From ad5cfd0087bd077ce2a0b8e6af2d45deac4ebc15 Mon Sep 17 00:00:00 2001 From: silveryferret Date: Wed, 19 Jul 2017 23:22:36 -0400 Subject: [PATCH] Fixes Chemistry-Recipes.dm. Not 100% sure how this happened, mergetool must've screwed up somehow. --- code/modules/reagents/Chemistry-Recipes.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 231984090c..c25654a2e1 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1842,6 +1842,7 @@ required_reagents = list("tea" = 5, "berryjuice" = 1) result_amount = 6 +/datum/chemical_reaction/drinks/sakebomb name = "Sake Bomb" id = "sakebomb" result = "sakebomb" @@ -1862,6 +1863,7 @@ required_reagents = list("sake" = 2, "vodka" = 2, "tomatojuice" = 1) result_amount = 5 +/datum/chemical_reaction/drinks/tokyorose name = "Tokyo Rose" id = "tokyorose" result = "tokyorose" @@ -1904,6 +1906,9 @@ result_amount = 3 /datum/chemical_reaction/drinks/euphoria + name = "Euphoria" + id = "euphoria" + result = "euphoria" required_reagents = list("specialwhiskey" = 1, "cognac" = 2) result_amount = 3 @@ -1911,6 +1916,7 @@ name = "Xanadu Cannon" id = "xanaducannon" result = "xanaducannon" + required_reagents = list("ale" = 1, "dr_gibb" = 1) result_amount = 2 /datum/chemical_reaction/drinks/debugger @@ -1941,6 +1947,7 @@ required_reagents = list("sake" = 1, "melonliquor" = 1) result_amount = 2 +//R-UST Port /datum/chemical_reaction/oxyphoron name = "Oxyphoron" id = "oxyphoron"