1 files changed, 29 insertions, 11 deletions
diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json
index 1961e2b..4c8fc0d 100644
--- a/json/items/gun/9mm.json
+++ b/json/items/gun/9mm.json
@@ -1,10 +1,25 @@
 [
   {
     "id": "usp_9mm",
-    "copy-from": "usp_9mm",
+    "copy-from": "pistol_base",
     "type": "GUN",
     "name": { "str_sp": "H&K USP 9mm" },
-    "weight": "748 g"
+    "description": "A popular pistol, widely used among law enforcement.  Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
+    "weight": "748 g",
+    "volume": "460 ml",
+    "price": 68000,
+    "price_postapoc": 2500,
+    "to_hit": -2,
+    "material": [ "steel", "plastic" ],
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "ranged_damage": { "damage_type": "bullet", "amount": -1 },
+    "dispersion": 400,
+    "durability": 9,
+    "blackpowder_tolerance": 48,
+    "min_cycle_recoil": 450,
+    "magazine_well": "250 ml",
+    "magazines": [ [ "9mm", [ "usp9mag", "usp9mag_10rd", "usp9mag_18rd", "usp9mag_20rd", "usp9mag_32rd" ] ] ]
   },
   {
     "id": "hk_p30_9",
@@ -25,7 +40,16 @@
     "type": "GUN",
     "name": { "str_sp": "H&K MP5A4" },
     "weight": "2540 g",
-    "volume": "1750 ml"
+    "volume": "1750 ml",
+    "magazines": [ [ "9mm", [ "mp5mag", "mp5mag_10rd", "mp5mag_15rd", "mp5mag_20rd", "mp5mag_38rd", "mp5mag_40rd", "mp5bigmag", "mp5mag_100rd" ] ] ]
+  },
+  {
+    "id": "hk_mp5sd",
+    "copy-from": "hk_mp5sd",
+    "type": "GUN",
+    "name": { "str_sp": "H&K MP5SD" },
+    "volume": "2000 ml",
+    "magazines": [ [ "9mm", [ "mp5mag", "mp5mag_10rd", "mp5mag_15rd", "mp5mag_20rd", "mp5mag_38rd", "mp5mag_40rd", "mp5bigmag", "mp5mag_100rd" ] ] ]
   },
   {
     "id": "hk_mp5k",
@@ -33,14 +57,8 @@
     "type": "GUN",
     "name": { "str_sp": "H&K MP5K-PDW" },
     "weight": "2530 g",
-    "volume": "1250 ml"
-  },
-  {
-    "id": "hk_mp5sd",
-    "copy-from": "hk_mp5sd",
-    "type": "GUN",
-    "name": { "str_sp": "H&K MP5SD" },
-    "volume": "2000 ml"
+    "volume": "1250 ml",
+    "magazines": [ [ "9mm", [ "mp5mag", "mp5mag_10rd", "mp5mag_15rd", "mp5mag_20rd", "mp5mag_38rd", "mp5mag_40rd", "mp5bigmag", "mp5mag_100rd" ] ] ]
   },
   {
     "id": "hk_ump9",