Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added launch alarm for PR #4976 #5105

Merged
merged 9 commits into from
Dec 7, 2023
Merged

Added launch alarm for PR #4976 #5105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cccd4c9
Added launch alarm for PR #4976
fordmichigan Dec 2, 2023
779a26b
Merge branch 'master' into adding-sound-to-#4976
fordmichigan Dec 2, 2023
66c22a1
Merge branch 'master' into adding-sound-to-#4976
fordmichigan Dec 3, 2023
6f51315
Merge branch 'master' into adding-sound-to-#4976
fordmichigan Dec 3, 2023
7a0c548
Merge branch 'master' into adding-sound-to-#4976
fordmichigan Dec 3, 2023
a284956
Merge branch 'master' into adding-sound-to-#4976
fordmichigan Dec 4, 2023
baf2678
Update code/modules/shuttle/computer.dm
fordmichigan Dec 6, 2023
c406aab
Merge branch 'master' into adding-sound-to-#4976
fordmichigan Dec 7, 2023
4891d79
fixed error
fordmichigan Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/modules/shuttle/computer.dm
View file
Open in desktop
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
View file
Open in desktop
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