diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 1e1e4039724..d926d3e0c61 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -287,28 +287,28 @@
//These tanks we're sure of their contents
if("nitrogen") //So we're a bit more picky about them.
- if(t.air_contents.gas["nitrogen"] && !t.air_contents.gas["oxygen"])
- contents.Add(t.air_contents.gas["nitrogen"])
+ if(t.air_contents.gas[/datum/gas/nitrogen] && !t.air_contents.gas[/datum/gas/oxygen])
+ contents.Add(t.air_contents.gas[/datum/gas/nitrogen])
else
contents.Add(0)
if ("oxygen")
- if(t.air_contents.gas["oxygen"] && !t.air_contents.gas["phoron"])
- contents.Add(t.air_contents.gas["oxygen"])
+ if(t.air_contents.gas[/datum/gas/oxygen] && !t.air_contents.gas[/datum/gas/phoron])
+ contents.Add(t.air_contents.gas[/datum/gas/oxygen])
else
contents.Add(0)
// No races breath this, but never know about downstream servers.
if ("carbon_dioxide")
- if(t.air_contents.gas["carbon_dioxide"] && !t.air_contents.gas["phoron"])
- contents.Add(t.air_contents.gas["carbon_dioxide"])
+ if(t.air_contents.gas[/datum/gas/carbon_dioxide] && !t.air_contents.gas[/datum/gas/phoron])
+ contents.Add(t.air_contents.gas[/datum/gas/carbon_dioxide])
else
contents.Add(0)
// And here's for the Vox
if ("phoron")
- if(t.air_contents.gas["phoron"] && !t.air_contents.gas["oxygen"])
- contents.Add(t.air_contents.gas["phoron"])
+ if(t.air_contents.gas[/datum/gas/phoron] && !t.air_contents.gas[/datum/gas/oxygen])
+ contents.Add(t.air_contents.gas[/datum/gas/phoron])
else
contents.Add(0)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 602deccad7b..aa3ed0d43a2 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -504,7 +504,7 @@ datum/objective/steal
for(var/obj/item/I in all_items) //Check for phoron tanks
if(istype(I, steal_target))
- found_amount += (target_name=="28 moles of phoron (full tank)" ? (I:air_contents:gas["phoron"]) : (I:amount))
+ found_amount += (target_name=="28 moles of phoron (full tank)" ? (I:air_contents:gas[/datum/gas/phoron]) : (I:amount))
return found_amount>=target_amount
if("50 coins (in bag)")
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index 54409f15539..c830e642659 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -43,13 +43,13 @@
var/total_moles = air_sample.total_moles
if(total_moles > 0)
if(output&4)
- signal.data["oxygen"] = round(100*air_sample.gas["oxygen"]/total_moles,0.1)
+ signal.data["oxygen"] = round(100*air_sample.gas[/datum/gas/oxygen]/total_moles,0.1)
if(output&8)
- signal.data["phoron"] = round(100*air_sample.gas["phoron"]/total_moles,0.1)
+ signal.data["phoron"] = round(100*air_sample.gas[/datum/gas/phoron]/total_moles,0.1)
if(output&16)
- signal.data["nitrogen"] = round(100*air_sample.gas["nitrogen"]/total_moles,0.1)
+ signal.data["nitrogen"] = round(100*air_sample.gas[/datum/gas/nitrogen]/total_moles,0.1)
if(output&32)
- signal.data["carbon_dioxide"] = round(100*air_sample.gas["carbon_dioxide"]/total_moles,0.1)
+ signal.data["carbon_dioxide"] = round(100*air_sample.gas[/datum/gas/carbon_dioxide]/total_moles,0.1)
else
signal.data["oxygen"] = 0
signal.data["phoron"] = 0
@@ -484,4 +484,4 @@ obj/machinery/computer/general_air_control/Destroy()
"sigtype"="command"
)
- radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA)
\ No newline at end of file
+ radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA)
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index db50d509a19..0bf80086b36 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -397,7 +397,7 @@ update_flag
//Dirty way to fill room with gas. However it is a bit easier to do than creating some floor/engine/n2o -rastaf0
/obj/machinery/portable_atmospherics/canister/sleeping_agent/roomfiller/New()
..()
- air_contents.gas["sleeping_agent"] = 9*4000
+ air_contents.gas[/datum/gas/nitrous_oxide] = 9*4000
spawn(10)
var/turf/simulated/location = src.loc
if (istype(src.loc))
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 6f4aa13d084..41277a6a25e 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -234,7 +234,7 @@
if(occupant.bodytemperature < T0C)
occupant.sleeping = max(5, (1/occupant.bodytemperature)*2000)
occupant.Paralyse(max(5, (1/occupant.bodytemperature)*3000))
- if(air_contents.gas["oxygen"] > 2)
+ if(air_contents.gas[/datum/gas/oxygen] > 2)
if(occupant.getOxyLoss()) occupant.adjustOxyLoss(-1)
else
occupant.adjustOxyLoss(-1)
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index ea9c93186a9..e4511e20800 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -171,14 +171,14 @@
OT.master = V
PT.valve_welded = 1
- PT.air_contents.gas["phoron"] = phoron_amt
- PT.air_contents.gas["carbon_dioxide"] = carbon_amt
+ PT.air_contents.gas[/datum/gas/phoron] = phoron_amt
+ PT.air_contents.gas[/datum/gas/carbon_dioxide] = carbon_amt
PT.air_contents.total_moles = phoron_amt + carbon_amt
PT.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE+1
PT.air_contents.update_values()
OT.valve_welded = 1
- OT.air_contents.gas["oxygen"] = oxygen_amt
+ OT.air_contents.gas[/datum/gas/oxygen] = oxygen_amt
OT.air_contents.total_moles = oxygen_amt
OT.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE+1
OT.air_contents.update_values()
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index b47f62fc022..b4a21cd5203 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -1532,10 +1532,10 @@ GLOBAL_LIST_EMPTY(PDAs)
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles
if (total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
- var/n2_level = environment.gas["nitrogen"]/total_moles
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/o2_level = environment.gas[/datum/gas/oxygen]/total_moles
+ var/n2_level = environment.gas[/datum/gas/nitrogen]/total_moles
+ var/co2_level = environment.gas[/datum/gas/carbon_dioxide]/total_moles
+ var/phoron_level = environment.gas[/datum/gas/phoron]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
// entry is what the element is describing
diff --git a/code/game/objects/items/devices/communicator/helper.dm b/code/game/objects/items/devices/communicator/helper.dm
index 8417db60680..040aabef984 100644
--- a/code/game/objects/items/devices/communicator/helper.dm
+++ b/code/game/objects/items/devices/communicator/helper.dm
@@ -6,10 +6,10 @@
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles
if (total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
- var/n2_level = environment.gas["nitrogen"]/total_moles
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/o2_level = environment.gas[/datum/gas/oxygen]/total_moles
+ var/n2_level = environment.gas[/datum/gas/nitrogen]/total_moles
+ var/co2_level = environment.gas[/datum/gas/carbon_dioxide]/total_moles
+ var/phoron_level = environment.gas[/datum/gas/phoron]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
// Label is what the entry is describing
@@ -539,4 +539,4 @@
if(B.id == internal_data["shuttle_door_code"])
target_doors += B
- return target_doors
\ No newline at end of file
+ return target_doors
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 9e8febf1634..438f5bb4305 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -139,7 +139,7 @@
usr.set_machine(src)
if(href_list["light"])
if(!ptank) return
- if(ptank.air_contents.gas["phoron"] < 1) return
+ if(ptank.air_contents.gas[/datum/gas/phoron] < 1) return
if(!status) return
lit = !lit
if(lit)
@@ -188,8 +188,8 @@
//Transfer 5% of current tank air contents to turf
var/datum/gas_mixture_old/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100))
//air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is stupid and I could probably make it work without fucking it up like this, but there you have it. -- TLE
- new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas["phoron"],get_dir(loc,target))
- air_transfer.gas["phoron"] = 0
+ new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(target,air_transfer.gas[/datum/gas/phoron],get_dir(loc,target))
+ air_transfer.gas[/datum/gas/phoron] = 0
target.assume_air(air_transfer)
//Burn it based on transfered gas
//target.hotspot_expose(part4.air_contents.temperature*2,300)
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index 2c5f81e5bcf..4c1971e3817 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -67,7 +67,7 @@
var/datum/gas_mixture_old/G = air_contents.remove(num)
- var/allgases = G.gas["carbon_dioxide"] + G.gas["nitrogen"] + G.gas["oxygen"] + G.gas["phoron"]
+ var/allgases = G.gas[/datum/gas/carbon_dioxide] + G.gas[/datum/gas/nitrogen] + G.gas[/datum/gas/oxygen] + G.gas[/datum/gas/phoron]
if(allgases >= 0.005)
return 1
@@ -132,7 +132,7 @@
var/datum/gas_mixture_old/G = pressure_vessel.air_contents.remove(num)
- var/allgases = G.gas["carbon_dioxide"] + G.gas["nitrogen"] + G.gas["oxygen"] + G.gas["phoron"]
+ var/allgases = G.gas[/datum/gas/carbon_dioxide] + G.gas[/datum/gas/nitrogen] + G.gas[/datum/gas/oxygen] + G.gas[/datum/gas/phoron]
if(allgases >= 0.005)
return 1
qdel(G)
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 4b770dd90d3..1b42427cc09 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -21,7 +21,7 @@
air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/oxygen/examine(mob/user)
- if(..(user, 0) && air_contents.gas["oxygen"] < 10)
+ if(..(user, 0) && air_contents.gas[/datum/gas/oxygen] < 10)
to_chat(user, text("The meter on \the [src] indicates you are almost out of oxygen!"))
//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
@@ -44,8 +44,8 @@
/obj/item/tank/anesthetic/Initialize()
. = ..()
- air_contents.gas["oxygen"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
- air_contents.gas["sleeping_agent"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+ air_contents.gas[/datum/gas/oxygen] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
+ air_contents.gas[/datum/gas/nitrous_oxide] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
air_contents.update_values()
/*
@@ -57,7 +57,7 @@
icon_state = "oxygen"
/obj/item/tank/air/examine(mob/user)
- if(..(user, 0) && air_contents.gas["oxygen"] < 1 && loc==user)
+ if(..(user, 0) && air_contents.gas[/datum/gas/oxygen] < 1 && loc==user)
to_chat(user, "The meter on the [src.name] indicates you are almost out of air!")
user << sound('sound/effects/alert.ogg')
@@ -132,7 +132,7 @@
src.air_contents.adjust_gas("oxygen", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/oxygen/examine(mob/user)
- if(..(user, 0) && air_contents.gas["oxygen"] < 0.2 && loc==user)
+ if(..(user, 0) && air_contents.gas[/datum/gas/oxygen] < 0.2 && loc==user)
to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!"))
user << sound('sound/effects/alert.ogg')
@@ -205,7 +205,7 @@
src.air_contents.adjust_gas("nitrogen", (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/nitrogen/examine(mob/user)
- if(..(user, 0) && air_contents.gas["nitrogen"] < 10)
+ if(..(user, 0) && air_contents.gas[/datum/gas/nitrogen] < 10)
to_chat(user, text("The meter on \the [src] indicates you are almost out of nitrogen!"))
//playsound(user, 'sound/effects/alert.ogg', 50, 1)
@@ -248,6 +248,6 @@
src.air_contents.adjust_gas("carbon_dioxide", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/emergency/carbon_dioxide/examine(mob/user)
- if(..(user, 0) && air_contents.gas["carbon_dioxide"] < 0.2 && loc==user)
+ if(..(user, 0) && air_contents.gas[/datum/gas/carbon_dioxide] < 0.2 && loc==user)
to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!"))
user << sound('sound/effects/alert.ogg')
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index a66890f95b1..65b3c9aa55d 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -554,8 +554,8 @@ var/list/global/tank_gauge_cache = list()
oxygen_amt = 4.5
- src.air_contents.gas["phoron"] = phoron_amt
- src.air_contents.gas["oxygen"] = oxygen_amt
+ src.air_contents.gas[/datum/gas/phoron] = phoron_amt
+ src.air_contents.gas[/datum/gas/oxygen] = oxygen_amt
src.air_contents.update_values()
src.valve_welded = 1
src.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE-1
diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm
index 40a6b1ade2b..7bbe44ca4ca 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -150,7 +150,7 @@
/obj/structure/bonfire/proc/check_oxygen()
var/datum/gas_mixture_old/G = loc.return_air()
- if(G.gas["oxygen"] < 1)
+ if(G.gas[/datum/gas/oxygen] < 1)
return FALSE
return TRUE
@@ -334,7 +334,7 @@
/obj/structure/fireplace/proc/check_oxygen()
var/datum/gas_mixture_old/G = loc.return_air()
- if(G.gas["oxygen"] < 1)
+ if(G.gas[/datum/gas/oxygen] < 1)
return FALSE
return TRUE
@@ -413,4 +413,4 @@
/obj/structure/fireplace/water_act(amount)
if(prob(amount * 10))
- extinguish()
\ No newline at end of file
+ extinguish()
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index bbb5cd542b9..c435ba292a6 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -484,7 +484,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[/datum/gas/phoron] = 70
Rad.drainratio = 0
Rad.P = Phoron
Phoron.loc = Rad
@@ -523,7 +523,7 @@
var/obj/item/tank/phoron/Phoron = new/obj/item/tank/phoron(Rad)
- Phoron.air_contents.gas["phoron"] = 29.1154 //This is a full tank if you filled it from a canister
+ Phoron.air_contents.gas[/datum/gas/phoron] = 29.1154 //This is a full tank if you filled it from a canister
Rad.P = Phoron
Phoron.loc = Rad
@@ -536,7 +536,7 @@
var/obj/machinery/atmospherics/binary/pump/Pump = M
if(Pump.name == "Engine Feed" && response == "Setup Completely")
found_the_pump = 1
- Pump.air2.gas["nitrogen"] = 3750 //The contents of 2 canisters.
+ Pump.air2.gas[/datum/gas/nitrogen] = 3750 //The contents of 2 canisters.
Pump.air2.temperature = 50
Pump.air2.update_values()
Pump.update_use_power(USE_POWER_IDLE)
@@ -564,7 +564,7 @@
if(!found_the_pump && response == "Setup Completely")
to_chat(src, "Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter")
var/turf/simulated/T = SM.loc
- T.zone.air.gas["nitrogen"] += 450
+ T.zone.air.gas[/datum/gas/nitrogen] += 450
T.zone.air.temperature = 50
T.zone.air.update_values()
diff --git a/code/modules/atmospherics/zas/Turf.dm b/code/modules/atmospherics/zas/Turf.dm
index f61d1cf4fc4..b8f4379d4c6 100644
--- a/code/modules/atmospherics/zas/Turf.dm
+++ b/code/modules/atmospherics/zas/Turf.dm
@@ -248,10 +248,10 @@
var/sum = oxygen + carbon_dioxide + nitrogen + phoron
if(sum>0)
- GM.gas["oxygen"] = (oxygen/sum)*amount
- GM.gas["carbon_dioxide"] = (carbon_dioxide/sum)*amount
- GM.gas["nitrogen"] = (nitrogen/sum)*amount
- GM.gas["phoron"] = (phoron/sum)*amount
+ GM.gas[/datum/gas/oxygen] = (oxygen/sum)*amount
+ GM.gas[/datum/gas/carbon_dioxide] = (carbon_dioxide/sum)*amount
+ GM.gas[/datum/gas/nitrogen] = (nitrogen/sum)*amount
+ GM.gas[/datum/gas/phoron] = (phoron/sum)*amount
GM.temperature = temperature
GM.update_values()
diff --git a/code/modules/atmospherics/zas/Zone.dm b/code/modules/atmospherics/zas/Zone.dm
index e56dcd44172..5899dd8b47f 100644
--- a/code/modules/atmospherics/zas/Zone.dm
+++ b/code/modules/atmospherics/zas/Zone.dm
@@ -175,7 +175,7 @@ Class Procs:
for(var/g in air.gas)
to_chat(M, "[gas_data.name[g]]: [air.gas[g]]")
M << "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]�K ([air.temperature - T0C]�C)"
- M << "O2 per N2: [(air.gas["nitrogen"] ? air.gas["oxygen"]/air.gas["nitrogen"] : "N/A")] Moles: [air.total_moles]"
+ M << "O2 per N2: [(air.gas[/datum/gas/nitrogen] ? air.gas[/datum/gas/oxygen]/air.gas[/datum/gas/nitrogen] : "N/A")] Moles: [air.total_moles]"
to_chat(M, "Simulated: [contents.len] ([air.group_multiplier])")
//M << "Unsimulated: [unsimulated_contents.len]"
//M << "Edges: [edges.len]"
@@ -194,4 +194,4 @@ Class Procs:
to_chat(M, "Space Edges: [space_edges] ([space_coefficient] connections)")
//for(var/turf/T in unsimulated_contents)
- // M << "[T] at ([T.x],[T.y])"
\ No newline at end of file
+ // M << "[T] at ([T.x],[T.y])"
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index 82578796a24..b4205e9bfe6 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -726,10 +726,10 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
- var/n2_level = environment.gas["nitrogen"]/total_moles
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/o2_level = environment.gas[/datum/gas/oxygen]/total_moles
+ var/n2_level = environment.gas[/datum/gas/nitrogen]/total_moles
+ var/co2_level = environment.gas[/datum/gas/carbon_dioxide]/total_moles
+ var/phoron_level = environment.gas[/datum/gas/phoron]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
set_pin_data(IC_OUTPUT, 1, pressure)
set_pin_data(IC_OUTPUT, 2, round(environment.temperature-T0C,0.1))
@@ -831,7 +831,7 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
+ var/o2_level = environment.gas[/datum/gas/oxygen]/total_moles
set_pin_data(IC_OUTPUT, 1, round(o2_level*100,0.1))
else
set_pin_data(IC_OUTPUT, 1, 0)
@@ -861,7 +861,7 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
+ var/co2_level = environment.gas[/datum/gas/carbon_dioxide]/total_moles
set_pin_data(IC_OUTPUT, 1, round(co2_level*100,0.1))
else
set_pin_data(IC_OUTPUT, 1, 0)
@@ -891,7 +891,7 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/n2_level = environment.gas["nitrogen"]/total_moles
+ var/n2_level = environment.gas[/datum/gas/nitrogen]/total_moles
set_pin_data(IC_OUTPUT, 1, round(n2_level*100,0.1))
else
set_pin_data(IC_OUTPUT, 1, 0)
@@ -921,7 +921,7 @@
var/total_moles = environment.total_moles
if (total_moles)
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/phoron_level = environment.gas[/datum/gas/phoron]/total_moles
set_pin_data(IC_OUTPUT, 1, round(phoron_level*100,0.1))
else
set_pin_data(IC_OUTPUT, 1, 0)
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index e4609d19ab7..4a6ce511a44 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -5,7 +5,7 @@
if(!environment) return
var/turf/T = get_turf(src)
- if(environment.gas["phoron"] > 0 || (T && locate(/obj/effect/alien/weeds) in T.contents))
+ if(environment.gas[/datum/gas/phoron] > 0 || (T && locate(/obj/effect/alien/weeds) in T.contents))
update_progression()
adjustBruteLoss(-1)
adjustFireLoss(-1)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 66571be43ee..0126a6e550f 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -521,8 +521,8 @@
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[/datum/gas/nitrous_oxide])
+ var/SA_pp = (breath.gas[/datum/gas/nitrous_oxide] / breath.total_moles) * breath_pressure
// Enough to make us paralysed for a bit
if(SA_pp > SA_para_min)
@@ -538,7 +538,7 @@
else if(SA_pp > 0.15)
if(prob(20))
spawn(0) emote(pick("giggle", "laugh"))
- breath.adjust_gas("sleeping_agent", -breath.gas["sleeping_agent"]/6, update = 0) //update after
+ breath.adjust_gas("sleeping_agent", -breath.gas[/datum/gas/nitrous_oxide]/6, update = 0) //update after
// Were we able to breathe?
if (failed_inhale || failed_exhale)
diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm
index 99848b6725e..c421eb36dc0 100644
--- a/code/modules/mob/living/carbon/human/species/station/alraune.dm
+++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm
@@ -233,8 +233,8 @@
H.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[/datum/gas/nitrous_oxide])
+ var/SA_pp = (breath.gas[/datum/gas/nitrous_oxide] / breath.total_moles) * breath_pressure
// Enough to make us paralysed for a bit
if(SA_pp > SA_para_min)
@@ -250,7 +250,7 @@
else if(SA_pp > 0.15)
if(prob(20))
spawn(0) H.emote(pick("giggle", "laugh"))
- breath.adjust_gas("sleeping_agent", -breath.gas["sleeping_agent"]/6, update = 0) //update after
+ breath.adjust_gas("sleeping_agent", -breath.gas[/datum/gas/nitrous_oxide]/6, update = 0) //update after
// Were we able to breathe?
if (failed_inhale || failed_exhale)
diff --git a/code/modules/mob/living/carbon/human/species/station/plasmen.dm b/code/modules/mob/living/carbon/human/species/station/plasmen.dm
index bcfe02ab0da..9cd4402ee3f 100644
--- a/code/modules/mob/living/carbon/human/species/station/plasmen.dm
+++ b/code/modules/mob/living/carbon/human/species/station/plasmen.dm
@@ -77,7 +77,7 @@
if(!environment) return
var/enviroment_bad = 0 //In case they're ever set on fire while wearing a spacesuit, we don't want the message that they're reacting with the atmosphere.
- if(environment.gas["oxygen"] > 0.5)
+ if(environment.gas[/datum/gas/oxygen] > 0.5)
if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space) && H.head && istype(H.head,/obj/item/clothing/head/helmet/space)) // now any airtight spessuit works for them. which means exploration voidsuits work :O
return
H.adjust_fire_stacks(2)
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
index 90e964baf6f..974bc3d3874 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
@@ -115,7 +115,7 @@
var/datum/gas_mixture_old/environment = T.return_air()
if(!environment) return
- if(environment.gas["phoron"] > 0 || locate(/obj/effect/alien/weeds) in T)
+ if(environment.gas[/datum/gas/phoron] > 0 || locate(/obj/effect/alien/weeds) in T)
if(!regenerate(H))
var/obj/item/organ/internal/xenos/plasmavessel/P = H.internal_organs_by_name[O_PLASMA]
P.stored_plasma += weeds_plasma_rate
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 957aefa198f..439758b9d17 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -384,7 +384,7 @@
return 1
var/datum/gas_mixture_old/G = loc.return_air() // Check if we're standing in an oxygenless environment
- if(G.gas["oxygen"] < 1)
+ if(G.gas[/datum/gas/oxygen] < 1)
ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire
return 1
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 5f6a9a3ad61..a37d479e46c 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -482,28 +482,28 @@
bodytemperature += ((Environment.temperature - bodytemperature) / 5)
if(min_oxy)
- if(Environment.gas["oxygen"] < min_oxy)
+ if(Environment.gas[/datum/gas/oxygen] < min_oxy)
atmos_unsuitable = 1
if(max_oxy)
- if(Environment.gas["oxygen"] > max_oxy)
+ if(Environment.gas[/datum/gas/oxygen] > max_oxy)
atmos_unsuitable = 1
if(min_tox)
- if(Environment.gas["phoron"] < min_tox)
+ if(Environment.gas[/datum/gas/phoron] < min_tox)
atmos_unsuitable = 2
if(max_tox)
- if(Environment.gas["phoron"] > max_tox)
+ if(Environment.gas[/datum/gas/phoron] > max_tox)
atmos_unsuitable = 2
if(min_n2)
- if(Environment.gas["nitrogen"] < min_n2)
+ if(Environment.gas[/datum/gas/nitrogen] < min_n2)
atmos_unsuitable = 1
if(max_n2)
- if(Environment.gas["nitrogen"] > max_n2)
+ if(Environment.gas[/datum/gas/nitrogen] > max_n2)
atmos_unsuitable = 1
if(min_co2)
- if(Environment.gas["carbon_dioxide"] < min_co2)
+ if(Environment.gas[/datum/gas/carbon_dioxide] < min_co2)
atmos_unsuitable = 1
if(max_co2)
- if(Environment.gas["carbon_dioxide"] > max_co2)
+ if(Environment.gas[/datum/gas/carbon_dioxide] > max_co2)
atmos_unsuitable = 1
//Atmos effect
diff --git a/code/modules/mob/living/simple_mob/life.dm b/code/modules/mob/living/simple_mob/life.dm
index eec58c7b74b..2fd1f61b107 100644
--- a/code/modules/mob/living/simple_mob/life.dm
+++ b/code/modules/mob/living/simple_mob/life.dm
@@ -92,28 +92,28 @@
bodytemperature += ((Environment.temperature - bodytemperature) / 5)
if(min_oxy)
- if(Environment.gas["oxygen"] < min_oxy)
+ if(Environment.gas[/datum/gas/oxygen] < min_oxy)
atmos_unsuitable = 1
if(max_oxy)
- if(Environment.gas["oxygen"] > max_oxy)
+ if(Environment.gas[/datum/gas/oxygen] > max_oxy)
atmos_unsuitable = 1
if(min_tox)
- if(Environment.gas["phoron"] < min_tox)
+ if(Environment.gas[/datum/gas/phoron] < min_tox)
atmos_unsuitable = 2
if(max_tox)
- if(Environment.gas["phoron"] > max_tox)
+ if(Environment.gas[/datum/gas/phoron] > max_tox)
atmos_unsuitable = 2
if(min_n2)
- if(Environment.gas["nitrogen"] < min_n2)
+ if(Environment.gas[/datum/gas/nitrogen] < min_n2)
atmos_unsuitable = 1
if(max_n2)
- if(Environment.gas["nitrogen"] > max_n2)
+ if(Environment.gas[/datum/gas/nitrogen] > max_n2)
atmos_unsuitable = 1
if(min_co2)
- if(Environment.gas["carbon_dioxide"] < min_co2)
+ if(Environment.gas[/datum/gas/carbon_dioxide] < min_co2)
atmos_unsuitable = 1
if(max_co2)
- if(Environment.gas["carbon_dioxide"] > max_co2)
+ if(Environment.gas[/datum/gas/carbon_dioxide] > max_co2)
atmos_unsuitable = 1
//Atmos effect
@@ -160,4 +160,4 @@
spawn(3) //We'll update our icon in a sec
update_icon()
- return ..(gibbed,deathmessage)
\ No newline at end of file
+ return ..(gibbed,deathmessage)
diff --git a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm
index 9d867a982e6..90fec40e4c9 100644
--- a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm
@@ -80,11 +80,11 @@
data["SM_EPR"] = active.get_epr()
//data["SM_EPR"] = active.get_epr()
if(air.total_moles)
- data["SM_gas_O2"] = round(100*air.gas["oxygen"]/air.total_moles,0.01)
- data["SM_gas_CO2"] = round(100*air.gas["carbon_dioxide"]/air.total_moles,0.01)
- data["SM_gas_N2"] = round(100*air.gas["nitrogen"]/air.total_moles,0.01)
- data["SM_gas_PH"] = round(100*air.gas["phoron"]/air.total_moles,0.01)
- data["SM_gas_N2O"] = round(100*air.gas["sleeping_agent"]/air.total_moles,0.01)
+ data["SM_gas_O2"] = round(100*air.gas[/datum/gas/oxygen]/air.total_moles,0.01)
+ data["SM_gas_CO2"] = round(100*air.gas[/datum/gas/carbon_dioxide]/air.total_moles,0.01)
+ data["SM_gas_N2"] = round(100*air.gas[/datum/gas/nitrogen]/air.total_moles,0.01)
+ data["SM_gas_PH"] = round(100*air.gas[/datum/gas/phoron]/air.total_moles,0.01)
+ data["SM_gas_N2O"] = round(100*air.gas[/datum/gas/nitrous_oxide]/air.total_moles,0.01)
else
data["SM_gas_O2"] = 0
data["SM_gas_CO2"] = 0
@@ -130,4 +130,4 @@
for(var/obj/machinery/power/supermatter/S in supermatters)
if(S.uid == newuid)
active = S
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 1cdac11afa9..b373a2cab90 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -37,7 +37,7 @@ var/global/list/rad_collectors = list()
receive_pulse(rads * 5) //Maths is hard
if(P)
- if(P.air_contents.gas["phoron"] == 0)
+ if(P.air_contents.gas[/datum/gas/phoron] == 0)
investigate_log("out of fuel.","singulo")
eject()
else
@@ -51,7 +51,7 @@ var/global/list/rad_collectors = list()
toggle_power()
user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
"You turn the [src.name] [active? "on":"off"].")
- investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas["phoron"]/0.29)]%":"It is empty"].","singulo")
+ investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas[/datum/gas/phoron]/0.29)]%":"It is empty"].","singulo")
return
else
to_chat(user, "The controls are locked!")
@@ -130,7 +130,7 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
if(P && active)
var/power_produced = 0
- power_produced = P.air_contents.gas["phoron"]*pulse_strength*20
+ power_produced = P.air_contents.gas[/datum/gas/phoron]*pulse_strength*20
add_avail(power_produced)
last_power_new = power_produced
return
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index be8137db47e..7146eaab834 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -279,7 +279,7 @@
damage = max( damage + min( ( (removed.temperature - CRITICAL_TEMPERATURE) / 150 ), damage_inc_limit ) , 0 )
//Ok, 100% oxygen atmosphere = best reaction
//Maxes out at 100% oxygen pressure
- oxygen = max(min((removed.gas["oxygen"] - (removed.gas["nitrogen"] * NITROGEN_SLOWING_FACTOR)) / removed.total_moles, 1), 0)
+ oxygen = max(min((removed.gas[/datum/gas/oxygen] - (removed.gas[/datum/gas/nitrogen] * NITROGEN_SLOWING_FACTOR)) / removed.total_moles, 1), 0)
//calculate power gain for oxygen reaction
var/temp_factor
diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm
index 1ae56fca7ca..4447309a1c7 100644
--- a/code/modules/shuttles/shuttles_web.dm
+++ b/code/modules/shuttles/shuttles_web.dm
@@ -514,10 +514,10 @@
var/total_moles = environment.total_moles
if(total_moles)
- var/o2_level = environment.gas["oxygen"]/total_moles
- var/n2_level = environment.gas["nitrogen"]/total_moles
- var/co2_level = environment.gas["carbon_dioxide"]/total_moles
- var/phoron_level = environment.gas["phoron"]/total_moles
+ var/o2_level = environment.gas[/datum/gas/oxygen]/total_moles
+ var/n2_level = environment.gas[/datum/gas/nitrogen]/total_moles
+ var/co2_level = environment.gas[/datum/gas/carbon_dioxide]/total_moles
+ var/phoron_level = environment.gas[/datum/gas/phoron]/total_moles
var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level)
aircontents = list(\
"pressure" = "[round(pressure,0.1)]",\
diff --git a/code/modules/xenoarcheaology/artifacts/artifact.dm b/code/modules/xenoarcheaology/artifacts/artifact.dm
index ea0f2f2f1ee..0edf7f94cb6 100644
--- a/code/modules/xenoarcheaology/artifacts/artifact.dm
+++ b/code/modules/xenoarcheaology/artifacts/artifact.dm
@@ -93,13 +93,13 @@
else if(env.temperature > 375)
trigger_hot = 1
- if(env.gas["phoron"] >= 10)
+ if(env.gas[/datum/gas/phoron] >= 10)
trigger_phoron = 1
- if(env.gas["oxygen"] >= 10)
+ if(env.gas[/datum/gas/oxygen] >= 10)
trigger_oxy = 1
- if(env.gas["carbon_dioxide"] >= 10)
+ if(env.gas[/datum/gas/carbon_dioxide] >= 10)
trigger_co2 = 1
- if(env.gas["nitrogen"] >= 10)
+ if(env.gas[/datum/gas/nitrogen] >= 10)
trigger_nitro = 1
//COLD ACTIVATION
diff --git a/maps/tether/tether_phoronlock.dm b/maps/tether/tether_phoronlock.dm
index b6dd6a3a0a7..28abae32428 100644
--- a/maps/tether/tether_phoronlock.dm
+++ b/maps/tether/tether_phoronlock.dm
@@ -23,7 +23,7 @@ obj/machinery/airlock_sensor/phoron/process()
if(on)
var/datum/gas_mixture_old/air_sample = return_air()
var/pressure = round(air_sample.return_pressure(), 0.1)
- var/phoron = ("phoron" in air_sample.gas) ? round(air_sample.gas["phoron"], 0.1) : 0
+ var/phoron = ("phoron" in air_sample.gas) ? round(air_sample.gas[/datum/gas/phoron], 0.1) : 0
if(abs(pressure - previousPressure) > 0.1 || previousPressure == null || abs(phoron - previousPhoron) > 0.1 || previousPhoron == null)
var/datum/signal/signal = new