Merge pull request #3557 from Fox-McCloud/spell-icons-fake-nath

Updates Fake Disintegrate and Spell Icons
This commit is contained in:
TheDZD
2016-02-11 18:09:12 -05:00
6 changed files with 27 additions and 18 deletions
+17
View File
@@ -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)
..()
+1 -1
View File
@@ -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."