Merge pull request #4711 from Citadel-Station-13/upstream-merge-34097

[MIRROR] Fixes can_cast short circuit
2018-01-08 04:17:42 +00:00
parent 984bf470d5 82d8c9720b
commit 432fdfc0d3
1 changed files with 1 additions and 3 deletions
@@ -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)