diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 2c728b50b3c..caed940f7a4 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -890,7 +890,8 @@
/obj/item/seeds/sunflowerseed = 3,/obj/item/seeds/tomatoseed = 3,/obj/item/seeds/towermycelium = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/appleseed = 3,
/obj/item/seeds/poppyseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/whitebeetseed = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/limeseed = 3,
/obj/item/seeds/lemonseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/cocoapodseed = 3,
- /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3)
+ /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3,
+ /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/coffeeaseed = 3, /obj/item/seeds/teaasperaseed = 3)
contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/plumpmycelium = 2,/obj/item/seeds/reishimycelium = 2)
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index 67b85413388..8fe56d6bd70 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -133,9 +133,9 @@
/*
* Sun/Novaflower
*/
-/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob)
- M << " [user] smacks you with a sunflower!FLOWER POWER"
- user << " Your sunflower's FLOWER POWER strikes [M]"
+/obj/item/weapon/grown/novaflower/attack(mob/M as mob, mob/user as mob)
+ M << " [user] smacks you with a novaflower!FLOWER POWER"
+ user << " Your novaflower's FLOWER POWER strikes [M]"
/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob)
if(!..()) return
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index f1d12a1a6a5..d22c05ff41c 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -466,7 +466,7 @@ proc/populate_seed_list()
display_name = "chili plants"
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/chili)
chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25))
- mutants = list("icechili")
+ mutants = list("icechili", "ghostchili")
packet_icon = "seed-chili"
plant_icon = "chili"
harvest_repeat = 1
@@ -490,6 +490,21 @@ proc/populate_seed_list()
maturation = 4
production = 4
+/datum/seed/chili/ghost
+ name = "ghostchili"
+ seed_name = "ghost chili pepper"
+ display_name = "ghost chili pepper plants"
+ mutants = null
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli)
+ chems = list("capsaicin" = list(8,2), "condensedcapsaicin" = list(4,4), "nutriment" = list(1,25))
+ packet_icon = "seed-chilighost"
+ plant_icon = "chilighost"
+ growth_stages = 6
+
+ maturation = 10
+ production = 10
+ yield = 3
+
// Berry plants/variants.
/datum/seed/berry
name = "berries"
@@ -601,7 +616,7 @@ proc/populate_seed_list()
seed_name = "blood tomato"
display_name = "blood tomato plant"
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato)
- mutants = list("killer")
+ mutants = list("killertomato")
packet_icon = "seed-bloodtomato"
plant_icon = "bloodtomato"
chems = list("nutriment" = list(1,10), "blood" = list(1,5))
@@ -938,13 +953,13 @@ proc/populate_seed_list()
production = 6
yield = 6
growth_stages = 3
- plant_icon = ""
/datum/seed/flower/sunflower
name = "sunflowers"
seed_name = "sunflower"
display_name = "sunflowers"
packet_icon = "seed-sunflower"
+ mutants = list("moonflower", "novaflower")
products = list(/obj/item/weapon/grown/sunflower)
plant_icon = "sunflower"
@@ -952,6 +967,33 @@ proc/populate_seed_list()
maturation = 6
growth_stages = 3
+/datum/seed/flower/moonflower
+ name = "moonflowers"
+ seed_name = "moonflower"
+ display_name = "moonflowers"
+ packet_icon = "seed-moonflower"
+ mutants = null
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/moonflower)
+ plant_icon = "moonflower"
+ chems = list("nutriment" = list(1,50), "moonshine" = list(1,10))
+
+ lifespan = 25
+ maturation = 6
+ growth_stages = 3
+
+/datum/seed/flower/novaflower
+ name = "novaflowers"
+ seed_name = "novaflower"
+ display_name = "novaflowers"
+ packet_icon = "seed-novaflower"
+ mutants = null
+ products = list(/obj/item/weapon/grown/novaflower)
+ plant_icon = "novaflower"
+
+ lifespan = 25
+ maturation = 6
+ growth_stages = 3
+
//Grapes/varieties
/datum/seed/grapes
name = "grapes"
@@ -980,6 +1022,151 @@ proc/populate_seed_list()
plant_icon = "greengrape"
chems = list("nutriment" = list(1,10), "kelotane" = list(3,5))
+//Soybeans/varieties
+/datum/seed/soybean
+ name = "soybean"
+ seed_name = "soybean"
+ display_name = "soybeans"
+ packet_icon = "seed-soybean"
+ mutants = list("koibean")
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans)
+ plant_icon = "soybean"
+ harvest_repeat = 1
+ chems = list("nutriment" = list(1,20))
+
+ lifespan = 25
+ maturation = 4
+ production = 4
+ yield = 3
+ potency = 5
+
+/datum/seed/soybean/koi
+ name = "koibean"
+ seed_name = "koibean"
+ display_name = "koi beans"
+ packet_icon = "seed-koibean"
+ mutants = null
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/koibeans)
+ plant_icon = "soybean"
+ harvest_repeat = 1
+ chems = list("nutriment" = list(1,30), "carpotoxin" = list(1,20))
+
+ lifespan = 25
+ maturation = 4
+ production = 4
+ yield = 3
+ potency = 5
+
+//Tobacco/varieties
+/datum/seed/tobacco
+ name = "tobacco"
+ seed_name = "tobacco"
+ display_name = "tobacco"
+ packet_icon = "seed-tobacco"
+ mutants = list("stobacco")
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco)
+ plant_icon = "tobacco"
+ harvest_repeat = 1
+ chems = list("nutriment" = list(1,40), "nicotine" = list(1,40))
+
+ lifespan = 25
+ maturation = 5
+ production = 5
+ yield = 6
+ potency = 10
+ growth_stages = 3
+
+/datum/seed/tobacco/space
+ name = "stobacco"
+ seed_name = "space tobacco"
+ display_name = "space tobacco"
+ packet_icon = "seed-stobacco"
+ mutants = null
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space)
+ plant_icon = "stobacco"
+ harvest_repeat = 1
+ chems = list("nutriment" = list(1,40), "nicotine" = list(1,20), "inaprovaline" = list(1,30))
+
+ lifespan = 25
+ maturation = 5
+ production = 5
+ yield = 4
+ potency = 5
+ growth_stages = 3
+
+//Tea/varieties
+/datum/seed/teaaspera
+ name = "teaaspera"
+ seed_name = "tea aspera"
+ display_name = "tea aspera"
+ packet_icon = "seed-teaaspera"
+ mutants = list("teaastra")
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/teaaspera)
+ plant_icon = "teaaspera"
+ harvest_repeat = 1
+ chems = list("teapowder" = list(1,20), "anti_toxin" = list(1,30))
+
+ lifespan = 30
+ maturation = 5
+ production = 5
+ yield = 6
+ potency = 10
+ growth_stages = 5
+
+/datum/seed/teaastra
+ name = "teaastra"
+ seed_name = "tea astra"
+ display_name = "tea astra"
+ packet_icon = "seed-teaastra"
+ mutants = null
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/teaastra)
+ plant_icon = "teaastra"
+ harvest_repeat = 1
+ chems = list("teapowder2" = list(1,20), "impedrezene" = list(1,30))
+
+ lifespan = 30
+ maturation = 5
+ production = 5
+ yield = 6
+ potency = 10
+ growth_stages = 5
+
+//Coffee/varieties
+/datum/seed/coffeea
+ name = "coffeea"
+ seed_name = "coffee arabica"
+ display_name = "coffee arabica"
+ packet_icon = "seed-coffeea"
+ mutants = list("coffeer")
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/coffeea)
+ plant_icon = "coffeea"
+ harvest_repeat = 1
+ chems = list("coffeepowder" = list(1,20), "synaptizine" = list(1,40))
+
+ lifespan = 30
+ maturation = 5
+ production = 5
+ yield = 6
+ potency = 10
+ growth_stages = 5
+
+/datum/seed/coffeer
+ name = "coffeer"
+ seed_name = "coffee robusta"
+ display_name = "coffee robusta"
+ mutants = null
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/coffeer)
+ plant_icon = "coffeer"
+ harvest_repeat = 1
+ chems = list("coffeepowder2" = list(1,20), "synaptizine" = list(1,20), "hyperzine" = list(1,40))
+
+ lifespan = 30
+ maturation = 5
+ production = 5
+ yield = 4
+ potency = 10
+ growth_stages = 5
+
//Everything else
/datum/seed/peanuts
name = "peanut"
@@ -1093,22 +1280,6 @@ proc/populate_seed_list()
potency = 10
growth_stages = 4
-/datum/seed/soybean
- name = "soybean"
- seed_name = "soybean"
- display_name = "soybeans"
- packet_icon = "seed-soybean"
- products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans)
- plant_icon = "soybean"
- harvest_repeat = 1
- chems = list("nutriment" = list(1,20))
-
- lifespan = 25
- maturation = 4
- production = 4
- yield = 3
- potency = 5
-
/datum/seed/wheat
name = "wheat"
seed_name = "wheat"
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index d0afda2e6fb..948e78f96e9 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -115,6 +115,9 @@
/obj/item/seeds/soyaseed
seed_type = "soybean"
+/obj/item/seeds/koiseed
+ seed_type = "koibean"
+
/obj/item/seeds/wheatseed
seed_type = "wheat"
@@ -221,4 +224,29 @@
seed_type = "cherry"
/obj/item/seeds/kudzuseed
- seed_type = "kudzu"
\ No newline at end of file
+ seed_type = "kudzu"
+
+/obj/item/seeds/tobaccoseed
+ seed_type = "tobacco"
+
+/obj/item/seeds/stobaccoseed
+ seed_type = "stobacco"
+
+/obj/item/seeds/teaasperaseed
+ seed_type = "teaaspera"
+
+/obj/item/seeds/teaastraseed
+ seed_type = "teaastra"
+
+/obj/item/seeds/coffeeaseed
+ seed_type = "coffeea"
+
+/obj/item/seeds/coffeerseed
+ seed_type = "coffeer"
+
+/obj/item/seeds/moonflowerseed
+ seed_type = "moonflower"
+
+/obj/item/seeds/novaflowerseed
+ seed_type = "novaflower"
+
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 2e38631ce6f..af5fd0c1e7b 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/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"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 500703563e8..f8047e85d3f 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/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
diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm
index cf8b6c39ac9..c3d41be9820 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm
+++ b/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 -
diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi
index 502290f27f5..2be2ecdb58c 100644
Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ