diff --git a/data/json/items/gun/10mm.json b/data/json/items/gun/10mm.json
index c3ed1199fd415..4e7598fcc11d6 100644
--- a/data/json/items/gun/10mm.json
+++ b/data/json/items/gun/10mm.json
@@ -32,7 +32,12 @@
     "blackpowder_tolerance": 56,
     "clip_size": 6,
     "pocket_data": [
-      { "pocket_type": "MAGAZINE", "ammo_restriction": { "10mm": 6, "40": 6 }, "allowed_speedloaders": [ "40_speedloader6" ] }
+      {
+        "pocket_type": "MAGAZINE",
+        "rigid": true,
+        "ammo_restriction": { "10mm": 6, "40": 6 },
+        "allowed_speedloaders": [ "40_speedloader6" ]
+      }
     ]
   },
   {
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
index f9ea52d3c9407..664d0b0b8309b 100644
--- a/data/json/items/gun/22.json
+++ b/data/json/items/gun/22.json
@@ -84,7 +84,14 @@
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "flags": [ "RELOAD_ONE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "22": 19 }, "allowed_speedloaders": [ "marlin_tubeloader" ] } ]
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE",
+        "rigid": true,
+        "ammo_restriction": { "22": 19 },
+        "allowed_speedloaders": [ "marlin_tubeloader" ]
+      }
+    ]
   },
   {
     "id": "moss_brownie",
diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json
index a7dd9030fb727..a4c5ecf8e66f5 100644
--- a/data/json/items/gun/3006.json
+++ b/data/json/items/gun/3006.json
@@ -117,7 +117,9 @@
       [ "underbarrel mount", 1 ]
     ],
     "flags": [ "RELOAD_ONE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 5 }, "allowed_speedloaders": [ "3006_clip" ] } ]
+    "pocket_data": [
+      { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3006": 5 }, "allowed_speedloaders": [ "3006_clip" ] }
+    ]
   },
   {
     "id": "m1918",
diff --git a/data/json/items/gun/500.json b/data/json/items/gun/500.json
index 34d2cab092b4f..31c43e76e652d 100644
--- a/data/json/items/gun/500.json
+++ b/data/json/items/gun/500.json
@@ -68,6 +68,13 @@
       [ "stock mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "500": 5 }, "allowed_speedloaders": [ "500_speedloader5" ] } ]
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE",
+        "rigid": true,
+        "ammo_restriction": { "500": 5 },
+        "allowed_speedloaders": [ "500_speedloader5" ]
+      }
+    ]
   }
 ]
diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index e333a0ad2f37e..3f2819a0863f9 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -118,7 +118,14 @@
     ],
     "flags": [ "RELOAD_ONE", "NEVER_JAMS" ],
     "weapon_category": [ "AUTOMATIC_RIFLES" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "762": 10 }, "allowed_speedloaders": [ "762x39_clip" ] } ]
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE",
+        "rigid": true,
+        "ammo_restriction": { "762": 10 },
+        "allowed_speedloaders": [ "762x39_clip" ]
+      }
+    ]
   },
   {
     "id": "aksemi",
diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json
index c0fb0fd7c006d..8e846dd2fe5e6 100644
--- a/data/json/items/gun/762R.json
+++ b/data/json/items/gun/762R.json
@@ -81,7 +81,9 @@
       [ "underbarrel mount", 1 ]
     ],
     "flags": [ "RELOAD_ONE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "762R": 5 }, "allowed_speedloaders": [ "762R_clip" ] } ]
+    "pocket_data": [
+      { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762R": 5 }, "allowed_speedloaders": [ "762R_clip" ] }
+    ]
   },
   {
     "id": "mosin91_30_ebr",
diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
index 82dfb791d9ebc..f9ac4051f417e 100644
--- a/data/json/items/gun/9mm.json
+++ b/data/json/items/gun/9mm.json
@@ -426,7 +426,14 @@
       [ "underbarrel mount", 1 ]
     ],
     "flags": [ "RELOAD_ONE" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "9mm": 10 }, "allowed_speedloaders": [ "clip9mm_10rd" ] } ]
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE",
+        "rigid": true,
+        "ammo_restriction": { "9mm": 10 },
+        "allowed_speedloaders": [ "clip9mm_10rd" ]
+      }
+    ]
   },
   {
     "id": "mauser_m714",