Skip to content

Commit

Permalink
Balloon Alerts for Gun Safety
Browse files Browse the repository at this point in the history
  • Loading branch information
private-tristan committed Dec 7, 2023
1 parent 280f179 commit 30e090f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions code/modules/projectiles/gun.dm
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
//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

0 comments on commit 30e090f

Please sign in to comment.