diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 89051ad374a..01a904404d4 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -504,6 +504,7 @@ /obj/item/reagent_containers/food/condiment/ntella = 1, /obj/item/reagent_containers/food/condiment/peanut_butter = 1, /obj/item/reagent_containers/food/condiment/cherry_jelly = 1, + /obj/item/reagent_containers/food/condiment/sweet_chili = 0.8, /obj/item/reagent_containers/food/condiment/grape_jelly = 0.5 ) diff --git a/code/game/objects/random/produce.dm b/code/game/objects/random/produce.dm index 66918da31aa..0119755647c 100644 --- a/code/game/objects/random/produce.dm +++ b/code/game/objects/random/produce.dm @@ -67,6 +67,7 @@ "cacao" = 0.5, "cherry" = 0.25, "onion" = 0.5, + "garlic" = 0.5, "bellpepper" = 0.25 ) diff --git a/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm b/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm index 36d66c4aa11..de3ddf33693 100644 --- a/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm +++ b/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm @@ -183,3 +183,10 @@ w_class = WEIGHT_CLASS_TINY var/kitchen_tag = "animal" +/obj/item/reagent_containers/food/snacks/variable/macaron + name = "macaron" + desc = "Fluffy, brittle, sweet macaron." + icon_state = "macaroncustom" + size = 15 + w_class = WEIGHT_CLASS_TINY + bitesize = 6 diff --git a/code/modules/cooking/machinery/cooking_machines/oven.dm b/code/modules/cooking/machinery/cooking_machines/oven.dm index 1bf00def318..35195ef5faf 100644 --- a/code/modules/cooking/machinery/cooking_machines/oven.dm +++ b/code/modules/cooking/machinery/cooking_machines/oven.dm @@ -38,7 +38,8 @@ "Kebab" = /obj/item/reagent_containers/food/snacks/variable/kebab, "Waffles" = /obj/item/reagent_containers/food/snacks/variable/waffles, "Cookie" = /obj/item/reagent_containers/food/snacks/variable/cookie, - "Donut" = /obj/item/reagent_containers/food/snacks/variable/donut + "Donut" = /obj/item/reagent_containers/food/snacks/variable/donut, + "Macaron" = /obj/item/reagent_containers/food/snacks/variable/macaron, ) /obj/machinery/appliance/cooker/oven/Initialize() diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index 7762d36fe17..24ee9e3d8cb 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -191,15 +191,23 @@ result = /obj/item/reagent_containers/food/snacks/biscuits_and_gravy reagent_mix = RECIPE_REAGENT_REPLACE -/singleton/recipe/elotes - appliance = OVEN | GRILL - reagents = list(/singleton/reagent/nutriment/mayonnaise = 5, /singleton/reagent/spacespice = 2) - fruit = list("corn" = 2, "lime" = 1) +/singleton/recipe/mozzarella_sticks + appliance = FRYER + reagents = list(/singleton/reagent/nutriment/flour = 5, /singleton/reagent/nutriment/protein/egg = 3, /singleton/reagent/sodiumchloride = 1) items = list( /obj/item/reagent_containers/food/snacks/cheesewedge ) - reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product - result = /obj/item/reagent_containers/food/snacks/elotes + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/bowl/mozzarella_sticks + +/singleton/recipe/mozzarella_sticks_alt + appliance = FRYER + items = list( + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + coating = /singleton/reagent/nutriment/coating/batter + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/bowl/mozzarella_sticks // Konyang @@ -232,6 +240,51 @@ items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/soup/miyeokguk +/singleton/recipe/sweet_chili_chicken + appliance = SAUCEPAN | POT + fruit = list("lime" = 1) + reagents = list(/singleton/reagent/nutriment/soysauce = 5, /singleton/reagent/nutriment/sweet_chili= 5) + items = list( + /obj/item/reagent_containers/food/snacks/meat/chicken, + /obj/item/reagent_containers/food/snacks/boiledrice, + ) + result = /obj/item/reagent_containers/food/snacks/sweet_chili_chicken + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + +/singleton/recipe/eggrolls_vegetable + appliance = FRYER + fruit = list("cabbage" = 1, "carrot" = 1) + reagents = list(/singleton/reagent/nutriment/flour = 5, /singleton/reagent/nutriment/protein/egg = 3) + result = /obj/item/reagent_containers/food/snacks/bowl/eggrolls_vegetable + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + +/singleton/recipe/eggrolls_vegetable_vegan + appliance = FRYER + fruit = list("cabbage" = 1, "carrot" = 1) + reagents = list(/singleton/reagent/nutriment/flour = 5, /singleton/reagent/water = 5) + result = /obj/item/reagent_containers/food/snacks/bowl/eggrolls_vegetable + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + +/singleton/recipe/eggrolls_meat + appliance = FRYER + fruit = list("cabbage" = 1) + reagents = list(/singleton/reagent/nutriment/flour = 5, /singleton/reagent/nutriment/protein/egg = 3) + items = list( + /obj/item/reagent_containers/food/snacks/cutlet, + ) + result = /obj/item/reagent_containers/food/snacks/bowl/eggrolls_meat + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + +/singleton/recipe/eggrolls_meat_alt + appliance = FRYER + fruit = list("cabbage" = 1) + reagents = list(/singleton/reagent/nutriment/flour = 5, /singleton/reagent/water = 5) + items = list( + /obj/item/reagent_containers/food/snacks/cutlet, + ) + result = /obj/item/reagent_containers/food/snacks/bowl/eggrolls_meat + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + // Mictlani /singleton/recipe/pozole @@ -241,6 +294,16 @@ items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/soup/pozole +/singleton/recipe/elotes + appliance = OVEN | GRILL + reagents = list(/singleton/reagent/nutriment/mayonnaise = 5, /singleton/reagent/spacespice = 2) + fruit = list("corn" = 2, "lime" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/cheesewedge, + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/reagent_containers/food/snacks/elotes + // Dominia /singleton/recipe/moroz_flatbread @@ -342,6 +405,20 @@ result = /obj/item/reagent_containers/food/snacks/bowl/fufus reagent_mix = RECIPE_REAGENT_REPLACE +/singleton/recipe/dodo_ikire + appliance = SKILLET | SAUCEPAN + fruit = list("banana" = 2, "chili" = 1) + reagents = list(/singleton/reagent/sodiumchloride = 1) + result = /obj/item/reagent_containers/food/snacks/dodo_ikire + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/crimson_lime + appliance = SAUCEPAN + fruit = list("lime" = 1, "chili" = 1) + reagents = list(/singleton/reagent/nutriment/coco = 5, /singleton/reagent/drink/milk = 5) + result = /obj/item/reagent_containers/food/snacks/crimson_lime + reagent_mix = RECIPE_REAGENT_REPLACE + //Silversun /singleton/recipe/clams_casino diff --git a/code/modules/cooking/recipes/recipes_burger.dm b/code/modules/cooking/recipes/recipes_burger.dm index 38421764bab..f39d57d1ea8 100644 --- a/code/modules/cooking/recipes/recipes_burger.dm +++ b/code/modules/cooking/recipes/recipes_burger.dm @@ -150,3 +150,31 @@ reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/burger/nakarka_hamburger +/singleton/recipe/mossburger + appliance = SKILLET + fruit = list("moss" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/cutlet, + ) + result = /obj/item/reagent_containers/food/snacks/burger/moss + +/singleton/recipe/mossburger_sad + fruit = list("moss" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/burger + ) + result = /obj/item/reagent_containers/food/snacks/burger/moss/sad + +/singleton/recipe/bigbite_mossburger + appliance = SKILLET + fruit = list("moss" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/burger/moss, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/cheesewedge, + ) + reagents = list(/singleton/reagent/nutriment/protein/egg = 3) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/burger/bigbite/moss 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 ebe2486f11d..b8dcb7e63f4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -159,14 +159,6 @@ M.add_chemical_effect(CE_BLOODRESTORE, blood_factor * removed) M.intoxication -= min(M.intoxication,nut_fact*removed*0.05) //Nutrients can absorb alcohol. -/singleton/reagent/nutriment/coating/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) - if (!holder.reagent_data[type]["cooked"]) - //Raw coatings will sometimes cause vomiting - if (ishuman(M) && prob(1)) - var/mob/living/carbon/human/H = M - H.delayed_vomit() - . = ..() - /singleton/reagent/nutriment/coating/initialize_data(var/list/newdata, var/datum/reagents/holder) // Called when the reagent is created. var/list/data = ..() LAZYSET(data, "cooked", istype(holder?.my_atom,/obj/item/reagent_containers/food/snacks)) @@ -754,6 +746,18 @@ if(.) M.add_chemical_effect(CE_ANTIPARASITE, 10) +/singleton/reagent/nutriment/sweet_chili + name = "Sweet Chili Sauce" + description = "Spicy AND sweet!" + reagent_state = LIQUID + color = "#dd4103" + taste_description = "sweet chili" + taste_mult = 1.5 + value = 0.2 + condiment_name = "sweet chili" + condiment_desc = "Sweet chili sauce, for those who want spicy food but are afraid to commit." + condiment_icon_state = "sweet_chili" + /singleton/reagent/nutriment/mayonnaise name = "Mayonnaise" description = "Mayonnaise, a staple classic for sandwiches." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 71b54b0a1ad..8a37537c3bb 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1851,6 +1851,13 @@ required_reagents = list(/singleton/reagent/drink/garlicjuice = 1, /singleton/reagent/nutriment/triglyceride/oil/corn = 1) result_amount = 2 +/datum/chemical_reaction/sweet_chili + name = "Sweet Chili Sauce" + id = "sweet_chili" + result = /singleton/reagent/nutriment/sweet_chili + required_reagents = list(/singleton/reagent/sugar = 1, /singleton/reagent/capsaicin = 1) + result_amount = 2 + /datum/chemical_reaction/peanutbutter // Yes, this doesn't make sense. No, I don't know how to do this better name = "Peanut Butter" id = "peanutbutter" diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 2dfe803b23a..f14cd3a2eb9 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -441,3 +441,10 @@ desc = "Contains 5u of phoron." icon_state = "packet_small_yellow" reagents_to_add = list(/singleton/reagent/toxin/phoron = 5) + +/obj/item/reagent_containers/food/condiment/sweet_chili + icon_state = "sweet_chili" + name = "sweet chili" + empty_icon_state = "sweet_chili_empty" + reagents_to_add = list(/singleton/reagent/nutriment/sweet_chili = 50) + amount_per_transfer_from_this = 1 diff --git a/code/modules/reagents/reagent_containers/food/snacks/burger.dm b/code/modules/reagents/reagent_containers/food/snacks/burger.dm index 2dea48c0eb7..dfa60b7ab64 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/burger.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/burger.dm @@ -10,7 +10,7 @@ reagent_data = list(/singleton/reagent/nutriment = list("bun" = 3)) bitesize = 2 -// Burger + cheese wedge = cheeseburger +// Burger + specific toppings = special burger /obj/item/reagent_containers/food/snacks/burger/attackby(obj/item/attacking_item, mob/user) if(istype(attacking_item, /obj/item/reagent_containers/food/snacks/cheesewedge))// && !istype(src,/obj/item/reagent_containers/food/snacks/cheesewedge)) new /obj/item/reagent_containers/food/snacks/burger/cheese(src) @@ -24,6 +24,14 @@ qdel(attacking_item) qdel(src) return + else if(istype(attacking_item, /obj/item/reagent_containers/food/snacks/grown)) // Burger + Moss = A "less authentic" mossburger + var/obj/item/reagent_containers/food/snacks/grown/S = attacking_item + if(istype(S.seed, /datum/seed/grass/moss)) + new /obj/item/reagent_containers/food/snacks/burger/moss/sad(src) + to_chat(user, "You sprinkle some moss on top of the burger.") + qdel(attacking_item) + qdel(src) + return else if(istype(attacking_item, /obj/item/reagent_containers/food/snacks)) var/obj/item/reagent_containers/food/snacks/csandwich/burger/B = new(get_turf(src)) B.attackby(attacking_item, user) @@ -247,3 +255,26 @@ /obj/item/reagent_containers/food/snacks/burger/nakarka_hamburger/ungrilled reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nakarka = 2, /singleton/reagent/nutriment/protein = 3) + +/obj/item/reagent_containers/food/snacks/burger/moss + name = "mossburger" + desc = "A Konyanger staple, popularized by the fast food chain 'UP! Burger'. The moss is cooked along with the meat, giving it a unique flavor." + icon_state = "mossburger" + filling_color = "#8eb866" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 4) + reagent_data = list(/singleton/reagent/nutriment = list("mossy crunch" = 4)) + +/obj/item/reagent_containers/food/snacks/burger/moss/sad //The result of making the burger without cooking the moss together with the meat. Basically the same, but looks less impressive. + desc = "A Konyanger staple, popularized by the fast food chain UP! Burger. The moss is TYPICALLY cooked along with the meat, giving it a unique flavor, but here it's just... limply sitting on top of the burger, as if added in as an afterthought. It might be fine, just don't let anyone from Konyang see this. Or the health inspector, for that matter." + icon_state = "mossburger_sad" + +/obj/item/reagent_containers/food/snacks/burger/bigbite/moss + name = "big bite mossburger" + desc = "Available now at an 'UP! Burger' near you!" + icon_state = "mossburger_big" + filling_color = "#b1a15c" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/protein = 10) + reagent_data = list(/singleton/reagent/nutriment = list("mossy crunch" = 5, "buns" = 3), /singleton/reagent/nutriment/protein = list("meat" = 5, "egg" = 3, "cheese" = 3)) + bitesize = 3 diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm index d084033327e..08fded6caaf 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -268,18 +268,33 @@ if(50 to INFINITY) icon_state = "gravybiscuits" -/obj/item/reagent_containers/food/snacks/elotes - name = "elotes" +/obj/item/reagent_containers/food/snacks/bowl/mozzarella_sticks + name = "mozzarella sticks" gender = PLURAL - desc = "Grilled mexican sweet corn with chili powder, mayonnaise, cheese, sour cream, and seasonings." + desc = "Fried sticks of molten mozzarrella cheese hidden in a deep fried breaded coating. " icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' - icon_state = "elotes" + icon_state = "mozzarella_sticks" + unitname = "mozzarella stick" + filling_color = "#fabe17" trash = /obj/item/trash/plate + vendingobject = /obj/item/reagent_containers/food/snacks/mozzarella_stick + bitesize = 1 + reagents_to_add = list(/singleton/reagent/nutriment/protein/cheese = 4, /singleton/reagent/nutriment = 4) + reagent_data = list(/singleton/reagent/nutriment/protein/cheese = list("molten cheese" = 5), /singleton/reagent/nutriment = list("crunchy coating" = 5)) - reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 3) - reagent_data = list(/singleton/reagent/nutriment = list("corn" = 5, "zesty seasoning" = 3, "lime" = 3), /singleton/reagent/nutriment/protein = list("cheese" = 5)) - bitesize = 2 - filling_color = "#d8ab18" +/obj/item/reagent_containers/food/snacks/bowl/mozzarella_sticks/update_icon() + switch(reagents.total_volume) + if(1 to 3) + icon_state = "mozzarella_sticks_half" + if(4 to INFINITY) + icon_state = "mozzarella_sticks" + +/obj/item/reagent_containers/food/snacks/mozzarella_stick + name = "mozzarella stick" + desc = "A cheese stick by any other name would taste as savory." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "mozzarella_stick" + filling_color = "#fabe17" // Konyang @@ -409,6 +424,73 @@ if(91 to INFINITY) icon_state = "riceball" +/obj/item/reagent_containers/food/snacks/sweet_chili_chicken + name = "sweet chili chicken" + desc = "Konyanger style chicken bursting with flavor served over a bed of rice, covered in sesame and green onions with a healthy helping of sweet chili sauce. A little bit spicy, a little bit sweet, a little bit connected to it's roots in Asia, and a little bit modern. In other words - Very Konyang." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "sweetchilichicken" + filling_color = "#C97F02" + trash = /obj/item/trash/bowl_small + reagents_to_add = list(/singleton/reagent/nutriment/protein = 4, /singleton/reagent/nutriment = 1, /singleton/reagent/nutriment/rice = 3, /singleton/reagent/capsaicin = 1) + reagent_data = list(/singleton/reagent/nutriment = list("rice" = 4), /singleton/reagent/nutriment/protein = list("sweet and spicy chicken" = 5)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/bowl/eggrolls_vegetable + name = "vegetable eggrolls" + gender = PLURAL + desc = "Fried, crispy eggrolls full of carrots, cabbage and ginger. Contrary to popular belief, eggrolls are frequently made without any eggs, using rice paper or wheat based wraps instead." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "eggrolls_veg_full" + unitname = "eggroll" + filling_color = "#b19445" + trash = /obj/item/trash/plate + vendingobject = /obj/item/reagent_containers/food/snacks/eggroll_vegetable + bitesize = 2 + reagents_to_add = list(/singleton/reagent/nutriment = 6) + reagent_data = list(/singleton/reagent/nutriment = list("vegetables" = 5, "crunchy coating" = 5, "ginger" = 3)) + +/obj/item/reagent_containers/food/snacks/bowl/eggrolls_vegetable/update_icon() + switch(reagents.total_volume) + if(1 to 2) + icon_state = "eggrolls_veg_one" + if(3 to INFINITY) + icon_state = "eggrolls_veg_full" + +/obj/item/reagent_containers/food/snacks/eggroll_vegetable + name = "vegetable eggroll" + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + desc = "A crunchy eggroll full of crispy veggies." + icon_state = "eggroll_veg" + filling_color = "#b19445" + +/obj/item/reagent_containers/food/snacks/bowl/eggrolls_meat + name = "meat eggrolls" + gender = PLURAL + desc = "Fried, crispy eggrolls full of meat, traditionally either pork or chicken, although other kinds exist around the spur. Contrary to popular belief, eggrolls are frequently made without any eggs, using rice paper or wheat based wraps instead." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "eggrolls_meat_full" + unitname = "eggroll" + filling_color = "#613e16" + trash = /obj/item/trash/plate + vendingobject = /obj/item/reagent_containers/food/snacks/eggroll_meat + bitesize = 2 + reagents_to_add = list(/singleton/reagent/nutriment/protein = 3, /singleton/reagent/nutriment = 3) + reagent_data = list(/singleton/reagent/nutriment/protein = list("meat" = 5), /singleton/reagent/nutriment = list("crunchy coating" = 5, "ginger" = 3)) + +/obj/item/reagent_containers/food/snacks/bowl/eggrolls_meat/update_icon() + switch(reagents.total_volume) + if(1 to 2) + icon_state = "eggrolls_meat_one" + if(3 to INFINITY) + icon_state = "eggrolls_meat_full" + +/obj/item/reagent_containers/food/snacks/eggroll_meat + name = "meat eggroll" + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + desc = "A crunchy eggroll full of meat and ginger." + icon_state = "eggroll_meat" + filling_color = "#613e16" + // Mictlani /obj/item/reagent_containers/food/snacks/soup/pozole @@ -419,6 +501,18 @@ reagent_data = list(/singleton/reagent/nutriment = list("peppermint" = 2, "salad" = 4, "hot stew" = 2)) reagents_to_add = list(/singleton/reagent/nutriment = 8, /singleton/reagent/water = 5, /singleton/reagent/drink/dynjuice =2) +/obj/item/reagent_containers/food/snacks/elotes + name = "elotes" + gender = PLURAL + desc = "Grilled mexican sweet corn with chili powder, mayonnaise, cheese, sour cream, and seasonings." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "elotes" + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 3) + reagent_data = list(/singleton/reagent/nutriment = list("corn" = 5, "zesty seasoning" = 3, "lime" = 3), /singleton/reagent/nutriment/protein = list("cheese" = 5)) + bitesize = 2 + filling_color = "#d8ab18" + // Dominia /obj/item/reagent_containers/food/snacks/moroz_flatbread name = "morozian flatbread" @@ -625,6 +719,35 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/bowl) bitesize = 2 filling_color = "#eee0b1" +/obj/item/reagent_containers/food/snacks/dodo_ikire + name = "dodo ikire" + desc = "Originally a Nigerian dish, dodo ikire is traditionally made of over-ripe plantains fried in palm oil with crushed chili, sometimes with onion or ginger for additional flavoring. an Eridanian favorite!" + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "dodo" + filling_color = "#331d13" + reagents_to_add = list(/singleton/reagent/nutriment/ = 5, /singleton/reagent/capsaicin = 2) + bitesize = 2 + trash = /obj/item/trash/plate + reagent_data = list(/singleton/reagent/nutriment = list("plantains" = 5, "chili" = 3, "zest" = 2)) + +/obj/item/reagent_containers/food/snacks/dodo_ikire/update_icon() + var/percent_dodo = round((reagents.total_volume / 7) * 100) + switch(percent_dodo) + if(0 to 49) + icon_state = "dodo_half" + if(50 to INFINITY) + icon_state = "dodo" + +/obj/item/reagent_containers/food/snacks/crimson_lime + name = "crimson lime" + desc = "Possibly named after the presidential crimson house of Suwong, the Konyanger city this dessert originates from, or possibly named after the hint of chili that's mixed into this dessert. Crimson fruit are typically various jungle or citrus fruits coated in dark chili chocolate. It typically favors fruit that is less aggressively sweet so the opposite flavors can play off of each other without overpowering one another." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "crimson_lime" + filling_color = "#2d460d" + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment/ = 4) + reagent_data = list(/singleton/reagent/nutriment = list("lime" = 5, "chocolate" = 5, "chili" = 2)) + /obj/item/reagent_containers/food/snacks/bowl/alfajores name = "alfajores" desc = "A plate of delicious vanilla sandwich cookies filled with dulche de leche and covered in coconut shavings. A sweet South American treat!" diff --git a/code/modules/reagents/reagent_containers/food/snacks/fryer.dm b/code/modules/reagents/reagent_containers/food/snacks/fryer.dm index 470d8e73c9e..f4b103503bc 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/fryer.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/fryer.dm @@ -10,6 +10,44 @@ reagent_data = list(/singleton/reagent/nutriment = list("fresh fries" = 4)) bitesize = 2//This is mainly for the benefit of adminspawning +///makes fries gain the visual look of whatever sauce you add to them +/obj/item/reagent_containers/food/snacks/fries/on_reagent_change() + + if(reagents.has_any_reagent(list(/singleton/reagent/nutriment/flour, /singleton/reagent/spacecleaner, /singleton/reagent/antidexafen, /singleton/reagent/carbon))) //For when the scrubbers inevitably attack the kitchen. + name = "ruined fries" + desc = "A tragic, innocent casualty in the war against scrubbers." + icon_state = "fries_ruined" + + else if(reagents.has_reagent(/singleton/reagent/nutriment/ketchup)) + name = "fries with ketchup" + desc = "A classic." + icon_state = "fries_redsauce" + + else if(reagents.has_reagent(/singleton/reagent/nutriment/mayonnaise)) + name = "fries with mayonnaise" + desc = "A European classic." + icon_state = "fries_whitesauce" + + else if(reagents.has_reagent(/singleton/reagent/nutriment/garlicsauce)) + name = "fries with garlic sauce" + desc = "Delicious! Just... Don't breathe in anyone's direction for a while after eating them." + icon_state = "fries_garlicsauce" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_chocolate)) + name = "fries with chocolate sauce" + desc = "Someone has a case of the munchies." + icon_state = "fries_brownsauce" + + else if(reagents.has_reagent(/singleton/reagent/nutriment/barbecue)) + name = "fries with barbecue sauce" + desc = "As you stare deep into this plate of fries, somewhere in the distance you think you hear a faint 'yee haw'." + icon_state = "fries_brownsauce" + + else if(reagents.has_reagent(/singleton/reagent/nutriment/sweet_chili)) + name = "fries with sweet chili sauce" + desc = "A plate of fries giving off those mid-tier mall food court vibes." + icon_state = "fries_redsauce" + /obj/item/reagent_containers/food/snacks/microchips name = "micro chips" desc = "Soft and rubbery. should have fried them" diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index b51166e18ca..1823dfdccde 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -152,6 +152,87 @@ reagent_data = list(/singleton/reagent/nutriment = list("waffle" = 8)) bitesize = 2 +///makes waffles change their look based on which syrup they have applied to them +/obj/item/reagent_containers/food/snacks/waffles/on_reagent_change() + if(reagents.has_any_reagent(list(/singleton/reagent/nutriment/flour, /singleton/reagent/spacecleaner, /singleton/reagent/antidexafen, /singleton/reagent/carbon))) //For when the scrubbers inevitably attack the kitchen. + name = "ruined waffles" + desc = "Oh boy! Look at all that powdered suga- wait, wait, no, that's... no, that's not sugar. Oh, these poor waffles." + icon_state = "waffles_ruined" + + else if(reagents.has_reagent(/singleton/reagent/nutriment/ketchup)) + name = "waffles with ketchup" + desc = "Why? Just why?" + icon_state = "waffles_redsauce" + + else if(reagents.has_reagent(/singleton/reagent/nutriment/mayonnaise)) + name = "waffles with mayonnaise" + desc = "All of the cholesterol with none of the joy." + icon_state = "waffles_vanilla" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_chocolate)) + name = "waffles with chocolate sauce" + desc = "Mmm, waffles with chocolate sauce." + icon_state = "waffles_chocolate" + + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_vanilla)) + name = "checkerboard waffles" + desc = "Waffles with chocolate and vanilla sauces carefully applied in a checkerboard pattern. Extremely fancy, in a 12 year old birthday party kind of way." + icon_state = "waffles_checkers" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_vanilla)) + name = "Mmm, waffles with vanilla sauce." + icon_state = "waffles_vanilla" + + if(reagents.has_reagent(/singleton/reagent/condiment/syrup_chocolate)) + name = "checkerboard waffles" + desc = "Waffles with chocolate and vanilla sauces carefully applied in a checkerboard pattern. Extremely fancy, in a 12 year old birthday party kind of way." + icon_state = "waffles_checkers" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_strawberry)) + name = "waffles with strawberry sauce" + desc = "Don't worry! They're so neon red, there's no CHANCE anything nutritious got through to them!" + icon_state = "waffles_redsauce" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_berry)) + name = "waffles with berry sauce" + desc = "Waffles with neon red berry sauce. Stretching the term 'berries' to the absolute furthest limits allowed by food health and safety regulations." + icon_state = "waffles_redsauce" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_caramel)) + name = "waffles with caramel sauce" + desc = "Because some people just want to chug a whole keg of sugar and get away with calling it breakfast." + icon_state = "waffles_lightbrownsauce" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_pumpkin)) + name = "waffles with pumpkin spice sauce" + desc = "For that perfect social media breakfast photo on an autumn morning." + icon_state = "waffles_lightbrownsauce" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_dirtberry)) + name = "waffles with dirtberry sauce" + desc = "Parrrt of this complete brrreakfast!" + icon_state = "waffles_lightbrownsauce" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_blueberry)) + name = "waffles with blueberry sauce" + desc = "You could have had waffles with actual blueberries to maybe get just a little bit of nutrition in there along with the flavor, but no. You chose this." + icon_state = "waffles_bluesauce" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_blueraspberry)) + name = "waffles with blue raspberry sauce" + desc = "Introducing breakfast to colors it was never meant to be! Wow!" + icon_state = "waffles_bluesauce" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_raspberry)) + name = "waffles with raspberry sauce" + desc = "Glamour waffles." + icon_state = "waffles_pinksauce" + + else if(reagents.has_reagent(/singleton/reagent/condiment/syrup_ylphaberry)) + name = "waffles with ylpha sauce" + desc = "How delicious is this? Ylpha-nd out soon enough!" //Hurr hurr + icon_state = "waffles_pinksauce" + /obj/item/reagent_containers/food/snacks/soywafers name = "Soy Wafers" desc = "Simple pressed soy wafers." diff --git a/html/changelogs/Tomixcomics-PR.yml b/html/changelogs/Tomixcomics-PR.yml new file mode 100644 index 00000000000..e2a769082a0 --- /dev/null +++ b/html/changelogs/Tomixcomics-PR.yml @@ -0,0 +1,63 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Tomixcomics + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added 8 new food dishes (including 6 new Konyanger dishes) and 1 new sauce (sweet chili)." + - rscadd: "Added macarons to the custom foods you can make with the oven." + - rscadd: "Waffles and fries now visually change based on some specific syrups or condiments you might pour onto them." + - rscdel: "Removed the feature of batter (and by extention, a lot of fried foods) making people throw up." + - code_imp: "Moved a few foods around in the code to be in the correct food categories (such as Elotes being listed with other Mictlani food now)." + - qol: "Made produce boxes sometimes spawn garlic as random produce, and made onions a bit more likely to spawn as well, now that more recipes require them." diff --git a/icons/obj/item/reagent_containers/food/burger.dmi b/icons/obj/item/reagent_containers/food/burger.dmi index 08684d97ff6..7dbffb7ce25 100644 Binary files a/icons/obj/item/reagent_containers/food/burger.dmi and b/icons/obj/item/reagent_containers/food/burger.dmi differ diff --git a/icons/obj/item/reagent_containers/food/condiment.dmi b/icons/obj/item/reagent_containers/food/condiment.dmi index 3682d671c18..cc9b6387d86 100644 Binary files a/icons/obj/item/reagent_containers/food/condiment.dmi and b/icons/obj/item/reagent_containers/food/condiment.dmi differ diff --git a/icons/obj/item/reagent_containers/food/cultural/human.dmi b/icons/obj/item/reagent_containers/food/cultural/human.dmi index d7ec823348c..ade266ff3b9 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/human.dmi and b/icons/obj/item/reagent_containers/food/cultural/human.dmi differ diff --git a/icons/obj/item/reagent_containers/food/custom.dmi b/icons/obj/item/reagent_containers/food/custom.dmi index f5c764dcaa3..8378031da74 100644 Binary files a/icons/obj/item/reagent_containers/food/custom.dmi and b/icons/obj/item/reagent_containers/food/custom.dmi differ diff --git a/icons/obj/item/reagent_containers/food/fryer.dmi b/icons/obj/item/reagent_containers/food/fryer.dmi index 80470fcc416..9259fd861ac 100644 Binary files a/icons/obj/item/reagent_containers/food/fryer.dmi and b/icons/obj/item/reagent_containers/food/fryer.dmi differ diff --git a/icons/obj/item/reagent_containers/food/pastries.dmi b/icons/obj/item/reagent_containers/food/pastries.dmi index 63f515aea07..d4e80fd26df 100644 Binary files a/icons/obj/item/reagent_containers/food/pastries.dmi and b/icons/obj/item/reagent_containers/food/pastries.dmi differ