From 7ad36060f3f3cf9bda630cfbea0baef9bd623dae Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Fri, 22 May 2020 03:38:56 -0400 Subject: [PATCH] Newcrit Death Threshold Tweaks (#13374) --- code/modules/mob/living/carbon/human/life.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 17f2adb67dc..c9dbf3e9b6c 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -810,7 +810,9 @@ handle_organs() - if(getBrainLoss() >= 120 || (health + (getOxyLoss() / 2)) <= -500) + var/guaranteed_death_threshold = health + (getOxyLoss() * 0.5) - (getFireLoss() * 0.67) - (getBruteLoss() * 0.67) + + if(getBrainLoss() >= 120 || (guaranteed_death_threshold) <= -500) death() return