Skip to content

Commit

Permalink
Gun bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
ghostsheet committed Jul 26, 2023
1 parent dd643a8 commit 52c66f7
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down

0 comments on commit 52c66f7

Please sign in to comment.