From 0b78081af228ed99557fc4a344556bcd77e9e794 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Mon, 24 Jun 2024 14:57:55 +0200
Subject: [PATCH 01/12] initial commit

---
 data/json/items/gun/38.json | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
index 1bf810526f6fa..0b59cb583aabd 100644
--- a/data/json/items/gun/38.json
+++ b/data/json/items/gun/38.json
@@ -201,19 +201,17 @@
   {
     "id": "sw_619",
     "copy-from": "pistol_revolver",
-    "//": "Tileset whitelist for revolvers.",
     "type": "GUN",
-    "name": { "str_sp": "S&W 619" },
-    "description": "A seven-round .357 revolver sold by Smith & Wesson.  Can also fire .38 Special.  It features a fixed rear sight and a reinforced frame.",
+    "name": { "str_sp": "S&W 686 Plus" },
+    "description": "Introduced in the 90's, the Smith & Wessons's model 686 'Plus' features a robust stainless steel frame, an adjustable front sight and a seventh shot that's sure to save your life.",
     "ascii_picture": "sw_610",
-    "weight": "1074 g",
-    "volume": "608 ml",
-    "longest_side": "278 mm",
-    "barrel_length": "140 mm",
-    "//2": "100mm + 40mm max OAL for 357mag. Revolvers just built different.",
-    "price": "620 USD",
+    "weight": "1280 g",
+    "volume": "760 ml",
+    "longest_side": "305 mm",
+    "//": "barrel length (152mm) + cylinder length (40mm)",
+    "barrel_length": "192  mm",
+    "price": "980 USD",
     "price_postapoc": "12 USD 50 cent",
-    "to_hit": -2,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "light_gray",
@@ -238,8 +236,7 @@
         "ammo_restriction": { "357mag": 7, "38": 7 },
         "allowed_speedloaders": [ "38_speedloader" ]
       }
-    ],
-    "melee_damage": { "bash": 9 }
+    ]
   },
   {
     "id": "chiappa_rhino",

From 9c8b1624aad8c221557c86b44ae0a1eb478b694f Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Mon, 24 Jun 2024 15:19:06 +0200
Subject: [PATCH 02/12] fix minor typo

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

diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
index 0b59cb583aabd..94261c060fb87 100644
--- a/data/json/items/gun/38.json
+++ b/data/json/items/gun/38.json
@@ -203,7 +203,7 @@
     "copy-from": "pistol_revolver",
     "type": "GUN",
     "name": { "str_sp": "S&W 686 Plus" },
-    "description": "Introduced in the 90's, the Smith & Wessons's model 686 'Plus' features a robust stainless steel frame, an adjustable front sight and a seventh shot that's sure to save your life.",
+    "description": "Introduced in the 90's, the Smith & Wesson's model 686 'Plus' features a robust stainless steel frame, an adjustable front sight and a seventh shot that's sure to save your life.",
     "ascii_picture": "sw_610",
     "weight": "1280 g",
     "volume": "760 ml",

From f74f0c9dd95e81b558fa3494dd5c6c344f183f83 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Mon, 24 Jun 2024 18:32:52 +0200
Subject: [PATCH 03/12] fix containers

---
 .vscode/settings.json      | 5 ++++-
 data/json/professions.json | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2df65457a4a88..95294f0d6160a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -83,5 +83,8 @@
     "github-actions.remote-name": "upstream",
     // NOTE: This disable the plugins formatting so astyle is used.
     "C_Cpp.formatting": "disabled",
-    "astyle.astylerc": "${workspaceRoot}/.astylerc"
+    "astyle.astylerc": "${workspaceRoot}/.astylerc",
+    "files.associations": {
+        "vector": "cpp"
+    }
 }
diff --git a/data/json/professions.json b/data/json/professions.json
index 32344d742541c..bbb09d136dcd1 100644
--- a/data/json/professions.json
+++ b/data/json/professions.json
@@ -2513,7 +2513,7 @@
           { "group": "charged_ref_lighter" },
           { "item": "pants", "variant": "pants_stone" },
           { "group": "speedloaders_s&w619_magnum" },
-          { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 7, "container-item": "holster" }
+          { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 7, "container-item": "XL_holster" }
         ]
       },
       "male": { "entries": [ { "item": "briefs" } ] },
@@ -4650,7 +4650,7 @@
           { "item": "spiral_stone" },
           { "group": "charged_smart_phone" },
           { "group": "speedloaders_s&w619_special" },
-          { "item": "sw_619", "ammo-item": "38_special", "charges": 7, "container-item": "holster" },
+          { "item": "sw_619", "ammo-item": "38_special", "charges": 7, "container-item": "XL_holster" },
           { "item": "pants", "variant": "generic_pants" }
         ]
       },
@@ -6880,7 +6880,7 @@
           { "group": "charged_smart_phone" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "sw_619", "ammo-item": "357mag_jhp", "charges": 7 },
-          { "item": "western_holster", "contents-group": "bandolier_cowboy" }
+          { "item": "XL_holster", "contents-group": "bandolier_cowboy" }
         ]
       },
       "male": { "entries": [ { "item": "boxer_shorts" } ] },

From c0aa5cdbab83238b798f32d728bc938609db7309 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Mon, 24 Jun 2024 18:37:30 +0200
Subject: [PATCH 04/12] Update data/json/items/gun/38.json

Co-authored-by: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com>
---
 data/json/items/gun/38.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
index 94261c060fb87..61515131da090 100644
--- a/data/json/items/gun/38.json
+++ b/data/json/items/gun/38.json
@@ -203,7 +203,7 @@
     "copy-from": "pistol_revolver",
     "type": "GUN",
     "name": { "str_sp": "S&W 686 Plus" },
-    "description": "Introduced in the 90's, the Smith & Wesson's model 686 'Plus' features a robust stainless steel frame, an adjustable front sight and a seventh shot that's sure to save your life.",
+    "description": "Introduced in the 90's, Smith & Wesson's model 686 'Plus' features a robust stainless steel frame, an adjustable front sight and a seventh shot that's sure to save your life.",
     "ascii_picture": "sw_610",
     "weight": "1280 g",
     "volume": "760 ml",

From 04ca9442e58ea229679323cd142e2af07e988531 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Tue, 25 Jun 2024 11:51:48 +0200
Subject: [PATCH 05/12] fix attempt 1

---
 data/json/professions.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/data/json/professions.json b/data/json/professions.json
index bbb09d136dcd1..2ee5a08b29f1a 100644
--- a/data/json/professions.json
+++ b/data/json/professions.json
@@ -6879,8 +6879,7 @@
           { "item": "rope_30" },
           { "group": "charged_smart_phone" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "sw_619", "ammo-item": "357mag_jhp", "charges": 7 },
-          { "item": "XL_holster", "contents-group": "bandolier_cowboy" }
+          { "item": "sw_619", "ammo-item": "357mag_jhp", "charges": 7, "container-item": "western_holster" }
         ]
       },
       "male": { "entries": [ { "item": "boxer_shorts" } ] },

From 37973a9cfb01463bc0a5f37bd425a2b540a06266 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Tue, 25 Jun 2024 14:33:51 +0200
Subject: [PATCH 06/12] fix attempt 2

---
 data/json/monsterdrops/zombie_default.json  | 2 +-
 data/json/monsterdrops/zombie_survivor.json | 2 +-
 data/json/professions.json                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/monsterdrops/zombie_default.json b/data/json/monsterdrops/zombie_default.json
index 5026cf6e778a6..8b43ab8792436 100644
--- a/data/json/monsterdrops/zombie_default.json
+++ b/data/json/monsterdrops/zombie_default.json
@@ -270,7 +270,7 @@
         "distribution": [
           { "item": "teargas_sprayer", "prob": 10, "charges": [ 0, 8 ] },
           {
-            "collection": [ { "item": "holster" }, { "group": "guns_pistol_common_everyday_carry", "damage": [ 0, 2 ] } ],
+            "collection": [ { "item": "XL_holster" }, { "group": "guns_pistol_common_everyday_carry", "damage": [ 0, 2 ] } ],
             "prob": 8
           },
           {
diff --git a/data/json/monsterdrops/zombie_survivor.json b/data/json/monsterdrops/zombie_survivor.json
index b371f4974650f..1cc6c5ee080a3 100644
--- a/data/json/monsterdrops/zombie_survivor.json
+++ b/data/json/monsterdrops/zombie_survivor.json
@@ -38,7 +38,7 @@
         "distribution": [
           { "item": "teargas_sprayer", "prob": 10, "charges": [ 0, 5 ] },
           {
-            "collection": [ { "item": "holster" }, { "group": "guns_pistol_common_everyday_carry", "damage": [ 0, 2 ] } ],
+            "collection": [ { "item": "XL_holster" }, { "group": "guns_pistol_common_everyday_carry", "damage": [ 0, 2 ] } ],
             "prob": 10
           },
           {
diff --git a/data/json/professions.json b/data/json/professions.json
index 2ee5a08b29f1a..ab6e30950b6f9 100644
--- a/data/json/professions.json
+++ b/data/json/professions.json
@@ -4650,7 +4650,7 @@
           { "item": "spiral_stone" },
           { "group": "charged_smart_phone" },
           { "group": "speedloaders_s&w619_special" },
-          { "item": "sw_619", "ammo-item": "38_special", "charges": 7, "container-item": "XL_holster" },
+          { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 7, "container-item": "XL_holster" },
           { "item": "pants", "variant": "generic_pants" }
         ]
       },

From 9aae2b0c613dc97837ec44b81ef8fadfef8676a2 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Wed, 26 Jun 2024 12:35:06 +0200
Subject: [PATCH 07/12] I HATE JOHN BAILEY

---
 data/json/npcs/random_encounters/john_bailey.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/npcs/random_encounters/john_bailey.json b/data/json/npcs/random_encounters/john_bailey.json
index d82f0aff54429..488c6e0507091 100644
--- a/data/json/npcs/random_encounters/john_bailey.json
+++ b/data/json/npcs/random_encounters/john_bailey.json
@@ -85,7 +85,7 @@
       { "item": "backpack_hiking" },
       { "item": "wristwatch" },
       { "item": "bandolier_pistol", "contents-group": "john_bailey_bandolier" },
-      { "item": "holster", "contents-group": "john_bailey_pistol" },
+      { "item": "XL_holster", "contents-group": "john_bailey_pistol" },
       { "item": "bow_sling", "contents-item": "compbow_low" },
       { "item": "quiver", "contents-group": "john_bailey_quiver" }
     ]

From e800759f496230d2d2a1ed708dabcf301fe07ac5 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Wed, 26 Jun 2024 13:54:05 +0200
Subject: [PATCH 08/12] fix Generic_Guns conversion

---
 data/mods/Generic_Guns/firearms/pistol_magnum.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json
index afa560c913601..f98b45b0c54cb 100644
--- a/data/mods/Generic_Guns/firearms/pistol_magnum.json
+++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json
@@ -115,6 +115,7 @@
     "name": { "str": "hunting magnum" },
     "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ],
     "description": "Early handgun hunters helped develop this revolver's magnum ammunition from standard calibers, which needed heavier revolvers to safely fire it.  These revolvers' cylinders can thus chamber both magnum and standard pistol ammunition.  You could take medium to large game with this hefty piece.",
+    "longest_side": "300 mm",
     "clip_size": 6,
     "pocket_data": [
       {

From bf227dda3f943c7df21c753db572348f63d76ed8 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Wed, 26 Jun 2024 15:45:28 +0200
Subject: [PATCH 09/12] fix Generic_guns weirdness

---
 data/mods/Generic_Guns/firearms/pistol_magnum.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json
index f98b45b0c54cb..9923589e49708 100644
--- a/data/mods/Generic_Guns/firearms/pistol_magnum.json
+++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json
@@ -115,7 +115,8 @@
     "name": { "str": "hunting magnum" },
     "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ],
     "description": "Early handgun hunters helped develop this revolver's magnum ammunition from standard calibers, which needed heavier revolvers to safely fire it.  These revolvers' cylinders can thus chamber both magnum and standard pistol ammunition.  You could take medium to large game with this hefty piece.",
-    "longest_side": "300 mm",
+    "longest_side": "250 mm",
+    "volume": "400 ml",
     "clip_size": 6,
     "pocket_data": [
       {

From 6d490196a0d59105d4e6e6e2b60aaf906f0c7fa6 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Wed, 26 Jun 2024 17:30:59 +0200
Subject: [PATCH 10/12] GG holster is annoying

---
 data/mods/Generic_Guns/bandoliers/holster.json     | 4 ++--
 data/mods/Generic_Guns/firearms/pistol_magnum.json | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/data/mods/Generic_Guns/bandoliers/holster.json b/data/mods/Generic_Guns/bandoliers/holster.json
index 85c8adb0ca0ed..5081b1a624e4c 100644
--- a/data/mods/Generic_Guns/bandoliers/holster.json
+++ b/data/mods/Generic_Guns/bandoliers/holster.json
@@ -9,9 +9,9 @@
         "pocket_type": "CONTAINER",
         "holster": true,
         "min_item_volume": "100 ml",
-        "max_contains_volume": "400 ml",
+        "max_contains_volume": "850 ml",
         "max_contains_weight": "2 kg",
-        "max_item_length": "25 cm",
+        "max_item_length": "35 cm",
         "moves": 30
       },
       {
diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json
index 9923589e49708..afa560c913601 100644
--- a/data/mods/Generic_Guns/firearms/pistol_magnum.json
+++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json
@@ -115,8 +115,6 @@
     "name": { "str": "hunting magnum" },
     "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ],
     "description": "Early handgun hunters helped develop this revolver's magnum ammunition from standard calibers, which needed heavier revolvers to safely fire it.  These revolvers' cylinders can thus chamber both magnum and standard pistol ammunition.  You could take medium to large game with this hefty piece.",
-    "longest_side": "250 mm",
-    "volume": "400 ml",
     "clip_size": 6,
     "pocket_data": [
       {

From 87bbbb2b82393a9c5709b3b4f5c36477ed0841eb Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Fri, 28 Jun 2024 17:09:44 +0200
Subject: [PATCH 11/12] update the whole thing

---
 .../Weapons_Mods_Ammo/guns_by_calibre.json      |  2 +-
 data/json/items/gun/38.json                     | 17 +++++++++++++----
 data/json/monsterdrops/zombie_default.json      |  2 +-
 data/json/monsterdrops/zombie_survivor.json     |  2 +-
 .../npcs/random_encounters/john_bailey.json     |  2 +-
 data/json/professions.json                      |  7 ++++---
 data/mods/Generic_Guns/bandoliers/holster.json  |  4 ++--
 7 files changed, 23 insertions(+), 13 deletions(-)

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 1f1c7bc652072..dcc83faceb912 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -232,7 +232,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_display_357mag",
-    "items": [ { "item": "sw_619", "prob": 1 }, { "item": "colt_python", "prob": 2 } ]
+    "items": [ { "item": "sw_619", "variant": "sw_619", "prob": 1 }, { "item": "colt_python", "prob": 2 } ]
   },
   {
     "type": "item_group",
diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
index 61515131da090..7cfb67b8b842a 100644
--- a/data/json/items/gun/38.json
+++ b/data/json/items/gun/38.json
@@ -202,13 +202,14 @@
     "id": "sw_619",
     "copy-from": "pistol_revolver",
     "type": "GUN",
-    "name": { "str_sp": "S&W 686 Plus" },
-    "description": "Introduced in the 90's, Smith & Wesson's model 686 'Plus' features a robust stainless steel frame, an adjustable front sight and a seventh shot that's sure to save your life.",
+    "name": { "str_sp": "7-shots .357 revolver" },
+    "description": "A revolver chambered in .357, with a 6 inch barrel and 7 shots.",
     "ascii_picture": "sw_610",
     "weight": "1280 g",
     "volume": "760 ml",
-    "longest_side": "305 mm",
-    "//": "barrel length (152mm) + cylinder length (40mm)",
+    "//1": "took 5mm off `longest_side` so it can fit regular holsters",
+    "longest_side": "300 mm",
+    "//2": "barrel length (152mm) + cylinder length (40mm)",
     "barrel_length": "192  mm",
     "price": "980 USD",
     "price_postapoc": "12 USD 50 cent",
@@ -236,6 +237,14 @@
         "ammo_restriction": { "357mag": 7, "38": 7 },
         "allowed_speedloaders": [ "38_speedloader" ]
       }
+    ],
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "sw_619",
+        "name": { "str_sp": "S&W 686 Plus" },
+        "description": "Introduced in the 90's, Smith & Wesson's model 686 'Plus' features a robust stainless steel frame, an adjustable front sight and a seventh shot that's sure to save your life."
+      }
     ]
   },
   {
diff --git a/data/json/monsterdrops/zombie_default.json b/data/json/monsterdrops/zombie_default.json
index 8b43ab8792436..5026cf6e778a6 100644
--- a/data/json/monsterdrops/zombie_default.json
+++ b/data/json/monsterdrops/zombie_default.json
@@ -270,7 +270,7 @@
         "distribution": [
           { "item": "teargas_sprayer", "prob": 10, "charges": [ 0, 8 ] },
           {
-            "collection": [ { "item": "XL_holster" }, { "group": "guns_pistol_common_everyday_carry", "damage": [ 0, 2 ] } ],
+            "collection": [ { "item": "holster" }, { "group": "guns_pistol_common_everyday_carry", "damage": [ 0, 2 ] } ],
             "prob": 8
           },
           {
diff --git a/data/json/monsterdrops/zombie_survivor.json b/data/json/monsterdrops/zombie_survivor.json
index 1cc6c5ee080a3..b371f4974650f 100644
--- a/data/json/monsterdrops/zombie_survivor.json
+++ b/data/json/monsterdrops/zombie_survivor.json
@@ -38,7 +38,7 @@
         "distribution": [
           { "item": "teargas_sprayer", "prob": 10, "charges": [ 0, 5 ] },
           {
-            "collection": [ { "item": "XL_holster" }, { "group": "guns_pistol_common_everyday_carry", "damage": [ 0, 2 ] } ],
+            "collection": [ { "item": "holster" }, { "group": "guns_pistol_common_everyday_carry", "damage": [ 0, 2 ] } ],
             "prob": 10
           },
           {
diff --git a/data/json/npcs/random_encounters/john_bailey.json b/data/json/npcs/random_encounters/john_bailey.json
index 488c6e0507091..d82f0aff54429 100644
--- a/data/json/npcs/random_encounters/john_bailey.json
+++ b/data/json/npcs/random_encounters/john_bailey.json
@@ -85,7 +85,7 @@
       { "item": "backpack_hiking" },
       { "item": "wristwatch" },
       { "item": "bandolier_pistol", "contents-group": "john_bailey_bandolier" },
-      { "item": "XL_holster", "contents-group": "john_bailey_pistol" },
+      { "item": "holster", "contents-group": "john_bailey_pistol" },
       { "item": "bow_sling", "contents-item": "compbow_low" },
       { "item": "quiver", "contents-group": "john_bailey_quiver" }
     ]
diff --git a/data/json/professions.json b/data/json/professions.json
index ab6e30950b6f9..32344d742541c 100644
--- a/data/json/professions.json
+++ b/data/json/professions.json
@@ -2513,7 +2513,7 @@
           { "group": "charged_ref_lighter" },
           { "item": "pants", "variant": "pants_stone" },
           { "group": "speedloaders_s&w619_magnum" },
-          { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 7, "container-item": "XL_holster" }
+          { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 7, "container-item": "holster" }
         ]
       },
       "male": { "entries": [ { "item": "briefs" } ] },
@@ -4650,7 +4650,7 @@
           { "item": "spiral_stone" },
           { "group": "charged_smart_phone" },
           { "group": "speedloaders_s&w619_special" },
-          { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 7, "container-item": "XL_holster" },
+          { "item": "sw_619", "ammo-item": "38_special", "charges": 7, "container-item": "holster" },
           { "item": "pants", "variant": "generic_pants" }
         ]
       },
@@ -6879,7 +6879,8 @@
           { "item": "rope_30" },
           { "group": "charged_smart_phone" },
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "sw_619", "ammo-item": "357mag_jhp", "charges": 7, "container-item": "western_holster" }
+          { "item": "sw_619", "ammo-item": "357mag_jhp", "charges": 7 },
+          { "item": "western_holster", "contents-group": "bandolier_cowboy" }
         ]
       },
       "male": { "entries": [ { "item": "boxer_shorts" } ] },
diff --git a/data/mods/Generic_Guns/bandoliers/holster.json b/data/mods/Generic_Guns/bandoliers/holster.json
index 5081b1a624e4c..85c8adb0ca0ed 100644
--- a/data/mods/Generic_Guns/bandoliers/holster.json
+++ b/data/mods/Generic_Guns/bandoliers/holster.json
@@ -9,9 +9,9 @@
         "pocket_type": "CONTAINER",
         "holster": true,
         "min_item_volume": "100 ml",
-        "max_contains_volume": "850 ml",
+        "max_contains_volume": "400 ml",
         "max_contains_weight": "2 kg",
-        "max_item_length": "35 cm",
+        "max_item_length": "25 cm",
         "moves": 30
       },
       {

From 6a9582bd66d09d4e5b1478d261b6a33e0f66e704 Mon Sep 17 00:00:00 2001
From: BalthazarArgall <116303491+BalthazarArgall@users.noreply.github.com>
Date: Fri, 28 Jun 2024 17:15:01 +0200
Subject: [PATCH 12/12] fix botched merge

---
 data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json | 4 ----
 1 file changed, 4 deletions(-)

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 2f935eb0cdf01..4367cb59f7b7a 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -245,11 +245,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_display_357mag",
-<<<<<<< S&W619To686P
-    "items": [ { "item": "sw_619", "variant": "sw_619", "prob": 1 }, { "item": "colt_python", "prob": 2 } ]
-=======
     "items": [ { "item": "sw_619", "prob": 1 }, { "item": "rp63", "prob": 1 }, { "item": "colt_python", "prob": 2 } ]
->>>>>>> master
   },
   {
     "type": "item_group",