From eec1c9a32ac85905ee09265ab36210d7feeeb8bd Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 27 Dec 2015 17:27:19 +1030 Subject: [PATCH] Applying Harpy's prosthetic limb damage fix. Conflicts: code/modules/mob/living/carbon/human/human_damage.dm --- code/modules/mob/living/carbon/human/human_damage.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index f78e2e0aa62..c6ad0e1f55b 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -8,7 +8,7 @@ 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 && !O.vital) + 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