Skip to content

Commit

Permalink
Merge pull request #37748 from LaVeyanFiend/Looks_Like_Mags
Browse files Browse the repository at this point in the history
Add looks_like for magazines
  • Loading branch information
Rivet-the-Zombie authored Feb 9, 2020
2 parents da56791 + f39733d commit 0e870ea
Show file tree
Hide file tree
Showing 37 changed files with 169 additions and 14 deletions.
2 changes: 1 addition & 1 deletion data/json/items/magazine/12mm.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
{
"id": "hk_g80mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "H&K G80 magazine",
"description": "A magazine for H&K G80 railgun which can hold up to 20 ferromagnetic projectiles.",
Expand All @@ -10,7 +11,6 @@
"material": "steel",
"symbol": "#",
"color": "light_gray",
"looks_like": "8x40_50_mag",
"ammo_type": "12mm",
"capacity": 20,
"reliability": 10,
Expand Down
3 changes: 3 additions & 0 deletions data/json/items/magazine/20x60mm.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
{
"id": "20x66_10_mag",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "RMSA10 20x66mm compact magazine",
"description": "A 10 round box magazine for use with the RM228 PDW and RM121 auxiliary shotgun.",
Expand All @@ -18,6 +19,7 @@
},
{
"id": "20x66_20_mag",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "RMSB20 20x66mm magazine",
"description": "A 20 round box magazine for use with the RM20 caseless shotgun.",
Expand All @@ -35,6 +37,7 @@
},
{
"id": "20x66_40_mag",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "RMSB40 20x66mm extended magazine",
"description": "A 40 round box magazine for use with the RM20 caseless shotgun.",
Expand Down
11 changes: 11 additions & 0 deletions data/json/items/magazine/22.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
{
"id": "22_speedloader8",
"looks_like": "38_speedloader",
"type": "MAGAZINE",
"name": ".22 8-round speedloader",
"description": "This speedloader can hold 8 rounds of .22 and quickly reload a compatible revolver.",
Expand All @@ -16,6 +17,7 @@
},
{
"id": "360_200_mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "RMRB200 .22 magazine",
"description": "A 200 round box magazine for use with the RM360 rotary carbine.",
Expand All @@ -33,6 +35,7 @@
},
{
"id": "360_400_mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "RMRD400 .22 drum magazine",
"description": "A 400 round drum magazine for use with the RM360 rotary carbine.",
Expand All @@ -50,6 +53,7 @@
},
{
"id": "a180mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "A-180 magazine",
"description": "An unusually shaped pan magazine for the American-180.",
Expand All @@ -67,6 +71,7 @@
},
{
"id": "marlin_tubeloader",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": ".22 19-round tube loader",
"description": "This is a tube which holds 19 rounds of .22, designed for quick reloading of a compatible rifle with tubular magazine.",
Expand All @@ -82,6 +87,7 @@
},
{
"id": "mosquitomag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "SIG Mosquito magazine",
"description": "A factory specification 10-round magazine for the SIG Mosquito.",
Expand All @@ -98,6 +104,7 @@
},
{
"id": "ruger1022bigmag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "Ruger BX-25 magazine",
"description": "Extended 25-round stick magazine for the Ruger 10/22.",
Expand All @@ -114,6 +121,7 @@
},
{
"id": "ruger1022mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "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.",
Expand All @@ -131,6 +139,7 @@
},
{
"id": "sw22mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "S&W 22A magazine",
"description": "A standard capacity magazine for the popular S&W 22A pistol.",
Expand All @@ -147,6 +156,7 @@
},
{
"id": "j22mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Jennings J-22 magazine",
"description": "A cheap 6-round steel box magazine for the Jennings J-22.",
Expand All @@ -163,6 +173,7 @@
},
{
"id": "wp22mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Walther P22 magazine",
"description": "A 10-round box magazine for the Walther P22.",
Expand Down
10 changes: 10 additions & 0 deletions data/json/items/magazine/223.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
{
"id": "223_speedloader5",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "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.",
Expand All @@ -17,6 +18,7 @@
{
"id": "belt223",
"copy-from": "magazine_belt",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "5.56x45mm ammo belt",
"ammo_type": "223",
Expand All @@ -27,6 +29,7 @@
},
{
"id": "lw223bigmag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "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.",
Expand All @@ -44,6 +47,7 @@
},
{
"id": "lw223mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "LW-32 magazine",
"description": "A 32-round polymer magazine for Leadworks LLC 223 firearms. Lightweight and reliable but somewhat more difficult to reload.",
Expand All @@ -61,6 +65,7 @@
},
{
"id": "ruger5",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "Ruger .223 5-round magazine",
"description": "A compact 5-round magazine used with the Ruger Mini-14 rifle.",
Expand All @@ -77,6 +82,7 @@
},
{
"//": "Used to be a STANAG 10 round, but switched to just be Ruger compatible",
"looks_like": "stanag30",
"id": "stanag10",
"type": "MAGAZINE",
"name": "Ruger .223 10-round magazine",
Expand All @@ -94,6 +100,7 @@
},
{
"id": "ruger30",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "Ruger .223 high-capacity magazine",
"description": "A high capacity magazine for use with the Ruger Mini-14 rifle.",
Expand All @@ -112,6 +119,7 @@
"id": "stanag30",
"type": "MAGAZINE",
"name": "STANAG magazine",
"//": "Tileset whitelist for rifle magazines",
"description": "A standard capacity magazine for use with STANAG compatible rifles.",
"weight": "360 g",
"volume": "500 ml",
Expand All @@ -126,6 +134,7 @@
},
{
"id": "stanag50",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "STANAG drum magazine",
"description": "A 50-round magazine with a bulky green drum for use with STANAG compatible rifles.",
Expand All @@ -145,6 +154,7 @@
},
{
"id": "survivor223mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "STANAG 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 STANAG compatible rifles.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/300.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
{
"id": "m2010mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "M2010 ESR magazine",
"description": "A 5-round box magazine used by M2010 ESR sniper rifle.",
Expand All @@ -10,7 +11,6 @@
"material": "steel",
"symbol": "#",
"color": "light_gray",
"looks_like": "8x40_50_mag",
"ammo_type": "300",
"capacity": 5,
"reliability": 9,
Expand Down
5 changes: 5 additions & 0 deletions data/json/items/magazine/3006.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
{
"id": "3006_clip",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": ".30-06 clip",
"//": "Provisional.",
Expand All @@ -17,6 +18,7 @@
},
{
"id": "blrmag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "Browning BLR magazine",
"description": "A compact 4-round box magazine for the Browning BLR.",
Expand All @@ -33,6 +35,7 @@
},
{
"id": "garandclip",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "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.",
Expand All @@ -50,6 +53,7 @@
},
{
"id": "m1918bigmag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "BAR extended magazine",
"description": "An aftermarket magazine for use with the Browning Automatic Rifle, holds 30 rounds.",
Expand All @@ -67,6 +71,7 @@
},
{
"id": "m1918mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "BAR magazine",
"//": "Compatable magazines made for reproductions exist, and the standard-capacity mags are fairly cheap compared to variants.",
Expand Down
Loading

0 comments on commit 0e870ea

Please sign in to comment.