mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 00:29:02 +01:00
A new trait that prevents passing out from oxygen damage (#94240)
## About The Pull Request A new trait, TRAIT_NO_OXYLOSS_PASSOUT, that prevents you from passing out due to having over 50 oxyloss. Applied by taking nooart and being a super hulk. I couldn't replicate it, but if it's still a bug this definitely closes #92771. Also I didn't remove the line in nooart that constantly removes the knockedout trait from oxyloss for redundacy reasons. I mean if it's going to keep removing the knockedout trait from hardcrit every turn despite having nohardcrit that's probably intentional. ## Why It's Good For The Game Bugfix I think. Also super hulks are supposed to be immune to everything stun related and fight on no matter how much damage they've taken, so yeah. ## Changelog 🆑 fix: Nooartrium patients and super hulks can no longer pass out from oxygen damage /🆑 Co-authored-by: Fghj240 <fakeemail@notrealemail.com>
This commit is contained in:
@@ -558,7 +558,7 @@
|
||||
*/
|
||||
/mob/living/carbon/proc/check_passout()
|
||||
var/mob_oxyloss = get_oxy_loss()
|
||||
if(mob_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD)
|
||||
if(mob_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD && !HAS_TRAIT(src, TRAIT_NO_OXYLOSS_PASSOUT))
|
||||
if(!HAS_TRAIT_FROM(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT))
|
||||
ADD_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)
|
||||
else if(mob_oxyloss < OXYLOSS_PASSOUT_THRESHOLD)
|
||||
|
||||
Reference in New Issue
Block a user