diff --git a/data/json/itemgroups/food.json b/data/json/itemgroups/food.json
index 0fc61a29bfc81..6b4cf99671a47 100644
--- a/data/json/itemgroups/food.json
+++ b/data/json/itemgroups/food.json
@@ -53,7 +53,7 @@
     "type": "item_group",
     "items": [
       [ "birdfood", 10 ],
-      { "item": "dogfood", "prob": 45, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 45, "container-item": "can_medium" },
       { "item": "catfood", "prob": 45, "container-item": "can_food" }
     ]
   },
diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
index 2f09b9b4403b0..afe004ef10f85 100644
--- a/data/json/itemgroups/item_groups.json
+++ b/data/json/itemgroups/item_groups.json
@@ -381,7 +381,7 @@
       [ "atomic_lamp", 1 ],
       [ "dog_whistle", 5 ],
       [ "pet_carrier", 2 ],
-      { "item": "dogfood", "prob": 10, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 10, "container-item": "can_medium" },
       { "item": "catfood", "prob": 10, "container-item": "can_food" },
       [ "nic_gum", 2 ],
       [ "oxygen_tank", 2 ],
@@ -627,7 +627,7 @@
       [ "coffeemaker", 10 ],
       [ "atomic_coffeepot", 2 ],
       [ "dog_whistle", 5 ],
-      { "item": "dogfood", "prob": 20, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 20, "container-item": "can_medium" },
       { "item": "catfood", "prob": 20, "container-item": "can_food" },
       [ "salted_fish", 15 ],
       [ "charcoal", 5 ],
@@ -1765,7 +1765,7 @@
       [ "jar_sauerkraut_pickled", 5 ],
       [ "sports_drink", 10 ],
       [ "protein_shake", 10 ],
-      { "item": "dogfood", "prob": 5, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 5, "container-item": "can_medium" },
       { "item": "catfood", "prob": 5, "container-item": "can_food" },
       { "item": "fish_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
       [ "lutefisk", 1 ],
@@ -1794,7 +1794,7 @@
       { "item": "can_beans", "prob": 4, "charges": 12, "container-item": "can_food_big" },
       { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "can_food_big" },
       { "item": "can_pineapple", "prob": 4, "charges": 12, "container-item": "can_food_big" },
-      { "item": "can_corn", "prob": 4, "charges": 4, "container-item": "can_food_big" },
+      { "item": "can_corn", "prob": 4, "charges": 6, "container-item": "can_food_big" },
       { "item": "sauce_red", "prob": 3, "charges": 96, "container-item": "can_food_big" }
     ]
   },
@@ -8436,6 +8436,8 @@
     "items": [
       [ "can_food", 65 ],
       [ "can_food_unsealed", 65 ],
+      [ "can_medium", 65 ],
+      [ "can_medium_unsealed", 65 ],
       { "item": "scrap", "prob": 50, "charges-min": 1, "charges-max": 3 },
       { "item": "steel_chunk", "prob": 50, "charges-min": 1, "charges-max": 2 },
       { "item": "steel_lump", "prob": 50, "charges-min": 1, "charges-max": 2 },
diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json
index e8c9b1d061e5e..f3929c054a228 100644
--- a/data/json/itemgroups/locations.json
+++ b/data/json/itemgroups/locations.json
@@ -212,7 +212,7 @@
     "id": "petstore_misc",
     "type": "item_group",
     "items": [
-      { "item": "dogfood", "prob": 35, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 35, "container-item": "can_medium" },
       { "item": "catfood", "prob": 35, "container-item": "can_food" },
       [ "birdfood", 15 ],
       [ "dog_whistle", 15 ],
@@ -223,7 +223,7 @@
     "id": "petstore_shelves",
     "type": "item_group",
     "items": [
-      { "item": "dogfood", "prob": 30, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 30, "container-item": "can_medium" },
       { "item": "catfood", "prob": 30, "container-item": "can_food" },
       [ "birdfood", 15 ],
       [ "can_tuna", 15 ],
@@ -852,7 +852,7 @@
       [ "dog_whistle", 10 ],
       [ "pet_carrier", 30 ],
       [ "petpack", 3 ],
-      { "item": "dogfood", "prob": 30, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 30, "container-item": "can_medium" },
       { "item": "catfood", "prob": 30, "container-item": "can_food" },
       [ "birdfood", 10 ],
       [ "towel", 20 ],
diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json
index 6447cac17229c..3f538f80bcce1 100644
--- a/data/json/items/comestibles/dairy.json
+++ b/data/json/items/comestibles/dairy.json
@@ -26,21 +26,22 @@
     "id": "milk_evap",
     "name": "evaporated milk",
     "name_plural": "evaporated milk",
-    "weight": "20 g",
+    "weight": "266 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 25,
     "healthy": 1,
-    "calories": 132,
+    "calories": 207,
     "description": "Milk that's had about 60% of its water removed prior to canning.",
     "price": 38,
     "material": [ "milk" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
     "flags": [ "EATEN_COLD" ],
+    "charges": 2,
     "vitamins": [ [ "vitA", 10 ], [ "vitC", 4 ], [ "calcium", 25 ] ],
     "fun": 1
   },
@@ -256,7 +257,7 @@
     "weight": "32 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 12,
@@ -265,9 +266,9 @@
     "price": 70,
     "material": [ "milk", "junk" ],
     "primary_material": "milk",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
-    "charges": 10,
+    "charges": 20,
     "vitamins": [ [ "vitA", 2 ], [ "vitC", 1 ], [ "calcium", 7 ] ],
     "fun": 3
   }
diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
index fe8c862b4509b..4fad4ac86ff87 100644
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
@@ -108,7 +108,7 @@
     "weight": "238 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
@@ -116,8 +116,9 @@
     "description": "A dense, sweet creamy sauce, often used in curries.",
     "price": 350,
     "material": "fruit",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
+    "charges": 2,
     "vitamins": [ [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 43 ] ],
     "fun": 1
   },
@@ -295,29 +296,6 @@
     "flags": [ "EATEN_COLD" ],
     "fun": 5
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "con_milk",
-    "name": "condensed milk",
-    "name_plural": "condensed milk",
-    "weight": "32 g",
-    "color": "white",
-    "spoils_in": "1 day",
-    "container": "can_food",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": 12,
-    "calories": 103,
-    "description": "Cow's milk that has been partly dehydrated, and also sweetened.  A key ingredient in many sweets.",
-    "price": 70,
-    "material": [ "milk", "junk" ],
-    "primary_material": "milk",
-    "volume": "250 ml",
-    "phase": "liquid",
-    "charges": 10,
-    "vitamins": [ [ "vitA", 2 ], [ "vitC", 1 ], [ "calcium", 7 ] ],
-    "fun": 3
-  },
   {
     "type": "COMESTIBLE",
     "id": "creamsoda",
diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
index eaa708ec9cb96..3961e4f556d49 100644
--- a/data/json/items/comestibles/drink_other.json
+++ b/data/json/items/comestibles/drink_other.json
@@ -6,7 +6,7 @@
     "weight": "64 g",
     "color": "red",
     "spoils_in": "3 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 1,
@@ -15,8 +15,8 @@
     "price": 4,
     "//": "Small cans--needs upsized after the string freeze.",
     "material": "tomato",
-    "volume": "250 ml",
-    "charges": 4,
+    "volume": "500 ml",
+    "charges": 8,
     "phase": "liquid",
     "flags": [ "EATEN_HOT" ],
     "fun": 1
diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
index 4c8c8ddc58a86..17006885feefc 100644
--- a/data/json/items/comestibles/fruit_dishes.json
+++ b/data/json/items/comestibles/fruit_dishes.json
@@ -84,17 +84,18 @@
     "weight": "268 g",
     "color": "yellow",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
     "healthy": 1,
-    "calories": 209,
+    "calories": 104,
     "description": "Canned pineapple rings in water.  Quite tasty.",
     "price": 400,
     "material": "fruit",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "fun": 7,
+    "charges": 2,
     "vitamins": [ [ "vitC", 26 ], [ "calcium", 4 ], [ "iron", 6 ] ]
   },
   {
diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
index 16d8ced2eb02c..58928ab8dd049 100644
--- a/data/json/items/comestibles/meat_dishes.json
+++ b/data/json/items/comestibles/meat_dishes.json
@@ -383,19 +383,20 @@
     "type": "COMESTIBLE",
     "id": "can_spam",
     "name": "SPAM",
-    "weight": "84 g",
+    "//": "SPAM comes in cans of six 2 oz slices.  Each charge is one slice.",
+    "weight": "56 g",
     "color": "pink",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -3,
-    "calories": 270,
+    "calories": 180,
     "description": "A canned pork product that is unnaturally pink, oddly rubbery, and not very tasty, this SPAM remains quite filling.  Completely unappetizing, but quite filling.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
-    "charges": 2,
+    "volume": "500 ml",
+    "charges": 6,
     "flags": [ "EATEN_HOT" ],
     "fun": -8,
     "vitamins": [ [ "iron", 3 ] ]
@@ -487,15 +488,16 @@
     "weight": "170 g",
     "color": "light_red",
     "spoils_in": "2 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 393,
     "description": "Meat encased in little dough satchels.  Tastes fine raw.",
     "price": 250,
     "material": [ "flesh", "wheat" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "flags": [ "EATEN_HOT" ],
+    "charges": 2,
     "vitamins": [ [ "vitA", 6 ], [ "calcium", 16 ], [ "iron", 9 ] ]
   },
   {
@@ -506,7 +508,7 @@
     "weight": "253 g",
     "color": "red",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 1,
@@ -514,9 +516,10 @@
     "description": "A spicy stew containing chili peppers, meat, tomatoes and beans.",
     "price": 290,
     "material": [ "flesh", "veggy", "bean", "tomato" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "flags": [ "EATEN_HOT" ],
     "fun": 5,
+    "charges": 2,
     "vitamins": [ [ "vitA", 14 ], [ "vitC", 7 ], [ "calcium", 6 ], [ "iron", 27 ] ]
   },
   {
@@ -527,7 +530,7 @@
     "weight": "267 g",
     "color": "brown",
     "spoils_in": "1 day 12 hours",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -8,
@@ -535,7 +538,8 @@
     "description": "Greasy Prospector improved pork and beans with hickory smoked pig fat chunks.",
     "price": 200,
     "material": [ "flesh", "bean" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 5,
     "vitamins": [ [ "vitC", 6 ], [ "calcium", 14 ], [ "iron", 25 ] ]
@@ -581,20 +585,20 @@
     "type": "COMESTIBLE",
     "id": "can_chicken",
     "name": "canned chicken",
-    "weight": "54 g",
+    "weight": "217 g",
     "color": "pink",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "calories": 100,
+    "calories": 400,
     "description": "Bright white chicken-paste.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
-    "charges": 4,
+    "volume": "500 ml",
+    "charges": 2,
     "fun": 1,
-    "vitamins": [ [ "vitA", 3 ], [ "calcium", 1 ], [ "iron", 4 ], [ "vitB", 23 ] ]
+    "vitamins": [ [ "vitA", 18 ], [ "calcium", 3 ], [ "iron", 18 ], [ "vitB", 34 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -603,16 +607,16 @@
     "weight": "232 g",
     "color": "white",
     "spoils_in": "4 days",
-    "container": "can_food",
-    "//": "Small cans--needs properly Jarred after the string freeze.",
+    "container": "jar_glass",
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 465,
     "description": "Fish fillets pickled in some sort of tangy white sauce.",
     "price": 310,
     "material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "fun": 3,
+    "charges": 2,
     "vitamins": [ [ "calcium", 34 ], [ "iron", 34 ] ]
   },
   {
@@ -642,7 +646,7 @@
     "weight": "253 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 2,
@@ -650,7 +654,8 @@
     "description": "Delicious, lumpy, white soup made of clams and potatoes.  A taste of the lost glory of New England.",
     "price": 400,
     "material": [ "flesh", "milk" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 6,
     "vitamins": [ [ "vitA", 20 ], [ "vitC", 14 ], [ "calcium", 7 ], [ "iron", 16 ], [ "vitB", 348 ] ]
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 31ab474f86f18..32cb299e5f081 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -247,7 +247,7 @@
     "weight": "256 g",
     "color": "brown",
     "spoils_in": "2 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -1,
@@ -255,7 +255,8 @@
     "description": "Canned beans.  A staple among canned goods, these are reputedly good for one's coronary health.",
     "price": 150,
     "material": "bean",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "vitamins": [ [ "calcium", 9 ], [ "iron", 24 ] ]
   },
@@ -587,8 +588,8 @@
     "description": "This is food for dogs.  It smells strange, but dogs seem to love it.",
     "weight": "554 g",
     "spoils_in": "1 day",
-    "container": "can_food",
-    "volume": "250 ml",
+    "container": "can_medium",
+    "volume": "500 ml",
     "price": 300,
     "to_hit": -5,
     "material": "flesh",
diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json
index 798618e795902..c7097a40dbf85 100644
--- a/data/json/items/comestibles/soup.json
+++ b/data/json/items/comestibles/soup.json
@@ -6,7 +6,7 @@
     "weight": "253 g",
     "color": "yellow",
     "spoils_in": "6 days 16 hours",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 30,
@@ -14,7 +14,8 @@
     "description": "Vegetable stock.  Tasty and fairly nutritious.",
     "price": 350,
     "material": "veggy",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT" ],
     "fun": 1,
@@ -27,7 +28,7 @@
     "weight": "267 g",
     "color": "yellow",
     "spoils_in": "6 days 16 hours",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 30,
@@ -36,7 +37,8 @@
     "price": 350,
     "material": "bone",
     "primary_material": "water",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "NO_SALVAGE" ],
     "fun": 10,
@@ -58,7 +60,7 @@
     "weight": "254 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -67,7 +69,8 @@
     "description": "A nutritious and delicious hearty vegetable soup.",
     "price": 400,
     "material": "veggy",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 43 ], [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 5 ] ],
@@ -80,7 +83,7 @@
     "weight": "253 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -89,7 +92,8 @@
     "description": "A nutritious and delicious hearty meat soup.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 80 ], [ "vitC", 36 ], [ "calcium", 3 ], [ "iron", 13 ], [ "vitB", 20 ] ],
@@ -102,7 +106,7 @@
     "weight": "265 g",
     "color": "light_gray",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -111,7 +115,8 @@
     "description": "A nutritious and delicious hearty fish soup.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 12 ], [ "vitC", 28 ], [ "calcium", 4 ], [ "iron", 5 ], [ "vitB", 20 ] ],
@@ -125,7 +130,7 @@
     "weight": "263 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 13,
@@ -134,7 +139,8 @@
     "description": "Spicy, and filled with bits of peppers.  It's pretty good.",
     "price": 750,
     "material": "veggy",
-    "volume": "250 ml",
+    "charges": 2,
+    "volume": "500 ml",
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 178 ], [ "vitC", 35 ], [ "calcium", 4 ], [ "iron", 12 ] ],
@@ -148,7 +154,7 @@
     "weight": "289 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 13,
@@ -157,7 +163,7 @@
     "description": "Spicy, and filled with bits of peppers and meat!  It's pretty good.",
     "price": 750,
     "material": [ "flesh", "veggy" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
     "charges": 2,
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
@@ -171,7 +177,7 @@
     "weight": "250 g",
     "color": "red",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -180,7 +186,8 @@
     "description": "A nutritious and delicious soup, made of gifts of nature.",
     "price": 350,
     "material": [ "flesh", "veggy" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 20 ], [ "vitC", 9 ], [ "iron", 3 ], [ "vitB", 5 ] ],
@@ -190,7 +197,6 @@
     "type": "COMESTIBLE",
     "id": "soup_human",
     "copy-from": "soup_meat",
-    "calories": 550,
     "name": "sap soup",
     "description": "A soup made from someone who is a far better meal than person.",
     "material": "hflesh"
@@ -202,7 +208,7 @@
     "weight": "261 g",
     "color": "light_gray",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 15,
@@ -212,7 +218,8 @@
     "price": 580,
     "material": [ "flesh", "wheat" ],
     "primary_material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 10 ], [ "calcium", 1 ], [ "iron", 9 ], [ "vitB", 8 ] ],
@@ -225,18 +232,18 @@
     "weight": "266 g",
     "color": "light_gray",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 15,
     "healthy": 1,
-    "calories": 211,
+    "calories": 70,
     "description": "A mushy, gray semi-liquid soup made from mushrooms.",
     "price": 450,
     "material": "mushroom",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
-    "charges": 4,
+    "charges": 2,
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "fun": 1,
     "vitamins": [ [ "calcium", 2 ], [ "iron", 2 ] ]
@@ -271,7 +278,7 @@
     "weight": "263 g",
     "color": "light_gray",
     "spoils_in": "6 days 16 hours",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 10,
@@ -281,7 +288,8 @@
     "price": 500,
     "material": [ "flesh", "wheat" ],
     "primary_material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 81 ], [ "vitC", 7 ], [ "calcium", 9 ], [ "iron", 13 ], [ "vitB", 20 ] ],
@@ -294,7 +302,7 @@
     "weight": "261 g",
     "color": "white",
     "spoils_in": "5 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 8,
@@ -303,7 +311,8 @@
     "description": "A rich and tasty fish chowder from Scotland, made with preserved fish and creamy milk.",
     "price": 500,
     "material": [ "flesh", "milk" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
     "vitamins": [ [ "vitA", 15 ], [ "vitC", 8 ], [ "calcium", 7 ], [ "iron", 7 ], [ "vitB", 8 ] ],
diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json
index e744c3679d430..a215550531922 100644
--- a/data/json/items/comestibles/veggy_dishes.json
+++ b/data/json/items/comestibles/veggy_dishes.json
@@ -113,11 +113,18 @@
     "id": "can_corn",
     "name": "corn",
     "name_plural": "corn",
-    "copy-from": "corn",
+    "comestible_type": "FOOD",
+    "weight": "178 g",
+    "color": "yellow",
+    "symbol": "%",
+    "material": "veggy",
+    "vitamins": [ [ "vitA", 6 ], [ "vitC", 3 ], [ "iron", 3 ] ],
     "spoils_in": "2 days",
-    "container": "can_food",
+    "container": "can_medium",
     "quench": 5,
-    "calories": 260,
+    "calories": 152,
+    "volume": "500 ml",
+    "charges": 2,
     "description": "Canned corn in water.  Eat up!",
     "price": 200,
     "flags": [ "EATEN_HOT" ]
diff --git a/data/json/items/containers.json b/data/json/items/containers.json
index a386b62ec941f..03575ec2c3259 100644
--- a/data/json/items/containers.json
+++ b/data/json/items/containers.json
@@ -438,8 +438,9 @@
     "id": "can_food",
     "type": "CONTAINER",
     "category": "container",
-    "name": "tin can",
-    "description": "A tin can, like what beans come in.",
+    "name": "small tin can",
+    "description": "A small tin can, like what tuna comes in.",
+    "//": "Represents a 4 cm radius x 5 cm height steel can.",
     "weight": "40 g",
     "volume": "250 ml",
     "price": 0,
@@ -455,14 +456,38 @@
     "id": "can_food_unsealed",
     "copy-from": "can_food",
     "type": "CONTAINER",
-    "name": "opened tin can",
-    "description": "A tin can, like what beans come in.  This one is opened and can't be easily sealed.",
+    "name": "small opened tin can",
+    "description": "A small tin can, like what tuna comes in.  This one is opened and can't be easily sealed.",
     "symbol": ")",
     "color": "blue",
     "preserves": false,
     "unseals_into": "null",
     "qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 2 ] ]
   },
+  {
+    "id": "can_medium",
+    "copy-from": "can_food",
+    "type": "CONTAINER",
+    "name": "medium tin can",
+    "description": "A medium tin can, like what soup comes in.",
+    "//": "Represents a 4 cm radius x 10 cm height steel can.",
+    "looks_like": "can_food",
+    "weight": "70 g",
+    "volume": "500 ml",
+    "contains": "500 ml",
+    "unseals_into": "can_medium_unsealed"
+  },
+  {
+    "id": "can_medium_unsealed",
+    "copy-from": "can_medium",
+    "type": "CONTAINER",
+    "name": "medium opened tin can",
+    "description": "A medium tin can, like what soup comes in.  This one is opened and can't be easily sealed.",
+    "looks_like": "can_food_unsealed",
+    "preserves": false,
+    "unseals_into": "null",
+    "qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 2 ] ]
+  },
   {
     "id": "canteen",
     "type": "CONTAINER",
diff --git a/data/json/items/migration.json b/data/json/items/migration.json
index c0a79915b0c58..00763f9506785 100644
--- a/data/json/items/migration.json
+++ b/data/json/items/migration.json
@@ -201,7 +201,7 @@
   {
     "id": "dogfood_canned",
     "type": "MIGRATION",
-    "replace": "can_food",
+    "replace": "can_medium",
     "contents": [ "dogfood" ]
   },
   {
diff --git a/data/json/mapgen/animalshelter.json b/data/json/mapgen/animalshelter.json
index f84f3d6fb4b88..893bf99886489 100644
--- a/data/json/mapgen/animalshelter.json
+++ b/data/json/mapgen/animalshelter.json
@@ -36,7 +36,7 @@
     "items": [
       [ "dog_whistle", 10 ],
       [ "pet_carrier", 30 ],
-      { "item": "dogfood", "prob": 50, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 50, "container-item": "can_medium" },
       { "item": "catfood", "prob": 50, "container-item": "can_food" },
       [ "towel", 20 ],
       [ "soap", 10 ],
diff --git a/data/json/mapgen/prison_1.json b/data/json/mapgen/prison_1.json
index 50f4595fb32a2..550cf629684d0 100644
--- a/data/json/mapgen/prison_1.json
+++ b/data/json/mapgen/prison_1.json
@@ -580,7 +580,7 @@
   {
     "id": "prison_canine_food",
     "type": "item_group",
-    "items": [ { "item": "dogfood", "prob": 100, "container-item": "can_food" } ]
+    "items": [ { "item": "dogfood", "prob": 100, "container-item": "can_medium" } ]
   },
   {
     "id": "prison_canine_bowl",
diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json
index 4df523369e68c..77a499198fd45 100644
--- a/data/json/npcs/items_generic.json
+++ b/data/json/npcs/items_generic.json
@@ -497,7 +497,7 @@
       [ "diveknife", 1 ],
       [ "diving_watch", 1 ],
       [ "dog_whistle", 3 ],
-      { "item": "dogfood", "prob": 3, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 3, "container-item": "can_medium" },
       [ "doublespeargun", 1 ],
       [ "drink_boozeberry", 1 ],
       [ "drink_rumcola", 1 ],
diff --git a/data/json/recipes/food/pasta.json b/data/json/recipes/food/pasta.json
index 4599663dbffb9..a7f125f832ccf 100644
--- a/data/json/recipes/food/pasta.json
+++ b/data/json/recipes/food/pasta.json
@@ -54,7 +54,7 @@
         [ "can_tomato", 1 ],
         [ "wild_herbs", 10 ]
       ],
-      [ [ "meat_red", 1, "LIST" ], [ "can_chicken", 2 ], [ "dry_meat", 1 ] ]
+      [ [ "meat_red", 1, "LIST" ], [ "can_chicken", 1 ], [ "dry_meat", 1 ] ]
     ]
   },
   {
@@ -81,7 +81,7 @@
         [ "wild_herbs", 10 ]
       ],
       [ [ "cheese", 1 ], [ "cheese_hard", 1 ], [ "can_cheese", 1 ] ],
-      [ [ "meat_red", 1, "LIST" ], [ "can_chicken", 2 ], [ "dry_meat", 1 ] ]
+      [ [ "meat_red", 1, "LIST" ], [ "can_chicken", 1 ], [ "dry_meat", 1 ] ]
     ]
   },
   {
@@ -238,7 +238,7 @@
         [ "can_salmon", 1 ],
         [ "can_tuna", 1 ],
         [ "bacon", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "sausage", 1 ],
         [ "bratwurst_sausage", 1 ]
       ],
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index 8fd1e41c8cc3a..dda3602131a13 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -1052,14 +1052,13 @@
     "time": "30 m",
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
-    "result_mult": 2,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
     "components": [
       [ [ "water", 11 ], [ "water_clean", 11 ] ],
       [ [ "jar_glass", 1 ] ],
-      [ [ "meat", 2 ], [ "fish", 2 ] ],
-      [ [ "veggy", 2 ], [ "veggy_wild", 2 ] ]
+      [ [ "meat", 1 ], [ "fish", 1 ] ],
+      [ [ "veggy", 1 ], [ "veggy_wild", 1 ] ]
     ]
   },
   {
@@ -1082,7 +1081,7 @@
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "can_medium_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
       [ [ "water", 1 ], [ "water_clean", 1 ] ],
       [ [ "meat", 1 ], [ "fish", 1 ] ],
@@ -1100,7 +1099,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "result_mult": 6,
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -1108,8 +1107,8 @@
     "components": [
       [ [ "water", 16 ], [ "water_clean", 16 ] ],
       [ [ "jar_3l_glass", 1 ] ],
-      [ [ "meat", 12 ], [ "fish", 12 ] ],
-      [ [ "veggy", 12 ], [ "veggy_wild", 12 ] ]
+      [ [ "meat", 6 ], [ "fish", 6 ] ],
+      [ [ "veggy", 6 ], [ "veggy_wild", 6 ] ]
     ]
   },
   {
@@ -1444,7 +1443,7 @@
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ],
-    "components": [ [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 2 ] ], [ [ "nachos", 3 ] ] ]
+    "components": [ [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ], [ [ "nachos", 3 ] ] ]
   },
   {
     "type": "recipe",
@@ -1458,7 +1457,7 @@
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ],
     "components": [
-      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 2 ] ],
+      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ],
       [ [ "cheese", 1 ], [ "cheese_hard", 1 ], [ "can_cheese", 1 ] ],
       [ [ "nachos", 3 ] ]
     ]
@@ -1841,6 +1840,7 @@
   {
     "type": "recipe",
     "result": "can_coconut",
+    "charges": 1,
     "byproducts": [ [ "juice_pulp", 2 ] ],
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_DRINKS",
@@ -2325,37 +2325,18 @@
     "skill_used": "cooking",
     "difficulty": 2,
     "time": "20 m",
+    "charges": 1,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "water", 1 ], [ "water_clean", 1 ] ],
-      [
-        [ "veggy_any", 1, "LIST" ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ]
-      ],
-      [
-        [ "seasoning_italian", 4 ],
-        [ "wild_herbs", 4 ],
-        [ "seasoning_salt", 1 ],
-        [ "soysauce", 2 ],
-        [ "pepper", 4 ],
-        [ "garlic_clove", 2 ],
-        [ "salt_water", 1 ],
-        [ "salt", 1 ]
-      ]
-    ]
+    "using": [ [ "broth_ingredients", 1 ] ],
+    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
   {
     "type": "recipe",
     "result": "broth_bone",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
@@ -2370,6 +2351,7 @@
   {
     "type": "recipe",
     "result": "broth_human",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
@@ -2381,6 +2363,76 @@
     "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ],
     "components": [ [ [ "bone_human", 10 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "broth",
+    "id_suffix": "canned",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "24 m",
+    "autolearn": true,
+    "contained": true,
+    "batch_time_factors": [ 83, 5 ],
+    "qualities": [
+      { "id": "SAW_M", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
+    "using": [ [ "broth_ingredients", 2 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "broth_bone",
+    "id_suffix": "canned",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "24 m",
+    "autolearn": true,
+    "contained": true,
+    "batch_time_factors": [ 83, 5 ],
+    "qualities": [
+      { "id": "SAW_M", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "bone", 20 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "broth_human",
+    "id_suffix": "canned",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "24 m",
+    "autolearn": true,
+    "contained": true,
+    "batch_time_factors": [ 83, 5 ],
+    "book_learn": [ [ "cookbook_human", 4 ] ],
+    "qualities": [
+      { "id": "SAW_M", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "CUT", "level": 1 },
+      { "id": "COOK", "level": 3 }
+    ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
+    "components": [
+      [ [ "can_medium_unsealed", 1 ] ],
+      [ [ "scrap", 1 ] ],
+      [ [ "bone_human", 20 ] ],
+      [ [ "water", 2 ], [ "water_clean", 2 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "result": "soup_mushroom",
@@ -2389,16 +2441,12 @@
     "skill_used": "cooking",
     "difficulty": 2,
     "time": "20 m",
-    "charges": 2,
+    "charges": 1,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 1 ] ],
-      [ [ "mushroom", 6 ], [ "mushroom_cooked", 6 ], [ "dry_mushroom", 6 ], [ "morel_cooked", 6 ] ],
-      [ [ "flour", 5 ] ]
-    ]
+    "using": [ [ "mushroom_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2412,18 +2460,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ] ],
-      [ [ "flour", 20 ], [ "starch", 2 ] ],
-      [ [ "mushroom", 12 ], [ "mushroom_cooked", 12 ], [ "dry_mushroom", 12 ], [ "morel_cooked", 12 ] ]
-    ]
+    "using": [ [ "mushroom_soup_ingredients", 2 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -2444,17 +2487,33 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ] ],
-      [ [ "flour", 10 ], [ "starch", 1 ] ],
-      [ [ "mushroom", 6 ], [ "mushroom_cooked", 6 ], [ "dry_mushroom", 6 ], [ "morel_cooked", 6 ] ]
-    ]
+    "using": [ [ "mushroom_soup_ingredients", 2 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "soup_mushroom",
+    "id_suffix": "jarred_3l",
+    "byproducts": [ [ "water", 10 ] ],
+    "container": "jar_3l_glass_sealed",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "skills_required": [ "mechanics", 1 ],
+    "difficulty": 4,
+    "time": "40 m",
+    "charges": 12,
+    "autolearn": true,
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
+    "using": [ [ "mushroom_soup_ingredients", 12 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
     "result": "soup_veggy",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
     "skill_used": "cooking",
@@ -2464,36 +2523,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "veggy_green", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "tofu", 1 ],
-        [ "dry_tofu", 1 ],
-        [ "raw_edamame", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "veggy_any", 1, "LIST" ] ]
-    ]
+    "using": [ [ "veggy_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2508,34 +2538,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "cabbage", 1 ],
-        [ "irradiated_cabbage", 1 ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 2 ] ]
-    ]
+    "using": [ [ "meat_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2550,61 +2553,12 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "veggy_any", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "can_corn", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "con_milk", 1 ],
-        [ "flatbread", 1 ],
-        [ "tortilla_corn", 1 ],
-        [ "bread", 1 ],
-        [ "cornbread", 1 ],
-        [ "biscuit", 1 ],
-        [ "hardtack", 1 ],
-        [ "wastebread", 1 ],
-        [ "sourdough_bread", 1 ],
-        [ "flour", 2 ],
-        [ "cornmeal", 2 ],
-        [ "milk_powder", 1 ],
-        [ "crackers", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [
-        [ "fish", 2 ],
-        [ "dry_fish", 2 ],
-        [ "fish_smoked", 2 ],
-        [ "fish_pickled", 2 ],
-        [ "salted_fish", 2 ],
-        [ "fish_canned", 2 ],
-        [ "can_salmon", 2 ],
-        [ "can_tuna", 2 ]
-      ]
-    ]
+    "using": [ [ "fish_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
     "result": "soup_woods",
+    "charges": 2,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
@@ -2614,44 +2568,7 @@
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "pine_tea", 1 ] ],
-      [
-        [ "meat_nofish", 1, "LIST" ],
-        [ "fish", 1 ],
-        [ "fish_smoked", 1 ],
-        [ "dry_fish", 1 ],
-        [ "rehydrated_fish", 1 ],
-        [ "fish_canned", 1 ],
-        [ "can_salmon", 1 ],
-        [ "can_tuna", 1 ],
-        [ "sausage", 1 ],
-        [ "sausage_cooked", 1 ],
-        [ "bratwurst_sausage", 1 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ]
-      ],
-      [
-        [ "veggy_wild", 1 ],
-        [ "veggy", 1 ],
-        [ "rehydrated_veggy", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "dry_beans", 1 ],
-        [ "can_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ]
-    ]
+    "using": [ [ "woods_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2661,38 +2578,12 @@
     "skill_used": "cooking",
     "difficulty": 2,
     "time": "20 m",
-    "charges": 1,
+    "charges": 2,
     "batch_time_factors": [ 80, 4 ],
     "book_learn": [ [ "cookbook_human", 2 ] ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [
-      [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "broth_human", 2 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "cabbage", 1 ],
-        [ "irradiated_cabbage", 1 ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "dry_hflesh", 1 ], [ "rehydrated_hflesh", 1 ], [ "human_meat", 1, "LIST" ] ]
-    ]
+    "using": [ [ "human_soup_ingredients", 1 ] ]
   },
   {
     "type": "recipe",
@@ -2890,7 +2781,7 @@
     "tools": [ [ [ "char_smoker", 10 ] ] ],
     "components": [
       [ [ "syrup", 1 ] ],
-      [ [ "meat_red", 3, "LIST" ], [ "can_chicken", 6 ] ],
+      [ [ "meat_red", 3, "LIST" ], [ "can_chicken", 3 ] ],
       [ [ "edible_fat", 1, "LIST" ], [ "edible_tallow_lard", 2, "LIST" ] ],
       [
         [ "salt", 10 ],
@@ -3049,7 +2940,7 @@
         [ "meat_smoked", 1 ],
         [ "dry_meat", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish", 1 ],
         [ "fish_smoked", 1 ],
         [ "dry_fish", 1 ],
@@ -3132,7 +3023,7 @@
         [ "meat_smoked", 1 ],
         [ "dry_meat", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish", 1 ],
         [ "fish_smoked", 1 ],
         [ "dry_fish", 1 ],
@@ -3214,7 +3105,7 @@
         [ "meat_smoked", 1 ],
         [ "dry_meat", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish", 1 ],
         [ "fish_smoked", 1 ],
         [ "dry_fish", 1 ],
@@ -3650,7 +3541,7 @@
         [ "meat_salted", 1 ],
         [ "meat_canned", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish_pickled", 1 ],
         [ "salted_fish", 1 ],
         [ "fish_canned", 1 ],
@@ -3692,7 +3583,7 @@
         [ "meat_salted", 1 ],
         [ "meat_canned", 1 ],
         [ "can_chicken", 1 ],
-        [ "can_spam", 1 ],
+        [ "can_spam", 2 ],
         [ "fish_pickled", 1 ],
         [ "salted_fish", 1 ],
         [ "fish_canned", 1 ],
@@ -4092,6 +3983,7 @@
   {
     "type": "recipe",
     "result": "curry_meat",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
@@ -4126,6 +4018,7 @@
   {
     "type": "recipe",
     "result": "curry_veggy",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
     "skill_used": "cooking",
@@ -4575,49 +4468,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "pine_tea", 2 ] ],
-      [
-        [ "meat_nofish", 2, "LIST" ],
-        [ "fish", 2 ],
-        [ "fish_smoked", 2 ],
-        [ "dry_fish", 2 ],
-        [ "rehydrated_fish", 2 ],
-        [ "fish_canned", 2 ],
-        [ "can_salmon", 2 ],
-        [ "can_tuna", 2 ],
-        [ "sausage", 4 ],
-        [ "sausage_cooked", 4 ],
-        [ "bratwurst_sausage", 4 ],
-        [ "powder_eggs", 4 ],
-        [ "eggs_bird", 4, "LIST" ],
-        [ "egg_reptile", 4 ]
-      ],
-      [
-        [ "veggy_wild", 2 ],
-        [ "veggy", 2 ],
-        [ "rehydrated_veggy", 2 ],
-        [ "dry_veggy", 2 ],
-        [ "dry_beans", 2 ],
-        [ "can_beans", 2 ],
-        [ "raw_beans", 2 ],
-        [ "beans_cooked", 2 ],
-        [ "dry_rice", 2 ],
-        [ "dandelion_cooked", 2 ],
-        [ "mushroom", 2 ],
-        [ "dry_mushroom", 2 ],
-        [ "mushroom_cooked", 2 ],
-        [ "morel_cooked", 2 ],
-        [ "acorns_cooked", 2 ]
-      ]
-    ]
+    "using": [ [ "woods_soup_ingredients", 1 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4631,38 +4488,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
-      [
-        [ "irradiated_potato", 2 ],
-        [ "potato", 2 ],
-        [ "celery", 2 ],
-        [ "irradiated_celery", 2 ],
-        [ "veggy_green", 2, "LIST" ],
-        [ "sauerkraut", 2 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ],
-        [ "can_beans", 2 ],
-        [ "beans_cooked", 2 ],
-        [ "spaghetti_raw", 2 ],
-        [ "macaroni_raw", 2 ],
-        [ "noodles_fast", 2 ],
-        [ "dry_beans", 2 ],
-        [ "raw_beans", 2 ],
-        [ "dry_rice", 2 ],
-        [ "dandelion_cooked", 2 ],
-        [ "acorns_cooked", 2 ]
-      ],
-      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 2 ] ]
-    ]
+    "using": [ [ "meat_soup_ingredients", 1 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4676,41 +4508,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ] ],
-      [
-        [ "irradiated_potato", 2 ],
-        [ "potato", 2 ],
-        [ "celery", 2 ],
-        [ "irradiated_celery", 2 ],
-        [ "veggy_green", 2, "LIST" ],
-        [ "sauerkraut", 2 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ],
-        [ "can_beans", 2 ],
-        [ "beans_cooked", 2 ],
-        [ "spaghetti_raw", 2 ],
-        [ "macaroni_raw", 2 ],
-        [ "noodles_fast", 2 ],
-        [ "dry_beans", 2 ],
-        [ "raw_beans", 2 ],
-        [ "tofu", 2 ],
-        [ "dry_tofu", 2 ],
-        [ "raw_edamame", 2 ],
-        [ "dry_rice", 2 ],
-        [ "dandelion_cooked", 2 ],
-        [ "acorns_cooked", 2 ]
-      ],
-      [ [ "veggy_any", 2, "LIST" ] ]
-    ]
+    "using": [ [ "veggy_soup_ingredients", 2 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4724,64 +4528,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "veggy_any", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "can_corn", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "con_milk", 1 ],
-        [ "flatbread", 1 ],
-        [ "tortilla_corn", 1 ],
-        [ "bread", 1 ],
-        [ "cornbread", 1 ],
-        [ "biscuit", 1 ],
-        [ "hardtack", 1 ],
-        [ "wastebread", 1 ],
-        [ "sourdough_bread", 1 ],
-        [ "flour", 2 ],
-        [ "cornmeal", 2 ],
-        [ "milk_powder", 1 ],
-        [ "crackers", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [
-        [ "fish", 2 ],
-        [ "dry_fish", 2 ],
-        [ "fish_smoked", 2 ],
-        [ "fish_pickled", 2 ],
-        [ "salted_fish", 2 ],
-        [ "fish_canned", 2 ],
-        [ "can_salmon", 2 ],
-        [ "can_tuna", 2 ]
-      ]
-    ]
+    "using": [ [ "fish_soup_ingredients", 1 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4794,39 +4547,14 @@
     "skill_used": "cooking",
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
-    "time": "30 m",
-    "result_mult": 2,
-    "book_learn": [ [ "cookbook_human", 4 ] ],
-    "batch_time_factors": [ 80, 4 ],
-    "qualities": [ { "id": "COOK", "level": 3 } ],
-    "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 2 ], [ "broth_human", 2 ], [ "broth_bone", 1 ] ],
-      [
-        [ "irradiated_potato", 2 ],
-        [ "potato", 2 ],
-        [ "celery", 2 ],
-        [ "irradiated_celery", 2 ],
-        [ "cabbage", 2 ],
-        [ "irradiated_cabbage", 2 ],
-        [ "sauerkraut", 2 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ],
-        [ "can_beans", 2 ],
-        [ "spaghetti_raw", 2 ],
-        [ "macaroni_raw", 2 ],
-        [ "noodles_fast", 2 ],
-        [ "dry_beans", 2 ],
-        [ "raw_beans", 2 ],
-        [ "dry_rice", 2 ],
-        [ "beans_cooked", 2 ],
-        [ "acorns_cooked", 2 ]
-      ],
-      [ [ "dry_hflesh", 2 ], [ "rehydrated_hflesh", 2 ], [ "human_meat", 2, "LIST" ] ]
-    ]
+    "time": "30 m",
+    "charges": 2,
+    "book_learn": [ [ "cookbook_human", 4 ] ],
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
+    "using": [ [ "human_soup_ingredients", 1 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -4840,35 +4568,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_glass", 1 ] ],
-      [ [ "water", 12 ], [ "water_clean", 12 ] ],
-      [
-        [ "veggy_any", 2, "LIST" ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ],
-        [ "mushroom_cooked", 2 ],
-        [ "morel_cooked", 2 ],
-        [ "mushroom", 2 ],
-        [ "dry_mushroom", 2 ]
-      ],
-      [
-        [ "seasoning_italian", 6 ],
-        [ "wild_herbs", 6 ],
-        [ "seasoning_salt", 2 ],
-        [ "soysauce", 2 ],
-        [ "pepper", 2 ],
-        [ "garlic_clove", 1 ],
-        [ "salt_water", 1 ],
-        [ "salt", 2 ]
-      ]
-    ]
+    "using": [ [ "broth_ingredients", 2 ] ],
+    "components": [ [ [ "jar_glass", 1 ] ], [ [ "water", 12 ], [ "water_clean", 12 ] ] ]
   },
   {
     "type": "recipe",
@@ -4882,7 +4588,7 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "1 h",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
@@ -4901,7 +4607,7 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "1 h",
-    "result_mult": 2,
+    "charges": 2,
     "book_learn": [ [ "cookbook_human", 4 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
@@ -5046,6 +4752,7 @@
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "2 m 45 s",
+    "batch_time_factors": [ 80, 2 ],
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
@@ -5832,6 +5539,7 @@
   {
     "type": "recipe",
     "result": "sloppyjoe",
+    "charges": 2,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
@@ -6426,7 +6134,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "30 m",
-    "result_mult": 2,
+    "charges": 2,
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -6608,10 +6316,10 @@
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "can_medium_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
       [ [ "water", 1 ], [ "water_clean", 1 ] ],
-      [ [ "beans_cooked", 1 ], [ "dry_beans", 1 ], [ "raw_beans", 1 ] ]
+      [ [ "beans_cooked", 2 ], [ "dry_beans", 2 ], [ "raw_beans", 2 ] ]
     ]
   },
   {
@@ -6633,48 +6341,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "pine_tea", 1 ] ],
-      [
-        [ "meat_nofish", 1, "LIST" ],
-        [ "rehydrated_meat", 1 ],
-        [ "meat_canned", 1 ],
-        [ "can_chicken", 1 ],
-        [ "fish", 1 ],
-        [ "fish_smoked", 1 ],
-        [ "dry_fish", 1 ],
-        [ "rehydrated_fish", 1 ],
-        [ "fish_canned", 1 ],
-        [ "can_salmon", 1 ],
-        [ "can_tuna", 1 ],
-        [ "sausage", 2 ],
-        [ "sausage_cooked", 2 ],
-        [ "bratwurst_sausage", 2 ],
-        [ "bacon", 2 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ]
-      ],
-      [
-        [ "veggy_wild", 1 ],
-        [ "veggy", 1 ],
-        [ "rehydrated_veggy", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "dry_beans", 1 ],
-        [ "can_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dry_rice", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ]
-    ]
+    "using": [ [ "woods_soup_ingredients", 1 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -6695,33 +6363,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "veggy_green", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "veggy_any", 1, "LIST" ] ]
-    ]
+    "using": [ [ "veggy_soup_ingredients", 2 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -6742,33 +6385,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ], [ "broth_bone", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "veggy_green", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ]
-    ]
+    "using": [ [ "meat_soup_ingredients", 1 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -6789,34 +6407,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "//": "This recipe currently has issues with not being able to give it a result_mult or charges. As such, limited ingredients will make it function with the values for meat.",
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ], [ "broth_bone", 1 ], [ "broth_human", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "irradiated_potato", 1 ],
-        [ "potato", 1 ],
-        [ "celery", 1 ],
-        [ "irradiated_celery", 1 ],
-        [ "cabbage", 1 ],
-        [ "irradiated_cabbage", 1 ],
-        [ "sauerkraut", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "can_beans", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_rice", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [ [ "dry_hflesh", 1 ], [ "rehydrated_hflesh", 1 ], [ "human_meat", 1, "LIST" ] ]
-    ]
+    "using": [ [ "human_soup_ingredients", 1 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -6837,59 +6429,8 @@
       { "id": "COOK", "level": 3 }
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
-    "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
-      [ [ "scrap", 1 ] ],
-      [ [ "broth", 1 ], [ "broth_bone", 1 ] ],
-      [
-        [ "spaghetti_raw", 1 ],
-        [ "macaroni_raw", 1 ],
-        [ "noodles_fast", 1 ],
-        [ "veggy_any", 1, "LIST" ],
-        [ "sauerkraut", 1 ],
-        [ "can_corn", 1 ],
-        [ "dry_veggy", 1 ],
-        [ "con_milk", 1 ],
-        [ "flatbread", 1 ],
-        [ "tortilla_corn", 1 ],
-        [ "bread", 1 ],
-        [ "cornbread", 1 ],
-        [ "biscuit", 1 ],
-        [ "hardtack", 1 ],
-        [ "wastebread", 1 ],
-        [ "sourdough_bread", 1 ],
-        [ "flour", 1 ],
-        [ "cornmeal", 1 ],
-        [ "milk_powder", 1 ],
-        [ "crackers", 1 ],
-        [ "powder_eggs", 1 ],
-        [ "eggs_bird", 1, "LIST" ],
-        [ "egg_reptile", 1 ],
-        [ "dry_beans", 1 ],
-        [ "raw_beans", 1 ],
-        [ "dry_lentils", 1 ],
-        [ "raw_lentils", 1 ],
-        [ "dry_rice", 1 ],
-        [ "can_beans", 1 ],
-        [ "beans_cooked", 1 ],
-        [ "dandelion_cooked", 1 ],
-        [ "mushroom", 1 ],
-        [ "dry_mushroom", 1 ],
-        [ "mushroom_cooked", 1 ],
-        [ "morel_cooked", 1 ],
-        [ "acorns_cooked", 1 ]
-      ],
-      [
-        [ "fish", 1 ],
-        [ "dry_fish", 1 ],
-        [ "fish_smoked", 1 ],
-        [ "fish_pickled", 1 ],
-        [ "salted_fish", 1 ],
-        [ "fish_canned", 1 ],
-        [ "can_salmon", 1 ],
-        [ "can_tuna", 1 ]
-      ]
-    ]
+    "using": [ [ "fish_soup_ingredients", 1 ] ],
+    "components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -7348,6 +6889,7 @@
   {
     "type": "recipe",
     "result": "soup_cullenskink",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
@@ -8072,7 +7614,7 @@
     "time": "40 m",
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
-    "result_mult": 12,
+    "charges": 12,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
     "components": [
@@ -8094,7 +7636,7 @@
     "time": "40 m",
     "autolearn": true,
     "batch_time_factors": [ 83, 5 ],
-    "result_mult": 12,
+    "charges": 12,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
     "components": [
@@ -8226,52 +7768,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ], [ "broth_bone", 12 ], [ "pine_tea", 12 ] ],
-      [
-        [ "meat_nofish", 12, "LIST" ],
-        [ "rehydrated_meat", 12 ],
-        [ "meat_canned", 12 ],
-        [ "fish", 12 ],
-        [ "fish_smoked", 12 ],
-        [ "dry_fish", 12 ],
-        [ "rehydrated_fish", 12 ],
-        [ "fish_canned", 12 ],
-        [ "can_salmon", 12 ],
-        [ "can_tuna", 12 ],
-        [ "sausage", 24 ],
-        [ "sausage_cooked", 24 ],
-        [ "bratwurst_sausage", 24 ],
-        [ "bacon", 24 ],
-        [ "powder_eggs", 24 ],
-        [ "eggs_bird", 24, "LIST" ],
-        [ "egg_reptile", 24 ]
-      ],
-      [
-        [ "veggy_wild", 12 ],
-        [ "veggy", 12 ],
-        [ "rehydrated_veggy", 12 ],
-        [ "dry_veggy", 12 ],
-        [ "dry_beans", 12 ],
-        [ "can_beans", 12 ],
-        [ "raw_beans", 12 ],
-        [ "beans_cooked", 12 ],
-        [ "dry_rice", 12 ],
-        [ "dandelion_cooked", 12 ],
-        [ "mushroom", 12 ],
-        [ "dry_mushroom", 12 ],
-        [ "mushroom_cooked", 12 ],
-        [ "morel_cooked", 12 ],
-        [ "acorns_cooked", 12 ]
-      ]
-    ]
+    "using": [ [ "woods_soup_ingredients", 6 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8285,38 +7788,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ], [ "broth_bone", 12 ] ],
-      [
-        [ "irradiated_potato", 6 ],
-        [ "potato", 6 ],
-        [ "celery", 6 ],
-        [ "irradiated_celery", 6 ],
-        [ "veggy_green", 6, "LIST" ],
-        [ "sauerkraut", 6 ],
-        [ "powder_eggs", 6 ],
-        [ "eggs_bird", 6, "LIST" ],
-        [ "egg_reptile", 6 ],
-        [ "can_beans", 6 ],
-        [ "beans_cooked", 6 ],
-        [ "spaghetti_raw", 6 ],
-        [ "macaroni_raw", 6 ],
-        [ "noodles_fast", 6 ],
-        [ "dry_beans", 6 ],
-        [ "raw_beans", 6 ],
-        [ "dry_rice", 6 ],
-        [ "dandelion_cooked", 6 ],
-        [ "acorns_cooked", 6 ]
-      ],
-      [ [ "meat_red", 6, "LIST" ], [ "dry_meat", 6 ], [ "can_chicken", 12 ] ]
-    ]
+    "using": [ [ "meat_soup_ingredients", 6 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8330,38 +7808,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ] ],
-      [
-        [ "irradiated_potato", 12 ],
-        [ "potato", 12 ],
-        [ "celery", 12 ],
-        [ "irradiated_celery", 12 ],
-        [ "veggy_green", 12, "LIST" ],
-        [ "sauerkraut", 12 ],
-        [ "powder_eggs", 12 ],
-        [ "eggs_bird", 12, "LIST" ],
-        [ "egg_reptile", 12 ],
-        [ "can_beans", 12 ],
-        [ "beans_cooked", 12 ],
-        [ "spaghetti_raw", 12 ],
-        [ "macaroni_raw", 12 ],
-        [ "noodles_fast", 12 ],
-        [ "dry_beans", 12 ],
-        [ "raw_beans", 12 ],
-        [ "dry_rice", 12 ],
-        [ "dandelion_cooked", 12 ],
-        [ "acorns_cooked", 12 ]
-      ],
-      [ [ "veggy_any", 12, "LIST" ] ]
-    ]
+    "using": [ [ "veggy_soup_ingredients", 12 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8375,64 +7828,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ], [ "broth_bone", 12 ] ],
-      [
-        [ "spaghetti_raw", 6 ],
-        [ "macaroni_raw", 6 ],
-        [ "noodles_fast", 6 ],
-        [ "veggy_any", 6, "LIST" ],
-        [ "sauerkraut", 6 ],
-        [ "can_corn", 6 ],
-        [ "dry_veggy", 6 ],
-        [ "con_milk", 6 ],
-        [ "flatbread", 6 ],
-        [ "tortilla_corn", 6 ],
-        [ "bread", 6 ],
-        [ "cornbread", 6 ],
-        [ "biscuit", 6 ],
-        [ "hardtack", 6 ],
-        [ "wastebread", 6 ],
-        [ "sourdough_bread", 6 ],
-        [ "flour", 12 ],
-        [ "cornmeal", 12 ],
-        [ "milk_powder", 6 ],
-        [ "crackers", 6 ],
-        [ "powder_eggs", 6 ],
-        [ "eggs_bird", 6, "LIST" ],
-        [ "egg_reptile", 6 ],
-        [ "dry_beans", 6 ],
-        [ "raw_beans", 6 ],
-        [ "dry_lentils", 6 ],
-        [ "raw_lentils", 6 ],
-        [ "dry_rice", 6 ],
-        [ "can_beans", 6 ],
-        [ "beans_cooked", 6 ],
-        [ "dandelion_cooked", 6 ],
-        [ "mushroom", 6 ],
-        [ "dry_mushroom", 6 ],
-        [ "mushroom_cooked", 6 ],
-        [ "morel_cooked", 6 ],
-        [ "acorns_cooked", 6 ]
-      ],
-      [
-        [ "fish", 12 ],
-        [ "dry_fish", 12 ],
-        [ "fish_smoked", 12 ],
-        [ "fish_pickled", 12 ],
-        [ "salted_fish", 12 ],
-        [ "fish_canned", 12 ],
-        [ "can_salmon", 12 ],
-        [ "can_tuna", 12 ]
-      ]
-    ]
+    "using": [ [ "fish_soup_ingredients", 6 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8446,38 +7848,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "book_learn": [ [ "cookbook_human", 4 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 10 ], [ "water_clean", 10 ] ],
-      [ [ "broth", 12 ], [ "broth_human", 12 ], [ "broth_bone", 6 ] ],
-      [
-        [ "irradiated_potato", 12 ],
-        [ "potato", 12 ],
-        [ "celery", 12 ],
-        [ "irradiated_celery", 12 ],
-        [ "cabbage", 12 ],
-        [ "irradiated_cabbage", 12 ],
-        [ "sauerkraut", 12 ],
-        [ "powder_eggs", 12 ],
-        [ "eggs_bird", 12, "LIST" ],
-        [ "egg_reptile", 12 ],
-        [ "can_beans", 12 ],
-        [ "spaghetti_raw", 12 ],
-        [ "macaroni_raw", 12 ],
-        [ "noodles_fast", 12 ],
-        [ "dry_beans", 12 ],
-        [ "raw_beans", 12 ],
-        [ "dry_rice", 12 ],
-        [ "beans_cooked", 12 ],
-        [ "acorns_cooked", 12 ]
-      ],
-      [ [ "dry_hflesh", 12 ], [ "rehydrated_hflesh", 12 ], [ "human_meat", 12, "LIST" ] ]
-    ]
+    "using": [ [ "human_soup_ingredients", 6 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
   },
   {
     "type": "recipe",
@@ -8491,35 +7868,13 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [
-      [ [ "jar_3l_glass", 1 ] ],
-      [ [ "water", 22 ], [ "water_clean", 22 ] ],
-      [
-        [ "veggy_any", 12, "LIST" ],
-        [ "powder_eggs", 12 ],
-        [ "eggs_bird", 12, "LIST" ],
-        [ "egg_reptile", 12 ],
-        [ "mushroom_cooked", 12 ],
-        [ "morel_cooked", 12 ],
-        [ "mushroom", 12 ],
-        [ "dry_mushroom", 12 ]
-      ],
-      [
-        [ "seasoning_italian", 60 ],
-        [ "wild_herbs", 60 ],
-        [ "seasoning_salt", 60 ],
-        [ "soysauce", 8 ],
-        [ "pepper", 80 ],
-        [ "garlic_clove", 24 ],
-        [ "salt_water", 4 ],
-        [ "salt", 60 ]
-      ]
-    ]
+    "using": [ [ "broth_ingredients", 12 ] ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 22 ], [ "water_clean", 22 ] ] ]
   },
   {
     "type": "recipe",
@@ -8533,12 +7888,12 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "1 h 10 m",
-    "result_mult": 12,
+    "charges": 12,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 24 ], [ "water_clean", 24 ] ], [ [ "bone", 120 ] ] ]
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 22 ], [ "water_clean", 22 ] ], [ [ "bone", 120 ] ] ]
   },
   {
     "type": "recipe",
@@ -8552,12 +7907,12 @@
     "skills_required": [ "mechanics", 1 ],
     "difficulty": 4,
     "time": "1 h 10 m",
-    "result_mult": 12,
+    "charges": 12,
     "book_learn": [ [ "cookbook_human", 4 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
-    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 24 ], [ "water_clean", 24 ] ], [ [ "bone_human", 120 ] ] ]
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "water", 22 ], [ "water_clean", 22 ] ], [ [ "bone_human", 120 ] ] ]
   },
   {
     "type": "recipe",
@@ -8584,7 +7939,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "2 h",
-    "result_mult": 12,
+    "charges": 48,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -8606,7 +7961,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "40 m",
-    "result_mult": 2,
+    "charges": 8,
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -8637,10 +7992,10 @@
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "can_medium_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
-      [ [ "can_tomato", 2 ], [ "tomato", 2 ], [ "irradiated_tomato", 2 ] ],
-      [ [ "water", 1 ], [ "water_clean", 1 ] ]
+      [ [ "can_tomato", 4 ], [ "tomato", 4 ], [ "irradiated_tomato", 4 ] ],
+      [ [ "water", 2 ], [ "water_clean", 2 ] ]
     ]
   },
   {
@@ -8669,6 +8024,7 @@
   {
     "type": "recipe",
     "result": "con_milk",
+    "charges": 1,
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
@@ -8704,7 +8060,7 @@
     "difficulty": 3,
     "autolearn": true,
     "time": "2 h",
-    "result_mult": 12,
+    "charges": 12,
     "book_learn": [ [ "cookbook_italian", 2 ], [ "family_cookbook", 2 ], [ "mag_cooking", 2 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -8736,7 +8092,7 @@
     "difficulty": 3,
     "autolearn": true,
     "time": "45 m",
-    "result_mult": 2,
+    "charges": 2,
     "book_learn": [ [ "cookbook_italian", 2 ], [ "family_cookbook", 2 ], [ "mag_cooking", 2 ] ],
     "batch_time_factors": [ 80, 4 ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
@@ -8776,16 +8132,16 @@
     ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
     "components": [
-      [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
+      [ [ "can_medium_unsealed", 1 ] ],
       [ [ "scrap", 1 ] ],
-      [ [ "milk_standard_raw", 2, "LIST" ] ],
+      [ [ "milk_standard_raw", 4, "LIST" ] ],
       [
-        [ "sugar", 100 ],
-        [ "syrup", 1 ],
-        [ "beet_syrup", 1 ],
-        [ "molasses", 1 ],
-        [ "honey_bottled", 1 ],
-        [ "honey_glassed", 1 ]
+        [ "sugar", 200 ],
+        [ "syrup", 2 ],
+        [ "beet_syrup", 2 ],
+        [ "molasses", 2 ],
+        [ "honey_bottled", 2 ],
+        [ "honey_glassed", 2 ]
       ]
     ]
   },
diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
index d1201087cc961..2407904353df0 100644
--- a/data/json/recipes/recipe_others.json
+++ b/data/json/recipes/recipe_others.json
@@ -2502,6 +2502,19 @@
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "can_medium_unsealed",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_CONTAINERS",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "30 m",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
+    "qualities": [ { "id": "CHISEL", "level": 3 } ],
+    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
+  },
   {
     "type": "recipe",
     "result": "jackhammer",
diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
index c3e241c96bd9f..2ac0f06d28fcd 100644
--- a/data/json/requirements/cooking_components.json
+++ b/data/json/requirements/cooking_components.json
@@ -133,7 +133,7 @@
         [ "bacon", 4 ],
         [ "lunchmeat", 5 ],
         [ "bologna", 5 ],
-        [ "can_spam", 4 ],
+        [ "can_spam", 2 ],
         [ "can_chicken", 1 ],
         [ "meat_pickled", 1 ],
         [ "dry_meat", 1 ],
@@ -160,8 +160,8 @@
         [ "bacon", 1 ],
         [ "lunchmeat", 2 ],
         [ "bologna", 5 ],
-        [ "can_spam", 4 ],
-        [ "fried_spam", 4 ],
+        [ "can_spam", 2 ],
+        [ "fried_spam", 2 ],
         [ "can_chicken", 1 ],
         [ "fish_cooked", 1 ],
         [ "fish_smoked", 1 ],
@@ -191,6 +191,167 @@
     "//": "Cooked meat that non-cannibals would be unhappy eating.",
     "components": [ [ [ "human_cooked", 1 ], [ "mutant_human_cooked", 1 ] ] ]
   },
+  {
+    "id": "meat_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
+      [
+        [ "irradiated_potato", 1 ],
+        [ "potato", 1 ],
+        [ "celery", 1 ],
+        [ "irradiated_celery", 1 ],
+        [ "cabbage", 1 ],
+        [ "irradiated_cabbage", 1 ],
+        [ "sauerkraut", 1 ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ],
+        [ "spaghetti_raw", 1 ],
+        [ "macaroni_raw", 1 ],
+        [ "noodles_fast", 1 ],
+        [ "dry_beans", 1 ],
+        [ "raw_beans", 1 ],
+        [ "dry_rice", 1 ],
+        [ "dandelion_cooked", 1 ],
+        [ "acorns_cooked", 1 ],
+        [ "dry_lentils", 1 ],
+        [ "raw_lentils", 1 ]
+      ],
+      [ [ "meat_red", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ]
+    ]
+  },
+  {
+    "id": "human_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "broth_human", 2 ] ],
+      [
+        [ "irradiated_potato", 1 ],
+        [ "potato", 1 ],
+        [ "celery", 1 ],
+        [ "irradiated_celery", 1 ],
+        [ "cabbage", 1 ],
+        [ "irradiated_cabbage", 1 ],
+        [ "sauerkraut", 1 ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ],
+        [ "spaghetti_raw", 1 ],
+        [ "macaroni_raw", 1 ],
+        [ "noodles_fast", 1 ],
+        [ "dry_beans", 1 ],
+        [ "raw_beans", 1 ],
+        [ "dry_rice", 1 ],
+        [ "dandelion_cooked", 1 ],
+        [ "acorns_cooked", 1 ],
+        [ "dry_lentils", 1 ],
+        [ "raw_lentils", 1 ]
+      ],
+      [ [ "dry_hflesh", 1 ], [ "rehydrated_hflesh", 1 ], [ "human_meat", 1, "LIST" ] ]
+    ]
+  },
+  {
+    "id": "fish_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 2 ], [ "broth_bone", 2 ] ],
+      [
+        [ "spaghetti_raw", 1 ],
+        [ "macaroni_raw", 1 ],
+        [ "noodles_fast", 1 ],
+        [ "veggy_any", 1, "LIST" ],
+        [ "sauerkraut", 1 ],
+        [ "can_corn", 1 ],
+        [ "dry_veggy", 1 ],
+        [ "con_milk", 1 ],
+        [ "flatbread", 1 ],
+        [ "tortilla_corn", 1 ],
+        [ "bread", 1 ],
+        [ "cornbread", 1 ],
+        [ "biscuit", 1 ],
+        [ "hardtack", 1 ],
+        [ "wastebread", 1 ],
+        [ "sourdough_bread", 1 ],
+        [ "flour", 2 ],
+        [ "cornmeal", 2 ],
+        [ "milk_powder", 1 ],
+        [ "crackers", 1 ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "dry_beans", 1 ],
+        [ "raw_beans", 1 ],
+        [ "dry_lentils", 1 ],
+        [ "raw_lentils", 1 ],
+        [ "dry_rice", 1 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ],
+        [ "dandelion_cooked", 1 ],
+        [ "mushroom", 1 ],
+        [ "dry_mushroom", 1 ],
+        [ "mushroom_cooked", 1 ],
+        [ "morel_cooked", 1 ],
+        [ "acorns_cooked", 1 ]
+      ],
+      [
+        [ "fish", 2 ],
+        [ "dry_fish", 2 ],
+        [ "fish_smoked", 2 ],
+        [ "fish_pickled", 2 ],
+        [ "salted_fish", 2 ],
+        [ "fish_canned", 2 ],
+        [ "can_salmon", 2 ],
+        [ "can_tuna", 2 ]
+      ]
+    ]
+  },
+  {
+    "id": "woods_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "pine_tea", 2 ] ],
+      [
+        [ "meat_nofish", 1, "LIST" ],
+        [ "fish", 1 ],
+        [ "fish_smoked", 1 ],
+        [ "dry_fish", 1 ],
+        [ "rehydrated_fish", 1 ],
+        [ "fish_canned", 1 ],
+        [ "can_salmon", 1 ],
+        [ "can_tuna", 1 ],
+        [ "sausage", 1 ],
+        [ "sausage_cooked", 1 ],
+        [ "bratwurst_sausage", 1 ],
+        [ "powder_eggs", 2 ],
+        [ "eggs_bird", 2, "LIST" ],
+        [ "egg_reptile", 2 ]
+      ],
+      [
+        [ "veggy_wild", 2 ],
+        [ "veggy", 2 ],
+        [ "rehydrated_veggy", 2 ],
+        [ "dry_veggy", 2 ],
+        [ "dry_beans", 2 ],
+        [ "can_beans", 2 ],
+        [ "raw_beans", 2 ],
+        [ "beans_cooked", 2 ],
+        [ "dry_lentils", 2 ],
+        [ "raw_lentils", 2 ],
+        [ "dry_rice", 2 ],
+        [ "dandelion_cooked", 2 ],
+        [ "mushroom", 2 ],
+        [ "dry_mushroom", 2 ],
+        [ "mushroom_cooked", 2 ],
+        [ "morel_cooked", 2 ],
+        [ "acorns_cooked", 2 ]
+      ]
+    ]
+  },
   {
     "id": "any_fat",
     "type": "requirement",
@@ -393,6 +554,75 @@
     "type": "requirement",
     "components": [ [ [ "dandelion_cooked", 1 ], [ "veggy_any_uncooked", 1, "LIST" ], [ "veggy_canned", 1 ], [ "veggy_salted", 1 ] ] ]
   },
+  {
+    "id": "mushroom_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 1 ] ],
+      [ [ "mushroom", 1 ], [ "mushroom_cooked", 1 ], [ "dry_mushroom", 1 ], [ "morel_cooked", 1 ] ],
+      [ [ "flour", 1 ] ]
+    ]
+  },
+  {
+    "id": "broth_ingredients",
+    "type": "requirement",
+    "components": [
+      [
+        [ "veggy_any", 1, "LIST" ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "mushroom_cooked", 1 ],
+        [ "morel_cooked", 1 ],
+        [ "mushroom", 1 ],
+        [ "dry_mushroom", 1 ]
+      ],
+      [
+        [ "seasoning_italian", 4 ],
+        [ "wild_herbs", 4 ],
+        [ "seasoning_salt", 4 ],
+        [ "soysauce", 2 ],
+        [ "pepper", 4 ],
+        [ "garlic_clove", 2 ],
+        [ "salt_water", 1 ],
+        [ "salt", 4 ]
+      ]
+    ]
+  },
+  {
+    "id": "veggy_soup_ingredients",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 1 ] ],
+      [
+        [ "spaghetti_raw", 1 ],
+        [ "macaroni_raw", 1 ],
+        [ "noodles_fast", 1 ],
+        [ "irradiated_potato", 1 ],
+        [ "potato", 1 ],
+        [ "celery", 1 ],
+        [ "irradiated_celery", 1 ],
+        [ "veggy_green", 1, "LIST" ],
+        [ "sauerkraut", 1 ],
+        [ "powder_eggs", 1 ],
+        [ "eggs_bird", 1, "LIST" ],
+        [ "egg_reptile", 1 ],
+        [ "dry_beans", 1 ],
+        [ "raw_beans", 1 ],
+        [ "dry_rice", 1 ],
+        [ "can_beans", 1 ],
+        [ "beans_cooked", 1 ],
+        [ "dandelion_cooked", 1 ],
+        [ "acorns_cooked", 1 ],
+        [ "tofu", 1 ],
+        [ "dry_tofu", 1 ],
+        [ "raw_edamame", 1 ],
+        [ "dry_lentils", 1 ],
+        [ "raw_lentils", 1 ]
+      ],
+      [ [ "veggy_any", 1, "LIST" ] ]
+    ]
+  },
   {
     "id": "wash_liquor",
     "type": "requirement",
diff --git a/data/json/vehicles/trucks.json b/data/json/vehicles/trucks.json
index 14ead2c9e8105..cb0d0e76d604f 100644
--- a/data/json/vehicles/trucks.json
+++ b/data/json/vehicles/trucks.json
@@ -891,8 +891,8 @@
       { "x": -2, "y": 1, "chance": 20, "items": [ "blanket" ] },
       { "x": -3, "y": 0, "chance": 20, "items": [ "blanket" ] },
       { "x": -3, "y": 1, "chance": 20, "items": [ "blanket" ] },
-      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_food" } },
-      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_food" } },
+      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_medium" } },
+      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_medium" } },
       { "x": -4, "y": 1, "chance": 10, "items": { "item": "cat_food", "container-item": "can_food" } },
       { "x": -4, "y": 1, "chance": 10, "items": { "item": "cat_food", "container-item": "can_food" } },
       { "x": -4, "y": 0, "chance": 3, "items": [ "beartrap" ] }