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 #38336

Merged
merged 1 commit into from
Feb 25, 2020
Merged

Magazine name to object #38336

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
6 changes: 3 additions & 3 deletions data/json/items/magazine/20x60mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "20x66_10_mag",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "RMSA10 20x66mm compact magazine",
"name": { "str": "RMSA10 20x66mm compact magazine" },
"description": "A 10 round box magazine for use with the RM228 PDW and RM121 auxiliary shotgun.",
"weight": "210 g",
"volume": "250 ml",
Expand All @@ -21,7 +21,7 @@
"id": "20x66_20_mag",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "RMSB20 20x66mm magazine",
"name": { "str": "RMSB20 20x66mm magazine" },
"description": "A 20 round box magazine for use with the RM20 caseless shotgun.",
"weight": "280 g",
"volume": "500 ml",
Expand All @@ -39,7 +39,7 @@
"id": "20x66_40_mag",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "RMSB40 20x66mm extended magazine",
"name": { "str": "RMSB40 20x66mm extended magazine" },
"description": "A 40 round box magazine for use with the RM20 caseless shotgun.",
"weight": "280 g",
"volume": "750 ml",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/magazine/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"id": "360_200_mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "RMRB200 .22 magazine",
"name": { "str": "RMRB200 .22 magazine" },
"description": "A 200 round box magazine for use with the RM360 rotary carbine.",
"weight": "360 g",
"volume": "500 ml",
Expand All @@ -37,7 +37,7 @@
"id": "360_400_mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "RMRD400 .22 drum magazine",
"name": { "str": "RMRD400 .22 drum magazine" },
"description": "A 400 round drum magazine for use with the RM360 rotary carbine.",
"weight": "440 g",
"volume": "750 ml",
Expand Down Expand Up @@ -106,7 +106,7 @@
"id": "ruger1022bigmag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "Ruger BX-25 magazine",
"name": { "str": "Ruger BX-25 magazine" },
"description": "Extended 25-round stick magazine for the Ruger 10/22.",
"weight": "180 g",
"volume": "500 ml",
Expand All @@ -123,7 +123,7 @@
"id": "ruger1022mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "Ruger 10/22 rotary magazine",
"name": { "str": "Ruger 10/22 rotary magazine" },
"description": "Removable 10-round rotary magazine for the Ruger 10/22 which allows the magazine to fit flush with the bottom of the stock.",
"weight": "80 g",
"volume": "250 ml",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/magazine/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"id": "ruger5",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "Ruger .223 5-round magazine",
"name": { "str": "Ruger .223 5-round magazine" },
"description": "A compact 5-round magazine used with the Ruger Mini-14 rifle.",
"weight": "60 g",
"volume": "250 ml",
Expand All @@ -85,7 +85,7 @@
"looks_like": "stanag30",
"id": "stanag10",
"type": "MAGAZINE",
"name": "Ruger .223 10-round magazine",
"name": { "str": "Ruger .223 10-round magazine" },
"description": "A compact 10-round magazine used with the Ruger Mini-14 rifle.",
"weight": "100 g",
"volume": "250 ml",
Expand All @@ -102,7 +102,7 @@
"id": "ruger30",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "Ruger .223 high-capacity magazine",
"name": { "str": "Ruger .223 high-capacity magazine" },
"description": "A high capacity magazine for use with the Ruger Mini-14 rifle.",
"weight": "360 g",
"volume": "500 ml",
Expand Down Expand Up @@ -174,7 +174,7 @@
"id": "ruger_makeshiftmag",
"copy-from": "survivor223mag",
"type": "MAGAZINE",
"name": "Ruger makeshift magazine",
"name": { "str": "Ruger 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 the Ruger Mini-14 rifle."
}
]
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 @@ -37,7 +37,7 @@
"id": "rugerlcpmag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Ruger LCP magazine",
"name": { "str": "Ruger LCP magazine" },
"description": "A standard 6-round capacity magazine for the Ruger LCP pistol.",
"weight": "65 g",
"volume": "60ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/magazine/5x50.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "5x50_100_mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "RMFB100 5x50mm extended magazine",
"name": { "str": "RMFB100 5x50mm extended magazine" },
"description": "A 100 round box magazine for use with 5x50mm flechette firearms.",
"weight": "360 g",
"volume": "630ml",
Expand All @@ -21,7 +21,7 @@
"id": "5x50_50_mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "RMFB50 5x50mm magazine",
"name": { "str": "RMFB50 5x50mm magazine" },
"description": "A 50 round box magazine for use with 5x50mm flechette firearms.",
"weight": "240 g",
"volume": "315ml",
Expand Down
14 changes: 7 additions & 7 deletions data/json/items/magazine/8x40mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "8x40_100_mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "RMGB100 8x40mm magazine",
"name": { "str": "RMGB100 8x40mm magazine" },
"description": "A 100 round box magazine for use with Rivtech 8x40mm caseless firearms.",
"weight": "150 g",
"volume": "750 ml",
Expand All @@ -21,7 +21,7 @@
"id": "8x40_10_mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "RMGP10 8x40mm stick magazine",
"name": { "str": "RMGP10 8x40mm stick magazine" },
"description": "A 10 round stick magazine for use with Rivtech 8x40mm caseless firearms.",
"weight": "60 g",
"volume": "250 ml",
Expand All @@ -39,7 +39,7 @@
"id": "8x40_250_mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "RMGD250 8x40mm drum magazine",
"name": { "str": "RMGD250 8x40mm drum magazine" },
"description": "A 250 round drum magazine for use with Rivtech 8x40mm caseless firearms.",
"weight": "340 g",
"volume": "2 L",
Expand All @@ -56,7 +56,7 @@
"id": "8x40_25_mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "RMGP25 8x40mm stick magazine",
"name": { "str": "RMGP25 8x40mm stick magazine" },
"description": "A 25 round stick magazine for use with Rivtech 8x40mm caseless firearms.",
"weight": "90 g",
"volume": "500 ml",
Expand All @@ -74,7 +74,7 @@
"id": "8x40_500_mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "RMGB500 8x40mm drum magazine",
"name": { "str": "RMGB500 8x40mm drum magazine" },
"description": "A 500 round drum magazine for use with Rivtech 8x40mm caseless firearms.",
"weight": "1400 g",
"volume": "4 L",
Expand All @@ -90,7 +90,7 @@
"id": "8x40_50_mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "RMGB50 8x40mm magazine",
"name": { "str": "RMGB50 8x40mm magazine" },
"description": "A 50 round box magazine for use with Rivtech 8x40mm caseless firearms.",
"weight": "110 g",
"volume": "500 ml",
Expand All @@ -108,7 +108,7 @@
"id": "8x40_speedloader5",
"looks_like": "38_speedloader",
"type": "MAGAZINE",
"name": "RMGS5 8x40mm speedloader",
"name": { "str": "RMGS5 8x40mm speedloader" },
"description": "This speedloader, made by Rivtech for use with RM99 revolver, can hold 5 rounds of 8x40mm caseless rounds and quickly reload a compatible revolver.",
"weight": "92 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/magazine/liquid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"id": "rm4502",
"looks_like": "pressurized_tank",
"type": "MAGAZINE",
"name": "RM450-2 fuel canister",
"name": { "str": "RM450-2 fuel canister" },
"description": "A 2L pressurized steel canister with a valve designed for the RM451's feed system.",
"weight": "400 g",
"volume": "2 L",
Expand All @@ -55,7 +55,7 @@
"id": "rm4504",
"looks_like": "pressurized_tank",
"type": "MAGAZINE",
"name": "RM450-4 fuel canister",
"name": { "str": "RM450-4 fuel canister" },
"description": "A 4L pressurized steel canister with a valve designed for the RM451's feed system.",
"weight": "800 g",
"volume": "4 L",
Expand Down