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.

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

Fixes Hijack Dropship launch announcement alarm not turning off - Bwoop is Kil #5025

Merged
merged 20 commits into from
Nov 26, 2023
Merged

Fixes Hijack Dropship launch announcement alarm not turning off - Bwoop is Kil #5025

merged 20 commits into from
Nov 26, 2023

Conversation

hislittlecuzingames
Copy link
Contributor

@hislittlecuzingames hislittlecuzingames commented Nov 24, 2023

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
Queen.Hijack.turns.off.alarm.mp4

Changelog

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 24, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Sound Blast 5 minutes of bass boosted music to our players UI deletes nanoui/html Fix Fix one bug, make ten more labels Nov 24, 2023
@hislittlecuzingames hislittlecuzingames changed the title Dropship launch announcement alarm Fixes Hijack Dropship launch announcement alarm not turning off Nov 24, 2023
…nnouncement-Alarm

# Conflicts:
#	tgui/packages/tgui/interfaces/DropshipFlightControl.tsx
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 24, 2023
removed unnecessary new lines
Copy link
Member

@fira fira left a comment

Choose a reason for hiding this comment

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

BWOOOOMP is kil

@Birdtalon

This comment was marked as off-topic.

@hislittlecuzingames
Copy link
Contributor Author

Bwoop

@hislittlecuzingames hislittlecuzingames changed the title Fixes Hijack Dropship launch announcement alarm not turning off Fixes Hijack Dropship launch announcement alarm not turning off - Bwoop is Kil Nov 25, 2023
@harryob harryob added this pull request to the merge queue Nov 26, 2023
Merged via the queue into cmss13-devs:master with commit 5e2819e Nov 26, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Sound Blast 5 minutes of bass boosted music to our players UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants