From f619e27a676b8460f83e3393290c2cddf7946b72 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 27 May 2014 03:00:31 -0400 Subject: [PATCH] Completed unfinished species.breath_type switch Conflicts: code/modules/mob/living/carbon/human/life.dm --- code/modules/mob/living/carbon/human/life.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0cf57a4a063..d83fc74f99f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -585,6 +585,10 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc switch(species.breath_type) if("nitrogen") breath.nitrogen -= inhaled_gas_used + if("phoron") + breath.toxins -= inhaled_gas_used + if("C02") + breath.carbon_dioxide-= inhaled_gas_used else breath.oxygen -= inhaled_gas_used @@ -617,7 +621,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc //scale linearly from 0 to 1 between safe_exhaled_max and safe_exhaled_max*0.7 var/ratio = 1.0 - (safe_exhaled_max - exhaled_pp)/(safe_exhaled_max*0.3) - //give them some oxyloss, up to the limit - we don't want people falling unconcious until they're pretty close to safe_exhaled_max + //give them some oxyloss, up to the limit - we don't want people falling unconcious due to CO2 alone until they're pretty close to safe_exhaled_max. if (getOxyLoss() < 50*ratio) adjustOxyLoss(HUMAN_MAX_OXYLOSS) co2_alert = 1