Skip to content

Commit

Permalink
Fixes Hijack Dropship launch announcement alarm not turning off - Bwo…
Browse files Browse the repository at this point in the history
…op 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
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty 

<details>
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

</details>


# Changelog

:cl:
fix: Disables launch announcment alarm if it's sounding when queen
hijacks
/:cl:

---------

Co-authored-by: Drathek <[email protected]>
  • Loading branch information
hislittlecuzingames and Drulikar committed Nov 26, 2023
1 parent 28d3f59 commit 5e2819e
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions code/modules/shuttle/computers/dropship_computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.")

Expand Down

0 comments on commit 5e2819e

Please sign in to comment.