Merge pull request #77643 from Maleclypse/Try-again-on-airtight-conta…

…iners Only remove airtight from containers that don't hold gases well
CleverRaven · Nov 13, 2024 · 143349e · 143349e
2 parents b860ef2 + 10568ec
commit 143349e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 14 deletions.
diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -1384,7 +1384,7 @@
     "name": { "str_sp": "nitrox" },
     "symbol": "=",
     "color": "white",
-    "container": "bottle_plastic",
+    "container": "pressurized_canister",
     "sealed": false,
     "description": "A mixture of oxygen and nitrogen in proportions suitable for sustaining divers.",
     "volume": "250 ml",
@@ -1401,7 +1401,7 @@
     "name": { "str_sp": "extinguishing agent" },
     "symbol": "%",
     "color": "white",
-    "container": "bottle_plastic",
+    "container": "pressurized_canister",
     "sealed": false,
     "description": "A dry chemical solution effective at extinguishing fires.",
     "volume": "250 ml",
@@ -1419,7 +1419,7 @@
     "name": { "str_sp": "tear gas spray" },
     "symbol": "%",
     "color": "white",
-    "container": "bottle_plastic",
+    "container": "pressurized_canister",
     "sealed": false,
     "description": "A noxious aerosolized irritant used to fend off attackers both human and bear alike.",
     "volume": "250 ml",

diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json
@@ -566,7 +566,6 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
-        "airtight": true,
         "watertight": true,
         "rigid": true,
         "transparent": true,
@@ -798,7 +797,6 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
-        "airtight": true,
         "watertight": true,
         "rigid": true,
         "transparent": true,
@@ -860,7 +858,6 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
-        "airtight": true,
         "watertight": true,
         "rigid": true,
         "transparent": true,
@@ -900,7 +897,6 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
-        "airtight": true,
         "watertight": true,
         "rigid": true,
         "transparent": true,
@@ -4237,7 +4233,6 @@
         "pocket_type": "CONTAINER",
         "max_contains_volume": "250 ml",
         "max_contains_weight": "1500 g",
-        "airtight": true,
         "moves": 50,
         "sealed_data": { "spoil_multiplier": 0.0 },
         "watertight": true
@@ -4264,7 +4259,6 @@
         "pocket_type": "CONTAINER",
         "max_contains_volume": "510 ml",
         "max_contains_weight": "3 kg",
-        "airtight": true,
         "moves": 50,
         "sealed_data": { "spoil_multiplier": 0.0 },
         "watertight": true
@@ -4291,7 +4285,6 @@
         "pocket_type": "CONTAINER",
         "max_contains_volume": "1625 ml",
         "max_contains_weight": "4 kg",
-        "airtight": true,
         "moves": 50,
         "sealed_data": { "spoil_multiplier": 0.0 },
         "watertight": true
@@ -4319,7 +4312,6 @@
         "pocket_type": "CONTAINER",
         "max_contains_volume": "125 ml",
         "max_contains_weight": "750 g",
-        "airtight": true,
         "moves": 50,
         "sealed_data": { "spoil_multiplier": 0.0 },
         "watertight": true
@@ -4346,7 +4338,6 @@
         "pocket_type": "CONTAINER",
         "max_contains_volume": "31 ml",
         "max_contains_weight": "180 g",
-        "airtight": true,
         "moves": 50,
         "sealed_data": { "spoil_multiplier": 0.0 },
         "watertight": true
@@ -4373,7 +4364,6 @@
         "pocket_type": "CONTAINER",
         "max_contains_volume": "32 ml",
         "max_contains_weight": "180 g",
-        "airtight": true,
         "moves": 50,
         "sealed_data": { "spoil_multiplier": 0.0 },
         "watertight": true
@@ -4401,7 +4391,6 @@
         "pocket_type": "CONTAINER",
         "max_contains_volume": "2000 ml",
         "max_contains_weight": "1500 g",
-        "airtight": true,
         "transparent": true,
         "moves": 50,
         "sealed_data": { "spoil_multiplier": 0.0 },
@@ -4618,6 +4607,34 @@
     },
     "melee_damage": { "bash": 20 }
   },
+  {
+    "id": "pressurized_canister",
+    "type": "TOOL",
+    "category": "tool_magazine",
+    "name": { "str": "pressurized canister" },
+    "description": "A small tank for containing pressurized gases.",
+    "weight": "25 g",
+    "volume": "350 ml",
+    "longest_side": "12 cm",
+    "price": "20 USD",
+    "price_postapoc": "5 USD",
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" },
+    "material": [ "steel", "plastic" ],
+    "symbol": ";",
+    "color": "green",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "airtight": true,
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "250 ml",
+        "max_contains_weight": "50 g"
+      }
+    ],
+    "flags": [ "COLLAPSE_CONTENTS", "NO_SALVAGE" ],
+    "melee_damage": { "bash": 1 }
+  },
   {
     "id": "small_propane_tank",
     "type": "TOOL",