From 548965dbd90c215cf932f19cf78a35c566b972db Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 21 Feb 2016 15:43:57 +1030 Subject: [PATCH] Fixes halloss and oxyloss for species with low health values. --- code/modules/mob/living/carbon/human/life.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index ddf8e90e8b..a69a031f69 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -937,7 +937,7 @@ return 1 //UNCONSCIOUS. NO-ONE IS HOME - if((getOxyLoss() > 50) || (health <= config.health_threshold_crit)) + if((getOxyLoss() > (species.total_health/2)) || (health <= config.health_threshold_crit)) Paralyse(3) if(hallucination) @@ -956,7 +956,7 @@ for(var/atom/a in hallucinations) qdel(a) - if(halloss > 100) + if(halloss >= species.total_health) src << "You're in too much pain to keep going..." src.visible_message("[src] slumps to the ground, too weak to continue fighting.") Paralyse(10)