diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index a4d6befc3ea..9cbcccb2900 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -762,6 +762,7 @@ /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, + /obj/item/seeds/vanilla = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3, @@ -831,6 +832,7 @@ /obj/item/seeds/tobaccoseed = 40, /obj/item/seeds/tomatoseed = 30, /obj/item/seeds/towermycelium = 20, + /obj/item/seeds/vanilla = 30, /obj/item/seeds/watermelonseed = 30, /obj/item/seeds/wheatseed = 20, /obj/item/seeds/whitebeetseed = 20, diff --git a/code/modules/hydroponics/seed_datums/flowers.dm b/code/modules/hydroponics/seed_datums/flowers.dm index fcd0598f163..fbcd2b6354d 100644 --- a/code/modules/hydroponics/seed_datums/flowers.dm +++ b/code/modules/hydroponics/seed_datums/flowers.dm @@ -59,3 +59,23 @@ /obj/item/seeds/sunflowerseed seed_type = "sunflowers" + +/datum/seed/flower/vanilla + name = "vanilla" + seed_name = "vanilla" + display_name = "vanilla" + chems = list(/decl/reagent/nutriment/vanilla = list(3,10), /decl/reagent/nutriment = list(1,20)) + +/obj/item/seeds/vanilla + seed_type = "vanilla" + +/datum/seed/flower/vanilla/setup_traits() + ..() + set_trait(TRAIT_MATURATION,7) + set_trait(TRAIT_PRODUCTION,1) + set_trait(TRAIT_YIELD,2) + set_trait(TRAIT_PRODUCT_ICON,"flower5") + set_trait(TRAIT_PRODUCT_COLOUR,"#e8efe5") + set_trait(TRAIT_PLANT_COLOUR,"#6B8C5E") + set_trait(TRAIT_PLANT_ICON,"flower") + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index a4ee506c0d3..25c690ff31d 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -90,6 +90,7 @@ /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, + /obj/item/seeds/vanilla = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3, @@ -155,6 +156,7 @@ /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/tomatoseed = 3, /obj/item/seeds/towermycelium = 3, + /obj/item/seeds/vanilla = 3, /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 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 b7e05deeb50..b404b4c03f5 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -4734,6 +4734,12 @@ glass_name = "glass of Hro'zamal Soda" glass_desc = "A cabornated version of the herbal tea made with Hro'zamal Ras'Nifs powder." +/decl/reagent/nutriment/vanilla + name = "Vanilla Extract" + description = "The extract from vanilla beans..." + color = "#e8efe5" + taste_description = "vanilla" + /decl/reagent/nutriment/pumpkinpulp name = "Pumpkin Pulp" description = "The gooey insides of a slain pumpkin. This day is the greatest..." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 5265bd48280..030e5fd227e 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3410,6 +3410,14 @@ required_temperature_max = T0C + 100 // Sugar caramelises after 82C, water boils at 100C. mix_message = "The sugar dissolves into the solution." +/datum/chemical_reaction/vanillasyrup + name = "Vanilla Syrup" + id = "vanillasyrup" + result = /decl/reagent/drink/syrup_vanilla + required_reagents = list(/decl/reagent/nutriment/vanilla = 2, /decl/reagent/drink/syrup_simple = 3) + result_amount = 5 + mix_message = "The solution takes on a pale yellow hue and the aroma of vanilla." + /datum/chemical_reaction/caramelsyrup name = "Caramel Syrup" id = "caramelsyrup" diff --git a/html/changelogs/xxxxyobdab-PR-#12509.yml b/html/changelogs/xxxxyobdab-PR-#12509.yml new file mode 100644 index 00000000000..0f91dd43a00 --- /dev/null +++ b/html/changelogs/xxxxyobdab-PR-#12509.yml @@ -0,0 +1,44 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: xxxxyobdab + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a vanilla flower plant, containing vanilla extract" + - rscadd: "Added a vanilla extract reagent for the plant." + - rscadd: "Added a vanilla syrup recipe. Simple Syrup(3 units) + Vanilla extract(2 units)" + - rscadd: "Added Vanilla seeds to vending machines."