cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reworks stasis, reshuffles life order, makes gases use defines. (#9409)

Browse Source
This commit is contained in:
Matt Atlas
2020-08-09 13:20:06 +02:00
committed by GitHub
parent c0b6ee9bb3
commit c7c5d44a97
83 changed files with 593 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/organs/internal/heart.dm
View File

@@ -112,7 +112,7 @@
if(owner.species && owner.species.flags & NO_BLOOD)
return
if(!owner || owner.stat == DEAD || owner.bodytemperature < 170 || owner.in_stasis) //Dead or cryosleep people do not pump the blood.
if(!owner || owner.stat == DEAD || owner.bodytemperature < 170 || owner.InStasis()) //Dead or cryosleep people do not pump the blood.
return
if(pulse != PULSE_NONE || BP_IS_ROBOTIC(src))

12
code/modules/organs/internal/lungs.dm
View File

@@ -67,7 +67,7 @@
"<span class='danger'>You can't breathe!</span>",
"You hear someone gasp for air!",
)
owner.losebreath = round(damage/2)
owner.losebreath += round(damage/2)
if(rescued)
if(is_bruised())
@@ -160,14 +160,14 @@
if(owner.species.breath_type)
breath_type = species.breath_type
else
breath_type = "oxygen"
breath_type = GAS_OXYGEN
inhaling = breath.gas[breath_type]
if(owner.species.poison_type)
poison_type = species.poison_type
else
poison_type = "phoron"
poison_type = GAS_PHORON
poison = breath.gas[poison_type]
if(owner.species.exhale_type)
@@ -241,8 +241,8 @@
owner.phoron_alert = 0
// If there's some other shit in the air lets deal with it here.
if(breath.gas["sleeping_agent"])
var/SA_pp = (breath.gas["sleeping_agent"] / breath.total_moles) * breath_pressure
if(breath.gas[GAS_N2O])
var/SA_pp = (breath.gas[GAS_N2O] / breath.total_moles) * breath_pressure
// Enough to make us paralysed for a bit
if(SA_pp > SA_para_min)
@@ -259,7 +259,7 @@
if(prob(20))
spawn(0)
owner.emote(pick("giggle", "laugh"))
breath.adjust_gas("sleeping_agent", -breath.gas["sleeping_agent"]/6, update = 0) //update after
breath.adjust_gas(GAS_N2O, -breath.gas[GAS_N2O]/6, update = 0) //update after
// Were we able to breathe?
if (failed_inhale || failed_exhale)