I know now why you cry: Shotgun additions

data/json/itemgroups/gunmod.json

@@ -34,6 +34,7 @@
       [ "pistol_bayonet", 10 ],
       [ "pistol_scope", 10 ],
       [ "pistol_stock", 10 ],
+      [ "arredondo_chute", 20 ],
       [ "rail_laser_sight", 40 ],
       [ "red_dot_sight", 70 ],
       [ "recoil_stock", 60 ],

data/json/itemgroups/guns.json

@@ -292,40 +292,53 @@
     "id": "guns_shotgun_common",
     "//": "Shotguns commonly owned by citizens and found in many locations.",
     "items": [
-      { "item": "mossberg_500", "prob": 50, "charges-min": 0, "charges-max": 8 },
-      { "item": "remington_870", "prob": 100, "charges-min": 0, "charges-max": 6 },
+      { "item": "mossberg_500", "prob": 33, "charges-min": 0, "charges-max": 8 },
+      { "item": "remington_870", "prob": 35, "charges-min": 0, "charges-max": 6 },
+      { "item": "mossberg_500_security", "prob": 17, "charges-min": 0, "charges-max": 8 },
+      { "item": "remington_870_express", "prob": 18, "charges-min": 0, "charges-max": 6 },
+      { "item": "browning_a5", "prob": 14, "charges-min": 0, "charges-max": 6 },
+      { "item": "mossberg_930", "prob": 15, "charges-min": 0, "charges-max": 6 },
       { "item": "shotgun_d", "prob": 30, "charges-min": 0, "charges-max": 2 },
       { "item": "shotgun_s", "prob": 30 }
     ]
   },
   {
     "type": "item_group",
     "id": "guns_shotgun_rare",
-    "//": "Less common shotguns including those only used by police/paramilitary forces.",
+    "//": "Uncommon or rare shotguns in civilian posession.",
     "items": [
       { "item": "ksg", "prob": 50, "charges-min": 0, "charges-max": 7 },
-      { "item": "m1014", "prob": 80, "charges-min": 0, "charges-max": 8 },
-      { "item": "rm120c", "prob": 30, "charges-min": 0, "charges-max": 5 },
-      { "item": "rm228", "prob": 30, "charges-min": 0, "charges-max": 10 },
-      { "item": "l_def_12", "prob": 20, "charges-min": 0, "charges-max": 8 },
-      { "item": "saiga_12", "prob": 50, "charges-min": 0, "charges-max": 10 },
-      { "item": "saiga_410", "prob": 40, "charges-min": 0, "charges-max": 10 }
+      { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
+      { "item": "tavor_12", "prob": 5, "charges-min": 0, "charges-max": 16 },
+      { "item": "SPAS_12", "prob": 2, "charges-min": 0, "charges-max": 9 },
+      { "item": "winchester_1887", "prob": 10, "charges-min": 0, "charges-max": 7 },
+      { "item": "winchester_1897", "prob": 7, "charges-min": 0, "charges-max": 6 },
+      { "item": "rm120c", "prob": 5, "charges-min": 0, "charges-max": 5 },
+      { "item": "rm228", "prob": 5, "charges-min": 0, "charges-max": 10 }
     ]
   },
   {
     "type": "item_group",
     "id": "guns_shotgun_milspec",
-    "//": "Military specification shotguns only ever found at military sites.",
+    "//": "Military shotguns currently in service.",
     "items": [
       { "item": "rm20", "prob": 20, "charges-min": 0, "charges-max": 20 },
+      { "item": "remington_870_express", "prob": 50, "charges-min": 0, "charges-max": 6 },
+      { "item": "remington_870_breacher", "prob": 20, "charges-min": 0, "charges-max": 6 },
+      { "item": "remington_590", "prob": 50, "charges-min": 0, "charges-max": 6 },
       { "item": "m1014", "prob": 100, "charges-min": 0, "charges-max": 8 }
     ]
   },
   {
     "type": "item_group",
     "id": "guns_shotgun_obscure",
     "//": "Imported or otherwise very obscure shotguns.",
-    "items": [  ]
+    "items": [
+    { "item": "saiga_12", "prob": 50, "charges-min": 0, "charges-max": 10 },
+    { "item": "streetsweeper", "prob": 4, "charges-min": 0, "charges-max": 10 },
+    { "item": "USAS_12", "prob": 1, "charges-min": 0, "charges-max": 10 },
+    { "item": "saiga_410", "prob": 40, "charges-min": 0, "charges-max": 10 }
+    ]
   },
   {
     "type": "item_group",
@@ -491,6 +504,7 @@
       { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
       { "item": "m4a1", "prob": 35, "charges-min": 0, "charges-max": 30 },
       { "item": "as50", "prob": 5, "charges-min": 0, "charges-max": 10 },
+      { "item": "USAS_12", "prob": 1, "charges-min": 0, "charges-max": 10 },
       { "item": "hk417_13", "prob": 30, "charges-min": 0, "charges-max": 20 }
     ]
   },

data/json/itemgroups/item_groups.json

@@ -3305,9 +3305,9 @@
       [ "tazer", 25 ],
       [ "remington_700", 5 ],
       [ "3006", 5 ],
-      [ "l_def_12", 8 ],
-      [ "remington_870", 8 ],
-      [ "mossberg_500", 8 ],
+      [ "ksg", 8 ],
+      [ "remington_870_express", 8 ],
+      [ "mossberg_500_security", 8 ],
       [ "shot_beanbag", 25 ],
       [ "rm120c", 2 ],
       [ "rm20", 1 ],

data/json/itemgroups/magazines.json

@@ -273,6 +273,8 @@
     "items": [
       [ "saiga10mag", 50 ],
       [ "saiga30mag", 10 ],
+      [ "USAS10mag", 20 ],
+      [ "USAS20mag", 5 ],
       [ "saiga410mag_10rd", 30 ],
       [ "saiga410mag_30rd", 10 ],
       [ "shot_speedloader6", 15 ],

data/json/items/classes/gun.json

@@ -182,14 +182,14 @@
       [ "barrel", 1 ],
       [ "bore", 1 ],
       [ "brass catcher", 1 ],
-      [ "grip", 1 ],
+      [ "grip mount", 1 ],
       [ "mechanism", 4 ],
       [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights mount", 1 ],
       [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "underbarrel", 1 ]
+      [ "stock mount", 1 ],
+      [ "underbarrel mount", 1 ]
     ]
   },
   {