From 4b444860fd0c3ac88a7634ca0be759f01086bc2c Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Tue, 2 Apr 2019 14:25:29 -0400 Subject: [PATCH] Fixes Some Species Having Oxy Damage --- code/modules/mob/living/carbon/human/human_damage.dm | 2 ++ code/modules/mob/living/carbon/human/status_procs.dm | 1 + code/modules/mob/living/damage_procs.dm | 4 ++++ code/modules/mob/living/status_procs.dm | 1 + 4 files changed, 8 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index b4cb92af01e..7e9739a816d 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/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 diff --git a/code/modules/mob/living/carbon/human/status_procs.dm b/code/modules/mob/living/carbon/human/status_procs.dm index 9a1c7a5bbd6..30653023751 100644 --- a/code/modules/mob/living/carbon/human/status_procs.dm +++ b/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 . = ..() diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index e3005292c95..afca9ad8798 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/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 diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 2eea5755293..d47f21b8d46 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/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)