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

Balloon Alerts for Gun Safety #5152

Merged
merged 2 commits into from
Dec 7, 2023

Conversation

private-tristan
Copy link
Contributor

@private-tristan private-tristan commented Dec 7, 2023

About the pull request

When attempting to shoot a gun while safety is on (either the gun safety itself or triggering help intent safety) you'll get a balloon alert informing you.
help intent safety is on (will be in lowercase):
image
gun safety toggled on:
image

also decreases the size of the "Help intent safety is on! Switch to another intent to fire your weapon." message to normal size.

Explain why it's good for the game

Reading chat when you're (presumably) in the middle of trying to shoot at a xeno is quite hard, having it as a balloon alert allows you to quickly realize what's happening.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
qol: Gun safety messages now use balloon alerts.
/:cl:

@github-actions github-actions bot added the Quality of Life Make the game harder to play label Dec 7, 2023
@@ -1933,8 +1934,8 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed

if(gun_user.client?.prefs?.toggle_prefs & TOGGLE_HELP_INTENT_SAFETY && (gun_user.a_intent == INTENT_HELP))
if(world.time % 3) // Limits how often this message pops up, saw this somewhere else and thought it was clever
Copy link
Contributor

Choose a reason for hiding this comment

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

👀

@harryob harryob added this pull request to the merge queue Dec 7, 2023
Merged via the queue into cmss13-devs:master with commit 60d25a2 Dec 7, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Quality of Life Make the game harder to play
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants