diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 51bd5f5ba66..06f2999be84 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -682,6 +682,7 @@ /obj/item/seeds/potatoseed = 3, /obj/item/seeds/pumpkinseed = 3, /obj/item/seeds/qlortseed = 3, + /obj/item/seeds/clam/rasval = 3, /obj/item/seeds/replicapod = 3, /obj/item/seeds/reishimycelium = 3, /obj/item/seeds/riceseed = 3, @@ -747,6 +748,7 @@ /obj/item/seeds/potatoseed = 30, /obj/item/seeds/pumpkinseed = 40, /obj/item/seeds/qlortseed = 70, + /obj/item/seeds/clam/rasval = 100, /obj/item/seeds/reishimycelium = 30, /obj/item/seeds/replicapod = 200, /obj/item/seeds/riceseed = 20, diff --git a/code/modules/cooking/recipes/cultural/recipes_tajara.dm b/code/modules/cooking/recipes/cultural/recipes_tajara.dm index 1f802e3843b..d4493369776 100644 --- a/code/modules/cooking/recipes/cultural/recipes_tajara.dm +++ b/code/modules/cooking/recipes/cultural/recipes_tajara.dm @@ -71,6 +71,90 @@ return ..() return FALSE +// Tajaran cakes +/decl/recipe/conecake + appliance = OVEN + reagents = list(/decl/reagent/drink/milk/adhomai = 5, /decl/reagent/nutriment/flour/nfrihi = 15, /decl/reagent/water = 5, /decl/reagent/sugar = 15) + result = /obj/item/reagent_containers/food/snacks/cone_cake + +/decl/recipe/avah + appliance = FRYER + reagents = list(/decl/reagent/drink/milk/adhomai = 5, /decl/reagent/sugar = 5) + items = list( + /obj/item/reagent_containers/food/snacks/dough, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/avah + +// Tajaran pies +/decl/recipe/fruitrikazu + appliance = OVEN + reagents = list(/decl/reagent/sugar = 5) + fruit = list("mtear" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/tajaran_bread + ) + result = /obj/item/reagent_containers/food/snacks/fruit_rikazu + +/decl/recipe/meatrikazu + appliance = OVEN + reagents = list(/decl/reagent/sodiumchloride = 1, /decl/reagent/blackpepper = 1) + items = list( + /obj/item/reagent_containers/food/snacks/tajaran_bread, + /obj/item/reagent_containers/food/snacks/meat/adhomai + ) + result = /obj/item/reagent_containers/food/snacks/meat_rikazu + +/decl/recipe/vegetablerikazu + appliance = OVEN + reagents = list(/decl/reagent/nutriment/flour/nfrihi = 5) + fruit = list("earthenroot" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/tajaran_bread + ) + result = /obj/item/reagent_containers/food/snacks/vegetable_rikazu + +/decl/recipe/chocolaterikazu + appliance = OVEN + reagents = list(/decl/reagent/drink/milk/cream = 5) + items = list( + /obj/item/reagent_containers/food/snacks/tajaran_bread, + /obj/item/reagent_containers/food/snacks/chocolatebar + ) + result = /obj/item/reagent_containers/food/snacks/chocolate_rikazu + +/decl/recipe/dirt_roast + appliance = OVEN + reagents = list(/decl/reagent/spacespice = 1, /decl/reagent/sugar = 5) + fruit = list("nifberries" = 1) + result = /obj/item/reagent_containers/food/snacks/dirt_roast + +/decl/recipe/fatshouter_fillet + appliance = OVEN + reagents = list(/decl/reagent/spacespice = 1, /decl/reagent/nutriment/flour/nfrihi = 5, /decl/reagent/sodiumchloride = 1, /decl/reagent/blackpepper = 1, /decl/reagent/alcohol/messa_mead = 5) + fruit = list("earthenroot" = 2) + items = list( + /obj/item/reagent_containers/food/snacks/tajaran_bread, + /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/meat/adhomai, + /obj/item/reagent_containers/food/snacks/spreads/lard + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/fatshouter_fillet + +/decl/recipe/zkahnkowafull + appliance = POT | SAUCEPAN + reagents = list(/decl/reagent/blood = 10, /decl/reagent/nutriment/flour/nfrihi = 5, /decl/reagent/sodiumchloride = 1, /decl/reagent/blackpepper = 1) + items = list( + /obj/item/reagent_containers/food/snacks/meat/adhomai + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/zkahnkowafull + +/decl/recipe/creamice + reagents = list(/decl/reagent/drink/milk/adhomai = 10, /decl/reagent/sugar = 10, /decl/reagent/drink/ice = 10) + result = /obj/item/reagent_containers/food/snacks/creamice + // Tajaran Seafood /decl/recipe/spicy_clams fruit = list("chili" = 1, "cabbage" = 1) diff --git a/code/modules/hydroponics/seed_datums/aquaculture.dm b/code/modules/hydroponics/seed_datums/aquaculture.dm index 84764f1937a..eab68ff7147 100644 --- a/code/modules/hydroponics/seed_datums/aquaculture.dm +++ b/code/modules/hydroponics/seed_datums/aquaculture.dm @@ -50,3 +50,17 @@ /obj/item/seeds/barnacle seed_type = "barnacle" + +/datum/seed/mollusc/clam/rasval + name = "rasval clam" + seed_name = "rasval clam" + display_name = "rasval clam bed" + product_type = /obj/item/mollusc/clam/rasval + +/datum/seed/mollusc/clam/rasval/New() + ..() + set_trait(TRAIT_PRODUCT_COLOUR, "#9aaca6") + set_trait(TRAIT_PLANT_COLOUR, "#9aaca6") + +/obj/item/seeds/clam/rasval + seed_type = "rasval clam" \ No newline at end of file diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 160d9d5b888..d42b240c815 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -94,7 +94,8 @@ /obj/item/seeds/ylpha = 2, /obj/item/seeds/clam = 15, /obj/item/seeds/barnacle = 15, - /obj/item/seeds/mollusc = 15 + /obj/item/seeds/mollusc = 15, + /obj/item/seeds/clam/rasval = 15 ) /obj/machinery/seed_storage/xenobotany diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index ca1bcdd629d..35f3cbf6cc8 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -4707,6 +4707,134 @@ bitesize = 4 reagents_to_add = list(/decl/reagent/nutriment/protein/seafood = 20, /decl/reagent/ammonia = 10) +/obj/item/reagent_containers/food/snacks/cone_cake + name = "cone cake" + desc = "A spongy cone-shaped cake covered in sugar." + icon_state = "conecake" + bitesize = 2 + reagents_to_add = list(/decl/reagent/nutriment = 15) + reagent_data = list(/decl/reagent/nutriment = list("Incredible sweetness" = 8, "Cake" = 7)) + desc_fluff = "A spongy, sugar-coated cake that's baked on a spit shaped like a cone, giving it a signature look. Often sold alongside Azvah due to similar preparation methods, the difference between them being the unique shape, the crisp, flaky outside, and the tooth-aching sweetness of the dish that turns some foreigners away." + filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/fruit_rikazu + name = "fruit rikazu" + desc = "A small, crispy Adhomian pie meant for one person filled with fruits." + icon_state = "rikazu_fruit" + bitesize = 2 + reagents_to_add = list(/decl/reagent/nutriment = 8) + reagent_data = list(/decl/reagent/nutriment = list("crispy dough" = 4, "sweet fruit" = 4)) + desc_fluff = "Small pies, often hand-sized, usually made by folding dough overstuffing of fruit and cream cheese; commonly served hot. The simple preparation makes it a fast favorite, and the versatility of the ingredients has gained its favor with Tajara of all creeds. Different variations of Rikazu pop up all over Adhomai, some filled with meats, or vegetables, or even imported ingredients, like chocolate filling." + filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/meat_rikazu + name = "meat rikazu" + desc = "A small, crispy Adhomian pie meant for one person filled with meat." + icon_state = "rikazu_meat" + bitesize = 2 + reagents_to_add = list(/decl/reagent/nutriment = 4, /decl/reagent/nutriment/protein = 4) + reagent_data = list(/decl/reagent/nutriment = list("crispy dough" = 4), /decl/reagent/nutriment/protein = list("savory meat" = 4)) + desc_fluff = "Small pies, often hand-sized, usually made by folding dough overstuffing of fruit and cream cheese; commonly served hot. The simple preparation makes it a fast favorite, and the versatility of the ingredients has gained its favor with Tajara of all creeds. Different variations of Rikazu pop up all over Adhomai, some filled with meats, or vegetables, or even imported ingredients, like chocolate filling." + filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/vegetable_rikazu + name = "vegetable rikazu" + desc = "A small, crispy Adhomian pie meant for one person filled with vegetables." + icon_state = "rikazu_veg" + bitesize = 2 + reagents_to_add = list(/decl/reagent/nutriment = 8) + reagent_data = list(/decl/reagent/nutriment = list("crispy dough" = 4, "cruncy vegetables" = 4)) + desc_fluff = "Small pies, often hand-sized, usually made by folding dough overstuffing of fruit and cream cheese; commonly served hot. The simple preparation makes it a fast favorite, and the versatility of the ingredients has gained its favor with Tajara of all creeds. Different variations of Rikazu pop up all over Adhomai, some filled with meats, or vegetables, or even imported ingredients, like chocolate filling." + filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/chocolate_rikazu + name = "chocolate rikazu" + desc = "A small, crispy Adhomian pie meant for one person filled with chocolate." + icon_state = "rikazu_choc" + bitesize = 2 + reagents_to_add = list(/decl/reagent/nutriment = 8) + reagent_data = list(/decl/reagent/nutriment = list("crispy dough" = 4, "smooth chocolate" = 4)) + desc_fluff = "Small pies, often hand-sized, usually made by folding dough overstuffing of fruit and cream cheese; commonly served hot. The simple preparation makes it a fast favorite, and the versatility of the ingredients has gained its favor with Tajara of all creeds. Different variations of Rikazu pop up all over Adhomai, some filled with meats, or vegetables, or even imported ingredients, like chocolate filling." + filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/avah + name = "avah" + desc = "A large fried dough ball covered in a sweet cream icing." + icon_state = "avah" + bitesize = 2 + reagents_to_add = list(/decl/reagent/nutriment = 7, /decl/reagent/nutriment/protein/cheese = 5) + reagent_data = list(/decl/reagent/nutriment = list("Oily dough" = 7), /decl/reagent/nutriment/protein/cheese = list("sweet cream cheese" = 5)) + desc_fluff = "Used to only mean 'sweets' or 'sweet thing', now singularly refers to a particular dessert. The batter is grilled and made into soft, spherical shapes, and then covered with fruit jams, sugar, or sweet cream cheese. These treats are often sold at festivals and celebrations, and foreigners compare them to pancakes." + filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/dirt_roast + name = "roasted dirtberries" + desc = "A bag of warm roasted dirtberries covered in spice." + icon_state = "roast_dirtberries" + bitesize = 2 + reagents_to_add = list(/decl/reagent/nutriment = 4, /decl/reagent/drink/syrup_caramel = 4) + reagent_data = list(/decl/reagent/nutriment = list("warm crunchy nuts" = 2, "cinnamon" = 2), /decl/reagent/drink/syrup_caramel = list("caramel" = 5)) + desc_fluff = "A traditional snack consisting of oven-roasted dirtberries covered in a mixture of spice and caramel. These crunchy fruits are usually sold at outdoor festivals and events and are enjoyed for their warming effect and pleasant taste." + filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/sliceable/fatshouter_fillet + name = "fatshouter fillet" + desc = "A medium rare fillet of Fatshouter meat covered in an earthenroot pate and wrapped in a flaky crust." + icon_state = "fatshouterfillet_full" + bitesize = 2 + slice_path = /obj/item/reagent_containers/food/snacks/meatbreadslice + slices_num = 5 + reagents_to_add = list(/decl/reagent/nutriment/protein = 10, /decl/reagent/nutriment = 10, /decl/reagent/alcohol/messa_mead = 5) + reagent_data = list(/decl/reagent/nutriment/protein = list("juicy meat" = 10), /decl/reagent/nutriment = list("flaky dough" = 5, "savoury vegetables" = 5)) + desc_fluff = "for a time was considered the benchmark by which to rate the abilities of a chef. The production of this exquisite dish is no easy task, the preparation process begins with the aging of a high-grade tenderloin steak acquired from a Fatshouter fed exclusively on dirtberries. The high starch content of the dirtberries ensures that the creature has a high fat percentage and imparts a unique flavour to the meat and traditionally Noble families would keep a raise small herds of Fatshouters specifically for the production of this dish. After 28 days of dry aging, the tenderloin is ready for use. One day prior to serving the dish, a pâté is made by sauteéing thinly sliced pieces of earthenroot soaked in a generous amount of Messa’s Mead and then thickened with lard before being ground into a fine paste and left to - chill. On the day that the dish is to be served a flaky pastry dough is made. Next the aged 7 tenderloin is trimmed of accumulated mold and rind and coated in a dryrub after which the chilled pâté is spread across the surface of the meat and it is wrapped in the thinly rolled pastry dough. Next the pastry is washed with a small amount of clarified lard to give the crust a nice shine, after which it is placed into a large oven and cooked at a high heat for around 40 minutes. Though the dish was regarded as a symbol of the blatant excess and overindulgence of the ruling elite, it has since been reintroduced to the public by enterprising chefs seeking to recapture the high-class culinary culture of the past." + filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/fatshouterslice + name = "fatshouter fillet slice" + desc = "A medium rare fillet of Fatshouter meat covered in an earthenroot pate and wrapped in a flaky crust." + icon_state = "fatshouterfillet_slice" + filling_color = "#FF7575" + desc_fluff = "for a time was considered the benchmark by which to rate the abilities of a chef. The production of this exquisite dish is no easy task, the preparation process begins with the aging of a high-grade tenderloin steak acquired from a Fatshouter fed exclusively on dirtberries. The high starch content of the dirtberries ensures that the creature has a high fat percentage and imparts a unique flavour to the meat and traditionally Noble families would keep a raise small herds of Fatshouters specifically for the production of this dish. After 28 days of dry aging, the tenderloin is ready for use. One day prior to serving the dish, a pâté is made by sauteéing thinly sliced pieces of earthenroot soaked in a generous amount of Messa’s Mead and then thickened with lard before being ground into a fine paste and left to - chill. On the day that the dish is to be served a flaky pastry dough is made. Next the aged 7 tenderloin is trimmed of accumulated mold and rind and coated in a dryrub after which the chilled pâté is spread across the surface of the meat and it is wrapped in the thinly rolled pastry dough. Next the pastry is washed with a small amount of clarified lard to give the crust a nice shine, after which it is placed into a large oven and cooked at a high heat for around 40 minutes. Though the dish was regarded as a symbol of the blatant excess and overindulgence of the ruling elite, it has since been reintroduced to the public by enterprising chefs seeking to recapture the high-class culinary culture of the past." + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/fatshouterslice/filled + reagents_to_add = list(/decl/reagent/nutriment/protein = 2, /decl/reagent/nutriment = 2, /decl/reagent/alcohol/messa_mead = 1) + reagent_data = list(/decl/reagent/nutriment/protein = list("juicy meat" = 2), /decl/reagent/nutriment = list("flaky dough" = 1, "savoury vegetables" = 1)) + +/obj/item/reagent_containers/food/snacks/sliceable/zkahnkowafull + name = "Zkah'nkowa" + desc = "A large smoked sausage." + icon_state = "zkah'nkowa_full" + bitesize = 2 + slice_path = /obj/item/reagent_containers/food/snacks/zkahnkowaslice + slices_num = 5 + reagents_to_add = list(/decl/reagent/nutriment/protein = 25) + reagent_data = list(/decl/reagent/nutriment/protein = list("salty" = 10, "smoky meat" = 15)) + desc_fluff = "A canned variety of the Fatshouter Bloodpudding, known for its low-fat content and lighter color. It was created shortly after the First Revolution to ease the food shortage after the conflict. Its low cost and nutritious value allowed it to become a staple of the Hadiist diet." + filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/zkahnkowaslice + name = "Zkah'nkowa slice" + desc = "A slice of smoked sausage." + icon_state = "zkah'nkowa_slice" + filling_color = "#FF7575" + desc_fluff = "A canned variety of the Fatshouter Bloodpudding, known for its low-fat content and lighter color. It was created shortly after the First Revolution to ease the food shortage after the conflict. Its low cost and nutritious value allowed it to become a staple of the Hadiist diet." + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/fatshouterslice/filled + reagents_to_add = list(/decl/reagent/nutriment/protein = 5) + reagent_data = list(/decl/reagent/nutriment/protein = list("salty" = 3, "smoky meat" = 5)) + +/obj/item/reagent_containers/food/snacks/creamice + name = "creamice" + desc = "A bowl of delicious Tajaran ice cream" + icon_state = "creamice" + bitesize = 2 + reagents_to_add = list(/decl/reagent/nutriment = 8) + reagent_data = list(/decl/reagent/nutriment = list("creamy" = 3, "sweet" = 3, "cold" = 2)) + desc_fluff = "The traditional dessert of Northern Harr'masir is considered by many as being the mixture of ice, Fatshouters’s milk, sugar, and Nif-Berries’ oil, named Creamice. The popular tales claim it was invented after a famine desolated the land, resulting in the population resorting to eating snow, however, such tale has been classified by most historians as nothing but fiction. Creamice is commonly consumed by the nobility since they are the ones that can afford the luxury of refrigeration." + filling_color = "#BD8939" + /obj/item/reagent_containers/food/snacks/onionrings name = "onion rings" desc = "Like circular fries but better." diff --git a/code/modules/reagents/reagent_containers/food/snacks/fish.dm b/code/modules/reagents/reagent_containers/food/snacks/fish.dm index b7a95ea3d8b..514b86727f6 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/fish.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/fish.dm @@ -101,3 +101,14 @@ crack_shell(user) return return ..() + +/obj/item/mollusc/clam/rasval + name = "ras'val clam" + desc = "An adhomian clam, native to the sea of Ras'val." + icon_state = "ras'val_clams" + meat_type = /obj/item/reagent_containers/food/snacks/clam + shell_type = /obj/item/trash/mollusc_shell/clam/rasval + +/obj/item/trash/mollusc_shell/clam/rasval + name = "ras'val clam shell" + icon_state = "ras'val_clams_shell" diff --git a/html/changelogs/TajFood.yml b/html/changelogs/TajFood.yml new file mode 100644 index 00000000000..ee47b4b5a4f --- /dev/null +++ b/html/changelogs/TajFood.yml @@ -0,0 +1,7 @@ +author: TheGreyWolf & SpecialFilms + +delete-after: True + +changes: + - rscadd: "Several new tajaran food & recipes have been added." + - rscadd: "Ras'val clams now exist as a clam type." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index c1488a218d7..1e91e9c462b 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/molluscs.dmi b/icons/obj/molluscs.dmi index 6c9cfea125e..e2bbbd51000 100644 Binary files a/icons/obj/molluscs.dmi and b/icons/obj/molluscs.dmi differ