Merge pull request #2726 from Citadel-Station-13/upstream-merge-30631

[MIRROR] Fixes shuttle lighting issues

code/__DEFINES/subsystems.dm

@@ -56,7 +56,6 @@
 #define INIT_ORDER_TIMER 1
 #define INIT_ORDER_DEFAULT 0
 #define INIT_ORDER_AIR -1
-#define INIT_ORDER_SHUTTLE -2
 #define INIT_ORDER_MINIMAP -3
 #define INIT_ORDER_ASSETS -4
 #define INIT_ORDER_ICON_SMOOTHING -5
@@ -64,6 +63,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_SQUEAK -40
 #define INIT_ORDER_PERSISTENCE -100
 

code/modules/lighting/lighting_turf.dm

@@ -103,12 +103,12 @@
 		reconsider_lights()
 
 /turf/proc/change_area(var/area/old_area, var/area/new_area)
-	if (new_area.dynamic_lighting != old_area.dynamic_lighting)
-		if (new_area.dynamic_lighting)
-			lighting_build_overlay()
-
-		else
-			lighting_clear_overlay()
+	if(SSlighting.initialized)
+		if (new_area.dynamic_lighting != old_area.dynamic_lighting)
+			if (new_area.dynamic_lighting)
+				lighting_build_overlay()
+			else
+				lighting_clear_overlay()
 
 /turf/proc/get_corners()
 	if (!IS_DYNAMIC_LIGHTING(src) && !light_sources)