Botany Plant Additions

> Reintroduced a number of previously removed plants:
+ Tobacco
+ Space Tobacco
+ Tea Aspera
+ Tea Astra
+ Coffee Arabica
+ Coffee Robusta
+ Moonflower
+ Novaflower
+ Koibean

> Fixed a typo preventing the mutation of Blood tomatoes into Killer
Tomatoes.
> Added an additional version of both tea and coffee powders and drinks.
> Added additional tea and coffee recipes to make and utilize the new
versions.
> Added coffee arabica, tobacco, and tea aspera seeds to seed vending
machines.

code/modules/reagents/Chemistry-Reagents.dm

@@ -2878,16 +2878,30 @@ datum
 				return
 
 		toxin/coffeepowder
-			name = "Coffee Grounds"
+			name = "Coffee Arabica Grounds"
 			id = "coffeepowder"
-			description = "Finely ground coffee beans, used to make coffee."
+			description = "Finely ground Coffee Arabica beans, used to make coffee."
+			reagent_state = SOLID
+			color = "#5B2E0D" // rgb: 91, 46, 13
+
+		toxin/coffeepowder2
+			name = "Coffee Robusta Grounds"
+			id = "coffeepowder2"
+			description = "Finely ground Coffee Robusta beans, used to make coffee."
 			reagent_state = SOLID
 			color = "#5B2E0D" // rgb: 91, 46, 13
 
 		toxin/teapowder
-			name = "Ground Tea Leaves"
+			name = "Ground Tea Aspera Leaves"
 			id = "teapowder"
-			description = "Finely shredded tea leaves, used for making tea."
+			description = "Finely shredded Tea Aspera leaves, used for making tea."
+			reagent_state = SOLID
+			color = "#7F8400" // rgb: 127, 132, 0
+
+		toxin/teapowder2
+			name = "Ground Tea Astra Leaves"
+			id = "teapowder2"
+			description = "Finely shredded Tea Astra leaves, used for making tea."
 			reagent_state = SOLID
 			color = "#7F8400" // rgb: 127, 132, 0
 
@@ -3131,42 +3145,61 @@ 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"
-					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
+			coffee2
+				name = "Coffee"
+				id = "coffee2"
+				description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant."
+				color = "#482000" // rgb: 72, 32, 0
+				adj_dizzy = -5
+				adj_drowsy = -3
+				adj_sleepy = -2
+				adj_temp = 25
 
-					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.Jitter(5)
+					if(prob(5)) M.emote(pick("twitch","blink_r","shiver"))
+					M.status_flags |= GOTTAGOFAST
+					if(adj_temp > 0 && holder.has_reagent("frostoil"))
+						holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM)
+					holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
 
-				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
+			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
+
+				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"
@@ -3184,6 +3217,23 @@ datum
 						M.adjustToxLoss(-1)
 					return
 
+			tea2
+				name = "Tea"
+				id = "tea2"
+				description = "Tea tasty, much tasty! Tea much good for drink!"
+				color = "#101000" // rgb: 16, 16, 0
+				adj_dizzy = -2
+				adj_sleepy = -3
+				adj_temp = 20
+
+				on_mob_life(var/mob/living/M as mob)
+					if(!M) M = holder.my_atom
+					M.jitteriness = max(M.jitteriness-5,0)
+					if(prob(80)) M.adjustBrainLoss(1*REM)
+					if(prob(50)) M.drowsyness = max(M.drowsyness, 3)
+					if(prob(10)) M.emote("drool")
+					..()
+					return
 
 			icetea
 				name = "Iced Tea"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1594,6 +1594,13 @@ datum
 			required_reagents = list("coffeepowder" = 1, "water" = 5)
 			result_amount = 5
 
+		coffee2
+			name = "Coffee"
+			id = "coffee2"
+			result = "coffee2"
+			required_reagents = list("coffeepowder2" = 1, "water" = 5)
+			result_amount = 5
+
 		tea
 			name = "Tea"
 			id = "tea"
@@ -1601,6 +1608,12 @@ datum
 			required_reagents = list("teapowder" = 1, "water" = 5)
 			result_amount = 5
 
+		tea2
+			name = "Tea"
+			id = "tea2"
+			result = "tea2"
+			required_reagents = list("teapowder2" = 1, "water" = 5)
+			result_amount = 5
 
 		soysauce
 			name = "Soy Sauce"
@@ -1685,6 +1698,13 @@ datum
 			required_reagents = list("ice" = 1, "tea" = 3)
 			result_amount = 4
 
+		icetea2
+			name = "Iced Tea"
+			id = "icetea"
+			result = "icetea"
+			required_reagents = list("ice" = 1, "tea2" = 3)
+			result_amount = 4
+
 		icecoffee
 			name = "Iced Coffee"
 			id = "icecoffee"
@@ -1692,6 +1712,13 @@ datum
 			required_reagents = list("ice" = 1, "coffee" = 3)
 			result_amount = 4
 
+		icecoffee2
+			name = "Iced Coffee"
+			id = "icecoffee"
+			result = "icecoffee"
+			required_reagents = list("ice" = 1, "coffee2" = 3)
+			result_amount = 4
+
 		nuka_cola
 			name = "Nuka Cola"
 			id = "nuka_cola"
@@ -1746,6 +1773,14 @@ datum
 			required_catalysts = list("enzyme" = 5)
 			result_amount = 5
 
+		kahlua2
+			name = "Kahlua"
+			id = "kahlua"
+			result = "kahlua"
+			required_reagents = list("coffee2" = 5, "sugar" = 5)
+			required_catalysts = list("enzyme" = 5)
+			result_amount = 5
+
 		gin_tonic
 			name = "Gin and Tonic"
 			id = "gintonic"
@@ -1872,6 +1907,13 @@ datum
 			required_reagents = list("irishcream" = 1, "coffee" = 1)
 			result_amount = 2
 
+		irish_coffee2
+			name = "Irish Coffee"
+			id = "irishcoffee"
+			result = "irishcoffee"
+			required_reagents = list("irishcream" = 1, "coffee2" = 1)
+			result_amount = 2
+
 		b52
 			name = "B-52"
 			id = "b52"
@@ -2051,6 +2093,13 @@ datum
 			required_reagents = list("coffee" = 1, "soymilk" = 1)
 			result_amount = 2
 
+		soy_latte2
+			name = "Soy Latte"
+			id = "soy_latte"
+			result = "soy_latte"
+			required_reagents = list("coffee2" = 1, "soymilk" = 1)
+			result_amount = 2
+
 		cafe_latte
 			name = "Cafe Latte"
 			id = "cafe_latte"
@@ -2058,6 +2107,13 @@ datum
 			required_reagents = list("coffee" = 1, "milk" = 1)
 			result_amount = 2
 
+		cafe_latte2
+			name = "Cafe Latte"
+			id = "cafe_latte"
+			result = "cafe_latte"
+			required_reagents = list("coffee2" = 1, "milk" = 1)
+			result_amount = 2
+
 		acidspit
 			name = "Acid Spit"
 			id = "acidspit"
@@ -2198,6 +2254,13 @@ datum
 			required_reagents = list("spacemountainwind" = 1, "coffee" = 1)
 			result_amount = 2
 
+		rewriter2
+			name = "Rewriter"
+			id = "rewriter"
+			result = "rewriter"
+			required_reagents = list("spacemountainwind" = 1, "coffee2" = 1)
+			result_amount = 2
+
 
 
 //Fox

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 -