From 4c075f08062ffd19bc428a6817d9b8b346d6a920 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 16:02:03 -0600
Subject: [PATCH 01/12] Add the modular AR pistol

---
 data/json/items/gun/223.json            | 24 ++++++++++++++++++++++
 data/json/items/gunmod/conversions.json | 27 ++++++++++++++++++++-----
 data/json/items/gunmod/mechanism.json   |  4 ++--
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index ed7cb076dfb78..c041ba28fe1af 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -26,6 +26,30 @@
     "//3": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.",
     "melee_damage": { "bash": 12 }
   },
+  {
+    "id": "modular_ar_pistol",
+    "copy-from": "pistol_base",
+    "//": "Roughly based on https://www.cheaperthandirt.com/del-ton-lima-ar-15-semi-auto-pistol-5.56-nato-7.5-barrel-30-rounds-m-lok-handguard-black/FC-848456002687.html, with the upper subtracted.",
+    "looks_like": "modular_ar15",
+    "type": "GUN",
+    "name": { "str": "AR pistol" },
+    "description": "A compact, 7.5 inch barrel version of the classic AR-15 design, commercially marketed as a home defense weapon.  AR pistols lack stocks, or have arm braces due to restrictions on short barreled rifles, and so without a stock, they're legally classified as a pistol.",
+    "weight": "1043 g",
+    "volume": "748 ml",
+    "longest_side": "373 mm",
+    "price": "245 USD",
+    "price_postapoc": "35 USD",
+    "material": [ "steel", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "NULL" ],
+    "dispersion": 150,
+    "durability": 7,
+    "min_cycle_recoil": 1350,
+    "valid_mod_locations": [ [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 2 ], [ "sling", 1 ], [ "stock accessory", 2 ], [ "stock", 1 ] ],
+    "flags": [ "NO_TURRET" ],
+    "melee_damage": { "bash": 9 }
+  },
   {
     "id": "ar_pistol",
     "copy-from": "rifle_semi",
diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json
index 3dd8c984fc833..8e2553ba60001 100644
--- a/data/json/items/gunmod/conversions.json
+++ b/data/json/items/gunmod/conversions.json
@@ -31,7 +31,7 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
     "install_time": "5 m",
     "ammo_modifier": [ "223" ],
     "magazine_adaptor": [
@@ -125,6 +125,23 @@
     "price": "269 USD 99 cent",
     "add_mod": [ [ "brass catcher", 1 ], [ "rail", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ]
   },
+  {
+    "id": "retool_ar15_223rem_pistol",
+    "copy-from": "retool_ar15_223rem",
+	"//": "Based on https://veriforcetactical.com/product/ar-15-pistol-upper-556-7-inch-m-lok-slim-profile-with-mcbs/",
+    "type": "GUNMOD",
+    "name": { "str": "Pistol .223 upper receiver" },
+    "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle's lower frame.  Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit providing a weapon with a 7.5-inch barrel chambered for .223 Remington ammunition.  These are most often found on stockless AR pistol lowers, to comply with legal restrictions on short barrels on rifles.  No such laws exist now, or at least people that can enforce them.",
+    "weight": "1134 g",
+    "volume": "718 ml",
+    "longest_side": "435 mm",
+    "integral_volume": "1295 ml",
+    "integral_weight": "1819 g",
+    "integral_longest_side": "191 mm",
+    "barrel_length": "191 mm",
+    "price": "499 USD 95 cent",
+    "add_mod": [ [ "brass catcher", 1 ], [ "rail", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "muzzle", 1 ] ]
+  },
   {
     "id": "retool_ar15_300blk",
     "type": "GUNMOD",
@@ -143,7 +160,7 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
     "install_time": "5 m",
     "ammo_modifier": [ "300blk" ],
     "magazine_adaptor": [
@@ -252,7 +269,7 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
     "install_time": "5 m",
     "dispersion_modifier": 15,
     "ammo_modifier": [ "50beowulf" ],
@@ -326,7 +343,7 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
     "install_time": "5 m",
     "dispersion_modifier": 15,
     "ammo_modifier": [ "450" ],
@@ -417,7 +434,7 @@
     "symbol": ":",
     "color": "dark_gray",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle" ],
+    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
     "install_time": "5 m",
     "dispersion_modifier": 15,
     "overwrite_min_cycle_recoil": 83,
diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json
index c2f582ab3ad9e..c20188fdeb44b 100644
--- a/data/json/items/gunmod/mechanism.json
+++ b/data/json/items/gunmod/mechanism.json
@@ -34,7 +34,7 @@
     "symbol": ":",
     "color": "red",
     "location": "mechanism",
-    "mod_targets": [ "modular_ar15", "ar_pistol" ],
+    "mod_targets": [ "modular_ar15", "ar_pistol", "modular_ar_pistol" ],
     "//": "Install time short since it drops in, hinging open the AR being all the 'skill' necessary. Precision drop marginal since it'd change how semi and FA trigger pulls feel.",
     "install_time": "5 m",
     "dispersion_modifier": 10,
@@ -56,7 +56,7 @@
     "symbol": ":",
     "color": "red",
     "location": "mechanism",
-    "mod_targets": [ "modular_ar15", "ar_pistol" ],
+    "mod_targets": [ "modular_ar15", "ar_pistol", "modular_ar_pistol" ],
     "//": "Sort of long install time. Gotta grind down the carrier trip to SP1-ish length. Unfortunately, since you're sort of guessing how long that is, the AR's timing with this installed will be borked.(disco might be disengaged at non-ideal times).",
     "install_time": "25 m",
     "dispersion_modifier": 40,

From b90c35626d1e706c39ccb2bca8420c5c066bd311 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 17:19:09 -0600
Subject: [PATCH 02/12] Migrate ar pistol

Due to limitations of migration, had to migrate it into a rifle.
---
 data/json/obsoletion_and_migration_0.I/migration_items.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
index 1cf8670de999d..a695f3c4d5d79 100644
--- a/data/json/obsoletion_and_migration_0.I/migration_items.json
+++ b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1825,5 +1825,10 @@
     "type": "MIGRATION",
     "replace": "small_squeeze_tube",
     "contents": [ { "id": "super_glue", "count": 40 } ]
+  },
+  {
+    "id": "ar_pistol",
+    "type": "MIGRATION",
+    "replace": "rdb_223"
   }
 ]

From 8e3cb166b2410740c00ac072e041ad02c65379e2 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 17:55:55 -0600
Subject: [PATCH 03/12] Itemgroup replacements

---
 .../conversions/conversion_guns.json          | 24 +++++++
 .../itemgroups/Weapons_Mods_Ammo/guns.json    | 12 ++--
 .../Weapons_Mods_Ammo/guns_by_calibre.json    | 21 +++++-
 .../Weapons_Mods_Ammo/nested_guns.json        | 65 +++++++++++++++----
 4 files changed, 102 insertions(+), 20 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json
index 3ddb735446ab5..123415b83ccff 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json
@@ -107,6 +107,30 @@
     "subtype": "collection",
     "entries": [ { "item": "modular_ar15", "contents-item": "retool_ar15_22" } ]
   },
+  {
+    "id": "ar_pistol",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_223rem_pistol" } ]
+  },
+  {
+    "id": "ar_pistol_long",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_223rem_short" } ]
+  },
+  {
+    "id": "ar_pistol_300",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_300blk_short" } ]
+  },
+  {
+    "id": "ar_pistol_300_long",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "modular_ar_pistol", "contents-item": "retool_ar15_300blk_medium" } ]
+  },
   {
     "id": "mdrx_223",
     "type": "item_group",
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index ef101b3c69e53..e3d484dec4376 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -15,6 +15,8 @@
       { "group": "guns_pistol_common_44", "prob": 1 },
       { "group": "guns_pistol_common_10mm", "prob": 1 },
       { "group": "guns_pistol_common_762_39", "prob": 1 },
+      { "group": "guns_pistol_common_223", "prob": 17 },
+      { "group": "guns_pistol_common_300", "prob": 10 },
       { "group": "guns_pistol_common_other", "prob": 39 }
     ]
   },
@@ -53,6 +55,8 @@
       { "group": "guns_pistol_common_display_45colt", "prob": 5 },
       { "group": "guns_pistol_common_display_10mm", "prob": 1 },
       { "group": "guns_pistol_common_display_762_39", "prob": 1 },
+      { "group": "guns_pistol_common_display_223", "prob": 17 },
+      { "group": "guns_pistol_common_display_300", "prob": 10 },
       { "group": "guns_pistol_common_display_other", "prob": 46 }
     ]
   },
@@ -151,11 +155,7 @@
     "subtype": "distribution",
     "id": "guns_pistol_obscure_display",
     "//": "Very obscure pistols which are illegal to sell.",
-    "items": [
-      { "item": "ar_pistol", "prob": 35 },
-      { "group": "guns_pistol_collectible", "prob": 1 },
-      { "item": "minidraco556", "prob": 30 }
-    ]
+    "items": [ { "group": "guns_pistol_collectible", "prob": 1 }, { "item": "minidraco556", "prob": 30 } ]
   },
   {
     "type": "item_group",
@@ -1694,7 +1694,7 @@
     "items": [
       { "group": "guns_improvised", "prob": 50 },
       { "group": "modular_ar15", "prob": 13, "charges": [ 0, 30 ] },
-      { "item": "ar_pistol", "prob": 2, "charges": [ 0, 30 ] },
+      { "group": "ar_pistol", "prob": 7, "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 ] },
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
index 99ae836e0ea84..4aac20ad231b1 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -95,6 +95,16 @@
       { "group": "nested_draco_micro", "prob": 8 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_223",
+    "items": [ { "group": "nested_ar_pistol", "prob": 8 }, { "group": "nested_ar_pistol_long", "prob": 10 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_300",
+    "items": [ { "group": "nested_ar_pistol_300", "prob": 2 }, { "group": "nested_ar_pistol_300_long", "prob": 5 } ]
+  },
   {
     "type": "item_group",
     "id": "guns_pistol_common_other",
@@ -290,6 +300,16 @@
     "id": "guns_pistol_common_display_762_39",
     "items": [ { "item": "draco", "prob": 10 }, { "item": "draco_mini", "prob": 5 }, { "item": "draco_micro", "prob": 8 } ]
   },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_display_223",
+    "items": [ { "group": "ar_pistol", "prob": 8 }, { "group": "ar_pistol_long", "prob": 10 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "guns_pistol_common_display_300",
+    "items": [ { "group": "ar_pistol_300", "prob": 2 }, { "group": "ar_pistol_300_long", "prob": 5 } ]
+  },
   {
     "type": "item_group",
     "id": "guns_pistol_common_display_other",
@@ -510,7 +530,6 @@
     "type": "item_group",
     "id": "guns_rifle_common_worn_223",
     "items": [
-      { "item": "ar_pistol", "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 ] },
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
index d3d910d686f11..1d83e819f9a3b 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -1350,19 +1350,6 @@
       { "group": "on_hand_3006" }
     ]
   },
-  {
-    "id": "nested_ar_pistol",
-    "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": "ar_pistol", "charges": [ 0, 30 ] },
-      { "item": "stanag10" },
-      { "item": "stanag10", "prob": 50 },
-      { "group": "on_hand_223" }
-    ]
-  },
   {
     "id": "nested_garand",
     "type": "item_group",
@@ -1402,6 +1389,58 @@
       { "group": "on_hand_223" }
     ]
   },
+  {
+    "id": "nested_ar_pistol",
+    "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": [
+      { "group": "ar_pistol", "charges": [ 0, 30 ] },
+      { "item": "stanag10" },
+      { "item": "stanag10", "prob": 50 },
+      { "group": "on_hand_223" }
+    ]
+  },
+  {
+    "id": "nested_ar_pistol_long",
+    "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": [
+      { "group": "ar_pistol_long", "charges": [ 0, 30 ] },
+      { "item": "stanag10" },
+      { "item": "stanag10", "prob": 50 },
+      { "group": "on_hand_223" }
+    ]
+  },
+  {
+    "id": "nested_ar_pistol_300",
+    "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": [
+      { "group": "ar_pistol_300", "charges": [ 0, 30 ] },
+      { "item": "stanag10" },
+      { "item": "stanag10", "prob": 50 },
+      { "group": "on_hand_300BLK" }
+    ]
+  },
+  {
+    "id": "nested_ar_pistol_300_long",
+    "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": [
+      { "group": "ar_pistol_300_long", "charges": [ 0, 30 ] },
+      { "item": "stanag10" },
+      { "item": "stanag10", "prob": 50 },
+      { "group": "on_hand_300BLK" }
+    ]
+  },
   {
     "id": "nested_cx4",
     "type": "item_group",

From 80ca5128adac343fb4dc080cd430bfa00d65478b Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 17:57:54 -0600
Subject: [PATCH 04/12] Further mention removal

---
 data/json/items/gun/22.json        | 4 ++--
 data/json/recipes/weapon/mods.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
index 43cf565e613f5..0022f6853281a 100644
--- a/data/json/items/gun/22.json
+++ b/data/json/items/gun/22.json
@@ -277,7 +277,7 @@
   {
     "id": "cp33",
     "copy-from": "pistol_base",
-    "looks_like": "ar_pistol",
+    "looks_like": "modular_ar_pistol",
     "type": "GUN",
     "name": { "str": "high capacity handgun" },
     "description": "A large capacity handgun, chambered in .22 and feeding from quad stack magazines.  Used both recreationally and in competition.",
@@ -365,7 +365,7 @@
   },
   {
     "id": "ruger_charger",
-    "looks_like": "ar_pistol",
+    "looks_like": "modular_ar_pistol",
     "type": "GUN",
     "//": "Stats are from https://ruger.com/products/22Charger/specSheets/4923.html",
     "reload_noise_volume": 10,
diff --git a/data/json/recipes/weapon/mods.json b/data/json/recipes/weapon/mods.json
index cbfabee3b8b17..02bcd49e994ee 100644
--- a/data/json/recipes/weapon/mods.json
+++ b/data/json/recipes/weapon/mods.json
@@ -1273,7 +1273,7 @@
     "tools": [
       [
         [ "modular_ar15", -1 ],
-        [ "ar_pistol", -1 ],
+        [ "modular_ar_pistol", -1 ],
         [ "modular_m27_assault_rifle", -1 ],
         [ "modular_m16_auto_rifle", -1 ],
         [ "modular_m4_carbine", -1 ],
@@ -1298,7 +1298,7 @@
     "//": "Simple to manufacture, hence it's not gonna be in published in too much detail in gun-mags.",
     "book_learn": [ [ "manual_rifle", 6 ], [ "textbook_anarch", 3 ] ],
     "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
-    "tools": [ [ [ "modular_ar15", -1 ], [ "ar_pistol", -1 ] ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ],
+    "tools": [ [ [ "modular_ar15", -1 ], [ "modular_ar_pistol", -1 ] ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ],
     "components": [ [ [ "sheet_metal_small", 2 ] ] ]
   },
   {

From 1b6864130635978e416171ade82441010d20de9d Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 17:58:06 -0600
Subject: [PATCH 05/12] Remove old gun

---
 data/json/items/gun/223.json | 61 ------------------------------------
 1 file changed, 61 deletions(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index c041ba28fe1af..85cec2483f176 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -50,67 +50,6 @@
     "flags": [ "NO_TURRET" ],
     "melee_damage": { "bash": 9 }
   },
-  {
-    "id": "ar_pistol",
-    "copy-from": "rifle_semi",
-    "looks_like": "modular_ar15",
-    "type": "GUN",
-    "name": { "str": "AR pistol" },
-    "description": "A compact, 7.5 inch barrel version of the classic AR-15 design, commercially marketed as a home defense weapon.",
-    "weight": "2267 g",
-    "volume": "1758 ml",
-    "longest_side": "584 mm",
-    "barrel_length": "191 mm",
-    "price": "914 USD",
-    "price_postapoc": "35 USD",
-    "material": [ "steel", "aluminum" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "223" ],
-    "skill": "pistol",
-    "range": -6,
-    "dispersion": 380,
-    "durability": 6,
-    "min_cycle_recoil": 1350,
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "bore", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "rail mount", 2 ],
-      [ "sights", 1 ],
-      [ "stock mount", 1 ],
-      [ "underbarrel", 1 ]
-    ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE_WELL",
-        "item_restriction": [
-          "stanag30",
-          "stanag5",
-          "stanag5ranger",
-          "stanag10",
-          "stanag10ranger",
-          "stanag20",
-          "stanag20ranger",
-          "stanag30ranger",
-          "stanag40",
-          "stanag40ranger",
-          "stanag50",
-          "stanag60",
-          "stanag60drum",
-          "stanag90",
-          "stanag100",
-          "stanag100drum",
-          "stanag150",
-          "survivor223mag"
-        ]
-      }
-    ],
-    "melee_damage": { "bash": 9 }
-  },
   {
     "//": "Groups all 'H&K416' related rifles together. Used M27 due to it being the most popular of the three in the US.",
     "id": "modular_m27_assault_rifle",

From c70454f99a9f7cb7a202501475e97081c3e152f7 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 17:59:07 -0600
Subject: [PATCH 06/12] Adds to-hit

---
 data/json/items/gun/223.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index 85cec2483f176..fbb7766a5b63f 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -39,6 +39,7 @@
     "longest_side": "373 mm",
     "price": "245 USD",
     "price_postapoc": "35 USD",
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "steel", "aluminum" ],
     "symbol": "(",
     "color": "dark_gray",

From 1708174abc2b25f322fc340efbf8cc34c70e27f4 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 18:00:45 -0600
Subject: [PATCH 07/12] Generic Guns stuff

---
 data/mods/Generic_Guns/firearms/gg_firearms_migration.json | 2 +-
 data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index 271ae960a25e3..a47082e818fca 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -355,7 +355,7 @@
       "ar15_450medium",
       "ar15_450short",
       "ar15_762",
-      "ar_pistol",
+      "modular_ar_pistol",
       "rifle_223",
       "ruger_mini",
       "sig_assault_rifle",
diff --git a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
index 35367dc2f9434..67242fa2d275f 100644
--- a/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
+++ b/data/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json
@@ -26,6 +26,7 @@
       "retool_ar15_223rem_extended",
       "retool_ar15_223rem_medium",
       "retool_ar15_223rem_short",
+      "retool_ar15_223rem_pistol",
       "retool_ar15_300blk",
       "retool_ar15_300blk_medium",
       "retool_ar15_300blk_short",

From 5dd6784b943bcde703fc98434bd2a4951a1d0fb4 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 18:47:19 -0600
Subject: [PATCH 08/12] Update item_demographics.json

---
 data/mods/TEST_DATA/item_demographics.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json
index 5423a89bbaac4..ab552ae9cbcaf 100644
--- a/data/mods/TEST_DATA/item_demographics.json
+++ b/data/mods/TEST_DATA/item_demographics.json
@@ -710,7 +710,6 @@
           "weight": 125,
           "items": {
             "ar15": 1,
-            "ar_pistol": 1,
             "famas": 1,
             "scar_l": 1,
             "m16a4": 1,
@@ -719,6 +718,7 @@
             "m249_semi": 1,
             "m27_assault_rifle": 1,
             "m4_carbine": 1,
+            "modular_ar_pistol": 1,
             "ruger_mini": 1,
             "sig_assault_rifle": 1,
             "sl8": 1,
@@ -969,7 +969,6 @@
           "items": {
             "2_shot_special": 1,
             "90two40": 1,
-            "ar_pistol": 1,
             "ashot": 1,
             "bfr": 1,
             "bond_410": 1,
@@ -1018,6 +1017,7 @@
             "mauser_m714": 1,
             "minidraco556": 1,
             "model_10_revolver": 1,
+            "modular_ar_pistol": 1,
             "chiappa_rhino": 1,
             "p08": 1,
             "p220_10": 1,

From cffb5519e756b07adf9a4af4fd41c2203284d540 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 18:51:26 -0600
Subject: [PATCH 09/12] Update other migrations

---
 data/json/obsoletion_and_migration_0.I/migration_items.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
index a695f3c4d5d79..939e3d628fc45 100644
--- a/data/json/obsoletion_and_migration_0.I/migration_items.json
+++ b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1640,17 +1640,17 @@
   {
     "id": "plr16",
     "type": "MIGRATION",
-    "replace": "ar_pistol"
+    "replace": "rdb_223"
   },
   {
     "id": "oa93",
     "type": "MIGRATION",
-    "replace": "ar_pistol"
+    "replace": "rdb_223"
   },
   {
     "id": "m231pfw",
     "type": "MIGRATION",
-    "replace": "ar_pistol"
+    "replace": "rdb_223"
   },
   {
     "id": "moss_brownie",

From c45ef5dee3e5024678849df8f61cc7bc6c616485 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 18:57:43 -0600
Subject: [PATCH 10/12] Description fix

---
 data/json/items/gun/223.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
index fbb7766a5b63f..65a3022dae0ac 100644
--- a/data/json/items/gun/223.json
+++ b/data/json/items/gun/223.json
@@ -33,7 +33,7 @@
     "looks_like": "modular_ar15",
     "type": "GUN",
     "name": { "str": "AR pistol" },
-    "description": "A compact, 7.5 inch barrel version of the classic AR-15 design, commercially marketed as a home defense weapon.  AR pistols lack stocks, or have arm braces due to restrictions on short barreled rifles, and so without a stock, they're legally classified as a pistol.",
+    "description": "The common AR-15 platform, with its stock removed and buffer tube covered by a sleeve.  AR pistols lack stocks, or have arm braces due to restrictions on short barreled rifles, and so without a stock, they're legally classified as a pistol.",
     "weight": "1043 g",
     "volume": "748 ml",
     "longest_side": "373 mm",

From 963bee87c6db41f0208d1ffcad29c5e864761837 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 19:40:20 -0600
Subject: [PATCH 11/12] Lint

---
 data/json/items/gunmod/conversions.json | 47 +++++++++++++++++++++----
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json
index 8e2553ba60001..61ce86280779b 100644
--- a/data/json/items/gunmod/conversions.json
+++ b/data/json/items/gunmod/conversions.json
@@ -31,7 +31,14 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "ammo_modifier": [ "223" ],
     "magazine_adaptor": [
@@ -128,7 +135,7 @@
   {
     "id": "retool_ar15_223rem_pistol",
     "copy-from": "retool_ar15_223rem",
-	"//": "Based on https://veriforcetactical.com/product/ar-15-pistol-upper-556-7-inch-m-lok-slim-profile-with-mcbs/",
+    "//": "Based on https://veriforcetactical.com/product/ar-15-pistol-upper-556-7-inch-m-lok-slim-profile-with-mcbs/",
     "type": "GUNMOD",
     "name": { "str": "Pistol .223 upper receiver" },
     "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle's lower frame.  Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit providing a weapon with a 7.5-inch barrel chambered for .223 Remington ammunition.  These are most often found on stockless AR pistol lowers, to comply with legal restrictions on short barrels on rifles.  No such laws exist now, or at least people that can enforce them.",
@@ -160,7 +167,14 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "ammo_modifier": [ "300blk" ],
     "magazine_adaptor": [
@@ -269,7 +283,14 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "dispersion_modifier": 15,
     "ammo_modifier": [ "50beowulf" ],
@@ -343,7 +364,14 @@
     "symbol": ":",
     "color": "green",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "dispersion_modifier": 15,
     "ammo_modifier": [ "450" ],
@@ -434,7 +462,14 @@
     "symbol": ":",
     "color": "dark_gray",
     "location": "bore",
-    "mod_targets": [ "modular_ar15", "modular_m4_carbine", "modular_m16a4", "modular_m16_auto_rifle", "modular_m27_assault_rifle", "modular_ar_pistol" ],
+    "mod_targets": [
+      "modular_ar15",
+      "modular_m4_carbine",
+      "modular_m16a4",
+      "modular_m16_auto_rifle",
+      "modular_m27_assault_rifle",
+      "modular_ar_pistol"
+    ],
     "install_time": "5 m",
     "dispersion_modifier": 15,
     "overwrite_min_cycle_recoil": 83,

From 5ab6d2e5a53477b4503243bec110798548f4b156 Mon Sep 17 00:00:00 2001
From: Holli <hollierthanthouare@gmail.com>
Date: Fri, 16 Aug 2024 22:50:10 -0600
Subject: [PATCH 12/12] Uncapitalization (Thanks Ferret!)

---
 data/json/items/gunmod/conversions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json
index 61ce86280779b..27796c7046f12 100644
--- a/data/json/items/gunmod/conversions.json
+++ b/data/json/items/gunmod/conversions.json
@@ -137,7 +137,7 @@
     "copy-from": "retool_ar15_223rem",
     "//": "Based on https://veriforcetactical.com/product/ar-15-pistol-upper-556-7-inch-m-lok-slim-profile-with-mcbs/",
     "type": "GUNMOD",
-    "name": { "str": "Pistol .223 upper receiver" },
+    "name": { "str": "pistol .223 upper receiver" },
     "description": "This is a complete upper receiver assembly containing a barrel, handguard, and bolt carrier group that, given the right knowledge, is installable upon an AR-15-style rifle's lower frame.  Swappable uppers enable compatible firearms to be retooled for different cartridges and barrel lengths, with this kit providing a weapon with a 7.5-inch barrel chambered for .223 Remington ammunition.  These are most often found on stockless AR pistol lowers, to comply with legal restrictions on short barrels on rifles.  No such laws exist now, or at least people that can enforce them.",
     "weight": "1134 g",
     "volume": "718 ml",