diff --git a/code/modules/cooking/recipes/cultural/recipes_tajara.dm b/code/modules/cooking/recipes/cultural/recipes_tajara.dm index 575049238c2..4338639d32b 100644 --- a/code/modules/cooking/recipes/cultural/recipes_tajara.dm +++ b/code/modules/cooking/recipes/cultural/recipes_tajara.dm @@ -71,6 +71,69 @@ return ..() return FALSE +/singleton/recipe/earthenroot_mash + appliance = MIX + fruit = list("earthenroot" = 1) + reagents = list(/singleton/reagent/blackpepper = 1, /singleton/reagent/sodiumchloride = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/earthenroot_mash + +/singleton/recipe/earthenroot_fries + appliance = FRYER + items = list( + /obj/item/reagent_containers/food/snacks/earthenroot_chopped + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/earthenroot_fries + +/singleton/recipe/earthenroot_wedges + appliance = SKILLET + items = list( + /obj/item/reagent_containers/food/snacks/earthenroot_chopped + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/earthenroot_wedges + +/singleton/recipe/earthenroot_salad + appliance = MIX + fruit = list("earthenroot" = 1, "mtear" = 2, "nifberries" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/dip/sarmikhir + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/salad/earthenroot + +/singleton/recipe/sarmikhir_sandwich + appliance = MIX + items = list( + /obj/item/reagent_containers/food/snacks/hardbread_slice, + /obj/item/reagent_containers/food/snacks/hardbread_slice, + /obj/item/reagent_containers/food/snacks/dip/sarmikhir + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/sarmikhir_sandwich + +/singleton/recipe/tunneler_meategg + appliance = SAUCEPAN | POT + items = list( + /obj/item/reagent_containers/food/snacks/hardbread_slice, + /obj/item/reagent_containers/food/snacks/meat/adhomai, + /obj/item/reagent_containers/food/snacks/egg/ice_tunnelers + ) + reagents = list(/singleton/reagent/spacespice = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/tunneler_meategg + +/singleton/recipe/tunneler_souffle + appliance = OVEN + items = list( + /obj/item/reagent_containers/food/snacks/dip/sarmikhir, + /obj/item/reagent_containers/food/snacks/egg/ice_tunnelers + ) + reagents = list(/singleton/reagent/nutriment/flour/nfrihi = 5) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/tunneler_souffle + // Tajaran cakes /singleton/recipe/conecake appliance = OVEN @@ -86,6 +149,27 @@ ) result = /obj/item/reagent_containers/food/snacks/avah +/singleton/recipe/miniavah + appliance = FRYER + items = list( + /obj/item/reagent_containers/food/snacks/meat/adhomai, + /obj/item/reagent_containers/food/snacks/dough + ) + reagents = list(/singleton/reagent/nutriment/flour/nfrihi = 5, /singleton/reagent/spacespice = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/chipplate/miniavah_basket + +/singleton/recipe/hardbread_pudding + appliance = OVEN + fruit = list("earthenroot" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/hardbread, + /obj/item/reagent_containers/food/snacks/hardbread + ) + reagents = list(/singleton/reagent/drink/milk/cream = 5, /singleton/reagent/sugar = 5) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/hardbread_pudding + // Tajaran pies /singleton/recipe/fruitrikazu appliance = OVEN @@ -156,6 +240,17 @@ fruit = list("nifberries" = 1) result = /obj/item/reagent_containers/food/snacks/creamice +/singleton/recipe/stuffed_eartenroot + appliance = OVEN + fruit = list("earthenroot" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/dip/sarmikhir, + /obj/item/reagent_containers/food/snacks/zkahnkowaslice, + /obj/item/reagent_containers/food/snacks/hardbread_slice + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/stuffed_earthenroot + // Tajaran Seafood /singleton/recipe/spicy_clams fruit = list("chili" = 1, "cabbage" = 1) @@ -166,6 +261,26 @@ ) result = /obj/item/reagent_containers/food/snacks/spicy_clams +/singleton/recipe/clam_pasta + appliance = POT | SAUCEPAN + fruit = list("earthenroot" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/clam + ) + reagents = list(/singleton/reagent/water = 5) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/clam_pasta + +/singleton/recipe/fermented_worm_sandwich + appliance = MIX + items = list( + /obj/item/reagent_containers/food/snacks/hardbread_slice, + /obj/item/reagent_containers/food/snacks/hardbread_slice, + /obj/item/reagent_containers/food/snacks/fermented_worm + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/fermented_worm_sandwich + // Tajaran candy /singleton/recipe/tajcandy appliance = OVEN @@ -187,3 +302,16 @@ /obj/item/reagent_containers/food/snacks/meat/adhomai ) result = /obj/item/reagent_containers/food/snacks/explorer_ration + +// Tajaran Dips +/singleton/recipe/sarmikhir + appliance = MIX + reagents = list(/singleton/reagent/drink/milk/adhomai/fermented = 15, /singleton/reagent/drink/milk/cream = 15, /singleton/reagent/spacespice = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/dip/sarmikhir + +/singleton/recipe/tajhummus + 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 diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 8b6fe426330..e4be716e00c 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -221,6 +221,11 @@ new /obj/item/reagent_containers/food/snacks/carrotfries(get_turf(src)) qdel(src) return + else if(!isnull(seed.chems[/singleton/reagent/drink/earthenrootjuice])) + to_chat(user, "You slice \the [src] into sticks.") + new /obj/item/reagent_containers/food/snacks/earthenroot_chopped(get_turf(src)) + qdel(src) + return else if(!isnull(seed.chems[/singleton/reagent/drink/milk/soymilk])) to_chat(user, "You roughly chop up \the [src].") new /obj/item/reagent_containers/food/snacks/soydope(get_turf(src)) 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 482805a6207..f715a3e7ddf 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -663,6 +663,7 @@ color = "#d8c045" condiment_name = "garlic sauce" condiment_desc = "Perfect for repelling vampires and/or potential dates." + condiment_icon_state = "garlic_sauce" /singleton/reagent/nutriment/mayonnaise name = "Mayonnaise" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index cbbebb6ac65..74a8d10aa1b 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -4334,6 +4334,22 @@ bitesize = 2 filling_color = "#FFF454" +/obj/item/reagent_containers/food/snacks/chip/sourcream + name = "sour cream chip" + desc = "A portion sized chip good for dipping. This one has sour cream on it." + icon_state = "chip_sourcream" + bitten_state = "chip_half_sourcream" + bitesize = 2 + filling_color = "#e4e4e4" + +/obj/item/reagent_containers/food/snacks/chip/tajhummus + name = "hummus chip" + desc = "A portion sized chip good for dipping. This one has hummus on it." + icon_state = "chip_hummus" + bitten_state = "chip_half_hummus" + bitesize = 2 + filling_color = "#cca628" + /obj/item/reagent_containers/food/snacks/chip/nacho name = "nacho chip" desc = "A nacho ship stray from a plate of cheesy nachos." @@ -4344,7 +4360,7 @@ /obj/item/reagent_containers/food/snacks/chip/nacho/salsa name = "nacho chip" - desc = "A nacho ship stray from a plate of cheesy nachos. This one has salsa on it." + desc = "A stray nacho chip from a plate of cheesy nachos. This one has salsa on it." icon_state = "chip_nacho_salsa" bitten_state = "chip_half" bitesize = 2 @@ -4352,7 +4368,7 @@ /obj/item/reagent_containers/food/snacks/chip/nacho/guac name = "nacho chip" - desc = "A nacho ship stray from a plate of cheesy nachos. This one has guac on it." + desc = "A stray nacho chip from a plate of cheesy nachos. This one has guac on it." icon_state = "chip_nacho_guac" bitten_state = "chip_half" bitesize = 2 @@ -4360,12 +4376,28 @@ /obj/item/reagent_containers/food/snacks/chip/nacho/cheese name = "nacho chip" - desc = "A nacho ship stray from a plate of cheesy nachos. This one has extra cheese on it." + desc = "A stray nacho chip from a plate of cheesy nachos. This one has extra cheese on it." icon_state = "chip_nacho_cheese" bitten_state = "chip_half" bitesize = 2 filling_color = "#FFF454" +/obj/item/reagent_containers/food/snacks/chip/nacho/sourcream + name = "nacho chip" + desc = "A stray nacho chip from a plate of cheesy nachos. This one has extra sour cream on it." + icon_state = "chip_nacho_sourcream" + bitten_state = "chip_half_sourcream" + bitesize = 2 + filling_color = "#e4e4e4" + +/obj/item/reagent_containers/food/snacks/chip/nacho/tajhummus + name = "nacho chip" + desc = "A stray nacho chip from a plate of cheesy nachos. This one has extra hummus on it." + icon_state = "chip_nacho_hummus" + bitten_state = "chip_half_hummus" + bitesize = 2 + filling_color = "#cca628" + // chip plates /obj/item/reagent_containers/food/snacks/chipplate name = "basket of chips" @@ -4417,6 +4449,7 @@ name = "queso dip" desc = "A simple, cheesy dip consisting of tomatos, cheese, and spices." var/nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/cheese + var/avahtrans = /obj/item/reagent_containers/food/snacks/chip/miniavah/cheese var/chiptrans = /obj/item/reagent_containers/food/snacks/chip/cheese icon_state = "dip_cheese" trash = /obj/item/trash/dipbowl @@ -4431,6 +4464,8 @@ var/obj/item/reagent_containers/food/snacks/returningitem if(istype(item,/obj/item/reagent_containers/food/snacks/chip/nacho) && item.icon_state == "chip_nacho") returningitem = new nachotrans(src) + else if (istype(item,/obj/item/reagent_containers/food/snacks/chip/miniavah) && item.icon_state == "avah_full" || item.icon_state == "avah_half") + returningitem = new avahtrans(src) else if (istype(item,/obj/item/reagent_containers/food/snacks/chip) && (item.icon_state == "chip" || item.icon_state == "chip_half")) returningitem = new chiptrans(src) if(returningitem) @@ -4442,7 +4477,7 @@ returningitem.bitesize = Clamp(returningitem.reagents.total_volume,1,10) else if(prob(1)) memed = 1 - to_chat(user, "You scoop up some dip with the chip, but mid-scop, the chip breaks off into the dreadful abyss of dip, never to be seen again...") + to_chat(user, "You scoop up some dip with \the [returningitem], but mid-scoop, \the [returningitem] breaks off into the dreadful abyss of dip, never to be seen again...") returningitem.icon_state = "[returningitem.icon_state]_half" returningitem.bitesize = Clamp(returningitem.reagents.total_volume,1,10) else @@ -4453,10 +4488,10 @@ if (reagents && reagents.total_volume) if(!memed) - to_chat(user, "You scoop up some dip with the chip.") + to_chat(user, "You scoop up some dip with \the [returningitem].") else if(!memed) - to_chat(user, "You scoop up the remaining dip with the chip.") + to_chat(user, "You scoop up the remaining dip with \the [returningitem].") var/obj/waste = new trash(loc) if (loc == user) user.put_in_hands(waste) @@ -4466,6 +4501,7 @@ name = "salsa dip" desc = "Traditional Sol chunky salsa dip containing tomatos, peppers, and spices." nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/salsa + avahtrans = /obj/item/reagent_containers/food/snacks/chip/miniavah/salsa chiptrans = /obj/item/reagent_containers/food/snacks/chip/salsa icon_state = "dip_salsa" reagents_to_add = list(/singleton/reagent/nutriment = 20) @@ -4476,12 +4512,35 @@ name = "guac dip" desc = "A recreation of the ancient Sol 'Guacamole' dip using tofu, limes, and spices. This recreation obviously leaves out mole meat." nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/guac + avahtrans = /obj/item/reagent_containers/food/snacks/chip/miniavah/guac chiptrans = /obj/item/reagent_containers/food/snacks/chip/guac icon_state = "dip_guac" reagents_to_add = list(/singleton/reagent/nutriment = 20) reagent_data = list(/singleton/reagent/nutriment = list("guacmole" = 20)) filling_color = "#35961D" +/obj/item/reagent_containers/food/snacks/dip/sarmikhir + name = "sarmikhir" + desc = "A traditional Tajaran cream made of fermented Fatshouter milk. Traditionally used with bread or as condiment." + nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/sourcream + avahtrans = /obj/item/reagent_containers/food/snacks/chip/miniavah/sourcream + chiptrans = /obj/item/reagent_containers/food/snacks/chip/sourcream + icon_state = "dip_sourcream" + reagents_to_add = list(/singleton/reagent/nutriment = 20) + reagent_data = list(/singleton/reagent/nutriment = list("sour cream" = 20)) + filling_color = "#e4e4e4" + +/obj/item/reagent_containers/food/snacks/dip/tajhummus + name = "hrikhir" + desc = "A savoury Tajaran dip, typically paired with avahs." + nachotrans = /obj/item/reagent_containers/food/snacks/chip/nacho/tajhummus + avahtrans = /obj/item/reagent_containers/food/snacks/chip/miniavah/tajhummus + chiptrans = /obj/item/reagent_containers/food/snacks/chip/tajhummus + icon_state = "dip_hummus" + reagents_to_add = list(/singleton/reagent/nutriment = 20) + reagent_data = list(/singleton/reagent/nutriment = list("sweet hummus" = 20)) + filling_color = "#cca628" + // Roasted Peanuts (under chips/nachos because finger food) /obj/item/reagent_containers/food/snacks/roasted_peanut name = "roasted peanut" @@ -5328,6 +5387,8 @@ bitesize = 1 reagents_to_add = list(/singleton/reagent/nutriment = 15) reagent_data = list(/singleton/reagent/nutriment = list("crusty bread" = 2)) + slice_path = /obj/item/reagent_containers/food/snacks/hardbread_slice + slices_num = 6 throw_range = 5 throwforce = 10 w_class = ITEMSIZE_NORMAL @@ -5336,6 +5397,14 @@ It is known for its hard crust, bland taste and for being long lasting. The hard bread was usually prepared for long journeys, hard winters or military campaigns, \ due to its shelf life. Certain folk stories and jokes claim that such food could also be used as an artillery ammunition or thrown at besieging armies during sieges." +/obj/item/reagent_containers/food/snacks/hardbread_slice + name = "adhomian hard bread slice" + desc = "A long-lasting Tajaran bread slice. It is usually prepared for long journeys, hard winters, or military campaigns." + icon_state = "hardbread_slice" + filling_color = "#BD8939" + bitesize = 2 + throwforce = 2 + /obj/item/reagent_containers/food/snacks/spreads/lard name = "lard" desc = "A stick of animal fat." @@ -5419,6 +5488,199 @@ return ..() +/obj/item/reagent_containers/food/snacks/earthenroot_mash + name = "mashed earthen-root" + desc = "Mounds of mashed earthen-root. Soft and pillowy." + icon_state = "earthenroot_mash" + trash = /obj/item/trash/plate + filling_color = "#3884a7" + reagents_to_add = list(/singleton/reagent/nutriment = 4) + reagent_data = list(/singleton/reagent/nutriment = list("mashed earthenroot" = 4)) + bitesize = 1 + +/obj/item/reagent_containers/food/snacks/earthenroot_chopped + name = "chopped earthen-root" + desc = "Chopped earthen-root. Cooking this would make it nicer." + icon_state = "earthenroot_chopped" + trash = /obj/item/trash/plate + filling_color = "#5498b8" + reagents_to_add = list(/singleton/reagent/nutriment = 3) + reagent_data = list(/singleton/reagent/nutriment = list("sweet, chunky earthenroot" = 3)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/earthenroot_fries + name = "earthen-root fries" + desc = "A plate full of fresh earthen-root fries. A crispy sweet Adhomian treat." + icon_state = "earthenroot_fries" + trash = /obj/item/trash/plate + filling_color = "#3884a7" + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/triglyceride/oil = 1.2) + reagent_data = list(/singleton/reagent/nutriment = list("crispy sweet earthen-root fries" = 4)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/earthenroot_wedges + name = "fried earthen-root wedges" + desc = "Some fried wedges made from earthen-root. Chunkier than fries, but still crispy." + icon_state = "earthenroot_wedges" + trash = /obj/item/trash/plate + filling_color = "#3884a7" + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/triglyceride/oil = 1.2) + reagent_data = list(/singleton/reagent/nutriment = list("crispy sweet earthen-root wedges" = 4)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/salad/earthenroot + name = "earthen-root salad" + desc = "A Tajaran salad containing earthen-root, sarmikhir, herbs and cream. A great option for the more healthy-minded." + icon_state = "earthenroot_salad" + trash = /obj/item/trash/snack_bowl + reagents_to_add = list(/singleton/reagent/nutriment = 10) + reagent_data = list(/singleton/reagent/nutriment = list("sweet chunky earthen-root" = 2, "sour cream" = 2, "oily berries" = 2, "sweet herbs" = 2)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/stuffed_earthenroot + name = "stuffed earthen-root" + desc = "An earthen-root stuffed with Adhomian meat. Crunchy on the outside, savoury on the inside." + icon_state = "earthenroot_stuffed" + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment = 8, /singleton/reagent/nutriment/protein = 7) + reagent_data = list(/singleton/reagent/nutriment = list("sweet earthen-root" = 3), /singleton/reagent/nutriment/protein = list("smoky, salty meat")) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/clam_pasta + name = "ras'val pasta" + desc = "A Tajaran pasta made from earthen-root, boiled with Ras'val clams. For the seafood lovers that can't handle spice." + icon_state = "earthenroot_clambake" + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein/seafood = 6) + reagent_data = list(/singleton/reagent/nutriment = list("sweet and salty earthen-root" = 3), /singleton/reagent/nutriment/protein/seafood = list("salty clam meat")) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/fermented_worm_sandwich + name = "fermented hma'trra sandwich" + desc = "A Tajaran delicacy that stinks as bad as it looks. Some claim the meat is an acquired taste and swear by its flavour." + icon_state = "hardbread_fermented" + reagents_to_add = list(/singleton/reagent/nutriment = 10, /singleton/reagent/nutriment/protein/seafood = 15, /singleton/reagent/ammonia = 10) + reagent_data = list(/singleton/reagent/nutriment = list("crusty bread" = 2), /singleton/reagent/nutriment/protein/seafood = list("salty, tangy fish" = 3)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/sarmikhir_sandwich + name = "sarmikhir sandwich" + desc = "A Tajaran sandwich with hard bread and sour cream. A staple of the Hadiist breakfast menu." + icon_state = "hardbread_sourcream" + reagents_to_add = list(/singleton/reagent/nutriment = 12) + reagent_data = list(/singleton/reagent/nutriment = list("crusty bread" = 2, "sour cream" = 2)) + +/obj/item/reagent_containers/food/snacks/soup/tajfish + name = "adhomian fish soup" + desc = "A creamy Adhomian fish soup, garnished with sweet herbs." + icon_state = "adhomian_fish_soup" + trash = /obj/item/trash/snack_bowl + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 4) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("creamy, sweet fish.")) + +/obj/item/reagent_containers/food/snacks/hardbread_pudding + name = "hardbread pudding" + desc = "Traditional Adhomian hardbread pudding, sliceable into four slices. Topped with delicious sweet cream." + icon_state = "hardbread_pudding_whole" + slice_path = /obj/item/reagent_containers/food/snacks/hardbread_bun + slices_num = 4 + trash = /obj/item/trash/tray + reagents_to_add = list(/singleton/reagent/nutriment = 30, /singleton/reagent/drink/milk/cream = 15) + reagent_data = list(/singleton/reagent/nutriment = list("soft bread" = 3), /singleton/reagent/drink/milk/cream = list("sweet cream" = 3)) + +/obj/item/reagent_containers/food/snacks/hardbread_bun + name = "hardbread bun" + desc = "A bun made out of hardbread pudding. Topped with sweet cream." + icon_state = "hardbread_pudding_bun" + trash = /obj/item/trash/snack_bowl + +/obj/item/reagent_containers/food/snacks/tunneler_meategg + name = "tunneler meategg" + desc = "An Adhomian ice tunneler egg cooked with a layer of meat. All the protein that you'll need!" + icon_state = "tunneler_scotchegg" + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 3, /singleton/reagent/nutriment/protein = 7, /singleton/reagent/nutriment = 5) + reagent_data = list(/singleton/reagent/nutriment/protein = list("savoury meat" = 3), /singleton/reagent/nutriment = list("meaty bread" = 1)) + +/obj/item/reagent_containers/food/snacks/tunneler_souffle + name = "tunneler souffle" + desc = "A souffle made from an Adhomian ice tunneler egg and traditional sour cream." + icon_state = "tunneler_souffle" + reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 3, /singleton/reagent/nutriment = 5, /singleton/reagent/drink/milk/cream = 5) + reagent_data = list(/singleton/reagent/nutriment = list("baked dough" = 2)) + +/obj/item/reagent_containers/food/snacks/chipplate/miniavah_basket + name = "mini-avah basket" + desc = "A basket of mini-avahs, a small variant of a traditional avah filled with meat that are the perfect size for dipping." + icon_state = "miniavahs_3" + vendingobject = /obj/item/reagent_containers/food/snacks/chip/miniavah + unitname = "mini-avah" + trash = /obj/item/trash/chipbasket + bitesize = 6 + reagents_to_add = list(/singleton/reagent/nutriment = 9, /singleton/reagent/nutriment/protein = 9) + reagent_data = list(/singleton/reagent/nutriment = list("baked dough" = 3), /singleton/reagent/nutriment/protein = list("savoury meat" = 3)) + +/obj/item/reagent_containers/food/snacks/chipplate/miniavah_basket/update_icon() + switch(reagents.total_volume) + if(1 to 6) + icon_state = "miniavahs_1" + if(7 to 12) + icon_state = "miniavahs_2" + if(18 to INFINITY) + icon_state = "miniavahs_3" + +/obj/item/reagent_containers/food/snacks/chip/miniavah/on_consume(mob/M as mob) + if(reagents && reagents.total_volume) + icon_state = bitten_state + . = ..() + +/obj/item/reagent_containers/food/snacks/chip/miniavah + name = "mini-avah" + desc = "A miniature avah, a traditional Adhomian treat. This one is filled with meat, and is the perfect size for dipping." + icon_state = "avah_full" + bitten_state = "avah_half" + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/chip/miniavah/cheese + name = "cheese mini-avah" + desc = "A miniature avah filled with meat. This one has cheese on it." + icon_state = "avah_full_queso" + bitten_state = "avah_half_queso" + bitesize = 2 + filling_color = "#FFF454" + +/obj/item/reagent_containers/food/snacks/chip/miniavah/salsa + name = "salsa mini-avah" + desc = "A miniature avah filled with meat. This one has salsa on it." + icon_state = "avah_full_salsa" + bitten_state = "avah_half_salsa" + bitesize = 2 + filling_color = "#FF4D36" + +/obj/item/reagent_containers/food/snacks/chip/miniavah/guac + name = "guac mini-avah" + desc = "A miniature avah filled with meat. This one has guac on it." + icon_state = "avah_full_guac" + bitten_state = "avah_half_guac" + bitesize = 2 + filling_color = "#35961D" + +/obj/item/reagent_containers/food/snacks/chip/miniavah/sourcream + name = "sourcream mini-avah" + desc = "A miniature avah filled with meat. This one has sour cream on it." + icon_state = "avah_full_sourcream" + bitten_state = "avah_half_sourcream" + bitesize = 2 + filling_color = "#e4e4e4" + +/obj/item/reagent_containers/food/snacks/chip/miniavah/tajhummus + name = "hummus mini-avah" + desc = "A miniature avah filled with meat. This one has sweet hummus on it." + icon_state = "avah_full_hummus" + bitten_state = "avah_half_hummus" + bitesize = 2 + filling_color = "#cca628" + /obj/item/reagent_containers/food/snacks/stew/diona name = "dionae stew" desc = "A steaming bowl of juicy dionae nymph. Extra cosy." diff --git a/html/changelogs/ramke - tajfoodexpansion.yml b/html/changelogs/ramke - tajfoodexpansion.yml new file mode 100644 index 00000000000..4d0bdb8a938 --- /dev/null +++ b/html/changelogs/ramke - tajfoodexpansion.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: Ramke, AfraidofAmericans + +# 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 17 new Tajara-themed foods. This includes variations of earthen-root dishes, hardbread pudding, sandwiches, dips, avah, and more." + - imageadd: "New garlic sauce sprite." \ No newline at end of file diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 81cd572df4c..d06f025b280 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ