From d75379d6afe6abeef5012d65260b022475c7a704 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 15 Feb 2015 17:01:51 -0500 Subject: [PATCH] Lexorin causes losebreath instead of oxyloss Makes lexorin actually do what it's description says, now less deadly as a side effect. --- code/modules/mob/living/carbon/human/life.dm | 5 +---- code/modules/reagents/Chemistry-Reagents.dm | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 05ea0a9714..599707aaa1 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -326,7 +326,6 @@ if(istype(O)) O.add_autopsy_data("Radiation Poisoning", damage) proc/breathe() - if(reagents.has_reagent("lexorin")) return if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return if(species && (species.flags & NO_BREATHE || species.flags & IS_SYNTHETIC)) return @@ -439,17 +438,15 @@ return if(!breath || (breath.total_moles == 0) || suiciding) + failed_last_breath = 1 if(suiciding) adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster - failed_last_breath = 1 oxygen_alert = max(oxygen_alert, 1) return 0 if(health > config.health_threshold_crit) adjustOxyLoss(HUMAN_MAX_OXYLOSS) - failed_last_breath = 1 else adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS) - failed_last_breath = 1 oxygen_alert = max(oxygen_alert, 1) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index b9db05c3d0..b7029876e6 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1702,8 +1702,8 @@ datum if(!M) M = holder.my_atom if(prob(33)) M.take_organ_damage(1*REM, 0) - M.adjustOxyLoss(3) - if(prob(20)) M.emote("gasp") + if(M.losebreath < 15) + M.losebreath++ ..() return