From a2b7cedd34e74a69e6ab2c995c45be075720eff5 Mon Sep 17 00:00:00 2001 From: rockdtben Date: Wed, 28 Dec 2011 19:05:27 +0000 Subject: [PATCH] -Fixed a bug that caused insta oxycrit. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2841 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/verbs/suicide.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index 5cc53f1876..a71f486651 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -149,7 +149,7 @@ suiciding = 1 viewers(src) << "\red [src] is thrashing wildly! It looks like \he's trying to commit suicide." //put em at -175 - adjustOxyLoss(max(100 - getFireLoss() - getBruteLoss() - getOxyLoss()), 0) + adjustOxyLoss(max(100 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 4090131872..18f93bdf1b 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -345,7 +345,7 @@ oxygen_used = breath.oxygen*ratio/6 oxygen_alert = max(oxygen_alert, 1)*/ else // We're in safe limits - adjustOxyLoss(max(getOxyLoss()-5, 0)) + adjustOxyLoss(-5) oxygen_used = breath.oxygen/6 oxygen_alert = 0