Skip to content

Commit

Permalink
M39 arm brace stock disables when dropped (#4655)
Browse files Browse the repository at this point in the history
# About the pull request

If you got delimbed while the brace was locked, the next person to equip
it gets it stuck on their hand
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
It should fix the gun accidentally getting stuck to peoples hands

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: M39 arm brace disables when dropped
/:cl:
  • Loading branch information
BeagleGaming1 authored Oct 13, 2023
1 parent dfb1f5b commit 1c62c62
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,10 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w
if(fire_delay_group && delay_left > 0)
LAZYSET(user.fire_delay_next_fire, src, world.time + delay_left)

for(var/obj/item/attachable/stock/smg/collapsible/brace/current_stock in contents) //SMG armbrace folds to stop it getting stuck on people
if(current_stock.stock_activated)
current_stock.activate_attachment(src, user, turn_off = TRUE)

unwield(user)
set_gun_user(null)

Expand Down

0 comments on commit 1c62c62

Please sign in to comment.