Obsolete MP18, OA-93, PLR 16, M231, and Mossberg Brownie (#73862)

* Main push

* Linting pass

* Lint 2

* That missing enter was real important

Author: Holli-Git

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -137,7 +137,6 @@
       { "group": "nested_m1911-460", "prob": 3 },
       { "group": "nested_makarov", "prob": 100 },
       { "group": "nested_mauser_c96", "prob": 39 },
-      { "group": "nested_moss_brownie", "prob": 400 },
       { "group": "nested_mr73", "prob": 8 },
       { "group": "nested_pistol_flintlock", "prob": 150 },
       { "group": "nested_raging_bull", "prob": 100 },
@@ -156,7 +155,6 @@
       { "item": "af2011a1_38super", "prob": 25 },
       { "item": "draco", "prob": 30 },
       { "item": "ar_pistol", "prob": 35 },
-      { "item": "plr16", "prob": 3 },
       { "group": "guns_pistol_collectible", "prob": 1 },
       { "item": "minidraco556", "prob": 30 }
     ]
@@ -262,12 +260,7 @@
     "id": "guns_smg_obscure",
     "subtype": "distribution",
     "//": "Imported or otherwise very obscure SMGs.",
-    "items": [
-      { "item": "ppsh", "prob": 50 },
-      { "item": "hk_mp5_10_semi", "prob": 1 },
-      { "item": "greasegun", "prob": 150 },
-      { "group": "guns_smg_collectible", "prob": 1 }
-    ]
+    "items": [ { "item": "ppsh", "prob": 50 }, { "item": "hk_mp5_10_semi", "prob": 1 }, { "item": "greasegun", "prob": 150 } ]
   },
   {
     "type": "item_group",
@@ -280,12 +273,6 @@
       { "group": "guns_smg_common_display", "prob": 60 }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "guns_smg_collectible",
-    "//": "Extremely rare factory-made submachine guns that are possible for civilians to own; only likely to show up in gun collections, museums or similar.  Always unloaded.",
-    "items": [ { "item": "mp18", "variant": "mp18", "prob": 3 } ]
-  },
   {
     "type": "item_group",
     "id": "guns_smg_improvised",
@@ -449,7 +436,6 @@
       { "group": "nested_carbine_flintlock", "prob": 140 },
       { "group": "nested_m60_semi", "prob": 10 },
       { "group": "nested_rifle_flintlock", "prob": 180 },
-      { "group": "nested_oa93", "prob": 3 },
       { "group": "nested_steyr_aug", "prob": 40 },
       { "group": "nested_win70_458", "prob": 60 },
       { "group": "nested_arx160", "prob": 40 },
@@ -479,7 +465,6 @@
       { "item": "type99", "variant": "type99", "contents-group": "type99_mods", "prob": 5, "charges": 0 },
       { "item": "type99_sniper", "contents-item": "arisaka_monopod", "prob": 2, "charges": 0 },
       { "item": "m60_semi", "prob": 5 },
-      { "item": "oa93", "prob": 3 },
       { "item": "steyr_aug", "prob": 5 },
       { "item": "fn_fal_semi", "variant": "fal_dsa", "prob": 40 },
       { "item": "hk_g3", "prob": 40 },
@@ -1744,7 +1729,6 @@
       { "group": "guns_improvised", "prob": 50 },
       { "group": "modular_ar15", "prob": 13, "charges": [ 0, 30 ] },
       { "item": "ar_pistol", "prob": 2, "charges": [ 0, 30 ] },
-      { "item": "plr16", "prob": 1, "charges": [ 0, 30 ] },
       { "item": "mossberg_500", "prob": 2, "charges": [ 0, 6 ] },
       { "item": "remington_870", "prob": 2, "charges": [ 0, 5 ] },
       { "item": "benelli_sa", "variant": "m2", "prob": 2, "charges": [ 0, 4 ] },

data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json

@@ -276,11 +276,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_rare_223",
-    "items": [
-      { "group": "nested_ar_pistol", "prob": 1 },
-      { "group": "nested_plr16", "prob": 1 },
-      { "group": "nested_minidraco556", "prob": 1 }
-    ]
+    "items": [ { "group": "nested_ar_pistol", "prob": 1 }, { "group": "nested_minidraco556", "prob": 1 } ]
   },
   {
     "type": "item_group",
@@ -409,7 +405,6 @@
     "id": "guns_rifle_common_223",
     "items": [
       { "group": "nested_ar_pistol", "prob": 1 },
-      { "group": "nested_plr16", "prob": 1 },
       { "group": "nested_ar15", "prob": 15 },
       { "group": "nested_ruger_mini", "prob": 1 },
       { "group": "nested_ak556", "prob": 2 },
@@ -481,7 +476,6 @@
     "id": "guns_rifle_common_worn_223",
     "items": [
       { "item": "ar_pistol", "prob": 1, "charges": [ 0, 30 ] },
-      { "item": "plr16", "prob": 1, "charges": [ 0, 30 ] },
       { "item": "ruger_mini", "prob": 1, "charges": [ 0, 5 ] },
       { "item": "ak556", "prob": 2, "charges": [ 0, 30 ] },
       { "item": "ak556", "variant": "zpapm90", "prob": 1, "charges": [ 0, 30 ] },

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -884,14 +884,6 @@
     "ammo": 100,
     "entries": [ { "item": "mauser_c96" }, { "group": "on_hand_9mm" } ]
   },
-  {
-    "id": "nested_moss_brownie",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [ { "item": "moss_brownie" }, { "group": "on_hand_22" } ]
-  },
   {
     "id": "nested_p08",
     "type": "item_group",
@@ -1320,19 +1312,6 @@
       { "group": "on_hand_223" }
     ]
   },
-  {
-    "id": "nested_plr16",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [
-      { "item": "plr16", "charges": [ 0, 10 ] },
-      { "group": "stanag_10_random" },
-      { "group": "stanag_10_random", "prob": 50 },
-      { "group": "on_hand_223" }
-    ]
-  },
   {
     "id": "nested_garand",
     "type": "item_group",
@@ -2034,19 +2013,6 @@
     "ammo": 100,
     "entries": [ { "item": "rifle_flintlock" }, { "group": "on_hand_flintlock" } ]
   },
-  {
-    "id": "nested_oa93",
-    "type": "item_group",
-    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
-    "subtype": "collection",
-    "ammo": 100,
-    "entries": [
-      { "item": "oa93", "charges": [ 0, 30 ] },
-      { "group": "stanag_10_random" },
-      { "group": "stanag_10_random", "prob": 50 },
-      { "group": "on_hand_223" }
-    ]
-  },
   {
     "id": "nested_steyr_aug",
     "type": "item_group",

data/json/itemgroups/military.json

@@ -644,7 +644,6 @@
       { "item": "usp_45", "prob": 6 },
       { "item": "modular_m4_carbine", "variant": "modular_m4a1", "prob": 7 },
       { "group": "m4_cqbr", "prob": 1 },
-      { "item": "m231pfw", "prob": 1 },
       { "item": "modular_m16a4", "prob": 5 },
       { "item": "modular_m16_auto_rifle", "variant": "modular_m16a3", "prob": 1 },
       { "item": "colt_ro635", "prob": 1 },

data/json/items/gun/22.json

@@ -111,50 +111,6 @@
     ],
     "melee_damage": { "bash": 12 }
   },
-  {
-    "id": "moss_brownie",
-    "looks_like": "glock_17",
-    "copy-from": "pistol_base",
-    "type": "GUN",
-    "name": { "str": ".22 derringer pistol" },
-    "description": "A four barreled, adorably tiny pocket pistol, firing the equally minuscule .22 LR cartridge.  Produced in the early 20th century for trappers, its combat effectiveness is questionable to say the least.",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "moss_brownie",
-        "name": { "str": "Mossberg Brownie pistol" },
-        "description": "The first gun produced by O.F. Mossberg & Sons, the Brownie is a small pocket pistol marketed to trappers during the early 20th century.  Its four barrels can accept .22 Short and .22 LR cartridges."
-      }
-    ],
-    "weight": "286 g",
-    "volume": "100 ml",
-    "longest_side": "129 mm",
-    "barrel_length": "64 mm",
-    "price": "1 kUSD 100 USD",
-    "price_postapoc": "5 USD",
-    "to_hit": -1,
-    "material": [ "steel", "wood" ],
-    "color": "dark_gray",
-    "ammo": [ "22" ],
-    "ranged_damage": { "damage_type": "bullet", "amount": -2 },
-    "dispersion": 520,
-    "durability": 6,
-    "blackpowder_tolerance": 96,
-    "clip_size": 4,
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "belt clip", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "sights mount", 1 ],
-      [ "stock mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
-    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
-    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "22": 4 } } ],
-    "melee_damage": { "bash": 1 }
-  },
   {
     "id": "rifle_22",
     "looks_like": "ar15",