diff --git a/code/datums/spells/fake_gib.dm b/code/datums/spells/fake_gib.dm index 5b8dc339c8e..23d2343e10e 100644 --- a/code/datums/spells/fake_gib.dm +++ b/code/datums/spells/fake_gib.dm @@ -1,17 +1,11 @@ -/obj/effect/proc_holder/spell/targeted/fake_gib +/obj/effect/proc_holder/spell/targeted/touch/fake_disintegrate name = "Disintegrate" - desc = "This spell instantly kills somebody adjacent to you with the vilest of magick." + desc = "This spell charges your hand with vile energy that can be used to violently explode victims." + hand_path = "/obj/item/weapon/melee/touch_attack/fake_disintegrate" - school = "conjuration" - charge_max = 20 + school = "evocation" + charge_max = 600 clothes_req = 0 - invocation = "EI NATH" - invocation_type = "shout" - range = -1 - include_user = 1 - cooldown_min = 5 //25 deciseconds reduction per rank + cooldown_min = 200 //100 deciseconds reduction per rank - sparks_spread = 3 - sparks_amt = 1 - - action_icon_state = "spell_disintegrate" \ No newline at end of file + action_icon_state = "gib" \ No newline at end of file diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index 99e7b0c8a0d..2c31c943284 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -14,7 +14,7 @@ selection_type = "range" var/list/compatible_mobs = list(/mob/living/carbon/human) - action_icon_state = "spell_horse" + action_icon_state = "barn" /obj/effect/proc_holder/spell/targeted/horsemask/cast(list/targets, mob/user = usr) if(!targets.len) diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 904b7d54e63..98423b3e5fc 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -85,8 +85,6 @@ emp_heavy = 6 emp_light = 10 - action_icon_state = "tech" - /obj/effect/proc_holder/spell/targeted/turf_teleport/blink name = "Blink" desc = "This spell randomly teleports you a short distance." @@ -144,7 +142,7 @@ summon_type = list("/obj/effect/forcefield") summon_lifespan = 300 - action_icon_state = "spell_forcewall" + action_icon_state = "shield" /obj/effect/proc_holder/spell/aoe_turf/conjure/timestop name = "Stop Time" diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index e8bdb02c764..b3c7834ae8d 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -73,4 +73,21 @@ var/mob/M = target M.Stun(2) new /obj/structure/closet/statue(M.loc, M) + ..() + +/obj/item/weapon/melee/touch_attack/fake_disintegrate + name = "toy plastic hand" + desc = "This hand of mine glows with an awesome power! Ok, maybe just batteries." + catchphrase = "EI NATH!!" + on_use_sound = "sound/magic/Disintegrate.ogg" + icon_state = "disintegrate" + item_state = "disintegrate" + +/obj/item/weapon/melee/touch_attack/fake_disintegrate/afterattack(atom/target, mob/living/carbon/user, proximity) + if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //exploding after touching yourself would be bad + return + var/datum/effect/system/spark_spread/sparks = new + sparks.set_up(4, 0, target.loc) //no idea what the 0 is + sparks.start() + playsound(target.loc, 'sound/effects/gib.ogg', 100, 1, 10) ..() \ No newline at end of file diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index f168ca5f35a..7422d610fb9 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -839,7 +839,7 @@ /obj/item/weapon/spellbook/oneuse/fake_gib - spell = /obj/effect/proc_holder/spell/targeted/fake_gib + spell = /obj/effect/proc_holder/spell/targeted/touch/fake_disintegrate spellname = "disintegrate" icon_state ="bookfireball" desc = "This book feels like it will rip stuff apart." \ No newline at end of file diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi index 57d17caaa46..7f5f8925b17 100644 Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ