From 5bcede58016283c2774661c9dd1231b7e1ca08d9 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 23 Aug 2015 20:22:15 -0400 Subject: [PATCH] Fixes adjustBrainLoss adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change. --- code/modules/mob/living/carbon/human/human_damage.dm | 1 - code/modules/organs/organ.dm | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 530daea57c7..50ddb6557d6 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -30,7 +30,6 @@ var/obj/item/organ/brain/sponge = internal_organs_by_name["brain"] if(sponge) sponge.take_damage(amount) - sponge.damage = min(max(brainloss, 0),(maxHealth*2)) brainloss = sponge.damage else brainloss = 200 diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index bbafd2e53bc..4c4ed581b25 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -193,14 +193,15 @@ var/list/organ_cache = list() W.damage += damage W.time_inflicted = world.time +//Note: external organs have their own version of this proc /obj/item/organ/proc/take_damage(amount, var/silent=0) if(src.status & ORGAN_ROBOT) - src.damage += (amount * 0.8) + src.damage = between(0, src.damage + (amount * 0.8), max_damage) else - src.damage += amount + src.damage = between(0, src.damage + amount, max_damage) //only show this if the organ is not robotic - if(owner && parent_organ) + if(owner && parent_organ && amount > 0) var/obj/item/organ/external/parent = owner.get_organ(parent_organ) if(parent && !silent) owner.custom_pain("Something inside your [parent.name] hurts a lot.", 1)