Merge branch 'master' into upstream-merge-26386

code/modules/shuttle/arrivals.dm

@@ -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()
@@ -177,7 +179,7 @@
 
 	Launch(TRUE)
 
-	user << "<span class='notice'>Calling your shuttle. One moment...</span>"
+	to_chat(user, "<span class='notice'>Calling your shuttle. One moment...</span>")
 	while(mode != SHUTTLE_CALL && !damaged)
 		stoplag()
 

code/modules/shuttle/arrivals.dm.rej

@@ -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()

code/modules/shuttle/emergency.dm

@@ -207,8 +207,17 @@
 
 	. = ..()
 
-/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, coefficient=1, area/signalOrigin, reason, redAlert)
-	var/call_time = SSshuttle.emergencyCallTime * coefficient
+/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signalOrigin, reason, redAlert, set_coefficient=null)
+	if(!isnum(set_coefficient))
+		var/security_num = seclevel2num(get_security_level())
+		switch(security_num)
+			if(SEC_LEVEL_GREEN)
+				set_coefficient = 2
+			if(SEC_LEVEL_BLUE)
+				set_coefficient = 1
+			else
+				set_coefficient = 0.5
+	var/call_time = SSshuttle.emergencyCallTime * set_coefficient
 	switch(mode)
 		// The shuttle can not normally be called while "recalling", so
 		// if this proc is called, it's via admin fiat