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

fix: Specific guns now have correct copy-from to fix their weapon categories. #4604

Merged
merged 1 commit into from
May 8, 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
2 changes: 1 addition & 1 deletion data/json/items/gun/22.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
{
"id": "moss_brownie",
"copy-from": "pistol_base",
"copy-from": "pistol_1shot",
"type": "GUN",
"name": { "str_sp": "Mossberg Brownie" },
"description": "The first gun produced by O.F. Mossberg & Sons. A small pocket pistol, marketed to trappers during the early 20th century. Its four barrels can accept .22 Short and .22 LR cartridges.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/762.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
{
"id": "sks",
"copy-from": "rifle_manual",
"copy-from": "rifle_semi",
"type": "GUN",
"name": { "str": "SKS" },
"description": "Developed by the Soviets in 1945, this rifle was quickly replaced by the full-auto AK47. However, due to its superb accuracy, low recoil and deployable integrated bayonet, this gun maintains immense popularity.",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
},
{
"id": "pipe_shotgun",
"copy-from": "shotgun_base",
"copy-from": "shotgun_1shot",
"type": "GUN",
"name": { "str": "pipe shotgun" },
"description": "A home-made shotgun. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
Expand Down Expand Up @@ -670,7 +670,7 @@
},
{
"id": "winchester_1897",
"copy-from": "shotgun_base",
"copy-from": "shotgun_pump",
"type": "GUN",
"name": { "str": "M1897 Trench Gun" },
"description": "The Winchester 1897 was one of the first commercially successful pump action shotguns. In its 'trench' configuration it has become a heavily romanticized American icon of World War 1. With its barrel shroud, bayonet lug and 17 inch bayonet, this shotgun is undeniably fearsome in appearance. There aren't any more trenches to clear, so the next zombie infested town will have to suffice.",
Expand Down
Loading