From 5115672f4d72424cd96a074b4bd76d3bf5fafeed Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Thu, 12 Oct 2023 20:52:13 -0400 Subject: [PATCH 1/2] hopefully --- code/modules/projectiles/gun.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index e9ab9aecc3c2..0aa283fcee7b 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -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, TRUE) + unwield(user) set_gun_user(null) From 0937534d9898439b500c7d7dfedc01758375e5c5 Mon Sep 17 00:00:00 2001 From: Beagle <56142455+BeagleGaming1@users.noreply.github.com> Date: Fri, 13 Oct 2023 15:17:17 -0400 Subject: [PATCH 2/2] if you say so --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 0aa283fcee7b..9d16574aa9da 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -526,7 +526,7 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w 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, TRUE) + current_stock.activate_attachment(src, user, turn_off = TRUE) unwield(user) set_gun_user(null)