diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index a51e9c3430e..874d0854440 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -778,15 +778,14 @@ check_passout() /** -* Check to see if we should be passed out from oyxloss +* Check to see if we should be passed out from oxyloss */ /mob/living/carbon/proc/check_passout() - if(!isnum(oxyloss)) - return - if(oxyloss <= 50) - if(getOxyLoss() > 50) + var/mob_oxyloss = getOxyLoss() + if(mob_oxyloss >= 50) + if(!HAS_TRAIT_FROM(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)) ADD_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT) - else if(getOxyLoss() <= 50) + else if(mob_oxyloss < 50) REMOVE_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT) /mob/living/carbon/get_organic_health()