From d906d1358ff021223cc056c86d741ca39e77b509 Mon Sep 17 00:00:00 2001 From: Mloc Date: Tue, 20 Dec 2011 10:12:51 +0000 Subject: [PATCH 2/2] Removed wizard gib spell, make gibbing and dust-ing drop everything on the person. Signed-off-by: Mloc --- code/game/gamemodes/wizard/spellbook.dm | 30 ++++++++++++------------- code/game/gamemodes/wizard/spells.dm | 2 ++ code/game/gamemodes/wizard/wizard.dm | 4 ++-- code/modules/mob/mob.dm | 4 ++++ 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index dc92ea836b9..9da0da4711b 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -14,7 +14,7 @@ dat += "The number after the spell name is the cooldown time.
" dat += "Magic Missile (10)
" dat += "Fireball (10)
" - dat += "Disintegrate (60)
" +// dat += "Disintegrate (60)
" dat += "Disable Technology (60)
" dat += "Smoke (10)
" dat += "Blind (30)
" @@ -54,10 +54,10 @@ usr.verbs += /client/proc/fireball usr.mind.special_verbs += /client/proc/fireball src.temp = "This spell fires a fireball at a target and does not require wizard garb. Be careful not to fire it at people that are standing next to you." - if ("3") - usr.verbs += /mob/proc/kill - usr.mind.special_verbs += /mob/proc/kill - src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown." +// if ("3") +// usr.verbs += /mob/proc/kill +// usr.mind.special_verbs += /mob/proc/kill +// src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown." if ("4") usr.verbs += /mob/proc/tech usr.mind.special_verbs += /mob/proc/tech @@ -114,9 +114,9 @@ if ("2") usr.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/fireball(usr) src.temp = "This spell fires a fireball at a target and does not require wizard garb. Be careful not to fire it at people that are standing next to you." - if ("3") - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(usr) - src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown." +// if ("3") +// usr.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(usr) +// src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown." if ("4") usr.spell_list += new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(usr) src.temp = "This spell disables all weapons, cameras and most other technology in range." @@ -183,7 +183,7 @@ dat += "Each item costs 1 telecrystal. The number afterwards is the cooldown time.
" dat += "Magic Missile (10)
" dat += "Fireball (10)
" - dat += "Disintegrate (60)
" +// dat += "Disintegrate (60)
" dat += "Disable Technology (60)
" dat += "Smoke (10)
" dat += "Blind (30)
" @@ -224,12 +224,12 @@ usr.verbs += /client/proc/fireball usr.mind.special_verbs += /client/proc/fireball src.temp = "This spell fires a fireball at a target and does not require wizard garb. Be careful not to fire it at people that are standing next to you." - else if (href_list["spell_disintegrate"]) - if (src.uses >= 1) - src.uses -= 1 - usr.verbs += /mob/proc/kill - usr.mind.special_verbs += /mob/proc/kill - src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown." +// else if (href_list["spell_disintegrate"]) +// if (src.uses >= 1) +// src.uses -= 1 +// usr.verbs += /mob/proc/kill +// usr.mind.special_verbs += /mob/proc/kill +// src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown." else if (href_list["spell_emp"]) if (src.uses >= 1) src.uses -= 1 diff --git a/code/game/gamemodes/wizard/spells.dm b/code/game/gamemodes/wizard/spells.dm index bbc1e54c331..a10739c4103 100644 --- a/code/game/gamemodes/wizard/spells.dm +++ b/code/game/gamemodes/wizard/spells.dm @@ -229,6 +229,7 @@ //KILL +/* /mob/proc/kill(mob/living/M as mob in oview(1)) set category = "Spells" set name = "Disintegrate" @@ -249,6 +250,7 @@ s.start() M.dust() +*/ //DISABLE TECH diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 3c15ee72bbd..1d6b3dcea03 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -243,7 +243,7 @@ M.verbs -= /client/proc/jaunt M.verbs -= /client/proc/magicmissile M.verbs -= /client/proc/fireball - M.verbs -= /mob/proc/kill +// M.verbs -= /mob/proc/kill M.verbs -= /mob/proc/tech M.verbs -= /client/proc/smokecloud M.verbs -= /client/proc/blind @@ -257,7 +257,7 @@ M.mind.special_verbs -= /client/proc/jaunt M.mind.special_verbs -= /client/proc/magicmissile M.mind.special_verbs -= /client/proc/fireball - M.mind.special_verbs -= /mob/proc/kill +// M.mind.special_verbs -= /mob/proc/kill M.mind.special_verbs -= /mob/proc/tech M.mind.special_verbs -= /client/proc/smokecloud M.mind.special_verbs -= /client/proc/blind diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index fc6d8a61adb..60aef82be18 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -803,6 +803,8 @@ else gibs(loc, viruses) sleep(15) + for(var/obj/item/I in src.contents) + I.loc = get_turf(src) del(src) /* @@ -838,6 +840,8 @@ Dusting robots does not eject the MMI, so it's a bit more powerful than gib() /N sleep(15) if(isrobot(src)&&src:mmi)//Is a robot and it has an mmi. del(src:mmi)//Delete the MMI first so that it won't go popping out. + for(var/obj/item/I in src.contents) + I.loc = get_turf(src) del(src) /*