Fix conflict

code/modules/shuttle/arrivals.dm

@@ -0,0 +1,169 @@
+/obj/docking_port/mobile/arrivals
+	name = "arrivals shuttle"
+	id = "arrivals"
+
+	dwidth = 3
+	width = 7
+	height = 15
+	dir = WEST
+	port_angle = 180
+
+	callTime = INFINITY
+	ignitionTime = 50
+
+	roundstart_move = TRUE	//force a call to dockRoundstart
+
+	var/sound_played
+	var/damaged	//too damaged to undock?
+	var/list/areas	//areas in our shuttle
+	var/list/queued_announces	//people coming in that we have to announce
+	var/obj/machinery/requests_console/console
+	var/force_depart = FALSE
+
+/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
+
+	SSshuttle.arrivals = src
+
+	areas = list()
+
+	if(latejoin.len)
+		WARNING("Map contains predefined latejoin spawn points and an arrivals shuttle. Using the arrivals shuttle.")
+
+	latejoin = list()
+	for(var/area/shuttle/arrival/A in sortedAreas)
+		for(var/obj/structure/chair/C in A)
+			latejoin += C
+		if(!console)
+			console = locate(/obj/machinery/requests_console) in A
+		areas += A
+
+/obj/docking_port/mobile/arrivals/dockRoundstart()
+	SSshuttle.generate_transit_dock(src)
+	Launch()
+	timer = world.time
+	check()
+	return TRUE
+
+/obj/docking_port/mobile/arrivals/check()
+	. = ..()
+
+	if(damaged)
+		if(!CheckTurfsPressure())
+			damaged = FALSE
+			if(console)
+				console.say("Repairs complete, launching soon.") 
+		return
+
+//If this proc is high on the profiler add a cooldown to the stuff after this line
+
+	else if(CheckTurfsPressure())
+		damaged = TRUE
+		if(console)
+			console.say("Alert, hull breach detected!")
+		var/obj/machinery/announcement_system/announcer = pick(announcement_systems)
+		announcer.announce("ARRIVALS_BROKEN", channels = list())
+		if(mode != SHUTTLE_CALL)
+			sound_played = FALSE
+			mode = SHUTTLE_IDLE
+		else		
+			SendToStation()
+		return
+
+	var/found_awake = PersonCheck()
+	if(mode == SHUTTLE_CALL)
+		if(found_awake)
+			SendToStation()
+	else if(mode == SHUTTLE_IGNITING)
+		if(found_awake && !force_depart)
+			mode = SHUTTLE_IDLE
+			sound_played = FALSE
+		else if(!sound_played)
+			hyperspace_sound(HYPERSPACE_WARMUP, areas)
+			sound_played = TRUE
+	else if(!found_awake)
+		Launch(FALSE)
+
+/obj/docking_port/mobile/arrivals/proc/CheckTurfsPressure()
+	for(var/I in latejoin)
+		var/turf/open/T = get_turf(I)
+		var/pressure = T.air.return_pressure()
+		if(pressure < HAZARD_LOW_PRESSURE || pressure > HAZARD_HIGH_PRESSURE)	//simple safety check
+			return TRUE
+	return FALSE
+
+/obj/docking_port/mobile/arrivals/proc/PersonCheck()
+	for(var/A in areas)
+		for(var/mob/living/L in A)
+			//don't dock for braindead'
+			if(L.key && L.client && L.stat != DEAD)
+				return TRUE
+	return FALSE
+
+/obj/docking_port/mobile/arrivals/proc/SendToStation()
+	var/dockTime = config.arrivals_shuttle_dock_window
+	if(mode == SHUTTLE_CALL && timeLeft(1) > dockTime)
+		if(console)
+			console.say(damaged ? "Initiating emergency docking for repairs!" : "Now approaching: [SSmapping.config.map_name].")
+		hyperspace_sound(HYPERSPACE_LAUNCH, areas)	//for the new guy
+		setTimer(dockTime)
+
+/obj/docking_port/mobile/arrivals/dock(obj/docking_port/stationary/S1, force=FALSE)
+	var/docked = S1 == assigned_transit
+	sound_played = FALSE
+	if(docked)	//about to launch
+		if(!force_depart && PersonCheck())
+			mode = SHUTTLE_IDLE
+			if(console)
+				console.say("Launch cancelled, lifeform dectected on board.")
+			return
+		force_depart = FALSE
+	. = ..()
+	if(!. && !docked && !damaged)
+		console.say("Welcome to your new life, employees!")
+		for(var/L in queued_announces)
+			var/datum/callback/C = L
+			C.Invoke()
+		LAZYCLEARLIST(queued_announces)
+
+/obj/docking_port/mobile/arrivals/check_effects()
+	..()
+	if(!sound_played && timeLeft(1) <= HYPERSPACE_END_TIME)
+		sound_played = TRUE
+		hyperspace_sound(HYPERSPACE_END, areas)
+
+/obj/docking_port/mobile/arrivals/canDock(obj/docking_port/stationary/S)
+	. = ..()
+	if(. == SHUTTLE_ALREADY_DOCKED)
+		. = SHUTTLE_CAN_DOCK
+
+/obj/docking_port/mobile/arrivals/proc/Launch(pickingup)
+	if(mode != SHUTTLE_CALL)
+		if(pickingup)
+			force_depart = TRUE
+		if(console)
+			console.say(pickingup ? "Departing immediately for new employee pickup." : "Shuttle departing.")
+		request(SSshuttle.getDock("arrivals_stationary"))		//we will intentionally never return SHUTTLE_ALREADY_DOCKED
+
+/obj/docking_port/mobile/arrivals/proc/RequireUndocked(mob/user)
+	if(mode == SHUTTLE_CALL || damaged)
+		return
+	
+	Launch(TRUE)
+
+	user << "<span class='notice'>Calling your shuttle. One moment...</span>"
+	while(mode != SHUTTLE_CALL && !damaged)
+		stoplag()
+
+/obj/docking_port/mobile/arrivals/proc/QueueAnnounce(mob, rank)
+	LAZYADD(queued_announces, CALLBACK(GLOBAL_PROC, .proc/AnnounceArrival, mob, rank))

code/modules/shuttle/emergency.dm

@@ -322,8 +322,10 @@
 
 			if(time_left <= 50 && !sound_played) //4 seconds left:REV UP THOSE ENGINES BOYS. - should sync up with the launch
 				sound_played = 1 //Only rev them up once.
-				for(var/area/shuttle/escape/E in world)
-					E << 'sound/effects/hyperspace_begin.ogg'
+				var/list/areas = list()
+				for(var/area/shuttle/escape/E in sortedAreas)
+					areas += E
+				hyperspace_sound(HYPERSPACE_WARMUP, areas)
 
 			if(time_left <= 0 && !SSshuttle.emergencyNoEscape)
 				//move each escape pod (or applicable spaceship) to its corresponding transit dock
@@ -334,8 +336,10 @@
 						M.enterTransit()
 
 				//now move the actual emergency shuttle to its transit dock
-				for(var/area/shuttle/escape/E in world)
-					E << 'sound/effects/hyperspace_progress.ogg'
+				var/list/areas = list()
+				for(var/area/shuttle/escape/E in sortedAreas)
+					areas += E
+				hyperspace_sound(HYPERSPACE_LAUNCH, areas)
 				enterTransit()
 				mode = SHUTTLE_ESCAPE
 				launch_status = ENDGAME_LAUNCHED
@@ -346,10 +350,13 @@
 			SSshuttle.checkHostileEnvironment()
 
 		if(SHUTTLE_ESCAPE)
+			if(sound_played && time_left <= HYPERSPACE_END_TIME)
+				var/list/areas = list()
+				for(var/area/shuttle/escape/E in sortedAreas)
+					areas += E
+				hyperspace_sound(HYPERSPACE_END, areas)
 			if(areaInstance.parallax_movedir && time_left <= PARALLAX_LOOP_TIME)
 				parallax_slowdown()
-				for(var/area/shuttle/escape/E in world)
-					E << 'sound/effects/hyperspace_end.ogg'
 				for(var/A in SSshuttle.mobile)
 					var/obj/docking_port/mobile/M = A
 					if(M.launch_status == ENDGAME_LAUNCHED)

code/modules/shuttle/on_move.dm

@@ -42,6 +42,7 @@
 	shuttledocked = 0
 	for(var/obj/machinery/door/airlock/A in orange(1, src))
 		A.shuttledocked = 0
+		INVOKE_ASYNC(A, /obj/machinery/door/.proc/close)
 	. = ..()
 	shuttledocked =  1
 	for(var/obj/machinery/door/airlock/A in orange(1, src))

code/modules/shuttle/shuttle.dm

@@ -1,5 +1,7 @@
 //use this define to highlight docking port bounding boxes (ONLY FOR DEBUG USE)
-// #define DOCKING_PORT_HIGHLIGHT
+#ifdef TESTING
+#define DOCKING_PORT_HIGHLIGHT
+#endif
 
 //NORTH default dir
 /obj/docking_port
@@ -119,6 +121,7 @@
 	var/turf/T1 = locate(L[3],L[4],z)
 	for(var/turf/T in block(T0,T1))
 		T.color = _color
+		LAZYINITLIST(T.atom_colours)
 		T.maptext = null
 	if(_color)
 		var/turf/T = locate(L[1], L[2], z)
@@ -239,8 +242,7 @@
 
 /obj/docking_port/mobile/Initialize(mapload)
 	..()
-	if(!mapload)
-		return
+
 	var/area/A = get_area(src)
 	if(istype(A, /area/shuttle))
 		areaInstance = A
@@ -312,6 +314,10 @@
 //call the shuttle to destination S
 /obj/docking_port/mobile/proc/request(obj/docking_port/stationary/S)
 	if(!check_dock(S))
+		testing("check_dock failed on request for [src]")
+		return
+	
+	if(mode == SHUTTLE_IGNITING && destination == S)
 		return
 
 	switch(mode)
@@ -709,4 +715,19 @@
 			return S
 	return null
 
+/obj/docking_port/mobile/proc/hyperspace_sound(phase, list/areas)
+	var/s
+	switch(phase)
+		if(HYPERSPACE_WARMUP)
+			s = 'sound/effects/hyperspace_begin.ogg'
+		if(HYPERSPACE_LAUNCH)
+			s = 'sound/effects/hyperspace_progress.ogg'
+		if(HYPERSPACE_END)
+			s = 'sound/effects/hyperspace_end.ogg'
+		else
+			CRASH("Invalid hyperspace sound phase: [phase]")
+	for(var/A in areas)
+		for(var/obj/machinery/door/E in A)	//dumb, I know, but playing it on the engines doesn't do it justice
+			playsound(E, s, 100, FALSE, max(width, height) - world.view)
+
 #undef DOCKING_PORT_HIGHLIGHT