Merge pull request #35 from Citadel-Station-13/master

synch stuff

_maps/RandomRuins/SpaceRuins/cloning_facility.dmm

@@ -69,7 +69,7 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav/powered/ancient_shuttle)
 "j" = (
-/obj/machinery/computer/prototype_cloning,
+/obj/machinery/computer/cloning/prototype,
 /obj/machinery/light{
 	dir = 1
 	},

code/__DEFINES/atmospherics.dm

@@ -136,7 +136,7 @@
 #define TANK_FRAGMENT_SCALE	    			(6.*ONE_ATMOSPHERE)		//+1 for each SCALE kPa aboe threshold
 #define TANK_MAX_RELEASE_PRESSURE 			(ONE_ATMOSPHERE*3)
 #define TANK_MIN_RELEASE_PRESSURE 			0
-#define TANK_DEFAULT_RELEASE_PRESSURE 		16
+#define TANK_DEFAULT_RELEASE_PRESSURE 		17
 
 //CANATMOSPASS
 #define ATMOS_PASS_YES 1
@@ -270,16 +270,9 @@
 	T.pixel_x = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X;\
 	T.pixel_y = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y;
 
-#define THERMAL_ENERGY(gas) (gas.temperature * gas.heat_capacity())
 #define QUANTIZE(variable)		(round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that
 															once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */
 
-//prefer this to gas_mixture/total_moles in performance critical areas
-#define TOTAL_MOLES(cached_gases, out_var)\
-	out_var = 0;\
-	for(var/total_moles_id in cached_gases){\
-		out_var += cached_gases[total_moles_id];\
-	}
 
 #ifdef TESTING
 GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0))
@@ -288,6 +281,19 @@ GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0))
 #define CALCULATE_ADJACENT_TURFS(T) SSadjacent_air.queue[T] = 1
 #endif
 
+#define EXTOOLS (world.system_type == MS_WINDOWS ? "byond-extools.dll" : "libbyond-extools.so")
+
+GLOBAL_VAR(atmos_extools_initialized) // this must be an uninitialized (null) one or init_monstermos will be called twice because reasons
+#define ATMOS_EXTOOLS_CHECK if(!GLOB.atmos_extools_initialized){\
+	GLOB.atmos_extools_initialized=TRUE;\
+	if(fexists(EXTOOLS)){\
+		var/result = call(EXTOOLS,"init_monstermos")();\
+		if(result != "ok") {CRASH(result);}\
+	} else {\
+		CRASH("[EXTOOLS] does not exist!");\
+	}\
+}
+
 //Unomos - So for whatever reason, garbage collection actually drastically decreases the cost of atmos later in the round. Turning this into a define yields massively improved performance.
 #define GAS_GARBAGE_COLLECT(GASGASGAS)\
 	var/list/CACHE_GAS = GASGASGAS;\
@@ -296,10 +302,6 @@ GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0))
 			CACHE_GAS -= id;\
 	}
 
-#define ARCHIVE_TEMPERATURE(gas) gas.temperature_archived = gas.temperature
-
-#define ARCHIVE(gas) gas.temperature_archived = gas.temperature; gas.gas_archive = gas.gases.Copy();
-
 GLOBAL_LIST_INIT(pipe_paint_colors, list(
 		"amethyst" = rgb(130,43,255), //supplymain
 		"blue" = rgb(0,0,255),

code/__DEFINES/cooldowns.dm

@@ -0,0 +1,71 @@
+//// COOLDOWN SYSTEMS
+/*
+ * We have 2 cooldown systems: timer cooldowns (divided between stoppable and regular) and world.time cooldowns.
+ *
+ * When to use each?
+ *
+ * * Adding a commonly-checked cooldown, like on a subsystem to check for processing
+ * * * Use the world.time ones, as they are cheaper.
+ *
+ * * Adding a rarely-used one for special situations, such as giving an uncommon item a cooldown on a target.
+ * * * Timer cooldown, as adding a new variable on each mob to track the cooldown of said uncommon item is going too far.
+ *
+ * * Triggering events at the end of a cooldown.
+ * * * Timer cooldown, registering to its signal.
+ *
+ * * Being able to check how long left for the cooldown to end.
+ * * * Either world.time or stoppable timer cooldowns, depending on the other factors. Regular timer cooldowns do not support this.
+ *
+ * * Being able to stop the timer before it ends.
+ * * * Either world.time or stoppable timer cooldowns, depending on the other factors. Regular timer cooldowns do not support this.
+*/
+
+
+/*
+ * Cooldown system based on an datum-level associative lazylist using timers.
+*/
+
+//INDEXES
+#define COOLDOWN_EMPLOYMENT_CABINET	"employment cabinet"
+
+
+//TIMER COOLDOWN MACROS
+
+#define COMSIG_CD_STOP(cd_index) "cooldown_[cd_index]"
+#define COMSIG_CD_RESET(cd_index) "cd_reset_[cd_index]"
+
+#define TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, /proc/end_cooldown, cd_source, cd_index), cd_time))
+
+#define TIMER_COOLDOWN_CHECK(cd_source, cd_index) LAZYACCESS(cd_source.cooldowns, cd_index)
+
+#define TIMER_COOLDOWN_END(cd_source, cd_index) LAZYREMOVE(cd_source.cooldowns, cd_index)
+
+/*
+ * Stoppable timer cooldowns.
+ * Use indexes the same as the regular tiemr cooldowns.
+ * They make use of the TIMER_COOLDOWN_CHECK() and TIMER_COOLDOWN_END() macros the same, just not the TIMER_COOLDOWN_START() one.
+ * A bit more expensive than the regular timers, but can be reset before they end and the time left can be checked.
+*/
+
+#define S_TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, /proc/end_cooldown, cd_source, cd_index), cd_time, TIMER_STOPPABLE))
+
+#define S_TIMER_COOLDOWN_RESET(cd_source, cd_index) reset_cooldown(cd_source, cd_index)
+
+#define S_TIMER_COOLDOWN_TIMELEFT(cd_source, cd_index) (timeleft(TIMER_COOLDOWN_CHECK(cd_source, cd_index)))
+
+
+/*
+ * Cooldown system based on storing world.time on a variable, plus the cooldown time.
+ * Better performance over timer cooldowns, lower control. Same functionality.
+*/
+
+#define COOLDOWN_DECLARE(cd_index) var/##cd_index = 0
+
+#define COOLDOWN_START(cd_source, cd_index, cd_time) (cd_source.cd_index = world.time + cd_time)
+
+//Returns true if the cooldown has run its course, false otherwise
+#define COOLDOWN_FINISHED(cd_source, cd_index) (cd_source.cd_index < world.time)
+
+#define COOLDOWN_RESET(cd_source, cd_index) cd_source.cd_index = 0
+
+#define COOLDOWN_TIMELEFT(cd_source, cd_index) (max(0, cd_source.cd_index - world.time))

code/__DEFINES/dcs/signals.dm

@@ -224,6 +224,11 @@
 #define COMSIG_LIVING_RUN_BLOCK "living_do_run_block"				//from base of mob/living/do_run_block(): (real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone)
 #define COMSIG_LIVING_GET_BLOCKING_ITEMS "get_blocking_items"	//from base of mob/living/get_blocking_items(): (list/items)
 
+#define COMSIG_LIVING_ACTIVE_BLOCK_START "active_block_start"			//from base of mob/living/keybind_start_active_blocking(): (obj/item/blocking_item, list/backup_items)
+	#define COMPONENT_PREVENT_BLOCK_START 1
+#define COMSIG_LIVING_ACTIVE_PARRY_START "active_parry_start"			//from base of mob/living/initiate_parry_sequence(): (parrying_method, datum/parrying_item_mob_or_art, list/backup_items)
+	#define COMPONENT_PREVENT_PARRY_START 1
+
 //ALL OF THESE DO NOT TAKE INTO ACCOUNT WHETHER AMOUNT IS 0 OR LOWER AND ARE SENT REGARDLESS!
 #define COMSIG_LIVING_STATUS_STUN "living_stun"					//from base of mob/living/Stun() (amount, update, ignore)
 #define COMSIG_LIVING_STATUS_KNOCKDOWN "living_knockdown"		//from base of mob/living/Knockdown() (amount, update, ignore)

code/__DEFINES/machines.dm

@@ -115,3 +115,7 @@
 //these flags are used to tell the DNA modifier if a plant gene cannot be extracted or modified.
 #define PLANT_GENE_REMOVABLE	(1<<0)
 #define PLANT_GENE_EXTRACTABLE	(1<<1)
+
+#define CLONEPOD_GET_MIND		1
+#define CLONEPOD_POLL_MIND		2
+#define CLONEPOD_NO_MIND		3

code/__DEFINES/skills/defines.dm

@@ -8,12 +8,6 @@
 /// Levels
 #define SKILL_PROGRESSION_LEVEL					4
 
-
-/// Max value of skill for numerical skills
-#define SKILL_NUMERICAL_MAX			100
-/// Min value of skill for numerical skills
-#define SKILL_NUMERICAL_MIN			0
-
 // Standard values for job starting skills
 
 #define STARTING_SKILL_SURGERY_MEDICAL		35		//out of SKILL_NUMERICAL_MAX
@@ -26,6 +20,13 @@
 
 #define DEF_SKILL_GAIN					1
 #define SKILL_GAIN_SURGERY_PER_STEP		0.25
+#define STD_USE_TOOL_MULT				1
+#define EASY_USE_TOOL_MULT				0.75
+#define TRIVIAL_USE_TOOL_MULT			0.5
+#define BARE_USE_TOOL_MULT				0.25
+
+//multiplier of the difference of max_value and min_value. Mostly for balance purposes between numerical and level-based skills.
+#define STD_NUM_SKILL_ITEM_GAIN_MULTI	0.002
 
 //An extra point for each few seconds of delay when using a tool. Before the multiplier.
 #define SKILL_GAIN_DELAY_DIVISOR		3 SECONDS

code/__DEFINES/spaceman_dmm.dm

@@ -29,6 +29,5 @@
 #endif
 
 /world/proc/enable_debugger()
-    var/dll = world.GetConfig("env", "EXTOOLS_DLL")
-    if (dll)
-        call(dll, "debug_initialize")()
+    if (fexists(EXTOOLS))
+        call(EXTOOLS, "debug_initialize")()

code/__DEFINES/subsystems.dm

@@ -137,12 +137,13 @@
 // SSair run section
 #define SSAIR_PIPENETS 1
 #define SSAIR_ATMOSMACHINERY 2
-#define SSAIR_REACTQUEUE 3
-#define SSAIR_EXCITEDGROUPS 4
-#define SSAIR_HIGHPRESSURE 5
-#define SSAIR_HOTSPOTS 6
-#define SSAIR_SUPERCONDUCTIVITY 7
-#define SSAIR_REBUILD_PIPENETS 8
+#define SSAIR_EXCITEDGROUPS 3
+#define SSAIR_HIGHPRESSURE 4
+#define SSAIR_HOTSPOTS 5
+#define SSAIR_SUPERCONDUCTIVITY 6
+#define SSAIR_REBUILD_PIPENETS 7
+#define SSAIR_EQUALIZE 8
+#define SSAIR_ACTIVETURFS 9
 
 #define COMPILE_OVERLAYS(A)\
 	if (TRUE) {\

code/_onclick/item_attack.dm

@@ -123,7 +123,7 @@
 		if(totitemdamage)
 			totitemdamage = user.mind.item_action_skills_mod(I, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ, bad_trait)
 		for(var/skill in I.used_skills)
-			if(!(I.used_skills[skill] & SKILL_TRAIN_ATTACK_OBJ))
+			if(!(SKILL_TRAIN_ATTACK_OBJ in I.used_skills[skill]))
 				continue
 			user.mind.auto_gain_experience(skill, I.skill_gain)
 
@@ -192,9 +192,10 @@
 	if(.)
 		. = user.mind.item_action_skills_mod(I, ., I.skill_difficulty, SKILL_ATTACK_MOB, bad_trait)
 	for(var/skill in I.used_skills)
-		if(!(I.used_skills[skill] & SKILL_TRAIN_ATTACK_MOB))
+		if(!(SKILL_TRAIN_ATTACK_MOB in I.used_skills[skill]))
 			continue
-		user.mind.auto_gain_experience(skill, I.skill_gain)
+		var/datum/skill/S = GLOB.skill_datums[skill]
+		user.mind.auto_gain_experience(skill, I.skill_gain*S.item_skill_gain_multi)
 
 // Proximity_flag is 1 if this afterattack was called on something adjacent, in your square, or on your person.
 // Click parameters is the params string from byond Click() code, see that documentation.

code/_onclick/telekinesis.dm

@@ -102,9 +102,8 @@
 //stops TK grabs being equipped anywhere but into hands
 /obj/item/tk_grab/equipped(mob/user, slot)
 	if(slot == SLOT_HANDS)
-		return
+		return ..()
 	qdel(src)
-	return
 
 /obj/item/tk_grab/examine(user)
 	if (focus)

code/controllers/configuration/entries/comms.dm

@@ -25,4 +25,23 @@
 /datum/config_entry/string/medal_hub_address
 
 /datum/config_entry/string/medal_hub_password
-	protection = CONFIG_ENTRY_HIDDEN
+	protection = CONFIG_ENTRY_HIDDEN
+
+/datum/config_entry/keyed_list/cross_server_bunker_override
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_TEXT
+	protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/keyed_list/cross_server_bunker_override/ValidateAndSet(str_val)
+	. = ..()
+	if(.)
+		var/list/newv = list()
+		for(var/I in config_entry_value)
+			newv[replacetext(I, "+", " ")] = config_entry_value[I]
+		config_entry_value = newv
+
+/datum/config_entry/keyed_list/cross_server_bunker_override/ValidateListEntry(key_name, key_value)
+	return key_value != "byond:\\address:port" && ..()
+
+/datum/config_entry/flag/allow_cross_server_bunker_override
+	protection = CONFIG_ENTRY_LOCKED

code/controllers/subsystem/air.dm

@@ -6,7 +6,7 @@ SUBSYSTEM_DEF(air)
 	flags = SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
-	var/cost_turf_reactions = 0
+	var/cost_turfs = 0
 	var/cost_groups = 0
 	var/cost_highpressure = 0
 	var/cost_hotspots = 0
@@ -14,10 +14,9 @@ SUBSYSTEM_DEF(air)
 	var/cost_pipenets = 0
 	var/cost_rebuilds = 0
 	var/cost_atmos_machinery = 0
+	var/cost_equalize = 0
 
-	var/list/excited_groups = list()
 	var/list/active_turfs = list()
-	var/list/turf_react_queue = list()
 	var/list/hotspots = list()
 	var/list/networks = list()
 	var/list/pipenets_needing_rebuilt = list()
@@ -38,20 +37,25 @@ SUBSYSTEM_DEF(air)
 	var/map_loading = TRUE
 	var/list/queued_for_activation
 
+	var/log_explosive_decompression = TRUE // If things get spammy, admemes can turn this off.
+
+	var/monstermos_turf_limit = 10
+	var/monstermos_hard_turf_limit = 2000
+	var/monstermos_enabled = TRUE
+
 /datum/controller/subsystem/air/stat_entry(msg)
 	msg += "C:{"
-	msg += "RQ:[round(cost_turf_reactions,1)]|"
+	msg += "EQ:[round(cost_equalize,1)]|"
+	msg += "AT:[round(cost_turfs,1)]|"
 	msg += "EG:[round(cost_groups,1)]|"
 	msg += "HP:[round(cost_highpressure,1)]|"
 	msg += "HS:[round(cost_hotspots,1)]|"
 	msg += "SC:[round(cost_superconductivity,1)]|"
 	msg += "PN:[round(cost_pipenets,1)]|"
-	msg += "RB:[round(cost_rebuilds,1)]|"
 	msg += "AM:[round(cost_atmos_machinery,1)]"
 	msg += "} "
 	msg += "AT:[active_turfs.len]|"
-	msg += "RQ:[turf_react_queue.len]|"
-	msg += "EG:[excited_groups.len]|"
+	msg += "EG:[get_amt_excited_groups()]|"
 	msg += "HS:[hotspots.len]|"
 	msg += "PN:[networks.len]|"
 	msg += "HP:[high_pressure_delta.len]|"
@@ -59,8 +63,8 @@ SUBSYSTEM_DEF(air)
 	msg += "AT/MS:[round((cost ? active_turfs.len/cost : 0),0.1)]"
 	..(msg)
 
-
 /datum/controller/subsystem/air/Initialize(timeofday)
+	extools_update_ssair()
 	map_loading = FALSE
 	setup_allturfs()
 	setup_atmos_machinery()
@@ -68,6 +72,7 @@ SUBSYSTEM_DEF(air)
 	gas_reactions = init_gas_reactions()
 	return ..()
 
+/datum/controller/subsystem/air/proc/extools_update_ssair()
 
 /datum/controller/subsystem/air/fire(resumed = 0)
 	var/timer = TICK_USAGE_REAL
@@ -101,12 +106,21 @@ SUBSYSTEM_DEF(air)
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
-		currentpart = SSAIR_REACTQUEUE
+		currentpart = monstermos_enabled ? SSAIR_EQUALIZE : SSAIR_ACTIVETURFS
 
-	if(currentpart == SSAIR_REACTQUEUE)
+	if(currentpart == SSAIR_EQUALIZE)
 		timer = TICK_USAGE_REAL
-		process_react_queue(resumed)
-		cost_turf_reactions = MC_AVERAGE(cost_turf_reactions, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+		process_turf_equalize(resumed)
+		cost_equalize = MC_AVERAGE(cost_equalize, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+		if(state != SS_RUNNING)
+			return
+		resumed = 0
+		currentpart = SSAIR_ACTIVETURFS
+
+	if(currentpart == SSAIR_ACTIVETURFS)
+		timer = TICK_USAGE_REAL
+		process_active_turfs(resumed)
+		cost_turfs = MC_AVERAGE(cost_turfs, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
@@ -148,6 +162,8 @@ SUBSYSTEM_DEF(air)
 		resumed = 0
 	currentpart = SSAIR_REBUILD_PIPENETS
 
+
+
 /datum/controller/subsystem/air/proc/process_pipenets(resumed = 0)
 	if (!resumed)
 		src.currentrun = networks.Copy()
@@ -182,19 +198,6 @@ SUBSYSTEM_DEF(air)
 			return
 
 
-/datum/controller/subsystem/air/proc/process_react_queue(resumed = 0)
-	if(!resumed)
-		src.currentrun = turf_react_queue.Copy()
-	var/list/currentrun = src.currentrun
-	while(currentrun.len)
-		var/turf/open/T = currentrun[currentrun.len]
-		currentrun.len--
-		if(T)
-			T.process_cell_reaction()
-		if(MC_TICK_CHECK)
-			return
-
-
 /datum/controller/subsystem/air/proc/process_super_conductivity(resumed = 0)
 	if (!resumed)
 		src.currentrun = active_super_conductivity.Copy()
@@ -229,10 +232,45 @@ SUBSYSTEM_DEF(air)
 		high_pressure_delta.len--
 		T.high_pressure_movements()
 		T.pressure_difference = 0
+		T.pressure_specific_target = null
 		if(MC_TICK_CHECK)
 			return
 
+/datum/controller/subsystem/air/proc/process_turf_equalize(resumed = 0)
+	//cache for sanic speed
+	var/fire_count = times_fired
+	if (!resumed)
+		src.currentrun = active_turfs.Copy()
+	//cache for sanic speed (lists are references anyways)
+	var/list/currentrun = src.currentrun
+	while(currentrun.len)
+		var/turf/open/T = currentrun[currentrun.len]
+		currentrun.len--
+		if (T)
+			T.equalize_pressure_in_zone(fire_count)
+			//equalize_pressure_in_zone(T, fire_count)
+		if (MC_TICK_CHECK)
+			return
+
+/datum/controller/subsystem/air/proc/process_active_turfs(resumed = 0)
+	//cache for sanic speed
+	var/fire_count = times_fired
+	if (!resumed)
+		src.currentrun = active_turfs.Copy()
+	//cache for sanic speed (lists are references anyways)
+	var/list/currentrun = src.currentrun
+	while(currentrun.len)
+		var/turf/open/T = currentrun[currentrun.len]
+		currentrun.len--
+		if (T)
+			T.process_cell(fire_count)
+		if (MC_TICK_CHECK)
+			return
+
 /datum/controller/subsystem/air/proc/process_excited_groups(resumed = 0)
+	if(process_excited_groups_extools(resumed, (Master.current_ticklimit - TICK_USAGE) * 0.01 * world.tick_lag))
+		sleep()
+	/*
 	if (!resumed)
 		src.currentrun = excited_groups.Copy()
 	//cache for sanic speed (lists are references anyways)
@@ -248,29 +286,33 @@ SUBSYSTEM_DEF(air)
 			EG.dismantle()
 		if (MC_TICK_CHECK)
 			return
+	*/
+
+/datum/controller/subsystem/air/proc/process_excited_groups_extools()
+/datum/controller/subsystem/air/proc/get_amt_excited_groups()
 
 /datum/controller/subsystem/air/proc/remove_from_active(turf/open/T)
 	active_turfs -= T
-	SSair_turfs.currentrun -= T
+	if(currentpart == SSAIR_ACTIVETURFS)
+		currentrun -= T
 	#ifdef VISUALIZE_ACTIVE_TURFS
 	T.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#00ff00")
 	#endif
 	if(istype(T))
-		T.excited = 0
-		if(T.excited_group)
-			T.excited_group.garbage_collect()
-	remove_from_react_queue(T)
+		T.set_excited(FALSE)
+		T.eg_garbage_collect()
 
 /datum/controller/subsystem/air/proc/add_to_active(turf/open/T, blockchanges = 1)
 	if(istype(T) && T.air)
 		#ifdef VISUALIZE_ACTIVE_TURFS
 		T.add_atom_colour("#00ff00", TEMPORARY_COLOUR_PRIORITY)
 		#endif
-		T.excited = TRUE
-		active_turfs[T] = SSair_turfs.currentrun[T] = TRUE
-		if(blockchanges && T.excited_group)
-			T.excited_group.garbage_collect()
-		add_to_react_queue(T)
+		T.set_excited(TRUE)
+		active_turfs |= T
+		if(currentpart == SSAIR_ACTIVETURFS)
+			currentrun |= T
+		if(blockchanges)
+			T.eg_garbage_collect()
 	else if(T.flags_1 & INITIALIZED_1)
 		for(var/turf/S in T.atmos_adjacent_turfs)
 			add_to_active(S)
@@ -281,17 +323,6 @@ SUBSYSTEM_DEF(air)
 	else
 		T.requires_activation = TRUE
 
-/datum/controller/subsystem/air/proc/add_to_react_queue(turf/open/T)
-	if(istype(T) && T.air)
-		turf_react_queue[T] = TRUE
-		if(currentpart == SSAIR_REACTQUEUE)
-			currentrun[T] = TRUE
-
-/datum/controller/subsystem/air/proc/remove_from_react_queue(turf/open/T)
-	turf_react_queue -= T
-	if(currentpart == SSAIR_REACTQUEUE)
-		currentrun -= T
-
 /datum/controller/subsystem/air/StartLoadingMap()
 	LAZYINITLIST(queued_for_activation)
 	map_loading = TRUE
@@ -339,11 +370,11 @@ SUBSYSTEM_DEF(air)
 
 		while (turfs_to_check.len)
 		var/ending_ats = active_turfs.len
-		for(var/thing in excited_groups)
+		/*for(var/thing in excited_groups)
 			var/datum/excited_group/EG = thing
-			EG.self_breakdown(space_is_all_consuming = 1)
-			EG.dismantle()
-			CHECK_TICK
+			//EG.self_breakdown(space_is_all_consuming = 1)
+			//EG.dismantle()
+			CHECK_TICK*/
 
 		var/msg = "HEY! LISTEN! [DisplayTimeText(world.timeofday - timer)] were wasted processing [starting_ats] turf(s) (connected to [ending_ats] other turfs) with atmos differences at round start."
 		to_chat(world, "<span class='boldannounce'>[msg]</span>")
@@ -351,6 +382,7 @@ SUBSYSTEM_DEF(air)
 
 /turf/open/proc/resolve_active_graph()
 	. = list()
+	/*
 	var/datum/excited_group/EG = excited_group
 	if (blocks_air || !air)
 		return
@@ -371,7 +403,8 @@ SUBSYSTEM_DEF(air)
 			EG.add_turf(ET)
 		if (!ET.excited)
 			ET.excited = 1
-			. += ET
+			. += ET*/
+
 /turf/open/space/resolve_active_graph()
 	return list()
 
@@ -389,9 +422,8 @@ SUBSYSTEM_DEF(air)
 		CHECK_TICK
 
 /datum/controller/subsystem/air/proc/setup_template_machinery(list/atmos_machines)
-	if(!initialized)
-		return
-
+	if(!initialized) // yogs - fixes randomized bars
+		return // yogs
 	for(var/A in atmos_machines)
 		var/obj/machinery/atmospherics/AM = A
 		AM.atmosinit()
@@ -415,6 +447,7 @@ SUBSYSTEM_DEF(air)
 
 #undef SSAIR_PIPENETS
 #undef SSAIR_ATMOSMACHINERY
+#undef SSAIR_ACTIVETURFS
 #undef SSAIR_EXCITEDGROUPS
 #undef SSAIR_HIGHPRESSURE
 #undef SSAIR_HOTSPOTS

code/controllers/subsystem/air_turfs.dm

@@ -1,5 +1,5 @@
 //WHAT IF WE TAKE THE ACTIVE TURF PROCESSING AND PUSH IT SOMEWHERE ELSE!!!
-
+/*
 SUBSYSTEM_DEF(air_turfs)
 	name = "Atmospherics - Turfs"
 	init_order = INIT_ORDER_AIR_TURFS
@@ -24,3 +24,4 @@ SUBSYSTEM_DEF(air_turfs)
 			return
 	resumed = 0
 	return
+*/

code/datums/components/crafting/guncrafting.dm

@@ -1,4 +1,4 @@
-k// PARTS //
+// PARTS //
 /obj/item/weaponcrafting
 	icon = 'icons/obj/improvised.dmi'
 
@@ -8,61 +8,33 @@ k// PARTS //
 	custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 6)
 	icon_state = "riflestock"
 
-/obj/item/weaponcrafting/durathread_string
-	name = "durathread string"
-	desc = "A long piece of durathread with some resemblance to cable coil."
+/obj/item/weaponcrafting/string
+	name = "wound thread"
+	desc = "A long piece of thread with some resemblance to cable coil."
 	icon_state = "durastring"
 
 ////////////////////////////////
-// KAT IMPROVISED WEAPON PARTS//
+// IMPROVISED WEAPON PARTS//
 ////////////////////////////////
 
 /obj/item/weaponcrafting/improvised_parts
-	name = "Eerie bunch of coloured dots."
-	desc = "You feel the urge to report to Central that the parent type of guncrafting, which should never appear in this reality, has appeared. Whatever that means."
+	name = "Debug Improvised Gun Part"
+	desc = "A badly coded gun part. You should report coders if you see this."
 	icon = 'icons/obj/guns/gun_parts.dmi'
 	icon_state = "palette"
 
-// BARRELS
-
-/obj/item/weaponcrafting/improvised_parts/barrel_rifle
-	name = "rifle barrel"
-	desc = "A pipe with a diameter just the right size to fire 7.62 rounds out of."
-	icon_state = "barrel_rifle"
-
-/obj/item/weaponcrafting/improvised_parts/barrel_shotgun
-	name = "shotgun barrel"
-	desc = "A twenty bore shotgun barrel."
-	icon_state = "barrel_shotgun"
-
-/obj/item/weaponcrafting/improvised_parts/barrel_pistol
-	name = "pistol barrel"
-	desc = "A pipe with a small diameter and some holes finely cut into it. It fits .32 ACP bullets. Probably."
-	icon_state = "barrel_pistol"
-	w_class = WEIGHT_CLASS_SMALL
-
 // RECEIVERS
 
 /obj/item/weaponcrafting/improvised_parts/rifle_receiver
-	name = "bolt action receiver"
-	desc = "A crudely constructed receiver to create an improvised bolt-action breechloaded rifle. It's generic enough to modify to create other rifles, potentially."
+	name = "rifle receiver"
+	desc = "A crudely constructed receiver to create an improvised bolt-action breechloaded rifle."  // removed some text implying that the item had more uses than it does
 	icon_state = "receiver_rifle"
 	w_class = WEIGHT_CLASS_SMALL
 
-/obj/item/weaponcrafting/improvised_parts/pistol_receiver
-	name = "pistol receiver"
-	desc = "A receiver to connect house and connects all the parts to make an improvised pistol."
-	icon_state = "receiver_pistol"
-	w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/weaponcrafting/improvised_parts/laser_receiver
-	name = "energy emitter assembly"
-	desc = "A mixture of components haphazardly wired together to form an energy emitter."
-	icon_state = "laser_assembly"
 
 /obj/item/weaponcrafting/improvised_parts/shotgun_receiver
-	name = "break-action assembly"
-	desc = "An improvised receiver to create a break-action breechloaded shotgun. Parts of this are still useful if you want to make another type of shotgun, however."
+	name = "shotgun reciever"
+	desc = "An improvised receiver to create a break-action breechloaded shotgun."  // removed some text implying that the item had more uses than it does
 	icon_state = "receiver_shotgun"
 	w_class = WEIGHT_CLASS_SMALL
 
@@ -78,15 +50,3 @@ k// PARTS //
 	name = "wooden firearm body"
 	desc = "A crudely fashioned wooden body to help keep higher calibre improvised weapons from blowing themselves apart."
 	icon_state = "wooden_body"
-
-/obj/item/weaponcrafting/improvised_parts/wooden_grip
-	name = "wooden pistol grip"
-	desc = "A nice wooden grip hollowed out for pistol magazines."
-	icon_state = "wooden_pistolgrip"
-	w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/weaponcrafting/improvised_parts/makeshift_lens
-	name = "makeshift focusing lens"
-	desc = "A properly made lens made with actual glassworking tools would perform much better, but this will have to do."
-	icon_state = "focusing_lens"
-	w_class = WEIGHT_CLASS_TINY

code/datums/components/crafting/recipes/recipes_primal.dm

@@ -103,7 +103,7 @@
 /datum/crafting_recipe/bone_bow
 	name = "Bone Bow"
 	result = /obj/item/gun/ballistic/bow/ashen
-	time = 200
+	time = 120 // 80+120 = 200
 	always_availible = FALSE
 	reqs = list(/obj/item/stack/sheet/bone = 8,
 				 /obj/item/stack/sheet/sinew = 4)
@@ -112,7 +112,7 @@
 /datum/crafting_recipe/bow_tablet
 	name = "Sandstone Bow Making Manual"
 	result = /obj/item/book/granter/crafting_recipe/bone_bow
-	time = 600 //Scribing
+	time = 200 //Scribing // don't care
 	always_availible = FALSE
 	reqs = list(/obj/item/stack/rods = 1,
 				 /obj/item/stack/sheet/mineral/sandstone = 4)

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -192,8 +192,8 @@
 	result =  /obj/item/gun/ballistic/bow/pipe
 	reqs = list(/obj/item/pipe = 5,
 	/obj/item/stack/sheet/plastic = 15,
-	/obj/item/weaponcrafting/durathread_string = 5)
-	time = 450
+	/obj/item/weaponcrafting/string = 5)
+	time = 150
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
@@ -248,10 +248,10 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
-/datum/crafting_recipe/ishotgun
+/datum/crafting_recipe/ishotgun // smaller and more versatile gun requires some better materials
 	name = "Improvised Shotgun"
 	result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised
-	reqs = list(/obj/item/weaponcrafting/improvised_parts/barrel_shotgun = 1,
+	reqs = list(/obj/item/pipe = 2, // putting a large amount of meaningless timegates by forcing people to turn base resources into upgraded resources kinda sucks
 				/obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 1,
 				/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 1,
 				/obj/item/weaponcrafting/improvised_parts/wooden_body = 1,
@@ -262,10 +262,10 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
-/datum/crafting_recipe/irifle
+/datum/crafting_recipe/irifle // larger and less versatile gun, but a bit easier to make
 	name = "Improvised Rifle (7.62mm)"
 	result = /obj/item/gun/ballistic/shotgun/boltaction/improvised
-	reqs = list(/obj/item/weaponcrafting/improvised_parts/barrel_rifle = 1,
+	reqs = list(/obj/item/pipe = 2, // above
 				/obj/item/weaponcrafting/improvised_parts/rifle_receiver = 1,
 				/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 1,
 				/obj/item/weaponcrafting/improvised_parts/wooden_body = 1,
@@ -276,49 +276,6 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
-/datum/crafting_recipe/ipistol
-	name = "Improvised Pistol (.32)"
-	result = /obj/item/gun/ballistic/automatic/pistol/improvised/nomag
-	reqs = list(/obj/item/weaponcrafting/improvised_parts/barrel_pistol = 1,
-				/obj/item/weaponcrafting/improvised_parts/pistol_receiver = 1,
-				/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 1,
-				/obj/item/weaponcrafting/improvised_parts/wooden_grip = 1,
-				/obj/item/stack/sheet/plastic = 15,
-				/obj/item/stack/sheet/plasteel = 1)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_WIRECUTTER)
-	time = 100
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/ilaser
-	name = "Improvised Energy Gun"
-	result = /obj/item/gun/energy/e_gun/old/improvised
-	reqs = list(/obj/item/weaponcrafting/improvised_parts/laser_receiver = 1,
-				/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 1,
-				/obj/item/weaponcrafting/improvised_parts/makeshift_lens = 1,
-				/obj/item/stock_parts/cell = 1,
-				/obj/item/stack/sheet/metal = 10,
-				/obj/item/stack/sheet/plasteel = 5,
-				/obj/item/stack/cable_coil = 10)
-	tools = list(TOOL_SCREWDRIVER)
-	time = 100
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/ilaser/upgraded
-	name = "Improvised Energy Gun Upgrade"
-	result = /obj/item/gun/energy/e_gun/old/improvised/upgraded
-	reqs = list(/obj/item/gun/energy/e_gun/old/improvised = 1,
-				/obj/item/glasswork/glass_base/lens = 1,
-				/obj/item/stock_parts/capacitor/quadratic = 2,
-				/obj/item/stock_parts/micro_laser/ultra = 1,
-				/obj/item/stock_parts/cell/bluespace = 1,
-				/obj/item/stack/cable_coil = 5)
-	tools = list(TOOL_SCREWDRIVER, TOOL_MULTITOOL)
-	time = 100
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-
 //////////////////
 ///AMMO CRAFTING//
 //////////////////
@@ -326,9 +283,9 @@
 /datum/crafting_recipe/arrow
 	name = "Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow/wood
-	time = 30
+	time = 5 // these only do 15 damage
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
-				 /obj/item/stack/sheet/durathread = 1,
+				 /obj/item/stack/sheet/cloth = 1,
 				 /obj/item/stack/rods = 1) // 1 metal sheet = 2 rods = 2 arrows
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
@@ -336,7 +293,7 @@
 /datum/crafting_recipe/bone_arrow
 	name = "Bone Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow/bone
-	time = 30
+	time = 5
 	always_availible = FALSE
 	reqs = list(/obj/item/stack/sheet/bone = 1,
 				 /obj/item/stack/sheet/sinew = 1,
@@ -348,7 +305,7 @@
 	name = "Ashen Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow/ash
 	tools = list(TOOL_WELDER)
-	time = 30
+	time = 10 // 1.5 seconds minimum per actually worthwhile arrow excluding interface lag
 	always_availible = FALSE
 	reqs = list(/obj/item/ammo_casing/caseless/arrow/wood = 1)
 	category = CAT_WEAPONRY
@@ -442,92 +399,28 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 
-/datum/crafting_recipe/m32acp
-	name = ".32ACP Empty Magazine"
-	result = /obj/item/ammo_box/magazine/m32acp/empty
-	reqs = list(/obj/item/stack/sheet/metal = 3,
-				/obj/item/stack/sheet/plasteel = 1,
-				/obj/item/stack/packageWrap = 1)
-	tools = list(TOOL_WELDER,TOOL_SCREWDRIVER)
-	time = 5
-	category = CAT_WEAPONRY
-	subcategory = CAT_AMMO
-
 ////////////////////
 // PARTS CRAFTING //
 ////////////////////
 
-// BARRELS
-
-/datum/crafting_recipe/rifle_barrel
-	name = "Improvised Rifle Barrel"
-	result = /obj/item/weaponcrafting/improvised_parts/barrel_rifle
-	reqs = list(/obj/item/pipe = 2)
-	tools = list(TOOL_WELDER,TOOL_SAW)
-	time = 150
-	category = CAT_WEAPONRY
-	subcategory = CAT_PARTS
-
-/datum/crafting_recipe/shotgun_barrel
-	name = "Improvised Shotgun Barrel"
-	result = /obj/item/weaponcrafting/improvised_parts/barrel_shotgun
-	reqs = list(/obj/item/pipe = 2)
-	tools = list(TOOL_WELDER,TOOL_SAW)
-	time = 150
-	category = CAT_WEAPONRY
-	subcategory = CAT_PARTS
-
-/datum/crafting_recipe/pistol_barrel
-	name = "Improvised Pistol Barrel"
-	result = /obj/item/weaponcrafting/improvised_parts/barrel_pistol
-	reqs = list(/obj/item/pipe = 1,
-				/obj/item/stack/sheet/plasteel = 1)
-	tools = list(TOOL_WELDER,TOOL_SAW)
-	time = 150
-	category = CAT_WEAPONRY
-	subcategory = CAT_PARTS
-
 // RECEIVERS
 
 /datum/crafting_recipe/rifle_receiver
 	name = "Improvised Rifle Receiver"
 	result = /obj/item/weaponcrafting/improvised_parts/rifle_receiver
-	reqs = list(/obj/item/stack/sheet/metal = 10,
-				/obj/item/stack/sheet/plasteel = 1)
+	reqs = list(/obj/item/stack/sheet/metal = 15) // you can carry multiple shotguns
 	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
-	time = 50
+	time = 25
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS
 
 /datum/crafting_recipe/shotgun_receiver
 	name = "Improvised Shotgun Receiver"
 	result = /obj/item/weaponcrafting/improvised_parts/shotgun_receiver
-	reqs = list(/obj/item/stack/sheet/metal = 10,
-				/obj/item/stack/sheet/plasteel = 1)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) // Dual wielding has been removed, plasteel is a soft timesink to obtain for most to make mass production harder.
-	time = 50
-	category = CAT_WEAPONRY
-	subcategory = CAT_PARTS
-
-/datum/crafting_recipe/pistol_receiver
-	name = "Improvised Pistol Receiver"
-	result = /obj/item/weaponcrafting/improvised_parts/pistol_receiver
-	reqs = list(/obj/item/stack/sheet/metal = 5,
-				/obj/item/stack/sheet/plasteel = 1)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_SAW)
-	time = 50
-	category = CAT_WEAPONRY
-	subcategory = CAT_PARTS
-
-/datum/crafting_recipe/laser_receiver
-	name = "Energy Weapon Assembly"
-	result = /obj/item/weaponcrafting/improvised_parts/laser_receiver
-	reqs = list(/obj/item/stack/sheet/metal = 10,
-				/obj/item/stock_parts/capacitor = 2,
-				/obj/item/stock_parts/micro_laser = 1,
-				/obj/item/assembly/prox_sensor = 1)
-	tools = list(TOOL_SCREWDRIVER, TOOL_MULTITOOL, TOOL_WELDER) // Prox sensor and multitool for the circuit board, welder for extremely ghetto soldering.
-	time = 150
+	reqs = list(/obj/item/stack/sheet/metal = 15,
+				/obj/item/stack/sheet/plasteel = 1) // requires access or hacking since shotgun is better
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
+	time = 25
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS
 
@@ -539,16 +432,6 @@
 	reqs = list(/obj/item/stack/sheet/metal = 3,
 				/obj/item/assembly/igniter = 1)
 	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
-	time = 150
-	category = CAT_WEAPONRY
-	subcategory = CAT_PARTS
-
-/datum/crafting_recipe/makeshift_lens
-	name = "Makeshift Lens"
-	result = /obj/item/weaponcrafting/improvised_parts/makeshift_lens
-	reqs = list(/obj/item/stack/sheet/metal = 1,
-				/obj/item/stack/sheet/glass = 2)
-	tools = list(TOOL_WELDER) // Glassmaking lets you make non-makeshift lenses.
-	time = 50
+	time = 25
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS

code/datums/components/wet_floor.dm

@@ -121,7 +121,7 @@
 		if(-INFINITY to T0C)
 			add_wet(TURF_WET_ICE, max_time_left())			//Water freezes into ice!
 		if(T0C to T0C + 100)
-			decrease = ((T.air.temperature - T0C) / SSwet_floors.temperature_coeff) * (diff / SSwet_floors.time_ratio)
+			decrease = ((T.air.return_temperature() - T0C) / SSwet_floors.temperature_coeff) * (diff / SSwet_floors.time_ratio)
 		if(T0C + 100 to INFINITY)
 			decrease = INFINITY
 	decrease = max(0, decrease)

code/datums/datum.dm

@@ -39,6 +39,9 @@
 	/// A weak reference to another datum
 	var/datum/weakref/weak_reference
 
+	///Lazy associative list of currently active cooldowns.
+	var/list/cooldowns
+
 #ifdef TESTING
 	var/running_find_references
 	var/last_find_references = 0
@@ -201,3 +204,34 @@
 		qdel(D)
 	else
 		return returned
+
+/**
+  * Callback called by a timer to end an associative-list-indexed cooldown.
+  *
+  * Arguments:
+  * * source - datum storing the cooldown
+  * * index - string index storing the cooldown on the cooldowns associative list
+  *
+  * This sends a signal reporting the cooldown end.
+  */
+/proc/end_cooldown(datum/source, index)
+	if(QDELETED(source))
+		return
+	SEND_SIGNAL(source, COMSIG_CD_STOP(index))
+	TIMER_COOLDOWN_END(source, index)
+
+
+/**
+  * Proc used by stoppable timers to end a cooldown before the time has ran out.
+  *
+  * Arguments:
+  * * source - datum storing the cooldown
+  * * index - string index storing the cooldown on the cooldowns associative list
+  *
+  * This sends a signal reporting the cooldown end, passing the time left as an argument.
+  */
+/proc/reset_cooldown(datum/source, index)
+	if(QDELETED(source))
+		return
+	SEND_SIGNAL(source, COMSIG_CD_RESET(index), S_TIMER_COOLDOWN_TIMELEFT(source, index))
+	TIMER_COOLDOWN_END(source, index)

code/datums/diseases/advance/symptoms/heal.dm

@@ -404,7 +404,7 @@
 	if(M.loc)
 		environment = M.loc.return_air()
 	if(environment)
-		plasmamount = environment.gases[/datum/gas/plasma]
+		plasmamount = environment.get_moles(/datum/gas/plasma)
 		if(plasmamount && plasmamount > GLOB.meta_gas_visibility[/datum/gas/plasma]) //if there's enough plasma in the air to see
 			. += power * 0.5
 	if(M.reagents.has_reagent(/datum/reagent/toxin/plasma))

code/datums/dna.dm

@@ -678,7 +678,7 @@
 	holder.update_transform()
 	var/danger = CONFIG_GET(number/threshold_body_size_slowdown)
 	if(features["body_size"] < danger)
-		var/slowdown = 1 + round(danger/features["body_size"], 0.1) * CONFIG_GET(number/body_size_slowdown_multiplier)
+		var/slowdown = (1 - round(features["body_size"] / danger, 0.1)) * CONFIG_GET(number/body_size_slowdown_multiplier)
 		holder.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/small_stride, TRUE, slowdown)
 	else if(old_size < danger)
 		holder.remove_movespeed_modifier(/datum/movespeed_modifier/small_stride)

code/datums/helper_datums/teleport.dm

@@ -117,9 +117,8 @@
 			continue
 
 		var/datum/gas_mixture/A = F.air
-		var/list/A_gases = A.gases
 		var/trace_gases
-		for(var/id in A_gases)
+		for(var/id in A.get_gases())
 			if(id in GLOB.hardcoded_gases)
 				continue
 			trace_gases = TRUE
@@ -128,15 +127,15 @@
 		// Can most things breathe?
 		if(trace_gases)
 			continue
-		if(A_gases[/datum/gas/oxygen] <= 16)
+		if(A.get_moles(/datum/gas/oxygen) < 16)
 			continue
-		if(A_gases[/datum/gas/plasma])
+		if(A.get_moles(/datum/gas/plasma))
 			continue
-		if(A_gases[/datum/gas/carbon_dioxide] >= 10)
+		if(A.get_moles(/datum/gas/carbon_dioxide) >= 10)
 			continue
 
 		// Aim for goldilocks temperatures and pressure
-		if((A.temperature <= 270) || (A.temperature >= 360))
+		if((A.return_temperature() <= 270) || (A.return_temperature() >= 360))
 			continue
 		var/pressure = A.return_pressure()
 		if((pressure <= 20) || (pressure >= 550))

code/datums/martial/boxing.dm

@@ -58,12 +58,10 @@
 	var/datum/martial_art/boxing/style = new
 
 /obj/item/clothing/gloves/boxing/equipped(mob/user, slot)
-	if(!ishuman(user))
-		return
-	if(slot == SLOT_GLOVES)
+	. = ..()
+	if(ishuman(user) && slot == SLOT_GLOVES)
 		var/mob/living/carbon/human/H = user
 		style.teach(H,TRUE)
-	return
 
 /obj/item/clothing/gloves/boxing/dropped(mob/user)
 	. = ..()

code/datums/martial/krav_maga.dm

@@ -196,9 +196,8 @@
 	var/datum/martial_art/krav_maga/style = new
 
 /obj/item/clothing/gloves/krav_maga/equipped(mob/user, slot)
-	if(!ishuman(user))
-		return
-	if(slot == SLOT_GLOVES)
+	. = ..()
+	if(ishuman(user) && slot == SLOT_GLOVES)
 		var/mob/living/carbon/human/H = user
 		style.teach(H,1)
 

code/datums/martial/wrestling.dm

@@ -377,7 +377,7 @@
 	var/turf/ST = null
 	var/falling = 0
 	var/damage = damage_roll(A,D)
-	
+
 	for (var/obj/O in oview(1, A))
 		if (O.density == 1)
 			if (O == A)
@@ -472,12 +472,10 @@
 	var/datum/martial_art/wrestling/style = new
 
 /obj/item/storage/belt/champion/wrestling/equipped(mob/user, slot)
-	if(!ishuman(user))
-		return
-	if(slot == SLOT_BELT)
+	. = ..()
+	if(ishuman(user) && slot == SLOT_BELT)
 		var/mob/living/carbon/human/H = user
 		style.teach(H,1)
-	return
 
 /obj/item/storage/belt/champion/wrestling/dropped(mob/user)
 	. = ..()

code/datums/mutations/actions.dm

@@ -226,9 +226,8 @@
 /obj/effect/proc_holder/spell/targeted/olfaction/cast(list/targets, mob/living/user = usr)
 	//can we sniff? is there miasma in the air?
 	var/datum/gas_mixture/air = user.loc.return_air()
-	var/list/cached_gases = air.gases
 
-	if(cached_gases[/datum/gas/miasma])
+	if(air.get_moles(/datum/gas/miasma))
 		user.adjust_disgust(sensitivity * 45)
 		to_chat(user, "<span class='warning'>With your overly sensitive nose, you get a whiff of stench and feel sick! Try moving to a cleaner area!</span>")
 		return

code/datums/skills/_check_skills.dm

@@ -40,7 +40,7 @@
 	. = list()
 	.["playername"] = owner.name
 	.["see_skill_mods"] = see_skill_mods
-	.["admin"] = check_rights(R_DEBUG)
+	.["admin"] = check_rights(R_DEBUG, FALSE)
 
 /datum/skill_holder/ui_act(action, params)
 	. = ..()

code/datums/skills/_skill.dm

@@ -33,6 +33,10 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	var/base_multiplier = 1
 	/// Value added to the base multiplier depending on overall competency compared to maximum value/level.
 	var/competency_multiplier = 1
+	/// Experience gain multiplier gained from using items.
+	var/item_skill_gain_multi = 1
+	/// Skill gain quantisation
+	var/skill_gain_quantisation = 0.1
 	/// A list of ways this skill can affect or be affected through actions and skill modifiers.
 	var/list/skill_traits = list(SKILL_SANITY, SKILL_INTELLIGENCE)
 	/// Index of this skill in the UI
@@ -108,6 +112,10 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	/// Min value of this skill
 	var/min_value = 0
 
+/datum/skill/numerical/New()
+	..()
+	skill_gain_quantisation = item_skill_gain_multi = item_skill_gain_multi * (max_value - min_value) * STD_NUM_SKILL_ITEM_GAIN_MULTI
+
 /datum/skill/numerical/sanitize_value(new_value)
 	return clamp(new_value, min_value, max_value)
 

code/datums/skills/_skill_holder.dm

@@ -91,10 +91,10 @@
 		CRASH("Invalid set_skill_value call. Use skill typepaths.")	//until a time when we somehow need text ids for dynamic skills, I'm enforcing this.
 	var/datum/skill/S = GLOB.skill_datums[skill]
 	value = S.sanitize_value(value)
-	skill_holder.need_static_data_update = TRUE
 	if(!isnull(value))
 		LAZYINITLIST(skill_holder.skills)
 		S.set_skill_value(skill_holder, value, src, silent)
+		skill_holder.need_static_data_update = TRUE
 		return TRUE
 	return FALSE
 
@@ -120,11 +120,9 @@
 		CRASH("You cannot auto increment a non numerical(experience skill!")
 	var/current = get_skill_value(skill, FALSE)
 	var/affinity = get_skill_affinity(skill)
-	var/target_value = current + (value * affinity)
-	if(maximum)
-		target_value = min(target_value, maximum)
-		if(target_value == maximum) //no more experience to gain, early return.
-			return
+	var/target_value = round(current + (value * affinity), S.skill_gain_quantisation)
+	if(maximum && target_value >= maximum) //no more experience to gain, early return.
+		return
 	boost_skill_value_to(skill, target_value, silent, current)
 
 /**

code/datums/world_topic.dm

@@ -74,6 +74,25 @@
 	for(var/client/C in GLOB.clients)
 		C.AnnouncePR(final_composed)
 
+/datum/world_topic/auto_bunker_passthrough
+	keyword = "auto_bunker_override"
+	require_comms_key = TRUE
+
+/datum/world_topic/auto_bunker_passthrough/Run(list/input)
+	if(!CONFIG_GET(flag/allow_cross_server_bunker_override))
+		return "Function Disabled"
+	var/ckeytobypass = input["ckey"]
+	var/is_new_ckey = !(ckey(ckeytobypass) in GLOB.bunker_passthrough)
+	var/sender = input["source"] || "UNKNOWN"
+	GLOB.bunker_passthrough |= ckey(ckeytobypass)
+	GLOB.bunker_passthrough[ckey(ckeytobypass)] = world.realtime
+	SSpersistence.SavePanicBunker() //we can do this every time, it's okay
+	if(!is_new_ckey)
+		log_admin("AUTO BUNKER: [ckeytobypass] given access (incoming comms from [sender]).")
+		message_admins("AUTO BUNKER: [ckeytobypass] given access (incoming comms from [sender]).")
+		send2irc("Panic Bunker", "AUTO BUNKER: [ckeytobypass] given access (incoming comms from [sender]).")
+	return "Success"
+
 /datum/world_topic/ahelp_relay
 	keyword = "Ahelp"
 	require_comms_key = TRUE

code/game/gamemodes/objective.dm

@@ -201,10 +201,13 @@ GLOBAL_LIST_EMPTY(objectives)
 	return won || ..()
 
 /datum/objective/assassinate/once/process()
-	won = check_completion()
+	won = check_midround_completion()
 	if(won)
 		STOP_PROCESSING(SSprocessing,src)
 
+/datum/objective/assassinate/once/proc/check_midround_completion()
+	return won || !considered_alive(target) //The target afking / logging off for a bit during the round doesn't complete it, but them being afk at roundend does.
+
 /datum/objective/assassinate/internal
 	var/stolen = 0 		//Have we already eliminated this target?
 

code/game/gamemodes/objective_items.dm

@@ -125,7 +125,7 @@
 /datum/objective_item/steal/plasma/check_special_completion(obj/item/tank/T)
 	var/target_amount = text2num(name)
 	var/found_amount = 0
-	found_amount += T.air_contents.gases[/datum/gas/plasma]
+	found_amount += T.air_contents.get_moles(/datum/gas/plasma)
 	return found_amount>=target_amount
 
 

code/game/machinery/cloning.dm

@@ -26,6 +26,7 @@
 	var/efficiency
 
 	var/datum/mind/clonemind
+	var/get_clone_mind = CLONEPOD_GET_MIND
 	var/grab_ghost_when = CLONER_MATURE_CLONE
 
 	var/internal_radio = TRUE
@@ -134,43 +135,44 @@
 	return examine(user)
 
 //Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, mutation_index, mindref, datum/species/mrace, list/features, factions, list/quirks, datum/bank_account/insurance, list/traumas)
+/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, mutation_index, mindref, blood_type, datum/species/mrace, list/features, factions, list/quirks, datum/bank_account/insurance, list/traumas)
 	if(panel_open)
 		return FALSE
 	if(mess || attempting)
 		return FALSE
-	clonemind = locate(mindref) in SSticker.minds
-	if(!istype(clonemind))	//not a mind
-		return FALSE
-	if(!QDELETED(clonemind.current))
-		if(clonemind.current.stat != DEAD)	//mind is associated with a non-dead body
+	if(get_clone_mind == CLONEPOD_GET_MIND)
+		clonemind = locate(mindref) in SSticker.minds
+		if(!istype(clonemind))	//not a mind
 			return FALSE
-		if(clonemind.current.suiciding) // Mind is associated with a body that is suiciding.
+		if(!QDELETED(clonemind.current))
+			if(clonemind.current.stat != DEAD)	//mind is associated with a non-dead body
+				return FALSE
+			if(clonemind.current.suiciding) // Mind is associated with a body that is suiciding.
+				return FALSE
+			if(AmBloodsucker(clonemind.current)) //If the mind is a bloodsucker
+				return FALSE
+		if(clonemind.active)	//somebody is using that mind
+			if( ckey(clonemind.key)!=ckey )
+				return FALSE
+		else
+			// get_ghost() will fail if they're unable to reenter their body
+			var/mob/dead/observer/G = clonemind.get_ghost()
+			if(!G)
+				return FALSE
+			if(G.suiciding) // The ghost came from a body that is suiciding.
+				return FALSE
+		if(clonemind.damnation_type) //Can't clone the damned.
+			INVOKE_ASYNC(src, .proc/horrifyingsound)
+			mess = TRUE
+			update_icon()
 			return FALSE
-		if(AmBloodsucker(clonemind.current)) //If the mind is a bloodsucker
-			return FALSE
-	if(clonemind.active)	//somebody is using that mind
-		if( ckey(clonemind.key)!=ckey )
-			return FALSE
-	else
-		// get_ghost() will fail if they're unable to reenter their body
-		var/mob/dead/observer/G = clonemind.get_ghost()
-		if(!G)
-			return FALSE
-		if(G.suiciding) // The ghost came from a body that is suiciding.
-			return FALSE
-	if(clonemind.damnation_type) //Can't clone the damned.
-		INVOKE_ASYNC(src, .proc/horrifyingsound)
-		mess = TRUE
-		update_icon()
-		return FALSE
 	current_insurance = insurance
 	attempting = TRUE //One at a time!!
 	countdown.start()
 
 	var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)
 
-	H.hardset_dna(ui, mutation_index, H.real_name, null, mrace, features)
+	H.hardset_dna(ui, mutation_index, H.real_name, blood_type, mrace, features)
 
 	H.easy_randmut(NEGATIVE+MINOR_NEGATIVE) //100% bad mutation. Can be cured with mutadone.
 
@@ -192,7 +194,14 @@
 	ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
 	H.Unconscious(80)
 
-	clonemind.transfer_to(H)
+	if(clonemind)
+		clonemind.transfer_to(H)
+
+	else if(get_clone_mind == CLONEPOD_POLL_MIND)
+		var/list/candidates = pollCandidatesForMob("Do you want to play as [clonename]'s defective clone? (Don't ERP without permission from the original)", null, null, null, 100, H, POLL_IGNORE_CLONE)
+		if(LAZYLEN(candidates))
+			var/mob/C = pick(candidates)
+			H.key = C.key
 
 	if(grab_ghost_when == CLONER_FRESH_CLONE)
 		H.grab_ghost()
@@ -549,6 +558,17 @@
 		. += "cover-on"
 	. += "panel"
 
+//Experimental cloner; clones a body regardless of the owner's status, letting a ghost control it instead
+/obj/machinery/clonepod/experimental
+	name = "experimental cloning pod"
+	desc = "An ancient cloning pod. It seems to be an early prototype of the experimental cloners used in Nanotrasen Stations."
+	icon = 'icons/obj/machines/cloning.dmi'
+	icon_state = "pod_0"
+	req_access = null
+	circuit = /obj/item/circuitboard/machine/clonepod/experimental
+	internal_radio = FALSE
+	get_clone_mind = CLONEPOD_POLL_MIND
+
 /*
  *	Manual -- A big ol' manual.
  */

code/game/machinery/computer/atmos_control.dm

@@ -53,14 +53,14 @@
 			"id_tag" = id_tag,
 			"timestamp" = world.time,
 			"pressure" = air_sample.return_pressure(),
-			"temperature" = air_sample.temperature,
+			"temperature" = air_sample.return_temperature(),
 			"gases" = list()
 		))
 		var/total_moles = air_sample.total_moles()
 		if(total_moles)
-			for(var/gas_id in air_sample.gases)
+			for(var/gas_id in air_sample.get_gases())
 				var/gas_name = GLOB.meta_gas_names[gas_id]
-				signal.data["gases"][gas_name] = air_sample.gases[gas_id] / total_moles * 100
+				signal.data["gases"][gas_name] = air_sample.get_moles(gas_id) / total_moles * 100
 
 		radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 

code/game/machinery/computer/cloning.dm

@@ -8,6 +8,7 @@
 	circuit = /obj/item/circuitboard/computer/cloning
 	req_access = list(ACCESS_HEADS) //ONLY USED FOR RECORD DELETION RIGHT NOW.
 	var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
+	var/clonepod_type = /obj/machinery/clonepod
 	var/list/pods //Linked cloning pods
 	var/temp = "Inactive"
 	var/scantemp_ckey
@@ -17,6 +18,7 @@
 	var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything.
 	var/loading = 0 // Nice loading text
 	var/autoprocess = 0
+	var/use_records = TRUE // Old experimental cloner.
 	var/list/records = list()
 
 	light_color = LIGHT_COLOR_BLUE
@@ -36,29 +38,32 @@
 	return ..()
 
 /obj/machinery/computer/cloning/proc/GetAvailablePod(mind = null)
-	if(pods)
-		for(var/P in pods)
-			var/obj/machinery/clonepod/pod = P
-			if(pod.occupant && pod.clonemind == mind)
-				return null
-			if(pod.is_operational() && !(pod.occupant || pod.mess))
-				return pod
+	if(!pods)
+		return
+	for(var/P in pods)
+		var/obj/machinery/clonepod/pod = P
+		if(pod.occupant && pod.get_clone_mind == CLONEPOD_GET_MIND && pod.clonemind == mind)
+			return null
+		if(pod.is_operational() && !(pod.occupant || pod.mess))
+			return pod
 
 /obj/machinery/computer/cloning/proc/HasEfficientPod()
-	if(pods)
-		for(var/P in pods)
-			var/obj/machinery/clonepod/pod = P
-			if(pod.is_operational() && pod.efficiency > 5)
-				return TRUE
+	if(!pods)
+		return
+	for(var/P in pods)
+		var/obj/machinery/clonepod/pod = P
+		if(pod.is_operational() && pod.efficiency > 5)
+			return TRUE
 
 /obj/machinery/computer/cloning/proc/GetAvailableEfficientPod(mind = null)
-	if(pods)
-		for(var/P in pods)
-			var/obj/machinery/clonepod/pod = P
-			if(pod.occupant && pod.clonemind == mind)
-				return pod
-			else if(!. && pod.is_operational() && !(pod.occupant || pod.mess) && pod.efficiency > 5)
-				. = pod
+	if(!pods)
+		return
+	for(var/P in pods)
+		var/obj/machinery/clonepod/pod = P
+		if(pod.occupant && pod.clonemind == mind)
+			return pod
+		else if(!. && pod.is_operational() && !(pod.occupant || pod.mess) && pod.efficiency > 5)
+			. = pod
 
 /obj/machinery/computer/cloning/process()
 	if(!(scanner && LAZYLEN(pods) && autoprocess))
@@ -73,7 +78,7 @@
 		if(pod.occupant)
 			continue	//how though?
 
-		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"], R.fields["traumas"]))
+		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["blood_type"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"], R.fields["traumas"]))
 			temp = "[R.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
 			records -= R
 
@@ -103,12 +108,10 @@
 	return null
 
 /obj/machinery/computer/cloning/proc/findcloner()
-	var/obj/machinery/clonepod/podf = null
-
+	var/obj/machinery/clonepod/podf
 	for(var/direction in GLOB.cardinals)
-
-		podf = locate(/obj/machinery/clonepod, get_step(src, direction))
-		if (!isnull(podf) && podf.is_operational())
+		podf = locate(clonepod_type, get_step(src, direction))
+		if(podf?.is_operational())
 			AttachCloner(podf)
 
 /obj/machinery/computer/cloning/proc/AttachCloner(obj/machinery/clonepod/pod)
@@ -132,7 +135,7 @@
 	else if(istype(W, /obj/item/multitool))
 		var/obj/item/multitool/P = W
 
-		if(istype(P.buffer, /obj/machinery/clonepod))
+		if(istype(P.buffer, clonepod_type))
 			if(get_area(P.buffer) != get_area(src))
 				to_chat(user, "<font color = #666633>-% Cannot link machines across power zones. Buffer cleared %-</font color>")
 				P.buffer = null
@@ -157,13 +160,14 @@
 	var/dat = ""
 	dat += "<a href='byond://?src=[REF(src)];refresh=1'>Refresh</a>"
 
-	if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL)
-		if(!autoprocess)
-			dat += "<a href='byond://?src=[REF(src)];task=autoprocess'>Autoclone</a>"
+	if(use_records)
+		if(scanner && HasEfficientPod() && scanner.scan_level >= AUTOCLONING_MINIMAL_LEVEL)
+			if(!autoprocess)
+				dat += "<a href='byond://?src=[REF(src)];task=autoprocess'>Autoclone</a>"
+			else
+				dat += "<a href='byond://?src=[REF(src)];task=stopautoprocess'>Stop autoclone</a>"
 		else
-			dat += "<a href='byond://?src=[REF(src)];task=stopautoprocess'>Stop autoclone</a>"
-	else
-		dat += "<span class='linkOff'>Autoclone</span>"
+			dat += "<span class='linkOff'>Autoclone</span>"
 	dat += "<h3>Cloning Pod Status</h3>"
 	dat += "<div class='statusDisplay'>[temp]&nbsp;</div>"
 
@@ -190,26 +194,29 @@
 				else if(loading)
 					dat += "[scanner_occupant] => Scanning..."
 				else
-					if(scanner_occupant.ckey != scantemp_ckey)
-						scantemp = "Ready to Scan"
-						scantemp_ckey = scanner_occupant.ckey
+					if(use_records)
+						if(scanner_occupant.ckey != scantemp_ckey)
+							scantemp = "Ready to Scan"
+							scantemp_ckey = scanner_occupant.ckey
+					else
+						scantemp = "Ready to Clone"
 					dat += "[scanner_occupant] => [scantemp]"
 				dat += "</div>"
 
 				if(scanner_occupant)
-					dat += "<a href='byond://?src=[REF(src)];scan=1'>Start Scan</a>"
-					dat += "<br><a href='byond://?src=[REF(src)];lock=1'>[src.scanner.locked ? "Unlock Scanner" : "Lock Scanner"]</a>"
+					dat += "<a href='byond://?src=[REF(src)];scan=1'>[use_records ? "Start Scan" : "Clone"]</a>"
+					dat += "<br><a href='byond://?src=[REF(src)];lock=1'>[scanner.locked ? "Unlock Scanner" : "Lock Scanner"]</a>"
 				else
-					dat += "<span class='linkOff'>Start Scan</span>"
-
-			// Database
-			dat += "<h3>Database Functions</h3>"
-			if (src.records.len && src.records.len > 0)
-				dat += "<a href='byond://?src=[REF(src)];menu=2'>View Records ([src.records.len])</a><br>"
-			else
-				dat += "<span class='linkOff'>View Records (0)</span><br>"
-			if (src.diskette)
-				dat += "<a href='byond://?src=[REF(src)];disk=eject'>Eject Disk</a><br>"
+					dat += "<span class='linkOff'>[use_records ? "Start Scan" : "Clone"]</span>"
+			if(use_records)
+				// Database
+				dat += "<h3>Database Functions</h3>"
+				if (src.records.len && src.records.len > 0)
+					dat += "<a href='byond://?src=[REF(src)];menu=2'>View Records ([src.records.len])</a><br>"
+				else
+					dat += "<span class='linkOff'>View Records (0)</span><br>"
+				if (src.diskette)
+					dat += "<a href='byond://?src=[REF(src)];disk=eject'>Eject Disk</a><br>"
 
 
 
@@ -290,24 +297,19 @@
 				autoprocess = FALSE
 				STOP_PROCESSING(SSmachines, src)
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		. = TRUE
 
 	else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational())
 		scantemp = ""
 
-		loading = 1
+		loading = TRUE
 		src.updateUsrDialog()
 		playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
 		say("Initiating scan...")
 		var/prev_locked = scanner.locked
 		scanner.locked = TRUE
-		spawn(20)
-			src.scan_occupant(scanner.occupant)
-
-			loading = 0
-			src.updateUsrDialog()
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-			scanner.locked = prev_locked
-
+		addtimer(CALLBACK(src, .proc/finish_scan, scanner.occupant, prev_locked), 2 SECONDS)
+		. = TRUE
 
 		//No locking an open scanner.
 	else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational())
@@ -317,8 +319,17 @@
 		else
 			scanner.locked = FALSE
 			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+		. = TRUE
 
-	else if(href_list["view_rec"])
+
+	else if (href_list["refresh"])
+		src.updateUsrDialog()
+		playsound(src, "terminal_type", 25, 0)
+		. = TRUE
+
+	if(. || !use_records)
+		return
+	if(href_list["view_rec"])
 		playsound(src, "terminal_type", 25, 0)
 		src.active_record = find_record("id", href_list["view_rec"], records)
 		if(active_record)
@@ -330,6 +341,7 @@
 				src.menu = 3
 		else
 			src.temp = "Record missing."
+		. = TRUE
 
 	else if (href_list["del_rec"])
 		if ((!src.active_record) || (src.menu < 3))
@@ -353,8 +365,9 @@
 				else
 					src.temp = "<font class='bad'>Access Denied.</font>"
 					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		. = TRUE
 
-	else if (href_list["disk"]) //Load or eject.
+	else if (href_list["disk"] && use_records) //Load or eject.
 		switch(href_list["disk"])
 			if("load")
 				if (!diskette || !istype(diskette.fields) || !diskette.fields["name"] || !diskette.fields)
@@ -392,10 +405,7 @@
 				diskette.name = "data disk - '[src.diskette.fields["name"]]'"
 				src.temp = "Save successful."
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
-	else if (href_list["refresh"])
-		src.updateUsrDialog()
-		playsound(src, "terminal_type", 25, 0)
+		. = TRUE
 
 	else if (href_list["clone"])
 		var/datum/data/record/C = find_record("id", href_list["clone"], records)
@@ -415,7 +425,7 @@
 			else if(pod.occupant)
 				temp = "<font class='bad'>Cloning cycle already in progress.</font>"
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"], C.fields["bank_account"]))
+			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["blood_type"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"], C.fields["bank_account"], C.fields["traumas"]))
 				temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 				records.Remove(C)
@@ -429,14 +439,28 @@
 		else
 			temp = "<font class='bad'>Data corruption.</font>"
 			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		. = TRUE
 
-	else if (href_list["menu"])
-		src.menu = text2num(href_list["menu"])
+	else if (href_list["menu"] && use_records)
+		menu = text2num(href_list["menu"])
 		playsound(src, "terminal_type", 25, 0)
+		. = TRUE
 
+/obj/machinery/computer/cloning/proc/finish_scan(mob/living/L, prev_locked)
+	if(!scanner || !L)
+		return
 	src.add_fingerprint(usr)
 	src.updateUsrDialog()
-	return
+
+	if(use_records)
+		scan_occupant(L)
+	else
+		clone_occupant(L)
+
+	loading = FALSE
+	src.updateUsrDialog()
+	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+	scanner.locked = prev_locked
 
 /obj/machinery/computer/cloning/proc/scan_occupant(occupant)
 	var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
@@ -455,30 +479,9 @@
 	if(isbrain(mob_occupant))
 		dna = B.stored_dna
 
-	if(!istype(dna))
-		scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		return
-	if(mob_occupant.suiciding || mob_occupant.hellbound)
-		scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		return
-	if((HAS_TRAIT(mob_occupant, TRAIT_NOCLONE)) && (src.scanner.scan_level < 2))
-		scantemp = "<font class='bad'>Subject no longer contains the fundamental materials required to create a living clone.</font>"
-		playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
-		return
-	if ((!mob_occupant.ckey) || (!mob_occupant.client))
-		scantemp = "<font class='bad'>Mental interface failure.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		return
-	if (find_record("ckey", mob_occupant.ckey, records))
-		scantemp = "<font class='average'>Subject already in database.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		return
-	if(SSeconomy.full_ancap && !has_bank_account)
-		scantemp = "<font class='average'>Subject is either missing an ID card with a bank account on it, or does not have an account to begin with. Please ensure the ID card is on the body before attempting to scan.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+	if(!can_scan(dna, mob_occupant, FALSE, has_bank_account))
 		return
+
 	var/datum/data/record/R = new()
 	if(dna.species)
 		// We store the instance rather than the path, because some
@@ -529,3 +532,78 @@
 	board.records = records
 	scantemp = "Subject successfully scanned."
 	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+//Used by the experimental cloning computer.
+/obj/machinery/computer/cloning/proc/clone_occupant(occupant)
+	var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
+	var/datum/dna/dna
+	if(ishuman(mob_occupant))
+		var/mob/living/carbon/C = mob_occupant
+		dna = C.has_dna()
+	if(isbrain(mob_occupant))
+		var/mob/living/brain/B = mob_occupant
+		dna = B.stored_dna
+
+	if(!can_scan(dna, mob_occupant, TRUE))
+		return
+
+	var/clone_species
+	if(dna.species)
+		clone_species = dna.species
+	else
+		var/datum/species/rando_race = pick(GLOB.roundstart_races)
+		clone_species = rando_race.type
+
+	var/obj/machinery/clonepod/pod = GetAvailablePod()
+	//Can't clone without someone to clone.  Or a pod.  Or if the pod is busy. Or full of gibs.
+	if(!LAZYLEN(pods))
+		temp = "<font class='bad'>No Clonepods detected.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+	else if(!pod)
+		temp = "<font class='bad'>No Clonepods available.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+	else if(pod.occupant)
+		temp = "<font class='bad'>Cloning cycle already in progress.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+	else
+		pod.growclone(null, mob_occupant.real_name, dna.uni_identity, dna.mutation_index, null, dna.blood_type, clone_species, dna.features, mob_occupant.faction)
+		temp = "[mob_occupant.real_name] => <font class='good'>Cloning data sent to pod.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+
+/obj/machinery/computer/cloning/proc/can_scan(datum/dna/dna, mob/living/mob_occupant, experimental = FALSE, datum/bank_account/account)
+	if(!istype(dna))
+		scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		return
+	if(!experimental)
+		if(mob_occupant.suiciding || mob_occupant.hellbound)
+			scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>"
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			return
+	if((HAS_TRAIT(mob_occupant, TRAIT_NOCLONE)) && (src.scanner.scan_level < 2))
+		scantemp = "<font class='bad'>Subject no longer contains the fundamental materials required to create a living clone.</font>"
+		playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
+		return
+	if (!experimental)
+		if(!mob_occupant.ckey || !mob_occupant.client)
+			scantemp = "<font class='bad'>Mental interface failure.</font>"
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			return
+		if (find_record("ckey", mob_occupant.ckey, records))
+			scantemp = "<font class='average'>Subject already in database.</font>"
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			return
+		if(SSeconomy.full_ancap && !account)
+			scantemp = "<font class='average'>Subject is either missing an ID card with a bank account on it, or does not have an account to begin with. Please ensure the ID card is on the body before attempting to scan.</font>"
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			return
+	return TRUE
+
+//Prototype cloning console, much more rudimental and lacks modern functions such as saving records, autocloning, or safety checks.
+/obj/machinery/computer/cloning/prototype
+	name = "prototype cloning console"
+	desc = "Used to operate an experimental cloner."
+	icon_screen = "dna"
+	icon_keyboard = "med_key"
+	circuit = /obj/item/circuitboard/computer/cloning/prototype
+	clonepod_type = /obj/machinery/clonepod/experimental

code/game/machinery/doors/airlock.dm

@@ -93,7 +93,7 @@
 	var/shuttledocked = 0
 	var/delayed_close_requested = FALSE // TRUE means the door will automatically close the next time it's opened.
 
-	var/air_tight = FALSE	//TRUE means density will be set as soon as the door begins to close
+	air_tight = FALSE
 	var/prying_so_hard = FALSE
 
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE

code/game/machinery/doors/door.dm

@@ -17,6 +17,7 @@
 	interaction_flags_atom = INTERACT_ATOM_UI_INTERACT
 
 	var/secondsElectrified = 0
+	var/air_tight = FALSE	//TRUE means density will be set as soon as the door begins to close
 	var/shockedby
 	var/visible = TRUE // To explain: Whether the door can block line of sight when closed or not.
 	var/operating = FALSE
@@ -161,7 +162,7 @@
 			open()
 		else
 			close()
-		return
+		return TRUE
 	if(density)
 		do_animate("deny")
 
@@ -181,11 +182,36 @@
 /obj/machinery/door/proc/try_to_crowbar(obj/item/I, mob/user)
 	return
 
+/obj/machinery/door/proc/is_holding_pressure()
+	var/turf/open/T = loc
+	if(!T)
+		return FALSE
+	if(!density)
+		return FALSE
+	// alrighty now we check for how much pressure we're holding back
+	var/min_moles = T.air.total_moles()
+	var/max_moles = min_moles
+	// okay this is a bit hacky. First, we set density to 0 and recalculate our adjacent turfs
+	density = FALSE
+	T.ImmediateCalculateAdjacentTurfs()
+	// then we use those adjacent turfs to figure out what the difference between the lowest and highest pressures we'd be holding is
+	for(var/turf/open/T2 in T.atmos_adjacent_turfs)
+		if((flags_1 & ON_BORDER_1) && get_dir(src, T2) != dir)
+			continue
+		var/moles = T2.air.total_moles()
+		if(moles < min_moles)
+			min_moles = moles
+		if(moles > max_moles)
+			max_moles = moles
+	density = TRUE
+	T.ImmediateCalculateAdjacentTurfs() // alright lets put it back
+	return max_moles - min_moles > 20
+
 /obj/machinery/door/attackby(obj/item/I, mob/user, params)
-	if(user.a_intent != INTENT_HARM && (istype(I, /obj/item/crowbar) || istype(I, /obj/item/fireaxe)))
+	if(user.a_intent != INTENT_HARM && (I.tool_behaviour == TOOL_CROWBAR || istype(I, /obj/item/fireaxe)))
 		try_to_crowbar(I, user)
 		return 1
-	else if(istype(I, /obj/item/weldingtool))
+	else if(I.tool_behaviour == TOOL_WELDER)
 		try_to_weld(I, user)
 		return 1
 	else if(!(I.item_flags & NOBLUDGEON) && user.a_intent != INTENT_HARM)
@@ -223,13 +249,13 @@
 	if(prob(20/severity) && (istype(src, /obj/machinery/door/airlock) || istype(src, /obj/machinery/door/window)) )
 		INVOKE_ASYNC(src, .proc/open)
 	if(prob(severity*10 - 20))
-		if(secondsElectrified == 0)
-			secondsElectrified = -1
+		if(secondsElectrified == MACHINE_NOT_ELECTRIFIED)
+			secondsElectrified = MACHINE_ELECTRIFIED_PERMANENT
 			LAZYADD(shockedby, "\[[TIME_STAMP("hh:mm:ss", FALSE)]\]EM Pulse")
 			addtimer(CALLBACK(src, .proc/unelectrify), 300)
 
 /obj/machinery/door/proc/unelectrify()
-	secondsElectrified = 0
+	secondsElectrified = MACHINE_NOT_ELECTRIFIED
 
 /obj/machinery/door/update_icon_state()
 	if(density)
@@ -289,8 +315,11 @@
 				return
 
 	operating = TRUE
+
 	do_animate("closing")
 	layer = closingLayer
+	if(air_tight)
+		density = TRUE
 	sleep(5)
 	density = TRUE
 	sleep(5)
@@ -302,7 +331,7 @@
 	update_freelook_sight()
 	if(safe)
 		CheckForMobs()
-	else
+	else if(!(flags_1 & ON_BORDER_1))
 		crush()
 	return 1
 

code/game/machinery/doors/firedoor.dm

@@ -23,6 +23,8 @@
 	assemblytype = /obj/structure/firelock_frame
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 70)
 	interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_REQUIRES_SILICON | INTERACT_MACHINE_OPEN
+	air_tight = TRUE
+	var/emergency_close_timer = 0
 	var/nextstate = null
 	var/boltslocked = TRUE
 	var/list/affecting_areas
@@ -68,10 +70,14 @@
 	return ..()
 
 /obj/machinery/door/firedoor/Bumped(atom/movable/AM)
-	if(panel_open || operating)
+	if(panel_open || operating || welded)
 		return
-	if(!density)
-		return ..()
+	if(ismob(AM))
+		var/mob/user = AM
+		if(density && !welded && !operating && !(stat & NOPOWER) && (!density || allow_hand_open(user)))
+			add_fingerprint(user)
+			open()
+			return TRUE
 	return FALSE
 
 
@@ -86,6 +92,15 @@
 	. = ..()
 	if(.)
 		return
+
+	if(!welded && !operating && !(stat & NOPOWER) && (!density || allow_hand_open(user)))
+		add_fingerprint(user)
+		if(density)
+			emergency_close_timer = world.time + 30 // prevent it from instaclosing again if in space
+			open()
+		else
+			close()
+		return TRUE
 	if(operating || !density)
 		return
 	user.changeNext_move(CLICK_CD_MELEE)
@@ -100,7 +115,7 @@
 		return
 
 	if(welded)
-		if(istype(C, /obj/item/wrench))
+		if(C.tool_behaviour == TOOL_WRENCH)
 			if(boltslocked)
 				to_chat(user, "<span class='notice'>There are screws locking the bolts in place!</span>")
 				return
@@ -114,7 +129,7 @@
 								 "<span class='notice'>You undo [src]'s floor bolts.</span>")
 			deconstruct(TRUE)
 			return
-		if(istype(C, /obj/item/screwdriver))
+		if(C.tool_behaviour == TOOL_SCREWDRIVER)
 			user.visible_message("<span class='notice'>[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts.</span>", \
 								 "<span class='notice'>You [boltslocked ? "unlock" : "lock"] [src]'s floor bolts.</span>")
 			C.play_tool_sound(src)
@@ -140,10 +155,27 @@
 		return
 
 	if(density)
+		if(is_holding_pressure())
+			// tell the user that this is a bad idea, and have a do_after as well
+			to_chat(user, "<span class='warning'>As you begin crowbarring \the [src] a gush of air blows in your face... maybe you should reconsider?</span>")
+			if(!do_after(user, 15, TRUE, src)) // give them a few seconds to reconsider their decision.
+				return
+			log_game("[key_name_admin(user)] has opened a firelock with a pressure difference at [AREACOORD(loc)]") // there bibby I made it logged just for you. Enjoy.
+			// since we have high-pressure-ness, close all other firedoors on the tile
+			whack_a_mole()
+		if(welded || operating || !density)
+			return // in case things changed during our do_after
+		emergency_close_timer = world.time + 60 // prevent it from instaclosing again if in space
 		open()
 	else
 		close()
 
+/obj/machinery/door/firedoor/proc/allow_hand_open(mob/user)
+	var/area/A = get_area(src)
+	if(A && A.fire)
+		return FALSE
+	return !is_holding_pressure()
+
 /obj/machinery/door/firedoor/attack_ai(mob/user)
 	add_fingerprint(user)
 	if(welded || operating || stat & NOPOWER)
@@ -171,20 +203,16 @@
 		if("closing")
 			flick("door_closing", src)
 
-/obj/machinery/door/firedoor/update_icon_state()
+/obj/machinery/door/firedoor/update_icon()
+	cut_overlays()
 	if(density)
 		icon_state = "door_closed"
+		if(welded)
+			add_overlay("welded")
 	else
 		icon_state = "door_open"
-
-/obj/machinery/door/firedoor/update_overlays()
-	. = ..()
-	if(!welded)
-		return
-	if(density)
-		. += "welded"
-	else
-		. += "welded_open"
+		if(welded)
+			add_overlay("welded_open")
 
 /obj/machinery/door/firedoor/open()
 	. = ..()
@@ -194,6 +222,61 @@
 	. = ..()
 	latetoggle()
 
+/obj/machinery/door/firedoor/proc/whack_a_mole(reconsider_immediately = FALSE)
+	set waitfor = 0
+	for(var/cdir in GLOB.cardinals)
+		if((flags_1 & ON_BORDER_1) && cdir != dir)
+			continue
+		whack_a_mole_part(get_step(src, cdir), reconsider_immediately)
+	if(flags_1 & ON_BORDER_1)
+		whack_a_mole_part(get_turf(src), reconsider_immediately)
+
+/obj/machinery/door/firedoor/proc/whack_a_mole_part(turf/start_point, reconsider_immediately)
+	set waitfor = 0
+	var/list/doors_to_close = list()
+	var/list/turfs = list()
+	turfs[start_point] = 1
+	for(var/i = 1; (i <= turfs.len && i <= 11); i++) // check up to 11 turfs.
+		var/turf/open/T = turfs[i]
+		if(istype(T, /turf/open/space))
+			return -1
+		for(var/T2 in T.atmos_adjacent_turfs)
+			if(turfs[T2])
+				continue
+			var/is_cut_by_unopen_door = FALSE
+			for(var/obj/machinery/door/firedoor/FD in T2)
+				if((FD.flags_1 & ON_BORDER_1) && get_dir(T2, T) != FD.dir)
+					continue
+				if(FD.operating || FD == src || FD.welded || FD.density)
+					continue
+				doors_to_close += FD
+				is_cut_by_unopen_door = TRUE
+
+			for(var/obj/machinery/door/firedoor/FD in T)
+				if((FD.flags_1 & ON_BORDER_1) && get_dir(T, T2) != FD.dir)
+					continue
+				if(FD.operating || FD == src || FD.welded || FD.density)
+					continue
+				doors_to_close += FD
+				is_cut_by_unopen_door= TRUE
+			if(!is_cut_by_unopen_door)
+				turfs[T2] = 1
+	if(turfs.len > 10)
+		return // too big, don't bother
+	for(var/obj/machinery/door/firedoor/FD in doors_to_close)
+		FD.emergency_pressure_stop(FALSE)
+		if(reconsider_immediately)
+			var/turf/open/T = FD.loc
+			if(istype(T))
+				T.ImmediateCalculateAdjacentTurfs()
+
+/obj/machinery/door/firedoor/proc/emergency_pressure_stop(consider_timer = TRUE)
+	set waitfor = 0
+	if(density || operating || welded)
+		return
+	if(world.time >= emergency_close_timer || !consider_timer)
+		close()
+
 /obj/machinery/door/firedoor/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
 		var/obj/structure/firelock_frame/F = new assemblytype(get_turf(src))
@@ -227,6 +310,59 @@
 	opacity = TRUE
 	density = TRUE
 
+/obj/machinery/door/firedoor/border_only/close()
+	if(density)
+		return TRUE
+	if(operating || welded)
+		return
+	var/turf/T1 = get_turf(src)
+	var/turf/T2 = get_step(T1, dir)
+	for(var/mob/living/M in T1)
+		if(M.stat == CONSCIOUS && M.pulling && M.pulling.loc == T2 && !M.pulling.anchored && M.pulling.move_resist <= M.move_force)
+			var/mob/living/M2 = M.pulling
+			if(!istype(M2) || !M2.buckled || !M2.buckled.buckle_prevents_pull)
+				to_chat(M, "<span class='notice'>You pull [M.pulling] through [src] right as it closes</span>")
+				M.pulling.forceMove(T1)
+				M.start_pulling(M2)
+				
+	for(var/mob/living/M in T2)
+		if(M.stat == CONSCIOUS && M.pulling && M.pulling.loc == T1 && !M.pulling.anchored && M.pulling.move_resist <= M.move_force)
+			var/mob/living/M2 = M.pulling
+			if(!istype(M2) || !M2.buckled || !M2.buckled.buckle_prevents_pull)
+				to_chat(M, "<span class='notice'>You pull [M.pulling] through [src] right as it closes</span>")
+				M.pulling.forceMove(T2)
+				M.start_pulling(M2)
+	. = ..()
+
+/obj/machinery/door/firedoor/border_only/allow_hand_open(mob/user)
+	var/area/A = get_area(src)
+	if((!A || !A.fire) && !is_holding_pressure())
+		return TRUE
+	whack_a_mole(TRUE) // WOOP WOOP SIDE EFFECTS
+	var/turf/T = loc
+	var/turf/T2 = get_step(T, dir)
+	if(!T || !T2)
+		return
+	var/status1 = check_door_side(T)
+	var/status2 = check_door_side(T2)
+	if((status1 == 1 && status2 == -1) || (status1 == -1 && status2 == 1))
+		to_chat(user, "<span class='warning'>Access denied. Try closing another firedoor to minimize decompression, or using a crowbar.</span>")
+		return FALSE
+	return TRUE
+
+/obj/machinery/door/firedoor/border_only/proc/check_door_side(turf/open/start_point)
+	var/list/turfs = list()
+	turfs[start_point] = 1
+	for(var/i = 1; (i <= turfs.len && i <= 11); i++) // check up to 11 turfs.
+		var/turf/open/T = turfs[i]
+		if(istype(T, /turf/open/space))
+			return -1
+		for(var/T2 in T.atmos_adjacent_turfs)
+			turfs[T2] = 1
+	if(turfs.len <= 10)
+		return 0 // not big enough to matter
+	return start_point.air.return_pressure() < 20 ? -1 : 1
+
 /obj/machinery/door/firedoor/border_only/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover) && (mover.pass_flags & PASSGLASS))
 		return TRUE
@@ -257,6 +393,18 @@
 	assemblytype = /obj/structure/firelock_frame/heavy
 	max_integrity = 550
 
+/obj/machinery/door/firedoor/window
+	name = "window shutter"
+	icon = 'icons/obj/doors/doorfirewindow.dmi'
+	desc = "A second window that slides in when the original window is broken, designed to protect against hull breaches. Truly a work of genius by NT engineers."
+	glass = TRUE
+	explosion_block = 0
+	max_integrity = 50
+	resistance_flags = 0 // not fireproof
+	heat_proof = FALSE
+
+/obj/machinery/door/firedoor/window/allow_hand_open()
+	return TRUE
 
 /obj/item/electronics/firelock
 	name = "firelock circuitry"
@@ -294,7 +442,7 @@
 /obj/structure/firelock_frame/attackby(obj/item/C, mob/user)
 	switch(constructionStep)
 		if(CONSTRUCTION_PANEL_OPEN)
-			if(istype(C, /obj/item/crowbar))
+			if(C.tool_behaviour == TOOL_CROWBAR)
 				C.play_tool_sound(src)
 				user.visible_message("<span class='notice'>[user] starts prying something out from [src]...</span>", \
 									 "<span class='notice'>You begin prying out the wire cover...</span>")
@@ -308,7 +456,7 @@
 				constructionStep = CONSTRUCTION_WIRES_EXPOSED
 				update_icon()
 				return
-			if(istype(C, /obj/item/wrench))
+			if(C.tool_behaviour == TOOL_WRENCH)
 				if(locate(/obj/machinery/door/firedoor) in get_turf(src))
 					to_chat(user, "<span class='warning'>There's already a firelock there.</span>")
 					return
@@ -350,7 +498,7 @@
 				return
 
 		if(CONSTRUCTION_WIRES_EXPOSED)
-			if(istype(C, /obj/item/wirecutters))
+			if(C.tool_behaviour == TOOL_WIRECUTTER)
 				C.play_tool_sound(src)
 				user.visible_message("<span class='notice'>[user] starts cutting the wires from [src]...</span>", \
 									 "<span class='notice'>You begin removing [src]'s wires...</span>")
@@ -364,7 +512,7 @@
 				constructionStep = CONSTRUCTION_GUTTED
 				update_icon()
 				return
-			if(istype(C, /obj/item/crowbar))
+			if(C.tool_behaviour == TOOL_CROWBAR)
 				C.play_tool_sound(src)
 				user.visible_message("<span class='notice'>[user] starts prying a metal plate into [src]...</span>", \
 									 "<span class='notice'>You begin prying the cover plate back onto [src]...</span>")
@@ -379,7 +527,7 @@
 				update_icon()
 				return
 		if(CONSTRUCTION_GUTTED)
-			if(istype(C, /obj/item/crowbar))
+			if(C.tool_behaviour == TOOL_CROWBAR)
 				user.visible_message("<span class='notice'>[user] begins removing the circuit board from [src]...</span>", \
 									 "<span class='notice'>You begin prying out the circuit board from [src]...</span>")
 				if(!C.use_tool(src, user, 50, volume=50))
@@ -401,7 +549,7 @@
 									 "<span class='notice'>You begin adding wires to [src]...</span>")
 				playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1)
 				if(do_after(user, 60, target = src))
-					if(constructionStep != CONSTRUCTION_GUTTED || !B.use_tool(src, user, 0, 5))
+					if(constructionStep != CONSTRUCTION_GUTTED || B.get_amount() < 5 || !B)
 						return
 					user.visible_message("<span class='notice'>[user] adds wires to [src].</span>", \
 										 "<span class='notice'>You wire [src].</span>")
@@ -410,7 +558,7 @@
 					update_icon()
 				return
 		if(CONSTRUCTION_NOCIRCUIT)
-			if(istype(C, /obj/item/weldingtool))
+			if(C.tool_behaviour == TOOL_WELDER)
 				if(!C.tool_start_check(user, amount=1))
 					return
 				user.visible_message("<span class='notice'>[user] begins cutting apart [src]'s frame...</span>", \

code/game/machinery/exp_cloner.dm

@@ -1,298 +0,0 @@
-//Experimental cloner; clones a body regardless of the owner's status, letting a ghost control it instead
-/obj/machinery/clonepod/experimental
-	name = "experimental cloning pod"
-	desc = "An ancient cloning pod. It seems to be an early prototype of the experimental cloners used in Nanotrasen Stations."
-	icon = 'icons/obj/machines/cloning.dmi'
-	icon_state = "pod_0"
-	req_access = null
-	circuit = /obj/item/circuitboard/machine/clonepod/experimental
-	internal_radio = FALSE
-
-//Start growing a human clone in the pod!
-/obj/machinery/clonepod/experimental/growclone(clonename, ui, mutation_index, mindref, last_death, blood_type, datum/species/mrace, list/features, factions, list/quirks)
-	if(panel_open)
-		return FALSE
-	if(mess || attempting)
-		return FALSE
-
-	attempting = TRUE //One at a time!!
-	countdown.start()
-
-	var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)
-
-	H.hardset_dna(ui, mutation_index, H.real_name, blood_type, mrace, features)
-
-	if(efficiency > 2)
-		var/list/unclean_mutations = (GLOB.not_good_mutations|GLOB.bad_mutations)
-		H.dna.remove_mutation_group(unclean_mutations)
-	if(efficiency > 5 && prob(20))
-		H.easy_randmut(POSITIVE)
-	if(efficiency < 3 && prob(50))
-		var/mob/M = H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
-		if(ismob(M))
-			H = M
-
-	H.silent = 20 //Prevents an extreme edge case where clones could speak if they said something at exactly the right moment.
-	occupant = H
-
-	if(!clonename)	//to prevent null names
-		clonename = "clone ([rand(1,999)])"
-	H.real_name = clonename
-
-	icon_state = "pod_1"
-	//Get the clone body ready
-	maim_clone(H)
-	ADD_TRAIT(H, TRAIT_STABLEHEART, "cloning")
-	ADD_TRAIT(H, TRAIT_EMOTEMUTE, "cloning")
-	ADD_TRAIT(H, TRAIT_MUTE, "cloning")
-	ADD_TRAIT(H, TRAIT_NOBREATH, "cloning")
-	ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, "cloning")
-	H.Unconscious(80)
-
-	var/list/candidates = pollCandidatesForMob("Do you want to play as [clonename]'s defective clone?", null, null, null, 100, H)
-	if(LAZYLEN(candidates))
-		var/mob/C = pick(candidates)
-		H.key = C.key
-
-	if(grab_ghost_when == CLONER_FRESH_CLONE)
-		H.grab_ghost()
-		to_chat(H, "<span class='notice'><b>Consciousness slowly creeps over you as your body regenerates.</b><br><i>So this is what cloning feels like?</i></span>")
-
-	if(grab_ghost_when == CLONER_MATURE_CLONE)
-		H.ghostize(TRUE)	//Only does anything if they were still in their old body and not already a ghost
-		to_chat(H.get_ghost(TRUE), "<span class='notice'>Your body is beginning to regenerate in a cloning pod. You will become conscious when it is complete.</span>")
-
-	if(H)
-		H.faction |= factions
-
-		H.set_cloned_appearance()
-
-		H.suiciding = FALSE
-	attempting = FALSE
-	return TRUE
-
-
-//Prototype cloning console, much more rudimental and lacks modern functions such as saving records, autocloning, or safety checks.
-/obj/machinery/computer/prototype_cloning
-	name = "prototype cloning console"
-	desc = "Used to operate an experimental cloner."
-	icon_screen = "dna"
-	icon_keyboard = "med_key"
-	circuit = /obj/item/circuitboard/computer/prototype_cloning
-	var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
-	var/list/pods //Linked experimental cloning pods
-	var/temp = "Inactive"
-	var/scantemp = "Ready to Scan"
-	var/loading = FALSE // Nice loading text
-
-	light_color = LIGHT_COLOR_BLUE
-
-/obj/machinery/computer/prototype_cloning/Initialize()
-	. = ..()
-	updatemodules(TRUE)
-
-/obj/machinery/computer/prototype_cloning/Destroy()
-	if(pods)
-		for(var/P in pods)
-			DetachCloner(P)
-		pods = null
-	return ..()
-
-/obj/machinery/computer/prototype_cloning/proc/GetAvailablePod(mind = null)
-	if(pods)
-		for(var/P in pods)
-			var/obj/machinery/clonepod/experimental/pod = P
-			if(pod.is_operational() && !(pod.occupant || pod.mess))
-				return pod
-
-/obj/machinery/computer/prototype_cloning/proc/updatemodules(findfirstcloner)
-	scanner = findscanner()
-	if(findfirstcloner && !LAZYLEN(pods))
-		findcloner()
-
-/obj/machinery/computer/prototype_cloning/proc/findscanner()
-	var/obj/machinery/dna_scannernew/scannerf = null
-
-	// Loop through every direction
-	for(var/direction in GLOB.cardinals)
-		// Try to find a scanner in that direction
-		scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, direction))
-		// If found and operational, return the scanner
-		if (!isnull(scannerf) && scannerf.is_operational())
-			return scannerf
-
-	// If no scanner was found, it will return null
-	return null
-
-/obj/machinery/computer/prototype_cloning/proc/findcloner()
-	var/obj/machinery/clonepod/experimental/podf = null
-	for(var/direction in GLOB.cardinals)
-		podf = locate(/obj/machinery/clonepod/experimental, get_step(src, direction))
-		if (!isnull(podf) && podf.is_operational())
-			AttachCloner(podf)
-
-/obj/machinery/computer/prototype_cloning/proc/AttachCloner(obj/machinery/clonepod/experimental/pod)
-	if(!pod.connected)
-		pod.connected = src
-		LAZYADD(pods, pod)
-
-/obj/machinery/computer/prototype_cloning/proc/DetachCloner(obj/machinery/clonepod/experimental/pod)
-	pod.connected = null
-	LAZYREMOVE(pods, pod)
-
-/obj/machinery/computer/prototype_cloning/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/multitool))
-		var/obj/item/multitool/P = W
-
-		if(istype(P.buffer, /obj/machinery/clonepod/experimental))
-			if(get_area(P.buffer) != get_area(src))
-				to_chat(user, "<font color = #666633>-% Cannot link machines across power zones. Buffer cleared %-</font color>")
-				P.buffer = null
-				return
-			to_chat(user, "<font color = #666633>-% Successfully linked [P.buffer] with [src] %-</font color>")
-			var/obj/machinery/clonepod/experimental/pod = P.buffer
-			if(pod.connected)
-				pod.connected.DetachCloner(pod)
-			AttachCloner(pod)
-		else
-			P.buffer = src
-			to_chat(user, "<font color = #666633>-% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-</font color>")
-		return
-	else
-		return ..()
-
-/obj/machinery/computer/prototype_cloning/attack_hand(mob/user)
-	if(..())
-		return
-	interact(user)
-
-/obj/machinery/computer/prototype_cloning/interact(mob/user)
-	user.set_machine(src)
-	add_fingerprint(user)
-
-	if(..())
-		return
-
-	updatemodules(TRUE)
-
-	var/dat = ""
-	dat += "<a href='byond://?src=[REF(src)];refresh=1'>Refresh</a>"
-
-	dat += "<h3>Cloning Pod Status</h3>"
-	dat += "<div class='statusDisplay'>[temp]&nbsp;</div>"
-
-	if (isnull(src.scanner) || !LAZYLEN(pods))
-		dat += "<h3>Modules</h3>"
-		//dat += "<a href='byond://?src=[REF(src)];relmodules=1'>Reload Modules</a>"
-		if (isnull(src.scanner))
-			dat += "<font class='bad'>ERROR: No Scanner detected!</font><br>"
-		if (!LAZYLEN(pods))
-			dat += "<font class='bad'>ERROR: No Pod detected</font><br>"
-
-	// Scan-n-Clone
-	if (!isnull(src.scanner))
-		var/mob/living/scanner_occupant = get_mob_or_brainmob(scanner.occupant)
-
-		dat += "<h3>Cloning</h3>"
-
-		dat += "<div class='statusDisplay'>"
-		if(!scanner_occupant)
-			dat += "Scanner Unoccupied"
-		else if(loading)
-			dat += "[scanner_occupant] => Scanning..."
-		else
-			scantemp = "Ready to Clone"
-			dat += "[scanner_occupant] => [scantemp]"
-		dat += "</div>"
-
-		if(scanner_occupant)
-			dat += "<a href='byond://?src=[REF(src)];clone=1'>Clone</a>"
-			dat += "<br><a href='byond://?src=[REF(src)];lock=1'>[src.scanner.locked ? "Unlock Scanner" : "Lock Scanner"]</a>"
-		else
-			dat += "<span class='linkOff'>Clone</span>"
-
-	var/datum/browser/popup = new(user, "cloning", "Prototype Cloning System Control")
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-
-/obj/machinery/computer/prototype_cloning/Topic(href, href_list)
-	if(..())
-		return
-
-	if(loading)
-		return
-
-	else if ((href_list["clone"]) && !isnull(scanner) && scanner.is_operational())
-		scantemp = ""
-
-		loading = TRUE
-		updateUsrDialog()
-		playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
-		say("Initiating scan...")
-
-		spawn(20)
-			clone_occupant(scanner.occupant)
-			loading = FALSE
-			updateUsrDialog()
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
-		//No locking an open scanner.
-	else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational())
-		if ((!scanner.locked) && (scanner.occupant))
-			scanner.locked = TRUE
-			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		else
-			scanner.locked = FALSE
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-
-	else if (href_list["refresh"])
-		updateUsrDialog()
-		playsound(src, "terminal_type", 25, 0)
-
-	add_fingerprint(usr)
-	updateUsrDialog()
-	return
-
-/obj/machinery/computer/prototype_cloning/proc/clone_occupant(occupant)
-	var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
-	var/datum/dna/dna
-	if(ishuman(mob_occupant))
-		var/mob/living/carbon/C = mob_occupant
-		dna = C.has_dna()
-	if(isbrain(mob_occupant))
-		var/mob/living/brain/B = mob_occupant
-		dna = B.stored_dna
-
-	if(!istype(dna))
-		scantemp = "<font class='bad'>Unable to locate valid genetic data.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-		return
-	if((HAS_TRAIT(mob_occupant, TRAIT_NOCLONE)) && (src.scanner.scan_level < 2))
-		scantemp = "<font class='bad'>Subject no longer contains the fundamental materials required to create a living clone.</font>"
-		playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
-		return
-
-	var/clone_species
-	if(dna.species)
-		clone_species = dna.species
-	else
-		var/datum/species/rando_race = pick(GLOB.roundstart_races)
-		clone_species = rando_race.type
-
-	var/obj/machinery/clonepod/pod = GetAvailablePod()
-	//Can't clone without someone to clone.  Or a pod.  Or if the pod is busy. Or full of gibs.
-	if(!LAZYLEN(pods))
-		temp = "<font class='bad'>No Clonepods detected.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-	else if(!pod)
-		temp = "<font class='bad'>No Clonepods available.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-	else if(pod.occupant)
-		temp = "<font class='bad'>Cloning cycle already in progress.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-	else
-		pod.growclone(mob_occupant.real_name, dna.uni_identity, dna.mutation_index, null, null, dna.blood_type, clone_species, dna.features, mob_occupant.faction)
-		temp = "[mob_occupant.real_name] => <font class='good'>Cloning data sent to pod.</font>"
-		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-

code/game/machinery/shuttle/shuttle_engine.dm

@@ -130,7 +130,7 @@
 	var/deltaTemperature = req_power / heat_cap
 	if(deltaTemperature < 0)
 		return
-	env.temperature += deltaTemperature
+	env.set_temperature(env.return_temperature(),deltaTemperature)
 	air_update_turf()
 
 /obj/machinery/shuttle/engine/default_change_direction_wrench(mob/user, obj/item/I)

code/game/machinery/shuttle/shuttle_heater.dm

@@ -89,8 +89,8 @@
 	var/datum/gas_mixture/air_contents = airs[1]
 	if(!air_contents)
 		return
-	air_contents.volume = gas_capacity
-	air_contents.temperature = T20C
+	air_contents.set_volume(gas_capacity)
+	air_contents.set_temperature(T20C)
 
 /obj/machinery/atmospherics/components/unary/shuttle/heater/proc/hasFuel(var/required)
 	var/datum/gas_mixture/air_contents = airs[1]

code/game/machinery/spaceheater.dm

@@ -83,9 +83,9 @@
 		var/datum/gas_mixture/env = L.return_air()
 
 		var/newMode = HEATER_MODE_STANDBY
-		if(setMode != HEATER_MODE_COOL && env.temperature < targetTemperature - temperatureTolerance)
+		if(setMode != HEATER_MODE_COOL && env.return_temperature() < targetTemperature - temperatureTolerance)
 			newMode = HEATER_MODE_HEAT
-		else if(setMode != HEATER_MODE_HEAT && env.temperature > targetTemperature + temperatureTolerance)
+		else if(setMode != HEATER_MODE_HEAT && env.return_temperature() > targetTemperature + temperatureTolerance)
 			newMode = HEATER_MODE_COOL
 
 		if(mode != newMode)
@@ -96,7 +96,7 @@
 			return
 
 		var/heat_capacity = env.heat_capacity()
-		var/requiredPower = abs(env.temperature - targetTemperature) * heat_capacity
+		var/requiredPower = abs(env.return_temperature() - targetTemperature) * heat_capacity
 		requiredPower = min(requiredPower, heatingPower)
 
 		if(requiredPower < 1)
@@ -106,7 +106,7 @@
 		if(mode == HEATER_MODE_COOL)
 			deltaTemperature *= -1
 		if(deltaTemperature)
-			env.temperature += deltaTemperature
+			env.set_temperature(env.return_temperature() + deltaTemperature)
 			air_update_turf()
 		cell.use(requiredPower / efficiency)
 	else
@@ -194,9 +194,9 @@
 	var/curTemp
 	if(istype(L))
 		var/datum/gas_mixture/env = L.return_air()
-		curTemp = env.temperature
+		curTemp = env.return_temperature()
 	else if(isturf(L))
-		curTemp = L.temperature
+		curTemp = L.return_temperature()
 	if(isnull(curTemp))
 		data["currentTemp"] = "N/A"
 	else

code/game/mecha/combat/honker.dm

@@ -21,7 +21,7 @@
 	var/cell_charge = get_charge()
 	var/datum/gas_mixture/int_tank_air = internal_tank.return_air()
 	var/tank_pressure = internal_tank ? round(int_tank_air.return_pressure(),0.01) : "None"
-	var/tank_temperature = internal_tank ? int_tank_air.temperature : "Unknown"
+	var/tank_temperature = internal_tank ? int_tank_air.return_temperature() : "Unknown"
 	var/cabin_pressure = round(return_pressure(),0.01)
 	var/output = {"[report_internal_damage()]
 						[integrity<30?"<font color='red'><b>DAMAGE LEVEL CRITICAL</b></font><br>":null]
@@ -155,4 +155,4 @@
 	var/color=""
 	for (var/i=0;i<6;i++)
 		color = color+pick(colors)
-	return color
+	return color

code/game/mecha/equipment/tools/other_tools.dm

@@ -422,13 +422,13 @@
 		return
 	var/datum/gas_mixture/GM = new
 	if(prob(10))
-		GM.gases[/datum/gas/plasma] += 100
-		GM.temperature = 1500+T0C //should be enough to start a fire
+		GM.adjust_moles(/datum/gas/plasma,100)
+		GM.set_temperature(1500+T0C) //should be enough to start a fire
 		T.visible_message("[src] suddenly disgorges a cloud of heated plasma.")
 		qdel(src)
 	else
-		GM.gases[/datum/gas/plasma] += 5
-		GM.temperature = istype(T) ? T.air.return_temperature() : T20C
+		GM.adjust_moles(/datum/gas/plasma,5)
+		GM.set_temperature(istype(T) ? T.air.return_temperature() : T20C)
 		T.visible_message("[src] suddenly disgorges a cloud of plasma.")
 	T.assume_air(GM)
 	return

code/game/mecha/mecha.dm

@@ -247,10 +247,10 @@
 
 /obj/mecha/proc/add_cabin()
 	cabin_air = new
-	cabin_air.temperature = T20C
-	cabin_air.volume = 200
-	cabin_air.gases[/datum/gas/oxygen] = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
-	cabin_air.gases[/datum/gas/nitrogen] = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+	cabin_air.set_temperature(T20C)
+	cabin_air.set_volume(200)
+	cabin_air.set_moles(/datum/gas/oxygen,O2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature()))
+	cabin_air.set_moles(/datum/gas/nitrogen,N2STANDARD*cabin_air.return_volume()/(R_IDEAL_GAS_EQUATION*cabin_air.return_temperature()))
 	return cabin_air
 
 /obj/mecha/proc/add_radio()
@@ -302,9 +302,9 @@
 				if(int_tank_air.return_pressure() > internal_tank.maximum_pressure && !(internal_damage & MECHA_INT_TANK_BREACH))
 					setInternalDamage(MECHA_INT_TANK_BREACH)
 				if(int_tank_air && int_tank_air.return_volume() > 0) //heat the air_contents
-					int_tank_air.temperature = min(6000+T0C, int_tank_air.temperature+rand(10,15))
+					int_tank_air.set_temperature(min(6000+T0C, int_tank_air.return_temperature()+rand(10,15)))
 			if(cabin_air && cabin_air.return_volume()>0)
-				cabin_air.temperature = min(6000+T0C, cabin_air.return_temperature()+rand(10,15))
+				cabin_air.set_temperature(min(6000+T0C, cabin_air.return_temperature()+rand(10,15)))
 				if(cabin_air.return_temperature() > max_temperature/2)
 					take_damage(4/round(max_temperature/cabin_air.return_temperature(),0.1), BURN, 0, 0)
 
@@ -329,8 +329,8 @@
 
 	if(internal_temp_regulation)
 		if(cabin_air && cabin_air.return_volume() > 0)
-			var/delta = cabin_air.temperature - T20C
-			cabin_air.temperature -= max(-10, min(10, round(delta/4,0.1)))
+			var/delta = cabin_air.return_temperature() - T20C
+			cabin_air.set_temperature(cabin_air.return_temperature() - max(-10, min(10, round(delta/4,0.1))))
 
 	if(internal_tank)
 		var/datum/gas_mixture/tank_air = internal_tank.return_air()

code/game/mecha/mecha_topic.dm

@@ -75,7 +75,7 @@
 	var/cell_charge = get_charge()
 	var/datum/gas_mixture/int_tank_air = internal_tank.return_air()
 	var/tank_pressure = internal_tank ? round(int_tank_air.return_pressure(),0.01) : "None"
-	var/tank_temperature = internal_tank ? int_tank_air.temperature : "Unknown"
+	var/tank_temperature = internal_tank ? int_tank_air.return_temperature() : "Unknown"
 	var/cabin_pressure = round(return_pressure(),0.01)
 	. = {"[report_internal_damage()]
 						[integrity<30?"<span class='userdanger'>DAMAGE LEVEL CRITICAL</span><br>":null]

code/game/objects/effects/contraband.dm

@@ -212,6 +212,11 @@
 	desc = "A heretical poster depicting the titular star of an equally heretical book."
 	icon_state = "poster4"
 
+/obj/structure/sign/poster/contraband/post_ratvar
+	name = "Post This Ratvar"
+	desc = "Oh what in the hell? Those cultists have animated paper technology and they use it for a meme?"
+	icon_state = "postvar"
+
 /obj/structure/sign/poster/contraband/syndicate_recruitment
 	name = "Syndicate Recruitment"
 	desc = "See the galaxy! Shatter corrupt megacorporations! Join today!"

code/game/objects/effects/effect_system/effects_foam.dm

@@ -40,12 +40,11 @@
 	if(hotspot && istype(T) && T.air)
 		qdel(hotspot)
 		var/datum/gas_mixture/G = T.air
-		var/plas_amt = min(30,G.gases[/datum/gas/plasma]) //Absorb some plasma
-		G.gases[/datum/gas/plasma] -= plas_amt
+		var/plas_amt = min(30,G.get_moles(/datum/gas/plasma))  //Absorb some plasma
+		G.adjust_moles(/datum/gas/plasma,-plas_amt)
 		absorbed_plasma += plas_amt
-		if(G.temperature > T20C)
-			G.temperature = max(G.temperature/2,T20C)
-		GAS_GARBAGE_COLLECT(G.gases)
+		if(G.return_temperature() > T20C)
+			G.set_temperature(max(G.return_temperature()/2,T20C))
 		T.air_update_turf()
 
 /obj/effect/particle_effect/foam/firefighting/kill_foam()
@@ -317,15 +316,13 @@
 		O.ClearWet()
 		if(O.air)
 			var/datum/gas_mixture/G = O.air
-			G.temperature = 293.15
+			G.set_temperature(293.15)
 			for(var/obj/effect/hotspot/H in O)
 				qdel(H)
-			var/list/G_gases = G.gases
-			for(var/I in G_gases)
+			for(var/I in G.get_gases())
 				if(I == /datum/gas/oxygen || I == /datum/gas/nitrogen)
 					continue
-				G_gases[I] = 0
-			GAS_GARBAGE_COLLECT(G.gases)
+				G.set_moles(I, 0)
 			O.air_update_turf()
 		for(var/obj/machinery/atmospherics/components/unary/U in O)
 			if(!U.welded)

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -166,15 +166,13 @@
 		if(T.air)
 			var/datum/gas_mixture/G = T.air
 			if(!distcheck || get_dist(T, location) < blast) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air
-				G.temperature = temperature
+				G.set_temperature(temperature)
 			T.air_update_turf()
 			for(var/obj/effect/hotspot/H in T)
 				qdel(H)
-			var/list/G_gases = G.gases
-			if(G_gases[/datum/gas/plasma])
-				G_gases[/datum/gas/nitrogen] += (G_gases[/datum/gas/plasma])
-				G_gases[/datum/gas/plasma] = 0
-				GAS_GARBAGE_COLLECT(G.gases)
+			if(G.get_moles(/datum/gas/plasma))
+				G.adjust_moles(/datum/gas/nitrogen, G.get_moles(/datum/gas/plasma))
+				G.set_moles(/datum/gas/plasma, 0)
 		if (weldvents)
 			for(var/obj/machinery/atmospherics/components/unary/U in T)
 				if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber.

code/game/objects/effects/spawners/bombspawner.dm

@@ -19,11 +19,11 @@
 	var/obj/item/tank/internals/plasma/PT = new(V)
 	var/obj/item/tank/internals/oxygen/OT = new(V)
 
-	PT.air_contents.gases[/datum/gas/plasma] = pressure_p*PT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_p))
-	PT.air_contents.temperature = CELSIUS_TO_KELVIN(temp_p)
+	PT.air_contents.set_moles(/datum/gas/plasma, pressure_p*PT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_p)))
+	PT.air_contents.set_temperature(CELSIUS_TO_KELVIN(temp_p))
 
-	OT.air_contents.gases[/datum/gas/oxygen] = pressure_o*OT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_o))
-	OT.air_contents.temperature = CELSIUS_TO_KELVIN(temp_o)
+	OT.air_contents.set_moles(/datum/gas/oxygen, pressure_o*OT.volume/(R_IDEAL_GAS_EQUATION*CELSIUS_TO_KELVIN(temp_o)))
+	OT.air_contents.set_temperature(CELSIUS_TO_KELVIN(temp_o))
 
 	V.tank_one = PT
 	V.tank_two = OT

code/game/objects/effects/spawners/lootdrop.dm

@@ -666,28 +666,18 @@
 	lootcount = 1
 	spawn_on_turf = FALSE
 	loot = list("" = 50,
-		/obj/item/weaponcrafting/improvised_parts/barrel_rifle = 10,
-		/obj/item/weaponcrafting/improvised_parts/barrel_shotgun = 5,
-		/obj/item/weaponcrafting/improvised_parts/barrel_pistol = 5,
-		/obj/item/weaponcrafting/improvised_parts/rifle_receiver = 10,
-		/obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 3,
-		/obj/item/weaponcrafting/improvised_parts/pistol_receiver = 3,
-		/obj/item/weaponcrafting/improvised_parts/laser_receiver = 1,
-		/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 10,
-		/obj/item/weaponcrafting/improvised_parts/makeshift_lens = 3,
+		/obj/item/weaponcrafting/improvised_parts/rifle_receiver = 13,
+		/obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 13,
+		/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 12,
 		)
 
 /obj/effect/spawner/lootdrop/weapon_parts
-	name = "random weapon parts spawner 25%"
+	name = "random weapon parts spawner 20%"
 	lootcount = 1
 	spawn_on_turf = FALSE
-	loot = list("" = 75,
-		/obj/item/weaponcrafting/improvised_parts/barrel_rifle = 5,
-		/obj/item/weaponcrafting/improvised_parts/barrel_pistol = 5,
+	loot = list("" = 80,
 		/obj/item/weaponcrafting/improvised_parts/rifle_receiver = 5,
-		/obj/item/weaponcrafting/improvised_parts/pistol_receiver = 2,
 		/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 5,
-		/obj/item/weaponcrafting/improvised_parts/makeshift_lens = 3,
 		)
 
 /obj/effect/spawner/lootdrop/ammo
@@ -695,8 +685,6 @@
 	lootcount = 1
 	spawn_on_turf = FALSE
 	loot = list("" = 25,
-		/obj/item/ammo_box/c32mm = 15,
-		/obj/item/ammo_box/r32mm = 15,
 		/obj/item/ammo_box/magazine/wt550m9 = 1,
 		/obj/item/ammo_casing/shotgun/buckshot = 7,
 		/obj/item/ammo_casing/shotgun/rubbershot = 7,
@@ -709,8 +697,6 @@
 	lootcount = 1
 	spawn_on_turf = FALSE
 	loot = list("" = 50,
-		/obj/item/ammo_box/c32mm = 7,
-		/obj/item/ammo_box/r32mm = 7,
 		/obj/item/ammo_box/magazine/wt550m9 = 2,
 		/obj/item/ammo_casing/shotgun/buckshot = 10,
 		/obj/item/ammo_casing/shotgun/rubbershot = 10,

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -486,4 +486,15 @@
 		addtimer(CALLBACK(src, .proc/end), 15)
 
 /obj/effect/constructing_effect/proc/end()
-	qdel(src)
+	qdel(src)
+
+/obj/effect/temp_visual/dir_setting/space_wind
+	icon = 'icons/effects/atmospherics.dmi'
+	icon_state = "space_wind"
+	layer = FLY_LAYER
+	duration = 20
+	mouse_opacity = 0
+
+/obj/effect/temp_visual/dir_setting/space_wind/Initialize(mapload, set_dir, set_alpha = 255)
+	. = ..()
+	alpha = set_alpha

code/game/objects/items.dm

@@ -68,6 +68,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	var/click_delay = CLICK_CD_MELEE
 
 	var/slot_flags = 0		//This is used to determine on which slots an item can fit.
+	var/current_equipped_slot
 	pass_flags = PASSTABLE
 	pressure_resistance = 4
 	var/obj/item/master = null
@@ -179,6 +180,11 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 		if(damtype == "brute")
 			hitsound = "swing_hit"
 
+	if(used_skills)
+		for(var/path in used_skills)
+			var/datum/skill/S = GLOB.skill_datums[path]
+			LAZYADD(used_skills[path], S.skill_traits)
+
 /obj/item/Destroy()
 	item_flags &= ~DROPDEL	//prevent reqdels
 	if(ismob(loc))
@@ -315,6 +321,10 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 		return
 	if(anchored)
 		return
+	if(loc == user && current_equipped_slot && current_equipped_slot != SLOT_HANDS)
+		if(current_equipped_slot in user.check_obscured_slots())
+			to_chat(src, "<span class='warning'>You are unable to unequip that while wearing other garments over it!</span>")
+			return FALSE
 
 	if(resistance_flags & ON_FIRE)
 		var/mob/living/carbon/C = user
@@ -336,7 +346,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 				C.update_damage_overlays()
 			return
 
-	if(acid_level > 20 && !ismob(loc))// so we can still remove the clothes on us that have acid.
+	if(acid_level > 20 && ismob(loc))// so we can still remove the clothes on us that have acid.
 		var/mob/living/carbon/C = user
 		if(istype(C))
 			if(!C.gloves || (!(C.gloves.resistance_flags & (UNACIDABLE|ACID_PROOF))))
@@ -379,6 +389,11 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 		return
 	if(anchored)
 		return
+	if(loc == user && current_equipped_slot && current_equipped_slot != SLOT_HANDS)
+		if(current_equipped_slot in user.check_obscured_slots())
+			to_chat(src, "<span class='warning'>You are unable to unequip that while wearing other garments over it!</span>")
+			return FALSE
+
 
 	SEND_SIGNAL(loc, COMSIG_TRY_STORAGE_TAKE, src, user.loc, TRUE)
 
@@ -423,6 +438,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 
 /obj/item/proc/dropped(mob/user)
 	SHOULD_CALL_PARENT(TRUE)
+	current_equipped_slot = null
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.Remove(user)
@@ -470,7 +486,9 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 // for items that can be placed in multiple slots
 // note this isn't called during the initial dressing of a player
 /obj/item/proc/equipped(mob/user, slot)
+	SHOULD_CALL_PARENT(TRUE)
 	. = SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot)
+	current_equipped_slot = slot
 	if(!(. & COMPONENT_NO_GRANT_ACTIONS))
 		for(var/X in actions)
 			var/datum/action/A = X
@@ -835,7 +853,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 
 // Called when a mob tries to use the item as a tool.
 // Handles most checks.
-/obj/item/proc/use_tool(atom/target, mob/living/user, delay, amount=0, volume=0, datum/callback/extra_checks, skill_gain_mult = 1, max_level = INFINITY)
+/obj/item/proc/use_tool(atom/target, mob/living/user, delay, amount=0, volume=0, datum/callback/extra_checks, skill_gain_mult = STD_USE_TOOL_MULT)
 	// No delay means there is no start message, and no reason to call tool_start_check before use_tool.
 	// Run the start check here so we wouldn't have to call it manually.
 	if(!delay && !tool_start_check(user, amount))
@@ -880,7 +898,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 		for(var/skill in used_skills)
 			if(!(SKILL_TRAINING_TOOL in used_skills[skill]))
 				continue
-			user.mind.auto_gain_experience(skill, gain*skill_gain_mult, GET_STANDARD_LVL(max_level))
+			var/datum/skill/S = GLOB.skill_datums[skill]
+			user.mind.auto_gain_experience(skill, gain*skill_gain_mult*S.item_skill_gain_multi)
 
 	return TRUE
 

code/game/objects/items/chrono_eraser.dm

@@ -246,9 +246,9 @@
 
 /obj/effect/chrono_field/return_air() //we always have nominal air and temperature
 	var/datum/gas_mixture/GM = new
-	GM.gases[/datum/gas/oxygen] = MOLES_O2STANDARD
-	GM.gases[/datum/gas/nitrogen] = MOLES_N2STANDARD
-	GM.temperature = T20C
+	GM.set_moles(/datum/gas/oxygen, MOLES_O2STANDARD)
+	GM.set_moles(/datum/gas/nitrogen, MOLES_N2STANDARD)
+	GM.set_temperature(T20C)
 	return GM
 
 /obj/effect/chrono_field/Move()

code/game/objects/items/cigs_lighters.dm

@@ -794,6 +794,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		reagents.clear_reagents()
 
 /obj/item/clothing/mask/vape/equipped(mob/user, slot)
+	. = ..()
 	if(slot == SLOT_WEAR_MASK)
 		if(!screw)
 			to_chat(user, "<span class='notice'>You start puffing on the vape.</span>")

code/game/objects/items/circuitboards/computer_circuitboards.dm

@@ -116,9 +116,9 @@
 	build_path = /obj/machinery/computer/cloning
 	var/list/records = list()
 
-/obj/item/circuitboard/computer/prototype_cloning
+/obj/item/circuitboard/computer/cloning/prototype
 	name = "Prototype Cloning (Computer Board)"
-	build_path = /obj/machinery/computer/prototype_cloning
+	build_path = /obj/machinery/computer/cloning/prototype
 
 /obj/item/circuitboard/computer/arcade/battle
 	name = "Arcade Battle (Computer Board)"

code/game/objects/items/devices/PDA/PDA.dm

@@ -437,7 +437,6 @@ GLOBAL_LIST_EMPTY(PDAs)
 					dat += "Unable to obtain a reading.<br>"
 				else
 					var/datum/gas_mixture/environment = T.return_air()
-					var/list/env_gases = environment.gases
 
 					var/pressure = environment.return_pressure()
 					var/total_moles = environment.total_moles()
@@ -445,12 +444,12 @@ GLOBAL_LIST_EMPTY(PDAs)
 					dat += "Air Pressure: [round(pressure,0.1)] kPa<br>"
 
 					if (total_moles)
-						for(var/id in env_gases)
-							var/gas_level = env_gases[id]/total_moles
+						for(var/id in environment.get_gases())
+							var/gas_level = environment.get_moles(id)/total_moles
 							if(gas_level > 0)
 								dat += "[GLOB.meta_gas_names[id]]: [round(gas_level*100, 0.01)]%<br>"
 
-					dat += "Temperature: [round(environment.temperature-T0C)]&deg;C<br>"
+					dat += "Temperature: [round(environment.return_temperature()-T0C)]&deg;C<br>"
 				dat += "<br>"
 			else//Else it links to the cart menu proc. Although, it really uses menu hub 4--menu 4 doesn't really exist as it simply redirects to hub.
 				dat += cartridge.generate_menu()

code/game/objects/items/devices/scanners.dm

@@ -556,41 +556,38 @@ GENETICS SCANNER
 	else
 		to_chat(user, "<span class='alert'>Pressure: [round(pressure, 0.01)] kPa</span>")
 	if(total_moles)
-		var/list/env_gases = environment.gases
 
-		var/o2_concentration = env_gases[/datum/gas/oxygen]/total_moles
-		var/n2_concentration = env_gases[/datum/gas/nitrogen]/total_moles
-		var/co2_concentration = env_gases[/datum/gas/carbon_dioxide]/total_moles
-		var/plasma_concentration = env_gases[/datum/gas/plasma]/total_moles
+		var/o2_concentration = environment.get_moles(/datum/gas/oxygen)/total_moles
+		var/n2_concentration = environment.get_moles(/datum/gas/nitrogen)/total_moles
+		var/co2_concentration = environment.get_moles(/datum/gas/carbon_dioxide)/total_moles
+		var/plasma_concentration = environment.get_moles(/datum/gas/plasma)/total_moles
 
 		if(abs(n2_concentration - N2STANDARD) < 20)
-			to_chat(user, "<span class='info'>Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen], 0.01)] mol)</span>")
+			to_chat(user, "<span class='info'>Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/nitrogen), 0.01)] mol)</span>")
 		else
-			to_chat(user, "<span class='alert'>Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/nitrogen], 0.01)] mol)</span>")
+			to_chat(user, "<span class='alert'>Nitrogen: [round(n2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/nitrogen), 0.01)] mol)</span>")
 
 		if(abs(o2_concentration - O2STANDARD) < 2)
-			to_chat(user, "<span class='info'>Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen], 0.01)] mol)</span>")
+			to_chat(user, "<span class='info'>Oxygen: [round(o2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/oxygen), 0.01)] mol)</span>")
 		else
-			to_chat(user, "<span class='alert'>Oxygen: [round(o2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/oxygen], 0.01)] mol)</span>")
+			to_chat(user, "<span class='alert'>Oxygen: [round(o2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/oxygen), 0.01)] mol)</span>")
 
 		if(co2_concentration > 0.01)
-			to_chat(user, "<span class='alert'>CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide], 0.01)] mol)</span>")
+			to_chat(user, "<span class='alert'>CO2: [round(co2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/carbon_dioxide), 0.01)] mol)</span>")
 		else
-			to_chat(user, "<span class='info'>CO2: [round(co2_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/carbon_dioxide], 0.01)] mol)</span>")
+			to_chat(user, "<span class='info'>CO2: [round(co2_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/carbon_dioxide), 0.01)] mol)</span>")
 
 		if(plasma_concentration > 0.005)
-			to_chat(user, "<span class='alert'>Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma], 0.01)] mol)</span>")
+			to_chat(user, "<span class='alert'>Plasma: [round(plasma_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/plasma), 0.01)] mol)</span>")
 		else
-			to_chat(user, "<span class='info'>Plasma: [round(plasma_concentration*100, 0.01)] % ([round(env_gases[/datum/gas/plasma], 0.01)] mol)</span>")
+			to_chat(user, "<span class='info'>Plasma: [round(plasma_concentration*100, 0.01)] % ([round(environment.get_moles(/datum/gas/plasma), 0.01)] mol)</span>")
 
-		GAS_GARBAGE_COLLECT(environment.gases)
-
-		for(var/id in env_gases)
+		for(var/id in environment.get_gases())
 			if(id in GLOB.hardcoded_gases)
 				continue
-			var/gas_concentration = env_gases[id]/total_moles
-			to_chat(user, "<span class='alert'>[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] % ([round(env_gases[id], 0.01)] mol)</span>")
-		to_chat(user, "<span class='info'>Temperature: [round(environment.temperature-T0C, 0.01)] &deg;C ([round(environment.temperature, 0.01)] K)</span>")
+			var/gas_concentration = environment.get_moles(id)/total_moles
+			to_chat(user, "<span class='alert'>[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] % ([round(environment.get_moles(id), 0.01)] mol)</span>")
+		to_chat(user, "<span class='info'>Temperature: [round(environment.return_temperature()-T0C, 0.01)] &deg;C ([round(environment.return_temperature(), 0.01)] K)</span>")
 
 /obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens
 	. = ..()
@@ -669,8 +666,8 @@ GENETICS SCANNER
 
 		var/total_moles = air_contents.total_moles()
 		var/pressure = air_contents.return_pressure()
-		var/volume = air_contents.return_volume() //could just do mixture.volume... but safety, I guess?
-		var/temperature = air_contents.temperature
+		var/volume = air_contents.return_volume()
+		var/temperature = air_contents.return_temperature()
 		var/cached_scan_results = air_contents.analyzer_results
 
 		if(total_moles > 0)
@@ -678,10 +675,9 @@ GENETICS SCANNER
 			to_chat(user, "<span class='notice'>Volume: [volume] L</span>")
 			to_chat(user, "<span class='notice'>Pressure: [round(pressure,0.01)] kPa</span>")
 
-			var/list/cached_gases = air_contents.gases
-			for(var/id in cached_gases)
-				var/gas_concentration = cached_gases[id]/total_moles
-				to_chat(user, "<span class='notice'>[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] % ([round(cached_gases[id], 0.01)] mol)</span>")
+			for(var/id in air_contents.get_gases())
+				var/gas_concentration = air_contents.get_moles(id)/total_moles
+				to_chat(user, "<span class='notice'>[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] % ([round(air_contents.get_moles(id), 0.01)] mol)</span>")
 			to_chat(user, "<span class='notice'>Temperature: [round(temperature - T0C,0.01)] &deg;C ([round(temperature, 0.01)] K)</span>")
 
 		else

code/game/objects/items/devices/transfer_valve.dm

@@ -168,8 +168,8 @@
 		target_self = TRUE
 	if(change_volume)
 		if(!target_self)
-			target.volume += tank_two.volume
-		target.volume += tank_one.air_contents.volume
+			target.set_volume(target.return_volume() + tank_two.volume)
+		target.set_volume(target.return_volume() + tank_one.air_contents.return_volume())
 	var/datum/gas_mixture/temp
 	temp = tank_one.air_contents.remove_ratio(1)
 	target.merge(temp)
@@ -180,11 +180,11 @@
 /obj/item/transfer_valve/proc/split_gases()
 	if (!valve_open || !tank_one || !tank_two)
 		return
-	var/ratio1 = tank_one.air_contents.volume/tank_two.air_contents.volume
+	var/ratio1 = tank_one.air_contents.return_volume()/tank_two.air_contents.return_volume()
 	var/datum/gas_mixture/temp
 	temp = tank_two.air_contents.remove_ratio(ratio1)
 	tank_one.air_contents.merge(temp)
-	tank_two.air_contents.volume -=  tank_one.air_contents.volume
+	tank_two.air_contents.set_volume(tank_two.air_contents.return_volume() - tank_one.air_contents.return_volume())
 
 	/*
 	Exadv1: I know this isn't how it's going to work, but this was just to check

code/game/objects/items/flamethrower.dm

@@ -204,11 +204,10 @@
 	//TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this...
 	//Transfer 5% of current tank air contents to turf
 	var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(release_amount)
-	if(air_transfer.gases[/datum/gas/plasma])
-		air_transfer.gases[/datum/gas/plasma] *= 5
+	air_transfer.set_moles(/datum/gas/plasma, air_transfer.get_moles(/datum/gas/plasma) * 5)
 	target.assume_air(air_transfer)
 	//Burn it based on transfered gas
-	target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500)
+	target.hotspot_expose((ptank.air_contents.return_temperature()*2) + 380,500)
 	//location.hotspot_expose(1000,500,1)
 	SSair.add_to_active(target, 0)
 

code/game/objects/items/grenades/chem_grenade.dm

@@ -97,7 +97,7 @@
 		to_chat(user, "<span class='notice'>You add [A] to the [initial(name)] assembly.</span>")
 
 	else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil))
-		if (I.use_tool(src, user, 0, 1, max_level = JOB_SKILL_BASIC))
+		if (I.use_tool(src, user, 0, 1, skill_gain_mult = TRIVIAL_USE_TOOL_MULT))
 			det_time = 50 // In case the cable_coil was removed and readded.
 			stage_change(WIRED)
 			to_chat(user, "<span class='notice'>You rig the [initial(name)] assembly.</span>")

code/game/objects/items/pet_carrier.dm

@@ -22,6 +22,11 @@
 	var/occupant_weight = 0
 	var/max_occupants = 3 //Hard-cap so you can't have infinite mice or something in one carrier
 	var/max_occupant_weight = MOB_SIZE_SMALL //This is calculated from the mob sizes of occupants
+	var/entrance_name = "door" //name of the entrance to the item
+	var/escape_time = 200 //how long it takes for mobs above small sizes to escape (for small sizes, its randomly 1.5 to 2x this)
+	var/load_time = 30 //how long it takes for mobs to be loaded into the pet carrier
+	var/has_lock_sprites = TRUE //whether to load the lock overlays or not
+	var/allows_hostiles = FALSE //does the pet carrier allow hostile entities to be held within it?
 
 /obj/item/pet_carrier/Destroy()
 	if(occupants.len)
@@ -51,20 +56,20 @@
 	else
 		. += "<span class='notice'>It has nothing inside.</span>"
 	if(user.canUseTopic(src))
-		. += "<span class='notice'>Activate it in your hand to [open ? "close" : "open"] its door.</span>"
+		. += "<span class='notice'>Activate it in your hand to [open ? "close" : "open"] its [entrance_name].</span>"
 		if(!open)
-			. += "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"] its door.</span>"
+			. += "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"] its [entrance_name].</span>"
 
 /obj/item/pet_carrier/attack_self(mob/living/user)
 	if(open)
-		to_chat(user, "<span class='notice'>You close [src]'s door.</span>")
+		to_chat(user, "<span class='notice'>You close [src]'s [entrance_name].</span>")
 		playsound(user, 'sound/effects/bin_close.ogg', 50, TRUE)
 		open = FALSE
 	else
 		if(locked)
 			to_chat(user, "<span class='warning'>[src] is locked!</span>")
 			return
-		to_chat(user, "<span class='notice'>You open [src]'s door.</span>")
+		to_chat(user, "<span class='notice'>You open [src]'s [entrance_name].</span>")
 		playsound(user, 'sound/effects/bin_open.ogg', 50, TRUE)
 		open = TRUE
 	update_icon()
@@ -86,7 +91,7 @@
 	if(user.a_intent == INTENT_HARM)
 		return ..()
 	if(!open)
-		to_chat(user, "<span class='warning'>You need to open [src]'s door!</span>")
+		to_chat(user, "<span class='warning'>You need to open [src]'s [entrance_name]!</span>")
 		return
 	if(target.mob_size > max_occupant_weight)
 		if(ishuman(target))
@@ -94,13 +99,15 @@
 			if(iscatperson(H))
 				to_chat(user, "<span class='warning'>You'd need a lot of catnip and treats, plus maybe a laser pointer, for that to work.</span>")
 			else
-				to_chat(user, "<span class='warning'>Humans, generally, do not fit into pet carriers.</span>")
+				to_chat(user, "<span class='warning'>Humans, generally, do not fit into [name]s.</span>")
 		else
 			to_chat(user, "<span class='warning'>You get the feeling [target] isn't meant for a [name].</span>")
 		return
 	if(user == target)
 		to_chat(user, "<span class='warning'>Why would you ever do that?</span>")
 		return
+	if(ishostile(target) && !allows_hostiles && target.move_resist < MOVE_FORCE_VERY_STRONG) //don't allow goliaths into pet carriers
+		to_chat(user, "<span class='warning'>You have a feeling you shouldn't keep this as a pet.</span>")
 	load_occupant(user, target)
 
 /obj/item/pet_carrier/relaymove(mob/living/user, direction)
@@ -110,8 +117,8 @@
 		remove_occupant(user)
 		return
 	else if(!locked)
-		loc.visible_message("<span class='notice'>[user] pushes open the door to [src]!</span>", \
-		"<span class='warning'>[user] pushes open the door of [src]!</span>")
+		loc.visible_message("<span class='notice'>[user] pushes open the [entrance_name] to [src]!</span>", \
+		"<span class='warning'>[user] pushes open the [entrance_name] of [src]!</span>")
 		open = TRUE
 		update_icon()
 		return
@@ -119,12 +126,19 @@
 		container_resist(user)
 
 /obj/item/pet_carrier/container_resist(mob/living/user)
+	//don't do the whole resist timer thing if it's open!
+	if(open)
+		loc.visible_message("<span class='notice'>[user] climbs out of [src]!</span>", \
+		"<span class='warning'>[user] jumps out of [src]!</span>")
+		remove_occupant(user)
+		return
+
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
 	if(user.mob_size <= MOB_SIZE_SMALL)
-		to_chat(user, "<span class='notice'>You poke a limb through [src]'s bars and start fumbling for the lock switch... (This will take some time.)</span>")
-		to_chat(loc, "<span class='warning'>You see [user] reach through the bars and fumble for the lock switch!</span>")
-		if(!do_after(user, rand(300, 400), target = user) || open || !locked || !(user in occupants))
+		to_chat(user, "<span class='notice'>You begin to try escaping the [src] and start fumbling for the lock switch... (This will take some time.)</span>")
+		to_chat(loc, "<span class='warning'>You see [user] attempting to unlock the [src]!</span>")
+		if(!do_after(user, rand(escape_time * 1.5, escape_time * 2), target = user) || open || !locked || !(user in occupants))
 			return
 		loc.visible_message("<span class='warning'>[user] flips the lock switch on [src] by reaching through!</span>", null, null, null, user)
 		to_chat(user, "<span class='boldannounce'>Bingo! The lock pops open!</span>")
@@ -132,12 +146,12 @@
 		playsound(src, 'sound/machines/boltsup.ogg', 30, TRUE)
 		update_icon()
 	else
-		loc.visible_message("<span class='warning'>[src] starts rattling as something pushes against the door!</span>", null, null, null, user)
+		loc.visible_message("<span class='warning'>[src] starts rattling as something pushes against the [entrance_name]!</span>", null, null, null, user)
 		to_chat(user, "<span class='notice'>You start pushing out of [src]... (This will take about 20 seconds.)</span>")
-		if(!do_after(user, 200, target = user) || open || !locked || !(user in occupants))
+		if(!do_after(user, escape_time, target = user) || open || !locked || !(user in occupants))
 			return
 		loc.visible_message("<span class='warning'>[user] shoves out of	[src]!</span>", null, null, null, user)
-		to_chat(user, "<span class='notice'>You shove open [src]'s door against the lock's resistance and fall out!</span>")
+		to_chat(user, "<span class='notice'>You shove open [src]'s [entrance_name] against the lock's resistance and fall out!</span>")
 		locked = FALSE
 		open = TRUE
 		update_icon()
@@ -151,7 +165,7 @@
 
 /obj/item/pet_carrier/update_overlays()
 	. = ..()
-	if(!open)
+	if(!open && has_lock_sprites)
 		. += "[locked ? "" : "un"]locked"
 
 /obj/item/pet_carrier/MouseDrop(atom/over_atom)
@@ -170,7 +184,7 @@
 	user.visible_message("<span class='notice'>[user] starts loading [target] into [src].</span>", \
 	"<span class='notice'>You start loading [target] into [src]...</span>", null, null, target)
 	to_chat(target, "<span class='userdanger'>[user] starts loading you into [user.p_their()] [name]!</span>")
-	if(!do_mob(user, target, 30))
+	if(!do_mob(user, target, load_time))
 		return
 	if(target in occupants)
 		return
@@ -192,9 +206,74 @@
 /obj/item/pet_carrier/proc/remove_occupant(mob/living/occupant, turf/new_turf)
 	if(!(occupant in occupants) || !istype(occupant))
 		return
-	occupant.forceMove(new_turf ? new_turf : drop_location())
+	occupant.forceMove(new_turf ? new_turf : get_turf(src))
 	occupants -= occupant
 	occupant_weight -= occupant.mob_size
 	occupant.setDir(SOUTH)
 
+//bluespace jar, a reskin of the pet carrier that can fit people and smashes when thrown
+/obj/item/pet_carrier/bluespace
+	name = "bluespace jar"
+	desc = "A jar, that seems to be bigger on the inside, somehow allowing lifeforms to fit through its narrow entrance."
+	open = FALSE //starts closed so it looks better on menus
+	icon_state = "bluespace_jar"
+	item_state = "bluespace_jar"
+	lefthand_file = ""
+	righthand_file = ""
+	max_occupant_weight = MOB_SIZE_HUMAN //can fit people, like a bluespace bodybag!
+	load_time = 40 //loading things into a jar takes longer than a regular pet carrier
+	entrance_name = "lid"
+	w_class = WEIGHT_CLASS_SMALL //it's a jar
+	throw_speed = 3
+	throw_range = 7
+	max_occupants = 1 //far less than a regular carrier or bluespace bodybag, because it can be thrown to release the contents
+	allows_hostiles = TRUE //can fit hostile creatures, with the move resist restrictions in place, this means they still cannot take things like legions/goliaths/etc regardless
+	has_lock_sprites = FALSE //jar doesn't show the regular lock overlay
+	custom_materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 600)
+	escape_time = 10 //half the time of a bluespace bodybag
+	var/datum/gas_mixture/occupant_gas_supply
+
+/obj/item/pet_carrier/bluespace/update_icon_state()
+	if(open)
+		icon_state = "bluespace_jar_open"
+	else
+		icon_state = "bluespace_jar"
+
+/obj/item/pet_carrier/bluespace/throw_impact()
+	. = ..()
+	//delete the item upon impact, releasing the creature inside (this is handled by its deletion)
+	if(occupants.len)
+		loc.visible_message("<span class='warning'>The bluespace jar smashes, releasing [occupants[1]]!</span>")
+	playsound(src, "shatter", 70, 1)
+	qdel(src)
+
+/obj/item/pet_carrier/bluespace/add_occupant(mob/living/occupant) //update the gas supply as required, this acts like magical internals
+	. = ..()
+	if(!occupant_gas_supply)
+		occupant_gas_supply = new
+	if(isanimal(occupant))
+		var/mob/living/simple_animal/animal = occupant
+		occupant_gas_supply.set_temperature(animal.minbodytemp) //simple animals only care about temperature when their turf isnt a location
+	else
+		if(ishuman(occupant)) //humans require resistance to cold/heat and living in no air while inside, and lose this when outside
+			ADD_TRAIT(occupant, TRAIT_RESISTCOLD, "bluespace_container_cold_resist")
+			ADD_TRAIT(occupant, TRAIT_RESISTHEAT, "bluespace_container_heat_resist")
+			ADD_TRAIT(occupant, TRAIT_NOBREATH, "bluespace_container_no_breath")
+			ADD_TRAIT(occupant, TRAIT_RESISTHIGHPRESSURE, "bluespace_container_resist_high_pressure")
+			ADD_TRAIT(occupant, TRAIT_RESISTLOWPRESSURE, "bluespace_container_resist_low_pressure")
+
+/obj/item/pet_carrier/bluespace/remove_occupant(mob/living/occupant)
+	. = ..()
+	if(ishuman(occupant))
+		REMOVE_TRAIT(occupant, TRAIT_RESISTCOLD, "bluespace_container_cold_resist")
+		REMOVE_TRAIT(occupant, TRAIT_RESISTHEAT, "bluespace_container_heat_resist")
+		REMOVE_TRAIT(occupant, TRAIT_NOBREATH, "bluespace_container_no_breath")
+		REMOVE_TRAIT(occupant, TRAIT_RESISTHIGHPRESSURE, "bluespace_container_resist_high_pressure")
+		REMOVE_TRAIT(occupant, TRAIT_RESISTLOWPRESSURE, "bluespace_container_resist_low_pressure")
+
+/obj/item/pet_carrier/bluespace/return_air()
+	if(!occupant_gas_supply)
+		occupant_gas_supply = new
+	return occupant_gas_supply
+
 #undef pet_carrier_full

code/game/objects/items/robot/robot_items.dm

@@ -355,6 +355,7 @@
 	emaggedhitdamage = 0
 
 /obj/item/borg/lollipop/equipped()
+	. = ..()
 	check_amount()
 
 /obj/item/borg/lollipop/dropped(mob/user)

code/game/objects/items/shields.dm

@@ -26,7 +26,7 @@
 /datum/block_parry_data/shield
 	block_damage_multiplier = 0.25
 	block_stamina_efficiency = 2.5
-	block_stamina_cost_per_second = 3.5
+	block_stamina_cost_per_second = 2.5
 	block_slowdown = 0
 	block_lock_attacking = FALSE
 	block_lock_sprinting = TRUE
@@ -386,7 +386,7 @@ obj/item/shield/riot/bullet_proof
 	max_integrity = 100
 	obj_integrity = 100
 	can_shatter = FALSE
-	item_flags = SLOWS_WHILE_IN_HAND
+	item_flags = SLOWS_WHILE_IN_HAND | ITEM_CAN_BLOCK
 	var/recharge_timerid
 	var/recharge_delay = 15 SECONDS
 

code/game/objects/items/stacks/sheets/glass.dm

@@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 		if (get_amount() < 1 || CC.get_amount() < 5)
 			to_chat(user, "<span class='warning>You need five lengths of coil and one sheet of glass to make wired glass!</span>")
 			return
-		CC.use_tool(src, user, 0, 5, max_level = JOB_SKILL_BASIC)
+		CC.use_tool(src, user, 0, 5, skill_gain_mult = TRIVIAL_USE_TOOL_MULT)
 		use(1)
 		to_chat(user, "<span class='notice'>You attach wire to the [name].</span>")
 		var/obj/item/stack/light_w/new_tile = new(user.loc)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -240,9 +240,8 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 		new /datum/stack_recipe("pew (right)", /obj/structure/chair/pew/right, 3, one_per_turf = TRUE, on_floor = TRUE),\
 		)),
 	null, \
-	new/datum/stack_recipe("wooden firearm body", /obj/item/weaponcrafting/improvised_parts/wooden_body, 10, time = 40), \
-	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
-	new/datum/stack_recipe("pistol grip", /obj/item/weaponcrafting/improvised_parts/wooden_grip, 5, time = 40), \
+	new/datum/stack_recipe("wooden firearm body", /obj/item/weaponcrafting/improvised_parts/wooden_body, 10, time = 20), \
+	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 20), \
 	new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
 	new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \
 	new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
@@ -382,6 +381,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("chemistry bag", /obj/item/storage/bag/chemistry, 4), \
 	new/datum/stack_recipe("bio bag", /obj/item/storage/bag/bio, 4), \
 	null, \
+	new/datum/stack_recipe("string", /obj/item/weaponcrafting/string, 1, time = 10), \
 	new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \
 	new/datum/stack_recipe("rag", /obj/item/reagent_containers/rag, 1), \
 	new/datum/stack_recipe("towel", /obj/item/reagent_containers/rag/towel, 3), \
@@ -429,7 +429,6 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
 	new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \
 	new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/durathread, 1, time = 25), \
-	new/datum/stack_recipe("durathread string", /obj/item/weaponcrafting/durathread_string, 1, time = 40), \
 	))
 
 /obj/item/stack/sheet/durathread

code/game/objects/items/storage/bags.dm

@@ -326,6 +326,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	flags_1 = CONDUCT_1
 	custom_materials = list(/datum/material/iron=3000)
+	var/max_items = 7
 
 /obj/item/storage/bag/tray/ComponentInitialize()
 	. = ..()
@@ -333,6 +334,7 @@
 	STR.max_w_class = WEIGHT_CLASS_NORMAL
 	STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food, /obj/item/reagent_containers/glass, /datum/reagent/consumable, /obj/item/kitchen/knife, /obj/item/kitchen/rollingpin, /obj/item/kitchen/fork, /obj/item/storage/box)) //Should cover: Bottles, Beakers, Bowls, Booze, Glasses, Food, Kitchen Tools, and ingredient boxes.
 	STR.insert_preposition = "on"
+	STR.max_items = max_items
 
 /obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
 	. = ..()
@@ -373,6 +375,14 @@
 	. = ..()
 	update_icon()
 
+//bluespace tray, holds more items
+/obj/item/storage/bag/tray/bluespace
+	name = "bluespace tray"
+	icon_state = "bluespace_tray"
+	desc = "A tray created using bluespace technology to fit more food on it."
+	max_items = 30 // far more items
+	custom_materials = list(/datum/material/iron = 2000, /datum/material/bluespace = 500)
+
 /*
  *	Chemistry bag
  */
@@ -462,4 +472,4 @@
 	STR.max_combined_w_class = INFINITY
 	STR.max_items = 2
 	STR.display_numerical_stacking = TRUE
-	STR.can_hold = typecacheof(list(/obj/item/rcd_ammo, /obj/item/stack/sheet))
+	STR.can_hold = typecacheof(list(/obj/item/rcd_ammo, /obj/item/stack/sheet))

code/game/objects/items/storage/fancy.dm

@@ -207,18 +207,18 @@
 		cig_position++
 
 /obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	if(!ismob(M))
-		return
+	if(M != user || !istype(M))
+		return ..()
 	var/obj/item/clothing/mask/cigarette/cig = locate(/obj/item/clothing/mask/cigarette) in contents
 	if(cig)
-		if(M == user && contents.len > 0 && !user.wear_mask)
+		if(!user.wear_mask && !(SLOT_WEAR_MASK in M.check_obscured_slots()))
 			var/obj/item/clothing/mask/cigarette/W = cig
 			SEND_SIGNAL(src, COMSIG_TRY_STORAGE_TAKE, W, M)
 			M.equip_to_slot_if_possible(W, SLOT_WEAR_MASK)
 			contents -= W
 			to_chat(user, "<span class='notice'>You take \a [W] out of the pack.</span>")
 		else
-			..()
+			return ..()
 	else
 		to_chat(user, "<span class='notice'>There are no [icon_type]s left in the pack.</span>")
 

code/game/objects/items/tanks/jetpack.dm

@@ -21,7 +21,7 @@
 
 /obj/item/tank/jetpack/populate_gas()
 	if(gas_type)
-		air_contents.gases[gas_type] = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
+		air_contents.set_moles(gas_type, ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)))
 
 
 /obj/item/tank/jetpack/ui_action_click(mob/user, action)

code/game/objects/items/tanks/tank_types.dm

@@ -18,8 +18,9 @@
 	force = 10
 	dog_fashion = /datum/dog_fashion/back
 
+
 /obj/item/tank/internals/oxygen/populate_gas()
-	air_contents.gases[/datum/gas/oxygen] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+	air_contents.set_moles(/datum/gas/oxygen, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 	return
 
 
@@ -47,8 +48,9 @@
 	force = 10
 
 /obj/item/tank/internals/anesthetic/populate_gas()
-	air_contents.gases[/datum/gas/oxygen] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
-	air_contents.gases[/datum/gas/nitrous_oxide] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+	air_contents.set_moles(/datum/gas/oxygen, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD)
+	air_contents.set_moles(/datum/gas/nitrous_oxide, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
+	return
 
 /*
  * Air
@@ -62,8 +64,9 @@
 	dog_fashion = /datum/dog_fashion/back
 
 /obj/item/tank/internals/air/populate_gas()
-	air_contents.gases[/datum/gas/oxygen] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
-	air_contents.gases[/datum/gas/nitrogen] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+	air_contents.set_moles(/datum/gas/oxygen, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD)
+	air_contents.set_moles(/datum/gas/nitrogen, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
+	return
 
 
 /*
@@ -79,7 +82,8 @@
 
 
 /obj/item/tank/internals/plasma/populate_gas()
-	air_contents.gases[/datum/gas/plasma] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+	air_contents.set_moles(/datum/gas/plasma, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return
 
 /obj/item/tank/internals/plasma/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/flamethrower))
@@ -93,12 +97,16 @@
 		F.update_icon()
 	else
 		return ..()
+
+/obj/item/tank/internals/plasma/full/populate_gas()
+	air_contents.set_moles(/datum/gas/plasma, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+
 //Makes empty oxygen tanks spawn without gas
 /obj/item/tank/internals/plasma/empty/populate_gas()
 	return
 
 /obj/item/tank/internals/plasma/full/populate_gas()
-	air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+	air_contents.set_moles(/datum/gas/plasma, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 
 /*
  * Plasmaman Plasma Tank
@@ -113,10 +121,11 @@
 	distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
 
 /obj/item/tank/internals/plasmaman/populate_gas()
-	air_contents.gases[/datum/gas/plasma] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+	air_contents.set_moles(/datum/gas/plasma, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+	return
 
 /obj/item/tank/internals/plasmaman/full/populate_gas()
-	air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+	air_contents.set_moles(/datum/gas/plasma, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 	return
 
 
@@ -129,7 +138,7 @@
 	w_class = WEIGHT_CLASS_SMALL //thanks i forgot this
 
 /obj/item/tank/internals/plasmaman/belt/full/populate_gas()
-	air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+	air_contents.set_moles(/datum/gas/plasma, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 	return
 
 //makes empty plasma tanks spawn without gas.
@@ -152,7 +161,7 @@
 
 
 /obj/item/tank/internals/emergency_oxygen/populate_gas()
-	air_contents.gases[/datum/gas/oxygen] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+	air_contents.set_moles(/datum/gas/oxygen, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
 	return
 
 /obj/item/tank/internals/emergency_oxygen/empty/populate_gas()
@@ -172,4 +181,4 @@
 	volume = 10
 
 /obj/item/tank/internals/emergency_oxygen/double/empty/populate_gas()
-	return
+	return

code/game/objects/items/tanks/tanks.dm

@@ -64,7 +64,7 @@
 	. = ..()
 
 	air_contents = new(volume) //liters
-	air_contents.temperature = T20C
+	air_contents.set_temperature(T20C)
 
 	populate_gas()
 
@@ -92,7 +92,7 @@
 
 	. += "<span class='notice'>The pressure gauge reads [round(src.air_contents.return_pressure(),0.01)] kPa.</span>"
 
-	var/celsius_temperature = src.air_contents.temperature-T0C
+	var/celsius_temperature = src.air_contents.return_temperature()-T0C
 	var/descriptive
 
 	if (celsius_temperature < 20)
@@ -235,7 +235,7 @@
 	if(tank_pressure < distribute_pressure)
 		distribute_pressure = tank_pressure
 
-	var/moles_needed = distribute_pressure*volume_to_return/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
+	var/moles_needed = distribute_pressure*volume_to_return/(R_IDEAL_GAS_EQUATION*air_contents.return_temperature())
 
 	return remove_air(moles_needed)
 

code/game/objects/items/tools/saw.dm

@@ -1,47 +0,0 @@
-/obj/item/hatchet/saw
-	name = "handsaw"
-	desc = "A very sharp handsaw, it's compact."
-	icon = 'icons/obj/tools.dmi'
-	icon_state = "saw"
-	item_state = "sawhandle_greyscale"
-	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	tool_behaviour = TOOL_SAW
-	force = 10
-	throwforce = 8
-	throw_speed = 3
-	throw_range = 5
-	custom_materials = list(/datum/material/iron = 5000)
-	attack_verb = list("sawed", "sliced", "cut")
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	sharpness = IS_SHARP
-	var/random_color = TRUE //code taken from screwdrivers.dm; cool handles are cool.
-	var/static/list/saw_colors = list(
-		"blue" = rgb(24, 97, 213),
-		"red" = rgb(255, 0, 0),
-		"pink" = rgb(213, 24, 141),
-		"brown" = rgb(160, 82, 18),
-		"green" = rgb(14, 127, 27),
-		"cyan" = rgb(24, 162, 213),
-		"yellow" = rgb(255, 165, 0)
-	)
-
-/obj/item/hatchet/saw/Initialize()
-	. = ..()
-	if(random_color)
-		icon_state = "sawhandle_greyscale"
-		var/our_color = pick(saw_colors)
-		add_atom_colour(saw_colors[our_color], FIXED_COLOUR_PRIORITY)
-		update_icon()
-	if(prob(75))
-		pixel_y = rand(-8, 8)
-
-/obj/item/hatchet/saw/update_overlays()
-	. = ..()
-	if(!random_color) //icon override
-		return
-	var/mutable_appearance/base_overlay = mutable_appearance(icon, "sawblade")
-	base_overlay.appearance_flags = RESET_COLOR
-	. += base_overlay
-
-// END

code/game/objects/structures/holosign.dm

@@ -94,7 +94,7 @@
 	alpha = 150
 	resistance_flags = FIRE_PROOF
 
-/obj/structure/holosign/barrier/firelock/blocksTemperature()
+/obj/structure/holosign/barrier/firelock/BlockSuperconductivity()
 	return TRUE
 
 /obj/structure/holosign/barrier/combifan
@@ -110,7 +110,7 @@
 	CanAtmosPass = ATMOS_PASS_NO
 	resistance_flags = FIRE_PROOF
 
-/obj/structure/holosign/barrier/combifan/blocksTemperature()
+/obj/structure/holosign/barrier/combifan/BlockSuperconductivity()
 	return TRUE
 
 /obj/structure/holosign/barrier/combifan/Initialize()

code/game/objects/structures/transit_tubes/station.dm

@@ -152,8 +152,8 @@
 		pod_moving = 0
 		if(!QDELETED(pod))
 			var/datum/gas_mixture/floor_mixture = loc.return_air()
-			ARCHIVE(floor_mixture)
-			ARCHIVE(pod.air_contents)
+			floor_mixture.archive()
+			pod.air_contents.archive()
 			pod.air_contents.share(floor_mixture, 1) //mix the pod's gas mixture with the tile it's on
 			air_update_turf()
 

code/game/objects/structures/transit_tubes/transit_tube_pod.dm

@@ -10,9 +10,9 @@
 
 /obj/structure/transit_tube_pod/Initialize()
 	. = ..()
-	air_contents.gases[/datum/gas/oxygen] = MOLES_O2STANDARD
-	air_contents.gases[/datum/gas/nitrogen] = MOLES_N2STANDARD
-	air_contents.temperature = T20C
+	air_contents.set_moles(/datum/gas/oxygen, MOLES_O2STANDARD)
+	air_contents.set_moles(/datum/gas/nitrogen, MOLES_N2STANDARD)
+	air_contents.set_temperature(T20C)
 
 
 /obj/structure/transit_tube_pod/Destroy()
@@ -181,4 +181,4 @@
 						return
 
 /obj/structure/transit_tube_pod/return_temperature()
-	return air_contents.temperature
+	return air_contents.return_temperature()

code/game/turfs/change_turf.dm

@@ -148,6 +148,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 		. = ..()
 		if (!.) // changeturf failed or didn't do anything
 			QDEL_NULL(stashed_air)
+			update_air_ref()
 			return
 		var/turf/open/newTurf = .
 		newTurf.air.copy_from(stashed_air)
@@ -308,24 +309,14 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 		return
 
 	var/datum/gas_mixture/total = new//Holders to assimilate air from nearby turfs
-	var/list/total_gases = total.gases
 
 	for(var/T in atmos_adjacent_turfs)
 		var/turf/open/S = T
 		if(!S.air)
 			continue
-		var/list/S_gases = S.air.gases
-		for(var/id in S_gases)
-			total_gases[id] += S_gases[id]
-		total.temperature += S.air.temperature
+		total.merge(S.air)
 
-	air.copy_from(total)
-
-	var/list/air_gases = air.gases
-	for(var/id in air_gases)
-		air_gases[id] /= turf_count //Averages contents of the turfs, ignoring walls and the like
-
-	air.temperature /= turf_count
+	air.copy_from(total.remove_ratio(1/turf_count))
 	SSair.add_to_active(src)
 
 /turf/proc/ReplaceWithLattice()

code/game/turfs/closed.dm

@@ -7,9 +7,14 @@
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 	rad_insulation = RAD_MEDIUM_INSULATION
 
+/turf/closed/Initialize()
+	. = ..()
+	update_air_ref()
+
 /turf/closed/AfterChange()
 	. = ..()
 	SSair.high_pressure_delta -= src
+	update_air_ref()
 
 /turf/closed/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
 	return FALSE

code/game/turfs/open.dm

@@ -199,7 +199,7 @@
 			flash_color(L, flash_color = "#C80000", flash_time = 10)
 
 /turf/open/Initalize_Atmos(times_fired)
-	excited = 0
+	set_excited(FALSE)
 	update_visuals()
 
 	current_cycle = times_fired
@@ -207,19 +207,19 @@
 	for(var/i in atmos_adjacent_turfs)
 		var/turf/open/enemy_tile = i
 		var/datum/gas_mixture/enemy_air = enemy_tile.return_air()
-		if(!excited && air.compare(enemy_air))
+		if(!get_excited() && air.compare(enemy_air))
 			//testing("Active turf found. Return value of compare(): [is_active]")
-			excited = TRUE
+			set_excited(TRUE)
 			SSair.active_turfs |= src
 
 /turf/open/proc/GetHeatCapacity()
 	. = air.heat_capacity()
 
 /turf/open/proc/GetTemperature()
-	. = air.temperature
+	. = air.return_temperature()
 
 /turf/open/proc/TakeTemperature(temp)
-	air.temperature += temp
+	air.set_temperature(air.return_temperature() + temp)
 	air_update_turf()
 
 /turf/open/proc/freon_gas_act()
@@ -304,9 +304,8 @@
 
 /turf/open/rad_act(pulse_strength)
 	. = ..()
-	if (air.gases[/datum/gas/carbon_dioxide] && air.gases[/datum/gas/oxygen])
-		pulse_strength = min(pulse_strength,air.gases[/datum/gas/carbon_dioxide]*1000,air.gases[/datum/gas/oxygen]*2000) //Ensures matter is conserved properly
-		air.gases[/datum/gas/carbon_dioxide]=max(air.gases[/datum/gas/carbon_dioxide]-(pulse_strength/1000),0)
-		air.gases[/datum/gas/oxygen]=max(air.gases[/datum/gas/oxygen]-(pulse_strength/2000),0)
-		air.gases[/datum/gas/pluoxium]+=(pulse_strength/4000)
-		GAS_GARBAGE_COLLECT(air.gases)
+	if (air.get_moles(/datum/gas/carbon_dioxide) && air.get_moles(/datum/gas/oxygen))
+		pulse_strength = min(pulse_strength,air.get_moles(/datum/gas/carbon_dioxide)*1000,air.get_moles(/datum/gas/oxygen)*2000) //Ensures matter is conserved properly
+		air.set_moles(/datum/gas/carbon_dioxide, max(air.get_moles(/datum/gas/carbon_dioxide)-(pulse_strength/1000),0))
+		air.set_moles(/datum/gas/oxygen, max(air.get_moles(/datum/gas/oxygen)-(pulse_strength/2000),0))
+		air.adjust_moles(/datum/gas/pluoxium, pulse_strength/4000)

code/game/turfs/space/space.dm

@@ -27,6 +27,7 @@
 /turf/open/space/Initialize()
 	icon_state = SPACE_ICON_STATE
 	air = space_gas
+	update_air_ref()
 	vis_contents.Cut() //removes inherited overlays
 	visibilityChanged()
 

code/game/turfs/turf.dm

@@ -277,7 +277,7 @@
 /turf/open/Entered(atom/movable/AM)
 	..()
 	//melting
-	if(isobj(AM) && air && air.temperature > T0C)
+	if(isobj(AM) && air && air.return_temperature() > T0C)
 		var/obj/O = AM
 		if(O.obj_flags & FROZEN)
 			O.make_unfrozen()

code/game/world.dm

@@ -9,9 +9,8 @@ GLOBAL_LIST(topic_status_cache)
 //This happens after the Master subsystem new(s) (it's a global datum)
 //So subsystems globals exist, but are not initialised
 /world/New()
-	var/extools = world.GetConfig("env", "EXTOOLS_DLL") || "./byond-extools.dll"
-	if (fexists(extools))
-		call(extools, "maptick_initialize")()
+	if (fexists(EXTOOLS))
+		call(EXTOOLS, "maptick_initialize")()
 	enable_debugger()
 
 	world.Profile(PROFILE_START)
@@ -276,6 +275,15 @@ GLOBAL_LIST(topic_status_cache)
 	shutdown_logging() // Past this point, no logging procs can be used, at risk of data loss.
 	..()
 
+/world/Del()
+	// memory leaks bad
+	var/num_deleted = 0
+	for(var/datum/gas_mixture/GM)
+		GM.__gasmixture_unregister()
+		num_deleted++
+	log_world("Deallocated [num_deleted] gas mixtures")
+	..()
+
 /world/proc/update_status()
 
 	var/list/features = list()
@@ -344,3 +352,6 @@ GLOBAL_LIST(topic_status_cache)
 	maxz++
 	SSmobs.MaxZChanged()
 	SSidlenpcpool.MaxZChanged()
+	world.refresh_atmos_grid()
+
+/world/proc/refresh_atmos_grid()

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -909,10 +909,9 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
 				assoc = SDQL_expression(object, expressions_list[expression_list])
 			if(assoc != null)
 				// Need to insert the key like this to prevent duplicate keys fucking up.
-				var/list/dummy = list()
-				dummy[result] = assoc
-				result = dummy
-			val += result
+				val[result] = assoc
+			else
+				val += list(result)
 	else
 		val = world.SDQL_var(object, expression, i, object, superuser, src)
 		i = expression.len

code/modules/admin/verbs/debug.dm

@@ -573,7 +573,7 @@
 		if(Rad.anchored)
 			if(!Rad.loaded_tank)
 				var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad)
-				Plasma.air_contents.gases[/datum/gas/plasma] = 70
+				Plasma.air_contents.set_moles(/datum/gas/plasma,70)
 				Rad.drainratio = 0
 				Rad.loaded_tank = Plasma
 				Plasma.forceMove(Rad)

code/modules/admin/verbs/diagnostics.dm

@@ -1,15 +1,14 @@
 /proc/show_air_status_to(turf/target, mob/user)
 	var/datum/gas_mixture/env = target.return_air()
-	var/list/env_gases = env.gases
 	var/burning = FALSE
 	if(isopenturf(target))
 		var/turf/open/T = target
 		if(T.active_hotspot)
 			burning = TRUE
 
-	var/list/lines = list("<span class='adminnotice'>[AREACOORD(target)]: [env.temperature] K ([env.temperature - T0C] C), [env.return_pressure()] kPa[(burning)?(", <font color='red'>burning</font>"):(null)]</span>")
-	for(var/id in env_gases)
-		var/moles = env_gases[id]
+	var/list/lines = list("<span class='adminnotice'>[AREACOORD(target)]: [env.return_temperature()] K ([env.return_temperature() - T0C] C), [env.return_pressure()] kPa[(burning)?(", <font color='red'>burning</font>"):(null)]</span>")
+	for(var/id in env.get_gases())
+		var/moles = env.get_moles(id)
 		if (moles >= 0.00001)
 			lines += "[GLOB.meta_gas_names[id]]: [moles] mol"
 	to_chat(usr, lines.Join("\n"))

code/modules/antagonists/revenant/revenant.dm

@@ -107,9 +107,8 @@
 		mind.add_antag_datum(/datum/antagonist/revenant)
 
 //Life, Stat, Hud Updates, and Say
-/mob/living/simple_animal/revenant/BiologicalLife(seconds, times_fired)
-	if(!(. = ..()))
-		return
+/mob/living/simple_animal/revenant/Life(seconds, times_fired)
+	. = ..()
 	if(stasis)
 		return
 	if(revealed && essence <= 0)

code/modules/assembly/bomb.dm

@@ -53,8 +53,8 @@
 		return
 	if(I.use_tool(src, user, 0, volume=40))
 		status = TRUE
-		GLOB.bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
-		message_admins("[ADMIN_LOOKUPFLW(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]")
+		GLOB.bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.return_temperature()-T0C]"
+		message_admins("[ADMIN_LOOKUPFLW(user)] welded a single tank bomb. Temp: [bombtank.air_contents.return_temperature()-T0C]")
 		to_chat(user, "<span class='notice'>A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.</span>")
 		add_fingerprint(user)
 		return TRUE
@@ -145,8 +145,7 @@
 	return
 
 /obj/item/tank/proc/ignite()	//This happens when a bomb is told to explode
-	var/fuel_moles = air_contents.gases[/datum/gas/plasma] + air_contents.gases[/datum/gas/oxygen]/6
-	GAS_GARBAGE_COLLECT(air_contents.gases)
+	var/fuel_moles = air_contents.get_moles(/datum/gas/plasma) + air_contents.get_moles(/datum/gas/oxygen)/6
 	var/datum/gas_mixture/bomb_mixture = air_contents.copy()
 	var/strength = 1
 
@@ -156,7 +155,7 @@
 		qdel(master)
 	qdel(src)
 
-	if(bomb_mixture.temperature > (T0C + 400))
+	if(bomb_mixture.return_temperature() > (T0C + 400))
 		strength = (fuel_moles/15)
 
 		if(strength >=1)
@@ -169,7 +168,7 @@
 			ground_zero.assume_air(bomb_mixture)
 			ground_zero.hotspot_expose(1000, 125)
 
-	else if(bomb_mixture.temperature > (T0C + 250))
+	else if(bomb_mixture.return_temperature() > (T0C + 250))
 		strength = (fuel_moles/20)
 
 		if(strength >=1)
@@ -180,7 +179,7 @@
 			ground_zero.assume_air(bomb_mixture)
 			ground_zero.hotspot_expose(1000, 125)
 
-	else if(bomb_mixture.temperature > (T0C + 100))
+	else if(bomb_mixture.return_temperature() > (T0C + 100))
 		strength = (fuel_moles/25)
 
 		if (strength >=1)

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -9,46 +9,31 @@
 	return
 
 
-/turf/open/hotspot_expose(exposed_temperature, exposed_volume, soh = FALSE, holo = FALSE)
-	var/datum/gas_mixture/air_contents = return_air()
-	if(!air_contents)
-		return 0
+/turf/open/hotspot_expose(exposed_temperature, exposed_volume, soh)
+	if(!air)
+		return
 
-	var/oxy = air_contents.gases[/datum/gas/oxygen]
-	var/tox = air_contents.gases[/datum/gas/plasma]
-	var/trit = air_contents.gases[/datum/gas/tritium]
+	var/oxy = air.get_moles(/datum/gas/oxygen)
+	if (oxy < 0.5)
+		return
+	var/tox = air.get_moles(/datum/gas/plasma)
+	var/trit = air.get_moles(/datum/gas/tritium)
 	if(active_hotspot)
 		if(soh)
-			if((tox > 0.5 || trit > 0.5) && oxy > 0.5)
-				if(active_hotspot.temperature < exposed_temperature*50)
-					active_hotspot.temperature = exposed_temperature*50
+			if(tox > 0.5 || trit > 0.5)
+				if(active_hotspot.temperature < exposed_temperature)
+					active_hotspot.temperature = exposed_temperature
 				if(active_hotspot.volume < exposed_volume)
 					active_hotspot.volume = exposed_volume
-		return 1
-
-	var/igniting = 0
+		return
 
 	if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && (tox > 0.5 || trit > 0.5))
-		igniting = 1
 
-	if(igniting)
-		if(oxy < 0.5)
-			return 0
-
-		active_hotspot = new /obj/effect/hotspot(src, holo)
-		active_hotspot.temperature = exposed_temperature*50
-		active_hotspot.volume = exposed_volume*25
+		active_hotspot = new /obj/effect/hotspot(src, exposed_volume*25, exposed_temperature)
 
 		active_hotspot.just_spawned = (current_cycle < SSair.times_fired)
 			//remove just_spawned protection if no longer processing this cell
 		SSair.add_to_active(src, 0)
-	else
-		var/datum/gas_mixture/heating = air_contents.remove_ratio(exposed_volume/air_contents.volume)
-		heating.temperature = exposed_temperature
-		heating.react()
-		assume_air(heating)
-		air_update_turf()
-	return igniting
 
 //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile
 /obj/effect/hotspot
@@ -67,11 +52,13 @@
 	var/bypassing = FALSE
 	var/visual_update_tick = 0
 
-/obj/effect/hotspot/Initialize(mapload, holo = FALSE)
+/obj/effect/hotspot/Initialize(mapload, starting_volume, starting_temperature)
 	. = ..()
-	if(holo)
-		flags_1 |= HOLOGRAM_1
 	SSair.hotspots += src
+	if(!isnull(starting_volume))
+		volume = starting_volume
+	if(!isnull(starting_temperature))
+		temperature = starting_temperature
 	perform_exposure()
 	setDir(pick(GLOB.cardinals))
 	air_update_turf()
@@ -83,22 +70,19 @@
 
 	location.active_hotspot = src
 
-	if(volume > CELL_VOLUME*0.95)
-		bypassing = TRUE
-	else
-		bypassing = FALSE
+	bypassing = !just_spawned && (volume > CELL_VOLUME*0.95)
 
 	if(bypassing)
-		if(!just_spawned)
-			volume = location.air.reaction_results["fire"]*FIRE_GROWTH_RATE
-			temperature = location.air.temperature
+		volume = location.air.reaction_results["fire"]*FIRE_GROWTH_RATE
+		temperature = location.air.return_temperature()
 	else
-		var/datum/gas_mixture/affected = location.air.remove_ratio(volume/location.air.volume)
-		affected.temperature = temperature
-		affected.react(src)
-		temperature = affected.temperature
-		volume = affected.reaction_results["fire"]*FIRE_GROWTH_RATE
-		location.assume_air(affected)
+		var/datum/gas_mixture/affected = location.air.remove_ratio(volume/location.air.return_volume())
+		if(affected) //in case volume is 0
+			affected.set_temperature(temperature)
+			affected.react(src)
+			temperature = affected.return_temperature()
+			volume = affected.reaction_results["fire"]*FIRE_GROWTH_RATE
+			location.assume_air(affected)
 
 	for(var/A in location)
 		var/atom/AT = A
@@ -164,7 +148,7 @@
 	color = list(LERP(0.3, 1, 1-greyscale_fire) * heat_r,0.3 * heat_g * greyscale_fire,0.3 * heat_b * greyscale_fire, 0.59 * heat_r * greyscale_fire,LERP(0.59, 1, 1-greyscale_fire) * heat_g,0.59 * heat_b * greyscale_fire, 0.11 * heat_r * greyscale_fire,0.11 * heat_g * greyscale_fire,LERP(0.11, 1, 1-greyscale_fire) * heat_b, 0,0,0)
 	alpha = heat_a
 
-#define INSUFFICIENT(path) (location.air.gases[path] < 0.5)
+#define INSUFFICIENT(path) (location.air.get_moles(path) < 0.5)
 /obj/effect/hotspot/process()
 	if(just_spawned)
 		just_spawned = FALSE
@@ -175,8 +159,7 @@
 		qdel(src)
 		return
 
-	if(location.excited_group)
-		location.excited_group.reset_cooldowns()
+	location.eg_reset_cooldowns()
 
 	if((temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) || (volume <= 1))
 		qdel(src)
@@ -186,7 +169,8 @@
 		return
 
 	//Not enough to burn
-	if((location.air.gases[/datum/gas/plasma] < 0.5 && location.air.gases[/datum/gas/tritium] < 0.5) || location.air.gases[/datum/gas/oxygen] < 0.5)
+	// god damn it previous coder you made the INSUFFICIENT macro for a fucking reason why didn't you use it here smh
+	if((INSUFFICIENT(/datum/gas/plasma) && INSUFFICIENT(/datum/gas/tritium)) || INSUFFICIENT(/datum/gas/oxygen))
 		qdel(src)
 		return
 
@@ -194,16 +178,15 @@
 
 	if(bypassing)
 		icon_state = "3"
-		if(!(flags_1 & HOLOGRAM_1))
-			location.burn_tile()
+		location.burn_tile()
 
 		//Possible spread due to radiated heat
-		if(location.air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_SPREAD)
-			var/radiated_temperature = location.air.temperature*FIRE_SPREAD_RADIOSITY_SCALE
+		if(location.air.return_temperature() > FIRE_MINIMUM_TEMPERATURE_TO_SPREAD)
+			var/radiated_temperature = location.air.return_temperature()*FIRE_SPREAD_RADIOSITY_SCALE
 			for(var/t in location.atmos_adjacent_turfs)
 				var/turf/open/T = t
 				if(!T.active_hotspot)
-					T.hotspot_expose(radiated_temperature, CELL_VOLUME/4, flags_1 & HOLOGRAM_1)
+					T.hotspot_expose(radiated_temperature, CELL_VOLUME/4)
 
 	else
 		if(volume > CELL_VOLUME*0.4)
@@ -227,14 +210,13 @@
 	var/turf/open/T = loc
 	if(istype(T) && T.active_hotspot == src)
 		T.active_hotspot = null
-	if(!(flags_1 & HOLOGRAM_1))
-		DestroyTurf()
+	DestroyTurf()
 	return ..()
 
 /obj/effect/hotspot/proc/DestroyTurf()
 	if(isturf(loc))
 		var/turf/T = loc
-		if(T.to_be_destroyed)
+		if(T.to_be_destroyed && !T.changing_turf)
 			var/chance_of_deletion
 			if (T.heat_capacity) //beware of division by zero
 				chance_of_deletion = T.max_fire_temperature_sustained / T.heat_capacity * 8 //there is no problem with prob(23456), min() was redundant --rastaf0

code/modules/atmospherics/environmental/LINDA_system.dm

@@ -18,7 +18,7 @@
 
 /turf/open/CanAtmosPass(turf/T, vertical = FALSE)
 	var/dir = vertical? get_dir_multiz(src, T) : get_dir(src, T)
-	var/opp = dir_inverse_multiz(dir)
+	var/opp = REVERSE_DIR(dir)
 	var/R = FALSE
 	if(vertical && !(zAirOut(dir, T) && T.zAirIn(dir, src)))
 		R = TRUE
@@ -44,25 +44,32 @@
 	return FALSE
 
 /turf/proc/ImmediateCalculateAdjacentTurfs()
-	var/canpass = CANATMOSPASS(src, src)
+	var/canpass = CANATMOSPASS(src, src) 
 	var/canvpass = CANVERTICALATMOSPASS(src, src)
 	for(var/direction in GLOB.cardinals_multiz)
 		var/turf/T = get_step_multiz(src, direction)
+		var/opp_dir = REVERSE_DIR(direction)
 		if(!isopenturf(T))
 			continue
 		if(!(blocks_air || T.blocks_air) && ((direction & (UP|DOWN))? (canvpass && CANVERTICALATMOSPASS(T, src)) : (canpass && CANATMOSPASS(T, src))) )
 			LAZYINITLIST(atmos_adjacent_turfs)
 			LAZYINITLIST(T.atmos_adjacent_turfs)
-			atmos_adjacent_turfs[T] = TRUE
-			T.atmos_adjacent_turfs[src] = TRUE
+			atmos_adjacent_turfs[T] = direction
+			T.atmos_adjacent_turfs[src] = opp_dir
+			T.__update_extools_adjacent_turfs()
 		else
 			if (atmos_adjacent_turfs)
 				atmos_adjacent_turfs -= T
 			if (T.atmos_adjacent_turfs)
 				T.atmos_adjacent_turfs -= src
+				T.__update_extools_adjacent_turfs()
 			UNSETEMPTY(T.atmos_adjacent_turfs)
 	UNSETEMPTY(atmos_adjacent_turfs)
 	src.atmos_adjacent_turfs = atmos_adjacent_turfs
+	__update_extools_adjacent_turfs()
+
+/turf/proc/__update_extools_adjacent_turfs()
+
 
 //returns a list of adjacent turfs that can share air with this one.
 //alldir includes adjacent diagonal tiles that can share
@@ -111,9 +118,9 @@
 	SSair.add_to_active(src,command)
 
 /atom/movable/proc/move_update_air(turf/T)
-	if(isturf(T))
-		T.air_update_turf(1)
-	air_update_turf(1)
+    if(isturf(T))
+        T.air_update_turf(1)
+    air_update_turf(1)
 
 /atom/proc/atmos_spawn_air(text) //because a lot of people loves to copy paste awful code lets just make an easy proc to spawn your plasma fires
 	var/turf/open/T = get_turf(src)

code/modules/atmospherics/environmental/LINDA_turf_tile.dm

@@ -8,6 +8,7 @@
 	var/list/atmos_adjacent_turfs
 	//bitfield of dirs in which we are superconducitng
 	var/atmos_supeconductivity = NONE
+	var/is_openturf = FALSE // used by extools shizz.
 
 	//used to determine whether we should archive
 	var/archived_cycle = 0
@@ -23,21 +24,21 @@
 	//used for spacewind
 	var/pressure_difference = 0
 	var/pressure_direction = 0
+	var/turf/pressure_specific_target
 
-	var/datum/excited_group/excited_group
-	var/excited = FALSE
 	var/datum/gas_mixture/turf/air
 
 	var/obj/effect/hotspot/active_hotspot
-	var/atmos_cooldown  = 0
 	var/planetary_atmos = FALSE //air will revert to initial_gas_mix over time
 
 	var/list/atmos_overlay_types //gas IDs of current active gas overlays
+	is_openturf = TRUE
 
 /turf/open/Initialize()
 	if(!blocks_air)
 		air = new
 		air.copy_from_turf(src)
+		update_air_ref()
 	. = ..()
 
 /turf/open/Destroy()
@@ -48,6 +49,8 @@
 		SSair.add_to_active(T)
 	return ..()
 
+/turf/proc/update_air_ref()
+
 /////////////////GAS MIXTURE PROCS///////////////////
 
 /turf/open/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air
@@ -89,15 +92,37 @@
 	temperature_archived = temperature
 
 /turf/open/archive()
-	ARCHIVE(air)
+	air.archive()
 	archived_cycle = SSair.times_fired
 	temperature_archived = temperature
 
+/turf/open/proc/eg_reset_cooldowns()
+/turf/open/proc/eg_garbage_collect()
+/turf/open/proc/get_excited()
+/turf/open/proc/set_excited()
+
 /////////////////////////GAS OVERLAYS//////////////////////////////
 
+
 /turf/open/proc/update_visuals()
-	var/list/new_overlay_types = tile_graphic()
+
 	var/list/atmos_overlay_types = src.atmos_overlay_types // Cache for free performance
+	var/list/new_overlay_types = list()
+	var/static/list/nonoverlaying_gases = typecache_of_gases_with_no_overlays()
+
+	if(!air) // 2019-05-14: was not able to get this path to fire in testing. Consider removing/looking at callers -Naksu
+		if (atmos_overlay_types)
+			for(var/overlay in atmos_overlay_types)
+				vis_contents -= overlay
+			src.atmos_overlay_types = null
+		return
+
+	for(var/id in air.get_gases())
+		if (nonoverlaying_gases[id])
+			continue
+		var/gas_overlay = GLOB.meta_gas_overlays[id]
+		if(gas_overlay && air.get_moles(id) > GLOB.meta_gas_visibility[META_GAS_MOLES_VISIBLE])
+			new_overlay_types += gas_overlay[min(FACTOR_GAS_VISIBLE_MAX, CEILING(air.get_moles(id) / MOLES_GAS_VISIBLE_STEP, 1))]
 
 	if (atmos_overlay_types)
 		for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added
@@ -112,19 +137,18 @@
 	UNSETEMPTY(new_overlay_types)
 	src.atmos_overlay_types = new_overlay_types
 
-/turf/open/proc/tile_graphic()
-	var/static/list/nonoverlaying_gases = typecache_of_gases_with_no_overlays()
-	if(!air)
-		return
-	. = new /list
-	var/list/gases = air.gases
-	for(var/id in gases)
-		if (nonoverlaying_gases[id])
-			continue
-		var/gas = gases[id]
-		var/gas_overlay = GLOB.meta_gas_overlays[id]
-		if(gas_overlay && gas > GLOB.meta_gas_visibility[id])
-			. += gas_overlay[min(FACTOR_GAS_VISIBLE_MAX, CEILING(gas / MOLES_GAS_VISIBLE_STEP, 1))]
+/turf/open/proc/set_visuals(list/new_overlay_types)
+	if (atmos_overlay_types)
+		for(var/overlay in atmos_overlay_types-new_overlay_types) //doesn't remove overlays that would only be added
+			vis_contents -= overlay
+
+	if (length(new_overlay_types))
+		if (atmos_overlay_types)
+			vis_contents += new_overlay_types - atmos_overlay_types //don't add overlays that already exist
+		else
+			vis_contents += new_overlay_types
+	UNSETEMPTY(new_overlay_types)
+	src.atmos_overlay_types = new_overlay_types
 
 /proc/typecache_of_gases_with_no_overlays()
 	. = list()
@@ -135,8 +159,8 @@
 
 /////////////////////////////SIMULATION///////////////////////////////////
 
-#define LAST_SHARE_CHECK \
-	var/last_share = our_air.last_share;\
+/*#define LAST_SHARE_CHECK \
+	var/last_share = our_air.get_last_share();\
 	if(last_share > MINIMUM_AIR_TO_SUSPEND){\
 		our_excited_group.reset_cooldowns();\
 		cached_atmos_cooldown = 0;\
@@ -144,107 +168,32 @@
 		our_excited_group.dismantle_cooldown = 0;\
 		cached_atmos_cooldown = 0;\
 	}
-
+*/
 /turf/proc/process_cell(fire_count)
 	SSair.remove_from_active(src)
 
-/turf/open/process_cell(fire_count)
-	if(archived_cycle < fire_count) //archive self if not already done
-		archive()
-
-	current_cycle = fire_count
-
-	//cache for sanic speed
-	var/list/adjacent_turfs = atmos_adjacent_turfs
-	var/datum/excited_group/our_excited_group = excited_group
-	var/adjacent_turfs_length = LAZYLEN(adjacent_turfs)
-	var/cached_atmos_cooldown = atmos_cooldown + 1
-
-	var/planet_atmos = planetary_atmos
-	if (planet_atmos)
-		adjacent_turfs_length++
-
-	var/datum/gas_mixture/our_air = air
-
-	for(var/t in adjacent_turfs)
-		var/turf/open/enemy_tile = t
-
-		if(fire_count <= enemy_tile.current_cycle)
+/turf/open/proc/equalize_pressure_in_zone(cyclenum)
+/turf/open/proc/consider_firelocks(turf/T2)
+	var/reconsider_adj = FALSE
+	for(var/obj/machinery/door/firedoor/FD in T2)
+		if((FD.flags_1 & ON_BORDER_1) && get_dir(T2, src) != FD.dir)
 			continue
-		enemy_tile.archive()
+		FD.emergency_pressure_stop()
+		reconsider_adj = TRUE
+	for(var/obj/machinery/door/firedoor/FD in src)
+		if((FD.flags_1 & ON_BORDER_1) && get_dir(src, T2) != FD.dir)
+			continue
+		FD.emergency_pressure_stop()
+		reconsider_adj = TRUE
+	if(reconsider_adj)
+		T2.ImmediateCalculateAdjacentTurfs() // We want those firelocks closed yesterday.
 
-	/******************* GROUP HANDLING START *****************************************************************/
+/turf/proc/handle_decompression_floor_rip()
+/turf/open/floor/handle_decompression_floor_rip(sum)
+	if(sum > 20 && prob(clamp(sum / 10, 0, 30)))
+		remove_tile()
 
-		var/should_share_air = FALSE
-		var/datum/gas_mixture/enemy_air = enemy_tile.air
-
-		//cache for sanic speed
-		var/datum/excited_group/enemy_excited_group = enemy_tile.excited_group
-
-		if(our_excited_group && enemy_excited_group)
-			if(our_excited_group != enemy_excited_group)
-				//combine groups (this also handles updating the excited_group var of all involved turfs)
-				our_excited_group.merge_groups(enemy_excited_group)
-				our_excited_group = excited_group //update our cache
-			should_share_air = TRUE
-
-		else if(our_air.compare(enemy_air))
-			if(!enemy_tile.excited)
-				SSair.add_to_active(enemy_tile)
-			var/datum/excited_group/EG = our_excited_group || enemy_excited_group || new
-			if(!our_excited_group)
-				EG.add_turf(src)
-			if(!enemy_excited_group)
-				EG.add_turf(enemy_tile)
-			our_excited_group = excited_group
-			should_share_air = TRUE
-
-		//air sharing
-		if(should_share_air)
-			var/difference = our_air.share(enemy_air, adjacent_turfs_length)
-			if(difference)
-				if(difference > 0)
-					consider_pressure_difference(enemy_tile, difference)
-				else
-					enemy_tile.consider_pressure_difference(src, -difference)
-			LAST_SHARE_CHECK
-
-
-	/******************* GROUP HANDLING FINISH *********************************************************************/
-
-	if (planet_atmos) //share our air with the "atmosphere" "above" the turf
-		var/datum/gas_mixture/G = new
-		G.copy_from_turf(src)
-		ARCHIVE(G)
-		if(our_air.compare(G))
-			if(!our_excited_group)
-				var/datum/excited_group/EG = new
-				EG.add_turf(src)
-				our_excited_group = excited_group
-			our_air.share(G, adjacent_turfs_length)
-			LAST_SHARE_CHECK
-
-	SSair.add_to_react_queue(src)
-
-	if((!our_excited_group && !(our_air.temperature > MINIMUM_TEMPERATURE_START_SUPERCONDUCTION && consider_superconductivity(starting = TRUE))) \
-	  || (cached_atmos_cooldown > (EXCITED_GROUP_DISMANTLE_CYCLES * 2)))
-		SSair.remove_from_active(src)
-
-	atmos_cooldown = cached_atmos_cooldown
-
-/turf/open/space/process_cell(fire_count) //dumb hack to prevent space pollution
-	. = ..()
-	var/datum/gas_mixture/immutable/I = space_gas
-	I.after_process_cell()
-
-/turf/proc/process_cell_reaction()
-	SSair.remove_from_react_queue(src)
-
-/turf/open/process_cell_reaction()
-	air.react(src)
-	update_visuals()
-	SSair.remove_from_react_queue(src)
-	return
+/turf/open/process_cell(fire_count)
 
 //////////////////////////SPACEWIND/////////////////////////////
 
@@ -256,15 +205,22 @@
 
 /turf/open/proc/high_pressure_movements()
 	var/atom/movable/M
+	var/multiplier = 1
+	if(locate(/obj/structure/rack) in src)
+		multiplier *= 0.1
+	else if(locate(/obj/structure/table) in src)
+		multiplier *= 0.2
 	for(var/thing in src)
 		M = thing
 		if (!M.anchored && !M.pulledby && M.last_high_pressure_movement_air_cycle < SSair.times_fired)
-			M.experience_pressure_difference(pressure_difference, pressure_direction)
+			M.experience_pressure_difference(pressure_difference * multiplier, pressure_direction, 0, pressure_specific_target)
+	if(pressure_difference > 100)
+		new /obj/effect/temp_visual/dir_setting/space_wind(src, pressure_direction, clamp(round(sqrt(pressure_difference) * 2), 10, 255))
 
 /atom/movable/var/pressure_resistance = 10
 /atom/movable/var/last_high_pressure_movement_air_cycle = 0
 
-/atom/movable/proc/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0)
+/atom/movable/proc/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0, throw_target)
 	var/const/PROBABILITY_OFFSET = 25
 	var/const/PROBABILITY_BASE_PRECENT = 75
 	var/max_force = sqrt(pressure_difference)*(MOVE_FORCE_DEFAULT / 5)
@@ -275,93 +231,8 @@
 	move_prob += pressure_resistance_prob_delta
 	if (move_prob > PROBABILITY_OFFSET && prob(move_prob) && (move_resist != INFINITY) && (!anchored && (max_force >= (move_resist * MOVE_FORCE_PUSH_RATIO))) || (anchored && (max_force >= (move_resist * MOVE_FORCE_FORCEPUSH_RATIO))))
 		step(src, direction)
-		last_high_pressure_movement_air_cycle = SSair.times_fired
-
-///////////////////////////EXCITED GROUPS/////////////////////////////
-
-/datum/excited_group
-	var/list/turf_list = list()
-	var/breakdown_cooldown = 0
-	var/dismantle_cooldown = 0
-
-/datum/excited_group/New()
-	SSair.excited_groups += src
-
-/datum/excited_group/proc/add_turf(turf/open/T)
-	turf_list += T
-	T.excited_group = src
-	reset_cooldowns()
-
-/datum/excited_group/proc/merge_groups(datum/excited_group/E)
-	if(turf_list.len > E.turf_list.len)
-		SSair.excited_groups -= E
-		for(var/t in E.turf_list)
-			var/turf/open/T = t
-			T.excited_group = src
-			turf_list += T
-		reset_cooldowns()
-	else
-		SSair.excited_groups -= src
-		for(var/t in turf_list)
-			var/turf/open/T = t
-			T.excited_group = E
-			E.turf_list += T
-		E.reset_cooldowns()
-
-/datum/excited_group/proc/reset_cooldowns()
-	breakdown_cooldown = 0
-	dismantle_cooldown = 0
-
-//argument is so world start can clear out any turf differences quickly.
-/datum/excited_group/proc/self_breakdown(space_is_all_consuming = FALSE)
-	var/datum/gas_mixture/A = new
-
-	//make local for sanic speed
-	var/list/A_gases = A.gases
-	var/list/turf_list = src.turf_list
-	var/turflen = turf_list.len
-	var/space_in_group = FALSE
-
-	for(var/t in turf_list)
-		var/turf/open/T = t
-		if (space_is_all_consuming && !space_in_group && istype(T.air, /datum/gas_mixture/immutable/space))
-			space_in_group = TRUE
-			qdel(A)
-			A = new /datum/gas_mixture/immutable/space()
-			A_gases = A.gases //update the cache
-			break
-		A.merge(T.air)
-
-	for(var/id in A_gases)
-		A_gases[id] /= turflen
-
-	for(var/t in turf_list)
-		var/turf/open/T = t
-		T.air.copy_from(A)
-		T.atmos_cooldown = 0
-		T.update_visuals()
-
-	breakdown_cooldown = 0
-
-/datum/excited_group/proc/dismantle()
-	for(var/t in turf_list)
-		var/turf/open/T = t
-		T.excited = FALSE
-		T.excited_group = null
-		SSair.active_turfs -= T
-	garbage_collect()
-
-/datum/excited_group/proc/garbage_collect()
-	for(var/t in turf_list)
-		var/turf/open/T = t
-		T.excited_group = null
-	turf_list.Cut()
-	SSair.excited_groups -= src
 
 ////////////////////////SUPERCONDUCTIVITY/////////////////////////////
-/atom/movable/proc/blocksTemperature()
-	return FALSE
-
 /turf/proc/conductivity_directions()
 	if(archived_cycle < SSair.times_fired)
 		archive()
@@ -376,9 +247,6 @@
 			. |= direction
 
 /turf/proc/neighbor_conduct_with_src(turf/open/other)
-	for (var/atom/movable/G in src)
-		if (G.blocksTemperature())
-			return
 	if(!other.blocks_air) //Open but neighbor is solid
 		other.temperature_share_open_to_solid(src)
 	else //Both tiles are solid
@@ -389,9 +257,7 @@
 	if(blocks_air)
 		..()
 		return
-	for (var/atom/movable/G in src)
-		if (G.blocksTemperature())
-			return
+
 	if(!other.blocks_air) //Both tiles are open
 		var/turf/open/T = other
 		T.air.temperature_share(air, WINDOW_HEAT_TRANSFER_COEFFICIENT)
@@ -410,8 +276,10 @@
 
 				if(!neighbor.thermal_conductivity)
 					continue
+
 				if(neighbor.archived_cycle < SSair.times_fired)
 					neighbor.archive()
+
 				neighbor.neighbor_conduct_with_src(src)
 
 				neighbor.consider_superconductivity()
@@ -430,7 +298,7 @@
 	//Conduct with air on my tile if I have it
 	if(!blocks_air)
 		temperature = air.temperature_share(null, thermal_conductivity, temperature, heat_capacity)
-	..((blocks_air ? temperature : air.temperature))
+	..((blocks_air ? temperature : air.return_temperature()))
 
 /turf/proc/consider_superconductivity()
 	if(!thermal_conductivity)
@@ -440,7 +308,7 @@
 	return TRUE
 
 /turf/open/consider_superconductivity(starting)
-	if(air.temperature < (starting?MINIMUM_TEMPERATURE_START_SUPERCONDUCTION:MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION))
+	if(air.return_temperature() < (starting?MINIMUM_TEMPERATURE_START_SUPERCONDUCTION:MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION))
 		return FALSE
 	if(air.heat_capacity() < M_CELL_WITH_RATIO) // Was: MOLES_CELLSTANDARD*0.1*0.05 Since there are no variables here we can make this a constant.
 		return FALSE

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -16,90 +16,80 @@ GLOBAL_LIST_INIT(meta_gas_dangers, meta_gas_danger_list())
 GLOBAL_LIST_INIT(meta_gas_ids, meta_gas_id_list())
 GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list())
 /datum/gas_mixture
-	var/list/gases = list()
-	var/list/gas_archive = list()
-	var/temperature = 0 //kelvins
-	var/tmp/temperature_archived = 0
-	var/volume = CELL_VOLUME //liters
-	var/last_share = 0
-	var/list/reaction_results = list()
+	var/initial_volume = CELL_VOLUME //liters
+	var/list/reaction_results
 	var/list/analyzer_results //used for analyzer feedback - not initialized until its used
-	var/gc_share = FALSE // Whether to call garbage_collect() on the sharer during shares, used for immutable mixtures
+	var/_extools_pointer_gasmixture = 0 // Contains the memory address of the shared_ptr object for this gas mixture in c++ land. Don't. Touch. This. Var.
 
 /datum/gas_mixture/New(volume)
 	if (!isnull(volume))
-		src.volume = volume
+		initial_volume = volume
+	ATMOS_EXTOOLS_CHECK
+	__gasmixture_register()
+	reaction_results = new
 
-	//PV = nRT
+/datum/gas_mixture/vv_edit_var(var_name, var_value)
+	if(var_name == "_extools_pointer_gasmixture")
+		return FALSE // please no. segfaults bad.
+	return ..()
+/*
+/datum/gas_mixture/Del()
+	__gasmixture_unregister()
+	. = ..()*/
 
-/datum/gas_mixture/proc/heat_capacity()
+/datum/gas_mixture/proc/__gasmixture_unregister()
+/datum/gas_mixture/proc/__gasmixture_register()
 
-/datum/gas_mixture/proc/archived_heat_capacity()
+/proc/gas_types()
+	var/list/L = subtypesof(/datum/gas)
+	for(var/gt in L)
+		var/datum/gas/G = gt
+		L[gt] = initial(G.specific_heat)
+	return L
 
-/datum/gas_mixture/heat_capacity() //joules per kelvin
-	var/list/cached_gases = gases
-	var/list/cached_gasheats = GLOB.meta_gas_specific_heats
-	. = 0
-	for(var/id in cached_gases)
-		. += cached_gases[id] * cached_gasheats[id]
-
-/datum/gas_mixture/archived_heat_capacity()
-	// lots of copypasta but heat_capacity is the single proc called the most in a regular round, bar none, so performance loss adds up
-	var/list/cached_gases = gas_archive
-	var/list/cached_gasheats = GLOB.meta_gas_specific_heats
-	. = 0
-	for(var/id in cached_gases)
-		. += cached_gases[id] * cached_gasheats[id]
-
-/datum/gas_mixture/turf/heat_capacity() // Same as above except vacuums return HEAT_CAPACITY_VACUUM
-	var/list/cached_gases = gases
-	var/list/cached_gasheats = GLOB.meta_gas_specific_heats
-	for(var/id in cached_gases)
-		. += cached_gases[id] * cached_gasheats[id]
-	if(!.)
-		. += HEAT_CAPACITY_VACUUM //we want vacuums in turfs to have the same heat capacity as space
-
-/datum/gas_mixture/turf/archived_heat_capacity() // Same as above except vacuums return HEAT_CAPACITY_VACUUM
-	var/list/cached_gases = gas_archive
-	var/list/cached_gasheats = GLOB.meta_gas_specific_heats
-	for(var/id in cached_gases)
-		. += cached_gases[id] * cached_gasheats[id]
-	if(!.)
-		. += HEAT_CAPACITY_VACUUM //we want vacuums in turfs to have the same heat capacity as space
+/datum/gas_mixture/proc/heat_capacity() //joules per kelvin
 
 /datum/gas_mixture/proc/total_moles()
-	var/cached_gases = gases
-	TOTAL_MOLES(cached_gases, .)
 
 /datum/gas_mixture/proc/return_pressure() //kilopascals
-	if(volume > 0) // to prevent division by zero
-		var/cached_gases = gases
-		TOTAL_MOLES(cached_gases, .)
-		. *= R_IDEAL_GAS_EQUATION * temperature / volume
-		return
-	return 0
 
 /datum/gas_mixture/proc/return_temperature() //kelvins
-	return temperature
+
+/datum/gas_mixture/proc/set_min_heat_capacity(n)
+/datum/gas_mixture/proc/set_temperature(new_temp)
+/datum/gas_mixture/proc/set_volume(new_volume)
+/datum/gas_mixture/proc/get_moles(gas_type)
+/datum/gas_mixture/proc/set_moles(gas_type, moles)
+/datum/gas_mixture/proc/scrub_into(datum/gas_mixture/target, list/gases)
+/datum/gas_mixture/proc/mark_immutable()
+/datum/gas_mixture/proc/get_gases()
+/datum/gas_mixture/proc/multiply(factor)
+/datum/gas_mixture/proc/get_last_share()
+/datum/gas_mixture/proc/clear()
+
+/datum/gas_mixture/proc/adjust_moles(gas_type, amt = 0)
+	set_moles(gas_type, get_moles(gas_type) + amt)
 
 /datum/gas_mixture/proc/return_volume() //liters
-	return max(0, volume)
 
 /datum/gas_mixture/proc/thermal_energy() //joules
-	return THERMAL_ENERGY(src) //see code/__DEFINES/atmospherics.dm; use the define in performance critical areas
 
 /datum/gas_mixture/proc/archive()
 	//Update archived versions of variables
 	//Returns: 1 in all cases
 
 /datum/gas_mixture/proc/merge(datum/gas_mixture/giver)
-	//Merges all air from giver into self. Deletes giver.
+	//Merges all air from giver into self. giver is untouched.
 	//Returns: 1 if we are mutable, 0 otherwise
 
 /datum/gas_mixture/proc/remove(amount)
-	//Proportionally removes amount of gas from the gas_mixture
+	//Removes amount of gas from the gas_mixture
 	//Returns: gas_mixture with the gases removed
 
+/datum/gas_mixture/proc/transfer_to(datum/gas_mixture/target, amount)
+	//Transfers amount of gas to target. Equivalent to target.merge(remove(amount)) but faster.
+	//Removes amount of gas from the gas_mixture
+
 /datum/gas_mixture/proc/remove_ratio(ratio)
 	//Proportionally removes amount of gas from the gas_mixture
 	//Returns: gas_mixture with the gases removed
@@ -136,245 +126,63 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list())
 	//Performs various reactions such as combustion or fusion (LOL)
 	//Returns: 1 if any reaction took place; 0 otherwise
 
-/datum/gas_mixture/archive()
-	temperature_archived = temperature
-	gas_archive = gases.Copy()
-	return 1
-
-/datum/gas_mixture/merge(datum/gas_mixture/giver)
-	if(!giver)
-		return 0
-
-	//heat transfer
-	if(abs(temperature - giver.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
-		var/self_heat_capacity = heat_capacity()
-		var/giver_heat_capacity = giver.heat_capacity()
-		var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity
-		if(combined_heat_capacity)
-			temperature = (giver.temperature * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity
-
-	var/list/cached_gases = gases //accessing datum vars is slower than proc vars
-	var/list/giver_gases = giver.gases
-	//gas transfer
-	for(var/giver_id in giver_gases)
-		cached_gases[giver_id] += giver_gases[giver_id]
-
-	return 1
-
+/datum/gas_mixture/proc/__remove()
 /datum/gas_mixture/remove(amount)
-	var/sum
-	var/list/cached_gases = gases
-	TOTAL_MOLES(cached_gases, sum)
-	amount = min(amount, sum) //Can not take more air than tile has!
-	if(amount <= 0)
-		return null
 	var/datum/gas_mixture/removed = new type
-	var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
-
-	removed.temperature = temperature
-	for(var/id in cached_gases)
-		removed_gases[id] = QUANTIZE((cached_gases[id] / sum) * amount)
-		cached_gases[id] -= removed_gases[id]
-	GAS_GARBAGE_COLLECT(gases)
+	__remove(removed, amount)
 
 	return removed
 
+/datum/gas_mixture/proc/__remove_ratio()
 /datum/gas_mixture/remove_ratio(ratio)
-	if(ratio <= 0)
-		return null
-	ratio = min(ratio, 1)
-
-	var/list/cached_gases = gases
 	var/datum/gas_mixture/removed = new type
-	var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
-
-	removed.temperature = temperature
-	for(var/id in cached_gases)
-		removed_gases[id] = QUANTIZE(cached_gases[id] * ratio)
-		cached_gases[id] -= removed_gases[id]
-
-	GAS_GARBAGE_COLLECT(gases)
+	__remove_ratio(removed, ratio)
 
 	return removed
 
 /datum/gas_mixture/copy()
-	var/list/cached_gases = gases
 	var/datum/gas_mixture/copy = new type
-	var/list/copy_gases = copy.gases
-
-	copy.temperature = temperature
-	for(var/id in cached_gases)
-		copy_gases[id] = cached_gases[id]
+	copy.copy_from(src)
 
 	return copy
 
-
-/datum/gas_mixture/copy_from(datum/gas_mixture/sample)
-	var/list/cached_gases = gases //accessing datum vars is slower than proc vars
-	var/list/sample_gases = sample.gases
-
-	temperature = sample.temperature
-	for(var/id in sample_gases)
-		cached_gases[id] = sample_gases[id]
-
-	//remove all gases not in the sample
-	cached_gases &= sample_gases
-
-	return 1
-
 /datum/gas_mixture/copy_from_turf(turf/model)
 	parse_gas_string(model.initial_gas_mix)
 
 	//acounts for changes in temperature
 	var/turf/model_parent = model.parent_type
 	if(model.temperature != initial(model.temperature) || model.temperature != initial(model_parent.temperature))
-		temperature = model.temperature
+		set_temperature(model.temperature)
 
 	return 1
 
 /datum/gas_mixture/parse_gas_string(gas_string)
-	var/list/gases = src.gases
 	var/list/gas = params2list(gas_string)
 	if(gas["TEMP"])
-		temperature = text2num(gas["TEMP"])
+		set_temperature(text2num(gas["TEMP"]))
 		gas -= "TEMP"
-	gases.Cut()
+	clear()
 	for(var/id in gas)
 		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
-		gases[path] = text2num(gas[id])
+		set_moles(path, text2num(gas[id]))
 	archive()
 	return 1
-
-/datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
-
-	var/list/cached_gases = gases
-	var/list/sharer_gases = sharer.gases
-
-	var/temperature_delta = temperature_archived - sharer.temperature_archived
-	var/abs_temperature_delta = abs(temperature_delta)
-
-	var/old_self_heat_capacity = 0
-	var/old_sharer_heat_capacity = 0
-	if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
-		old_self_heat_capacity = heat_capacity()
-		old_sharer_heat_capacity = sharer.heat_capacity()
-
-	var/heat_capacity_self_to_sharer = 0 //heat capacity of the moles transferred from us to the sharer
-	var/heat_capacity_sharer_to_self = 0 //heat capacity of the moles transferred from the sharer to us
-
-	var/moved_moles = 0
-	var/abs_moved_moles = 0
-
-	//we're gonna define these vars outside of this for loop because as it turns out, var declaration is pricy
-	var/delta
-	var/gas_heat_capacity
-	//and also cache this shit rq because that results in sanic speed for reasons byond explanation
-	var/list/cached_gasheats = GLOB.meta_gas_specific_heats
-	//GAS TRANSFER
-	for(var/id in cached_gases | sharer_gases) // transfer gases
-
-		delta = QUANTIZE(gas_archive[id] - sharer.gas_archive[id])/(atmos_adjacent_turfs+1) //the amount of gas that gets moved between the mixtures
-
-		if(delta && abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
-			gas_heat_capacity = delta * cached_gasheats[id]
-			if(delta > 0)
-				heat_capacity_self_to_sharer += gas_heat_capacity
-			else
-				heat_capacity_sharer_to_self -= gas_heat_capacity //subtract here instead of adding the absolute value because we know that delta is negative.
-
-		cached_gases[id]					-= delta
-		sharer_gases[id]			+= delta
-		moved_moles			+= delta
-		abs_moved_moles		+= abs(delta)
-
-	last_share = abs_moved_moles
-
-	//THERMAL ENERGY TRANSFER
-	if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
-		var/new_self_heat_capacity = old_self_heat_capacity + heat_capacity_sharer_to_self - heat_capacity_self_to_sharer
-		var/new_sharer_heat_capacity = old_sharer_heat_capacity + heat_capacity_self_to_sharer - heat_capacity_sharer_to_self
-
-		//transfer of thermal energy (via changed heat capacity) between self and sharer
-		if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			temperature = (old_self_heat_capacity*temperature - heat_capacity_self_to_sharer*temperature_archived + heat_capacity_sharer_to_self*sharer.temperature_archived)/new_self_heat_capacity
-
-		if(new_sharer_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			sharer.temperature = (old_sharer_heat_capacity*sharer.temperature-heat_capacity_sharer_to_self*sharer.temperature_archived + heat_capacity_self_to_sharer*temperature_archived)/new_sharer_heat_capacity
-		//thermal energy of the system (self and sharer) is unchanged
-
-			if(abs(old_sharer_heat_capacity) > MINIMUM_HEAT_CAPACITY)
-				if(abs(new_sharer_heat_capacity/old_sharer_heat_capacity - 1) < 0.1) // <10% change in sharer heat capacity
-					temperature_share(sharer, OPEN_HEAT_TRANSFER_COEFFICIENT)
-
-	if (initial(sharer.gc_share))
-		GAS_GARBAGE_COLLECT(sharer.gases)
-	if(temperature_delta > MINIMUM_TEMPERATURE_TO_MOVE || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE)
-		var/our_moles
-		TOTAL_MOLES(cached_gases,our_moles)
-		var/their_moles
-		TOTAL_MOLES(sharer_gases,their_moles)
-		return (temperature_archived*(our_moles + moved_moles) - sharer.temperature_archived*(their_moles - moved_moles)) * R_IDEAL_GAS_EQUATION / volume
-
-/datum/gas_mixture/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity)
-	//transfer of thermal energy (via conduction) between self and sharer
-	if(sharer)
-		sharer_temperature = sharer.temperature_archived
-	var/temperature_delta = temperature_archived - sharer_temperature
-	if(abs(temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
-		var/self_heat_capacity = archived_heat_capacity()
-		sharer_heat_capacity = sharer_heat_capacity || sharer.archived_heat_capacity()
-
-		if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY))
-			var/heat = conduction_coefficient*temperature_delta* \
-				(self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity))
-
-			temperature = max(temperature - heat/self_heat_capacity, TCMB)
-			sharer_temperature = max(sharer_temperature + heat/sharer_heat_capacity, TCMB)
-			if(sharer)
-				sharer.temperature = sharer_temperature
-	return sharer_temperature
-	//thermal energy of the system (self and sharer) is unchanged
-
-/datum/gas_mixture/compare(datum/gas_mixture/sample)
-	var/list/sample_gases = sample.gases //accessing datum vars is slower than proc vars
-	var/list/cached_gases = gases
-
-	for(var/id in cached_gases | sample_gases) // compare gases from either mixture
-		var/gas_moles = cached_gases[id]
-		var/sample_moles = sample_gases[id]
-		var/delta = abs(gas_moles - sample_moles)
-		if(delta > MINIMUM_MOLES_DELTA_TO_MOVE && \
-			delta > gas_moles * MINIMUM_AIR_RATIO_TO_MOVE)
-			return id
-
-	var/our_moles
-	TOTAL_MOLES(cached_gases, our_moles)
-	if(our_moles > MINIMUM_MOLES_DELTA_TO_MOVE)
-		var/temp = temperature
-		var/sample_temp = sample.temperature
-
-		var/temperature_delta = abs(temp - sample_temp)
-		if(temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND)
-			return "temp"
-
-	return ""
-
+	
 /datum/gas_mixture/react(datum/holder)
 	. = NO_REACTION
-	var/list/cached_gases = gases
-	if(!length(cached_gases))
+	if(!total_moles())
 		return
 	var/list/reactions = list()
 	for(var/datum/gas_reaction/G in SSair.gas_reactions)
-		if(cached_gases[G.major_gas])
+		if(get_moles(G.major_gas))
 			reactions += G
 	if(!length(reactions))
 		return
 	reaction_results = new
-	var/temp = temperature
-	var/ener = THERMAL_ENERGY(src)
+	var/temp = return_temperature()
+	var/ener = thermal_energy()
 
 	reaction_loop:
 		for(var/r in reactions)
@@ -388,14 +196,13 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list())
 			for(var/id in min_reqs)
 				if (id == "TEMP" || id == "ENER")
 					continue
-				if(cached_gases[id] < min_reqs[id])
+				if(get_moles(id) < min_reqs[id])
 					continue reaction_loop
 			//at this point, all minimum requirements for the reaction are satisfied.
 
 			/*	currently no reactions have maximum requirements, so we can leave the checks commented out for a slight performance boost
 				PLEASE DO NOT REMOVE THIS CODE. the commenting is here only for a performance increase.
 				enabling these checks should be as easy as possible and the fact that they are disabled should be as clear as possible
-
 			var/list/max_reqs = reaction.max_requirements
 			if((max_reqs["TEMP"] && temp > max_reqs["TEMP"]) \
 			|| (max_reqs["ENER"] && ener > max_reqs["ENER"]))
@@ -410,8 +217,6 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list())
 			. |= reaction.react(src, holder)
 			if (. & STOP_REACTIONS)
 				break
-	if(.)
-		GAS_GARBAGE_COLLECT(gases)
 
 //Takes the amount of the gas you want to PP as an argument
 //So I don't have to do some hacky switches/defines/magic strings
@@ -420,16 +225,50 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list())
 //O2_PP = get_partial_pressure(gas_mixture.oxygen)
 
 /datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure)
-	return (gas_pressure * R_IDEAL_GAS_EQUATION * temperature) / BREATH_VOLUME
+	return (gas_pressure * R_IDEAL_GAS_EQUATION * return_temperature()) / BREATH_VOLUME
 //inverse
 /datum/gas_mixture/proc/get_true_breath_pressure(partial_pressure)
-	return (partial_pressure * BREATH_VOLUME) / (R_IDEAL_GAS_EQUATION * temperature)
+	return (partial_pressure * BREATH_VOLUME) / (R_IDEAL_GAS_EQUATION * return_temperature())
 
 //Mathematical proofs:
 /*
 get_breath_partial_pressure(gas_pp) --> gas_pp/total_moles()*breath_pp = pp
 get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles()
-
 10/20*5 = 2.5
 10 = 2.5/5*20
 */
+
+/datum/gas_mixture/turf
+
+/*
+/mob/verb/profile_atmos()
+	/world{loop_checks = 0;}
+	var/datum/gas_mixture/A = new
+	var/datum/gas_mixture/B = new
+	A.parse_gas_string("o2=200;n2=800;TEMP=50")
+	B.parse_gas_string("co2=500;plasma=500;TEMP=5000")
+	var/pa
+	var/pb
+	pa = world.tick_usage
+	for(var/I in 1 to 100000)
+		B.transfer_to(A, 1)
+		A.transfer_to(B, 1)
+	pb = world.tick_usage
+	var/total_time = (pb-pa) * world.tick_lag
+	to_chat(src, "Total time (gas transfer): [total_time]ms")
+	to_chat(src, "Operations per second: [100000 / (total_time/1000)]")
+	pa = world.tick_usage
+	for(var/I in 1 to 100000)
+		B.total_moles();
+	pb = world.tick_usage
+	total_time = (pb-pa) * world.tick_lag
+	to_chat(src, "Total time (total_moles): [total_time]ms")
+	to_chat(src, "Operations per second: [100000 / (total_time/1000)]")
+	pa = world.tick_usage
+	for(var/I in 1 to 100000)
+		new /datum/gas_mixture
+	pb = world.tick_usage
+	total_time = (pb-pa) * world.tick_lag
+	to_chat(src, "Total time (new gas mixture): [total_time]ms")
+	to_chat(src, "Operations per second: [100000 / (total_time/1000)]")
+*/

code/modules/atmospherics/gasmixtures/immutable_mixtures.dm

@@ -2,73 +2,29 @@
 //it can be changed, but any changes will ultimately be undone before they can have any effect
 
 /datum/gas_mixture/immutable
-	var/initial_temperature
-	gc_share = TRUE
+	var/initial_temperature = 0
 
 /datum/gas_mixture/immutable/New()
 	..()
-	temperature = initial_temperature
-	temperature_archived = initial_temperature
-	gases.Cut()
+	set_temperature(initial_temperature)
+	populate()
+	mark_immutable()
 
-/datum/gas_mixture/immutable/merge()
-	return 0 //we're immutable.
+/datum/gas_mixture/immutable/proc/populate()
+	return
 
-/datum/gas_mixture/immutable/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
-	. = ..(sharer, 0)
-	temperature = initial_temperature
-	temperature_archived = initial_temperature
-	gases.Cut()
-
-/datum/gas_mixture/immutable/react()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/immutable/copy()
-	return new type //we're immutable, so we can just return a new instance.
-
-/datum/gas_mixture/immutable/copy_from()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/immutable/copy_from_turf()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/immutable/parse_gas_string()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/immutable/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity)
-	. = ..()
-	temperature = initial_temperature
-
-/datum/gas_mixture/immutable/proc/after_process_cell()
-	temperature = initial_temperature
-	temperature_archived = initial_temperature
-	gases.Cut()
 
 //used by space tiles
 /datum/gas_mixture/immutable/space
 	initial_temperature = TCMB
 
-/datum/gas_mixture/immutable/space/heat_capacity()
-	return HEAT_CAPACITY_VACUUM
-
-/datum/gas_mixture/immutable/space/remove()
-	return copy() //we're always empty, so we can just return a copy.
-
-/datum/gas_mixture/immutable/space/remove_ratio()
-	return copy() //we're always empty, so we can just return a copy.
-
+/datum/gas_mixture/immutable/space/populate()
+	set_min_heat_capacity(HEAT_CAPACITY_VACUUM)
 
 //used by cloners
 /datum/gas_mixture/immutable/cloner
 	initial_temperature = T20C
 
-/datum/gas_mixture/immutable/cloner/New()
+/datum/gas_mixture/immutable/cloner/populate()
 	..()
-	gases[/datum/gas/nitrogen] = MOLES_O2STANDARD + MOLES_N2STANDARD
-
-/datum/gas_mixture/immutable/cloner/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
-	. = ..(sharer, 0)
-	gases[/datum/gas/nitrogen] = MOLES_O2STANDARD + MOLES_N2STANDARD
-
-/datum/gas_mixture/immutable/cloner/heat_capacity()
-	return (MOLES_O2STANDARD + MOLES_N2STANDARD)*20 //specific heat of nitrogen is 20
+	set_moles(/datum/gas/nitrogen, MOLES_O2STANDARD + MOLES_N2STANDARD)

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -63,11 +63,11 @@
 /datum/gas_reaction/water_vapor/react(datum/gas_mixture/air, datum/holder)
 	var/turf/open/location = isturf(holder) ? holder : null
 	. = NO_REACTION
-	if (air.temperature <= WATER_VAPOR_FREEZE)
+	if (air.return_temperature() <= WATER_VAPOR_FREEZE)
 		if(location && location.freon_gas_act())
 			. = REACTING
 	else if(location && location.water_vapor_gas_act())
-		air.gases[/datum/gas/water_vapor] -= MOLES_GAS_VISIBLE
+		air.adjust_moles(/datum/gas/water_vapor,-MOLES_GAS_VISIBLE)
 		. = REACTING
 
 //tritium combustion: combustion of oxygen and tritium (treated as hydrocarbons). creates hotspots. exothermic
@@ -86,38 +86,37 @@
 /datum/gas_reaction/tritfire/react(datum/gas_mixture/air, datum/holder)
 	var/energy_released = 0
 	var/old_heat_capacity = air.heat_capacity()
-	var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow
-	var/temperature = air.temperature
+	var/temperature = air.return_temperature()
 	var/list/cached_results = air.reaction_results
 	cached_results["fire"] = 0
 	var/turf/open/location = isturf(holder) ? holder : null
 
 	var/burned_fuel = 0
-	if(cached_gases[/datum/gas/oxygen] < cached_gases[/datum/gas/tritium])
-		burned_fuel = cached_gases[/datum/gas/oxygen]/TRITIUM_BURN_OXY_FACTOR
-		cached_gases[/datum/gas/tritium] -= burned_fuel
+	if(air.get_moles(/datum/gas/oxygen) < air.get_moles(/datum/gas/tritium))
+		burned_fuel = air.get_moles(/datum/gas/oxygen)/TRITIUM_BURN_OXY_FACTOR
+		air.adjust_moles(/datum/gas/tritium, -burned_fuel)
 	else
-		burned_fuel = cached_gases[/datum/gas/tritium]*TRITIUM_BURN_TRIT_FACTOR
-		cached_gases[/datum/gas/tritium] -= cached_gases[/datum/gas/tritium]/TRITIUM_BURN_TRIT_FACTOR
-		cached_gases[/datum/gas/oxygen] -= cached_gases[/datum/gas/tritium]
+		burned_fuel = air.get_moles(/datum/gas/tritium)*TRITIUM_BURN_TRIT_FACTOR
+		air.adjust_moles(/datum/gas/tritium, -air.get_moles(/datum/gas/tritium)/TRITIUM_BURN_TRIT_FACTOR)
+		air.adjust_moles(/datum/gas/oxygen,-air.get_moles(/datum/gas/tritium))
 
 	if(burned_fuel)
 		energy_released += (FIRE_HYDROGEN_ENERGY_RELEASED * burned_fuel)
 		if(location && prob(10) && burned_fuel > TRITIUM_MINIMUM_RADIATION_ENERGY) //woah there let's not crash the server
 			radiation_pulse(location, energy_released/TRITIUM_BURN_RADIOACTIVITY_FACTOR)
 
-		cached_gases[/datum/gas/water_vapor] += burned_fuel/TRITIUM_BURN_OXY_FACTOR
+		air.adjust_moles(/datum/gas/water_vapor, burned_fuel/TRITIUM_BURN_OXY_FACTOR)
 
 		cached_results["fire"] += burned_fuel
 
 	if(energy_released > 0)
 		var/new_heat_capacity = air.heat_capacity()
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			air.temperature = (temperature*old_heat_capacity + energy_released)/new_heat_capacity
+			air.set_temperature((temperature*old_heat_capacity + energy_released)/new_heat_capacity)
 
 	//let the floor know a fire is happening
 	if(istype(location))
-		temperature = air.temperature
+		temperature = air.return_temperature()
 		if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
 			location.hotspot_expose(temperature, CELL_VOLUME)
 			for(var/I in location)
@@ -143,8 +142,7 @@
 /datum/gas_reaction/plasmafire/react(datum/gas_mixture/air, datum/holder)
 	var/energy_released = 0
 	var/old_heat_capacity = air.heat_capacity()
-	var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow
-	var/temperature = air.temperature
+	var/temperature = air.return_temperature()
 	var/list/cached_results = air.reaction_results
 	cached_results["fire"] = 0
 	var/turf/open/location = isturf(holder) ? holder : null
@@ -163,21 +161,21 @@
 		temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE)
 	if(temperature_scale > 0)
 		oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale
-		if(cached_gases[/datum/gas/oxygen] / cached_gases[/datum/gas/plasma] > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium.
+		if(air.get_moles(/datum/gas/oxygen) / air.get_moles(/datum/gas/plasma) > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium.
 			super_saturation = TRUE
-		if(cached_gases[/datum/gas/oxygen] > cached_gases[/datum/gas/plasma]*PLASMA_OXYGEN_FULLBURN)
-			plasma_burn_rate = (cached_gases[/datum/gas/plasma]*temperature_scale)/PLASMA_BURN_RATE_DELTA
+		if(air.get_moles(/datum/gas/oxygen) > air.get_moles(/datum/gas/plasma)*PLASMA_OXYGEN_FULLBURN)
+			plasma_burn_rate = (air.get_moles(/datum/gas/plasma)*temperature_scale)/PLASMA_BURN_RATE_DELTA
 		else
-			plasma_burn_rate = (temperature_scale*(cached_gases[/datum/gas/oxygen]/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA
+			plasma_burn_rate = (temperature_scale*(air.get_moles(/datum/gas/oxygen)/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA
 
 		if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY)
-			plasma_burn_rate = min(plasma_burn_rate,cached_gases[/datum/gas/plasma],cached_gases[/datum/gas/oxygen]/oxygen_burn_rate) //Ensures matter is conserved properly
-			cached_gases[/datum/gas/plasma] = QUANTIZE(cached_gases[/datum/gas/plasma] - plasma_burn_rate)
-			cached_gases[/datum/gas/oxygen] = QUANTIZE(cached_gases[/datum/gas/oxygen] - (plasma_burn_rate * oxygen_burn_rate))
+			plasma_burn_rate = min(plasma_burn_rate,air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/oxygen)/oxygen_burn_rate) //Ensures matter is conserved properly
+			air.set_moles(/datum/gas/plasma, QUANTIZE(air.get_moles(/datum/gas/plasma) - plasma_burn_rate))
+			air.set_moles(/datum/gas/oxygen, QUANTIZE(air.get_moles(/datum/gas/oxygen) - (plasma_burn_rate * oxygen_burn_rate)))
 			if (super_saturation)
-				cached_gases[/datum/gas/tritium] += plasma_burn_rate
+				air.adjust_moles(/datum/gas/tritium, plasma_burn_rate)
 			else
-				cached_gases[/datum/gas/carbon_dioxide] += plasma_burn_rate
+				air.adjust_moles(/datum/gas/carbon_dioxide, plasma_burn_rate)
 
 			energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate)
 
@@ -186,11 +184,11 @@
 	if(energy_released > 0)
 		var/new_heat_capacity = air.heat_capacity()
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			air.temperature = (temperature*old_heat_capacity + energy_released)/new_heat_capacity
+			air.set_temperature((temperature*old_heat_capacity + energy_released)/new_heat_capacity)
 
 	//let the floor know a fire is happening
 	if(istype(location))
-		temperature = air.temperature
+		temperature = air.return_temperature()
 		if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
 			location.hotspot_expose(temperature, CELL_VOLUME)
 			for(var/I in location)
@@ -218,7 +216,6 @@
 		/datum/gas/carbon_dioxide = FUSION_MOLE_THRESHOLD)
 
 /datum/gas_reaction/fusion/react(datum/gas_mixture/air, datum/holder)
-	var/list/cached_gases = air.gases
 	var/turf/open/location
 	if (istype(holder,/datum/pipeline)) //Find the tile the reaction is occuring on, or a random part of the network if it's a pipenet.
 		var/datum/pipeline/fusion_pipenet = holder
@@ -230,14 +227,14 @@
 	var/list/cached_scan_results = air.analyzer_results
 	var/old_heat_capacity = air.heat_capacity()
 	var/reaction_energy = 0 //Reaction energy can be negative or positive, for both exothermic and endothermic reactions.
-	var/initial_plasma = cached_gases[/datum/gas/plasma]
-	var/initial_carbon = cached_gases[/datum/gas/carbon_dioxide]
-	var/scale_factor = (air.volume)/(PI) //We scale it down by volume/Pi because for fusion conditions, moles roughly = 2*volume, but we want it to be based off something constant between reactions.
-	var/toroidal_size = (2*PI)+TORADIANS(arctan((air.volume-TOROID_VOLUME_BREAKEVEN)/TOROID_VOLUME_BREAKEVEN)) //The size of the phase space hypertorus
+	var/initial_plasma = air.get_moles(/datum/gas/plasma)
+	var/initial_carbon = air.get_moles(/datum/gas/carbon_dioxide)
+	var/scale_factor = (air.return_volume())/(PI) //We scale it down by volume/Pi because for fusion conditions, moles roughly = 2*volume, but we want it to be based off something constant between reactions.
+	var/toroidal_size = (2*PI)+TORADIANS(arctan((air.return_volume()-TOROID_VOLUME_BREAKEVEN)/TOROID_VOLUME_BREAKEVEN)) //The size of the phase space hypertorus
 	var/gas_power = 0
 	var/list/gas_fusion_powers = GLOB.meta_gas_fusions
-	for (var/gas_id in cached_gases)
-		gas_power += (gas_fusion_powers[gas_id]*cached_gases[gas_id])
+	for (var/gas_id in air.get_gases())
+		gas_power += (gas_fusion_powers[gas_id]*air.get_moles(gas_id))
 	var/instability = MODULUS((gas_power*INSTABILITY_GAS_POWER_FACTOR)**2,toroidal_size) //Instability effects how chaotic the behavior of the reaction is
 	cached_scan_results[id] = instability//used for analyzer feedback
 
@@ -249,9 +246,9 @@
 	carbon = MODULUS(carbon - plasma, toroidal_size)
 
 
-	cached_gases[/datum/gas/plasma] = plasma*scale_factor + FUSION_MOLE_THRESHOLD //Scales the gases back up
-	cached_gases[/datum/gas/carbon_dioxide] = carbon*scale_factor + FUSION_MOLE_THRESHOLD
-	var/delta_plasma = initial_plasma - cached_gases[/datum/gas/plasma]
+	air.set_moles(/datum/gas/plasma, plasma*scale_factor + FUSION_MOLE_THRESHOLD) //Scales the gases back up
+	air.set_moles(/datum/gas/carbon_dioxide , carbon*scale_factor + FUSION_MOLE_THRESHOLD)
+	var/delta_plasma = initial_plasma - air.get_moles(/datum/gas/plasma)
 
 	reaction_energy += delta_plasma*PLASMA_BINDING_ENERGY //Energy is gained or lost corresponding to the creation or destruction of mass.
 	if(instability < FUSION_INSTABILITY_ENDOTHERMALITY)
@@ -260,17 +257,17 @@
 		reaction_energy *= (instability-FUSION_INSTABILITY_ENDOTHERMALITY)**0.5
 
 	if(air.thermal_energy() + reaction_energy < 0) //No using energy that doesn't exist.
-		cached_gases[/datum/gas/plasma] = initial_plasma
-		cached_gases[/datum/gas/carbon_dioxide] = initial_carbon
+		air.set_moles(/datum/gas/plasma,initial_plasma)
+		air.set_moles(/datum/gas/carbon_dioxide, initial_carbon)
 		return NO_REACTION
-	cached_gases[/datum/gas/tritium] -= FUSION_TRITIUM_MOLES_USED
+	air.adjust_moles(/datum/gas/tritium, -FUSION_TRITIUM_MOLES_USED)
 	//The decay of the tritium and the reaction's energy produces waste gases, different ones depending on whether the reaction is endo or exothermic
 	if(reaction_energy > 0)
-		cached_gases[/datum/gas/oxygen] += FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT)
-		cached_gases[/datum/gas/nitrous_oxide] += FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT)
+		air.adjust_moles(/datum/gas/oxygen, FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT))
+		air.adjust_moles(/datum/gas/nitrous_oxide, FUSION_TRITIUM_MOLES_USED*(reaction_energy*FUSION_TRITIUM_CONVERSION_COEFFICIENT))
 	else
-		cached_gases[/datum/gas/bz] += FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT)
-		cached_gases[/datum/gas/nitryl] += FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT)
+		air.adjust_moles(/datum/gas/bz, FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT))
+		air.adjust_moles(/datum/gas/nitryl, FUSION_TRITIUM_MOLES_USED*(reaction_energy*-FUSION_TRITIUM_CONVERSION_COEFFICIENT))
 
 	if(reaction_energy)
 		if(location)
@@ -282,7 +279,7 @@
 
 		var/new_heat_capacity = air.heat_capacity()
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			air.temperature = clamp(((air.temperature*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB,INFINITY)
+			air.set_temperature(clamp(((air.return_temperature()*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB,INFINITY))
 		return REACTING
 
 /datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst.
@@ -299,22 +296,21 @@
 	)
 
 /datum/gas_reaction/nitrylformation/react(datum/gas_mixture/air)
-	var/list/cached_gases = air.gases
-	var/temperature = air.temperature
+	var/temperature = air.return_temperature()
 
 	var/old_heat_capacity = air.heat_capacity()
-	var/heat_efficency = min(temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*100),cached_gases[/datum/gas/oxygen],cached_gases[/datum/gas/nitrogen])
+	var/heat_efficency = min(temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*100),air.get_moles(/datum/gas/oxygen),air.get_moles(/datum/gas/nitrogen))
 	var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY
-	if ((cached_gases[/datum/gas/oxygen] - heat_efficency < 0 )|| (cached_gases[/datum/gas/nitrogen] - heat_efficency < 0)) //Shouldn't produce gas from nothing.
+	if ((air.get_moles(/datum/gas/oxygen) - heat_efficency < 0 )|| (air.get_moles(/datum/gas/nitrogen) - heat_efficency < 0)) //Shouldn't produce gas from nothing.
 		return NO_REACTION
-	cached_gases[/datum/gas/oxygen] -= heat_efficency
-	cached_gases[/datum/gas/nitrogen] -= heat_efficency
-	cached_gases[/datum/gas/nitryl] += heat_efficency*2
+	air.adjust_moles(/datum/gas/oxygen, heat_efficency)
+	air.adjust_moles(/datum/gas/nitrogen, heat_efficency)
+	air.adjust_moles(/datum/gas/nitryl, heat_efficency*2)
 
 	if(energy_used > 0)
 		var/new_heat_capacity = air.heat_capacity()
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			air.temperature = max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB)
+			air.set_temperature(max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB))
 		return REACTING
 
 /datum/gas_reaction/bzformation //Formation of BZ by combining plasma and tritium at low pressures. Exothermic.
@@ -330,27 +326,26 @@
 
 
 /datum/gas_reaction/bzformation/react(datum/gas_mixture/air)
-	var/list/cached_gases = air.gases
-	var/temperature = air.temperature
+	var/temperature = air.return_temperature()
 	var/pressure = air.return_pressure()
 	var/old_heat_capacity = air.heat_capacity()
-	var/reaction_efficency = min(1/((pressure/(0.1*ONE_ATMOSPHERE))*(max(cached_gases[/datum/gas/plasma]/cached_gases[/datum/gas/nitrous_oxide],1))),cached_gases[/datum/gas/nitrous_oxide],cached_gases[/datum/gas/plasma]/2)
+	var/reaction_efficency = min(1/((pressure/(0.1*ONE_ATMOSPHERE))*(max(air.get_moles(/datum/gas/plasma)/air.get_moles(/datum/gas/nitrous_oxide),1))),air.get_moles(/datum/gas/nitrous_oxide),air.get_moles(/datum/gas/plasma)/2)
 	var/energy_released = 2*reaction_efficency*FIRE_CARBON_ENERGY_RELEASED
-	if ((cached_gases[/datum/gas/nitrous_oxide] - reaction_efficency < 0 )|| (cached_gases[/datum/gas/plasma] - (2*reaction_efficency) < 0) || energy_released <= 0) //Shouldn't produce gas from nothing.
+	if ((air.get_moles(/datum/gas/nitrous_oxide) - reaction_efficency < 0 )|| (air.get_moles(/datum/gas/plasma) - (2*reaction_efficency) < 0) || energy_released <= 0) //Shouldn't produce gas from nothing.
 		return NO_REACTION
-	cached_gases[/datum/gas/bz] += reaction_efficency
-	if(reaction_efficency == cached_gases[/datum/gas/nitrous_oxide])
-		cached_gases[/datum/gas/bz] -= min(pressure,1)
-		cached_gases[/datum/gas/oxygen] += min(pressure,1)
-	cached_gases[/datum/gas/nitrous_oxide] -= reaction_efficency
-	cached_gases[/datum/gas/plasma]  -= 2*reaction_efficency
+	air.adjust_moles(/datum/gas/bz, reaction_efficency)
+	if(reaction_efficency == air.get_moles(/datum/gas/nitrous_oxide))
+		air.adjust_moles(/datum/gas/bz, -min(pressure,1))
+		air.adjust_moles(/datum/gas/oxygen, min(pressure,1))
+	air.adjust_moles(/datum/gas/nitrous_oxide, -reaction_efficency)
+	air.adjust_moles(/datum/gas/plasma, -2*reaction_efficency)
 
 	SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min((reaction_efficency**2)*BZ_RESEARCH_SCALE),BZ_RESEARCH_MAX_AMOUNT)
 
 	if(energy_released > 0)
 		var/new_heat_capacity = air.heat_capacity()
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			air.temperature = max(((temperature*old_heat_capacity + energy_released)/new_heat_capacity),TCMB)
+			air.set_temperature(max(((temperature*old_heat_capacity + energy_released)/new_heat_capacity),TCMB))
 		return REACTING
 
 /datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic.
@@ -367,24 +362,22 @@
 		"TEMP" = STIMULUM_HEAT_SCALE/2)
 
 /datum/gas_reaction/stimformation/react(datum/gas_mixture/air)
-	var/list/cached_gases = air.gases
-
 	var/old_heat_capacity = air.heat_capacity()
-	var/heat_scale = min(air.temperature/STIMULUM_HEAT_SCALE,cached_gases[/datum/gas/tritium],cached_gases[/datum/gas/plasma],cached_gases[/datum/gas/nitryl])
+	var/heat_scale = min(air.return_temperature()/STIMULUM_HEAT_SCALE,air.get_moles(/datum/gas/tritium),air.get_moles(/datum/gas/plasma),air.get_moles(/datum/gas/nitryl))
 	var/stim_energy_change = heat_scale + STIMULUM_FIRST_RISE*(heat_scale**2) - STIMULUM_FIRST_DROP*(heat_scale**3) + STIMULUM_SECOND_RISE*(heat_scale**4) - STIMULUM_ABSOLUTE_DROP*(heat_scale**5)
 
-	if ((cached_gases[/datum/gas/tritium] - heat_scale < 0 )|| (cached_gases[/datum/gas/plasma] - heat_scale < 0) || (cached_gases[/datum/gas/nitryl] - heat_scale < 0)) //Shouldn't produce gas from nothing.
+	if ((air.get_moles(/datum/gas/tritium) - heat_scale < 0 )|| (air.get_moles(/datum/gas/plasma) - heat_scale < 0) || (air.get_moles(/datum/gas/nitryl) - heat_scale < 0)) //Shouldn't produce gas from nothing.
 		return NO_REACTION
-	cached_gases[/datum/gas/stimulum]+= heat_scale/10
-	cached_gases[/datum/gas/tritium] -= heat_scale
-	cached_gases[/datum/gas/plasma] -= heat_scale
-	cached_gases[/datum/gas/nitryl] -= heat_scale
+	air.adjust_moles(/datum/gas/stimulum, heat_scale/10)
+	air.adjust_moles(/datum/gas/tritium, -heat_scale)
+	air.adjust_moles(/datum/gas/plasma, -heat_scale)
+	air.adjust_moles(/datum/gas/nitryl, -heat_scale)
 
 	SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, STIMULUM_RESEARCH_AMOUNT*max(stim_energy_change,0))
 	if(stim_energy_change)
 		var/new_heat_capacity = air.heat_capacity()
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			air.temperature = max(((air.temperature*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB)
+			air.set_temperature(max(((air.return_temperature()*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB))
 		return REACTING
 
 /datum/gas_reaction/nobliumformation //Hyper-Noblium formation is extrememly endothermic, but requires high temperatures to start. Due to its high mass, hyper-nobelium uses large amounts of nitrogen and tritium. BZ can be used as a catalyst to make it less endothermic.
@@ -399,22 +392,21 @@
 		"TEMP" = 5000000)
 
 /datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air)
-	var/list/cached_gases = air.gases
 	var/old_heat_capacity = air.heat_capacity()
-	var/nob_formed = min((cached_gases[/datum/gas/nitrogen]+cached_gases[/datum/gas/tritium])/100,cached_gases[/datum/gas/tritium]/10,cached_gases[/datum/gas/nitrogen]/20)
-	var/energy_taken = nob_formed*(NOBLIUM_FORMATION_ENERGY/(max(cached_gases[/datum/gas/bz],1)))
-	if ((cached_gases[/datum/gas/tritium] - 10*nob_formed < 0) || (cached_gases[/datum/gas/nitrogen] - 20*nob_formed < 0))
+	var/nob_formed = min((air.get_moles(/datum/gas/nitrogen)+air.get_moles(/datum/gas/tritium))/100,air.get_moles(/datum/gas/tritium)/10,air.get_moles(/datum/gas/nitrogen)/20)
+	var/energy_taken = nob_formed*(NOBLIUM_FORMATION_ENERGY/(max(air.get_moles(/datum/gas/bz),1)))
+	if ((air.get_moles(/datum/gas/tritium) - 10*nob_formed < 0) || (air.get_moles(/datum/gas/nitrogen) - 20*nob_formed < 0))
 		return NO_REACTION
-	cached_gases[/datum/gas/tritium] -= 10*nob_formed
-	cached_gases[/datum/gas/nitrogen] -= 20*nob_formed
-	cached_gases[/datum/gas/hypernoblium]+= nob_formed
+	air.adjust_moles(/datum/gas/tritium, -10*nob_formed)
+	air.adjust_moles(/datum/gas/nitrogen, -20*nob_formed)
+	air.adjust_moles(/datum/gas/hypernoblium,nob_formed)
 
 	SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, nob_formed*NOBLIUM_RESEARCH_AMOUNT)
 
 	if (nob_formed)
 		var/new_heat_capacity = air.heat_capacity()
 		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
-			air.temperature = max(((air.temperature*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)
+			air.set_temperature(max(((air.return_temperature()*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB))
 
 
 /datum/gas_reaction/miaster	//dry heat sterilization: clears out pathogens in the air
@@ -429,16 +421,15 @@
 	)
 
 /datum/gas_reaction/miaster/react(datum/gas_mixture/air, datum/holder)
-	var/list/cached_gases = air.gases
 	// As the name says it, it needs to be dry
-	if(cached_gases[/datum/gas/water_vapor] && cached_gases[/datum/gas/water_vapor]/air.total_moles() > 0.1)
+	if(air.get_moles(/datum/gas/water_vapor) && air.get_moles(/datum/gas/water_vapor)/air.total_moles() > 0.1)
 		return
 
 	//Replace miasma with oxygen
-	var/cleaned_air = min(cached_gases[/datum/gas/miasma], 20 + (air.temperature - FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 70) / 20)
-	cached_gases[/datum/gas/miasma] -= cleaned_air
-	cached_gases[/datum/gas/oxygen] += cleaned_air
+	var/cleaned_air = min(air.get_moles(/datum/gas/miasma), 20 + (air.return_temperature() - FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 70) / 20)
+	air.adjust_moles(/datum/gas/miasma, -cleaned_air)
+	air.adjust_moles(/datum/gas/oxygen, cleaned_air)
 
 	//Possibly burning a bit of organic matter through maillard reaction, so a *tiny* bit more heat would be understandable
-	air.temperature += cleaned_air * 0.002
+	air.set_temperature(air.return_temperature() + cleaned_air * 0.002)
 	SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, cleaned_air*MIASMA_RESEARCH_AMOUNT)//Turns out the burning of miasma is kinda interesting to scientists

code/modules/atmospherics/gasmixtures/zextools_broke.dm

@@ -0,0 +1,304 @@
+#ifdef EXTOOLS_BROKE
+
+/datum/gas_mixture
+	var/list/gases = list()
+	var/temperature = 0 //kelvins
+	var/tmp/temperature_archived = 0
+	var/volume = CELL_VOLUME //liters
+	var/last_share = 0
+
+/datum/gas_mixture/heat_capacity() //joules per kelvin
+	var/list/cached_gases = gases
+	var/list/cached_gasheats = GLOB.meta_gas_specific_heats
+	. = 0
+	for(var/id in cached_gases)
+		. += cached_gases[id] * cached_gasheats[id]
+
+/datum/gas_mixture/turf/heat_capacity() // Same as above except vacuums return HEAT_CAPACITY_VACUUM
+	var/list/cached_gases = gases
+	var/list/cached_gasheats = GLOB.meta_gas_specific_heats
+	for(var/id in cached_gases)
+		. += cached_gases[id] * cached_gasheats[id]
+	if(!.)
+		. += HEAT_CAPACITY_VACUUM //we want vacuums in turfs to have the same heat capacity as space
+
+//prefer this to gas_mixture/total_moles in performance critical areas
+#define TOTAL_MOLES(cached_gases, out_var)\
+	out_var = 0;\
+	for(var/total_moles_id in cached_gases){\
+		out_var += cached_gases[total_moles_id];\
+	}
+
+#define THERMAL_ENERGY(gas) (gas.temperature * gas.heat_capacity())
+
+/datum/gas_mixture/total_moles()
+	var/cached_gases = gases
+	TOTAL_MOLES(cached_gases, .)
+
+/datum/gas_mixture/return_pressure() //kilopascals
+	if(volume > 0) // to prevent division by zero
+		var/cached_gases = gases
+		TOTAL_MOLES(cached_gases, .)
+		. *= R_IDEAL_GAS_EQUATION * temperature / volume
+		return
+	return 0
+
+/datum/gas_mixture/return_temperature() //kelvins
+	return temperature
+
+/datum/gas_mixture/set_min_heat_capacity(n)
+	return
+/datum/gas_mixture/set_temperature(new_temp)
+	temperature = new_temp
+/datum/gas_mixture/set_volume(new_volume)
+	volume = new_volume
+/datum/gas_mixture/get_moles(gas_type)
+	return gases[gas_type]
+/datum/gas_mixture/set_moles(gas_type, moles)
+	gases[gas_type] = moles
+/datum/gas_mixture/scrub_into(datum/gas_mixture/target, list/gases)
+	if(isnull(target))
+		return FALSE
+
+	var/list/removed_gases = target.gases
+
+	//Filter it
+	var/datum/gas_mixture/filtered_out = new
+	var/list/filtered_gases = filtered_out.gases
+	filtered_out.temperature = removed.temperature
+	for(var/gas in filter_types & removed_gases)
+		filtered_gases[gas] = removed_gases[gas]
+		removed_gases[gas] = 0
+	merge(filtered_out)
+/datum/gas_mixture/mark_immutable()
+	return
+/datum/gas_mixture/get_gases()
+	return gases
+/datum/gas_mixture/multiply(factor)
+	for(var/id in gases)
+		gases[id] *= factor
+/datum/gas_mixture/get_last_share()
+	return last_share
+/datum/gas_mixture/clear()
+	gases.Cut()
+
+/datum/gas_mixture/return_volume()
+	return volume // wow!
+
+/datum/gas_mixture/thermal_energy()
+	return THERMAL_ENERGY(src)
+
+/datum/gas_mixture/archive()
+	temperature_archived = temperature
+	gas_archive = gases.Copy()
+	return 1
+
+/datum/gas_mixture/merge(datum/gas_mixture/giver)
+	if(!giver)
+		return 0
+
+	//heat transfer
+	if(abs(temperature - giver.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+		var/self_heat_capacity = heat_capacity()
+		var/giver_heat_capacity = giver.heat_capacity()
+		var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity
+		if(combined_heat_capacity)
+			temperature = (giver.temperature * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity
+
+	var/list/cached_gases = gases //accessing datum vars is slower than proc vars
+	var/list/giver_gases = giver.gases
+	//gas transfer
+	for(var/giver_id in giver_gases)
+		cached_gases[giver_id] += giver_gases[giver_id]
+
+	return 1
+
+/datum/gas_mixture/remove(amount)
+	var/sum
+	var/list/cached_gases = gases
+	TOTAL_MOLES(cached_gases, sum)
+	amount = min(amount, sum) //Can not take more air than tile has!
+	if(amount <= 0)
+		return null
+	var/datum/gas_mixture/removed = new type
+	var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
+
+	removed.temperature = temperature
+	for(var/id in cached_gases)
+		removed_gases[id] = QUANTIZE((cached_gases[id] / sum) * amount)
+		cached_gases[id] -= removed_gases[id]
+	GAS_GARBAGE_COLLECT(gases)
+
+	return removed
+
+/datum/gas_mixture/remove_ratio(ratio)
+	if(ratio <= 0)
+		return null
+	ratio = min(ratio, 1)
+
+	var/list/cached_gases = gases
+	var/datum/gas_mixture/removed = new type
+	var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
+
+	removed.temperature = temperature
+	for(var/id in cached_gases)
+		removed_gases[id] = QUANTIZE(cached_gases[id] * ratio)
+		cached_gases[id] -= removed_gases[id]
+
+	GAS_GARBAGE_COLLECT(gases)
+
+	return removed
+
+/datum/gas_mixture/copy()
+	var/list/cached_gases = gases
+	var/datum/gas_mixture/copy = new type
+	var/list/copy_gases = copy.gases
+
+	copy.temperature = temperature
+	for(var/id in cached_gases)
+		copy_gases[id] = cached_gases[id]
+
+	return copy
+
+
+/datum/gas_mixture/copy_from(datum/gas_mixture/sample)
+	var/list/cached_gases = gases //accessing datum vars is slower than proc vars
+	var/list/sample_gases = sample.gases
+
+	temperature = sample.temperature
+	for(var/id in sample_gases)
+		cached_gases[id] = sample_gases[id]
+
+	//remove all gases not in the sample
+	cached_gases &= sample_gases
+
+	return 1
+
+/datum/gas_mixture/copy_from_turf(turf/model)
+	parse_gas_string(model.initial_gas_mix)
+
+	//acounts for changes in temperature
+	var/turf/model_parent = model.parent_type
+	if(model.temperature != initial(model.temperature) || model.temperature != initial(model_parent.temperature))
+		temperature = model.temperature
+
+	return 1
+
+/datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
+
+	var/list/cached_gases = gases
+	var/list/sharer_gases = sharer.gases
+
+	var/temperature_delta = temperature_archived - sharer.temperature_archived
+	var/abs_temperature_delta = abs(temperature_delta)
+
+	var/old_self_heat_capacity = 0
+	var/old_sharer_heat_capacity = 0
+	if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+		old_self_heat_capacity = heat_capacity()
+		old_sharer_heat_capacity = sharer.heat_capacity()
+
+	var/heat_capacity_self_to_sharer = 0 //heat capacity of the moles transferred from us to the sharer
+	var/heat_capacity_sharer_to_self = 0 //heat capacity of the moles transferred from the sharer to us
+
+	var/moved_moles = 0
+	var/abs_moved_moles = 0
+
+	//we're gonna define these vars outside of this for loop because as it turns out, var declaration is pricy
+	var/delta
+	var/gas_heat_capacity
+	//and also cache this shit rq because that results in sanic speed for reasons byond explanation
+	var/list/cached_gasheats = GLOB.meta_gas_specific_heats
+	//GAS TRANSFER
+	for(var/id in cached_gases | sharer_gases) // transfer gases
+
+		delta = QUANTIZE(gas_archive[id] - sharer.gas_archive[id])/(atmos_adjacent_turfs+1) //the amount of gas that gets moved between the mixtures
+
+		if(delta && abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+			gas_heat_capacity = delta * cached_gasheats[id]
+			if(delta > 0)
+				heat_capacity_self_to_sharer += gas_heat_capacity
+			else
+				heat_capacity_sharer_to_self -= gas_heat_capacity //subtract here instead of adding the absolute value because we know that delta is negative.
+
+		cached_gases[id]					-= delta
+		sharer_gases[id]			+= delta
+		moved_moles			+= delta
+		abs_moved_moles		+= abs(delta)
+
+	last_share = abs_moved_moles
+
+	//THERMAL ENERGY TRANSFER
+	if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+		var/new_self_heat_capacity = old_self_heat_capacity + heat_capacity_sharer_to_self - heat_capacity_self_to_sharer
+		var/new_sharer_heat_capacity = old_sharer_heat_capacity + heat_capacity_self_to_sharer - heat_capacity_sharer_to_self
+
+		//transfer of thermal energy (via changed heat capacity) between self and sharer
+		if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY)
+			temperature = (old_self_heat_capacity*temperature - heat_capacity_self_to_sharer*temperature_archived + heat_capacity_sharer_to_self*sharer.temperature_archived)/new_self_heat_capacity
+
+		if(new_sharer_heat_capacity > MINIMUM_HEAT_CAPACITY)
+			sharer.temperature = (old_sharer_heat_capacity*sharer.temperature-heat_capacity_sharer_to_self*sharer.temperature_archived + heat_capacity_self_to_sharer*temperature_archived)/new_sharer_heat_capacity
+		//thermal energy of the system (self and sharer) is unchanged
+
+			if(abs(old_sharer_heat_capacity) > MINIMUM_HEAT_CAPACITY)
+				if(abs(new_sharer_heat_capacity/old_sharer_heat_capacity - 1) < 0.1) // <10% change in sharer heat capacity
+					temperature_share(sharer, OPEN_HEAT_TRANSFER_COEFFICIENT)
+
+	if (initial(sharer.gc_share))
+		GAS_GARBAGE_COLLECT(sharer.gases)
+	if(temperature_delta > MINIMUM_TEMPERATURE_TO_MOVE || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE)
+		var/our_moles
+		TOTAL_MOLES(cached_gases,our_moles)
+		var/their_moles
+		TOTAL_MOLES(sharer_gases,their_moles)
+		return (temperature_archived*(our_moles + moved_moles) - sharer.temperature_archived*(their_moles - moved_moles)) * R_IDEAL_GAS_EQUATION / volume
+
+/datum/gas_mixture/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity)
+	//transfer of thermal energy (via conduction) between self and sharer
+	if(sharer)
+		sharer_temperature = sharer.temperature_archived
+	var/temperature_delta = temperature_archived - sharer_temperature
+	if(abs(temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+		var/self_heat_capacity = archived_heat_capacity()
+		sharer_heat_capacity = sharer_heat_capacity || sharer.archived_heat_capacity()
+
+		if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY))
+			var/heat = conduction_coefficient*temperature_delta* \
+				(self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity))
+
+			temperature = max(temperature - heat/self_heat_capacity, TCMB)
+			sharer_temperature = max(sharer_temperature + heat/sharer_heat_capacity, TCMB)
+			if(sharer)
+				sharer.temperature = sharer_temperature
+	return sharer_temperature
+	//thermal energy of the system (self and sharer) is unchanged
+
+/datum/gas_mixture/compare(datum/gas_mixture/sample)
+	var/list/sample_gases = sample.gases //accessing datum vars is slower than proc vars
+	var/list/cached_gases = gases
+
+	for(var/id in cached_gases | sample_gases) // compare gases from either mixture
+		var/gas_moles = cached_gases[id]
+		var/sample_moles = sample_gases[id]
+		var/delta = abs(gas_moles - sample_moles)
+		if(delta > MINIMUM_MOLES_DELTA_TO_MOVE && \
+			delta > gas_moles * MINIMUM_AIR_RATIO_TO_MOVE)
+			return id
+
+	var/our_moles
+	TOTAL_MOLES(cached_gases, our_moles)
+	if(our_moles > MINIMUM_MOLES_DELTA_TO_MOVE)
+		var/temp = temperature
+		var/sample_temp = sample.temperature
+
+		var/temperature_delta = abs(temp - sample_temp)
+		if(temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND)
+			return "temp"
+
+	return ""
+
+/datum/gas_mixture/transfer_to(datum/gas_mixture/target, amount)
+	return merge(target.remove(amount))
+
+#endif

code/modules/atmospherics/machinery/airalarm.dm

@@ -269,7 +269,7 @@
 							"unit" = "kPa",
 							"danger_level" = cur_tlv.get_danger_level(pressure)
 	))
-	var/temperature = environment.temperature
+	var/temperature = environment.return_temperature()
 	cur_tlv = TLV["temperature"]
 	data["environment_data"] += list(list(
 							"name" = "Temperature",
@@ -278,16 +278,16 @@
 							"danger_level" = cur_tlv.get_danger_level(temperature)
 	))
 	var/total_moles = environment.total_moles()
-	var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.temperature / environment.volume
-	for(var/gas_id in environment.gases)
+	var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.return_temperature() / environment.return_volume()
+	for(var/gas_id in environment.get_gases())
 		if(!(gas_id in TLV)) // We're not interested in this gas, it seems.
 			continue
 		cur_tlv = TLV[gas_id]
 		data["environment_data"] += list(list(
 								"name" = GLOB.meta_gas_names[gas_id],
-								"value" = environment.gases[gas_id] / total_moles * 100,
+								"value" = environment.get_moles(gas_id) / total_moles * 100,
 								"unit" = "%",
-								"danger_level" = cur_tlv.get_danger_level(environment.gases[gas_id] * partial_pressure)
+								"danger_level" = cur_tlv.get_danger_level(environment.get_moles(gas_id) * partial_pressure)
 		))
 
 	if(!locked || hasSiliconAccessInArea(user, PRIVILEDGES_SILICON|PRIVILEDGES_DRONE))
@@ -684,24 +684,21 @@
 	var/datum/tlv/cur_tlv
 
 	var/datum/gas_mixture/environment = location.return_air()
-	var/list/env_gases = environment.gases
-	var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.temperature / environment.volume
+	var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.return_temperature() / environment.return_volume()
 
 	cur_tlv = TLV["pressure"]
 	var/environment_pressure = environment.return_pressure()
 	var/pressure_dangerlevel = cur_tlv.get_danger_level(environment_pressure)
 
 	cur_tlv = TLV["temperature"]
-	var/temperature_dangerlevel = cur_tlv.get_danger_level(environment.temperature)
+	var/temperature_dangerlevel = cur_tlv.get_danger_level(environment.return_temperature())
 
 	var/gas_dangerlevel = 0
-	for(var/gas_id in env_gases)
+	for(var/gas_id in environment.get_gases())
 		if(!(gas_id in TLV)) // We're not interested in this gas, it seems.
 			continue
 		cur_tlv = TLV[gas_id]
-		gas_dangerlevel = max(gas_dangerlevel, cur_tlv.get_danger_level(env_gases[gas_id] * partial_pressure))
-
-	GAS_GARBAGE_COLLECT(environment.gases)
+		gas_dangerlevel = max(gas_dangerlevel, cur_tlv.get_danger_level(environment.get_moles(gas_id) * partial_pressure))
 
 	var/old_danger_level = danger_level
 	danger_level = max(pressure_dangerlevel, temperature_dangerlevel, gas_dangerlevel)

code/modules/atmospherics/machinery/components/binary_devices/circulator.dm

@@ -52,10 +52,10 @@
 		return null
 
 	//Calculate necessary moles to transfer using PV = nRT
-	if(air2.temperature>0)
+	if(air2.return_temperature()>0)
 		var/pressure_delta = (input_starting_pressure - output_starting_pressure)/2
 
-		var/transfer_moles = pressure_delta*air1.volume/(air2.temperature * R_IDEAL_GAS_EQUATION)
+		var/transfer_moles = pressure_delta*air1.return_volume()/(air2.return_temperature() * R_IDEAL_GAS_EQUATION)
 
 		last_pressure_delta = pressure_delta
 

code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm

@@ -66,8 +66,8 @@
 			pressure_delta = min(pressure_delta, (air1.return_pressure() - input_pressure_min))
 
 		if(pressure_delta > 0)
-			if(air1.temperature > 0)
-				var/transfer_moles = pressure_delta*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+			if(air1.return_temperature() > 0)
+				var/transfer_moles = pressure_delta*environment.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION)
 
 				var/datum/gas_mixture/removed = air1.remove(transfer_moles)
 				//Removed can be null if there is no atmosphere in air1
@@ -81,20 +81,17 @@
 				parent1.update = 1
 
 	else //external -> output
-		var/pressure_delta = 10000
+		if(environment.return_pressure() > 0)
+			var/our_multiplier = air2.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION)
+			var/moles_delta = 10000 * our_multiplier
+			if(pressure_checks&EXT_BOUND)
+				moles_delta = min(moles_delta, (environment_pressure - output_pressure_max) * environment.return_volume() / (environment.return_temperature() * R_IDEAL_GAS_EQUATION))
+			if(pressure_checks&INPUT_MIN)
+				moles_delta = min(moles_delta, (input_pressure_min - air2.return_pressure()) * our_multiplier)
 
-		if(pressure_checks&EXT_BOUND)
-			pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
-		if(pressure_checks&INPUT_MIN)
-			pressure_delta = min(pressure_delta, (output_pressure_max - air2.return_pressure()))
-
-		if(pressure_delta > 0)
-			if(environment.temperature > 0)
-				var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
-
-				var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
-				//removed can be null if there is no air in the location
-				if(!removed)
+			if(moles_delta > 0)
+				var/datum/gas_mixture/removed = loc.remove_air(moles_delta)
+				if (isnull(removed)) // in space
 					return
 
 				air2.merge(removed)
@@ -182,8 +179,8 @@
 	..()
 	var/datum/gas_mixture/air1 = airs[1]
 	var/datum/gas_mixture/air2 = airs[2]
-	air1.volume = 1000
-	air2.volume = 1000
+	air1.set_volume(1000)
+	air2.set_volume(1000)
 
 // Mapping
 

code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm

@@ -53,11 +53,11 @@ Passive gate is similar to the regular pump except:
 		return
 
 	//Calculate necessary moles to transfer using PV = nRT
-	if((air1.total_moles() > 0) && (air1.temperature>0))
+	if((air1.total_moles() > 0) && (air1.return_temperature()>0))
 		var/pressure_delta = min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2)
 		//Can not have a pressure delta that would cause output_pressure > input_pressure
 
-		var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+		var/transfer_moles = pressure_delta*air2.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION)
 
 		//Actually transfer the gas
 		var/datum/gas_mixture/removed = air1.remove(transfer_moles)
@@ -172,4 +172,4 @@ Passive gate is similar to the regular pump except:
 
 /obj/machinery/atmospherics/components/binary/passive_gate/layer3
 	piping_layer = 3
-	icon_state = "passgate_map-3"
+	icon_state = "passgate_map-3"

code/modules/atmospherics/machinery/components/binary_devices/pump.dm

@@ -77,9 +77,9 @@
 		return
 
 	//Calculate necessary moles to transfer using PV=nRT
-	if((air1.total_moles() > 0) && (air1.temperature>0))
+	if((air1.total_moles() > 0) && (air1.return_temperature()>0))
 		var/pressure_delta = target_pressure - output_starting_pressure
-		var/transfer_moles = pressure_delta*air2.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+		var/transfer_moles = pressure_delta*air2.return_volume()/(air1.return_temperature() * R_IDEAL_GAS_EQUATION)
 
 		//Actually transfer the gas
 		var/datum/gas_mixture/removed = air1.remove(transfer_moles)
@@ -212,4 +212,4 @@
 
 /obj/machinery/atmospherics/components/binary/pump/on/layer3
 	piping_layer = 3
-	icon_state= "pump_on_map-3"
+	icon_state= "pump_on_map-3"