diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index d043d7dcce..475a25674f 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -206,4 +206,16 @@ /datum/recipe/hotwater reagents = list("water" = 60) - result = /obj/item/weapon/reagent_containers/glass/bottle/hotwater \ No newline at end of file + result = /obj/item/weapon/reagent_containers/glass/bottle/hotwater + +/datum/recipe/steamtealeaf + reagents = list("water" = 5) + fruit = list("tea" = 1) + + result = /obj/item/weapon/reagent_containers/food/snacks/steamtealeaf + +/datum/recipe/greentealeaf //TODO: Figure out how to make this recipe with a drying rack. + items = list( + /obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf + ) + result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf \ No newline at end of file diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 6485f55159..7c6b2b507e 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -1300,3 +1300,28 @@ set_trait(TRAIT_IDEAL_HEAT, 283) set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0) set_trait(TRAIT_WATER_CONSUMPTION, 0) + +// Tea plants/variants. +/datum/seed/tea + name = "tea" + seed_name = "tea" + display_name = "tea plant" + chems = list("teamush" = list(3,10)) + mutants = null + kitchen_tag = "tea" + +/datum/seed/tea/New() + ..() + set_trait(TRAIT_HARVEST_REPEAT,1) + set_trait(TRAIT_MATURATION,5) + set_trait(TRAIT_PRODUCTION,5) + set_trait(TRAIT_YIELD,6) + set_trait(TRAIT_POTENCY,20) + set_trait(TRAIT_PRODUCT_ICON,"tea") + set_trait(TRAIT_PRODUCT_COLOUR,"#b7e496") + set_trait(TRAIT_PLANT_COLOUR,"#b7e496") + set_trait(TRAIT_PLANT_ICON,"bush4") + set_trait(TRAIT_IDEAL_HEAT, 298) + set_trait(TRAIT_IDEAL_LIGHT, 7) + set_trait(TRAIT_WATER_CONSUMPTION, 6) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) \ No newline at end of file diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 0689f428b6..80654d408b 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -283,3 +283,6 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) /obj/item/seeds/thaadra seed_type = "thaadra" + +/obj/item/seeds/teaseed + seed_type = "tea" diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 4c6d8b2798..3cb33eb572 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -124,6 +124,7 @@ /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, + /obj/item/seeds/teaseed = 3, /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, @@ -173,6 +174,7 @@ /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, + /obj/item/seeds/teaseed = 3, /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, diff --git a/code/modules/hydroponics/seed_storage_vr.dm b/code/modules/hydroponics/seed_storage_vr.dm index 6d9d373b78..9f155225a7 100644 --- a/code/modules/hydroponics/seed_storage_vr.dm +++ b/code/modules/hydroponics/seed_storage_vr.dm @@ -30,6 +30,7 @@ /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, + /obj/item/seeds/teaseed = 3, /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, @@ -79,6 +80,7 @@ /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/shandseed = 2, + /obj/item/seeds/teaseed = 3, /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index d2bce48d56..8d14851c1b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -3294,4 +3294,86 @@ strength = 15 glass_name = "Sit on my face" - glass_desc = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!" \ No newline at end of file + glass_desc = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!" + +/datum/reagent/drink/freshtea + name = "Green tea" + id = "freshtea" //Not meant to be obtainable, this is to define effects for teas made from grown teas. + description = "Tasty green tea, it has antioxidants, it's good for you! Fresh means it's even healthier!" + taste_description = "green tea" + color = "#cac162" + adj_dizzy = -4 + adj_drowsy = -1 + adj_sleepy = -3 + adj_temp = 20 + + glass_name = "green tea" + glass_desc = "Tasty green tea, it has antioxidants, it's good for you!" + + cup_icon_state = "cup_tea" + cup_name = "cup of tea" + cup_desc = "Tasty green tea, it has antioxidants, it's good for you!" + +/datum/reagent/drink/freshtea/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(alien == IS_DIONA) + return + M.adjustToxLoss(-2 * removed) //Higher toxin removal than other tea to reflect difficulty in preparing, still worse than dylovene. + +/datum/reagent/drink/freshtea/green + name = "Green tea" + id = "freshteagreen" + description = "Floral green tea, it has antioxidants, it's good for you! Fresh means it's even healthier!" + taste_description = "floral with vegetal notes and a slightly bitter aftertaste" + color = "#cac162" + + glass_name = "green tea" + glass_desc = "Floral green tea, it has antioxidants, it's fresh and good for you!" + + cup_icon_state = "cup_tea" + cup_name = "cup of tea" + cup_desc = "Floral green tea, it has antioxidants, it's fresh and good for you!" + +/datum/reagent/drink/tealeavesgreen + name = "Green tea leaves" + id = "tealeavesgreen" + description = "Prepared green tea, just waiting for hot water." + taste_description = "overwhelmingly bitter with faint floral notes" + color = "#56761d" + + glass_name = "tea leaves" + glass_desc = "Dry tea leaves in a cup. Just add hot water!" + +/datum/reagent/drink/teamush + name = "Tea mush" + id = "teamush" + description = "Mashed tea leaves, a bit like grass clippings. You can't make proper tea out of this now." + taste_description = "overwhelmingly bitter plant" + color = "#7db72d" + + glass_name = "blended plant" + glass_desc = "Chunky, mashed up plant of some sort. Looks kinda gross." + +/datum/reagent/drink/instantteapowdergreen + name = "Instant green tea powder" + id = "instantteapowdergreen" + description = "Green tea powder missing all the goodness of green tea." //Heathen. + taste_description = "strongly bitter with a subtle chemical aftertaste" + color = "#56761d" + + glass_name = "tea powder" + glass_desc = "Instant green tea powder. Just add water for imitation green tea!" + +/datum/reagent/drink/instantteagreen + name = "Instant green tea" + id = "instantteagreen" + description = "Convenient green tea missing all the goodness of actual green tea." //It's not even hot. + taste_description = "bitter with a subtle chemical aftertaste" + color = "#cac162" + + glass_name = "green tea" + glass_desc = "Green tea. It smells a bit off." + + cup_icon_state = "cup_tea" + cup_name = "cup of tea" + cup_desc = "Green tea. It smells a bit off." \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes_ch.dm b/code/modules/reagents/Chemistry-Recipes_ch.dm index 3b7ce69c4f..6ff79e224c 100644 --- a/code/modules/reagents/Chemistry-Recipes_ch.dm +++ b/code/modules/reagents/Chemistry-Recipes_ch.dm @@ -11,12 +11,12 @@ result = "dyloteane" required_reagents = list("anti_toxin" = 1, "tea" = 1) result_amount = 1 - + /datum/chemical_reaction/dyloteane/super name = "dyloteanesuper" id = "dyloteanesuper" result = "dyloteane" - required_reagents = list("anti_toxin" = 1, "tea" = 1,"sugar" = 1) + required_reagents = list("anti_toxin" = 1, "tea" = 1,"sugar" = 1) result_amount = 10 //by the powers of england for sugaring your tea you gain *10 result /datum/chemical_reaction/eden @@ -30,5 +30,21 @@ id = "eden_snake" result = "eden_snake" required_reagents = list("eden" = 1, "ethanol" = 1) - - + +/datum/chemical_reaction/freshtea/green + id = "freshteagreen" + result = "freshteagreen" + required_reagents = list ("tealeavesgreen" = 1, "hotwater" = 9) + result_amount = 10 + +/datum/chemical_reaction/instantteapowder/green + id = "instantteapowdergreen" + result = "instantteapowdergreen" + required_reagents = list ("teamush" = 10, "frostoil" = 1) + result_amount = 10 + +/datum/chemical_reaction/instanttea/green + id = "instantteagreen" + result = "instantteagreen" + required_reagents = list ("instantteapowdergreen" = 1, "water" = 9) + result_amount = 10 \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm index e102328fe6..db27c59feb 100644 --- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm +++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm @@ -285,12 +285,12 @@ trash = /obj/item/trash/snack_bowl nutriment_amt = 0 nutriment_desc = list("something?" = 1, "nothing" = 4) - + /obj/item/weapon/reagent_containers/food/snacks/gelbowl/New() ..() reagents.add_reagent("gelatin", 15) bitesize = 2 - + /obj/item/weapon/reagent_containers/food/snacks/sauerkraut name = "Sauerkraut" desc = "What happens when you mix salt and minced cabbage and forget it on a shelf." @@ -303,7 +303,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sauerkraut/New() ..() bitesize = 3 - + /obj/item/weapon/reagent_containers/food/snacks/bigos name = "Bigos" desc = "What happens when you put minced sour cabbage and whats left in the fridge in a pot, start slowcooking it and then forget it for three hours." @@ -318,7 +318,7 @@ reagents.add_reagent("protein", 4) reagents.add_reagent("water", 3) bitesize = 7 - + /obj/item/weapon/reagent_containers/food/snacks/concha name = "concha" desc = "A sweet bread roll baked with a strawberry topping thats crunchy and delicious, it kinda looks like a shell." @@ -330,7 +330,7 @@ /obj/item/weapon/reagent_containers/food/snacks/concha/New() ..() bitesize = 3 - + /obj/item/weapon/reagent_containers/food/snacks/pandenata name = "Pan de nata" desc = "Large spongy and soft biscuits that taste creamy and sweet, a treat like this would be perfect on a lazy day." @@ -342,7 +342,7 @@ /obj/item/weapon/reagent_containers/food/snacks/pandenata/New() ..() bitesize = 3 - + /obj/item/weapon/reagent_containers/food/snacks/tocino name = "Tocino" desc = "A form of bacon made from cuts of pork that has cured in wine, sugar and salt for a while, best served on a hot skillet so remains warm and tasty til the last bite." @@ -367,7 +367,51 @@ /obj/item/weapon/reagent_containers/food/snacks/garlicbread/New() ..() bitesize = 3 - + +/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf + name = "Steamed tea leaf" + desc = "A freshly picked tea leaf steamed to inhibit oxidation. Needs rolling." + icon = 'icons/obj/food.dmi' + icon_state = "tealeafsteam" + nutriment_amt = 0 + nutriment_desc = list("nothing" = 1) + +/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf/New() + ..() + reagents.add_reagent("teamush", 3) + bitesize = 1 + +/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/weapon/material/kitchen/rollingpin)) + new /obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf(src) + user << "You roll the steamed tea leaf." + qdel(src) + +/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf + name = "Rolled steamed tea leaf" + desc = "A steamed tea leaf ready for drying." + icon = 'icons/obj/food.dmi' + icon_state = "tealeafsteamroll" + nutriment_amt = 0 + nutriment_desc = list("nothing" = 1) + +/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf/New() + ..() + bitesize = 1 + +/obj/item/weapon/reagent_containers/food/snacks/greentealeaf + name = "Green tea leaf" + desc = "Green tea! Just grind and mix with hot water." + icon = 'icons/obj/food.dmi' + icon_state = "greentealeaf" + nutriment_amt = 0 + nutriment_desc = list("nothing" = 1) + +/obj/item/weapon/reagent_containers/food/snacks/greentealeaf/New() + ..() + reagents.add_reagent("tealeavesgreen", 6) + bitesize = 1 + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube name = "sobaka cube" monkey_type = "Sobaka" diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index d3bac96aab..c19c0925b5 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi index 9fdc7c763f..6e269f562d 100644 Binary files a/icons/obj/hydroponics_products.dmi and b/icons/obj/hydroponics_products.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index 380cae9e9c..b730ab2b59 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ