Skip to content

Commit

Permalink
oppsie
Browse files Browse the repository at this point in the history
  • Loading branch information
Diegoflores31 committed Aug 20, 2023
1 parent 3da2624 commit 5f8572c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1080,7 +1080,7 @@ and you're good to go.
if(!(active_attachable.flags_attach_features & ATTACH_PROJECTILE)) //If it's unique projectile, this is where we fire it.
if((active_attachable.current_rounds <= 0) && !(active_attachable.flags_attach_features & ATTACH_IGNORE_EMPTY))
click_empty(user) //If it's empty, let them know.
to_chat(user, SPAN_WARNING("[active_attachable] is empty !"))
to_chat(user, SPAN_WARNING("[active_attachable] is empty!"))
to_chat(user, SPAN_NOTICE("You disable [active_attachable]."))
active_attachable.activate_attachment(src, null, TRUE)
else
Expand Down Expand Up @@ -1504,11 +1504,11 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed
to_chat(user, SPAN_WARNING("The safety is on!"))
return
if(active_attachable)
if(active_attachable && active_attachable.flags_attach_features & ATTACH_PROJECTILE)
if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
if(!(active_attachable.flags_attach_features & ATTACH_WIELD_OVERRIDE) && !(flags_item & WIELDED))
to_chat(user, SPAN_WARNING("You must wield \the [src] to fire \the [active_attachable]!"))
to_chat(user, SPAN_WARNING("You must wield [src] to fire \the [active_attachable]!"))
return
if((flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(flags_item & WIELDED)) //If we're not holding the weapon with both hands when we should.
if((flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(flags_item & WIELDED) && !active_attachable) //If we're not holding the weapon with both hands when we should.
to_chat(user, SPAN_WARNING("You need a more secure grip to fire this weapon!"))
return

Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2261,7 +2261,7 @@ Defined in conflicts.dm of the #defines folder.
var/obj/item/weapon/gun/attached_gun = loc

if(!(attached_gun.flags_item & WIELDED))
to_chat(user, SPAN_WARNING("You must wield \the [attached_gun] to fire \the [src]!"))
to_chat(user, SPAN_WARNING("You must wield [attached_gun] to fire \the [src]!"))
return

if(current_rounds > round_usage_per_tile && ..())
Expand Down Expand Up @@ -2408,7 +2408,7 @@ Defined in conflicts.dm of the #defines folder.
if(!internal_extinguisher)
return
if(!(gun.flags_item & WIELDED))
to_chat(user, SPAN_WARNING("You must wield \the [gun] to fire \the [src]!"))
to_chat(user, SPAN_WARNING("You must wield [gun] to fire \the [src]!"))
return
if(..())
return internal_extinguisher.afterattack(target, user)
Expand Down

0 comments on commit 5f8572c

Please sign in to comment.