Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

M39 arm brace stock disables when dropped #4655

Merged
merged 2 commits into from
Oct 13, 2023
Merged

M39 arm brace stock disables when dropped #4655

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5115672
hopefully
BeagleGaming1 Oct 13, 2023
0937534
if you say so
BeagleGaming1 Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/modules/projectiles/gun.dm
View file
Open in desktop
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