diff --git a/code/modules/cooking/recipes/cultural/recipes_skrell.dm b/code/modules/cooking/recipes/cultural/recipes_skrell.dm index a0741fcccdc..697aeff13ab 100644 --- a/code/modules/cooking/recipes/cultural/recipes_skrell.dm +++ b/code/modules/cooking/recipes/cultural/recipes_skrell.dm @@ -38,3 +38,50 @@ ) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/soup/qilvo + +//Neaera recipes. +/decl/recipe/neaerastew + appliance = POT + fruit = list("guami" = 2, "eki" = 2) + reagents = list(/decl/reagent/drink/dynjuice = 10) + items = list(/obj/item/reagent_containers/food/snacks/meat/neaera) + result = /obj/item/reagent_containers/food/snacks/stew/neaera + +/decl/recipe/neaerakabob + items = list( + /obj/item/stack/rods, + /obj/item/reagent_containers/food/snacks/meat/neaera, + /obj/item/organ/internal/kidneys/skrell/neaera + ) + result = /obj/item/reagent_containers/food/snacks/neaerakabob + +/decl/recipe/neaeraloaf + appliance = OVEN + reagents = list(/decl/reagent/drink/milk/cream = 10) + items = list(/obj/item/organ/internal/brain/skrell/neaera) + result = /obj/item/reagent_containers/food/snacks/neaeraloaf + +/decl/recipe/neaeracandy + appliance = OVEN + reagents = list(/decl/reagent/drink/milk/cream = 5) + reagent_mix = RECIPE_REAGENT_REPLACE + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/organ/internal/eyes/skrell/neaera + ) + result = /obj/item/reagent_containers/food/snacks/chipplate/neaeracandy + +/decl/recipe/fjylozynboiled + appliance = SAUCEPAN | POT + fruit = list("fjylozyn" = 1) + reagents = list(/decl/reagent/water = 5) + result = /obj/item/reagent_containers/food/snacks/fjylozynboiled + +/decl/recipe/gnaqmi + appliance = FRYER + items = list( + /obj/item/reagent_containers/food/snacks/fjylozynboiled, + /obj/item/reagent_containers/food/snacks/fjylozynboiled, + /obj/item/organ/internal/liver/skrell/neaera + ) + result = /obj/item/reagent_containers/food/snacks/gnaqmi \ No newline at end of file diff --git a/code/modules/hydroponics/seed_datums/jargon.dm b/code/modules/hydroponics/seed_datums/jargon.dm index 2355ca012cb..8d5f066e316 100644 --- a/code/modules/hydroponics/seed_datums/jargon.dm +++ b/code/modules/hydroponics/seed_datums/jargon.dm @@ -138,3 +138,29 @@ /obj/item/seeds/ylpha seed_type = "ylpha" + +/datum/seed/fjylozyn + name = "fjylozyn" + seed_name = "fjylozyn" + display_name = "fjylozyn" + mutants = null + chems = list(/decl/reagent/nutriment = list(3, 5), /decl/reagent/toxin = list(2, 3)) + kitchen_tag = "fjylozyn" + +/datum/seed/fjylozyn/setup_traits() + ..() + set_trait(TRAIT_MATURATION, 8) + set_trait(TRAIT_PRODUCTION, 3) + set_trait(TRAIT_POTENCY, 5) + set_trait(TRAIT_PRODUCT_ICON,"fjylozyn") + set_trait(TRAIT_PRODUCT_COLOUR,"#990000") + set_trait(TRAIT_PLANT_COLOUR,"#993333") + set_trait(TRAIT_PLANT_ICON,"wumpavines") + set_trait(TRAIT_YIELD, 6) + set_trait(TRAIT_BIOLUM,1) + set_trait(TRAIT_BIOLUM_COLOUR,"#990033") + set_trait(TRAIT_SPREAD,1) + set_trait(TRAIT_WATER_CONSUMPTION, 10) + +/obj/item/seeds/fjylozyn + seed_type = "fjylozyn" \ No newline at end of file diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 5de581cb178..7db91dcf5af 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -104,7 +104,8 @@ /obj/item/seeds/clam = 15, /obj/item/seeds/barnacle = 15, /obj/item/seeds/mollusc = 15, - /obj/item/seeds/clam/rasval = 15 + /obj/item/seeds/clam/rasval = 15, + /obj/item/seeds/fjylozyn = 1 ) /obj/machinery/seed_storage/xenobotany @@ -171,7 +172,8 @@ /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3, /obj/item/seeds/wulumunushaseed = 3, - /obj/item/seeds/dynseed = 3 + /obj/item/seeds/dynseed = 3, + /obj/item/seeds/fjylozyn = 3 ) /obj/machinery/seed_storage/attack_hand(mob/user as mob) diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index 86ddc45c6ad..377f4482497 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -112,6 +112,7 @@ name = SPECIES_MONKEY_SKRELL short_name = "nea" name_plural = "Neaera" + meat_type = /obj/item/reagent_containers/food/snacks/meat/neaera icobase = 'icons/mob/human_races/monkeys/r_neaera.dmi' deform = 'icons/mob/human_races/monkeys/r_neaera.dmi' @@ -125,6 +126,16 @@ holder_type = /obj/item/holder/monkey/neaera fall_mod = 0.25 + has_organ = list( + BP_HEART = /obj/item/organ/internal/heart/skrell/neaera, + BP_LUNGS = /obj/item/organ/internal/lungs/skrell/neaera, + BP_LIVER = /obj/item/organ/internal/liver/skrell/neaera, + BP_KIDNEYS = /obj/item/organ/internal/kidneys/skrell/neaera, + BP_BRAIN = /obj/item/organ/internal/brain/skrell/neaera, + BP_STOMACH = /obj/item/organ/internal/stomach, + BP_EYES = /obj/item/organ/internal/eyes/skrell/neaera + ) + /datum/species/monkey/unathi name = SPECIES_MONKEY_UNATHI short_name = "sto" diff --git a/code/modules/organs/subtypes/skrell.dm b/code/modules/organs/subtypes/skrell.dm index b779953cd23..1dd4321260a 100644 --- a/code/modules/organs/subtypes/skrell.dm +++ b/code/modules/organs/subtypes/skrell.dm @@ -44,4 +44,16 @@ storage.remove_from_storage(thing, get_turf(src)) /obj/item/organ/external/head/skrell/attack_self(mob/user) - storage.open(user) \ No newline at end of file + storage.open(user) + +/obj/item/organ/internal/heart/skrell/neaera + +/obj/item/organ/internal/lungs/skrell/neaera + +/obj/item/organ/internal/kidneys/skrell/neaera + +/obj/item/organ/internal/eyes/skrell/neaera + +/obj/item/organ/internal/liver/skrell/neaera + +/obj/item/organ/internal/brain/skrell/neaera \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 84977f9222e..0e4b9510330 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -4000,6 +4000,96 @@ reagent_data = list(/decl/reagent/nutriment = list("mushroom" = 4)) bitesize = 2 +//Neaera food +/obj/item/reagent_containers/food/snacks/stew/neaera + name = "neaera stew" + desc = "Stew made from neaera meat. It is typically garnished with other foods such as guami, eki, or dyn depending on taste." + icon_state = "neaera_stew" + reagents_to_add = list(/decl/reagent/nutriment = 4, /decl/reagent/nutriment/protein/seafood = 6, /decl/reagent/drink/dynjuice = 4) + reagent_data = list(/decl/reagent/nutriment/protein/seafood = list("meaty mushroom" = 2)) + filling_color = "#7C66DD" + +/obj/item/reagent_containers/food/snacks/neaerakabob + name = "neaera-kabob" + icon_state = "neaera_skewer" + desc = "Neaera meat and organs that have been cooked on a skewer. Typical street vendor food in the Jargon Federation." + trash = /obj/item/stack/rods + reagents_to_add = list(/decl/reagent/nutriment/protein/seafood = 8) + reagent_data = list(/decl/reagent/nutriment/protein/seafood = list("fatty meat" = 2)) + filling_color = "#7C66DD" + center_of_mass = list("x"=17, "y"=15) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/neaeraloaf + name = "neaera brain loaf" + icon_state = "neaera_brain_loaf" + desc = "A neaera brain baked in the oven and glazed with cream. Has a similar consistency to yogurt." + trash = /obj/item/trash/tray + reagents_to_add = list(/decl/reagent/nutriment/protein/seafood = 6, /decl/reagent/nutriment/triglyceride = 2, /decl/reagent/drink/milk/cream = 2) + reagent_data = list(/decl/reagent/nutriment/protein/seafood = list("creamy, sweet meat" = 6)) + filling_color = "#7C66DD" + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/neaeraloaf/update_icon() + var/percent = round((reagents.total_volume / 10) * 100) + switch(percent) + if(0 to 50) + icon_state = "neaera_brain_loaf_half" + if(51 to INFINITY) + icon_state = "neaera_brain_loaf" + +/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy + name = "plate of candied neaera eyes" + desc = "Candied neaera eyes shaped into cubes. The mix of savoury and sweet is generally acceptable for most species, although the dish is not commonly liked due to the use of eyes." + icon_state = "neaera_candied_eyes20" + trash = /obj/item/trash/candybowl + vendingobject = /obj/item/reagent_containers/food/snacks/neaeracandy + reagent_data = list(/decl/reagent/nutriment = list("creamy, fatty meat" = 1)) + bitesize = 1 + reagents_to_add = list(/decl/reagent/nutriment/protein/seafood = 20) + unitname = "candied eye" + filling_color = "#7C66DD" + +/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy/update_icon() + switch(reagents.total_volume) + if(1) + icon_state = "neaera_candied_eyes1" + if(2 to 5) + icon_state = "neaera_candied_eyes5" + if(6 to 10) + icon_state = "neaera_candied_eyes10" + if(11 to 15) + icon_state = "neaera_candied_eyes15" + if(20 to INFINITY) + icon_state = "neaera_candied_eyes20" + +/obj/item/reagent_containers/food/snacks/neaeracandy + name = "candied neaera eye" + desc = "A candied neaera eye shaped into a cube. The mix of savoury and sweet is generally acceptable for most species, although the dish is not commonly liked due to the use of eyes." + icon_state = "neaera_candied_eye" + reagents_to_add = list(/decl/reagent/nutriment/protein/seafood = 1) + reagent_data = list(/decl/reagent/nutriment/protein/seafood = list("creamy, fatty meat" = 3)) + bitesize = 1 + filling_color = "#7C66DD" + +/obj/item/reagent_containers/food/snacks/fjylozynboiled + name = "boiled fjylozyn" + desc = "Originating from Fjylo, this red seaweed-like vegetable is a primary source of protein for Skrell who don't eat meat. It is typically boiled, and while it can be eaten on its own, is notably one of the main ingredients in gnaqmi." + icon_state = "fjylozyn_boiled" + reagents_to_add = list(/decl/reagent/nutriment = 4) + reagent_data = list(/decl/reagent/nutriment = list("sweet turnips" = 3)) + bitesize = 2 + filling_color = "#7C66DD" + +/obj/item/reagent_containers/food/snacks/gnaqmi + name = "gnaqmi" + desc = "Fried neaera organs stuffed with boiled fjylozyn. It tastes like sweet turnips and meat, and is usually served as an after dinner snack to round off the evening at Skrell gatherings." + icon_state = "gnaqmi" + reagents_to_add = list(/decl/reagent/nutriment/protein/seafood = 4, /decl/reagent/nutriment = 8) + reagent_data = list(/decl/reagent/nutriment/protein/seafood = list("fatty meat" = 4), /decl/reagent/nutriment = list("sweet turnips" = 4)) + bitesize = 3 + filling_color = "#7C66DD" + /obj/item/reagent_containers/food/snacks/friedkois name = "fried k'ois" desc = "K'ois, freshly bathed in the radiation of a microwave." diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index ac93e0c3aa9..a2e84044b19 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -36,6 +36,11 @@ /obj/item/reagent_containers/food/snacks/meat/monkey //same as plain meat +/obj/item/reagent_containers/food/snacks/meat/neaera + name = "neaera meat" + icon_state = "neaera_meat" + reagents_to_add = list(/decl/reagent/nutriment/protein = 3, /decl/reagent/nutriment/protein/seafood = 3, /decl/reagent/nutriment/triglyceride = 2) + /obj/item/reagent_containers/food/snacks/meat/corgi name = "corgi meat" desc = "Tastes like... well, you know." diff --git a/html/changelogs/neaerafood.yml b/html/changelogs/neaerafood.yml new file mode 100644 index 00000000000..6204f2ca0c2 --- /dev/null +++ b/html/changelogs/neaerafood.yml @@ -0,0 +1,7 @@ +author: RyverStyx, listerla + +delete-after: True + +changes: + - rscadd: "Added a number of Skrell foods, produced with neaera organs." + - rscadd: "Added fjylozyn, a mildly toxic Skrell plant." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 473ba12fef2..79509e4fba7 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 ead4e68afaa..d5c8467f94f 100644 Binary files a/icons/obj/hydroponics_products.dmi and b/icons/obj/hydroponics_products.dmi differ