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 Ability to turn on and turn off a dropship alarm. (Requires pro… #4858

Merged
merged 14 commits into from
Nov 21, 2023
Merged

Added Ability to turn on and turn off a dropship alarm. (Requires pro… #4858

merged 14 commits into from
Nov 21, 2023

Conversation

hislittlecuzingames
Copy link
Contributor

@hislittlecuzingames hislittlecuzingames commented Nov 6, 2023 •
edited by github-actions bot
Loading

…jecting-looping-sounds branch made 5 November 2023 to work)

#ATTENTION!!!!!
Requires this PR to be approved first to work:
#4857

About the pull request

Makes an alarm the pilots can use on alamo or normandy to tell ground forces "Hey I plan on taking off soon."

Explain why it's good for the game

The ship takeoff sound to taking off is like 7 seconds.
Ground combat is mad intense & people can miss people talking. So having that alarm may make it so people hear that they're leaving before the ship leaves.

Testing Photographs and Procedure

Screenshots & Videos

oh...

Changelog

🆑
add: Launch Announcement Alarm for dropships to notify ground forces of departure.
/:cl:

@github-actions github-actions bot added Sound Blast 5 minutes of bass boosted music to our players UI deletes nanoui/html Feature Feature coder badge labels Nov 6, 2023
@hislittlecuzingames
Copy link
Contributor Author

Also added a sound.
I made that alarm sound. It's from a game I made

https://store.steampowered.com/app/1993730/Holy_Journey_of_Salvation/

Zonespace27
Zonespace27 requested changes Nov 6, 2023
View reviewed changes
code/modules/shuttle/computers/dropship_computer.dm Outdated Show resolved Hide resolved
code/modules/shuttle/computers/dropship_computer.dm Outdated Show resolved Hide resolved
code/modules/shuttle/computers/dropship_computer.dm Outdated Show resolved Hide resolved
code/modules/shuttle/computers/dropship_computer.dm Outdated Show resolved Hide resolved
code/modules/shuttle/computers/dropship_computer.dm Outdated Show resolved Hide resolved
code/modules/shuttle/shuttle.dm Show resolved Hide resolved
tgui/packages/tgui/interfaces/DropshipFlightControl.tsx Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/DropshipFlightControl.tsx Outdated Show resolved Hide resolved
code/datums/looping_sounds/misc_sounds.dm Outdated Show resolved Hide resolved
@Zonespace27 Zonespace27 marked this pull request as draft November 6, 2023 17:59
@BroseidonMOO BroseidonMOO added the Do Not Merge If you merge this PR, I will annihilate you label Nov 9, 2023
@github-actions GitHub Actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Nov 17, 2023
Drulikar
Drulikar requested changes Nov 20, 2023
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stop_launch_announcement_alarm should also be automatically called when the dropship launches (its whatever if the PO wants to be goofy and turn it back on but it'll get old quick)

tgui/packages/tgui/interfaces/DropshipFlightControl.tsx Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/DropshipFlightControl.tsx Outdated Show resolved Hide resolved
code/modules/shuttle/computers/dropship_computer.dm Outdated Show resolved Hide resolved
code/modules/shuttle/shuttle.dm Show resolved Hide resolved
tgui/packages/tgui/interfaces/DropshipFlightControl.tsx Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/DropshipFlightControl.tsx Outdated Show resolved Hide resolved
code/modules/shuttle/shuttle.dm Show resolved Hide resolved
@Drulikar Drulikar removed the Stale beg a maintainer to review your PR label Nov 20, 2023
@Drulikar Drulikar mentioned this pull request Nov 20, 2023
Merged
@Drulikar Drulikar removed the Do Not Merge If you merge this PR, I will annihilate you label Nov 20, 2023
@Drulikar Drulikar marked this pull request as ready for review November 20, 2023 12:44
Drulikar
Drulikar approved these changes Nov 20, 2023
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge after #4857 was squashed worked fine; changes appear to be working fine.

@hislittlecuzingames
Dropship Launch Announcement Alarm
0410f21 
Added restriction and warning about playing the alarm when you're not on a landing pad
@hislittlecuzingames
Copy link
Contributor Author

stop_launch_announcement_alarm should also be automatically called when the dropship launches (its whatever if the PO wants to be goofy and turn it back on but it'll get old quick)

Made some adjustments.

The alarm turns off as soon as you click launch.
I'd prefer if it stopped the alarm as soon as the ship actually took off, but this may be better so players just outside the ship know "hey, get on because we're actually leaving now" in case a couple soldiers want to guard just outside the doors to cover the escape of other marines.

I also restricted the alarm to only be soundable when you are idle or the ship is on the landing pad recharging/refueling.
A warning pops up saying
"The Launch Announcement Alarm is designed to tell people that you're going to take off soon."

I think it's ready for merge, so requesting review.
Let me know if there's anything else to adjust.

@Drulikar Drulikar added this pull request to the merge queue Nov 21, 2023
Merged via the queue into cmss13-devs:master with commit 9c274b6 Nov 21, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 21, 2023
@cm13-github
Automatic changelog for PR #4858 [ci skip]
ef6587e
@MistChristmas
Copy link
Contributor

May want to adjust it so that if queen interacts with the dropship console. The alarm gets disabled. It gets annoying after 3 minutes of it constantly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zonespace27 Zonespace27 Awaiting requested review from Zonespace27

@Drulikar Drulikar Awaiting requested review from Drulikar

Assignees
No one assigned
Labels
Feature Feature coder badge Sound Blast 5 minutes of bass boosted music to our players UI deletes nanoui/html
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@hislittlecuzingames @MistChristmas @Zonespace27 @Drulikar @BroseidonMOO