cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes oxyloss racking up extremely fast (#9253)

Browse Source
This commit is contained in:
Matt Atlas
2020-07-01 22:38:28 +02:00
committed by GitHub
parent 111b1a52e8
commit 6725cfbc34
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_defines.dm
+4 -4
View File
@@ -125,10 +125,10 @@
var/overeatduration = 0 // How long this guy is overeating //Carbon
var/overdrinkduration = 0 // How long this guy is overdrinking //Carbon
var/paralysis = 0.0
var/stunned = 0.0
var/weakened = 0.0
var/losebreath = 0.0//Carbon
var/paralysis = 0
var/stunned = 0
var/weakened = 0
var/losebreath = 0 //Carbon
var/intent = null//Living
var/shakecamera = 0
var/a_intent = I_HELP//Living
code/modules/organs/internal/lungs.dm
-7
View File
@@ -176,7 +176,6 @@
var/word = pick("extremely dizzy","short of breath","faint","confused")
to_chat(owner, "<span class='danger'>You feel [word].</span>")
owner.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
owner.co2_alert = 1
failed_exhale = 1
@@ -185,12 +184,6 @@
var/word = pick("dizzy","short of breath","faint","momentarily confused")
to_chat(owner, "<span class='warning'>You feel [word].</span>")
//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 due to CO2 alone until they're pretty close to safe_exhaled_max.
if (owner.getOxyLoss() < 50*ratio)
owner.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
owner.co2_alert = 1
failed_exhale = 1