diff --git a/code/modules/cooking/recipes/cultural/recipes_tajara.dm b/code/modules/cooking/recipes/cultural/recipes_tajara.dm index cc39817334f..982f762feaa 100644 --- a/code/modules/cooking/recipes/cultural/recipes_tajara.dm +++ b/code/modules/cooking/recipes/cultural/recipes_tajara.dm @@ -325,4 +325,68 @@ appliance = MIX fruit = list("mtear" = 1, "nifberries" = 1) reagents = list(/singleton/reagent/spacespice = 1, /singleton/reagent/nutriment/flour/nfrihi = 5) - result = /obj/item/reagent_containers/food/snacks/dip/tajhummus \ No newline at end of file + result = /obj/item/reagent_containers/food/snacks/dip/tajhummus + +// Tajaran gelatin-based food +/singleton/recipe/seafoodmousse + appliance = MIX + fruit = list("nifberries" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/clam, + /obj/item/reagent_containers/food/snacks/clam, + /obj/item/reagent_containers/food/snacks/dip/sarmikhir + ) + reagents = list(/singleton/reagent/nutriment/gelatin = 10, /singleton/reagent/water = 5, /singleton/reagent/spacespice = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/seafoodmousse + +/singleton/recipe/vegello + appliance = MIX + fruit = list("nifberries" = 2, "earthenroot" = 2, "mtear" = 2) + reagents = list(/singleton/reagent/nutriment/gelatin = 10, /singleton/reagent/water = 5, /singleton/reagent/spacespice = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/sliceable/vegello + +/singleton/recipe/fruitgello + appliance = MIX + fruit = list("nmshaan" = 2, "nifberries" = 1) + reagents = list(/singleton/reagent/nutriment/gelatin = 10, /singleton/reagent/water = 5, /singleton/reagent/sugar = 5, /singleton/reagent/drink/milk/cream = 5) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/fruitgello + +/singleton/recipe/aspicfatshouter + appliance = OVEN + items = list( + /obj/item/reagent_containers/food/snacks/meat/adhomai, + /obj/item/reagent_containers/food/snacks/meat/adhomai, + /obj/item/reagent_containers/food/snacks/meat/adhomai, + /obj/item/reagent_containers/food/snacks/egg/ice_tunnelers, + /obj/item/reagent_containers/food/snacks/egg/ice_tunnelers, + /obj/item/reagent_containers/food/snacks/dip/sarmikhir + ) + reagents = list(/singleton/reagent/nutriment/gelatin = 10, /singleton/reagent/water = 5, /singleton/reagent/spacespice = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/sliceable/aspicfatshouter + +/singleton/recipe/fatshouterbake + appliance = OVEN + fruit = list("nmshaan" = 2) + items = list( + /obj/item/reagent_containers/food/snacks/adhomian_can, + /obj/item/reagent_containers/food/snacks/adhomian_can + ) + reagents = list(/singleton/reagent/nutriment/gelatin = 5, /singleton/reagent/water = 5, /singleton/reagent/spacespice = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/sliceable/fatshouterbake + +/singleton/recipe/crownfurter + appliance = OVEN + fruit = list("nifberries" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/adhomian_sausage, + /obj/item/reagent_containers/food/snacks/adhomian_sausage, + /obj/item/reagent_containers/food/snacks/dip/sarmikhir + ) + reagents = list(/singleton/reagent/nutriment/gelatin = 5, /singleton/reagent/water = 5, /singleton/reagent/spacespice = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/chipplate/crownfurter diff --git a/code/modules/hydroponics/seed_datums/adhomai.dm b/code/modules/hydroponics/seed_datums/adhomai.dm index 76e320831bc..f40f91297a1 100644 --- a/code/modules/hydroponics/seed_datums/adhomai.dm +++ b/code/modules/hydroponics/seed_datums/adhomai.dm @@ -129,7 +129,7 @@ display_name = "sugar trees" seed_noun = SEED_NOUN_SEEDS mutants = null - chems = list(/singleton/reagent/sugar = list(2, 10)) + chems = list(/singleton/reagent/sugar = list(2, 10), /singleton/reagent/nutriment/gelatin = list(2, 5)) kitchen_tag = "nmshaan" /datum/seed/nmshaan/setup_traits() 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 66ca50a8c73..d7030fb90ec 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -914,6 +914,18 @@ color = "#441a03" taste_description = "chocolate" +/singleton/reagent/nutriment/gelatin + name = "Gelatin" + description = "A translucent, typically flavorless powder used in cooking." + reagent_state = SOLID + nutriment_factor = 1 + color = "#CBBCA9" + taste_description = "jiggliness" + condiment_name = "Gelatin Box" + condiment_icon_state = "gello" + condiment_desc = "An unassuming box of raw powdered gelatin. Let's get jiggly." + condiment_center_of_mass = list("x"=16, "y"=8) + /* Drinks */ /singleton/reagent/drink diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index de978931c06..ae2caead60f 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -5935,3 +5935,119 @@ reagent_data = list(/singleton/reagent/nutriment = list("dry mush" = 2, "something savoury" = 4)) bitesize = 2 trash = /obj/item/trash/plate + +/obj/item/reagent_containers/food/snacks/seafoodmousse + name = "seafood mousse" + desc = "A culinary classic on Adhomai that relies on gelatin to hold its shape. It even has a smile traced on it! Aw.." + icon_state = "fish_mousse" + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/protein/seafood = 6) + reagent_data = list(/singleton/reagent/nutriment = list("sour cream" = 2), /singleton/reagent/nutriment/protein/seafood = list("jiggly seafood" = 3)) + filling_color = "#FF7F7F" + trash = /obj/item/trash/snacktray + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/sliceable/vegello + name = "garden vegetable gelatin salad" + desc = "Shredded Messa's Tears, chopped earthenroot, and dirtberries make up the many layers of this salad, with the whole thing set in savory gelatin." + icon_state = "vegello_salad" + slice_path = /obj/item/reagent_containers/food/snacks/vegello_slice + slices_num = 6 + filling_color = "#B7BA8F" + reagents_to_add = list(/singleton/reagent/nutriment = 24) + reagent_data = list(/singleton/reagent/nutriment = list("jiggly vegetables" = 10, "bouncy gelatin" = 10)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/vegello_slice + name = "garden vegetable gelatin salad slice" + desc = "A slice of jiggly, bouncy veggie-laden gelatin. Scrumptious!" + icon_state = "vegello_salad_slice" + trash = /obj/item/trash/plate + filling_color = "#B7BA8F0" + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/fruitgello + name = "gelatin dessert" + desc = "Sweet, fruity gelatin with a decadent cream topping, sprinkled with dirtberries." + icon_state = "fruitgello_dessert" + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/drink/milk/cream = 4) + reagent_data = list(/singleton/reagent/nutriment = list("jiggly fruit" = 4), /singleton/reagent/drink/milk/cream = list("whipped cream" = 3)) + filling_color = "#F3C5CF" + trash = /obj/item/trash/plate + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/sliceable/aspicfatshouter + name = "fatshouter in aspic" + desc = "A large solid chunk of Adhomian meat, with hard-boiled tunneler eggs interspersed, contained within a savory aspic package and topped with sarmikhir. Great at parties!" + icon_state = "meatjello_cube" + slice_path = /obj/item/reagent_containers/food/snacks/aspicfatshouter_slice + slices_num = 5 + filling_color = "#967951" + reagents_to_add = list(/singleton/reagent/nutriment/protein = 15, /singleton/reagent/nutriment = 10, /singleton/reagent/nutriment/protein/egg = 5) + reagent_data = list(/singleton/reagent/nutriment = list("sour cream" = 5, "bouncy gelatin" = 5), /singleton/reagent/nutriment/protein = list("jiggly meat" = 15), /singleton/reagent/nutriment/protein/egg = list("hard-boiled eggs" = 3)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/aspicfatshouter_slice + name = "slice of fatshouter in aspic" + desc = "The amount of meat contained in this chunk of wobbly aspic is intimidating." + icon_state = "meatjello_cube_slice" + trash = /obj/item/trash/plate + filling_color = "#967951" + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/sliceable/fatshouterbake + name = "fatshouter bake" + desc = "Made popular during the war, due to the rationing restrictions, the fatshouter bake is merely a canned cube of fatshouter meat roasted with sugar tree candy stuffed inside." + icon_state = "fatshouter_bake" + slice_path = /obj/item/reagent_containers/food/snacks/fatshouterbake_slice + slices_num = 4 + trash = /obj/item/trash/grease + filling_color = "#94372A" + reagents_to_add = list(/singleton/reagent/nutriment/protein = 16, /singleton/reagent/nutriment = 8) + reagent_data = list(/singleton/reagent/nutriment = list("roasted, sweet fruit" = 3), /singleton/reagent/nutriment/protein = list("jiggly meat" = 3)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/fatshouterbake_slice + name = "slice of fatshouter bake" + desc = "A slice of slow-cooked canned meat smothered in roasted sugar tree fruit." + icon_state = "fatshouter_bake_slice" + trash = /obj/item/trash/plate + filling_color = "#94372A" + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/chipplate/crownfurter + name = "crown roast of adhomian frankfurters" + desc = "A party favorite, several adhomian sausages have been set upright around a center of sarmikhir for ease of dipping. It's finger food!" + icon_state = "crownfurter14" + trash = /obj/item/trash/tray + vendingobject = /obj/item/reagent_containers/food/snacks/tajfurter + reagent_data = list(/singleton/reagent/nutriment = list("sour cream" = 2), /singleton/reagent/nutriment/protein = list("roasted sausage" = 2)) + bitesize = 2 + reagents_to_add = list(/singleton/reagent/nutriment = 14, /singleton/reagent/nutriment/protein = 14) + unitname = "dipped frankfurter" + filling_color = "#94372A" + +/obj/item/reagent_containers/food/snacks/chipplate/crownfurter/update_icon() + switch(reagents.total_volume) + if(1 to 7) + icon_state = "crownfurter2" + if(8 to 11) + icon_state = "crownfurter4" + if(12 to 15) + icon_state = "crownfurter6" + if(16 to 19) + icon_state = "crownfurter8" + if(20 to 23) + icon_state = "crownfurter10" + if(24 to 27) + icon_state = "crownfurter12" + if(28 to INFINITY) + icon_state = "crownfurter14" + +/obj/item/reagent_containers/food/snacks/tajfurter + name = "dipped frankfurter" + desc = "Traditional adhomian sausage dipped in sarmikhir. Delicious!." + icon_state = "franksingle" + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/protein = 2) + reagent_data = list(/singleton/reagent/nutriment = list("sour cream" = 2), /singleton/reagent/nutriment/protein = list("roasted sausage" = 2)) + bitesize = 1 + filling_color = "#94372A" diff --git a/html/changelogs/sue - cursed food.yml b/html/changelogs/sue - cursed food.yml new file mode 100644 index 00000000000..3e3fcaddcdb --- /dev/null +++ b/html/changelogs/sue - cursed food.yml @@ -0,0 +1,42 @@ +################################ +# 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: Sue, Ramke + +# 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 gelatin, obtainable from grinding nm'shaan (sugar tree) fruit." + - rscadd: "Added 6 new gelatin-based dishes." \ No newline at end of file diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 47c835701e7..c1fe583cf7f 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ