cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup/adjustment of inhale_pp handling

Browse Source
This commit is contained in:
mwerezak
2014-08-18 13:33:51 -04:00
parent 72fed65b10
commit b04ac56d45
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -490,31 +490,23 @@
if(inhale_pp < safe_pressure_min) if(inhale_pp < safe_pressure_min)
if(prob(20)) if(prob(20))
spawn(0) emote("gasp") spawn(0) emote("gasp")
if(inhale_pp > 0)
var/ratio = inhale_pp/safe_pressure_min
// Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!) var/ratio = inhale_pp/safe_pressure_min
// The hell? By definition ratio > 1, and HUMAN_MAX_OXYLOSS = 1... why do we even have this? // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!)
adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) adjustOxyLoss(max(HUMAN_MAX_OXYLOSS*(1-ratio), 0))
failed_inhale = 1 failed_inhale = 1
inhaled_gas_used = inhaling*ratio/6
else
adjustOxyLoss(HUMAN_MAX_OXYLOSS)
failed_inhale = 1
oxygen_alert = max(oxygen_alert, 1) oxygen_alert = max(oxygen_alert, 1)
else else
// We're in safe limits // We're in safe limits
inhaled_gas_used = inhaling/6
oxygen_alert = 0 oxygen_alert = 0
inhaled_gas_used = inhaling/6
breath.adjust_gas(breath_type, -inhaled_gas_used) breath.adjust_gas(breath_type, -inhaled_gas_used)
if(!no_exhale) if(!no_exhale)
breath.adjust_gas(exhale_type, inhaled_gas_used) breath.adjust_gas_temp(exhale_type, inhaled_gas_used, bodytemperature)
// Too much exhaled gas in the air // Too much exhaled gas in the air
if(exhaled_pp > safe_exhaled_max) if(exhaled_pp > safe_exhaled_max)