6 files changed, 36 insertions, 15 deletions
diff --git a/json/items/magazine/308.json b/json/items/magazine/308.json
index db2d710..71d6967 100644
--- a/json/items/magazine/308.json
+++ b/json/items/magazine/308.json
@@ -37,11 +37,25 @@
     "description": "An improvised 5-round 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 Heckler & Koch HK417 rifle."
   },
   {
+    "id": "g3mag",
+    "copy-from": "g3mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K G3 20-round magazine" },
+    "description": "A standard 20-round box magazine for the Heckler & Koch G3 rifle."
+  },
+  {
+    "id": "g3bigmag",
+    "copy-from": "g3bigmag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K G3 50-round drum magazine" },
+    "description": "A bulky 50-round drum magazine for the Heckler & Koch G3 rifle."
+  },
+  {
     "id": "g3smallmag",
     "looks_like": "g3mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K G3 10 round magazine" },
-    "description": "A compact 10-round aluminum box magazine for the Heckler & Koch G3 rifle.",
+    "name": { "str": "H&K G3 10-round magazine" },
+    "description": "A compact 10-round box magazine for the Heckler & Koch G3 rifle.",
     "weight": "75 g",
     "volume": "250 ml",
     "price": 4500,
@@ -53,5 +67,12 @@
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ],
     "capacity": 10
+  },
+  {
+    "id": "g3_makeshiftmag",
+    "copy-from": "g3_makeshiftmag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K G3 5-round makeshift magazine" },
+    "description": "An improvised 5-round 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 Heckler & Koch G3 rifle."
   }
 ]
diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json
index 80f5c11..a48d946 100644
--- a/json/items/magazine/40.json
+++ b/json/items/magazine/40.json
@@ -3,7 +3,7 @@
     "id": "usp40mag",
     "copy-from": "usp9mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K USP .40 13-round magazine" },
+    "name": { "str": "H&K USP .40 magazine" },
     "description": "A standard 13-round magazine for use with the Heckler & Koch USP .40 handgun.",
     "ammo_type": [ "40" ],
     "capacity": 13
@@ -12,14 +12,14 @@
     "id": "p3040mag",
     "copy-from": "usp40mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K P30 .40 13-round magazine" },
+    "name": { "str": "H&K P30 .40 magazine" },
     "description": "A standard 13-round magazine for use with the Heckler & Koch P30 .40 handgun."
   },
   {
     "id": "ump40mag",
     "copy-from": "ump45mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K UMP40 30-round magazine" },
+    "name": { "str": "H&K UMP40 magazine" },
     "description": "A standard 30-round box magazine for use with the Heckler & Koch UMP40 SMG.",
     "weight": "200 g",
     "ammo_type": [ "40" ],
diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json
index 71ff47a..498bf07 100644
--- a/json/items/magazine/45.json
+++ b/json/items/magazine/45.json
@@ -27,7 +27,7 @@
     "id": "usp45mag",
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": { "str": "H&K USP .45 12-round magazine" },
+    "name": { "str": "H&K USP .45 magazine" },
     "description": "A standard 12-round magazine for use with the Heckler & Koch USP .45 handgun.",
     "weight": "60 g",
     "volume": "250 ml",
@@ -45,7 +45,7 @@
     "id": "hk45mag",
     "copy-from": "usp45mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K HK45 10-round magazine" },
+    "name": { "str": "H&K HK45 magazine" },
     "description": "A standard 10-round magazine for use with the Heckler & Koch HK45 handgun.",
     "capacity": 10
   }
diff --git a/json/items/magazine/473.json b/json/items/magazine/473.json
index 92d902c..0acb848 100644
--- a/json/items/magazine/473.json
+++ b/json/items/magazine/473.json
@@ -3,7 +3,7 @@
     "id": "hk_g11_mag",
     "looks_like": "8x40_50_mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K G11 50-round magazine" },
+    "name": { "str": "H&K G11 magazine" },
     "description": "A standard 50-round box magazine for use with the Heckler & Koch G11 caseless assault rifle.",
     "weight": "100 g",
     "volume": "500 ml",
diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json
index 609585f..9311d24 100644
--- a/json/items/magazine/9mm.json
+++ b/json/items/magazine/9mm.json
@@ -66,7 +66,7 @@
     "id": "p309mag",
     "copy-from": "usp9mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K P30 9x19mm 15-round magazine" },
+    "name": { "str": "H&K P30 9x19mm magazine" },
     "description": "A standard 15-round box magazine for use with the Heckler & Koch P30 9x19mm pistol."
   },
   {
@@ -132,7 +132,7 @@
     "copy-from": "mp5mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K MP5 38-round magazine" },
-    "description": "An expanded-capacity 38-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "description": "An expanded-capacity 38-round curved magazine for use with the Heckler & Koch MP5 SMG.",
     "weight": "266 g",
     "volume": "633 ml",
     "price": 4500,
@@ -144,7 +144,7 @@
     "copy-from": "mp5mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K MP5 20-round magazine" },
-    "description": "A compact 20-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "description": "A compact 20-round curved magazine for use with the Heckler & Koch MP5 SMG.",
     "weight": "128 g",
     "volume": "172 ml",
     "price": 3500,
@@ -156,7 +156,7 @@
     "copy-from": "mp5mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K MP5 15-round magazine" },
-    "description": "A compact 15-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "description": "A compact 15-round curved magazine for use with the Heckler & Koch MP5 SMG.",
     "weight": "96 g",
     "volume": "129 ml",
     "price": 3000,
@@ -168,7 +168,7 @@
     "copy-from": "mp5mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K MP5 10-round magazine" },
-    "description": "A very compact 10-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "description": "A very compact 10-round curved magazine for use with the Heckler & Koch MP5 SMG.",
     "weight": "64 g",
     "volume": "86 ml",
     "price": 2500,
@@ -179,7 +179,7 @@
     "id": "ump9mag",
     "copy-from": "ump45mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K UMP9 30-round magazine" },
+    "name": { "str": "H&K UMP9 magazine" },
     "description": "A standard 30-round curved box magazine for use with the Heckler & Koch UMP9 SMG.",
     "weight": "200 g",
     "ammo_type": [ "9mm" ],
diff --git a/json/items/magazine/shot.json b/json/items/magazine/shot.json
index e930298..1f57f67 100644
--- a/json/items/magazine/shot.json
+++ b/json/items/magazine/shot.json
@@ -3,7 +3,7 @@
     "id": "hk_caws_mag",
     "looks_like": "saiga10mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K CAWS 10-round magazine" },
+    "name": { "str": "H&K CAWS magazine" },
     "description": "A standard 10-round box magazine for the Heckler & Koch CAWS shotgun.",
     "weight": "210 g",
     "volume": "500 ml",