From 92e9488ddb61f1a2075b9af0cef50f13da9e1f89 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 10 Mar 2019 11:46:43 -0500
Subject: [PATCH] -Tea seed did not show up in seed vendor so also added to the
 vr version. It's unclear which one is used. -Removed tea mush from the rolled
 tea leaf as this shouldn't be in the final product. -Fixed flavor text on new
 tea beverages in glasses.

---
 code/modules/hydroponics/seed_storage.dm               |  1 +
 code/modules/hydroponics/seed_storage_vr.dm            |  2 ++
 .../Chemistry-Reagents-Food-Drinks.dm                  | 10 +++++-----
 .../reagents/reagent_containers/food/snacks_vr.dm      |  1 -
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index 60970809cd..3cb33eb572 100644
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -174,6 +174,7 @@
 		/obj/item/seeds/sugarcaneseed = 3,
 		/obj/item/seeds/sunflowerseed = 3,
 		/obj/item/seeds/shandseed = 2,
+		/obj/item/seeds/teaseed = 3,
 		/obj/item/seeds/tobaccoseed = 3,
 		/obj/item/seeds/tomatoseed = 3,
 		/obj/item/seeds/towermycelium = 3,
diff --git a/code/modules/hydroponics/seed_storage_vr.dm b/code/modules/hydroponics/seed_storage_vr.dm
index 6d9d373b78..9f155225a7 100644
--- a/code/modules/hydroponics/seed_storage_vr.dm
+++ b/code/modules/hydroponics/seed_storage_vr.dm
@@ -30,6 +30,7 @@
 		/obj/item/seeds/sugarcaneseed = 3,
 		/obj/item/seeds/sunflowerseed = 3,
 		/obj/item/seeds/shandseed = 2,
+		/obj/item/seeds/teaseed = 3,
 		/obj/item/seeds/tobaccoseed = 3,
 		/obj/item/seeds/tomatoseed = 3,
 		/obj/item/seeds/towermycelium = 3,
@@ -79,6 +80,7 @@
 		/obj/item/seeds/sugarcaneseed = 3,
 		/obj/item/seeds/sunflowerseed = 3,
 		/obj/item/seeds/shandseed = 2,
+		/obj/item/seeds/teaseed = 3,
 		/obj/item/seeds/tobaccoseed = 3,
 		/obj/item/seeds/tomatoseed = 3,
 		/obj/item/seeds/towermycelium = 3,
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 f47d788d0e..8d14851c1b 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -3307,7 +3307,7 @@
 	adj_sleepy = -3
 	adj_temp = 20
 
-	glass_name = "cup of tea"
+	glass_name = "green tea"
 	glass_desc = "Tasty green tea, it has antioxidants, it's good for you!"
 
 	cup_icon_state = "cup_tea"
@@ -3327,7 +3327,7 @@
 	taste_description = "floral with vegetal notes and a slightly bitter aftertaste"
 	color = "#cac162"
 
-	glass_name = "cup of tea"
+	glass_name = "green tea"
 	glass_desc = "Floral green tea, it has antioxidants, it's fresh and good for you!"
 
 	cup_icon_state = "cup_tea"
@@ -3341,7 +3341,7 @@
 	taste_description = "overwhelmingly bitter with faint floral notes"
 	color = "#56761d"
 
-	glass_name = "cup of tea leaves"
+	glass_name = "tea leaves"
 	glass_desc = "Dry tea leaves in a cup. Just add hot water!"
 
 /datum/reagent/drink/teamush
@@ -3361,7 +3361,7 @@
 	taste_description = "strongly bitter with a subtle chemical aftertaste"
 	color = "#56761d"
 
-	glass_name = "cup of tea powder"
+	glass_name = "tea powder"
 	glass_desc = "Instant green tea powder. Just add water for imitation green tea!"
 
 /datum/reagent/drink/instantteagreen
@@ -3371,7 +3371,7 @@
 	taste_description = "bitter with a subtle chemical aftertaste"
 	color = "#cac162"
 
-	glass_name = "cup of tea"
+	glass_name = "green tea"
 	glass_desc = "Green tea. It smells a bit off."
 
 	cup_icon_state = "cup_tea"
diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm
index a789e55e75..db27c59feb 100644
--- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm
@@ -397,7 +397,6 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf/New()
 	..()
-	reagents.add_reagent("teamush", 3)
 	bitesize = 1
 
 /obj/item/weapon/reagent_containers/food/snacks/greentealeaf