From 52c66f7451ece165e5eaf5a4a861ff594ab54033 Mon Sep 17 00:00:00 2001 From: ghostsheet Date: Wed, 26 Jul 2023 23:57:32 +1000 Subject: [PATCH] Gun bugfix --- code/modules/projectiles/gun_attachables.dm | 23 +++++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 001cd9fbe10c..2a77a6ba6a68 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -1315,15 +1315,17 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/hg3712/New() ..() - //it makes stuff much better when two-handed - accuracy_mod = HIT_ACCURACY_MULT_TIER_4 - recoil_mod = -RECOIL_AMOUNT_TIER_4 - scatter_mod = -SCATTER_AMOUNT_TIER_8 - movement_onehanded_acc_penalty_mod = -MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 - //it makes stuff much worse when one handed - accuracy_unwielded_mod = -HIT_ACCURACY_MULT_TIER_3 - recoil_unwielded_mod = RECOIL_AMOUNT_TIER_4 - scatter_unwielded_mod = SCATTER_AMOUNT_TIER_8 + + //HG stock is purely aesthetics, any changes should be done to the gun itself + accuracy_mod = 0 + recoil_mod = 0 + scatter_mod = 0 + movement_onehanded_acc_penalty_mod = 0 + accuracy_unwielded_mod = 0 + recoil_unwielded_mod = 0 + scatter_unwielded_mod = 0 + aim_speed_mod = 0 + wield_delay_mod = WIELD_DELAY_NONE /obj/item/attachable/stock/hg3712/m3717 name = "hg3717 stock" @@ -2323,6 +2325,9 @@ Defined in conflicts.dm of the #defines folder. burn_level = BURN_LEVEL_TIER_5 burn_duration = BURN_TIME_TIER_2 +/obj/item/attachable/attached_gun/flamer/advanced/unique_action(mob/user) + return //No need for volatile mode, it already does high damage by default + /obj/item/attachable/attached_gun/flamer/advanced/integrated name = "integrated flamethrower"