Merge pull request #3079 from Yoshax/drinks

Adds more types of tea

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -699,6 +699,71 @@
 	cup_name = "cup of iced tea"
 	cup_desc = "No relation to a certain rap artist/ actor."
 
+/datum/reagent/drink/tea/minttea
+	name = "Mint Tea"
+	id = "minttea"
+	description = "A tasty mixture of mint and tea. It's apparently good for you!"
+	color = "#A8442C"
+	taste_description = "black tea with tones of mint"
+
+	glass_name = "mint tea"
+	glass_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
+
+	cup_name = "cup of mint tea"
+	cup_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
+
+/datum/reagent/drink/tea/lemontea
+	name = "Lemon Tea"
+	id = "lemontea"
+	description = "A tasty mixture of lemon and tea. It's apparently good for you!"
+	color = "#FC6A00"
+	taste_description = "black tea with tones of lemon"
+
+	glass_name = "lemon tea"
+	glass_desc = "A tasty mixture of lemon and tea. It's apparently good for you!"
+
+	cup_name = "cup of lemon tea"
+	cup_desc = "A tasty mixture of lemon and tea. It's apparently good for you!"
+
+/datum/reagent/drink/tea/limetea
+	name = "Lime Tea"
+	id = "limetea"
+	description = "A tasty mixture of lime and tea. It's apparently good for you!"
+	color = "#DE4300"
+	taste_description = "black tea with tones of lime"
+
+	glass_name = "lime tea"
+	glass_desc = "A tasty mixture of lime and tea. It's apparently good for you!"
+
+	cup_name = "cup of berry tea"
+	cup_desc = "A tasty mixture of lime and tea. It's apparently good for you!"
+
+/datum/reagent/drink/tea/orangetea
+	name = "Orange Tea"
+	id = "orangetea"
+	description = "A tasty mixture of orange and tea. It's apparently good for you!"
+	color = "#FB4F06"
+	taste_description = "black tea with tones of orange"
+
+	glass_name = "orange tea"
+	glass_desc = "A tasty mixture of orange and tea. It's apparently good for you!"
+
+	cup_name = "cup of orange tea"
+	cup_desc = "A tasty mixture of orange and tea. It's apparently good for you!"
+
+/datum/reagent/drink/tea/berrytea
+	name = "Berry Tea"
+	id = "berrytea"
+	description = "A tasty mixture of berries and tea. It's apparently good for you!"
+	color = "#A60735"
+	taste_description = "black tea with tones of berries"
+
+	glass_name = "berry tea"
+	glass_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
+
+	cup_name = "cup of berry tea"
+	cup_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
+
 /datum/reagent/drink/coffee
 	name = "Coffee"
 	id = "coffee"
@@ -2165,3 +2230,4 @@
 
 	glass_name = "special blend whiskey"
 	glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
+

code/modules/reagents/Chemistry-Recipes.dm

@@ -1782,4 +1782,39 @@
 	id = "arnold_palmer"
 	result = "arnold_palmer"
 	required_reagents = list("icetea" = 1, "lemonade" = 1)
-	result_amount = 2
+	result_amount = 2
+
+/datum/chemical_reaction/minttea
+	name = "Mint Tea"
+	id = "minttea"
+	result = "minttea"
+	required_reagents = list("tea" = 5, "mint" = 1)
+	result_amount = 6
+
+/datum/chemical_reaction/lemontea
+	name = "Lemon Tea"
+	id = "lemontea"
+	result = "lemontea"
+	required_reagents = list("tea" = 5, "lemonjuice" = 1)
+	result_amount = 6
+
+/datum/chemical_reaction/limetea
+	name = "Lime Tea"
+	id = "limetea"
+	result = "limetea"
+	required_reagents = list("tea" = 5, "limejuice" = 1)
+	result_amount = 6
+
+/datum/chemical_reaction/limetea
+	name = "Orange Tea"
+	id = "orangetea"
+	result = "orangetea"
+	required_reagents = list("tea" = 5, "orangejuice" = 1)
+	result_amount = 6
+
+/datum/chemical_reaction/berrytea
+	name = "Berry Tea"
+	id = "berrytea"
+	result = "berrytea"
+	required_reagents = list("tea" = 5, "berryjuice" = 1)
+	result_amount = 6

code/modules/reagents/dispenser/dispenser2_energy.dm

@@ -57,5 +57,6 @@
 
 /obj/machinery/chemical_dispenser/bar_coffee
 	dispense_reagents = list(
-		"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice"
+		"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice",
+		"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint"
 		)