From e2b4e43a9c3bd35284be70edee927d9473ee8d37 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 00:07:34 -0400 Subject: [PATCH] Fixes suits being punctured by projectiles when... ...fully blocked by a shield. Conflicts: code/modules/mob/living/carbon/human/human_defense.dm --- code/modules/mob/living/carbon/human/human_defense.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 6e2b638be8c..f96b3c44229 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -51,11 +51,6 @@ emp_act return -1 // complete projectile permutation - if(check_shields(P.damage, "the [P.name]")) - P.on_hit(src, 2, def_zone) - handle_suit_punctures(P.damage_type, P.damage) - return 2 - //BEGIN BOOK'S TASER NERF. if(istype(P, /obj/item/projectile/beam/stun)) var/datum/organ/external/select_area = get_organ(def_zone) // We're checking the outside, buddy! @@ -89,6 +84,9 @@ emp_act return //END TASER NERF + if(check_shields(P.damage, "the [P.name]")) + P.on_hit(src, 2, def_zone) + return 2 var/datum/organ/external/organ = get_organ(check_zone(def_zone))