Lard is tallow and animal oil doesn't exist (#83020)

Author: BalthazarArgall

data/json/itemgroups/Food/food.json

@@ -271,7 +271,6 @@
       { "prob": 25, "group": "seasoning_salt_various" },
       { "item": "vinegar", "charges": -1, "prob": 15 },
       { "group": "vegetable_oil_bottle", "prob": 30 },
-      { "group": "animal_oil_bottle", "prob": 30 },
       { "prob": 8, "group": "veggy_pickled_jar_glass_sealed_2" },
       { "prob": 5, "group": "sauerkraut_jar_glass_sealed_2" },
       { "item": "sports_drink", "prob": 10 },
@@ -386,7 +385,6 @@
       { "item": "syrup_corn", "charges": [ 1, -1 ], "prob": 5 },
       { "item": "molasses", "charges": [ 1, -1 ], "prob": 15 },
       { "group": "vegetable_oil_bottle", "prob": 40 },
-      { "group": "animal_oil_bottle", "prob": 40 },
       { "item": "honey_bottled", "charges": [ 1, -1 ], "prob": 15 },
       { "prob": 5, "item": "honey_glassed", "count": [ 1, -1 ] },
       { "item": "jar_glass_sealed", "prob": 20 },

data/json/itemgroups/food_service.json

@@ -1047,7 +1047,6 @@
       [ "soysauce", 25 ],
       [ "hot_sauce", 25 ],
       { "group": "vegetable_oil_bottle", "prob": 50 },
-      { "group": "animal_oil_bottle", "prob": 50 },
       [ "cookbook", 8 ],
       [ "cookbook_italian", 9 ],
       { "prob": 3, "item": "cornmeal", "count": [ 10, -1 ] },
@@ -1087,7 +1086,6 @@
       [ "soysauce", 25 ],
       [ "hot_sauce", 25 ],
       { "group": "vegetable_oil_bottle", "prob": 40 },
-      { "group": "animal_oil_bottle", "prob": 40 },
       [ "cookbook", 8 ],
       [ "cookbook_daintydishes", 9 ],
       { "prob": 3, "item": "cornmeal", "count": [ 10, -1 ] },
@@ -1440,7 +1438,7 @@
       [ "onion", 15 ],
       [ "potato", 15 ],
       [ "pineapple", 20 ],
-      [ "lard", 10 ],
+      [ "tallow", 10 ],
       [ "mushroom_morel", 8 ],
       [ "sausage_cooked", 8 ],
       [ "mushroom", 20 ],
@@ -2811,17 +2809,6 @@
       { "item": "cooking_oil", "container-item": "jug_plastic", "charges": [ 0, 150 ] }
     ]
   },
-  {
-    "type": "item_group",
-    "id": "animal_oil_bottle",
-    "subtype": "distribution",
-    "items": [
-      { "item": "cooking_oil2", "container-item": "bottle_plastic", "charges": [ 0, 20 ] },
-      { "item": "cooking_oil2", "container-item": "bottle_folding", "charges": [ 0, 20 ] },
-      { "item": "cooking_oil2", "container-item": "bottle_twoliter", "charges": [ 0, 80 ] },
-      { "item": "cooking_oil2", "container-item": "jug_plastic", "charges": [ 0, 150 ] }
-    ]
-  },
   {
     "type": "item_group",
     "id": "oil_bottle_empty",
@@ -2833,11 +2820,5 @@
     "id": "vegetable_oil_bottle_full",
     "subtype": "distribution",
     "items": [ { "item": "cooking_oil", "container-group": "oil_bottle_empty" } ]
-  },
-  {
-    "type": "item_group",
-    "id": "animal_oil_bottle_full",
-    "subtype": "distribution",
-    "items": [ { "item": "cooking_oil", "container-group": "oil_bottle_empty" } ]
   }
 ]

data/json/itemgroups/supplies.json

@@ -603,7 +603,6 @@
       { "item": "water_clean", "prob": 90, "charges": [ 1, -1 ], "container-item": "bottle_plastic", "sealed": false },
       { "item": "cooking_oil", "prob": 100, "count": 4, "charges": [ 10, -1 ] },
       { "item": "chem_washing_soda", "prob": 100, "charges": [ 1, 20 ] },
-      { "item": "cooking_oil2", "prob": 100, "count": 4, "charges": [ 10, -1 ] },
       { "item": "lamp_oil", "prob": 100, "count": 4, "charges": [ 10, -1 ] }
     ]
   },

data/json/items/chemicals_and_resources.json

@@ -2143,8 +2143,7 @@
     "price": "0 cent",
     "price_postapoc": "10 cent",
     "symbol": "=",
-    "color": "white",
-    "looks_like": "lard"
+    "color": "white"
   },
   {
     "id": "silicone",

data/json/items/comestibles/bread.json

@@ -499,7 +499,7 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 61,
-    "description": "A type of bread popular in Chile and Bolivia.  Prepared using animal lard or oil, it resembles a large, round scone.  In the pre-Cataclysm world, it would usually be filled with savory ingredients.",
+    "description": "A type of bread popular in Chile and Bolivia.  Prepared using animal tallow or oil, it resembles a large, round scone.  In the pre-Cataclysm world, it would usually be filled with savory ingredients.",
     "price": "136 cent",
     "price_postapoc": "2 USD",
     "material": [ "wheat" ],

data/json/items/comestibles/carnivore.json

@@ -242,14 +242,6 @@
     "material": [ "hflesh" ],
     "vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
   },
-  {
-    "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
-    "id": "human_lard",
-    "name": { "str_sp": "human lard" },
-    "copy-from": "human_tallow",
-    "description": "A smooth, white block of dry-rendered human fat.  It will remain edible for a very long time, and can be used as an ingredient in many foods and projects."
-  },
   {
     "id": "human_flesh",
     "copy-from": "meat",
@@ -1594,14 +1586,6 @@
     "vitamins": [ [ "meat_allergen", 1 ] ],
     "fun": -18
   },
-  {
-    "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
-    "id": "lard",
-    "name": { "str_sp": "lard" },
-    "copy-from": "tallow",
-    "description": "A smooth, white block of dry-rendered animal fat.  It will remain edible for a very long time, and can be used as an ingredient in many foods and projects."
-  },
   {
     "id": "mutant_fat",
     "type": "ITEM",
@@ -1624,14 +1608,6 @@
     "proportional": { "price": 0.2 },
     "vitamins": [ [ "mutant_toxin", 180 ], [ "meat_allergen", 1 ] ]
   },
-  {
-    "id": "mutant_lard",
-    "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
-    "copy-from": "mutant_tallow",
-    "name": { "str_sp": "mutant lard" },
-    "description": "A smooth, white block of dry-rendered fat, sourced from a mutant animal.  It will remain edible for a very long time, and can be used as an ingredient in many foods and projects."
-  },
   {
     "id": "mutant_human_fat",
     "type": "ITEM",
@@ -1652,14 +1628,6 @@
     "material": [ "hflesh" ],
     "vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
   },
-  {
-    "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
-    "id": "mutant_human_lard",
-    "name": { "str_sp": "mutant humanoid lard" },
-    "copy-from": "mutant_human_tallow",
-    "description": "A smooth, white block of dry-rendered fat, sourced from a mutant humanoid.  It won't rot for a very long time, and can be used as an ingredient in many foods and projects."
-  },
   {
     "type": "ITEM",
     "subtypes": [ "COMESTIBLE" ],
@@ -2171,15 +2139,6 @@
     "extend": { "flags": [ "STRICT_HUMANITARIANISM" ] },
     "vitamins": [ [ "meat_allergen", 1 ] ]
   },
-  {
-    "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
-    "id": "demihuman_lard",
-    "name": { "str_sp": "demihuman lard" },
-    "copy-from": "lard",
-    "description": "A smooth, white block of dry-rendered demihuman fat.  It will remain edible for a very long time, and can be used as an ingredient in many foods and projects.",
-    "extend": { "flags": [ "STRICT_HUMANITARIANISM" ] }
-  },
   {
     "id": "demihuman_flesh",
     "copy-from": "meat",

data/json/items/comestibles/drink_other.json

@@ -254,17 +254,6 @@
     "vitamins": [ [ "veggy_allergen", 1 ] ],
     "freezing_point": -26
   },
-  {
-    "type": "ITEM",
-    "subtypes": [ "COMESTIBLE" ],
-    "id": "cooking_oil2",
-    "name": { "str_sp": "animal cooking oil" },
-    "copy-from": "cooking_oil",
-    "description": "Thin yellow animal oil used for cooking.",
-    "material": [ "flesh", "oil" ],
-    "delete": { "flags": [ "NUTRIENT_OVERRIDE" ] },
-    "vitamins": [ [ "meat_allergen", 1 ] ]
-  },
   {
     "type": "ITEM",
     "subtypes": [ "COMESTIBLE" ],

data/json/npcs/godco/members/foodguard.json

@@ -399,7 +399,6 @@
         "dry_corn",
         "salted_fish",
         "cooking_oil",
-        "cooking_oil2",
         "cornmeal",
         "flour",
         "fruit_wine",

data/json/npcs/items_generic.json

@@ -484,7 +484,6 @@
       [ "cookbook_mexican", 1 ],
       [ "cookies", 3 ],
       { "group": "vegetable_oil_bottle", "prob": 3 },
-      { "group": "animal_oil_bottle", "prob": 3 },
       [ "cordless_drill", 2 ],
       [ "corded_powerdrill", 2 ],
       [ "cornmeal", 3 ],

data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json

@@ -93,7 +93,6 @@
         "dry_veggy",
         "dry_fruit",
         "cooking_oil",
-        "cooking_oil2",
         "cornmeal",
         "flour",
         "fruit_wine",