Skip to content

Commit

Permalink
copied over (#12895)
Browse files Browse the repository at this point in the history
Co-authored-by: Yellow-Mushroom <[email protected]>
  • Loading branch information
ClosetedSkeletonGH and Yellow-Mushroom authored May 6, 2023
1 parent 4095296 commit 966fef2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
8 changes: 7 additions & 1 deletion code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1014,10 +1014,16 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.

/obj/item/attachable/stock/t39stock
name = "\improper SH-39 stock"
desc = "A specialized stock for the SH-35."
desc = "A specialized stock for the SH-39."
icon_state = "t39stock"
pixel_shift_x = 32
pixel_shift_y = 13
size_mod = 1
flags_attach_features = ATTACH_REMOVABLE
wield_delay_mod = 0.2 SECONDS
accuracy_mod = 0.15
recoil_mod = -2
scatter_mod = -2

/obj/item/attachable/stock/t60stock
name = "MG-60 stock"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/projectiles/guns/shotguns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@
starting_attachment_types = list(/obj/item/attachable/stock/t39stock)

fire_delay = 14 //one shot every 1.4 seconds.
accuracy_mult = 1.20
accuracy_mult = 1.05
accuracy_mult_unwielded = 0.65
scatter = 3
scatter_unwielded = 12
damage_mult = 0.7 //30% less damage. Faster firerate.
recoil = 0 //It has a stock on the sprite.
recoil_unwielded = 2
wield_delay = 1 SECONDS
recoil = 2
recoil_unwielded = 4
wield_delay = 0.8 SECONDS
akimbo_additional_delay = 0.9

/obj/item/weapon/gun/shotgun/combat/masterkey
Expand Down
Binary file modified icons/Marine/gun64.dmi
Binary file not shown.
Binary file modified icons/Marine/marine-weapons.dmi
Binary file not shown.

0 comments on commit 966fef2

Please sign in to comment.