From 2062e3610090de55c998b0c8ef8f4b8d3c547448 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sat, 11 Mar 2017 07:50:44 -0500 Subject: [PATCH] Fixes some arrivals shuttle stuff (#24921) * Fixes the arrivals shuttle announcement repeats * Fixes when the landing sound is played --- code/modules/shuttle/arrivals.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 41db431905f..4a1398ea493 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -138,7 +138,7 @@ /obj/docking_port/mobile/arrivals/check_effects() ..() - if(!sound_played && timeLeft(1) <= HYPERSPACE_END_TIME) + if(mode == SHUTTLE_CALL && !sound_played && timeLeft(1) <= HYPERSPACE_END_TIME) sound_played = TRUE hyperspace_sound(HYPERSPACE_END, areas) @@ -148,9 +148,9 @@ . = SHUTTLE_CAN_DOCK /obj/docking_port/mobile/arrivals/proc/Launch(pickingup) - if(mode != SHUTTLE_CALL) - if(pickingup) - force_depart = TRUE + if(pickingup) + force_depart = TRUE + if(mode == SHUTTLE_IDLE) 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