From 28406d3bf2b8b39051bd433a352af6c3927c816a Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Thu, 15 May 2014 02:03:37 -0400 Subject: [PATCH] Vox breath fixes --- code/modules/mob/living/carbon/human/life.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index eee1cf5aa46..df2c7ff826b 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -488,7 +488,7 @@ // Nitrogen, for Vox. var/Nitrogen_pp = (breath.nitrogen/breath.total_moles())*breath_pressure - if(O2_pp < safe_oxygen_min && (species != "Vox" || species != "Vox Armalis")) // Too little oxygen + if(O2_pp < safe_oxygen_min && (species.name != "Vox" || species.name != "Vox Armalis")) // Too little oxygen if(prob(20)) spawn(0) emote("gasp") if(O2_pp > 0) @@ -506,7 +506,7 @@ oxyloss += 5*ratio oxygen_used = breath.oxygen*ratio/6 oxygen_alert = max(oxygen_alert, 1)*/ - else if(Nitrogen_pp < safe_oxygen_min && (species == "Vox" || species == "Vox Armalis")) //Vox breathe nitrogen, not oxygen. + else if(Nitrogen_pp < safe_oxygen_min && (species.name == "Vox" || species.name == "Vox Armalis")) //Vox breathe nitrogen, not oxygen. if(prob(20)) spawn(0) emote("gasp") @@ -551,7 +551,7 @@ if(reagents) reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) toxins_alert = max(toxins_alert, 1) - else if(O2_pp > vox_oxygen_max && (species == "Vox" || species == "Vox Armalis")) //Oxygen is toxic to vox. + else if(O2_pp > vox_oxygen_max && (species.name == "Vox" || species.name == "Vox Armalis")) //Oxygen is toxic to vox. var/ratio = (breath.oxygen/vox_oxygen_max) * 1000 adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE)) toxins_alert = max(toxins_alert, 1)