Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/controllers/subsystem/adjacent_air.dm

@@ -20,6 +20,9 @@ SUBSYSTEM_DEF(adjacent_air)
 	return ..()
 
 /datum/controller/subsystem/adjacent_air/fire(resumed = FALSE, mc_check = TRUE)
+	if(SSair.thread_running())
+		pause()
+		return
 
 	var/list/queue = src.queue
 

code/controllers/subsystem/air.dm

@@ -9,24 +9,36 @@ SUBSYSTEM_DEF(air)
 	var/cost_turfs = 0
 	var/cost_groups = 0
 	var/cost_highpressure = 0
+	var/cost_deferred_airs
 	var/cost_hotspots = 0
+	var/cost_post_process = 0
 	var/cost_superconductivity = 0
 	var/cost_pipenets = 0
 	var/cost_rebuilds = 0
 	var/cost_atmos_machinery = 0
 	var/cost_equalize = 0
+	var/thread_wait_ticks = 0
+	var/cur_thread_wait_ticks = 0
+
+	var/low_pressure_turfs = 0
+	var/high_pressure_turfs = 0
+
+	var/num_group_turfs_processed = 0
+	var/num_equalize_processed = 0
 
 	var/list/hotspots = list()
 	var/list/networks = list()
 	var/list/pipenets_needing_rebuilt = list()
+	var/list/deferred_airs = list()
+	var/max_deferred_airs = 0
 	var/list/obj/machinery/atmos_machinery = list()
+	var/list/obj/machinery/atmos_air_machinery = list()
 	var/list/pipe_init_dirs_cache = list()
 
 	//atmos singletons
 	var/list/gas_reactions = list()
 
 	//Special functions lists
-	var/list/turf/active_super_conductivity = list()
 	var/list/turf/open/high_pressure_delta = list()
 
 
@@ -34,54 +46,88 @@ SUBSYSTEM_DEF(air)
 	var/currentpart = SSAIR_REBUILD_PIPENETS
 
 	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
+	// Max number of turfs equalization will grab.
+	var/equalize_turf_limit = 10
+	// Max number of turfs to look for a space turf, and max number of turfs that will be decompressed.
+	var/equalize_hard_turf_limit = 2000
+	// Whether equalization should be enabled at all.
+	var/equalize_enabled = FALSE
+	// Whether turf-to-turf heat exchanging should be enabled.
+	var/heat_enabled = FALSE
+	// Max number of times process_turfs will share in a tick.
+	var/share_max_steps = 1
+	// Excited group processing will try to equalize groups with total pressure difference less than this amount.
+	var/excited_group_pressure_goal = 0.25
 
 /datum/controller/subsystem/air/stat_entry(msg)
 	msg += "C:{"
-	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 += "HE:[round(heat_process_time(),1)]|"
 	msg += "SC:[round(cost_superconductivity,1)]|"
 	msg += "PN:[round(cost_pipenets,1)]|"
 	msg += "AM:[round(cost_atmos_machinery,1)]"
 	msg += "} "
-	var/active_turfs_len = get_amt_active_turfs()
-	msg += "AT:[active_turfs_len]|"
-	msg += "EG:[get_amt_excited_groups()]|"
+	msg += "TC:{"
+	msg += "AT:[round(cost_turfs,1)]|"
+	msg += "EG:[round(cost_groups,1)]|"
+	msg += "EQ:[round(cost_equalize,1)]|"
+	msg += "PO:[round(cost_post_process,1)]"
+	msg += "}"
+	msg += "TH:[round(thread_wait_ticks,1)]|"
 	msg += "HS:[hotspots.len]|"
 	msg += "PN:[networks.len]|"
 	msg += "HP:[high_pressure_delta.len]|"
-	msg += "AS:[active_super_conductivity.len]|"
+	msg += "HT:[high_pressure_turfs]|"
+	msg += "LT:[low_pressure_turfs]|"
+	msg += "ET:[num_equalize_processed]|"
+	msg += "GT:[num_group_turfs_processed]|"
+	msg += "DF:[max_deferred_airs]|"
 	msg += "GA:[get_amt_gas_mixes()]|"
-	msg += "MG:[get_max_gas_mixes()]|"
-	msg += "AT/MS:[round((cost ? active_turfs_len/cost : 0),0.1)]"
+	msg += "MG:[get_max_gas_mixes()]"
 	return ..()
 
 /datum/controller/subsystem/air/Initialize(timeofday)
-	extools_update_ssair()
 	map_loading = FALSE
 	setup_allturfs()
 	setup_atmos_machinery()
 	setup_pipenets()
 	gas_reactions = init_gas_reactions()
-	extools_update_reactions()
+	auxtools_update_reactions()
 	return ..()
 
 /datum/controller/subsystem/air/proc/extools_update_ssair()
-/datum/controller/subsystem/air/proc/extools_update_reactions()
+
+/datum/controller/subsystem/air/proc/auxtools_update_reactions()
+
+/proc/reset_all_air()
+	SSair.can_fire = 0
+	message_admins("Air reset begun.")
+	for(var/turf/open/T in world)
+		T.Initalize_Atmos(0)
+		CHECK_TICK
+	message_admins("Air reset done.")
+	SSair.can_fire = 1
+
+/datum/controller/subsystem/air/proc/thread_running()
+	return FALSE
+
+/proc/fix_corrupted_atmos()
+
+/datum/admins/proc/fixcorruption()
+	set category = "Debug"
+	set desc="Fixes air that has weird NaNs (-1.#IND and such). Hopefully."
+	set name="Fix Infinite Air"
+	fix_corrupted_atmos()
 
 /datum/controller/subsystem/air/fire(resumed = 0)
 	var/timer = TICK_USAGE_REAL
 
 	if(currentpart == SSAIR_REBUILD_PIPENETS)
+		timer = TICK_USAGE_REAL
 		var/list/pipenet_rebuilds = pipenets_needing_rebuilt
 		for(var/thing in pipenet_rebuilds)
 			var/obj/machinery/atmospherics/AT = thing
@@ -96,13 +142,14 @@ SUBSYSTEM_DEF(air)
 		currentpart = SSAIR_PIPENETS
 
 	if(currentpart == SSAIR_PIPENETS || !resumed)
+		timer = TICK_USAGE_REAL
 		process_pipenets(resumed)
 		cost_pipenets = MC_AVERAGE(cost_pipenets, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
 		currentpart = SSAIR_ATMOSMACHINERY
-
+	// This is only machinery like filters, mixers that don't interact with air
 	if(currentpart == SSAIR_ATMOSMACHINERY)
 		timer = TICK_USAGE_REAL
 		process_atmos_machinery(resumed)
@@ -110,33 +157,6 @@ SUBSYSTEM_DEF(air)
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
-		currentpart = monstermos_enabled ? SSAIR_EQUALIZE : SSAIR_ACTIVETURFS
-
-	if(currentpart == SSAIR_EQUALIZE)
-		timer = TICK_USAGE_REAL
-		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
-		currentpart = SSAIR_EXCITEDGROUPS
-
-	if(currentpart == SSAIR_EXCITEDGROUPS)
-		timer = TICK_USAGE_REAL
-		process_excited_groups(resumed)
-		cost_groups = MC_AVERAGE(cost_groups, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
-		if(state != SS_RUNNING)
-			return
-		resumed = 0
 		currentpart = SSAIR_HIGHPRESSURE
 
 	if(currentpart == SSAIR_HIGHPRESSURE)
@@ -146,6 +166,34 @@ SUBSYSTEM_DEF(air)
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
+		currentpart = SSAIR_FINALIZE_TURFS
+	// This literally just waits for the turf processing thread to finish, doesn't do anything else.
+	// this is necessary cause the next step after this interacts with the air--we get consistency
+	// issues if we don't wait for it, disappearing gases etc.
+	if(currentpart == SSAIR_FINALIZE_TURFS)
+		finish_turf_processing(resumed)
+		if(state != SS_RUNNING)
+			cur_thread_wait_ticks++
+			return
+		resumed = 0
+		thread_wait_ticks = MC_AVERAGE(thread_wait_ticks, cur_thread_wait_ticks)
+		cur_thread_wait_ticks = 0
+		currentpart = SSAIR_DEFERRED_AIRS
+	if(currentpart == SSAIR_DEFERRED_AIRS)
+		timer = TICK_USAGE_REAL
+		process_deferred_airs(resumed)
+		cost_deferred_airs = MC_AVERAGE(cost_deferred_airs, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+		if(state != SS_RUNNING)
+			return
+		resumed = 0
+		currentpart = SSAIR_ATMOSMACHINERY_AIR
+	if(currentpart == SSAIR_ATMOSMACHINERY_AIR)
+		timer = TICK_USAGE_REAL
+		process_atmos_air_machinery(resumed)
+		cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+		if(state != SS_RUNNING)
+			return
+		resumed = 0
 		currentpart = SSAIR_HOTSPOTS
 
 	if(currentpart == SSAIR_HOTSPOTS)
@@ -155,19 +203,58 @@ SUBSYSTEM_DEF(air)
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
-		currentpart = SSAIR_SUPERCONDUCTIVITY
-
-	if(currentpart == SSAIR_SUPERCONDUCTIVITY)
+		currentpart = heat_enabled ? SSAIR_TURF_CONDUCTION : SSAIR_ACTIVETURFS
+	// Heat -- slow and of questionable usefulness. Off by default for this reason. Pretty cool, though.
+	if(currentpart == SSAIR_TURF_CONDUCTION)
 		timer = TICK_USAGE_REAL
-		process_super_conductivity(resumed)
+		if(process_turf_heat(TICK_REMAINING_MS))
+			pause()
 		cost_superconductivity = MC_AVERAGE(cost_superconductivity, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
+		currentpart = SSAIR_ACTIVETURFS
+	// This simply starts the turf thread. It runs in the background until the FINALIZE_TURFS step, at which point it's waited for.
+	// This also happens to do all the commented out stuff below, all in a single separate thread. This is mostly so that the
+	// waiting is consistent.
+	if(currentpart == SSAIR_ACTIVETURFS)
+		timer = TICK_USAGE_REAL
+		process_turfs(resumed)
+		cost_turfs = MC_AVERAGE(cost_turfs, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+		if(state != SS_RUNNING)
+			return
+		resumed = 0
+	/*
+	// Monstermos and/or Putnamos--making large pressure deltas move faster
+	if(currentpart == SSAIR_EQUALIZE)
+		timer = TICK_USAGE_REAL
+		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_EXCITEDGROUPS
+	// Making small pressure deltas equalize immediately so they don't process anymore
+	if(currentpart == SSAIR_EXCITEDGROUPS)
+		timer = TICK_USAGE_REAL
+		process_excited_groups(resumed)
+		cost_groups = MC_AVERAGE(cost_groups, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+		if(state != SS_RUNNING)
+			return
+		resumed = 0
+		currentpart = SSAIR_TURF_POST_PROCESS
+	// Quick multithreaded "should we display/react?" checks followed by finishing those up before the next step
+	if(currentpart == SSAIR_TURF_POST_PROCESS)
+		timer = TICK_USAGE_REAL
+		post_process_turfs(resumed)
+		cost_post_process = MC_AVERAGE(cost_post_process, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+		if(state != SS_RUNNING)
+			return
+		resumed = 0
+		currentpart = SSAIR_HOTSPOTS
+	*/
 	currentpart = SSAIR_REBUILD_PIPENETS
 
-
-
 /datum/controller/subsystem/air/proc/process_pipenets(resumed = 0)
 	if (!resumed)
 		src.currentrun = networks.Copy()
@@ -187,6 +274,31 @@ SUBSYSTEM_DEF(air)
 	if(istype(atmos_machine, /obj/machinery/atmospherics))
 		pipenets_needing_rebuilt += atmos_machine
 
+/datum/controller/subsystem/air/proc/process_deferred_airs(resumed = 0)
+	max_deferred_airs = max(deferred_airs.len,max_deferred_airs)
+	while(deferred_airs.len)
+		var/list/cur_op = deferred_airs[deferred_airs.len]
+		deferred_airs.len--
+		var/datum/gas_mixture/air1
+		var/datum/gas_mixture/air2
+		if(isopenturf(cur_op[1]))
+			var/turf/open/T = cur_op[1]
+			air1 = T.return_air()
+		else
+			air1 = cur_op[1]
+		if(isopenturf(cur_op[2]))
+			var/turf/open/T = cur_op[2]
+			air2 = T.return_air()
+		else
+			air2 = cur_op[2]
+		if(istype(cur_op[3], /datum/callback))
+			var/datum/callback/cb = cur_op[3]
+			cb.Invoke(air1, air2)
+		else
+			air1.transfer_ratio_to(air2, cur_op[3])
+		if(MC_TICK_CHECK)
+			return
+
 /datum/controller/subsystem/air/proc/process_atmos_machinery(resumed = 0)
 	var/seconds = wait * 0.1
 	if (!resumed)
@@ -201,19 +313,22 @@ SUBSYSTEM_DEF(air)
 		if(MC_TICK_CHECK)
 			return
 
-
-/datum/controller/subsystem/air/proc/process_super_conductivity(resumed = 0)
+/datum/controller/subsystem/air/proc/process_atmos_air_machinery(resumed = 0)
+	var/seconds = wait * 0.1
 	if (!resumed)
-		src.currentrun = active_super_conductivity.Copy()
+		src.currentrun = atmos_air_machinery.Copy()
 	//cache for sanic speed (lists are references anyways)
 	var/list/currentrun = src.currentrun
 	while(currentrun.len)
-		var/turf/T = currentrun[currentrun.len]
+		var/obj/machinery/M = currentrun[currentrun.len]
 		currentrun.len--
-		T.super_conduct()
+		if(!M || (M.process_atmos(seconds) == PROCESS_KILL))
+			atmos_air_machinery.Remove(M)
 		if(MC_TICK_CHECK)
 			return
 
+/datum/controller/subsystem/air/proc/process_turf_heat()
+
 /datum/controller/subsystem/air/proc/process_hotspots(resumed = 0)
 	if (!resumed)
 		src.currentrun = hotspots.Copy()
@@ -241,7 +356,7 @@ SUBSYSTEM_DEF(air)
 			return
 
 /datum/controller/subsystem/air/proc/process_turf_equalize(resumed = 0)
-	if(process_turf_equalize_extools(resumed, (Master.current_ticklimit - TICK_USAGE) * 0.01 * world.tick_lag))
+	if(process_turf_equalize_auxtools(resumed,TICK_REMAINING_MS))
 		pause()
 	/*
 	//cache for sanic speed
@@ -260,8 +375,8 @@ SUBSYSTEM_DEF(air)
 			return
 	*/
 
-/datum/controller/subsystem/air/proc/process_active_turfs(resumed = 0)
-	if(process_active_turfs_extools(resumed, (Master.current_ticklimit - TICK_USAGE) * 0.01 * world.tick_lag))
+/datum/controller/subsystem/air/proc/process_turfs(resumed = 0)
+	if(process_turfs_auxtools(resumed,TICK_REMAINING_MS))
 		pause()
 	/*
 	//cache for sanic speed
@@ -280,75 +395,32 @@ SUBSYSTEM_DEF(air)
 	*/
 
 /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))
+	if(process_excited_groups_auxtools(resumed,TICK_REMAINING_MS))
 		pause()
-	/*
-	if (!resumed)
-		src.currentrun = excited_groups.Copy()
-	//cache for sanic speed (lists are references anyways)
-	var/list/currentrun = src.currentrun
-	while(currentrun.len)
-		var/datum/excited_group/EG = currentrun[currentrun.len]
-		currentrun.len--
-		EG.breakdown_cooldown++
-		EG.dismantle_cooldown++
-		if(EG.breakdown_cooldown >= EXCITED_GROUP_BREAKDOWN_CYCLES)
-			EG.self_breakdown()
-		else if(EG.dismantle_cooldown >= EXCITED_GROUP_DISMANTLE_CYCLES)
-			EG.dismantle()
-		if (MC_TICK_CHECK)
-			return
-	*/
 
-/datum/controller/subsystem/air/proc/process_active_turfs_extools()
-/datum/controller/subsystem/air/proc/process_turf_equalize_extools()
-/datum/controller/subsystem/air/proc/process_excited_groups_extools()
-/datum/controller/subsystem/air/proc/get_amt_excited_groups()
-/datum/controller/subsystem/air/proc/get_amt_active_turfs()
+/datum/controller/subsystem/air/proc/finish_turf_processing(resumed = 0)
+	if(finish_turf_processing_auxtools(TICK_REMAINING_MS))
+		pause()
+
+/datum/controller/subsystem/air/proc/post_process_turfs(resumed = 0)
+	if(post_process_turfs_auxtools(resumed,TICK_REMAINING_MS))
+		pause()
+
+/datum/controller/subsystem/air/proc/finish_turf_processing_auxtools()
+/datum/controller/subsystem/air/proc/process_turfs_auxtools()
+/datum/controller/subsystem/air/proc/post_process_turfs_auxtools()
+/datum/controller/subsystem/air/proc/process_turf_equalize_auxtools()
+/datum/controller/subsystem/air/proc/process_excited_groups_auxtools()
 /datum/controller/subsystem/air/proc/get_amt_gas_mixes()
 /datum/controller/subsystem/air/proc/get_max_gas_mixes()
-/datum/controller/subsystem/air/proc/add_to_active_extools()
-/datum/controller/subsystem/air/proc/remove_from_active_extools()
-/datum/controller/subsystem/air/proc/get_active_turfs()
-/datum/controller/subsystem/air/proc/clear_active_turfs()
-
-/datum/controller/subsystem/air/proc/remove_from_active(turf/open/T)
-	remove_from_active_extools(T)
-	#ifdef VISUALIZE_ACTIVE_TURFS
-	T.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#00ff00")
-	#endif
-	if(istype(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.set_excited(TRUE)
-		add_to_active_extools(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)
-	else if(map_loading)
-		if(queued_for_activation)
-			queued_for_activation[T] = T
-		return
-	else
-		T.requires_activation = TRUE
+/datum/controller/subsystem/air/proc/turf_process_time()
+/datum/controller/subsystem/air/proc/heat_process_time()
 
 /datum/controller/subsystem/air/StartLoadingMap()
-	LAZYINITLIST(queued_for_activation)
 	map_loading = TRUE
 
 /datum/controller/subsystem/air/StopLoadingMap()
 	map_loading = FALSE
-	for(var/T in queued_for_activation)
-		add_to_active(T)
-	queued_for_activation.Cut()
 
 /datum/controller/subsystem/air/proc/setup_allturfs()
 	var/list/turfs_to_init = block(locate(1, 1, 1), locate(world.maxx, world.maxy, world.maxz))
@@ -356,7 +428,6 @@ SUBSYSTEM_DEF(air)
 
 	// Clear active turfs - faster than removing every single turf in the world
 	// one-by-one, and Initalize_Atmos only ever adds `src` back in.
-	clear_active_turfs()
 
 	for(var/thing in turfs_to_init)
 		var/turf/T = thing
@@ -364,67 +435,9 @@ SUBSYSTEM_DEF(air)
 			continue
 		T.Initalize_Atmos(times_fired)
 		CHECK_TICK
-	var/starting_ats = get_amt_active_turfs()
-	if(starting_ats)
-		sleep(world.tick_lag)
-		var/timer = world.timeofday
-		log_mapping("There are [starting_ats] active turfs at roundstart caused by a difference of the air between the adjacent turfs. You can see its coordinates using \"Mapping -> Show roundstart AT list\" verb (debug verbs required).")
-		var/list/turfs_to_check = get_active_turfs()
-		for(var/T in turfs_to_check)
-			GLOB.active_turfs_startlist += T
-
-		//now lets clear out these active turfs
-		do
-			var/list/new_turfs_to_check = list()
-			for(var/turf/open/T in turfs_to_check)
-				new_turfs_to_check += T.resolve_active_graph()
-			CHECK_TICK
-			for(var/T in new_turfs_to_check)
-				add_to_active_extools(T)
-			turfs_to_check = new_turfs_to_check
-
-		while (turfs_to_check.len)
-		var/ending_ats = get_amt_active_turfs()
-		/*for(var/thing in excited_groups)
-			var/datum/excited_group/EG = thing
-			//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>")
-		warning(msg)
-
-/turf/open/proc/resolve_active_graph()
-	. = list()
-	/*
-	var/datum/excited_group/EG = excited_group
-	if (blocks_air || !air)
-		return
-	if (!EG)
-		EG = new
-		EG.add_turf(src)
-
-	for (var/turf/open/ET in atmos_adjacent_turfs)
-		if ( ET.blocks_air || !ET.air)
-			continue
-
-		var/ET_EG = ET.excited_group
-		if (ET_EG)
-			if (ET_EG != EG)
-				EG.merge_groups(ET_EG)
-				EG = excited_group //merge_groups() may decide to replace our current EG
-		else
-			EG.add_turf(ET)
-		if (!ET.excited)
-			ET.excited = 1
-			. += ET*/
-
-/turf/open/space/resolve_active_graph()
-	return list()
 
 /datum/controller/subsystem/air/proc/setup_atmos_machinery()
-	for (var/obj/machinery/atmospherics/AM in atmos_machinery)
+	for (var/obj/machinery/atmospherics/AM in atmos_machinery + atmos_air_machinery)
 		AM.atmosinit()
 		CHECK_TICK
 
@@ -432,7 +445,7 @@ SUBSYSTEM_DEF(air)
 //	all atmos machinery has to initalize before the first
 //	pipenet can be built.
 /datum/controller/subsystem/air/proc/setup_pipenets()
-	for (var/obj/machinery/atmospherics/AM in atmos_machinery)
+	for (var/obj/machinery/atmospherics/AM in atmos_machinery + atmos_air_machinery)
 		AM.build_network()
 		CHECK_TICK
 
@@ -460,12 +473,15 @@ SUBSYSTEM_DEF(air)
 
 	return pipe_init_dirs_cache[type]["[dir]"]
 
-/proc/get_extools_benchmarks()
-
 #undef SSAIR_PIPENETS
 #undef SSAIR_ATMOSMACHINERY
-#undef SSAIR_ACTIVETURFS
 #undef SSAIR_EXCITEDGROUPS
 #undef SSAIR_HIGHPRESSURE
 #undef SSAIR_HOTSPOTS
-#undef SSAIR_SUPERCONDUCTIVITY
+#undef SSAIR_TURF_CONDUCTION
+#undef SSAIR_REBUILD_PIPENETS
+#undef SSAIR_EQUALIZE
+#undef SSAIR_ACTIVETURFS
+#undef SSAIR_TURF_POST_PROCESS
+#undef SSAIR_FINALIZE_TURFS
+#undef SSAIR_ATMOSMACHINERY_AIR

code/controllers/subsystem/callback.dm

@@ -0,0 +1,14 @@
+SUBSYSTEM_DEF(callbacks)
+	name = "Auxtools Callbacks"
+	flags = SS_TICKER | SS_NO_INIT
+	wait = 1
+	priority = FIRE_PRIORITY_CALLBACKS
+
+/proc/process_atmos_callbacks()
+	SScallbacks.can_fire = 0
+	SScallbacks.flags |= SS_NO_FIRE
+	CRASH("Auxtools not found! Callback subsystem shutting itself off.")
+
+/datum/controller/subsystem/callbacks/fire()
+	if(process_atmos_callbacks(TICK_REMAINING_MS))
+		pause()

code/controllers/subsystem/shuttle.dm

@@ -740,6 +740,8 @@ SUBSYSTEM_DEF(shuttle)
 
 	preview_shuttle.register(replace)
 
+	preview_shuttle.reset_air()
+
 	// TODO indicate to the user that success happened, rather than just
 	// blanking the modification tab
 	preview_shuttle = null

code/controllers/subsystem/time_track.dm

@@ -31,18 +31,20 @@ SUBSYSTEM_DEF(time_track)
 			"maptick",
 			"num_timers",
 			"air_turf_cost",
+			"air_turf_thread_time",
+			"air_equalize_cost",
+			"air_post_process_cost",
 			"air_eg_cost",
 			"air_highpressure_cost",
 			"air_hotspots_cost",
-			"air_superconductivity_cost",
+			"air_heat_spread_cost",
 			"air_pipenets_cost",
 			"air_rebuilds_cost",
-			"air_turf_count",
-			"air_eg_count",
+			"air_amt_gas_mixes",
+			"air_alloc_gas_mixes",
 			"air_hotspot_count",
 			"air_network_count",
 			"air_delta_count",
-			"air_superconductive_count"
 		)
 	)
 
@@ -81,17 +83,19 @@ SUBSYSTEM_DEF(time_track)
 			MAPTICK_LAST_INTERNAL_TICK_USAGE,
 			length(SStimer.timer_id_dict),
 			SSair.cost_turfs,
+			SSair.turf_process_time(),
+			SSair.cost_equalize,
+			SSair.cost_post_process,
 			SSair.cost_groups,
 			SSair.cost_highpressure,
 			SSair.cost_hotspots,
 			SSair.cost_superconductivity,
 			SSair.cost_pipenets,
 			SSair.cost_rebuilds,
-			SSair.get_active_turfs(), //does not return a list, which is what we want
-			SSair.get_amt_excited_groups(),
+			SSair.get_amt_gas_mixes(),
+			SSair.get_max_gas_mixes(),
 			length(SSair.hotspots),
 			length(SSair.networks),
-			length(SSair.high_pressure_delta),
-			length(SSair.active_super_conductivity)
+			length(SSair.high_pressure_delta)
 		)
 	)