diff --git a/aurorastation.dme b/aurorastation.dme index 465e5ff6c19..6d14d6dfe26 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2012,6 +2012,7 @@ #include "code\modules\hydroponics\seed_datums\root_vegetables.dm" #include "code\modules\hydroponics\seed_datums\smokables.dm" #include "code\modules\hydroponics\seed_datums\tomato.dm" +#include "code\modules\hydroponics\seed_datums\unathi.dm" #include "code\modules\hydroponics\seed_datums\vegetables.dm" #include "code\modules\hydroponics\spreading\spreading.dm" #include "code\modules\hydroponics\spreading\spreading_growth.dm" diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 958ce5044ca..05a60ed27fb 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -738,6 +738,7 @@ icon_state = SEED_NOUN_SEEDS vend_id = SEED_NOUN_SEEDS products = list( + /obj/item/seeds/aghrasshseed = 3, /obj/item/seeds/ambrosiavulgarisseed = 3, /obj/item/seeds/appleseed = 3, /obj/item/seeds/bananaseed = 3, @@ -759,6 +760,7 @@ /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/eki = 3, /obj/item/seeds/garlicseed = 3, + /obj/item/seeds/gukheseed = 3, /obj/item/seeds/grapeseed = 3, /obj/item/seeds/grassseed = 3, /obj/item/seeds/greengrapeseed = 3, @@ -785,8 +787,11 @@ /obj/item/seeds/reishimycelium = 3, /obj/item/seeds/riceseed = 3, /obj/item/seeds/richcoffeeseed = 3, + /obj/item/seeds/sarezhiseed = 3, + /obj/item/seeds/serkiflowerseed, /obj/item/seeds/shandseed = 3, /obj/item/seeds/soyaseed = 3, + /obj/item/seeds/sthberryseed = 3, /obj/item/seeds/strawberryseed = 3, /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, @@ -800,6 +805,7 @@ /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3, /obj/item/seeds/wulumunushaseed = 2, + /obj/item/seeds/xuiziseed = 3, /obj/item/seeds/ylpha = 3 ) contraband = list( diff --git a/code/modules/cooking/recipes/cultural/recipes_unathi.dm b/code/modules/cooking/recipes/cultural/recipes_unathi.dm index 2a6034cbf04..f6ba67c5809 100644 --- a/code/modules/cooking/recipes/cultural/recipes_unathi.dm +++ b/code/modules/cooking/recipes/cultural/recipes_unathi.dm @@ -148,4 +148,32 @@ items = list( /obj/item/reagent_containers/food/snacks/spreads/butter ) - result = /obj/item/reagent_containers/food/snacks/sintapudding \ No newline at end of file + result = /obj/item/reagent_containers/food/snacks/sintapudding + +/singleton/recipe/stokskewer + appliance = SKILLET + fruit = list("gukhe" = 1) + reagents = list(/singleton/reagent/spacespice = 1) + items = list( + /obj/item/reagent_containers/food/snacks/rawcutlet, + /obj/item/reagent_containers/food/snacks/rawcutlet + ) + result = /obj/item/reagent_containers/food/snacks/stokkebab + +/singleton/recipe/gukhefish + appliance = SKILLET | SAUCEPAN + fruit = list("gukhe" = 1) + reagents = list(/singleton/reagent/sodiumchloride = 1, /singleton/reagent/spacespice = 1) + items = list( + /obj/item/reagent_containers/food/snacks/fish + ) + result = /obj/item/reagent_containers/food/snacks/gukhefish + +/singleton/recipe/aghrasshcake + appliance = OVEN + fruit = list("aghrassh nut" = 1) + reagents = list(/singleton/reagent/sodiumchloride = 3, /singleton/reagent/blackpepper = 3, /singleton/reagent/nutriment/coco = 3, /singleton/reagent/spacespice = 1) + items = list( + /obj/item/reagent_containers/food/snacks/egg + ) + result = /obj/item/reagent_containers/food/snacks/aghrasshcake \ No newline at end of file diff --git a/code/modules/hydroponics/seed_datums/unathi.dm b/code/modules/hydroponics/seed_datums/unathi.dm new file mode 100644 index 00000000000..1e3d6cff8c5 --- /dev/null +++ b/code/modules/hydroponics/seed_datums/unathi.dm @@ -0,0 +1,139 @@ +//Unathi plants + +/datum/seed/xuizi + name = "xuizi" + seed_name = "xuizi" + display_name = "xuizi cactus" + mutants = null + chems = list(/singleton/reagent/alcohol/butanol/xuizijuice = list(3, 5), /singleton/reagent/nutriment = list(2,2)) + kitchen_tag = "xuizi flesh" + +/datum/seed/xuizi/setup_traits() + ..() + set_trait(TRAIT_MATURATION,6) + set_trait(TRAIT_PRODUCTION,6) + set_trait(TRAIT_YIELD,6) + set_trait(TRAIT_POTENCY,10) + set_trait(TRAIT_PRODUCT_ICON,"stalk") + set_trait(TRAIT_PRODUCT_COLOUR,"#b7f0b1") + set_trait(TRAIT_PLANT_COLOUR,"#4D8F53") + set_trait(TRAIT_PLANT_ICON,"tree3") + set_trait(TRAIT_WATER_CONSUMPTION, 6) + +/obj/item/seeds/xuiziseed + seed_type = "xuizi" + +/datum/seed/sarezhi + name = "sarezhi berry" + seed_name = "sarezshi berry" + display_name = "sarezhi berry bush" + mutants = null + chems = list(/singleton/reagent/nutriment = list(2,2), /singleton/reagent/drink/sarezhiberryjuice = list(1,10)) + kitchen_tag = "sarezhi berry" + +/datum/seed/sarezhi/setup_traits() + ..() + set_trait(TRAIT_HARVEST_REPEAT,1) + set_trait(TRAIT_JUICY,1) + set_trait(TRAIT_MATURATION,5) + set_trait(TRAIT_PRODUCTION,5) + set_trait(TRAIT_YIELD,2) + set_trait(TRAIT_POTENCY,10) + set_trait(TRAIT_PRODUCT_ICON,"berry") + set_trait(TRAIT_PRODUCT_COLOUR,"#bf8fbc") + set_trait(TRAIT_PLANT_ICON,"bush") + set_trait(TRAIT_WATER_CONSUMPTION, 6) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + +/obj/item/seeds/sarezhiseed + seed_type = "sarezhi berry" + +/datum/seed/gukhe + name = "gukhe" + seed_name = "gukhe bloom" + display_name = "gukhe bloom" + mutants = null + chems = list(/singleton/reagent/nutriment = list(2,12), /singleton/reagent/capsaicin = list(10,10)) + kitchen_tag = "gukhe" + +/datum/seed/gukhe/setup_traits() + ..() + set_trait(TRAIT_HARVEST_REPEAT,1) + set_trait(TRAIT_JUICY,1) + set_trait(TRAIT_MATURATION,3) + set_trait(TRAIT_PRODUCTION,5) + set_trait(TRAIT_YIELD,4) + set_trait(TRAIT_POTENCY,10) + set_trait(TRAIT_PRODUCT_ICON,"algae") + set_trait(TRAIT_PRODUCT_COLOUR,"#e93e1c") + set_trait(TRAIT_PLANT_COLOUR,"#6d9c6b") + set_trait(TRAIT_PLANT_ICON,"algae") + set_trait(TRAIT_IDEAL_LIGHT, 6) + set_trait(TRAIT_WATER_CONSUMPTION, 6) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + +/obj/item/seeds/gukheseed + seed_type = "gukhe bloom" + +/datum/seed/aghrassh + name = "aghrassh" + seed_name = "aghrassh" + display_name = "aghrassh tree" + chems = list(/singleton/reagent/nutriment = list(1,20)) + kitchen_tag = "aghrassh nut" + +/datum/seed/aghrassh/setup_traits() + ..() + set_trait(TRAIT_HARVEST_REPEAT,1) + set_trait(TRAIT_MATURATION,6) + set_trait(TRAIT_PRODUCTION,6) + set_trait(TRAIT_YIELD,4) + set_trait(TRAIT_POTENCY,15) + set_trait(TRAIT_PRODUCT_ICON,"nuts") + set_trait(TRAIT_PRODUCT_COLOUR,"#866523") + set_trait(TRAIT_PLANT_ICON,"tree") + +/obj/item/seeds/aghrasshseed + seed_type = "aghrassh tree" + +/datum/seed/sthberry + name = "S'th berry" + seed_name = "S'th berry" + display_name = "S'th berry bush" + chems = list(/singleton/reagent/nutriment = list(2,2), /singleton/reagent/drink/sthberryjuice = list(3,5)) + kitchen_tag = "S'th berry" + +/datum/seed/sthberry/setup_traits() + ..() + set_trait(TRAIT_HARVEST_REPEAT,1) + set_trait(TRAIT_JUICY,1) + set_trait(TRAIT_MATURATION,5) + set_trait(TRAIT_PRODUCTION,5) + set_trait(TRAIT_YIELD,2) + set_trait(TRAIT_POTENCY,10) + set_trait(TRAIT_PRODUCT_ICON,"berry") + set_trait(TRAIT_PRODUCT_COLOUR,"#d40606") + set_trait(TRAIT_PLANT_ICON,"bush") + set_trait(TRAIT_WATER_CONSUMPTION, 6) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + +/obj/item/seeds/sthberryseed + seed_type = "S'th berry" + +/datum/seed/flower/serkiflower + name = "S'erki flowers" + seed_name = "S'erki flower" + display_name = "S'erki flowers" + +/datum/seed/flower/serkiflower/setup_traits() + ..() + set_trait(TRAIT_MATURATION,6) + set_trait(TRAIT_PRODUCT_ICON,"flower3") + set_trait(TRAIT_PRODUCT_COLOUR,"[pick("#ffbc05", "#7400a6")]") + set_trait(TRAIT_PLANT_ICON,"flower3") + set_trait(TRAIT_IDEAL_LIGHT, 7) + set_trait(TRAIT_WATER_CONSUMPTION, 6) + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + +/obj/item/seeds/serkiflowerseed + seed_type = "S'erki flowers" \ No newline at end of file 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 847b2015ac0..77a2178910f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1059,6 +1059,24 @@ glass_name = "glass of ylpha berry juice" glass_desc = "Ylpha berry juice. Or maybe it's jam. Who cares?" +/singleton/reagent/drink/sarezhiberryjuice + name = "Sarezhi Berry Juice" + description = "The tart juice of the sarezhi berry, a rare Moghresian crop which is fermented into the famed Sarezshi Wine" + color = "#bf8fbc" + taste_description = "tart, bitter berry juice" + glass_icon_state = "berryjuice" + glass_name = "glass of sarezhi berry juice" + glass_desc = "A glass of bitter, tart sarezhi juice. You know you're meant to make this into wine before drinking it, right?" + +/singleton/reagent/drink/sthberryjuice + name = "S'th Berry Juice" + description = "The sweet, delectable juice of the S'th berry, a Moghresian fruit found in the Izweski Heartland" + color = "" + taste_description = "sweet berry juice" + glass_icon_state = "berryjuice" + glass_name = "glass of S'th berry juice" + glass_desc = "A glass of S'th berry juice, an Unathi delicacy" + /singleton/reagent/drink/carrotjuice name = "Carrot juice" description = "It is just like a carrot but without crunching." diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index f1866aaa0f3..45749bc5229 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5817,6 +5817,30 @@ reagent_data = list(/singleton/reagent/nutriment = list("iron" = 3)) bitesize = 6 +/obj/item/reagent_containers/food/snacks/stokkebab + name = "stok skewers" + desc = "Two hearty skewers of seared meat, glazed in a tangy spice. A popular Skalamar street food - despite the name, it can be made with just about any meat." + icon_state = "stok-skewers" + reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/nutriment/protein = 2, /singleton/reagent/capsaicin = 2) + reagent_data = list(/singleton/reagent/nutriment = list("tangy and gamey meat" = 3)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/gukhefish + name = "gukhe fish" + desc = "A fish cutlet cured in a bitter gukhe rub, served with a tangy dipping sauce and a garnish of seaweed. A staple of Ouerean and Mictlani Unathi cooking." + icon_state = "gukhe-fish" + reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/nutriment/protein/seafood = 6, /singleton/reagent/capsaicin = 2, /singleton/reagent/sodiumchloride = 2) + reagent_data = list(/singleton/reagent/nutriment = list("tangy fish" = 3, "bitter gukhe" = 3)) + bitesize = 5 + +/obj/item/reagent_containers/food/snacks/aghrasshcake + name = "aghrassh cake" + desc = "A dense, calorie-packed puck of aghrassh paste, spices, and ground meat, usually eaten as an Unathi field ration. This one has an egg cracked over it to make it a bit more palatable." + icon_state = "aghrassh-cake" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 8, /singleton/reagent/nutriment/coco = 3, /singleton/reagent/blackpepper = 3) + reagent_data = list(/singleton/reagent/nutriment = list("aghrassh nuts" = 3, "mealy paste" = 3)) + bitesize = 5 + /obj/item/reagent_containers/food/snacks/phoroncandy name = "phoron rock candy" desc = "Rock candy popular in Flagsdale. Actually contains phoron." diff --git a/html/changelogs/RustingWithYou - lizardplants.yml b/html/changelogs/RustingWithYou - lizardplants.yml new file mode 100644 index 00000000000..7d85a70764d --- /dev/null +++ b/html/changelogs/RustingWithYou - lizardplants.yml @@ -0,0 +1,41 @@ +################################ +# 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: RustingWithYou + +# 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: "Adds several of the new Unathi plants, as well as meals based on them." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index d06f025b280..2cd8a9369c4 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/hydroponics_growing.dmi b/icons/obj/hydroponics_growing.dmi index 9330ecd2415..0077b2a7843 100644 Binary files a/icons/obj/hydroponics_growing.dmi and b/icons/obj/hydroponics_growing.dmi differ diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi index 69367e97564..26403b4b3be 100644 Binary files a/icons/obj/hydroponics_products.dmi and b/icons/obj/hydroponics_products.dmi differ