From 30e090fdf71f5dd3468238f0d1301e71e823e2e5 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Wed, 6 Dec 2023 20:12:06 -0500 Subject: [PATCH] Balloon Alerts for Gun Safety --- code/modules/projectiles/gun.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 8d7ab1532ade..c41a57f53527 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -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) @@ -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