Merge pull request #207 from FalseIncarnate/master

Botany Plant Additions

code/modules/reagents/Chemistry-Reagents.dm

@@ -2797,14 +2797,14 @@ datum
 		toxin/coffeepowder
 			name = "Coffee Grounds"
 			id = "coffeepowder"
-			description = "Finely ground coffee beans, used to make coffee."
+			description = "Finely ground Coffee beans, used to make coffee."
 			reagent_state = SOLID
 			color = "#5B2E0D" // rgb: 91, 46, 13
 
 		toxin/teapowder
 			name = "Ground Tea Leaves"
 			id = "teapowder"
-			description = "Finely shredded tea leaves, used for making tea."
+			description = "Finely shredded Tea leaves, used for making tea."
 			reagent_state = SOLID
 			color = "#7F8400" // rgb: 127, 132, 0
 
@@ -3048,8 +3048,8 @@ datum
 					M.Jitter(5)
 					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"
@@ -3088,7 +3088,7 @@ datum
 			tea
 				name = "Tea"
 				id = "tea"
-				description = "Tasty black tea, it has antioxidants, it's good for you!"
+				description = "Tasty black tea: It has antioxidants. It's good for you!"
 				color = "#101000" // rgb: 16, 16, 0
 				adj_dizzy = -2
 				adj_drowsy = -1
@@ -3101,13 +3101,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"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1601,7 +1601,6 @@ datum
 			required_reagents = list("teapowder" = 1, "water" = 5)
 			result_amount = 5
 
-
 		soysauce
 			name = "Soy Sauce"
 			id = "soysauce"

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"

code/modules/reagents/reagent_containers/food/snacks/grown.dm

@@ -393,36 +393,17 @@
 	name = "koibean"
 	desc = "Something about these seems fishy."
 	icon_state = "koibeans"
-	New()
-		..()
-		spawn(5)	//So potency can be set in the proc that creates these crops
-			reagents.add_reagent("nutriment", 1+round((potency / 30), 1))
-			reagents.add_reagent("carpotoxin", 1+round((potency / 20), 1))
-			bitesize = 1+round(reagents.total_volume / 2, 1)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower
 	name = "moonflower"
 	desc = "Store in a location at least 50 yards away from werewolves."
 	icon_state = "moonflower"
-	New()
-		..()
-		spawn(5)	//So potency can be set in the proc that creates these crops
-			reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
-			reagents.add_reagent("moonshine", 1+round((potency / 10), 1))
-			bitesize = 1+round(reagents.total_volume / 2, 1)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli
 	name = "ghost chili"
 	desc = "It seems to be vibrating gently."
 	icon_state = "ghostchilipepper"
 	var/mob/held_mob
-	New()
-		..()
-		spawn(5)	//So potency can be set in the proc that creates these crops
-			reagents.add_reagent("nutriment", 1+round((potency / 25), 1))
-			reagents.add_reagent("capsaicin", 8+round(potency / 2, 1))
-			reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1))
-			bitesize = 1+round(reagents.total_volume / 4, 1)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/tomato
 	name = "tomato"
@@ -643,6 +624,50 @@
 	user.SetLuminosity(round(user.luminosity - (potency/10),1))
 	SetLuminosity(round(potency/10,1))
 
+//Tobacco/varieties
+/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco
+	name = "tobacco leaves"
+	desc = "It's tobacco... Put that in your pipe and smoke it."
+	icon_state = "tobacco_leaves"
+	filling_color = "#FFE991"
+	plantname = "tobacco"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space
+	name = "space-tobacco leaves"
+	desc = "It's tobacco... From SPACE!"
+	icon_state = "stobacco_leaves"
+	filling_color = "#FFE991"
+	plantname = "stobacco"
+
+//Tea/varieties
+/obj/item/weapon/reagent_containers/food/snacks/grown/teaaspera
+	name = "tea-aspera leaves"
+	desc = "Tea Aspera is well documented to have beneficial health effects!"
+	icon_state = "tea_aspera_leaves"
+	filling_color = "#7F8400"
+	plantname = "teaaspera"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/teaastra
+	name = "tea-astra leaves"
+	desc = "Tea Astra is well documented to have significant health effects."
+	icon_state = "tea_astra_leaves"
+	filling_color = "#7F8400"
+	plantname = "teaastra"
+
+//Coffee/varieties
+/obj/item/weapon/reagent_containers/food/snacks/grown/coffeea
+	name = "coffee-arabica beans"
+	desc = "Coffee Arabica: A great way start to your morning, or to prolong your nights."
+	icon_state = "coffee_arabica"
+	filling_color = "#5B2E0D"
+	plantname = "coffeea"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/coffeer
+	name = "coffee-robusta beans"
+	desc = "Coffee Robusta: Coffe so robust we had to put it in the name."
+	icon_state = "coffee_robusta"
+	filling_color = "#5B2E0D"
+	plantname = "coffeer"
 
 // *************************************
 // Complex Grown Object Defines -