Merge pull request #578 from Citadel-Station-13/upstream-merge-25981

[MIRROR] Initialize Refactor
2017-04-28 09:29:00 -05:00
parent a4751682f4 085b421348
commit a39b40d879
30 changed files with 434 additions and 211 deletions
@@ -22,20 +22,22 @@
 	var/perma_docked = FALSE	//highlander with RESPAWN??? OH GOD!!!

 /obj/docking_port/mobile/arrivals/Initialize(mapload)
-	if(mapload)
-		return TRUE	//late initialize to make sure the latejoin list is populated

-	preferred_direction = dir

 	if(SSshuttle.arrivals)
 		WARNING("More than one arrivals docking_port placed on map!")
-		qdel(src)
-		return
+
+		return INITIALIZE_HINT_QDEL

 	SSshuttle.arrivals = src

-	. = ..()
+	. = ..()

+	preferred_direction = dir
+	return INITIALIZE_HINT_LATELOAD	//for latejoin list
+
+
+/obj/docking_port/mobile/arrivals/LateInitialize()
 	areas = list()

 	var/list/new_latejoin = list()
@@ -0,0 +1,11 @@
+diff a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm	(rejected hunks)
+@@ -30,6 +30,9 @@
+ 	..()
+ 
+ 	preferred_direction = dir
+	return INITIALIZE_HINT_LATELOAD	//for latejoin list
+
+/obj/docking_port/mobile/arrivals/LateInitialize()
+ 	areas = list()
+ 
+ 	var/list/new_latejoin = list()