diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm
index dfba4eddbcb..9a212fc334e 100644
--- a/code/WorkInProgress/Chemistry-Reagents.dm
+++ b/code/WorkInProgress/Chemistry-Reagents.dm
@@ -1439,6 +1439,22 @@ datum
 				..()
 				return
 
+		tea
+			name = "Tea"
+			id = "tea"
+			description = "Tasty black tea, it has antioxidants, it's good for you!"
+			reagent_state = LIQUID
+			on_mob_life(var/mob/M)
+				..()
+				M.dizziness = max(0,M.dizziness-2)
+				M:drowsyness = max(0,M:drowsyness-1)
+				M:sleeping = 0
+				if(M:toxloss && prob(50))
+					M:toxloss--
+				if (M.bodytemperature < 310)  //310 is the normal bodytemp. 310.055
+					M.bodytemperature = min(310, M.bodytemperature+5)
+				..()
+				return
 
 		space_cola
 			name = "Cola"
diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index 52f61ce8a4b..a06a52c1a7c 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -2253,6 +2253,16 @@
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
+/obj/item/weapon/reagent_containers/food/drinks/tea
+	name = "Sandy Balls Tea"
+	desc = "The perfect tea for those who enjoy life's simple pleasures."
+	icon_state = "tea"
+	New()
+		..()
+		reagents.add_reagent("tea", 30)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
+
 /obj/item/weapon/reagent_containers/food/drinks/cola
 	name = "Space Cola"
 	desc = "Cola. in space."
diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm
index 4e105728a69..6c260783a46 100644
--- a/code/defines/obj/vending.dm
+++ b/code/defines/obj/vending.dm
@@ -36,8 +36,8 @@
 	product_paths = "/obj/item/weapon/reagent_containers/food/drinks/bottle/gin;/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey;/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla;/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka;/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth;/obj/item/weapon/reagent_containers/food/drinks/bottle/rum;/obj/item/weapon/reagent_containers/food/drinks/bottle/wine;/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac;/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua;/obj/item/weapon/reagent_containers/food/drinks/beer;/obj/item/weapon/reagent_containers/food/drinks/ale;/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice;/obj/item/weapon/reagent_containers/food/drinks/bottle/cream;/obj/item/weapon/reagent_containers/food/drinks/tonic;/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/sodawater;/obj/item/weapon/reagent_containers/food/drinks/drinkingglass"
 	product_amounts = "5;5;5;5;5;5;5;5;5;6;6;4;4;4;4;8;8;8;30"
 	vend_delay = 15
-	product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/coffee"
-	product_hideamt = "10"
+	product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/coffee;/obj/item/weapon/reagent_containers/food/drinks/tea"
+	product_hideamt = "10;10"
 	product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Quite delighted to serve you!;Is nobody thirsty on this station?"
 
 /obj/machinery/vending/assist
@@ -47,12 +47,12 @@
 	product_hideamt = "5;2"
 
 /obj/machinery/vending/coffee
-	name = "coffee machine"
-	desc = "A Robust Coffee vending machine."
+	name = "Warm drinks machine"
+	desc = "A vending machine which dispenses warm drinks."
 	icon_state = "coffee"
 	icon_vend = "coffee-vend"
-	product_paths = "/obj/item/weapon/reagent_containers/food/drinks/coffee"
-	product_amounts = "25"
+	product_paths = "/obj/item/weapon/reagent_containers/food/drinks/coffee;/obj/item/weapon/reagent_containers/food/drinks/tea"
+	product_amounts = "25;25"
 	vend_delay = 34
 	product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/cola"
 	product_hideamt = "5"
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index ea4cc90b865..585b9115791 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ