From b30f81c7ea5197a74ec728cd94b4699d29bfd7c7 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 27 Dec 2015 01:25:13 -0500 Subject: [PATCH] Fixes #11381 --- code/modules/mob/living/carbon/human/human_damage.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index efe203c51cc..eaed6b62d5f 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -8,8 +8,8 @@ var/total_burn = 0 var/total_brute = 0 for(var/obj/item/organ/external/O in organs) //hardcoded to streamline things a bit - if(O.status & ORGAN_ROBOT) - continue //robot limbs don't count towards shock and crit + if(O.status & ORGAN_ROBOT && !O.vital) + continue //*non-vital* robot limbs don't count towards shock and crit total_brute += O.brute_dam total_burn += O.burn_dam