TGS Test Merge (#6813)

citadel.dme

@@ -16,7 +16,6 @@
 #include "_mapload\_basemap.dm"
 #include "code\___compile_options.dm"
 #include "code\__byond_version_compat.dm"
-#include "code\__global_init.dm"
 #include "code\_macros.dm"
 #include "code\global.dm"
 #include "code\__DEFINES\_bitfields.dm"
@@ -1018,6 +1017,7 @@
 #include "code\game\area\asteroid_areas.dm"
 #include "code\game\area\Away Mission areas.dm"
 #include "code\game\area\darkspace_area.dm"
+#include "code\game\area\endeavour_areas.dm"
 #include "code\game\area\misc.dm"
 #include "code\game\area\Off Station Areas.dm"
 #include "code\game\area\rift_areas.dm"
@@ -1026,7 +1026,6 @@
 #include "code\game\area\Space Station 13 areas.dm"
 #include "code\game\area\ss13_deprecated_areas.dm"
 #include "code\game\area\Tether_areas.dm"
-#include "code\game\area\endeavour_areas.dm"
 #include "code\game\area\station\exporation.dm"
 #include "code\game\area\station\security_areas.dm"
 #include "code\game\atoms\action_feedback.dm"
@@ -5277,6 +5276,16 @@
 #include "interface\skin.dmf"
 #include "interface\menus\_menus.dm"
 #include "interface\menus\main.dm"
+#include "maps\endeavour\endeavour-areas.dm"
+#include "maps\endeavour\endeavour-overmap.dm"
+#include "maps\endeavour\endeavour-sectors.dm"
+#include "maps\endeavour\endeavour-shuttle-landmarks.dm"
+#include "maps\endeavour\endeavour-turbolifts.dm"
+#include "maps\endeavour\endeavour.dm"
+#include "maps\endeavour\engines.dm"
+#include "maps\endeavour\sectors.dm"
+#include "maps\endeavour\shuttles.dm"
+#include "maps\endeavour\telecomms.dm"
 #include "maps\euthenia\euthenia.dm"
 #include "maps\generic\death_triggers.dm"
 #include "maps\generic\map_data.dm"
@@ -5344,14 +5353,8 @@
 #include "maps\triumph\triumph-shuttle-landmarks.dm"
 #include "maps\triumph\triumph-turbolifts.dm"
 #include "maps\triumph\triumph.dm"
-#include "maps\endeavour\engines.dm"
-#include "maps\endeavour\sectors.dm"
-#include "maps\endeavour\shuttles.dm"
-#include "maps\endeavour\telecomms.dm"
-#include "maps\endeavour\endeavour-areas.dm"
-#include "maps\endeavour\endeavour-overmap.dm"
-#include "maps\endeavour\endeavour-sectors.dm"
-#include "maps\endeavour\endeavour-shuttle-landmarks.dm"
-#include "maps\endeavour\endeavour-turbolifts.dm"
-#include "maps\endeavour\endeavour.dm"
 // END_INCLUDE
+
+// SPECIAL - DO NOT TOUCH
+#include "code\__global_init.dm"
+// END SPECIAL

code/__global_init.dm

@@ -1,5 +1,6 @@
 /**
- * DO NOT MOVE THIS FILE. EVER. THIS ABSOLUTELY MUST GO RIGHT AFTER COMPLE OPTIONS, BECAUSE WE **NEED** THESE DATUMS TO INIT BEFORE **ANY** OTHER IMPLICIT INIT PROCS!
+ * * This file is special. You may notice it's not ticked. Do not touch that.
+ * * This file is actually compiled in at the end of the compile order by a specially inserted line.
  */
 
 //! Log shunting - ENSURE shunt_redirected_log() IS CALLED IMMEDIATELY AFTER LOGGING IS SET UP!
@@ -34,6 +35,8 @@ var/datum/world_debug_enabler/world_debug_enabler = new
 		LIBCALL(debug_server, "auxtools_init")()
 		enable_debugging()
 		debug_loop()
+	// just here so we can check if this is working by breakpointing this
+	pass()
 
 /datum/world_debug_enabler/proc/debug_loop()
 	set waitfor = FALSE