From bd0b5c2eb578307722bc03079d2b77ee432c86c0 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 10 Feb 2018 12:04:18 -0500 Subject: [PATCH 1/2] Merge pull request #35479 from Cruix/chem_collisions Fixed chemical recipe conflicts --- code/modules/food_and_drinks/recipes/drinks_recipes.dm | 2 +- code/modules/reagents/chemistry/recipes/toxins.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index bc894488b2..cb33915ddf 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -441,7 +441,7 @@ name = "Chocolate Pudding" id = "chocolatepudding" results = list("chocolatepudding" = 20) - required_reagents = list("cocoa" = 5, "milk" = 5, "eggyolk" = 5) + required_reagents = list("chocolate_milk" = 10, "eggyolk" = 5) /datum/chemical_reaction/vanillapudding name = "Vanilla Pudding" diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index 6246d3adb2..375ee29ed5 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -55,7 +55,7 @@ name = "Lexorin" id = "lexorin" results = list("lexorin" = 3) - required_reagents = list("plasma" = 1, "hydrogen" = 1, "nitrogen" = 1) + required_reagents = list("plasma" = 1, "hydrogen" = 1, "oxygen" = 1) /datum/chemical_reaction/chloralhydrate name = "Chloral Hydrate"