Fixes Some Species Having Oxy Damage

This commit is contained in:
Fox McCloud
2019-04-02 14:25:29 -04:00
parent 41d3511d7f
commit 4b444860fd
4 changed files with 8 additions and 0 deletions
@@ -172,6 +172,7 @@
// Defined here solely to take species flags into account without having to recast at mob/living level.
/mob/living/carbon/human/adjustOxyLoss(amount)
if(NO_BREATHE in dna.species.species_traits)
oxyloss = 0
return FALSE
if(dna.species && amount > 0)
amount = amount * dna.species.oxy_mod
@@ -179,6 +180,7 @@
/mob/living/carbon/human/setOxyLoss(amount)
if(NO_BREATHE in dna.species.species_traits)
oxyloss = 0
return FALSE
if(dna.species && amount > 0)
amount = amount * dna.species.oxy_mod
@@ -1,5 +1,6 @@
/mob/living/carbon/human/SetLoseBreath(amount)
if(NO_BREATHE in dna.species.species_traits)
losebreath = 0
return FALSE
. = ..()
+4
View File
@@ -122,8 +122,10 @@
/mob/living/proc/adjustOxyLoss(amount, updating_health = TRUE)
if(status_flags & GODMODE)
oxyloss = 0
return FALSE //godmode
if(BREATHLESS in mutations)
oxyloss = 0
return FALSE
var/old_oxyloss = oxyloss
oxyloss = max(oxyloss + amount, 0)
@@ -137,8 +139,10 @@
/mob/living/proc/setOxyLoss(amount, updating_health = TRUE)
if(status_flags & GODMODE)
oxyloss = 0
return FALSE //godmode
if(BREATHLESS in mutations)
oxyloss = 0
return FALSE
var/old_oxyloss = oxyloss
oxyloss = amount
+1
View File
@@ -298,6 +298,7 @@
/mob/living/SetLoseBreath(amount)
if(BREATHLESS in mutations)
losebreath = 0
return FALSE
losebreath = max(amount, 0)