Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allows the MOU53 to be stored in the shotgun scabbard. #5705

Merged
merged 2 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/game/objects/items/storage/large_holster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
can_hold = list(
/obj/item/weapon/gun/shotgun/pump,
/obj/item/weapon/gun/shotgun/combat,
/obj/item/weapon/gun/shotgun/double/mou53,
)
has_gamemode_skin = TRUE

Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/shotguns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ can cause issues with ammo types getting mixed up during the burst.
update_attachable(ugl.slot)
stock.hidden = FALSE
stock.Attach(src)
update_attachable(stock.slot)
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" = 11, "stock_y" = 13.)
Expand Down
Loading