From d0b51e86ed56c04ca0ebbd08bb4c0b0700ed54d2 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Tue, 3 Feb 2015 19:09:18 -0800 Subject: [PATCH] fixes #7154 --- .../reagents/Chemistry-Goon-Medicine.dm | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/code/modules/reagents/Chemistry-Goon-Medicine.dm b/code/modules/reagents/Chemistry-Goon-Medicine.dm index d5dd5ad717ed18..e986c8de6b960e 100644 --- a/code/modules/reagents/Chemistry-Goon-Medicine.dm +++ b/code/modules/reagents/Chemistry-Goon-Medicine.dm @@ -601,22 +601,21 @@ datum/reagent/strange_reagent metabolization_rate = 0.2 datum/reagent/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob, var/method=TOUCH, var/volume) - if(M.bruteloss > 80 || M.fireloss > 80) - if(ishuman(M) || ismonkey(M)) - var/mob/living/carbon/C_target = M - var/obj/item/organ/brain/B = C_target.getorgan(/obj/item/organ/brain) - if(B) - B.loc = get_turf(C_target) - B.transfer_identity(C_target) - C_target.internal_organs -= B - M.gib() - else if(M.stat == DEAD) + if(M.stat == DEAD) + if(M.getBruteLoss() >= 80 || M.getFireLoss() >= 80) + if(ishuman(M) || ismonkey(M)) + var/mob/living/carbon/C_target = M + var/obj/item/organ/brain/B = C_target.getorgan(/obj/item/organ/brain) + if(B) + B.loc = get_turf(C_target) + B.transfer_identity(C_target) + C_target.internal_organs -= B + M.gib(M) + return var/mob/dead/observer/ghost = M.get_ghost() M.visible_message("[M]'s body convulses a bit.") - if(M.health <= config.health_threshold_dead && !M.suiciding && !ghost && !(NOCLONE in M.mutations)) + if(!M.suiciding && !ghost && !(NOCLONE in M.mutations)) M.stat = 1 - M.adjustBruteLoss(-20) // this should keep them from dying immediately - M.adjustFireLoss(-20) M.adjustOxyLoss(-20) M.adjustToxLoss(-20) dead_mob_list -= M