Skip to content

Commit

Permalink
Added launch alarm for PR #4976 (#5105)
Browse files Browse the repository at this point in the history
# About the pull request

Adds a looping alarm sound when the lifeboats are launched. This also
uses the function described in PR #4976 to trigger the sound. This is
NOT for adding those features, so wait until that is merged to merge
this PR.

# Explain why it's good for the game

Denies the need to make an announcement warning marines that the
lifeboats are leaving.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


https://youtu.be/L8ia2OKhUUA



</details>


# Changelog
<!-- If you add a name after the ':cl', that name will be used in the
changelog. You must add your CKEY after the CL if your GitHub name
doesn't



match. Maintainers freely reserve the right to remove and add tags
should they deem it appropriate. -->

:cl:alexguinea atticus-rezzer
add: Adds alarm sound for lifeboats when launching
/:cl:

---------

Co-authored-by: zzzmike <[email protected]>
  • Loading branch information
fordmichigan and zzzmike authored Dec 7, 2023
1 parent d3f1bbb commit 1498307
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions code/modules/shuttle/computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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\".")
Expand Down
2 changes: 2 additions & 0 deletions code/modules/shuttle/shuttles/crashable/lifeboats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()
Expand Down

0 comments on commit 1498307

Please sign in to comment.