From af27a1aa0394335bf9aba166c471c0fbe46302d8 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 7 Jan 2018 18:49:21 -0800 Subject: [PATCH] Fixes can_cast short circuit (#34097) --- code/modules/spells/spell_types/touch_attacks.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm index 4a2f54e1f5..2000d8daea 100644 --- a/code/modules/spells/spell_types/touch_attacks.dm +++ b/code/modules/spells/spell_types/touch_attacks.dm @@ -24,9 +24,7 @@ stoplag(1) /obj/effect/proc_holder/spell/targeted/touch/can_cast(mob/user = usr) - if(attached_hand) - return TRUE - return ..() + return ..() && attached_hand /obj/effect/proc_holder/spell/targeted/touch/proc/ChargeHand(mob/living/carbon/user) attached_hand = new hand_path(src)