Merge upstream

code/controllers/subsystem/air.dm

@@ -240,6 +240,9 @@ SUBSYSTEM_DEF(air)
 	active_turfs -= 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)
@@ -247,6 +250,9 @@ SUBSYSTEM_DEF(air)
 
 /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 = 1
 		active_turfs |= T
 		if(currentpart == SSAIR_ACTIVETURFS)

code/controllers/subsystem/atoms.dm

@@ -10,6 +10,8 @@ SUBSYSTEM_DEF(atoms)
 	var/initialized = INITIALIZATION_INSSATOMS
 	var/old_initialized
 
+	var/list/late_loaders
+
 /datum/controller/subsystem/atoms/Initialize(timeofday)
 	fire_overlay.appearance_flags = RESET_COLOR
 	setupGenetics() //to set the mutations' place in structural enzymes, so monkey.initialize() knows where to put the monkey mutation.
@@ -21,8 +23,6 @@ SUBSYSTEM_DEF(atoms)
 	if(initialized == INITIALIZATION_INSSATOMS)
 		return
 
-	var/list/late_loaders
-
 	initialized = INITIALIZATION_INNEW_MAPLOAD
 
 	var/static/list/NewQdelList = list()
@@ -68,15 +68,15 @@ SUBSYSTEM_DEF(atoms)
 
 	initialized = INITIALIZATION_INNEW_REGULAR
 
-	if(late_loaders)
-		for(var/I in late_loaders)
-			var/atom/A = I
-			var/start_tick = world.time
-			A.Initialize(FALSE)
-			if(start_tick != world.time)
-				WARNING("[A]: [A.type] slept during it's Initialize!")
-			CHECK_TICK
-		testing("Late-initialized [late_loaders.len] atoms")
+	for(var/I in late_loaders)
+		var/atom/A = I
+		var/start_tick = world.time
+		A.Initialize(FALSE)
+		if(start_tick != world.time)
+			WARNING("[A]: [A.type] slept during it's Initialize!")
+		CHECK_TICK
+	testing("Late-initialized [LAZYLEN(late_loaders)] atoms")
+	LAZYCLEARLIST(late_loaders)
 
 /datum/controller/subsystem/atoms/proc/map_loader_begin()
 	old_initialized = initialized

code/controllers/subsystem/mapping.dm

@@ -116,6 +116,7 @@ SUBSYSTEM_DEF(mapping)
 	INIT_ANNOUNCE("Loading [config.map_name]...")
 	TryLoadZ(config.GetFullMapPath(), FailedZs, ZLEVEL_STATION)
 	INIT_ANNOUNCE("Loaded station in [(REALTIMEOFDAY - start_time)/10]s!")
+	feedback_add_details("map_name", config.map_name)
 
 	if(config.minetype != "lavaland")
 		INIT_ANNOUNCE("WARNING: A map without lavaland set as it's minetype was loaded! This is being ignored! Update the maploader code!")

code/controllers/subsystem/processing/flightpacks.dm

@@ -5,3 +5,22 @@ PROCESSING_SUBSYSTEM_DEF(flightpacks)
 	wait = 2
 	stat_tag = "FM"
 	flags = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING
+
+	var/flightsuit_processing = FLIGHTSUIT_PROCESSING_FULL
+
+/datum/controller/subsystem/processing/flightpacks/Initialize()
+	sync_flightsuit_processing()
+
+/datum/controller/subsystem/processing/flightpacks/vv_edit_var(var_name, var_value)
+	..()
+	switch(var_name)
+		if("flightsuit_processing")
+			sync_flightsuit_processing()
+
+/datum/controller/subsystem/processing/flightpacks/proc/sync_flightsuit_processing()
+	for(var/obj/item/device/flightpack/FP in processing)
+		FP.sync_processing(src)
+	if(flightsuit_processing == FLIGHTSUIT_PROCESSING_NONE)	//Don't even bother firing.
+		can_fire = FALSE
+	else
+		can_fire = TRUE