Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528

[MIRROR] Minor refactor of how gas IDs are handled

code/modules/admin/verbs/debug.dm

@@ -715,8 +715,8 @@ GLOBAL_PROTECT(LastAdminCalledProc)
 		if(Rad.anchored)
 			if(!Rad.loaded_tank)
 				var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad)
-				ASSERT_GAS("plasma", Plasma.air_contents)
-				Plasma.air_contents.gases["plasma"][MOLES] = 70
+				ASSERT_GAS(/datum/gas/plasma, Plasma.air_contents)
+				Plasma.air_contents.gases[/datum/gas/plasma][MOLES] = 70
 				Rad.drainratio = 0
 				Rad.loaded_tank = Plasma
 				Plasma.loc = Rad

code/modules/assembly/bomb.dm

@@ -103,8 +103,8 @@
 	return
 
 /obj/item/tank/proc/ignite()	//This happens when a bomb is told to explode
-	air_contents.assert_gases("plasma", "o2")
-	var/fuel_moles = air_contents.gases["plasma"][MOLES] + air_contents.gases["o2"][MOLES]/6
+	air_contents.assert_gases(/datum/gas/plasma, /datum/gas/oxygen)
+	var/fuel_moles = air_contents.gases[/datum/gas/plasma][MOLES] + air_contents.gases[/datum/gas/oxygen][MOLES]/6
 	air_contents.garbage_collect()
 
 	var/strength = 1
@@ -160,4 +160,4 @@
 	if(!T)
 		return
 	T.assume_air(removed)
-	air_update_turf()
+	air_update_turf()

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -12,8 +12,8 @@
 	if(!air_contents)
 		return 0
 
-	var/oxy = air_contents.gases["o2"] ? air_contents.gases["o2"][MOLES] : 0
-	var/tox = air_contents.gases["plasma"] ? air_contents.gases["plasma"][MOLES] : 0
+	var/oxy = air_contents.gases[/datum/gas/oxygen] ? air_contents.gases[/datum/gas/oxygen][MOLES] : 0
+	var/tox = air_contents.gases[/datum/gas/plasma] ? air_contents.gases[/datum/gas/plasma][MOLES] : 0
 
 	if(active_hotspot)
 		if(soh)
@@ -112,7 +112,7 @@
 		qdel(src)
 		return
 
-	if(!(location.air) || !location.air.gases["plasma"] || !location.air.gases["o2"] || location.air.gases["plasma"][MOLES] < 0.5 || location.air.gases["o2"][MOLES] < 0.5)
+	if(!(location.air) || !location.air.gases[/datum/gas/plasma] || !location.air.gases[/datum/gas/oxygen] || location.air.gases[/datum/gas/plasma][MOLES] < 0.5 || location.air.gases[/datum/gas/oxygen][MOLES] < 0.5)
 		qdel(src)
 		return
 

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -268,8 +268,11 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 		gas -= "TEMP"
 	gases.Cut()
 	for(var/id in gas)
-		ADD_GAS(id, gases)
-		gases[id][MOLES] = text2num(gas[id])
+		var/path = id
+		if(!ispath(path))
+			path = gas_id2path(path) //a lot of these strings can't have embedded expressions (especially for mappers), so support for IDs needs to stick around
+		ADD_GAS(path, gases)
+		gases[path][MOLES] = text2num(gas[id])
 	return 1
 
 /datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)

code/modules/atmospherics/gasmixtures/gas_types.dm

@@ -1,9 +1,9 @@
-GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main four gases, which were at one time hardcoded
+GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/carbon_dioxide, /datum/gas/plasma)) //the main four gases, which were at one time hardcoded
 
 /proc/meta_gas_list()
-	. = new /list
-	for(var/gas_path in subtypesof(/datum/gas))
-		var/list/gas_info = new(5)
+	. = subtypesof(/datum/gas)
+	for(var/gas_path in .)
+		var/list/gas_info = new(6)
 		var/datum/gas/gas = gas_path
 
 		gas_info[META_GAS_SPECIFIC_HEAT] = initial(gas.specific_heat)
@@ -12,7 +12,14 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou
 		if(initial(gas.moles_visible) != null)
 			gas_info[META_GAS_OVERLAY] = new /obj/effect/overlay/gas(initial(gas.gas_overlay))
 		gas_info[META_GAS_DANGER] = initial(gas.dangerous)
-		.[initial(gas.id)] = gas_info
+		gas_info[META_GAS_ID] = initial(gas.id)
+		.[gas_path] = gas_info
+
+/proc/gas_id2path(id)
+	var/meta_gas = meta_gas_list()
+	for(var/path in meta_gas)
+		if(meta_gas[path][META_GAS_ID] == id)
+			return path
 
 /*||||||||||||||/----------\||||||||||||||*\
 ||||||||||||||||[GAS DATUMS]||||||||||||||||

code/modules/atmospherics/gasmixtures/immutable_mixtures.dm

@@ -69,8 +69,8 @@
 
 /datum/gas_mixture/immutable/cloner/garbage_collect()
 	..()
-	ADD_GAS("n2", gases)
-	gases["n2"][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
+	ADD_GAS(/datum/gas/nitrogen, gases)
+	gases[/datum/gas/nitrogen][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
 
 /datum/gas_mixture/immutable/cloner/heat_capacity()
 	return (MOLES_O2STANDARD + MOLES_N2STANDARD)*20 //specific heat of nitrogen is 20

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -44,21 +44,21 @@
 /datum/gas_reaction/agent_b/init_reqs()
 	min_requirements = list(
 		"TEMP" = 900,
-		"agent_b" = MINIMUM_HEAT_CAPACITY,
-		"plasma" = MINIMUM_HEAT_CAPACITY,
-		"co2" = MINIMUM_HEAT_CAPACITY
+		/datum/gas/oxygen_agent_b = MINIMUM_HEAT_CAPACITY,
+		/datum/gas/plasma = MINIMUM_HEAT_CAPACITY,
+		/datum/gas/carbon_dioxide = MINIMUM_HEAT_CAPACITY
 	)
 
 
 /datum/gas_reaction/agent_b/react(datum/gas_mixture/air)
 	var/list/cached_gases = air.gases
-	var/reaction_rate = min(cached_gases["co2"][MOLES]*0.75, cached_gases["plasma"][MOLES]*0.25, cached_gases["agent_b"][MOLES]*0.05)
+	var/reaction_rate = min(cached_gases[/datum/gas/carbon_dioxide][MOLES]*0.75, cached_gases[/datum/gas/plasma][MOLES]*0.25, cached_gases[/datum/gas/oxygen_agent_b][MOLES]*0.05)
 
-	cached_gases["co2"][MOLES] -= reaction_rate
-	cached_gases["agent_b"][MOLES] -= reaction_rate*0.05
+	cached_gases[/datum/gas/carbon_dioxide][MOLES] -= reaction_rate
+	cached_gases[/datum/gas/oxygen_agent_b][MOLES] -= reaction_rate*0.05
 
-	ASSERT_GAS("o2", air) //only need to assert oxygen, as this reaction doesn't occur without the other gases existing
-	cached_gases["o2"][MOLES] += reaction_rate
+	ASSERT_GAS(/datum/gas/oxygen, air) //only need to assert oxygen, as this reaction doesn't occur without the other gases existing
+	cached_gases[/datum/gas/oxygen][MOLES] += reaction_rate
 
 	air.temperature -= (reaction_rate*20000)/air.heat_capacity()
 
@@ -71,7 +71,7 @@
 	id = "freon"
 
 /datum/gas_reaction/freon/init_reqs()
-	min_requirements = list("freon" = MOLES_PLASMA_VISIBLE)
+	min_requirements = list(/datum/gas/freon = MOLES_PLASMA_VISIBLE)
 
 /datum/gas_reaction/freon/react(datum/gas_mixture/air, turf/open/location)
 	. = NO_REACTION
@@ -85,12 +85,12 @@
 	id = "vapor"
 
 /datum/gas_reaction/water_vapor/init_reqs()
-	min_requirements = list("water_vapor" = MOLES_PLASMA_VISIBLE)
+	min_requirements = list(/datum/gas/water_vapor = MOLES_PLASMA_VISIBLE)
 
 /datum/gas_reaction/water_vapor/react(datum/gas_mixture/air, turf/open/location)
 	. = NO_REACTION
 	if(location && location.water_vapor_gas_act())
-		air.gases["water_vapor"][MOLES] -= MOLES_PLASMA_VISIBLE
+		air.gases[/datum/gas/water_vapor][MOLES] -= MOLES_PLASMA_VISIBLE
 		. = REACTING
 
 //fire: combustion of plasma and volatile fuel (treated as hydrocarbons). creates hotspots. exothermic
@@ -111,28 +111,28 @@
 	cached_results[id] = 0
 
 	//General volatile gas burn
-	if(cached_gases["v_fuel"] && cached_gases["v_fuel"][MOLES])
+	if(cached_gases[/datum/gas/volatile_fuel] && cached_gases[/datum/gas/volatile_fuel][MOLES])
 		var/burned_fuel
-		if(!cached_gases["o2"])
+		if(!cached_gases[/datum/gas/oxygen])
 			burned_fuel = 0
-		else if(cached_gases["o2"][MOLES] < cached_gases["v_fuel"][MOLES])
-			burned_fuel = cached_gases["o2"][MOLES]
-			cached_gases["v_fuel"][MOLES] -= burned_fuel
-			cached_gases["o2"][MOLES] = 0
+		else if(cached_gases[/datum/gas/oxygen][MOLES] < cached_gases[/datum/gas/volatile_fuel][MOLES])
+			burned_fuel = cached_gases[/datum/gas/oxygen][MOLES]
+			cached_gases[/datum/gas/volatile_fuel][MOLES] -= burned_fuel
+			cached_gases[/datum/gas/oxygen][MOLES] = 0
 		else
-			burned_fuel = cached_gases["v_fuel"][MOLES]
-			cached_gases["o2"][MOLES] -= cached_gases["v_fuel"][MOLES]
+			burned_fuel = cached_gases[/datum/gas/volatile_fuel][MOLES]
+			cached_gases[/datum/gas/oxygen][MOLES] -= cached_gases[/datum/gas/volatile_fuel][MOLES]
 
 		if(burned_fuel)
 			energy_released += FIRE_CARBON_ENERGY_RELEASED * burned_fuel
 
-			ASSERT_GAS("co2", air)
-			cached_gases["co2"][MOLES] += burned_fuel
+			ASSERT_GAS(/datum/gas/carbon_dioxide, air)
+			cached_gases[/datum/gas/carbon_dioxide][MOLES] += burned_fuel
 
 			cached_results[id] += burned_fuel
 
 	//Handle plasma burning
-	if(cached_gases["plasma"] && cached_gases["plasma"][MOLES] > MINIMUM_HEAT_CAPACITY)
+	if(cached_gases[/datum/gas/plasma] && cached_gases[/datum/gas/plasma][MOLES] > MINIMUM_HEAT_CAPACITY)
 		var/plasma_burn_rate = 0
 		var/oxygen_burn_rate = 0
 		//more plasma released at higher temperatures
@@ -142,17 +142,17 @@
 		else
 			temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE)
 		if(temperature_scale > 0)
-			ASSERT_GAS("o2", air)
+			ASSERT_GAS(/datum/gas/oxygen, air)
 			oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale
-			if(cached_gases["o2"][MOLES] > cached_gases["plasma"][MOLES]*PLASMA_OXYGEN_FULLBURN)
-				plasma_burn_rate = (cached_gases["plasma"][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA
+			if(cached_gases[/datum/gas/oxygen][MOLES] > cached_gases[/datum/gas/plasma][MOLES]*PLASMA_OXYGEN_FULLBURN)
+				plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA
 			else
-				plasma_burn_rate = (temperature_scale*(cached_gases["o2"][MOLES]/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA
+				plasma_burn_rate = (temperature_scale*(cached_gases[/datum/gas/oxygen][MOLES]/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA
 			if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY)
-				ASSERT_GAS("co2", air)
-				cached_gases["plasma"][MOLES] = QUANTIZE(cached_gases["plasma"][MOLES] - plasma_burn_rate)
-				cached_gases["o2"][MOLES] = QUANTIZE(cached_gases["o2"][MOLES] - (plasma_burn_rate * oxygen_burn_rate))
-				cached_gases["co2"][MOLES] += plasma_burn_rate
+				ASSERT_GAS(/datum/gas/carbon_dioxide, air)
+				cached_gases[/datum/gas/plasma][MOLES] = QUANTIZE(cached_gases[/datum/gas/plasma][MOLES] - plasma_burn_rate)
+				cached_gases[/datum/gas/oxygen][MOLES] = QUANTIZE(cached_gases[/datum/gas/oxygen][MOLES] - (plasma_burn_rate * oxygen_burn_rate))
+				cached_gases[/datum/gas/carbon_dioxide][MOLES] += plasma_burn_rate
 
 				energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate)
 
@@ -185,36 +185,36 @@
 /datum/gas_reaction/fusion/init_reqs()
 	min_requirements = list(
 		"ENER" = PLASMA_BINDING_ENERGY * 10,
-		"plasma" = MINIMUM_HEAT_CAPACITY,
-		"co2" = MINIMUM_HEAT_CAPACITY
+		/datum/gas/plasma = MINIMUM_HEAT_CAPACITY,
+		/datum/gas/carbon_dioxide = MINIMUM_HEAT_CAPACITY
 	)
 
 /datum/gas_reaction/fusion/react(datum/gas_mixture/air)
 	var/list/cached_gases = air.gases
 	var/temperature = air.temperature
 
-	if((cached_gases["plasma"][MOLES]+cached_gases["co2"][MOLES])/air.total_moles() < FUSION_PURITY_THRESHOLD)
+	if((cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/carbon_dioxide][MOLES])/air.total_moles() < FUSION_PURITY_THRESHOLD)
 		//Fusion wont occur if the level of impurities is too high.
 		return NO_REACTION
 
 	var/old_heat_capacity = air.heat_capacity()
-	var/carbon_efficency = min(cached_gases["plasma"][MOLES]/cached_gases["co2"][MOLES],MAX_CARBON_EFFICENCY)
+	var/carbon_efficency = min(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/carbon_dioxide][MOLES],MAX_CARBON_EFFICENCY)
 	var/reaction_energy = THERMAL_ENERGY(air)
-	var/moles_impurities = air.total_moles()-(cached_gases["plasma"][MOLES]+cached_gases["co2"][MOLES])
+	var/moles_impurities = air.total_moles()-(cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/carbon_dioxide][MOLES])
 
 	var/plasma_fused = (PLASMA_FUSED_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY)
 	var/carbon_catalyzed = (CARBON_CATALYST_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY)
 	var/oxygen_added = carbon_catalyzed
 	var/nitrogen_added = (plasma_fused-oxygen_added)-(THERMAL_ENERGY(air)/PLASMA_BINDING_ENERGY)
 
-	reaction_energy = max(reaction_energy+((carbon_efficency*cached_gases["plasma"][MOLES])/((moles_impurities/carbon_efficency)+2)*10)+((plasma_fused/(moles_impurities/carbon_efficency))*PLASMA_BINDING_ENERGY),0)
+	reaction_energy = max(reaction_energy+((carbon_efficency*cached_gases[/datum/gas/plasma][MOLES])/((moles_impurities/carbon_efficency)+2)*10)+((plasma_fused/(moles_impurities/carbon_efficency))*PLASMA_BINDING_ENERGY),0)
 
-	air.assert_gases("o2", "n2")
+	air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
 
-	cached_gases["plasma"][MOLES] -= plasma_fused
-	cached_gases["co2"][MOLES] -= carbon_catalyzed
-	cached_gases["o2"][MOLES] += oxygen_added
-	cached_gases["n2"][MOLES] += nitrogen_added
+	cached_gases[/datum/gas/plasma][MOLES] -= plasma_fused
+	cached_gases[/datum/gas/carbon_dioxide][MOLES] -= carbon_catalyzed
+	cached_gases[/datum/gas/oxygen][MOLES] += oxygen_added
+	cached_gases[/datum/gas/nitrogen][MOLES] += nitrogen_added
 
 	if(reaction_energy > 0)
 		var/new_heat_capacity = air.heat_capacity()

code/modules/atmospherics/machinery/airalarm.dm

@@ -73,44 +73,44 @@
 	var/datum/radio_frequency/radio_connection
 
 	var/list/TLV = list( // Breathable air.
-		"pressure"		= new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE*  0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
-		"temperature"	= new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), // K
-		"o2"			= new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
-		"n2"			= new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
-		"co2" 			= new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
-		"plasma"		= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		"n2o"			= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		"bz"			= new/datum/tlv(-1, -1, 0.2, 0.5),
-		"freon"			= new/datum/tlv(-1, -1, 0.2, 0.5),
-		"water_vapor"	= new/datum/tlv(-1, -1, 0.2, 0.5)
+		"pressure"					= new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE*  0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
+		"temperature"				= new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), // K
+		/datum/gas/oxygen			= new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
+		/datum/gas/nitrogen			= new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
+		/datum/gas/carbon_dioxide	= new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
+		/datum/gas/plasma			= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
+		/datum/gas/nitrous_oxide	= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
+		/datum/gas/bz				= new/datum/tlv(-1, -1, 0.2, 0.5),
+		/datum/gas/freon			= new/datum/tlv(-1, -1, 0.2, 0.5),
+		/datum/gas/water_vapor		= new/datum/tlv(-1, -1, 0.2, 0.5)
 	)
 
 /obj/machinery/airalarm/server // No checks here.
 	TLV = list(
-		"pressure"		= new/datum/tlv(-1, -1, -1, -1),
-		"temperature"	= new/datum/tlv(-1, -1, -1, -1),
-		"o2"			= new/datum/tlv(-1, -1, -1, -1),
-		"n2"			= new/datum/tlv(-1, -1, -1, -1),
-		"co2"			= new/datum/tlv(-1, -1, -1, -1),
-		"plasma"		= new/datum/tlv(-1, -1, -1, -1),
-		"n2o"			= new/datum/tlv(-1, -1, -1, -1),
-		"bz"			= new/datum/tlv(-1, -1, -1, -1),
-		"freon"			= new/datum/tlv(-1, -1, -1, -1),
-		"water_vapor"	= new/datum/tlv(-1, -1, -1, -1)
+		"pressure"					= new/datum/tlv(-1, -1, -1, -1),
+		"temperature"				= new/datum/tlv(-1, -1, -1, -1),
+		/datum/gas/oxygen			= new/datum/tlv(-1, -1, -1, -1),
+		/datum/gas/nitrogen			= new/datum/tlv(-1, -1, -1, -1),
+		/datum/gas/carbon_dioxide	= new/datum/tlv(-1, -1, -1, -1),
+		/datum/gas/plasma			= new/datum/tlv(-1, -1, -1, -1),
+		/datum/gas/nitrous_oxide	= new/datum/tlv(-1, -1, -1, -1),
+		/datum/gas/bz				= new/datum/tlv(-1, -1, -1, -1),
+		/datum/gas/freon			= new/datum/tlv(-1, -1, -1, -1),
+		/datum/gas/water_vapor		= new/datum/tlv(-1, -1, -1, -1)
 	)
 
 /obj/machinery/airalarm/kitchen_cold_room // Copypasta: to check temperatures.
 	TLV = list(
-		"pressure"		= new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE*  0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
-		"temperature"	= new/datum/tlv(200,210,273.15,283.15), // K
-		"o2"			= new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
-		"n2"			= new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
-		"co2" 			= new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
-		"plasma"		= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		"n2o"			= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		"bz"			= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		"freon"			= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		"water_vapor"	= new/datum/tlv(-1, -1, 0.2, 0.5)
+		"pressure"					= new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE*  0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
+		"temperature"				= new/datum/tlv(200,210,273.15,283.15), // K
+		/datum/gas/oxygen			= new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
+		/datum/gas/nitrogen			= new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
+		/datum/gas/carbon_dioxide	= new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
+		/datum/gas/plasma			= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
+		/datum/gas/nitrous_oxide	= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
+		/datum/gas/bz				= new/datum/tlv(-1, -1, 0.2, 0.5),
+		/datum/gas/freon			= new/datum/tlv(-1, -1, 0.2, 0.5),
+		/datum/gas/water_vapor		= new/datum/tlv(-1, -1, 0.2, 0.5)
 	)
 
 /obj/machinery/airalarm/engine
@@ -760,4 +760,4 @@
 #undef AALARM_MODE_SIPHON
 #undef AALARM_MODE_CONTAMINATED
 #undef AALARM_MODE_REFILL
-#undef AALARM_REPORT_TIMEOUT
+#undef AALARM_REPORT_TIMEOUT

code/modules/atmospherics/machinery/components/trinary_devices/filter.dm

@@ -6,7 +6,7 @@
 	can_unwrench = TRUE
 	var/on = FALSE
 	var/target_pressure = ONE_ATMOSPHERE
-	var/filter_type = ""
+	var/filter_type = null
 	var/frequency = 0
 	var/datum/radio_frequency/radio_connection
 
@@ -28,6 +28,11 @@
 	if(frequency)
 		radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_ATMOSIA)
 
+/obj/machinery/atmospherics/components/trinary/filter/New()
+	..()
+	if(istext(filter_type))
+		filter_type = gas_id2path(filter_type) //support for mappers so they don't need to type out paths
+
 /obj/machinery/atmospherics/components/trinary/filter/Destroy()
 	SSradio.remove_object(src,frequency)
 	return ..()
@@ -86,9 +91,8 @@
 		if(!removed)
 			return
 
-		var/filtering = filter_type ? TRUE : FALSE
-
-		if(filtering && !istext(filter_type))
+		var/filtering = TRUE
+		if(!ispath(filter_type))
 			WARNING("Wrong gas ID in [src]'s filter_type var. filter_type == [filter_type]")
 			filtering = FALSE
 
@@ -124,7 +128,7 @@
 	data["on"] = on
 	data["pressure"] = round(target_pressure)
 	data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
-	data["filter_type"] = filter_type
+	data["filter_type"] = "[filter_type]"
 	return data
 
 /obj/machinery/atmospherics/components/trinary/filter/ui_act(action, params)
@@ -151,9 +155,9 @@
 				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
 				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
 		if("filter")
-			filter_type = ""
+			filter_type = null
 			var/filter_name = "nothing"
-			var/gas = params["mode"]
+			var/gas = text2path(params["mode"])
 			if(gas in GLOB.meta_gas_info)
 				filter_type = gas
 				filter_name	= GLOB.meta_gas_info[gas][META_GAS_NAME]

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -187,7 +187,7 @@
 			if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic.
 				beaker.reagents.trans_to(occupant, 1, 10 * efficiency) // Transfer reagents, multiplied because cryo magic.
 				beaker.reagents.reaction(occupant, VAPOR)
-				air1.gases["o2"][MOLES] -= 2 / efficiency // Lets use gas for this.
+				air1.gases[/datum/gas/oxygen][MOLES] -= 2 / efficiency //Let's use gas for this
 			if(++reagent_transfer >= 10 * efficiency) // Throttle reagent transfer (higher efficiency will transfer the same amount but consume less from the beaker).
 				reagent_transfer = 0
 
@@ -201,7 +201,7 @@
 
 	var/datum/gas_mixture/air1 = AIR1
 
-	if(!NODE1 || !AIR1 || !air1.gases.len || air1.gases["o2"][MOLES] < 5) // Turn off if the machine won't work.
+	if(!NODE1 || !AIR1 || !air1.gases.len || air1.gases[/datum/gas/oxygen][MOLES] < 5) // Turn off if the machine won't work.
 		on = FALSE
 		update_icon()
 		return
@@ -221,7 +221,7 @@
 			air1.temperature = max(air1.temperature - heat / air_heat_capacity, TCMB)
 			mob_occupant.bodytemperature = max(mob_occupant.bodytemperature + heat / heat_capacity, TCMB)
 
-		air1.gases["o2"][MOLES] -= 0.5 / efficiency // Magically consume gas? Why not, we run on cryo magic.
+		air1.gases[/datum/gas/oxygen][MOLES] -= 0.5 / efficiency // Magically consume gas? Why not, we run on cryo magic.
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/power_change()
 	..()

code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm

@@ -49,8 +49,8 @@
 		var/added_oxygen = oxygen_content - total_moles
 
 		air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen)
-		ASSERT_GAS("o2", air_contents)
-		air_contents.gases["o2"][MOLES] += added_oxygen
+		ASSERT_GAS(/datum/gas/oxygen, air_contents)
+		air_contents.gases[/datum/gas/oxygen][MOLES] += added_oxygen
 
 		update_parents()
 

code/modules/atmospherics/machinery/components/unary_devices/tank.dm

@@ -21,23 +21,23 @@
 		name = "[name] ([air_contents.gases[gas_type][GAS_META][META_GAS_NAME]])"
 
 /obj/machinery/atmospherics/components/unary/tank/carbon_dioxide
-	gas_type = "co2"
+	gas_type = /datum/gas/carbon_dioxide
 
 /obj/machinery/atmospherics/components/unary/tank/toxins
 	icon_state = "orange"
-	gas_type = "plasma"
+	gas_type = /datum/gas/plasma
 
 /obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b
 	icon_state = "orange_2"
-	gas_type = "agent_b"
+	gas_type = /datum/gas/oxygen_agent_b
 
 /obj/machinery/atmospherics/components/unary/tank/oxygen
 	icon_state = "blue"
-	gas_type = "o2"
+	gas_type = /datum/gas/oxygen
 
 /obj/machinery/atmospherics/components/unary/tank/nitrogen
 	icon_state = "red"
-	gas_type = "n2"
+	gas_type = /datum/gas/nitrogen
 
 /obj/machinery/atmospherics/components/unary/tank/air
 	icon_state = "grey"
@@ -46,6 +46,6 @@
 /obj/machinery/atmospherics/components/unary/tank/air/New()
 	..()
 	var/datum/gas_mixture/air_contents = AIR1
-	air_contents.assert_gases("o2", "n2")
-	air_contents.gases["o2"][MOLES] = AIR_CONTENTS * 0.2
-	air_contents.gases["n2"][MOLES] = AIR_CONTENTS * 0.8
+	air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
+	air_contents.gases[/datum/gas/oxygen][MOLES] = AIR_CONTENTS * 0.2
+	air_contents.gases[/datum/gas/nitrogen][MOLES] = AIR_CONTENTS * 0.8

code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm

@@ -174,7 +174,7 @@
 	if(scrubbing & SCRUBBING)
 		var/should_we_scrub = FALSE
 		for(var/id in env_gases)
-			if(id == "n2" || id == "o2")
+			if(id == /datum/gas/nitrogen || id == /datum/gas/oxygen)
 				continue
 			if(env_gases[id][MOLES])
 				should_we_scrub = TRUE
@@ -194,40 +194,40 @@
 			var/list/filtered_gases = filtered_out.gases
 			filtered_out.temperature = removed.temperature
 
-			if(scrub_Toxins && removed_gases["plasma"])
-				ADD_GAS("plasma", filtered_out.gases)
-				filtered_gases["plasma"][MOLES] = removed_gases["plasma"][MOLES]
-				removed.gases["plasma"][MOLES] = 0
+			if(scrub_Toxins && removed_gases[/datum/gas/plasma])
+				ADD_GAS(/datum/gas/plasma, filtered_out.gases)
+				filtered_gases[/datum/gas/plasma][MOLES] = removed_gases[/datum/gas/plasma][MOLES]
+				removed_gases[/datum/gas/plasma][MOLES] = 0
 
-			if(scrub_CO2 && removed_gases["co2"])
-				ADD_GAS("co2", filtered_out.gases)
-				filtered_gases["co2"][MOLES] = removed_gases["co2"][MOLES]
-				removed_gases["co2"][MOLES] = 0
+			if(scrub_CO2 && removed_gases[/datum/gas/carbon_dioxide])
+				ADD_GAS(/datum/gas/carbon_dioxide, filtered_out.gases)
+				filtered_gases[/datum/gas/carbon_dioxide][MOLES] = removed_gases[/datum/gas/carbon_dioxide][MOLES]
+				removed_gases[/datum/gas/carbon_dioxide][MOLES] = 0
 
-			if(removed_gases["agent_b"])
-				ADD_GAS("agent_b", filtered_out.gases)
-				filtered_gases["agent_b"][MOLES] = removed_gases["agent_b"][MOLES]
-				removed_gases["agent_b"][MOLES] = 0
+			if(removed_gases[/datum/gas/oxygen_agent_b])
+				ADD_GAS(/datum/gas/oxygen_agent_b, filtered_out.gases)
+				filtered_gases[/datum/gas/oxygen_agent_b][MOLES] = removed_gases[/datum/gas/oxygen_agent_b][MOLES]
+				removed_gases[/datum/gas/oxygen_agent_b][MOLES] = 0
 
-			if(scrub_N2O && removed_gases["n2o"])
-				ADD_GAS("n2o", filtered_out.gases)
-				filtered_gases["n2o"][MOLES] = removed_gases["n2o"][MOLES]
-				removed_gases["n2o"][MOLES] = 0
+			if(scrub_N2O && removed_gases[/datum/gas/nitrous_oxide])
+				ADD_GAS(/datum/gas/nitrous_oxide, filtered_out.gases)
+				filtered_gases[/datum/gas/nitrous_oxide][MOLES] = removed_gases[/datum/gas/nitrous_oxide][MOLES]
+				removed_gases[/datum/gas/nitrous_oxide][MOLES] = 0
 
-			if(scrub_BZ && removed_gases["bz"])
-				ADD_GAS("bz", filtered_out.gases)
-				filtered_gases["bz"][MOLES] = removed_gases["bz"][MOLES]
-				removed_gases["bz"][MOLES] = 0
+			if(scrub_BZ && removed_gases[/datum/gas/bz])
+				ADD_GAS(/datum/gas/bz, filtered_out.gases)
+				filtered_gases[/datum/gas/bz][MOLES] = removed_gases[/datum/gas/bz][MOLES]
+				removed_gases[/datum/gas/bz][MOLES] = 0
 
-			if(scrub_Freon && removed_gases["freon"])
-				ADD_GAS("freon", filtered_out.gases)
-				filtered_gases["freon"][MOLES] = removed_gases["freon"][MOLES]
-				removed_gases["freon"][MOLES] = 0
+			if(scrub_Freon && removed_gases[/datum/gas/freon])
+				ADD_GAS(/datum/gas/freon, filtered_out.gases)
+				filtered_gases[/datum/gas/freon][MOLES] = removed_gases[/datum/gas/freon][MOLES]
+				removed_gases[/datum/gas/freon][MOLES] = 0
 
-			if(scrub_WaterVapor && removed_gases["water_vapor"])
-				ADD_GAS("water_vapor", filtered_out.gases)
-				filtered_gases["water_vapor"][MOLES] = removed_gases["water_vapor"][MOLES]
-				removed_gases["water_vapor"][MOLES] = 0
+			if(scrub_WaterVapor && removed_gases[/datum/gas/water_vapor])
+				ADD_GAS(/datum/gas/water_vapor, filtered_out.gases)
+				filtered_gases[/datum/gas/water_vapor][MOLES] = removed_gases[/datum/gas/water_vapor][MOLES]
+				removed_gases[/datum/gas/water_vapor][MOLES] = 0
 
 			removed.garbage_collect()
 

code/modules/atmospherics/machinery/other/miner.dm

@@ -146,49 +146,49 @@
 /obj/machinery/atmospherics/miner/n2o
 	name = "\improper N2O Gas Miner"
 	overlay_color = "#FFCCCC"
-	spawn_id = "n2o"
+	spawn_id = /datum/gas/nitrous_oxide
 
 /obj/machinery/atmospherics/miner/nitrogen
 	name = "\improper N2 Gas Miner"
 	overlay_color = "#CCFFCC"
-	spawn_id = "n2"
+	spawn_id = /datum/gas/nitrogen
 
 /obj/machinery/atmospherics/miner/oxygen
 	name = "\improper O2 Gas Miner"
 	overlay_color = "#007FFF"
-	spawn_id = "o2"
+	spawn_id = /datum/gas/oxygen
 
 /obj/machinery/atmospherics/miner/toxins
 	name = "\improper Plasma Gas Miner"
 	overlay_color = "#FF0000"
-	spawn_id = "plasma"
+	spawn_id = /datum/gas/plasma
 
 /obj/machinery/atmospherics/miner/carbon_dioxide
 	name = "\improper CO2 Gas Miner"
 	overlay_color = "#CDCDCD"
-	spawn_id = "co2"
+	spawn_id = /datum/gas/carbon_dioxide
 
 /obj/machinery/atmospherics/miner/bz
 	name = "\improper BZ Gas Miner"
 	overlay_color = "#FAFF00"
-	spawn_id = "bz"
+	spawn_id = /datum/gas/bz
 
 /obj/machinery/atmospherics/miner/freon
 	name = "\improper Freon Gas Miner"
 	overlay_color = "#00FFE5"
-	spawn_id = "freon"
+	spawn_id = /datum/gas/freon
 
 /obj/machinery/atmospherics/miner/volatile_fuel
 	name = "\improper Volatile Fuel Gas Miner"
 	overlay_color = "#564040"
-	spawn_id = "v_fuel"
+	spawn_id = /datum/gas/volatile_fuel
 
 /obj/machinery/atmospherics/miner/agent_b
 	name = "\improper Agent B Gas Miner"
 	overlay_color = "#E81E24"
-	spawn_id = "agent_b"
+	spawn_id = /datum/gas/oxygen_agent_b
 
 /obj/machinery/atmospherics/miner/water_vapor
 	name = "\improper Water Vapor Gas Miner"
 	overlay_color = "#99928E"
-	spawn_id = "water_vapor"
+	spawn_id = /datum/gas/water_vapor

code/modules/atmospherics/machinery/portable/canister.dm

@@ -12,7 +12,7 @@
 
 	volume = 1000
 	var/filled = 0.5
-	var/gas_type = ""
+	var/gas_type
 	var/release_pressure = ONE_ATMOSPHERE
 	var/can_max_release_pressure = (ONE_ATMOSPHERE * 10)
 	var/can_min_release_pressure = (ONE_ATMOSPHERE / 10)
@@ -59,42 +59,42 @@
 	name = "n2 canister"
 	desc = "Nitrogen gas. Reportedly useful for something."
 	icon_state = "red"
-	gas_type = "n2"
+	gas_type = /datum/gas/nitrogen
 
 /obj/machinery/portable_atmospherics/canister/oxygen
 	name = "o2 canister"
 	desc = "Oxygen. Necessary for human life."
 	icon_state = "blue"
-	gas_type = "o2"
+	gas_type = /datum/gas/oxygen
 
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide
 	name = "co2 canister"
 	desc = "Carbon dioxide. What the fuck is carbon dioxide?"
 	icon_state = "black"
-	gas_type = "co2"
+	gas_type = /datum/gas/carbon_dioxide
 
 /obj/machinery/portable_atmospherics/canister/toxins
 	name = "plasma canister"
 	desc = "Plasma gas. The reason YOU are here. Highly toxic."
 	icon_state = "orange"
-	gas_type = "plasma"
+	gas_type = /datum/gas/plasma
 
 /obj/machinery/portable_atmospherics/canister/agent_b
 	name = "agent b canister"
 	desc = "Oxygen Agent B. You're not quite sure what it does."
-	gas_type = "agent_b"
+	gas_type = /datum/gas/oxygen_agent_b
 
 /obj/machinery/portable_atmospherics/canister/bz
 	name = "BZ canister"
 	desc = "BZ, a powerful hallucinogenic nerve agent."
 	icon_state = "purple"
-	gas_type = "bz"
+	gas_type = /datum/gas/bz
 
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide
 	name = "n2o canister"
 	desc = "Nitrous oxide gas. Known to cause drowsiness."
 	icon_state = "redws"
-	gas_type = "n2o"
+	gas_type = /datum/gas/nitrous_oxide
 
 /obj/machinery/portable_atmospherics/canister/air
 	name = "air canister"
@@ -105,14 +105,14 @@
 	name = "freon canister"
 	desc = "Freon. Great for the atmosphere!"
 	icon_state = "freon"
-	gas_type = "freon"
+	gas_type = /datum/gas/freon
 	starter_temp = 120
 
 /obj/machinery/portable_atmospherics/canister/water_vapor
 	name = "water vapor canister"
 	desc = "Water Vapor. We get it, you vape."
 	icon_state = "water_vapor"
-	gas_type = "water_vapor"
+	gas_type = /datum/gas/water_vapor
 	filled = 1
 
 /obj/machinery/portable_atmospherics/canister/proc/get_time_left()
@@ -148,7 +148,7 @@
 	name = "prototype canister"
 	desc = "A prototype canister for a prototype bike, what could go wrong?"
 	icon_state = "proto"
-	gas_type = "o2"
+	gas_type = /datum/gas/oxygen
 	filled = 1
 	release_pressure = ONE_ATMOSPHERE*2
 
@@ -181,9 +181,9 @@
 		if(starter_temp)
 			air_contents.temperature = starter_temp
 /obj/machinery/portable_atmospherics/canister/air/create_gas()
-	air_contents.add_gases("o2","n2")
-	air_contents.gases["o2"][MOLES] = (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
-	air_contents.gases["n2"][MOLES] = (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
+	air_contents.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
+	air_contents.gases[/datum/gas/oxygen][MOLES] = (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
+	air_contents.gases[/datum/gas/nitrogen][MOLES] = (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
 
 #define HOLDING 1
 #define CONNECTED 2

code/modules/atmospherics/machinery/portable/pump.dm

@@ -99,8 +99,8 @@
 		if("power")
 			on = !on
 			if(on && !holding)
-				var/plasma = air_contents.gases["plasma"]
-				var/n2o = air_contents.gases["n2o"]
+				var/plasma = air_contents.gases[/datum/gas/plasma]
+				var/n2o = air_contents.gases[/datum/gas/nitrous_oxide]
 				if(n2o || plasma)
 					var/area/A = get_area(src)
 					message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [A][ADMIN_JMP(src)]")
@@ -138,4 +138,4 @@
 				holding.loc = get_turf(src)
 				holding = null
 				. = TRUE
-	update_icon()
+	update_icon()

code/modules/atmospherics/machinery/portable/scrubber.dm

@@ -7,7 +7,7 @@
 	var/volume_rate = 1000
 	volume = 1000
 
-	var/list/scrubbing = list("plasma", "co2", "n2o", "agent_b", "bz", "freon", "water_vapor")
+	var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/oxygen_agent_b, /datum/gas/bz, /datum/gas/freon, /datum/gas/water_vapor)
 
 /obj/machinery/portable_atmospherics/scrubber/Destroy()
 	var/turf/T = get_turf(src)

code/modules/events/spacevine.dm

@@ -167,9 +167,9 @@
 	var/turf/open/floor/T = holder.loc
 	if(istype(T))
 		var/datum/gas_mixture/GM = T.air
-		if(!GM.gases["o2"])
+		if(!GM.gases[/datum/gas/oxygen])
 			return
-		GM.gases["o2"][MOLES] -= severity * holder.energy
+		GM.gases[/datum/gas/oxygen][MOLES] -= severity * holder.energy
 		GM.garbage_collect()
 
 /datum/spacevine_mutation/nitro_eater
@@ -182,9 +182,9 @@
 	var/turf/open/floor/T = holder.loc
 	if(istype(T))
 		var/datum/gas_mixture/GM = T.air
-		if(!GM.gases["n2"])
+		if(!GM.gases[/datum/gas/nitrogen])
 			return
-		GM.gases["n2"][MOLES] -= severity * holder.energy
+		GM.gases[/datum/gas/nitrogen][MOLES] -= severity * holder.energy
 		GM.garbage_collect()
 
 /datum/spacevine_mutation/carbondioxide_eater
@@ -197,9 +197,9 @@
 	var/turf/open/floor/T = holder.loc
 	if(istype(T))
 		var/datum/gas_mixture/GM = T.air
-		if(!GM.gases["co2"])
+		if(!GM.gases[/datum/gas/carbon_dioxide])
 			return
-		GM.gases["co2"][MOLES] -= severity * holder.energy
+		GM.gases[/datum/gas/carbon_dioxide][MOLES] -= severity * holder.energy
 		GM.garbage_collect()
 
 /datum/spacevine_mutation/plasma_eater
@@ -212,9 +212,9 @@
 	var/turf/open/floor/T = holder.loc
 	if(istype(T))
 		var/datum/gas_mixture/GM = T.air
-		if(!GM.gases["plasma"])
+		if(!GM.gases[/datum/gas/plasma])
 			return
-		GM.gases["plasma"][MOLES] -= severity * holder.energy
+		GM.gases[/datum/gas/plasma][MOLES] -= severity * holder.energy
 		GM.garbage_collect()
 
 /datum/spacevine_mutation/thorns

code/modules/hydroponics/grown/towercap.dm

@@ -181,8 +181,8 @@
 	if(isopenturf(loc))
 		var/turf/open/O = loc
 		if(O.air)
-			var/G = O.air.gases
-			if(G["o2"][MOLES] > 13)
+			var/loc_gases = O.air.gases
+			if(loc_gases[/datum/gas/oxygen][MOLES] > 13)
 				return 1
 	return 0
 

code/modules/mob/living/carbon/alien/life.dm

@@ -1,54 +1,54 @@
-/mob/living/carbon/alien/Life()
-	findQueen()
-	return..()
-
-/mob/living/carbon/alien/check_breath(datum/gas_mixture/breath)
-	if(status_flags & GODMODE)
-		return
-
-	if(!breath || (breath.total_moles() == 0))
-		//Aliens breathe in vaccuum
-		return 0
-
-	var/toxins_used = 0
-	var/tox_detect_threshold = 0.02
-	var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
-	var/list/breath_gases = breath.gases
-
-	breath.assert_gases("plasma", "o2")
-
-	//Partial pressure of the toxins in our breath
-	var/Toxins_pp = (breath_gases["plasma"][MOLES]/breath.total_moles())*breath_pressure
-
-	if(Toxins_pp > tox_detect_threshold) // Detect toxins in air
-		adjustPlasma(breath_gases["plasma"][MOLES]*250)
-		throw_alert("alien_tox", /obj/screen/alert/alien_tox)
-
-		toxins_used = breath_gases["plasma"][MOLES]
-
-	else
-		clear_alert("alien_tox")
-
-	//Breathe in toxins and out oxygen
-	breath_gases["plasma"][MOLES] -= toxins_used
-	breath_gases["o2"][MOLES] += toxins_used
-
-	breath.garbage_collect()
-
-	//BREATH TEMPERATURE
-	handle_breath_temperature(breath)
-
-/mob/living/carbon/alien/handle_status_effects()
-	..()
-	//natural reduction of movement delay due to stun.
-	if(move_delay_add > 0)
-		move_delay_add = max(0, move_delay_add - rand(1, 2))
-
-/mob/living/carbon/alien/handle_changeling()
-	return
-
-/mob/living/carbon/alien/handle_fire()//Aliens on fire code
-	if(..())
-		return
-	bodytemperature += BODYTEMP_HEATING_MAX //If you're on fire, you heat up!
-	return
+/mob/living/carbon/alien/Life()
+	findQueen()
+	return..()
+
+/mob/living/carbon/alien/check_breath(datum/gas_mixture/breath)
+	if(status_flags & GODMODE)
+		return
+
+	if(!breath || (breath.total_moles() == 0))
+		//Aliens breathe in vaccuum
+		return 0
+
+	var/toxins_used = 0
+	var/tox_detect_threshold = 0.02
+	var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
+	var/list/breath_gases = breath.gases
+
+	breath.assert_gases(/datum/gas/plasma, /datum/gas/oxygen)
+
+	//Partial pressure of the toxins in our breath
+	var/Toxins_pp = (breath_gases[/datum/gas/plasma][MOLES]/breath.total_moles())*breath_pressure
+
+	if(Toxins_pp > tox_detect_threshold) // Detect toxins in air
+		adjustPlasma(breath_gases[/datum/gas/plasma][MOLES]*250)
+		throw_alert("alien_tox", /obj/screen/alert/alien_tox)
+
+		toxins_used = breath_gases[/datum/gas/plasma][MOLES]
+
+	else
+		clear_alert("alien_tox")
+
+	//Breathe in toxins and out oxygen
+	breath_gases[/datum/gas/plasma][MOLES] -= toxins_used
+	breath_gases[/datum/gas/oxygen][MOLES] += toxins_used
+
+	breath.garbage_collect()
+
+	//BREATH TEMPERATURE
+	handle_breath_temperature(breath)
+
+/mob/living/carbon/alien/handle_status_effects()
+	..()
+	//natural reduction of movement delay due to stun.
+	if(move_delay_add > 0)
+		move_delay_add = max(0, move_delay_add - rand(1, 2))
+
+/mob/living/carbon/alien/handle_changeling()
+	return
+
+/mob/living/carbon/alien/handle_fire()//Aliens on fire code
+	if(..())
+		return
+	bodytemperature += BODYTEMP_HEATING_MAX //If you're on fire, you heat up!
+	return

code/modules/mob/living/carbon/human/species_types/plasmamen.dm

@@ -26,7 +26,7 @@
 	if((!istype(H.w_uniform, /obj/item/clothing/under/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/plasmaman)) && !atmos_sealed)
 		if(environment)
 			if(environment.total_moles())
-				if(environment.gases["o2"] && (environment.gases["o2"][MOLES]) >= 1) //Same threshhold that extinguishes fire
+				if(environment.gases[/datum/gas/oxygen] && (environment.gases[/datum/gas/oxygen][MOLES]) >= 1) //Same threshhold that extinguishes fire
 					H.adjust_fire_stacks(0.5)
 					if(!H.on_fire && H.fire_stacks > 0)
 						H.visible_message("<span class='danger'>[H]'s body reacts with the atmosphere and bursts into flames!</span>","<span class='userdanger'>Your body reacts with the atmosphere and bursts into flame!</span>")

code/modules/mob/living/carbon/life.dm

@@ -132,11 +132,10 @@
 	var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
 
 	var/list/breath_gases = breath.gases
-	breath.assert_gases("o2","plasma","co2","n2o", "bz")
-
-	var/O2_partialpressure = (breath_gases["o2"][MOLES]/breath.total_moles())*breath_pressure
-	var/Toxins_partialpressure = (breath_gases["plasma"][MOLES]/breath.total_moles())*breath_pressure
-	var/CO2_partialpressure = (breath_gases["co2"][MOLES]/breath.total_moles())*breath_pressure
+	breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz)
+	var/O2_partialpressure = (breath_gases[/datum/gas/oxygen][MOLES]/breath.total_moles())*breath_pressure
+	var/Toxins_partialpressure = (breath_gases[/datum/gas/plasma][MOLES]/breath.total_moles())*breath_pressure
+	var/CO2_partialpressure = (breath_gases[/datum/gas/carbon_dioxide][MOLES]/breath.total_moles())*breath_pressure
 
 
 	//OXYGEN
@@ -147,7 +146,7 @@
 			var/ratio = 1 - O2_partialpressure/safe_oxy_min
 			adjustOxyLoss(min(5*ratio, 3))
 			failed_last_breath = 1
-			oxygen_used = breath_gases["o2"][MOLES]*ratio
+			oxygen_used = breath_gases[/datum/gas/oxygen][MOLES]*ratio
 		else
 			adjustOxyLoss(3)
 			failed_last_breath = 1
@@ -157,11 +156,11 @@
 		failed_last_breath = 0
 		if(health >= HEALTH_THRESHOLD_CRIT)
 			adjustOxyLoss(-5)
-		oxygen_used = breath_gases["o2"][MOLES]
+		oxygen_used = breath_gases[/datum/gas/oxygen][MOLES]
 		clear_alert("not_enough_oxy")
 
-	breath_gases["o2"][MOLES] -= oxygen_used
-	breath_gases["co2"][MOLES] += oxygen_used
+	breath_gases[/datum/gas/oxygen][MOLES] -= oxygen_used
+	breath_gases[/datum/gas/carbon_dioxide][MOLES] += oxygen_used
 
 	//CARBON DIOXIDE
 	if(CO2_partialpressure > safe_co2_max)
@@ -180,15 +179,15 @@
 
 	//TOXINS/PLASMA
 	if(Toxins_partialpressure > safe_tox_max)
-		var/ratio = (breath_gases["plasma"][MOLES]/safe_tox_max) * 10
+		var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_tox_max) * 10
 		adjustToxLoss(Clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
 		throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
 	else
 		clear_alert("too_much_tox")
 
 	//NITROUS OXIDE
-	if(breath_gases["n2o"])
-		var/SA_partialpressure = (breath_gases["n2o"][MOLES]/breath.total_moles())*breath_pressure
+	if(breath_gases[/datum/gas/nitrous_oxide])
+		var/SA_partialpressure = (breath_gases[/datum/gas/nitrous_oxide][MOLES]/breath.total_moles())*breath_pressure
 		if(SA_partialpressure > SA_para_min)
 			Unconscious(60)
 			if(SA_partialpressure > SA_sleep_min)
@@ -198,8 +197,8 @@
 				emote(pick("giggle","laugh"))
 
 	//BZ (Facepunch port of their Agent B)
-	if(breath_gases["bz"])
-		var/bz_partialpressure = (breath_gases["bz"][MOLES]/breath.total_moles())*breath_pressure
+	if(breath_gases[/datum/gas/bz])
+		var/bz_partialpressure = (breath_gases[/datum/gas/bz][MOLES]/breath.total_moles())*breath_pressure
 		if(bz_partialpressure > 1)
 			hallucination += 20
 		else if(bz_partialpressure > 0.01)

code/modules/mob/living/life.dm

@@ -92,7 +92,7 @@
 		ExtinguishMob()
 		return
 	var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment
-	if(!G.gases["o2"] || G.gases["o2"][MOLES] < 1)
+	if(!G.gases[/datum/gas/oxygen] || G.gases[/datum/gas/oxygen][MOLES] < 1)
 		ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire
 		return
 	var/turf/location = get_turf(src)
@@ -123,5 +123,3 @@
 
 /mob/living/proc/update_damage_hud()
 	return
-
-

code/modules/mob/living/simple_animal/hostile/tree.dm

@@ -43,12 +43,12 @@
 	..()
 	if(isopenturf(loc))
 		var/turf/open/T = src.loc
-		if(T.air && T.air.gases["co2"])
-			var/co2 = T.air.gases["co2"][MOLES]
+		if(T.air && T.air.gases[/datum/gas/carbon_dioxide])
+			var/co2 = T.air.gases[/datum/gas/carbon_dioxide][MOLES]
 			if(co2 > 0)
 				if(prob(25))
 					var/amt = min(co2, 9)
-					T.air.gases["co2"][MOLES] -= amt
+					T.air.gases[/datum/gas/carbon_dioxide][MOLES] -= amt
 					T.atmos_spawn_air("o2=[amt]")
 
 /mob/living/simple_animal/hostile/tree/AttackingTarget()

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -186,10 +186,10 @@
 			var/ST_gases = ST.air.gases
 			ST.air.assert_gases(arglist(GLOB.hardcoded_gases))
 
-			var/tox = ST_gases["plasma"][MOLES]
-			var/oxy = ST_gases["o2"][MOLES]
-			var/n2  = ST_gases["n2"][MOLES]
-			var/co2 = ST_gases["co2"][MOLES]
+			var/tox = ST_gases[/datum/gas/plasma][MOLES]
+			var/oxy = ST_gases[/datum/gas/oxygen][MOLES]
+			var/n2  = ST_gases[/datum/gas/nitrogen][MOLES]
+			var/co2 = ST_gases[/datum/gas/carbon_dioxide][MOLES]
 
 			ST.air.garbage_collect()
 

code/modules/mob/living/simple_animal/slime/life.dm

@@ -134,8 +134,8 @@
 
 	if(stat != DEAD)
 		var/bz_percentage =0
-		if("bz" in environment.gases)
-			bz_percentage = environment.gases["bz"][MOLES] / environment.total_moles()
+		if(environment.gases[/datum/gas/bz])
+			bz_percentage = environment.gases[/datum/gas/bz][MOLES] / environment.total_moles()
 		var/stasis = (bz_percentage >= 0.05 && bodytemperature < (T0C + 100)) || force_stasis
 
 		if(stat == CONSCIOUS && stasis)

code/modules/power/singularity/collector.dm

@@ -31,11 +31,11 @@ GLOBAL_LIST_EMPTY(rad_collectors)
 
 /obj/machinery/power/rad_collector/process()
 	if(loaded_tank)
-		if(!loaded_tank.air_contents.gases["plasma"])
+		if(!loaded_tank.air_contents.gases[/datum/gas/plasma])
 			investigate_log("<font color='red'>out of fuel</font>.", INVESTIGATE_SINGULO)
 			eject()
 		else
-			loaded_tank.air_contents.gases["plasma"][MOLES] -= 0.001*drainratio
+			loaded_tank.air_contents.gases[/datum/gas/plasma][MOLES] -= 0.001*drainratio
 			loaded_tank.air_contents.garbage_collect()
 	return
 
@@ -50,7 +50,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
 			"<span class='notice'>You turn the [src.name] [active? "on":"off"].</span>")
 			var/fuel
 			if(loaded_tank)
-				fuel = loaded_tank.air_contents.gases["plasma"]
+				fuel = loaded_tank.air_contents.gases[/datum/gas/plasma]
 			fuel = fuel ? fuel[MOLES] : 0
 			investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"<font color='red'>It is empty</font>"].", INVESTIGATE_SINGULO)
 			return
@@ -139,7 +139,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
 
 /obj/machinery/power/rad_collector/proc/receive_pulse(pulse_strength)
 	if(loaded_tank && active)
-		var/power_produced = loaded_tank.air_contents.gases["plasma"] ? loaded_tank.air_contents.gases["plasma"][MOLES] : 0
+		var/power_produced = loaded_tank.air_contents.gases[/datum/gas/plasma] ? loaded_tank.air_contents.gases[/datum/gas/plasma][MOLES] : 0
 		power_produced *= pulse_strength*10
 		add_avail(power_produced)
 		last_power = power_produced

code/modules/power/supermatter/supermatter.dm

@@ -284,17 +284,17 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
 		if(damage > damage_archived && prob(10))
 			playsound(get_turf(src), 'sound/effects/empulse.ogg', 50, 1)
 
-	removed.assert_gases("o2", "plasma", "co2", "n2o", "n2", "freon")
+	removed.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/nitrogen, /datum/gas/freon)
 	//calculating gas related values
 	combined_gas = max(removed.total_moles(), 0)
 
-	plasmacomp = max(removed.gases["plasma"][MOLES]/combined_gas, 0)
-	o2comp = max(removed.gases["o2"][MOLES]/combined_gas, 0)
-	co2comp = max(removed.gases["co2"][MOLES]/combined_gas, 0)
+	plasmacomp = max(removed.gases[/datum/gas/plasma][MOLES]/combined_gas, 0)
+	o2comp = max(removed.gases[/datum/gas/oxygen][MOLES]/combined_gas, 0)
+	co2comp = max(removed.gases[/datum/gas/carbon_dioxide][MOLES]/combined_gas, 0)
 
-	n2ocomp = max(removed.gases["n2o"][MOLES]/combined_gas, 0)
-	n2comp = max(removed.gases["n2"][MOLES]/combined_gas, 0)
-	freoncomp = max(removed.gases["freon"][MOLES]/combined_gas, 0)
+	n2ocomp = max(removed.gases[/datum/gas/nitrous_oxide][MOLES]/combined_gas, 0)
+	n2comp = max(removed.gases[/datum/gas/nitrogen][MOLES]/combined_gas, 0)
+	freoncomp = max(removed.gases[/datum/gas/freon][MOLES]/combined_gas, 0)
 
 	gasmix_power_ratio = min(max(plasmacomp + o2comp + co2comp - n2comp - freoncomp, 0), 1)
 
@@ -348,12 +348,12 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
 	removed.temperature = max(0, min(removed.temperature, 2500 * dynamic_heat_modifier))
 
 	//Calculate how much gas to release
-	removed.gases["plasma"][MOLES] += max((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0)
+	removed.gases[/datum/gas/plasma][MOLES] += max((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0)
 
-	removed.gases["o2"][MOLES] += max(((device_energy + removed.temperature * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
+	removed.gases[/datum/gas/oxygen][MOLES] += max(((device_energy + removed.temperature * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
 
 	if(combined_gas < 50)
-		removed.gases["freon"][MOLES] = max((removed.gases["freon"][MOLES] + device_energy) * freoncomp / FREON_BREEDING_MODIFIER, 0)
+		removed.gases[/datum/gas/freon][MOLES] = max((removed.gases[/datum/gas/freon][MOLES] + device_energy) * freoncomp / FREON_BREEDING_MODIFIER, 0)
 
 	if(produces_gas)
 		env.merge(removed)

code/modules/surgery/organs/lungs.dm

@@ -95,13 +95,13 @@
 
 	var/list/breath_gases = breath.gases
 
-	breath.assert_gases("o2", "n2", "plasma", "co2", "n2o", "bz")
+	breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitrogen)
 
 	//Partial pressures in our breath
-	var/O2_pp = breath.get_breath_partial_pressure(breath_gases["o2"][MOLES])
-	var/N2_pp = breath.get_breath_partial_pressure(breath_gases["n2"][MOLES])
-	var/Toxins_pp = breath.get_breath_partial_pressure(breath_gases["plasma"][MOLES])
-	var/CO2_pp = breath.get_breath_partial_pressure(breath_gases["co2"][MOLES])
+	var/O2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])
+	var/N2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrogen][MOLES])
+	var/Toxins_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/plasma][MOLES])
+	var/CO2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/carbon_dioxide][MOLES])
 
 
 	//-- OXY --//
@@ -109,7 +109,7 @@
 	//Too much oxygen! //Yes, some species may not like it.
 	if(safe_oxygen_max)
 		if(O2_pp > safe_oxygen_max)
-			var/ratio = (breath_gases["o2"][MOLES]/safe_oxygen_max) * 10
+			var/ratio = (breath_gases[/datum/gas/oxygen][MOLES]/safe_oxygen_max) * 10
 			H.apply_damage_type(Clamp(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type)
 			H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
 		else
@@ -118,18 +118,18 @@
 	//Too little oxygen!
 	if(safe_oxygen_min)
 		if(O2_pp < safe_oxygen_min)
-			gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath_gases["o2"][MOLES])
+			gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath_gases[/datum/gas/oxygen][MOLES])
 			H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
 		else
 			H.failed_last_breath = FALSE
 			if(H.health >= HEALTH_THRESHOLD_CRIT)
 				H.adjustOxyLoss(-5)
-			gas_breathed = breath_gases["o2"][MOLES]
+			gas_breathed = breath_gases[/datum/gas/oxygen][MOLES]
 			H.clear_alert("not_enough_oxy")
 
 	//Exhale
-	breath_gases["o2"][MOLES] -= gas_breathed
-	breath_gases["co2"][MOLES] += gas_breathed
+	breath_gases[/datum/gas/oxygen][MOLES] -= gas_breathed
+	breath_gases[/datum/gas/carbon_dioxide][MOLES] += gas_breathed
 	gas_breathed = 0
 
 	//-- Nitrogen --//
@@ -137,7 +137,7 @@
 	//Too much nitrogen!
 	if(safe_nitro_max)
 		if(N2_pp > safe_nitro_max)
-			var/ratio = (breath_gases["n2"][MOLES]/safe_nitro_max) * 10
+			var/ratio = (breath_gases[/datum/gas/nitrogen][MOLES]/safe_nitro_max) * 10
 			H.apply_damage_type(Clamp(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type)
 			H.throw_alert("too_much_nitro", /obj/screen/alert/too_much_nitro)
 		else
@@ -146,18 +146,18 @@
 	//Too little nitrogen!
 	if(safe_nitro_min)
 		if(N2_pp < safe_nitro_min)
-			gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath_gases["n2"][MOLES])
+			gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath_gases[/datum/gas/nitrogen][MOLES])
 			H.throw_alert("nitro", /obj/screen/alert/not_enough_nitro)
 		else
 			H.failed_last_breath = FALSE
 			if(H.health >= HEALTH_THRESHOLD_CRIT)
 				H.adjustOxyLoss(-5)
-			gas_breathed = breath_gases["n2"][MOLES]
+			gas_breathed = breath_gases[/datum/gas/nitrogen][MOLES]
 			H.clear_alert("nitro")
 
 	//Exhale
-	breath_gases["n2"][MOLES] -= gas_breathed
-	breath_gases["co2"][MOLES] += gas_breathed
+	breath_gases[/datum/gas/nitrogen][MOLES] -= gas_breathed
+	breath_gases[/datum/gas/carbon_dioxide][MOLES] += gas_breathed
 	gas_breathed = 0
 
 	//-- CO2 --//
@@ -183,18 +183,18 @@
 	//Too little CO2!
 	if(safe_co2_min)
 		if(CO2_pp < safe_co2_min)
-			gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath_gases["co2"][MOLES])
+			gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath_gases[/datum/gas/carbon_dioxide][MOLES])
 			H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
 		else
 			H.failed_last_breath = FALSE
 			if(H.health >= HEALTH_THRESHOLD_CRIT)
 				H.adjustOxyLoss(-5)
-			gas_breathed = breath_gases["co2"][MOLES]
+			gas_breathed = breath_gases[/datum/gas/carbon_dioxide][MOLES]
 			H.clear_alert("not_enough_co2")
 
 	//Exhale
-	breath_gases["co2"][MOLES] -= gas_breathed
-	breath_gases["o2"][MOLES] += gas_breathed
+	breath_gases[/datum/gas/carbon_dioxide][MOLES] -= gas_breathed
+	breath_gases[/datum/gas/oxygen][MOLES] += gas_breathed
 	gas_breathed = 0
 
 
@@ -203,7 +203,7 @@
 	//Too much toxins!
 	if(safe_toxins_max)
 		if(Toxins_pp > safe_toxins_max)
-			var/ratio = (breath_gases["plasma"][MOLES]/safe_toxins_max) * 10
+			var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_toxins_max) * 10
 			H.apply_damage_type(Clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type)
 			H.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
 		else
@@ -213,18 +213,18 @@
 	//Too little toxins!
 	if(safe_toxins_min)
 		if(Toxins_pp < safe_toxins_min)
-			gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath_gases["plasma"][MOLES])
+			gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath_gases[/datum/gas/plasma][MOLES])
 			H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
 		else
 			H.failed_last_breath = FALSE
 			if(H.health >= HEALTH_THRESHOLD_CRIT)
 				H.adjustOxyLoss(-5)
-			gas_breathed = breath_gases["plasma"][MOLES]
+			gas_breathed = breath_gases[/datum/gas/plasma][MOLES]
 			H.clear_alert("not_enough_tox")
 
 	//Exhale
-	breath_gases["plasma"][MOLES] -= gas_breathed
-	breath_gases["co2"][MOLES] += gas_breathed
+	breath_gases[/datum/gas/plasma][MOLES] -= gas_breathed
+	breath_gases[/datum/gas/carbon_dioxide][MOLES] += gas_breathed
 	gas_breathed = 0
 
 
@@ -234,7 +234,7 @@
 
 	// N2O
 
-		var/SA_pp = breath.get_breath_partial_pressure(breath_gases["n2o"][MOLES])
+		var/SA_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrous_oxide][MOLES])
 		if(SA_pp > SA_para_min) // Enough to make us stunned for a bit
 			H.Unconscious(60) // 60 gives them one second to wake up and run away a bit!
 			if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
@@ -245,7 +245,7 @@
 
 	// BZ
 
-		var/bz_pp = breath.get_breath_partial_pressure(breath_gases["bz"][MOLES])
+		var/bz_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/bz][MOLES])
 		if(bz_pp > BZ_trip_balls_min)
 			H.hallucination += 20
 			if(prob(33))