Skip to content

Commit

Permalink
Resprites Tactical shotgun stock + stock now comes standard on all ta…
Browse files Browse the repository at this point in the history
…ctical shotguns (yes you can remove it) (#4444)

# About the pull request

See title

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

It's there, sitting, unused for years, yes it kinda sucks but the sprite
is good and it makes the shotgun look cooler so we might as well let it
be used

https://i.imgur.com/erbgUaK.png

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl: SpartanBobby, esselnek
add: tactical shotguns now come standard with their stock. Yes you can
remove it if you dont want it
add: new tactical shotgun stock sprite done by esselnek
/:cl:
  • Loading branch information
spartanbobby committed Oct 8, 2023
1 parent 6adfa19 commit 9e1cebb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions code/modules/projectiles/guns/shotguns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,18 @@ can cause issues with ammo types getting mixed up during the burst.

/obj/item/weapon/gun/shotgun/combat/handle_starting_attachment()
..()
var/obj/item/attachable/attached_gun/grenade/G = new(src)
G.flags_attach_features &= ~ATTACH_REMOVABLE
G.hidden = TRUE
G.Attach(src)
update_attachable(G.slot)
var/obj/item/attachable/attached_gun/grenade/ugl = new(src)
var/obj/item/attachable/stock/tactical/stock = new(src)
ugl.flags_attach_features &= ~ATTACH_REMOVABLE
ugl.hidden = TRUE
ugl.Attach(src)
update_attachable(ugl.slot)
stock.hidden = FALSE
stock.Attach(src)
update_attachable(stock.slot)

/obj/item/weapon/gun/shotgun/combat/set_gun_attachment_offsets()
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19,"rail_x" = 10, "rail_y" = 21, "under_x" = 14, "under_y" = 16, "stock_x" = 14, "stock_y" = 16)
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19,"rail_x" = 10, "rail_y" = 21, "under_x" = 14, "under_y" = 16, "stock_x" = 11, "stock_y" = 13.)



Expand Down
Binary file modified icons/obj/items/weapons/guns/attachments/stock.dmi
Binary file not shown.

0 comments on commit 9e1cebb

Please sign in to comment.