decomestible the chems (#75368)

CleverRaven · Aug 2, 2024 · 3f1cd85 · 3f1cd85
1 parent 41694a0
commit 3f1cd85
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
@@ -1632,41 +1632,32 @@
     "weight": "1 g"
   },
   {
-    "type": "COMESTIBLE",
+    "type": "GENERIC",
     "id": "chem_agar",
     "category": "chems",
     "price": "1 cent",
     "price_postapoc": "1 cent",
     "name": { "str_sp": "agar" },
     "symbol": ";",
-    "quench": -15,
-    "fun": -6,
     "color": "yellow",
     "container": "bottle_plastic_small",
-    "flags": [ "EDIBLE_FROZEN" ],
     "description": "Clear flakes of processed seaweed that can be dissolved in boiling water to create a very sturdy, temperature-resistant gel.  Not only is it good for making gels to separate molecules by size, but it's a great cheat ingredient to make sure your jellies set properly.",
-    "comestible_type": "INVALID",
     "material": [ "powder" ],
     "volume": "1 ml",
     "//": "Bulk density is around 0.55 g/mL",
     "weight": "1 g"
   },
   {
-    "type": "COMESTIBLE",
+    "type": "GENERIC",
     "id": "chem_acrylamide",
     "category": "chems",
     "price": "1 cent",
     "price_postapoc": "1 cent",
     "name": { "str_sp": "acrylamide" },
     "symbol": ";",
-    "quench": -15,
-    "healthy": -20,
-    "fun": -6,
     "color": "white",
     "container": "bottle_glass",
-    "flags": [ "EDIBLE_FROZEN" ],
     "description": "A handful of highly carcinogenic white powder that can be readily polymerized into a whole bunch of useful water-soluble gels.",
-    "comestible_type": "INVALID",
     "material": [ "powder" ],
     "volume": "2 ml",
     "//": "Bulk density is around 0.5 g/mL (because it's a powder, the actual density of 1.12 g/mL is not useful)",
@@ -1798,21 +1789,16 @@
     "looks_like": "milk"
   },
   {
-    "type": "COMESTIBLE",
+    "type": "GENERIC",
     "id": "chem_citric_acid",
     "category": "chems",
     "price": "1 cent",
     "price_postapoc": "1 cent",
     "name": { "str_sp": "citric acid" },
     "symbol": ";",
-    "quench": -15,
-    "healthy": -20,
-    "fun": -6,
     "color": "white",
     "container": "bottle_glass",
-    "flags": [ "EDIBLE_FROZEN" ],
     "description": "A manufactured form of citric acid that is commonly used as an additive in food, cleaning agents, and nutritional supplements.",
-    "comestible_type": "INVALID",
     "material": [ "powder" ],
     "volume": "2 ml",
     "//": "Bulk density is around 0.5 g/mL (because it's a powder, the actual density of 1.12 g/mL is not useful)",

diff --git a/data/json/obsoletion_and_migration_0.I/blacklist_temperature_removal.json b/data/json/obsoletion_and_migration_0.I/blacklist_temperature_removal.json
@@ -23,7 +23,10 @@
       "bifocal_transition_contacts_weekly",
       "butternut",
       "large_bone",
-      "chem_peptone_broth"
+      "chem_peptone_broth",
+      "chem_agar",
+      "chem_acrylamide",
+      "chem_citric_acid"
     ],
     "//1": "CAUTION: this list is for items that are safe for straightforward deactivation",
     "//2": "items that may be active for additional reasons other than temperature tracking should use separate special case handling"