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

Balloon Alerts for Gun Safety #5152

Merged
merged 2 commits into from
Dec 7, 2023
Merged

Balloon Alerts for Gun Safety #5152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30e090f
Balloon Alerts for Gun Safety
private-tristan Dec 7, 2023
10f21d4
Merge branch 'master' into balloonalerthelpsafety
private-tristan 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
5 changes: 3 additions & 2 deletions code/modules/projectiles/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,6 +1538,7 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed

if(flags_gun_features & GUN_TRIGGER_SAFETY)
to_chat(user, SPAN_WARNING("The safety is on!"))
gun_user.balloon_alert(gun_user, "safety on")
return
if(active_attachable)
if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
Expand Down Expand Up @@ -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.

👀

//Absolutely SCREAM this at people so they don't get killed by it
to_chat(gun_user, SPAN_HIGHDANGER("Help intent safety is on! Switch to another intent to fire your weapon."))
to_chat(gun_user, SPAN_DANGER("Help intent safety is on! Switch to another intent to fire your weapon."))
gun_user.balloon_alert(gun_user, "help intent safety")
click_empty(gun_user)
return FALSE

Expand Down