Skip to content

Commit

Permalink
way better alternative so it applies to more things
Browse files Browse the repository at this point in the history
  • Loading branch information
rintherat committed Jan 6, 2025
1 parent 28b73bf commit 39dcf41
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
8 changes: 8 additions & 0 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1621,6 +1621,14 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed
to_chat(user, SPAN_WARNING("The safety is on!"))
gun_user.balloon_alert(gun_user, "safety on")
return

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
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

if(active_attachable)
if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
if(!(active_attachable.flags_attach_features & ATTACH_WIELD_OVERRIDE) && !(flags_item & WIELDED))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,7 @@
to_chat(user, SPAN_WARNING("\The [name]'s safe-area accident inhibitor prevents you from firing!"))
msg_admin_niche("[key_name(user)] attempted to prime \a [G.name] in [get_area(src)] [ADMIN_JMP(src.loc)]")
return FALSE
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
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


/obj/item/weapon/gun/launcher/grenade/afterattack(atom/target, mob/user, flag) //Not actually after the attack. After click, more like.
if(able_to_fire(user))
Expand Down

0 comments on commit 39dcf41

Please sign in to comment.