From 5575ca217c2a837640b57db650d7a703ae7abe00 Mon Sep 17 00:00:00 2001
From: FalseIncarnate <false_incarnate@yahoo.com>
Date: Fri, 30 Jan 2015 15:25:26 -0500
Subject: [PATCH] Tea and Coffee Fixes

Fixes indentation issues preventing subtypes of coffee from inheriting
the base traits of coffee.

Adds indentation to allow Ice Tea to inherit base traits of Tea, just as
Iced Coffee does for Coffee. (standardization)

Adds Tea to the recognized list of Drinking Glass contents. Now it won't
show as a "Glass of ...What?"
---
 code/modules/reagents/Chemistry-Reagents.dm   | 73 ++++++++++---------
 .../food/drinks/drinkingglass.dm              |  4 +
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 6670e23f95c..32eb9621609 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -3132,40 +3132,41 @@ datum
 					if(adj_temp > 0 && holder.has_reagent("frostoil"))
 						holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM)
 					holder.remove_reagent(src.id, 0.1)
-			icecoffee
-				name = "Iced Coffee"
-				id = "icecoffee"
-				description = "Coffee and ice, refreshing and cool."
-				color = "#102838" // rgb: 16, 40, 56
-				adj_temp = -5
 
-			soy_latte
-				name = "Soy Latte"
-				id = "soy_latte"
-				description = "A nice and tasty beverage while you are reading your hippie books."
-				color = "#664300" // rgb: 102, 67, 0
-				adj_sleepy = 0
-				adj_temp = 5
+				icecoffee
+					name = "Iced Coffee"
+					id = "icecoffee"
+					description = "Coffee and ice, refreshing and cool."
+					color = "#102838" // rgb: 16, 40, 56
+					adj_temp = -5
 
-				on_mob_life(var/mob/living/M as mob)
-					..()
-					M.sleeping = 0
-					if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
-					return
+				soy_latte
+					name = "Soy Latte"
+					id = "soy_latte"
+					description = "A nice and tasty beverage while you are reading your hippie books."
+					color = "#664300" // rgb: 102, 67, 0
+					adj_sleepy = 0
+					adj_temp = 5
 
-			cafe_latte
-				name = "Cafe Latte"
-				id = "cafe_latte"
-				description = "A nice, strong and tasty beverage while you are reading."
-				color = "#664300" // rgb: 102, 67, 0
-				adj_sleepy = 0
-				adj_temp = 5
+					on_mob_life(var/mob/living/M as mob)
+						..()
+						M.sleeping = 0
+						if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
+						return
 
-				on_mob_life(var/mob/living/M as mob)
-					..()
-					M.sleeping = 0
-					if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
-					return
+				cafe_latte
+					name = "Cafe Latte"
+					id = "cafe_latte"
+					description = "A nice, strong and tasty beverage while you are reading."
+					color = "#664300" // rgb: 102, 67, 0
+					adj_sleepy = 0
+					adj_temp = 5
+
+					on_mob_life(var/mob/living/M as mob)
+						..()
+						M.sleeping = 0
+						if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
+						return
 
 			tea
 				name = "Tea"
@@ -3183,12 +3184,12 @@ datum
 						M.adjustToxLoss(-1)
 					return
 
-			icetea
-				name = "Iced Tea"
-				id = "icetea"
-				description = "No relation to a certain rap artist/ actor."
-				color = "#104038" // rgb: 16, 64, 56
-				adj_temp = -5
+				icetea
+					name = "Iced Tea"
+					id = "icetea"
+					description = "No relation to a certain rap artist/ actor."
+					color = "#104038" // rgb: 16, 64, 56
+					adj_temp = -5
 
 			kahlua
 				name = "Kahlua"
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index 5be9504710f..fe4f93dbab9 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -516,6 +516,10 @@
 					icon_state = "brownstar"
 					name = "Brown Star"
 					desc = "Its not what it sounds like..."
+				if("tea")
+					icon_state = "glass_brown"
+					name = "Glass of Tea"
+					desc = "A glass of hot tea. Perhaps a cup with a handle would have been smarter?"
 				if("icetea")
 					icon_state = "icetea"
 					name = "Iced Tea"