Merge pull request #11211 from Fox-McCloud/fix-the-thing

Fixes Some Species Having Oxy Damage

code/modules/mob/living/carbon/human/human_damage.dm

@@ -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

code/modules/mob/living/carbon/human/status_procs.dm

@@ -1,5 +1,6 @@
 /mob/living/carbon/human/SetLoseBreath(amount)
 	if(NO_BREATHE in dna.species.species_traits)
+		losebreath = 0
 		return FALSE
 	. = ..()
 

code/modules/mob/living/damage_procs.dm

@@ -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

code/modules/mob/living/status_procs.dm

@@ -298,6 +298,7 @@
 
 /mob/living/SetLoseBreath(amount)
 	if(BREATHLESS in mutations)
+		losebreath = 0
 		return FALSE
 	losebreath = max(amount, 0)