Merge pull request CleverRaven#67392 from ampersand55/fix_bone

Fix bone broth and bone stuff being inedible

data/json/items/comestibles/carnivore.json

@@ -1276,18 +1276,26 @@
     "delete": { "flags": [ "SMOKABLE" ] }
   },
   {
+    "abstract": "bone_abstract",
     "type": "COMESTIBLE",
-    "id": "bone",
+    "comestible_type": "FOOD",
+    "name": { "str_sp": "abstract bone" },
     "category": "spare_parts",
+    "color": "white",
+    "price": 0,
+    "material": [ "bone" ],
+    "weight": "1000 g",
+    "flags": [ "RAW", "NUTRIENT_OVERRIDE", "INEDIBLE", "LUPINE" ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "bone",
     "name": { "str": "bone" },
+    "copy-from": "bone_abstract",
     "weight": "225 g",
-    "color": "white",
     "symbol": "%",
     "description": "A bone from some creature or other.  Could be used in cooking and crafting.",
-    "comestible_type": "FOOD",
-    "price": 0,
     "price_postapoc": 10,
-    "material": [ "bone" ],
     "milling": { "into": "meal_bone", "conversion_rate": 4 },
     "volume": "250 ml",
     "longest_side": "40 cm",
@@ -1296,16 +1304,12 @@
   {
     "type": "COMESTIBLE",
     "id": "large_bone",
-    "category": "spare_parts",
     "name": { "str": "large bone" },
     "weight": "20 kg",
-    "color": "white",
     "symbol": "I",
     "description": "A huge bone of a large creature.",
-    "comestible_type": "FOOD",
-    "price": 0,
+    "copy-from": "bone_abstract",
     "price_postapoc": 20,
-    "material": [ "bone" ],
     "milling": { "into": "meal_bone", "conversion_rate": 4 },
     "volume": "36 L",
     "longest_side": "2000 cm",

data/json/materials.json

@@ -259,7 +259,7 @@
     "specific_heat_liquid": 1.2,
     "specific_heat_solid": 1.2,
     "latent_heat": 200,
-    "edible": false,
+    "edible": true,
     "rotting": true,
     "chip_resist": 8,
     "wind_resist": 90,