Port's TG's Maploader

code/controllers/master.dm

@@ -47,7 +47,7 @@ var/datum/controller/master/Master = new()
 	var/static/restart_clear = 0
 	var/static/restart_timeout = 0
 	var/static/restart_count = 0
-	
+
 	//current tick limit, assigned before running a subsystem.
 	//used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits
 	var/static/current_ticklimit = TICK_LIMIT_RUNNING
@@ -541,15 +541,25 @@ var/datum/controller/master/Master = new()
 	stat("Master Controller:", statclick.update("(TickRate:[Master.processing]) (Iteration:[Master.iteration])"))
 
 /datum/controller/master/StartLoadingMap()
+	if(map_loading)
+		admin_notice("<span class='danger'>Another map is attempting to be loaded before first map released lock.  Delaying.</span>", R_DEBUG)
+	else
+		admin_notice("<span class='danger'>Map is now being built.  Locking.</span>", R_DEBUG)
+
 	//disallow more than one map to load at once, multithreading it will just cause race conditions
 	while(map_loading)
 		stoplag()
 	for(var/S in subsystems)
 		var/datum/controller/subsystem/SS = S
 		SS.StartLoadingMap()
+
+	// ZAS might displace objects as the map loads if an air tick is processed mid-load.
+	air_processing_killed = TRUE
 	map_loading = TRUE
 
 /datum/controller/master/StopLoadingMap(bounds = null)
+	admin_notice("<span class='danger'>Map is finished.  Unlocking.</span>", R_DEBUG)
+	air_processing_killed = FALSE
 	map_loading = FALSE
 	for(var/S in subsystems)
 		var/datum/controller/subsystem/SS = S

code/controllers/subsystems/creation.dm

@@ -0,0 +1,29 @@
+//
+// Creation subsystem, which is responsible for initializing newly created objects.
+//
+SUBSYSTEM_DEF(creation)
+	name = "Creation"
+	priority = 14
+	wait = 5
+//	flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
+	flags = SS_NO_FIRE|SS_NO_INIT
+	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
+
+	var/list/atoms_needing_initialize = list()
+
+	var/map_loading = FALSE
+
+/datum/controller/subsystem/creation/StartLoadingMap()
+	map_loading = TRUE
+
+/datum/controller/subsystem/creation/StopLoadingMap()
+	map_loading = FALSE
+
+/datum/controller/subsystem/creation/proc/initialize_late_atoms()
+	admin_notice("<span class='danger'>Initializing atoms in submap.</span>", R_DEBUG)
+	var/total_atoms = atoms_needing_initialize.len
+	for(var/atom/movable/A in atoms_needing_initialize)
+		if(!QDELETED(A))
+			A.initialize()
+		atoms_needing_initialize -= A
+	admin_notice("<span class='danger'>Initalized [total_atoms] atoms in submap.</span>", R_DEBUG)