From 9454093cf5e6832cedc81645e566b6a1a40a5685 Mon Sep 17 00:00:00 2001
From: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com>
Date: Tue, 2 Apr 2024 06:46:32 -0500
Subject: [PATCH 1/2] first pass

---
 data/json/items/gun/22.json           | 2 +-
 data/json/items/gun/270win.json       | 2 +-
 data/json/items/gun/300.json          | 8 ++++----
 data/json/items/gun/3006.json         | 7 ++++---
 data/json/items/gun/303.json          | 4 ++--
 data/json/items/gun/308.json          | 6 +++---
 data/json/items/gun/338lapua.json     | 8 ++++----
 data/json/items/gun/36paper.json      | 3 ++-
 data/json/items/gun/38.json           | 2 +-
 data/json/items/gun/44.json           | 1 +
 data/json/items/gun/44paper.json      | 1 +
 data/json/items/gun/4570.json         | 2 +-
 data/json/items/gun/458wm.json        | 1 +
 data/json/items/gun/45colt.json       | 3 ++-
 data/json/items/gun/50.json           | 4 ++--
 data/json/items/gun/762R.json         | 4 ++--
 data/json/items/gun/77mm_jap.json     | 2 +-
 data/json/items/gun/artisan_guns.json | 2 +-
 data/json/items/gun/shot.json         | 5 +++--
 19 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
index 2f584d1467290..ac9e0ab8b33cb 100644
--- a/data/json/items/gun/22.json
+++ b/data/json/items/gun/22.json
@@ -100,7 +100,7 @@
       [ "underbarrel mount", 1 ]
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
-    "flags": [ "RELOAD_ONE" ],
+    "flags": [ "RELOAD_ONE", "NO_TURRET" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE",
diff --git a/data/json/items/gun/270win.json b/data/json/items/gun/270win.json
index 4dc21e9650567..1e2dfb1fdc797 100644
--- a/data/json/items/gun/270win.json
+++ b/data/json/items/gun/270win.json
@@ -30,7 +30,7 @@
     "clip_size": 4,
     "barrel_volume": "750 ml",
     "barrel_length": "610 mm",
-    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "brass catcher", 1 ],
diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json
index 171a89f238bc6..f920623434202 100644
--- a/data/json/items/gun/300.json
+++ b/data/json/items/gun/300.json
@@ -19,7 +19,7 @@
     "dispersion": 90,
     "durability": 8,
     "barrel_volume": "500 ml",
-    "flags": [ "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "m2010mag" ] } ],
     "melee_damage": { "bash": 12 }
   },
@@ -46,7 +46,7 @@
     "blackpowder_tolerance": 24,
     "clip_size": 3,
     "barrel_volume": "750 ml",
-    "flags": [ "RELOAD_ONE", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "EASY_CLEAN", "NO_TURRET" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "brass catcher", 1 ],
@@ -84,7 +84,7 @@
     "blackpowder_tolerance": 24,
     "clip_size": 3,
     "barrel_volume": "750 ml",
-    "flags": [ "RELOAD_ONE", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "EASY_CLEAN", "NO_TURRET" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "brass catcher", 1 ],
@@ -136,7 +136,7 @@
       [ "stock accessory", 2 ],
       [ "stock", 1 ]
     ],
-    "flags": [ "EASY_CLEAN" ],
+    "flags": [ "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [
       {
         "magazine_well": "300 ml",
diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json
index 2ee698b6e43cf..d5f450c8d305b 100644
--- a/data/json/items/gun/3006.json
+++ b/data/json/items/gun/3006.json
@@ -36,6 +36,7 @@
       [ "underbarrel mount", 1 ]
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
+    "flags": [ "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "blrmag" ] } ],
     "melee_damage": { "bash": 12 }
   },
@@ -116,7 +117,7 @@
       [ "stock mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "flags": [ "RELOAD_ONE", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [
       { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3006": 5 }, "allowed_speedloaders": [ "3006_clip" ] }
     ],
@@ -188,7 +189,7 @@
     "blackpowder_tolerance": 24,
     "clip_size": 4,
     "barrel_volume": "750 ml",
-    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3006": 4 } } ],
     "melee_damage": { "bash": 12 }
   },
@@ -232,7 +233,7 @@
       [ "stock accessory", 2 ],
       [ "stock", 1 ]
     ],
-    "flags": "RELOAD_ONE",
+    "flags": [ "RELOAD_ONE", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3006": 4 } } ],
     "melee_damage": { "bash": 12 }
   }
diff --git a/data/json/items/gun/303.json b/data/json/items/gun/303.json
index 7821f91de5851..7cb1a336a6821 100644
--- a/data/json/items/gun/303.json
+++ b/data/json/items/gun/303.json
@@ -28,7 +28,7 @@
     "dispersion": 170,
     "durability": 8,
     "blackpowder_tolerance": 40,
-    "flags": [ "EASY_CLEAN" ],
+    "flags": [ "EASY_CLEAN", "NO_TURRET" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "bayonet lug", 1 ],
@@ -74,7 +74,7 @@
     "dispersion": 150,
     "durability": 8,
     "blackpowder_tolerance": 40,
-    "flags": [ "EASY_CLEAN" ],
+    "flags": [ "EASY_CLEAN", "NO_TURRET" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "bayonet lug", 1 ],
diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
index 392a6ca30a5a2..61e356f541364 100644
--- a/data/json/items/gun/308.json
+++ b/data/json/items/gun/308.json
@@ -289,7 +289,7 @@
     "blackpowder_tolerance": 24,
     "clip_size": 3,
     "barrel_volume": "750 ml",
-    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 3 } } ],
     "melee_damage": { "bash": 12 }
   },
@@ -351,7 +351,7 @@
       [ "rail mount", 1 ],
       [ "underbarrel", 1 ]
     ],
-    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 5 } } ],
     "melee_damage": { "bash": 12 }
   },
@@ -566,7 +566,7 @@
       [ "underbarrel", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "flags": [ "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "steyr_scout_mag", "steyr_scout_mag_makeshift" ] } ],
     "melee_damage": { "bash": 10 }
   }
diff --git a/data/json/items/gun/338lapua.json b/data/json/items/gun/338lapua.json
index b7ffb048b0869..8fc0b9a344f06 100644
--- a/data/json/items/gun/338lapua.json
+++ b/data/json/items/gun/338lapua.json
@@ -28,7 +28,7 @@
     "durability": 10,
     "blackpowder_tolerance": 24,
     "default_mods": [ "cheek_pad", "butt_hook", "bipod", "rifle_scope", "muzzle_brake" ],
-    "flags": [ "EASY_CLEAN" ],
+    "flags": [ "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ai_338mag", "ai_338mag_10" ] } ],
     "melee_damage": { "bash": 12 }
   },
@@ -75,7 +75,7 @@
       [ "rail mount", 1 ],
       [ "stock mount", 1 ]
     ],
-    "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "338lapua": 1 } } ],
     "melee_damage": { "bash": 12 }
   },
@@ -108,7 +108,7 @@
     "durability": 10,
     "blackpowder_tolerance": 24,
     "built_in_mods": [ "cheek_pad" ],
-    "flags": [ "EASY_CLEAN" ],
+    "flags": [ "EASY_CLEAN", "NO_TURRET" ],
     "//": "Cheek pad required for holding the buttstock in place and keep it from folding.",
     "default_mods": [ "match_trigger", "muzzle_brake" ],
     "valid_mod_locations": [
@@ -166,7 +166,7 @@
       [ "underbarrel", 1 ],
       [ "stock", 1 ]
     ],
-    "flags": [ "NO_TURRET", "EASY_CLEAN" ],
+    "flags": [ "NO_TURRET", "EASY_CLEAN", "NO_TURRET" ],
     "//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 }
   }
diff --git a/data/json/items/gun/36paper.json b/data/json/items/gun/36paper.json
index 0dce2e56ed9ec..339969f4729bd 100644
--- a/data/json/items/gun/36paper.json
+++ b/data/json/items/gun/36paper.json
@@ -19,7 +19,8 @@
     "blackpowder_tolerance": 96,
     "clip_size": 6,
     "proportional": { "reload": 2.0 },
+    "flags": [ "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "36paper": 6 } } ],
     "melee_damage": { "bash": 8 }
   }
-]
+]
\ No newline at end of file
diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
index c47f7842c98ed..f31068de85e54 100644
--- a/data/json/items/gun/38.json
+++ b/data/json/items/gun/38.json
@@ -28,7 +28,7 @@
     "reload": 200,
     "valid_mod_locations": [ [ "grip", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "rail mount", 1 ], [ "stock mount", 1 ] ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
-    "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "38": 2 } } ],
     "melee_damage": { "bash": 3 }
   },
diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json
index 34255e82e904a..a025f9c83cfc2 100644
--- a/data/json/items/gun/44.json
+++ b/data/json/items/gun/44.json
@@ -77,6 +77,7 @@
       [ "rail mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
+    "flags": [ "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "44": 10 } } ],
     "melee_damage": { "bash": 12 }
   },
diff --git a/data/json/items/gun/44paper.json b/data/json/items/gun/44paper.json
index 0fbc54510781d..4e162f8653c87 100644
--- a/data/json/items/gun/44paper.json
+++ b/data/json/items/gun/44paper.json
@@ -18,6 +18,7 @@
     "durability": 7,
     "blackpowder_tolerance": 96,
     "clip_size": 6,
+    "flags": [ "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "44paper": 6 } } ],
     "melee_damage": { "bash": 8 }
   }
diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json
index 018acfd6e1d9b..8c4cf48206f69 100644
--- a/data/json/items/gun/4570.json
+++ b/data/json/items/gun/4570.json
@@ -32,7 +32,7 @@
       [ "stock mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "flags": [ "RELOAD_ONE" ],
+    "flags": [ "RELOAD_ONE", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "4570": 6 } } ],
     "melee_damage": { "bash": 12 }
   },
diff --git a/data/json/items/gun/458wm.json b/data/json/items/gun/458wm.json
index 580742a65cbf7..fc8c179e1ff88 100644
--- a/data/json/items/gun/458wm.json
+++ b/data/json/items/gun/458wm.json
@@ -19,6 +19,7 @@
     "price": 176000,
     "price_postapoc": 5000,
     "ammo": [ "458wm" ],
+    "flags": [ "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "458wm": 3 } } ]
   }
 ]
diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json
index f143c29a7a42f..8699232c9aab9 100644
--- a/data/json/items/gun/45colt.json
+++ b/data/json/items/gun/45colt.json
@@ -31,7 +31,7 @@
       [ "stock mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45colt": 2, "410shot": 2 } } ],
     "melee_damage": { "bash": 2 }
   },
@@ -96,6 +96,7 @@
     "clip_size": 6,
     "blackpowder_tolerance": 56,
     "//proportional": { "reload": 1.5 },
+    "flags": [ "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45colt": 6 } } ],
     "melee_damage": { "bash": 8 }
   }
diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json
index f76e55fe30382..5ca0a76bcfc5d 100644
--- a/data/json/items/gun/50.json
+++ b/data/json/items/gun/50.json
@@ -114,7 +114,7 @@
     "reload": 450,
     "barrel_volume": "1250 ml",
     "default_mods": [ "recoil_stock", "bipod", "rifle_scope", "muzzle_brake" ],
-    "flags": [ "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "tac50mag" ] } ],
     "melee_damage": { "bash": 12 }
   },
@@ -154,7 +154,7 @@
     ],
     "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
     "clip_size": 1,
-    "flags": [ "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN" ],
+    "flags": [ "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "50": 1 } } ],
     "melee_damage": { "bash": 12 }
   }
diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json
index 0d7e0c3a93fca..a9964a8c55c51 100644
--- a/data/json/items/gun/762R.json
+++ b/data/json/items/gun/762R.json
@@ -51,7 +51,7 @@
       [ "stock accessory", 2 ],
       [ "underbarrel", 1 ]
     ],
-    "flags": [ "RELOAD_ONE" ],
+    "flags": [ "RELOAD_ONE", "NO_TURRET" ],
     "pocket_data": [
       { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762R": 5 }, "allowed_speedloaders": [ "762R_clip" ] }
     ],
@@ -107,7 +107,7 @@
       [ "stock accessory", 2 ],
       [ "underbarrel mount", 1 ]
     ],
-    "flags": [ "RELOAD_ONE" ],
+    "flags": [ "RELOAD_ONE", "NO_TURRET" ],
     "pocket_data": [
       { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762R": 5 }, "allowed_speedloaders": [ "762R_clip" ] }
     ],
diff --git a/data/json/items/gun/77mm_jap.json b/data/json/items/gun/77mm_jap.json
index 92e9cc4fd6b97..871af8bcc30de 100644
--- a/data/json/items/gun/77mm_jap.json
+++ b/data/json/items/gun/77mm_jap.json
@@ -34,7 +34,7 @@
     "durability": 10,
     "blackpowder_tolerance": 24,
     "clip_size": 5,
-    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "bayonet lug", 1 ],
diff --git a/data/json/items/gun/artisan_guns.json b/data/json/items/gun/artisan_guns.json
index a82e5b134b69a..088191eccfd6a 100644
--- a/data/json/items/gun/artisan_guns.json
+++ b/data/json/items/gun/artisan_guns.json
@@ -100,7 +100,7 @@
     "to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "neutral" },
     "qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 14 ] ],
     "techniques": [ "RAPID" ],
-    "flags": [ "DURABLE_MELEE", "ALLOWS_BODY_BLOCK" ],
+    "flags": [ "DURABLE_MELEE", "ALLOWS_BODY_BLOCK", "NO_TURRET" ],
     "weapon_category": [ "AUTOMATIC_PISTOLS", "SHIVS" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "32": 2 } } ],
     "melee_damage": { "stab": 16 }
diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 318892a66bc7a..66c88f4c3509c 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -723,7 +723,7 @@
       [ "sights mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "flags": [ "RELOAD_ONE" ],
+    "flags": [ "RELOAD_ONE", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 6 } } ],
     "melee_damage": { "bash": 8 }
   },
@@ -819,6 +819,7 @@
       [ "stock accessory", 2 ],
       [ "underbarrel mount", 1 ]
     ],
+    "flags": [ "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 4 } } ]
   },
   {
@@ -877,7 +878,7 @@
     "reload": 600,
     "modes": [ [ "DEFAULT", "single", 1 ] ],
     "valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ],
-    "flags": [ "RELOAD_EJECT", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ],
     "melee_damage": { "bash": 8 }
   },

From a9e2f87ef4a35de77c75e1d252cc3fd7d10d90a1 Mon Sep 17 00:00:00 2001
From: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com>
Date: Tue, 2 Apr 2024 06:57:26 -0500
Subject: [PATCH 2/2] Update 36paper.json

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

diff --git a/data/json/items/gun/36paper.json b/data/json/items/gun/36paper.json
index 339969f4729bd..dbe3b878b243a 100644
--- a/data/json/items/gun/36paper.json
+++ b/data/json/items/gun/36paper.json
@@ -23,4 +23,4 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "36paper": 6 } } ],
     "melee_damage": { "bash": 8 }
   }
-]
\ No newline at end of file
+]