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

Updates Fake Disintegrate and Spell Icons

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"
+	action_icon_state = "gib"

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)

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"

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)
 	..()

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."