cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes hot cocoa and chocolate milk recipe conflict (#55606)

Browse Source 
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.
This commit is contained in:
interestingusernam3
2020-12-24 10:41:31 +01:00
committed by GitHub
parent 06e2d5c761
commit 9c6b883bf2
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+10 -3
View File
@@ -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)