Map generators run early (#11449)

BeeStation · Sep 8, 2024 · 4b1aa7f · 4b1aa7f
1 parent c434327
commit 4b1aa7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
@@ -169,7 +169,7 @@
 #define INIT_ORDER_XKEYSCORE		-10
 #define INIT_ORDER_STICKY_BAN		-10
 #define INIT_ORDER_LIGHTING			-20
-#define INIT_ORDER_SHUTTLE			-21
+#define INIT_ORDER_SHUTTLE			-21 // After atoms have been initialised to prevent mix-ups
 #define INIT_ORDER_ZCOPY			-22 // this should go after lighting and most objects being placed
 #define INIT_ORDER_MINOR_MAPPING	-40
 #define INIT_ORDER_PATH				-50

diff --git a/code/controllers/subsystem/async_map_generator.dm b/code/controllers/subsystem/async_map_generator.dm
@@ -2,6 +2,8 @@ SUBSYSTEM_DEF(async_map_generator)
 	name = "Async Map Generator"
 	wait = 1
 	flags = SS_TICKER | SS_NO_INIT
+	init_stage = INITSTAGE_EARLY
+	// We need to be running while shuttles are loading
 	runlevels = ALL
 
 	/// List of all currently executing generator datums