From 890ba9dbe1e9ceb8c3dcd092e6259b6ce4215610 Mon Sep 17 00:00:00 2001
From: vuonojenmustaturska <naksu@youzen.ext.b2.fi>
Date: Sat, 7 Oct 2017 04:34:24 +0300
Subject: [PATCH] Imminent danger of skeletons

* Renamed GASLIST into ADD_GAS
* Reordered ASSERT_GAS arguments around
* Replaced all instances of add_gas with the define
* Removed once instance of manual duplication of ASSERT_GAS with the real deal
---
 code/__DEFINES/atmospherics.dm                | 10 +++----
 .../game/mecha/equipment/tools/other_tools.dm |  2 +-
 .../effects/effect_system/effects_smoke.dm    |  2 +-
 code/game/objects/items/tanks/jetpack.dm      |  2 +-
 code/game/objects/items/tanks/tank_types.dm   | 11 ++++---
 code/game/turfs/turf.dm                       |  2 +-
 code/modules/admin/verbs/debug.dm             |  2 +-
 .../atmospherics/gasmixtures/gas_mixture.dm   | 29 ++++++++-----------
 .../gasmixtures/immutable_mixtures.dm         |  2 +-
 .../atmospherics/gasmixtures/reactions.dm     |  8 ++---
 .../components/trinary_devices/filter.dm      |  2 +-
 .../unary_devices/oxygen_generator.dm         |  2 +-
 .../components/unary_devices/tank.dm          |  2 +-
 .../components/unary_devices/vent_scrubber.dm | 14 ++++-----
 .../atmospherics/machinery/other/miner.dm     |  2 +-
 .../machinery/portable/canister.dm            |  2 +-
 .../machinery/portable/scrubber.dm            |  2 +-
 17 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index d8485c003ed..c38f4d932ed 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -177,10 +177,10 @@
 
 #define THERMAL_ENERGY(gas) (gas.temperature * gas.heat_capacity())
 
-#define GASLIST(id, out_list)\
-	var/list/tmp_gaslist = GLOB.gaslist_cache[id];\
-	out_list = tmp_gaslist.Copy();
+#define ADD_GAS(gas_id, out_list)\
+	var/list/tmp_gaslist = GLOB.gaslist_cache[gas_id];\
+	out_list[gas_id] = tmp_gaslist.Copy();
 
-//ASSERT_GAS(gas_mixture,gas_id) - used to guarantee that the gas list for this id exists in gas_mixture.
+//ASSERT_GAS(gas_id, gas_mixture) - used to guarantee that the gas list for this id exists in gas_mixture.gases.
 //Must be used before adding to a gas. May be used before reading from a gas.
-#define ASSERT_GAS(gas_mixture,gas_id) if (!gas_mixture.gases[gas_id]) { GASLIST(gas_id, gas_mixture.gases[gas_id]) };
\ No newline at end of file
+#define ASSERT_GAS(gas_id, gas_mixture) if (!gas_mixture.gases[gas_id]) { ADD_GAS(gas_id, gas_mixture.gases) };
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 5e89c6552ab..79c54874f08 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -430,7 +430,7 @@
 	if(!istype(T))
 		return
 	var/datum/gas_mixture/GM = new
-	ASSERT_GAS(GM,"plasma")
+	ASSERT_GAS("plasma", GM)
 	if(prob(10))
 		GM.gases["plasma"][MOLES] += 100
 		GM.temperature = 1500+T0C //should be enough to start a fire
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 2636b90f21d..538ea3bd84b 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -169,7 +169,7 @@
 				qdel(H)
 				var/list/G_gases = G.gases
 				if(G_gases["plasma"])
-					ASSERT_GAS(G,"n2")
+					ASSERT_GAS("n2", G)
 					G_gases["n2"][MOLES] += (G_gases["plasma"][MOLES])
 					G_gases["plasma"][MOLES] = 0
 					G.garbage_collect()
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index 3c998ca3ccd..63e9e0bb55f 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -17,7 +17,7 @@
 /obj/item/tank/jetpack/New()
 	..()
 	if(gas_type)
-		ASSERT_GAS(air_contents,gas_type)
+		ASSERT_GAS(gas_type,air_contents)
 		air_contents.gases[gas_type][MOLES] = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
 
 	ion_trail = new
diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm
index b4f6393b6bb..146693dd055 100644
--- a/code/game/objects/items/tanks/tank_types.dm
+++ b/code/game/objects/items/tanks/tank_types.dm
@@ -21,7 +21,7 @@
 
 /obj/item/tank/internals/oxygen/New()
 	..()
-	ASSERT_GAS(air_contents, "o2")
+	ASSERT_GAS("o2", air_contents)
 	air_contents.gases["o2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 	return
 
@@ -87,7 +87,7 @@
 
 /obj/item/tank/internals/plasma/New()
 	..()
-	ASSERT_GAS(air_contents,"plasma")
+	ASSERT_GAS("plasma", air_contents)
 	air_contents.gases["plasma"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 	return
 
@@ -105,8 +105,7 @@
 		return ..()
 
 /obj/item/tank/internals/plasma/full/New()
-	..()
-	ASSERT_GAS(air_contents,"plasma")
+	..() // Plasma asserted in parent
 	air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 	return
 
@@ -125,7 +124,7 @@
 
 /obj/item/tank/internals/plasmaman/New()
 	..()
-	ASSERT_GAS(air_contents,"plasma")
+	ASSERT_GAS("plasma", air_contents)
 	air_contents.gases["plasma"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 	return
 
@@ -167,7 +166,7 @@
 
 /obj/item/tank/internals/emergency_oxygen/New()
 	..()
-	ASSERT_GAS(air_contents,"o2")
+	ASSERT_GAS("o2", air_contents)
 	air_contents.gases["o2"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 	return
 
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 206d53b6d2a..33d74892290 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -290,7 +290,7 @@
 			continue
 		var/list/S_gases = S.air.gases
 		for(var/id in S_gases)
-			ASSERT_GAS(total, id)
+			ASSERT_GAS(id, total)
 			total_gases[id][MOLES] += S_gases[id][MOLES]
 		total.temperature += S.air.temperature
 
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 30034a6ac16..f670fe760a3 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -716,7 +716,7 @@ 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.air_contents, "plasma")
+				ASSERT_GAS("plasma", Plasma.air_contents)
 				Plasma.air_contents.gases["plasma"][MOLES] = 70
 				Rad.drainratio = 0
 				Rad.loaded_tank = Plasma
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index d676162f2f7..b9cba55ae6e 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -39,22 +39,18 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 
 //listmos procs
 
+// The following procs used to live here: thermal_energy(), assert_gas() and add_gas(). They have been moved into defines in code/__DEFINES/atmospherics.dm
+
 	//assert_gases(args) - shorthand for calling ASSERT_GAS() once for each gas type.
 /datum/gas_mixture/proc/assert_gases()
 	for(var/id in args)
-		ASSERT_GAS(src,id)
-
-	//add_gas(gas_id) - similar to assert_gas(), but does not check for an existing
-		//gas list for this id. This can clobber existing gases.
-	//Used instead of assert_gas() when you know the gas does not exist. Faster than assert_gas().
-/datum/gas_mixture/proc/add_gas(gas_id)
-	GASLIST(gas_id, gases[gas_id])
+		ASSERT_GAS(id, src)
 
 	//add_gases(args) - shorthand for calling add_gas() once for each gas_type.
 /datum/gas_mixture/proc/add_gases()
 	var/cached_gases = gases
 	for(var/id in args)
-		GASLIST(id, cached_gases[id])
+		ADD_GAS(id, cached_gases)
 
 	//garbage_collect() - removes any gas list which is empty.
 	//If called with a list as an argument, only removes gas lists with IDs from that list.
@@ -184,7 +180,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 	var/list/giver_gases = giver.gases
 	//gas transfer
 	for(var/giver_id in giver_gases)
-		ASSERT_GAS(src, giver_id)
+		ASSERT_GAS(giver_id, src)
 		cached_gases[giver_id][MOLES] += giver_gases[giver_id][MOLES]
 
 	return 1
@@ -201,7 +197,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 
 	removed.temperature = temperature
 	for(var/id in cached_gases)
-		removed.add_gas(id)
+		ADD_GAS(id, removed.gases)
 		removed_gases[id][MOLES] = QUANTIZE((cached_gases[id][MOLES] / sum) * amount)
 		cached_gases[id][MOLES] -= removed_gases[id][MOLES]
 	garbage_collect()
@@ -219,7 +215,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 
 	removed.temperature = temperature
 	for(var/id in cached_gases)
-		removed.add_gas(id)
+		ADD_GAS(id, removed.gases)
 		removed_gases[id][MOLES] = QUANTIZE(cached_gases[id][MOLES] * ratio)
 		cached_gases[id][MOLES] -= removed_gases[id][MOLES]
 
@@ -234,7 +230,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 
 	copy.temperature = temperature
 	for(var/id in cached_gases)
-		copy.add_gas(id)
+		ADD_GAS(id, copy.gases)
 		copy_gases[id][MOLES] = cached_gases[id][MOLES]
 
 	return copy
@@ -246,7 +242,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 
 	temperature = sample.temperature
 	for(var/id in sample_gases)
-		ASSERT_GAS(src,id)
+		ASSERT_GAS(id,src)
 		cached_gases[id][MOLES] = sample_gases[id][MOLES]
 
 	//remove all gases not in the sample
@@ -272,7 +268,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 		gas -= "TEMP"
 	gases.Cut()
 	for(var/id in gas)
-		add_gas(id)
+		ADD_GAS(id, gases)
 		gases[id][MOLES] = text2num(gas[id])
 	return 1
 
@@ -300,10 +296,9 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 
 	//GAS TRANSFER
 	for(var/id in sharer_gases - cached_gases) // create gases not in our cache
-		add_gas(id)
+		ADD_GAS(id, gases)
 	for(var/id in cached_gases) // transfer gases
-		if(!sharer_gases[id]) //checking here prevents an uneeded proc call if the check fails.
-			sharer.add_gas(id)
+		ASSERT_GAS(id, sharer)
 
 		var/gas = cached_gases[id]
 		var/sharergas = sharer_gases[id]
diff --git a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm
index 086e21daca2..50e1b38e52f 100644
--- a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm
+++ b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm
@@ -69,7 +69,7 @@
 
 /datum/gas_mixture/immutable/cloner/garbage_collect()
 	..()
-	add_gas("n2")
+	ADD_GAS("n2", gases)
 	gases["n2"][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
 
 /datum/gas_mixture/immutable/cloner/heat_capacity()
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index 750132dcd22..c4662134090 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -57,7 +57,7 @@
 	cached_gases["co2"][MOLES] -= reaction_rate
 	cached_gases["agent_b"][MOLES] -= reaction_rate*0.05
 
-	ASSERT_GAS(air, "o2") //only need to assert oxygen, as this reaction doesn't occur without the other gases existing
+	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
 
 	air.temperature -= (reaction_rate*20000)/air.heat_capacity()
@@ -126,7 +126,7 @@
 		if(burned_fuel)
 			energy_released += FIRE_CARBON_ENERGY_RELEASED * burned_fuel
 
-			ASSERT_GAS(air, "co2")
+			ASSERT_GAS("co2", air)
 			cached_gases["co2"][MOLES] += burned_fuel
 
 			cached_results[id] += burned_fuel
@@ -142,14 +142,14 @@
 		else
 			temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE)
 		if(temperature_scale > 0)
-			ASSERT_GAS(air, "o2")
+			ASSERT_GAS("o2", 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
 			else
 				plasma_burn_rate = (temperature_scale*(cached_gases["o2"][MOLES]/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA
 			if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY)
-				ASSERT_GAS(air, "co2")
+				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
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index df5470d219e..4e3ef0f3cc8 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -96,7 +96,7 @@
 			var/datum/gas_mixture/filtered_out = new
 
 			filtered_out.temperature = removed.temperature
-			ASSERT_GAS(filtered_out, filter_type)
+			ASSERT_GAS(filter_type, filtered_out)
 			filtered_out.gases[filter_type][MOLES] = removed.gases[filter_type][MOLES]
 
 			removed.gases[filter_type][MOLES] = 0
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
index ff260426c0b..7418205c7b5 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
@@ -47,7 +47,7 @@
 		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(air_contents, "o2")
+		ASSERT_GAS("o2", air_contents)
 		air_contents.gases["o2"][MOLES] += added_oxygen
 
 		update_parents()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
index 3d21d335847..3b0055edab4 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
@@ -16,7 +16,7 @@
 	air_contents.volume = volume
 	air_contents.temperature = T20C
 	if(gas_type)
-		ASSERT_GAS(air_contents, gas_type)
+		ASSERT_GAS(gas_type, air_contents)
 		air_contents.gases[gas_type][MOLES] = AIR_CONTENTS
 		name = "[name] ([air_contents.gases[gas_type][GAS_META][META_GAS_NAME]])"
 
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index 251eab55511..326f47aac4f 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -196,37 +196,37 @@
 			filtered_out.temperature = removed.temperature
 
 			if(scrub_Toxins && removed_gases["plasma"])
-				filtered_out.add_gas("plasma")
+				ADD_GAS("plasma", filtered_out.gases)
 				filtered_gases["plasma"][MOLES] = removed_gases["plasma"][MOLES]
 				removed_gases["plasma"][MOLES] = 0
 
 			if(scrub_CO2 && removed_gases["co2"])
-				filtered_out.add_gas("co2")
+				ADD_GAS("co2", filtered_out.gases)
 				filtered_gases["co2"][MOLES] = removed_gases["co2"][MOLES]
 				removed_gases["co2"][MOLES] = 0
 
 			if(removed_gases["agent_b"])
-				filtered_out.add_gas("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(scrub_N2O && removed_gases["n2o"])
-				filtered_out.add_gas("n2o")
+				ADD_GAS("n2o", filtered_out.gases)
 				filtered_gases["n2o"][MOLES] = removed_gases["n2o"][MOLES]
 				removed_gases["n2o"][MOLES] = 0
 
 			if(scrub_BZ && removed_gases["bz"])
-				filtered_out.add_gas("bz")
+				ADD_GAS("bz", filtered_out.gases)
 				filtered_gases["bz"][MOLES] = removed_gases["bz"][MOLES]
 				removed_gases["bz"][MOLES] = 0
 
 			if(scrub_Freon && removed_gases["freon"])
-				filtered_out.add_gas("freon")
+				ADD_GAS("freon", filtered_out.gases)
 				filtered_gases["freon"][MOLES] = removed_gases["freon"][MOLES]
 				removed_gases["freon"][MOLES] = 0
 
 			if(scrub_WaterVapor && removed_gases["water_vapor"])
-				filtered_out.add_gas("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
 
diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm
index f9f4502169f..1db4c5edd3a 100644
--- a/code/modules/atmospherics/machinery/other/miner.dm
+++ b/code/modules/atmospherics/machinery/other/miner.dm
@@ -132,7 +132,7 @@
 	if(!isopenturf(O))
 		return FALSE
 	var/datum/gas_mixture/merger = new
-	ASSERT_GAS(merger, spawn_id)
+	ASSERT_GAS(spawn_id, merger)
 	merger.gases[spawn_id][MOLES] = (spawn_mol)
 	merger.temperature = spawn_temp
 	O.assume_air(merger)
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 024330ed7e7..c08ef25b617 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -174,7 +174,7 @@
 
 /obj/machinery/portable_atmospherics/canister/proc/create_gas()
 	if(gas_type)
-		air_contents.add_gas(gas_type)
+		ADD_GAS(gas_type, air_contents.gases)
 		if(starter_temp)
 			air_contents.temperature = starter_temp
 		air_contents.gases[gas_type][MOLES] = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 93475a00a72..7a76405a900 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -45,7 +45,7 @@
 
 	filtered.temperature = filtering.temperature
 	for(var/gas in filtering.gases & scrubbing)
-		filtered.add_gas(gas)
+		ADD_GAS(gas, filtered.gases)
 		filtered.gases[gas][MOLES] = filtering.gases[gas][MOLES] // Shuffle the "bad" gasses to the filtered mixture.
 		filtering.gases[gas][MOLES] = 0
 	filtering.garbage_collect() // Now that the gasses are set to 0, clean up the mixture.