From 7c7ec2eeea04ab36b3103ed1df1217f7b9bca83b Mon Sep 17 00:00:00 2001 From: Shadowfire117 Date: Wed, 6 Feb 2019 21:35:35 +0100 Subject: [PATCH] Time for people to have cherry and watermelon tea! --- .../Chemistry-Reagents-Food-Drinks.dm | 26 +++++++++++++++++++ code/modules/reagents/Chemistry-Recipes.dm | 18 +++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 4b5e7d27b8..9be6af6911 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -894,6 +894,32 @@ cup_name = "cup of berry tea" cup_desc = "A tasty mixture of berries and tea. It's apparently good for you!" +/datum/reagent/drink/tea/cherrytea + name = "Cherry Tea" + id = "cherrytea" + description = "A tasty mixture of cherries and tea. It's apparently good for you!" + color = "#c15962" + taste_description = "black tea with lots of cherries" + + glass_name = "cherry tea" + glass_desc = "A tasty mixture of cherries and tea. It's apparently good for you!" + + cup_name = "cup of cherry tea" + cup_desc = "A tasty mixture of cherries and tea. It's apparently good for you!" + +/datum/reagent/drink/tea/watermelontea + name = "Watermelon Tea" + id = "watermelontea" + description = "A tasty mixture of watermelon and tea. It's apparently good for you!" + color = "#9f2c2c" + taste_description = "black tea with sweet watermelon for flavouring" + + glass_name = "watermelon tea" + glass_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!" + + cup_name = "cup of watermelon tea" + cup_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!" + /datum/reagent/drink/coffee name = "Coffee" id = "coffee" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 92627a4ef6..00cfd04ce9 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1899,6 +1899,20 @@ required_reagents = list("tea" = 5, "berryjuice" = 1) result_amount = 6 +/datum/chemical_reaction/drinks/cherrytea + name = "Cherry Tea" + id = "cherrytea" + result = "cherrytea" + required_reagents = list("tea" = 5, "cherryjelly" = 1) + result_amount = 6 + +/datum/chemical_reaction/drinks/watermelontea + name = "Watermelon Tea" + id = "watermelontea" + result = "watermelontea" + required_reagents = list("tea" = 5, "watermelonjuice" = 1) + result_amount = 6 + /datum/chemical_reaction/drinks/sakebomb name = "Sake Bomb" id = "sakebomb" @@ -2227,7 +2241,7 @@ name = "Watermelon bubble tea" id = "bubbleteawatermelon" result = "watermelon bubble tea" - required_reagents = list("gelatin" = 2, "tea" = 5, "watermelonjuice" = 1, "milk" = 2) + required_reagents = list("gelatin" = 2, "watermelontea" = 6, "milk" = 2) result_amount = 10 /datum/chemical_reaction/drinks/bubbletea/strawberry @@ -2241,7 +2255,7 @@ name = "Cherry bubble tea" id = "bubbleteacherry" result = "cherry bubble tea" - required_reagents = list("gelatin" = 2, "tea" = 5, "cherryjelly" = 1, "milk" = 2) + required_reagents = list("gelatin" = 2, "cherrytea" = 6, "milk" = 2) result_amount = 10 /datum/chemical_reaction/drinks/bubbletea/coffee