diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index 4d94ae05f8c9..cad5458e80e1 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -321,7 +321,10 @@ to_chat(user, "[src]'s screen blinks and says \"Launch command accepted\".") shipwide_ai_announcement("Launch command received. [lifeboat.id == MOBILE_SHUTTLE_LIFEBOAT_PORT ? "Port" : "Starboard"] Lifeboat doors will close in 10 seconds.") addtimer(CALLBACK(lifeboat, TYPE_PROC_REF(/obj/docking_port/mobile/crashable/lifeboat, evac_launch)), 10 SECONDS) + lifeboat.alarm_sound_loop.start() + lifeboat.playing_launch_announcement_alarm = TRUE return + if ("Emergency Launch") launch_initiated = TRUE to_chat(user, "[src]'s screen blinks and says \"Emergency Launch command accepted\".") diff --git a/code/modules/shuttle/shuttles/crashable/lifeboats.dm b/code/modules/shuttle/shuttles/crashable/lifeboats.dm index 11b376563d64..25d1aeb6efb7 100644 --- a/code/modules/shuttle/shuttles/crashable/lifeboats.dm +++ b/code/modules/shuttle/shuttles/crashable/lifeboats.dm @@ -47,6 +47,8 @@ set_mode(SHUTTLE_IGNITING) on_ignition() setTimer(ignitionTime) + alarm_sound_loop.stop() + playing_launch_announcement_alarm = FALSE /obj/docking_port/mobile/crashable/lifeboat/crash_check() . = ..()