From 9c6b883bf2bc02f1c08403f537b84ed81d12ce39 Mon Sep 17 00:00:00 2001 From: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com> Date: Thu, 24 Dec 2020 10:41:31 +0100 Subject: [PATCH] Fixes hot cocoa and chocolate milk recipe conflict (#55606) Chocolate milk is now made by cooling a 3:2 mix of hot cocoa and cocoa below 300 K. Hot cocoa recipe now makes 6 units instead of making 5 instead of 6. Alternative hot cocoa recipe that is made by mixing chocolate milk and milk 1:2 above 320 K. The first two of the above changes mean that chocolate milk can be made with a mix of 1:1 milk and cocoa if you heat it to 320K and then cool it to below 300K. --- .../food_and_drinks/recipes/drinks_recipes.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index e848a3b5c0b..37fddda6dd3 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -388,15 +388,22 @@ mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange." /datum/chemical_reaction/chocolate_milk - results = list(/datum/reagent/consumable/milk/chocolate_milk = 2) - required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/coco = 1) + results = list(/datum/reagent/consumable/milk/chocolate_milk = 5) + required_reagents = list(/datum/reagent/consumable/hot_coco = 3, /datum/reagent/consumable/coco = 2) mix_message = "The color changes as the mixture blends smoothly." + required_temp = 300 + is_cold_recipe = TRUE /datum/chemical_reaction/hot_coco - results = list(/datum/reagent/consumable/hot_coco = 5) + results = list(/datum/reagent/consumable/hot_coco = 6) required_reagents = list(/datum/reagent/consumable/milk = 5, /datum/reagent/consumable/coco = 1) required_temp = 320 +/datum/chemical_reaction/hot_coco_from_chocolate_milk + results = list(/datum/reagent/consumable/hot_coco = 3) + required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 1, /datum/reagent/consumable/milk = 2) + required_temp = 320 + /datum/chemical_reaction/coffee results = list(/datum/reagent/consumable/coffee = 5) required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5)