From 5e2819ebb3f34849c3184a34f19363ce14c02901 Mon Sep 17 00:00:00 2001 From: hislittlecuzingames <142365554+hislittlecuzingames@users.noreply.github.com> Date: Sun, 26 Nov 2023 14:27:12 -0500 Subject: [PATCH] Fixes Hijack Dropship launch announcement alarm not turning off - Bwoop is Kil (#5025) # About the pull request Turns the launch alarm off on dropships when the queen hijacks a ship. # Explain why it's good for the game Players found the alarm annoying when the ship was hijacked with the alarm sounding and they couldn't turn it off. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty
Happens in the first few seconds so you don't have to listen to youtube and alarms and sensory overload https://github.com/cmss13-devs/cmss13/assets/142365554/12485a52-a887-4ce0-825d-bb0b33e7e98d
# Changelog :cl: fix: Disables launch announcment alarm if it's sounding when queen hijacks /:cl: --------- Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/shuttle/computers/dropship_computer.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index d11c39ec1734..6774d81e590d 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -270,6 +270,9 @@ hijack.fire() GLOB.alt_ctrl_disabled = TRUE + dropship.alarm_sound_loop.stop() + dropship.playing_launch_announcement_alarm = FALSE + marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg', logging = ARES_LOG_SECURITY) log_ares_flight("Unknown", "Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.")