Skip to content

Commit

Permalink
Magazine name to object
Browse files Browse the repository at this point in the history
  • Loading branch information
snipercup committed Feb 25, 2020
1 parent f52fab1 commit 1fde1d1
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions data/json/items/magazine/22.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"id": "mosquitomag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "SIG Mosquito magazine",
"name": { "str": "SIG Mosquito magazine" },
"description": "A factory specification 10-round magazine for the SIG Mosquito.",
"weight": "60 g",
"volume": "250 ml",
Expand Down Expand Up @@ -141,7 +141,7 @@
"id": "sw22mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "S&W 22A magazine",
"name": { "str": "S&W 22A magazine" },
"description": "A standard capacity magazine for the popular S&W 22A pistol.",
"weight": "70 g",
"volume": "250 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/magazine/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
{
"id": "stanag30",
"type": "MAGAZINE",
"name": "STANAG magazine",
"name": { "str": "STANAG magazine" },
"//": "Tileset whitelist for rifle magazines",
"description": "A standard capacity magazine for use with STANAG compatible rifles.",
"weight": "360 g",
Expand All @@ -136,7 +136,7 @@
"id": "stanag50",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "STANAG drum magazine",
"name": { "str": "STANAG drum magazine" },
"description": "A 50-round magazine with a bulky green drum for use with STANAG compatible rifles.",
"weight": "600 g",
"volume": "1 L",
Expand All @@ -156,7 +156,7 @@
"id": "survivor223mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "STANAG makeshift magazine",
"name": { "str": "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.",
"weight": "80 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/magazine/32.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"id": "sigp230mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "SIG P230 magazine",
"name": { "str": "SIG P230 magazine" },
"description": "A factory specification 8-round magazine for the SIG Sauer P230.",
"weight": "70 g",
"volume": "250 ml",
Expand All @@ -37,7 +37,7 @@
"id": "skorpion61mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "Skorpion Vz. 61 magazine",
"name": { "str": "Skorpion Vz. 61 magazine" },
"description": "A standard 20-round magazine for the Skorpion Vz. 61, in .32 ACP.",
"weight": "120 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/380.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"id": "taurus_spectrum_mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Taurus Spectrum magazine",
"name": { "str": "Taurus Spectrum magazine" },
"description": "A compact, 6-round steel box magazine for use with the Taurus Spectrum.",
"weight": "65 g",
"volume": "74 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/40.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"id": "sig40mag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "SIG Pro .40 magazine",
"name": { "str": "SIG Pro .40 magazine" },
"description": "A compact and reliable magazine for use with the SIG Pro .40 pistol.",
"weight": "90 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/magazine/410shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "saiga410mag_10rd",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "Saiga-410 box magazine",
"name": { "str": "Saiga-410 box magazine" },
"description": "A removable plastic box magazine for the Saiga-410 shotgun. Holds 10 shells.",
"weight": "210 g",
"volume": "500 ml",
Expand All @@ -20,7 +20,7 @@
"id": "saiga410mag_30rd",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "Saiga-410 drum magazine",
"name": { "str": "Saiga-410 drum magazine" },
"description": "A removable plastic drum magazine for the Saiga-410 shotgun. Holds 30 shells.",
"weight": "460 g",
"volume": "1 L",
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/magazine/45.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"id": "tdi_mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "TDI Vector magazine",
"name": { "str": "TDI Vector magazine" },
"description": "A 30-round steel box magazine for use with the TDI Vector",
"weight": "210 g",
"volume": "500 ml",
Expand All @@ -89,7 +89,7 @@
"id": "thompson_bigmag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "Thompson extended magazine",
"name": { "str": "Thompson extended magazine" },
"description": "An extended 30-round magazine for the Thompson submachine gun.",
"weight": "255 g",
"volume": "750 ml",
Expand All @@ -107,7 +107,7 @@
"id": "thompson_drum",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "Thompson drum magazine",
"name": { "str": "Thompson drum magazine" },
"description": "A 50-round drum magazine for the Thompson submachine gun. Made famous by gangsters, but the military preferred standard 20 and 30-round magazines due to greater reliability.",
"weight": "500 g",
"volume": "1 L",
Expand All @@ -125,7 +125,7 @@
"id": "thompson_mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "Thompson magazine",
"name": { "str": "Thompson magazine" },
"description": "A standard 20-round magazine for the Thompson submachine gun.",
"weight": "170 g",
"volume": "500 ml",
Expand All @@ -142,7 +142,7 @@
"id": "thompson_makeshiftmag",
"copy-from": "smg_45_mag",
"type": "MAGAZINE",
"name": "Thompson makeshift magazine",
"name": { "str": "Thompson makeshift magazine" },
"description": "An improvised 20-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 Thompson SMG."
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/50.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"id": "tac50mag",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": "TAC-50 magazine",
"name": { "str": "TAC-50 magazine" },
"description": "5-round box magazine for McMillan TAC-50.",
"weight": "730 g",
"volume": "500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/762x25.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"id": "tokarevmag",
"looks_like": "glock17_17",
"type": "MAGAZINE",
"name": "Tokarev TT-33 magazine",
"name": { "str": "Tokarev TT-33 magazine" },
"description": "Standard 8-round magazine for Tokarev TT-33.",
"weight": "56 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/magazine/9mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
"id": "stenmag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "STEN magazine",
"name": { "str": "STEN magazine" },
"description": "A double-column, single-feed 9x19mm magazine used by the STEN submachine gun, based off the magazines for the German MP-28 and later MP-40.",
"weight": "255 g",
"volume": "500 ml",
Expand Down Expand Up @@ -264,7 +264,7 @@
"id": "tec9mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "TEC-9 magazine",
"name": { "str": "TEC-9 magazine" },
"description": "A cheap and somewhat unreliable 32-round steel box magazine for use with the TEC-9 SMG.",
"weight": "220 g",
"volume": "500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/9x18.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"id": "skorpion82mag",
"looks_like": "mp5mag",
"type": "MAGAZINE",
"name": "Skorpion Vz. 82 magazine",
"name": { "str": "Skorpion Vz. 82 magazine" },
"description": "A standard 20-round magazine for the Skorpion Vz. 82, in 9x18mm Makarov.",
"weight": "170 g",
"volume": "500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/magazine/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "saiga10mag",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "Saiga-12 box magazine",
"name": { "str": "Saiga-12 box magazine" },
"description": "A removable plastic magazine for the Saiga-12 shotgun. Holds 10 rounds.",
"weight": "210 g",
"volume": "500 ml",
Expand All @@ -20,7 +20,7 @@
"id": "saiga30mag",
"looks_like": "shotbelt_20",
"type": "MAGAZINE",
"name": "Saiga-12 drum magazine",
"name": { "str": "Saiga-12 drum magazine" },
"description": "A removable plastic magazine for the Saiga-12 shotgun. Holds 30 rounds.",
"weight": "460 g",
"volume": "1 L",
Expand Down

0 comments on commit 1fde1d1

Please sign in to comment.