From c7089467bc1c1ebbcb136de1bf80a1854e303598 Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Sat, 21 Apr 2018 12:40:33 -0700 Subject: [PATCH] Readd shields to attackhand --- code/modules/mob/living/carbon/human/human_attackhand.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 4a494131c45..068ea74b485 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -18,10 +18,14 @@ ..() + if((M != src) && M.a_intent != INTENT_HELP && check_shields(0, M.name, attack_type = UNARMED_ATTACK)) + add_logs(M, src, "Melee attack (failed to shield)") + visible_message("[M] attempted to touch [src]!") + return 0 var/datum/martial_art/attacker_style = M.martial_art - species.handle_attack_hand(src,M) + species.handle_attack_hand(src, M) switch(M.a_intent) if(INTENT_HELP)