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.

Sign up for GitHub

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

Magazine name to object #38213

Merged
merged 1 commit into from
Feb 22, 2020
Merged

Magazine name to object #38213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/magazine/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
"id": "j22mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Jennings J-22 magazine",
"name": { "str": "Jennings J-22 magazine" },
"description": "A cheap 6-round steel box magazine for the Jennings J-22.",
"weight": "55 g",
"volume": "27ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/magazine/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "223_speedloader5",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "LW-5 speedloader",
"name": { "str": "LW-5 speedloader" },
"description": "This speedloader, made by Leadworks for use with L2037 Backup revolver, can hold 5 rounds of .223 and quickly reload a compatible revolver.",
"weight": "116 g",
"volume": "250 ml",
Expand Down Expand Up @@ -31,7 +31,7 @@
"id": "lw223bigmag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "LW-56 magazine",
"name": { "str": "LW-56 magazine" },
"description": "A 56-round polymer magazine for Leadworks LLC 223 firearms. It's compact design makes it surprisingly easy to store. Lightweight and reliable but somewhat more difficult to reload.",
"weight": "340 g",
"volume": "750 ml",
Expand All @@ -49,7 +49,7 @@
"id": "lw223mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "LW-32 magazine",
"name": { "str": "LW-32 magazine" },
"description": "A 32-round polymer magazine for Leadworks LLC 223 firearms. Lightweight and reliable but somewhat more difficult to reload.",
"weight": "190 g",
"volume": "500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/3006.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"id": "garandclip",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "M1 Garand clip",
"name": { "str": "M1 Garand clip" },
"description": "A light-weight en-bloc clip for use with the M1 Garand that will be ejected after the last round is fired.",
"weight": "30 g",
"volume": "250 ml",
Expand Down
12 changes: 6 additions & 6 deletions data/json/items/magazine/308.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"id": "m14mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "M14 magazine",
"name": { "str": "M14 magazine" },
"description": "A military issue 20-round steel box magazine compatible with M14 pattern rifles.",
"weight": "280 g",
"volume": "500 ml",
Expand All @@ -125,7 +125,7 @@
"id": "m14smallmag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "M14 compact magazine",
"name": { "str": "M14 compact magazine" },
"description": "A compact aftermarket 5-round steel box magazine compatible with M14 pattern rifles. Although it has a low capacity it is easy to store and quick to reload.",
"weight": "60 g",
"volume": "250 ml",
Expand All @@ -143,7 +143,7 @@
"id": "m14_makeshiftmag",
"copy-from": "fal_makeshiftmag",
"type": "MAGAZINE",
"name": "M14 makeshift magazine",
"name": { "str": "M14 makeshift magazine" },
"description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with M14 rifle."
},
{
Expand Down Expand Up @@ -199,7 +199,7 @@
"id": "hk417mag_20rd",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "HK417 magazine",
"name": { "str": "HK417 magazine" },
"description": "A 20 round double stack box magazine for the HK417 rifle.",
"weight": "160 g",
"volume": "500 ml",
Expand All @@ -216,7 +216,7 @@
"id": "hk417mag_10rd",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "HK417 compact magazine",
"name": { "str": "HK417 compact magazine" },
"description": "A 10 round double stack box magazine for the HK417 rifle.",
"weight": "110 g",
"volume": "250 ml",
Expand All @@ -233,7 +233,7 @@
"id": "hk417_makeshiftmag",
"copy-from": "fal_makeshiftmag",
"type": "MAGAZINE",
"name": "HK417 makeshift magazine",
"name": { "str": "HK417 makeshift magazine" },
"description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with HK417 rifle."
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"id": "kp32mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Kel-Tec P32 magazine",
"name": { "str": "Kel-Tec P32 magazine" },
"description": "A standard 7-round steel box magazine for the Kel-Tec P32.",
"weight": "65 g",
"volume": "47ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/380.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "kp3atmag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Kel-Tec P3AT magazine",
"name": { "str": "Kel-Tec P3AT magazine" },
"description": "A standard 6-round steel box magazine for the Kel-Tec P3AT.",
"weight": "60 g",
"volume": "50ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/38super.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"id": "m1911mag_10rd_38super",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "M1911 .38 Super magazine",
"name": { "str": "M1911 .38 Super magazine" },
"description": "A compact single stack box magazine for the M1911.",
"weight": "80 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/40.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"id": "bhp40mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Hi-Power .40 S&W magazine",
"name": { "str": "Hi-Power .40 S&W magazine" },
"description": "A 10 round steel box magazine for the Browning Hi-Power .40 S&W.",
"weight": "120 g",
"volume": "185 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/magazine/45.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "m1911bigmag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "M1911 extended magazine",
"name": { "str": "M1911 extended magazine" },
"description": "An extended 10-round magazine for use with the M1911 handgun.",
"weight": "100 g",
"volume": "500 ml",
Expand All @@ -20,7 +20,7 @@
"id": "m1911mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "M1911 magazine",
"name": { "str": "M1911 magazine" },
"description": "A military issue 7-round magazine for use with the M1911 handgun.",
"weight": "70 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/460.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"id": "lw12mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "LW-12 magazine",
"name": { "str": "LW-12 magazine" },
"description": "A 12-round polymer magazine for use with the Leadworks LLC L39-460 and L39B-45 pistols.",
"weight": "60 g",
"volume": "250 ml",
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/magazine/9mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "9mm_speedloader7",
"looks_like": "38_speedloader",
"type": "MAGAZINE",
"name": "LW-7 speedloader",
"name": { "str": "LW-7 speedloader" },
"description": "This speedloader, made by Leadworks for use with L2032 Lookout revolver, can hold 7 rounds of 9x19mm and quickly reload a compatible revolver.",
"weight": "72 g",
"volume": "250 ml",
Expand Down Expand Up @@ -141,7 +141,7 @@
"id": "lw21mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "LW-21 magazine",
"name": { "str": "LW-21 magazine" },
"description": "A 21-round polymer magazine for Leadworks LLC 9x19mm firearms. Lightweight and reliable but somewhat more difficult to reload.",
"weight": "105 g",
"volume": "500 ml",
Expand Down Expand Up @@ -315,7 +315,7 @@
"id": "kpf9mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Kel-Tec PF-9 magazine",
"name": { "str": "Kel-Tec PF-9 magazine" },
"description": "A standard 7-round steel box magazine for the Kel-Tec PF-9.",
"weight": "60 g",
"volume": "60ml",
Expand Down Expand Up @@ -350,7 +350,7 @@
"id": "bhp9mag_13rd",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Hi-Power 9x19mm 13-round magazine",
"name": { "str": "Hi-Power 9x19mm 13-round magazine" },
"description": "A 13 round steel box magazine for the Browning Hi-Power 9x19mm.",
"weight": "100 g",
"volume": "191 ml",
Expand All @@ -367,7 +367,7 @@
"id": "bhp9mag_15rd",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Hi-Power 9x19mm 15-round magazine",
"name": { "str": "Hi-Power 9x19mm 15-round magazine" },
"description": "A 15 round steel box magazine for the Browning Hi-Power 9x19mm.",
"weight": "100 g",
"volume": "191 ml",
Expand Down