Fix mercury being powder (#57929)

CleverRaven · Jun 20, 2022 · cda1e75 · cda1e75
1 parent 51599d5
commit cda1e75
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/data/json/items/resources/chemicals.json b/data/json/items/resources/chemicals.json
@@ -94,7 +94,7 @@
     "symbol": "~",
     "color": "light_gray",
     "description": "Elemental mercury, liquid under normal conditions.  Known for its use in thermometers.",
-    "material": [ "powder_nonflam" ],
+    "material": [ "mercury" ],
     "volume": "250 ml",
     "weight": "13534 mg",
     "phase": "liquid",

diff --git a/data/json/materials.json b/data/json/materials.json
@@ -1551,6 +1551,24 @@
     "bash_dmg_verb": "damaged",
     "cut_dmg_verb": "damaged"
   },
+  {
+    "type": "material",
+    "id": "mercury",
+    "name": "Mercury",
+    "density": 13.53,
+    "specific_heat_liquid": 0.1395,
+    "specific_heat_solid": 0.1419,
+    "bash_resist": 0,
+    "cut_resist": 0,
+    "bullet_resist": 0,
+    "acid_resist": 8,
+    "fire_resist": 3,
+    "conductive": true,
+    "chip_resist": 8,
+    "dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ],
+    "bash_dmg_verb": "damaged",
+    "cut_dmg_verb": "damaged"
+  },
   {
     "type": "material",
     "id": "cac2powder",