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

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

View File

@@ -1562,7 +1562,7 @@
if(check_rights(R_ADMIN|R_SERVER))
if(href_list["vsc"] == "airflow")
vsc.ChangeSettingsDialog(usr,vsc.settings)
if(href_list["vsc"] == "phoron")
if(href_list["vsc"] == GAS_PHORON)
vsc.ChangeSettingsDialog(usr,vsc.plc.settings)
if(href_list["vsc"] == "default")
vsc.SetDefault(usr)

View File

@@ -6,12 +6,11 @@
return
var/datum/gas_mixture/environment = usr.loc.return_air()
environment.gas["phoron"] = 0
environment.gas["nitrogen"] = 82.1472
environment.gas["oxygen"] = 21.8366
environment.gas["carbon_dioxide"] = 0
environment.gas["sleeping_agent"] = 0
environment.gas["oxygen_agent_b"] = 0
environment.gas[GAS_PHORON] = 0
environment.gas[GAS_NITROGEN] = 82.1472
environment.gas[GAS_OXYGEN] = 21.8366
environment.gas[GAS_CO2] = 0
environment.gas[GAS_N2O] = 0
environment.temperature = 293.15
environment.update_values()
var/turf/simulated/location = get_turf(usr)

View File

@@ -403,7 +403,7 @@
if(Rad.anchored)
if(!Rad.P)
var/obj/item/tank/phoron/Phoron = new/obj/item/tank/phoron(Rad)
Phoron.air_contents.gas["phoron"] = 70
Phoron.air_contents.gas[GAS_PHORON] = 70
Rad.drainratio = 0
Rad.P = Phoron
Phoron.forceMove(Rad)

View File

@@ -501,7 +501,7 @@
if("brute") L.adjustBruteLoss(amount)
if("fire") L.adjustFireLoss(amount)
if("toxin") L.adjustToxLoss(amount)
if("oxygen")L.adjustOxyLoss(amount)
if("oxygen") L.adjustOxyLoss(amount)
if(BP_BRAIN) L.adjustBrainLoss(amount)
if("clone") L.adjustCloneLoss(amount)
else