cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Fixed a bug that caused insta oxycrit.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2841 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rockdtben
2011-12-28 19:05:27 +00:00
parent 19fb811e20
commit a2b7cedd34
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/verbs/suicide.dm
View File

@@ -149,7 +149,7 @@
suiciding = 1 suiciding = 1
viewers(src) << "\red <b>[src] is thrashing wildly! It looks like \he's trying to commit suicide.</b>" viewers(src) << "\red <b>[src] is thrashing wildly! It looks like \he's trying to commit suicide.</b>"
//put em at -175 //put em at -175
adjustOxyLoss(max(100 - getFireLoss() - getBruteLoss() - getOxyLoss()), 0) adjustOxyLoss(max(100 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
updatehealth() updatehealth()

2
code/modules/mob/living/carbon/human/life.dm
View File

@@ -345,7 +345,7 @@
oxygen_used = breath.oxygen*ratio/6 oxygen_used = breath.oxygen*ratio/6
oxygen_alert = max(oxygen_alert, 1)*/ oxygen_alert = max(oxygen_alert, 1)*/
else // We're in safe limits else // We're in safe limits
adjustOxyLoss(max(getOxyLoss()-5, 0)) adjustOxyLoss(-5)
oxygen_used = breath.oxygen/6 oxygen_used = breath.oxygen/6
oxygen_alert = 0 oxygen_alert = 0