Merge branch 'master' into development

code/controllers/subsystems/garbage-debug.dm

@@ -800,7 +800,6 @@
 	SearchVar(ntnet_card_uid)
 	SearchVar(ntnet_global)
 	SearchVar(ntnrc_uid)
-	SearchVar(z_levels)
 	SearchVar(BLOOD_VOLUME_SAFE)
 	SearchVar(BLOOD_VOLUME_OKAY)
 	SearchVar(BLOOD_VOLUME_BAD)

code/controllers/subsystems/initialization/atlas.dm

@@ -18,6 +18,10 @@ var/datum/controller/subsystem/atlas/SSatlas
 	var/list/spawn_locations = list()
 
 	var/list/connected_z_cache = list()
+	var/z_levels = 0	// Each bit represents a connection between adjacent levels.  So the first bit means levels 1 and 2 are connected.
+
+/datum/controller/subsystem/atlas/stat_entry()
+	..("W:{X:[world.maxx] Y:[world.maxy] Z:[world.maxz]} ZL:[z_levels]")
 
 /datum/controller/subsystem/atlas/New()
 	NEW_SS_GLOBAL(SSatlas)
@@ -112,6 +116,7 @@ var/datum/controller/subsystem/atlas/SSatlas
 /datum/controller/subsystem/atlas/proc/setup_multiz()
 	for (var/thing in height_markers)
 		var/obj/effect/landmark/map_data/marker = thing
+		log_debug("atlas: setting up Z marker on level [marker.z] with height [marker.height].")
 		marker.setup()
 
 	connected_z_cache.Cut()

code/controllers/subsystems/zcopy.dm

@@ -13,9 +13,9 @@
 	flags = SS_FIRE_IN_LOBBY
 
 	var/list/queued_turfs = list()
-	var/list/qt_idex = 1
+	var/qt_idex = 1
 	var/list/queued_overlays = list()
-	var/list/qo_idex = 1
+	var/qo_idex = 1
 
 	var/list/openspace_overlays = list()
 	var/list/openspace_turfs = list()