Merge branch 'master' into mapsyncs43293845982

2018-01-08 06:18:11 +00:00
parent e39ae49a2e 2d63c57837
commit e4410a3320
35 changed files with 269 additions and 142 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)