From fcaad005ded3df660c779453c075be226447c50d Mon Sep 17 00:00:00 2001 From: Incoming Date: Wed, 2 Sep 2015 00:26:42 -0400 Subject: [PATCH] Reverts #10922: ei nath nerfs 2: ayy lmao 1. Someone gets salty and tries to grudgecode ei nath away 2. Someone else has to step in and make a nerf that isn't shooting the spell in the knees 3. The salt does not abate and new grudgecode rises 4. Everyone laughs about it and forgets about the pull 5. Months later it gets pulled with no testing and outstanding grammatical errors to the surprise of everyone, including the person who originally grudgecoded it This is duuuuuuuumb --- code/datums/spells/touch_attacks.dm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm index 9f69c3bd2a4..cd83738c1f7 100644 --- a/code/datums/spells/touch_attacks.dm +++ b/code/datums/spells/touch_attacks.dm @@ -1,7 +1,6 @@ -/obj/effect/proc_holder/spell/targeted/touch +/obj/effect/proc_holder/spell/targeted/touch/ var/hand_path = "/obj/item/weapon/melee/touch_attack" var/obj/item/weapon/melee/touch_attack/attached_hand = null - var/refund_coeff = 1 //how much of their charge they get back. invocation_type = "none" //you scream on connecting, not summoning include_user = 1 range = -1 @@ -9,7 +8,7 @@ /obj/effect/proc_holder/spell/targeted/touch/Click(mob/user = usr) if(attached_hand) qdel(attached_hand) - charge_counter = round(charge_max * refund_coeff, 1) + charge_counter = charge_max attached_hand = null user << "You draw the power out of your hand." return 0 @@ -49,7 +48,6 @@ name = "Disintegrate" 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/disintegrate" - refund_coeff = 0.66 school = "evocation" charge_max = 600 @@ -58,15 +56,6 @@ action_icon_state = "gib" -/obj/effect/proc_holder/spell/targeted/touch/disintegrate/cast(list/targets) - for(var/mob/living/carbon/user in targets) - visible_message("[user] starts gathering destructive energy...", "You start gathering destructive energy...") - playsound(user.loc, 'sound/magic/Ethereal_Exit.ogg', 50, 1) - if(!do_after(user, 15)) - return 0 - visible_message("[user] channels a large amount of destructive energy to his hand!", "You channel a large amount of destructive energy to his hand!") - ..() - /obj/effect/proc_holder/spell/targeted/touch/flesh_to_stone name = "Flesh to Stone" desc = "This spell charges your hand with the power to turn victims into inert statues for a long period of time."