Skip to content

Commit

Permalink
kilo shotgun fix (#3714)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Hello everybody my name is market pliers and today we will be pulling
the plug

## Why It's Good For The Game

fixes #3682

## Changelog

:cl:
fix: the kilo sawnoff shotgun is no longer the private domicile of The
Void
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Theos <[email protected]>
  • Loading branch information
SomeguyManperson authored Nov 8, 2024
1 parent cc22934 commit 710748e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 1 addition & 3 deletions _maps/shuttles/independent/independent_kilo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -662,12 +662,10 @@
dir = 8
},
/obj/item/storage/box/ammo/a12g_rubbershot,
/obj/item/gun/ballistic/shotgun/doublebarrel/presawn{
default_ammo_type = 0
},
/obj/structure/cable/pink{
icon_state = "4-10"
},
/obj/item/gun/ballistic/shotgun/doublebarrel/presawn/empty,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"gs" = (
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/guns/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@ EMPTY_GUN_HELPER(shotgun/doublebarrel)
/obj/item/ammo_box/magazine/internal/shot/dual/lethal,
)

EMPTY_GUN_HELPER(shotgun/doublebarrel/presawn)

/obj/item/gun/ballistic/shotgun/doublebarrel/roumain
name = "HP antique double-barreled shotgun"
desc = "A special-edition shotgun hand-made by Hunter's Pride with a high-quality walnut stock inlaid with brass scrollwork. Shotguns like this are very rare outside of the Saint-Roumain Militia's ranks. Otherwise functionally identical to a common double-barreled shotgun. Chambered in 12g."
Expand Down

0 comments on commit 710748e

Please sign in to comment.