diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 16da3ca8fc3..9b4bf1bc92c 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -302,7 +302,7 @@ pickup_sound = 'sound/items/pickup/glass.ogg' /obj/item/trash/bluemoon - name = "empty blue moon" + name = "empty dessert glass" icon_state = "bluemoon" drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' @@ -406,3 +406,10 @@ icon_state = "small_bowl" drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' + +/obj/item/trash/bowl_brown + name = "terracotta bowl" + desc = "A brown bowl made of clay. Good for, uh, bowl... ing." + icon_state = "bowl_brown" + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index decf2234e90..d7cae1b41a8 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -481,3 +481,25 @@ ) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/paneer_gadpathur + +//Galatea + +/singleton/recipe/baked_golden_apple + appliance = OVEN + fruit = list("goldapple" = 1) + reagents = list(/singleton/reagent/sugar = 5, /singleton/reagent/drink/milk/cream = 5, /singleton/reagent/spacespice = 2) + items = list( + /obj/item/reagent_containers/food/snacks/no_raisin + ) + result = /obj/item/reagent_containers/food/snacks/baked_golden_apple + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/fire_loaf + appliance = OVEN + fruit = list ("onion" = 1, "chili" = 3) + reagents = list(/singleton/reagent/kelotane = 5) + items = list( + /obj/item/reagent_containers/food/snacks/meat + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/fire_loaf diff --git a/code/modules/cooking/recipes/cultural/recipes_unathi.dm b/code/modules/cooking/recipes/cultural/recipes_unathi.dm index dcc75fee6cc..a7ee3c7589a 100644 --- a/code/modules/cooking/recipes/cultural/recipes_unathi.dm +++ b/code/modules/cooking/recipes/cultural/recipes_unathi.dm @@ -187,3 +187,40 @@ ) result = /obj/item/reagent_containers/food/snacks/sliceable/eyebowl reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/caramelized_steak_bites + appliance = SKILLET | SAUCEPAN + reagents = list(/singleton/reagent/sugar = 10) + items = list( + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/spreads/butter + ) + result = /obj/item/reagent_containers/food/snacks/caramelized_steak_bites + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/guwan_gruel + appliance = SAUCEPAN | POT + reagents = list(/singleton/reagent/water = 10) + items = list( + /obj/item/reagent_containers/food/snacks/rawcutlet, //Intentionally any meat and not moghesian. Guwans can't be picky. + /obj/item/reagent_containers/food/snacks/fish + ) + result = /obj/item/reagent_containers/food/snacks/guwan_gruel + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/egg_pie + appliance = OVEN + reagents = list(/singleton/reagent/sugar = 5, /singleton/reagent/nutriment/protein/egg = 6) + items = list( + /obj/item/reagent_containers/food/snacks/dough + ) + result = /obj/item/reagent_containers/food/snacks/egg_pie + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/orszi + appliance = OVEN | GRILL + reagents = list(/singleton/reagent/nutriment/protein/egg = 3, /singleton/reagent/spacespice = 2) + items = list( + /obj/item/reagent_containers/food/snacks/fish + ) + result = /obj/item/reagent_containers/food/snacks/orszi diff --git a/code/modules/cooking/recipes/recipes_baked.dm b/code/modules/cooking/recipes/recipes_baked.dm index 665d24421c4..50ed644cb5c 100644 --- a/code/modules/cooking/recipes/recipes_baked.dm +++ b/code/modules/cooking/recipes/recipes_baked.dm @@ -125,3 +125,13 @@ ) result = /obj/item/reagent_containers/food/snacks/stuffed_pepper_rice result_quantity = 2 + +/singleton/recipe/baked_apple + appliance = OVEN + fruit = list("apple" = 1) + reagents = list(/singleton/reagent/sugar = 5, /singleton/reagent/spacespice = 2) + items = list( + /obj/item/reagent_containers/food/snacks/no_raisin + ) + result = /obj/item/reagent_containers/food/snacks/baked_apple + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/cooking/recipes/recipes_burger.dm b/code/modules/cooking/recipes/recipes_burger.dm index 894c778fdeb..38421764bab 100644 --- a/code/modules/cooking/recipes/recipes_burger.dm +++ b/code/modules/cooking/recipes/recipes_burger.dm @@ -130,3 +130,23 @@ reagents = list(/singleton/reagent/nutriment/protein = 6 , /singleton/reagent/nutriment/barbecue = 5) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/sloppyjoe + +/singleton/recipe/nakarka_hamburger + appliance = SKILLET + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/cutlet, + /obj/item/reagent_containers/food/snacks/nakarka_wedge + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/burger/nakarka_hamburger + +/singleton/recipe/nakarka_hamburger_alt + appliance = SKILLET + items = list( + /obj/item/reagent_containers/food/snacks/burger, + /obj/item/reagent_containers/food/snacks/nakarka_wedge + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/burger/nakarka_hamburger + diff --git a/code/modules/cooking/recipes/recipes_confections.dm b/code/modules/cooking/recipes/recipes_confections.dm index 643c69e06eb..094a5505a39 100644 --- a/code/modules/cooking/recipes/recipes_confections.dm +++ b/code/modules/cooking/recipes/recipes_confections.dm @@ -117,3 +117,16 @@ reagents = list(/singleton/reagent/drink/milk = 5, /singleton/reagent/sugar = 5, /singleton/reagent/nutriment/protein/egg = 3) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/custard + +/singleton/recipe/nakarka_mousse_berry + appliance = SAUCEPAN + fruit = list ("berries" = 1) + reagents = list(/singleton/reagent/drink/milk/nemiik = 5, /singleton/reagent/drink/milk/cream = 5, /singleton/reagent/sugar = 5) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/nakarka_mousse + +/singleton/recipe/nakarka_mousse_cherry + appliance = SAUCEPAN + reagents = list(/singleton/reagent/drink/milk/nemiik = 5, /singleton/reagent/drink/milk/cream = 5, /singleton/reagent/sugar = 5, /singleton/reagent/nutriment/cherryjelly = 5) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/nakarka_mousse/cherry diff --git a/code/modules/cooking/recipes/recipes_eggs.dm b/code/modules/cooking/recipes/recipes_eggs.dm index 5616dbb3642..2225d24b7b7 100644 --- a/code/modules/cooking/recipes/recipes_eggs.dm +++ b/code/modules/cooking/recipes/recipes_eggs.dm @@ -82,3 +82,13 @@ ) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/eggs_benedict + +/singleton/recipe/nakarka_omelette + appliance = SKILLET + items = list( + /obj/item/reagent_containers/food/snacks/nakarka_wedge, + /obj/item/reagent_containers/food/snacks/nakarka_wedge + ) + reagents = list(/singleton/reagent/nutriment/protein/egg = 6) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/nakarka_omelette diff --git a/code/modules/cooking/recipes/recipes_noodles.dm b/code/modules/cooking/recipes/recipes_noodles.dm index abe5625da24..c77779e321f 100644 --- a/code/modules/cooking/recipes/recipes_noodles.dm +++ b/code/modules/cooking/recipes/recipes_noodles.dm @@ -142,3 +142,27 @@ reagents = list(/singleton/reagent/water = 5, /singleton/reagent/drink/milk/soymilk = 5) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/ravioli/earthenroot + +/singleton/recipe/ravioli_nakarka + appliance = SAUCEPAN | POT + reagents = list(/singleton/reagent/water = 5, /singleton/reagent/drink/milk/cream = 5) + items = list( + /obj/item/reagent_containers/food/snacks/doughslice, + /obj/item/reagent_containers/food/snacks/doughslice, + /obj/item/reagent_containers/food/snacks/doughslice, + /obj/item/reagent_containers/food/snacks/nakarka_wedge + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/ravioli/nakarka + +/singleton/recipe/fettuccine_alfredo + appliance = SAUCEPAN | POT + fruit = list("garlic" = 1) + reagents = list(/singleton/reagent/water = 5) + items = list( + /obj/item/reagent_containers/food/snacks/spaghetti, + /obj/item/reagent_containers/food/snacks/spreads/butter, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/fettuccine_alfredo + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/reagents/reagent_containers/food/snacks/baked.dm b/code/modules/reagents/reagent_containers/food/snacks/baked.dm index 13b8ad72457..3b18035b9a1 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/baked.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/baked.dm @@ -241,3 +241,13 @@ icon = 'icons/obj/item/reagent_containers/food/baked.dmi' icon_state = "[variant]" update_icon() + +/obj/item/reagent_containers/food/snacks/baked_apple + name = "baked apple" + desc = "A soft, vegan baked apple stufed with raisins, nuts, cinnamon and brown sugar. All of the nature without any of the healthy!" //Grammar bad on purpose because funny. + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "baked_apple" + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/glucose = 3) + reagent_data = list(/singleton/reagent/nutriment = list("apple" = 5, "raisins" = 5, "nuts" = 3, "cinnamon" = 3)) + filling_color = "#a04e1e" diff --git a/code/modules/reagents/reagent_containers/food/snacks/burger.dm b/code/modules/reagents/reagent_containers/food/snacks/burger.dm index b7cbbd68b80..2dea48c0eb7 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/burger.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/burger.dm @@ -18,6 +18,12 @@ qdel(attacking_item) qdel(src) return + else if(istype(attacking_item, /obj/item/reagent_containers/food/snacks/nakarka_wedge)) // Burger + nakarka wedge = nakarka hamburger. You could make it this way but then it doesn't filter out the chem that upsets human and taj stomaches. + new /obj/item/reagent_containers/food/snacks/burger/nakarka_hamburger/ungrilled(src) + to_chat(user, "You slap a slice of ungrilled nakarka on 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) @@ -229,3 +235,15 @@ reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/protein = 4) reagent_data = list(/singleton/reagent/nutriment = list("barbecue sauce" = 5, "bun" = 5), /singleton/reagent/nutriment/protein = list("ground beef" = 5)) bitesize = 2 + +/obj/item/reagent_containers/food/snacks/burger/nakarka_hamburger + name = "nakarka hamburger" //wrote "hamburger" in full to set it apart from "nakarkaburger" which is a kois dish + desc = "A delicious hamburger with green Nakarka cheese. Grilling the cheese makes it palatable for Humans and Tajara as well. This meal is not to be confused with the K'ois version of the same meal. No. Seriously. DO NOT CONFUSE IT." + icon_state = "nakarkaburger" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 3) + reagent_data = list(/singleton/reagent/nutriment = list("sharp tangyness" = 4, "bun" = 2), /singleton/reagent/nutriment/protein = list("meat" = 4)) + bitesize = 2 + +/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) diff --git a/code/modules/reagents/reagent_containers/food/snacks/confections.dm b/code/modules/reagents/reagent_containers/food/snacks/confections.dm index d60d2761557..dbe863d265d 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/confections.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/confections.dm @@ -236,3 +236,27 @@ bitesize = 2 drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' + +/obj/item/reagent_containers/food/snacks/nakarka_mousse + name = "nakarka mousse" + desc = "A fluffy green mousse made out of Ne'miik. It is a recent, still uncommon dessert that has started sprouting up in cafes and restaurants wherever Vaurca and Humans coexist." + icon = 'icons/obj/item/reagent_containers/food/confections.dmi' + icon_state = "nakarkamousse" + trash = /obj/item/trash/bluemoon + filling_color = "#5dd159" + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/glucose = 2) + reagent_data = list(/singleton/reagent/nutriment = list("sweet tanginess" = 5, "berries" = 3)) + bitesize = 2 + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' + +/obj/item/reagent_containers/food/snacks/nakarka_mousse/cherry + reagent_data = list(/singleton/reagent/nutriment = list("sweet tanginess" = 5, "cherries" = 3)) + +/obj/item/reagent_containers/food/snacks/nakarka_mousse/update_icon() + var/percent_nakarkamousse = round((reagents.total_volume / 6) * 100) + switch(percent_nakarkamousse) + if(0 to 50) + icon_state = "nakarkamousse_half" + if(51 to INFINITY) + icon_state = "nakarkamousse" 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 84de367abf9..9b1e72c51c3 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -803,3 +803,37 @@ icon_state = "paneer_half" if(70 to INFINITY) icon_state = "paneer" + +//Galatea + +/obj/item/reagent_containers/food/snacks/baked_golden_apple + name = "baked golden apple" + desc = "Shiny and glamorous, this genetically modified golden apple is stuffed with raisins, nuts, brown sugar, cinnamon, and topped with whipped cream. It is a shining star of Galatean cuisine and of hoity toity rich people around the spur. Contains real gold! Don't eat the cinnamon sticks they're there as a garnish." + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "baked_gold_apple" + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/gold = 5, /singleton/reagent/nutriment/glucose = 3) + reagent_data = list(/singleton/reagent/nutriment = list("fancyness" = 5, "apple" = 5, "raisins" = 3, "nuts" = 3)) + filling_color = "#ffba25" + +/obj/item/reagent_containers/food/snacks/fire_loaf + name = "fire loaf" + desc = "A very spicy Galatean dish, traditionally made with synthmeat marinated in a special kelotane-infused mixture to give the dish it's strong color and help balance out the spicyness of the dish, as well as the chili peppers it is served with. Most cultures would just use dairy products to balance out a dish's spicyness. But most cultures aren't Galatea." //Does Kelotane even affect spicyness? Probably not. But it's good marketing. + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "fireloaf" + trash = /obj/item/trash/plate + bitesize = 2 + filling_color = "#8f2106" + reagents_to_add = list(/singleton/reagent/nutriment/protein = 5, /singleton/reagent/kelotane = 3, /singleton/reagent/capsaicin = 5) + reagent_data = list(/singleton/reagent/nutriment/protein = list("spicy meat" = 5, "chili" = 4, "onion" = 3, "unusual flavoring" = 3)) + +/obj/item/reagent_containers/food/snacks/fire_loaf/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_fire_loaf = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_fire_loaf) + if(0 to 49) + icon_state = "fireloaf_half" + if(50 to INFINITY) + icon_state = "fireloaf" diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/skrell.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/skrell.dm index 0b8614ea424..085a9da1338 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/skrell.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/skrell.dm @@ -174,7 +174,7 @@ name = "konaqu" desc = "Literally translating to 'whirpool orb', konaqu are popular pastry-like confections beloved among Nralakk youth. They tend to be soft and gooey underwater, or soft and brittle when dry. When served on dry land, they are often served with a small bowl or glass of water or milk to give people the option of dunking them." icon = 'icons/obj/item/reagent_containers/food/cultural/skrell.dmi' - icon_state = "qilvo" + icon_state = "konaqu1" filling_color = "#64e3faff" reagents_to_add = list(/singleton/reagent/nutriment = 4) reagent_data = list(/singleton/reagent/nutriment = list("fruity dough" = 5, "sweetness" = 5)) diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm index da5554b80fc..44810721868 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm @@ -230,6 +230,7 @@ bitesize = 3 drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' + filling_color = "#773204" /obj/item/storage/chewables/tobacco/koko name = "Ha'zana chewing koko" @@ -238,3 +239,75 @@ icon_state = "chew_koko" item_state = "chew_koko" starts_with = list(/obj/item/clothing/mask/chewable/chewingkoko = 6) + +/obj/item/reagent_containers/food/snacks/caramelized_steak_bites + name = "caramelized steak bites" + desc = "A rich, sticky-sweet dessert for any Unathi. For non-Unathi thixxs may sometimes be considered a main dish, albeit a very sweet one, as far as meat dishes are concerned." + icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' + icon_state = "steakbites" + trash = /obj/item/trash/bowl_brown + reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/drink/caramel = 5) + reagent_data = list(/singleton/reagent/nutriment/protein = list("meat" = 5)) + bitesize = 2 + filling_color = "#3b1b06" + +/obj/item/reagent_containers/food/snacks/caramelized_steak_bites/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_steakbites = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_steakbites) + if(0 to 80) + icon_state = "steakbites_half" + if(81 to INFINITY) + icon_state = "steakbites" + +/obj/item/reagent_containers/food/snacks/guwan_gruel + name = "guwan gruel" + desc = "Large, unflavored chunks of fish in a watered down meat slurry. Truly, a dish fit for someone scraping by after being expelled from their clan. Guwan then, try it." + icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' + icon_state = "guwan_gruel" + trash = /obj/item/trash/snack_bowl + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 4, /singleton/reagent/nutriment/protein = 3, /singleton/reagent/water = 4) + bitesize = 3 + filling_color = "#bd9499" + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("bland fish" = 5), /singleton/reagent/nutriment/protein = list("meat slurry" = 5)) + +/obj/item/reagent_containers/food/snacks/egg_pie + name = "egg pie" + desc = "A personal pie filled with raw egg. In Unathi cultures, this is considered a dessert. Other races may consider it a high-protein main course. It is sometimes nicknamed 'wasteland pie' due to the way the top of the dough cracks as it is baked." + icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' + icon_state = "egg_pie" + reagents_to_add = list(/singleton/reagent/nutriment/protein = 6, /singleton/reagent/nutriment = 3) + bitesize = 3 + filling_color = "#e6a823" + reagent_data = list(/singleton/reagent/nutriment = list ("dough" = 5), /singleton/reagent/nutriment/protein = list("egg" = 5)) + +/obj/item/reagent_containers/food/snacks/egg_pie/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_eggpie = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_eggpie) + if(0 to 90) + icon_state = "egg_pie_bitten" + if(91 to INFINITY) + icon_state = "egg_pie" + +/obj/item/reagent_containers/food/snacks/orszi + name = "grilled orszi" + desc = "A simple Ouerean recipe for serving grilled fish in an egg glaze with Ouerean spices. Beloved by all classes. You could theoretically prepare most fish like this but you have to use Orszi and Ouerean spices for that full authentic taste." + icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' + icon_state = "orszi" + trash = /obj/item/trash/plate + filling_color = "#e2a191" + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 2) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("grilled fish" = 5, "spices" = 3)) + +/obj/item/reagent_containers/food/snacks/orszi/update_icon() + var/percent_orszi = round((reagents.total_volume / 10) * 100) + switch(percent_orszi) + if(0 to 49) + icon_state = "orszi_half" + if(50 to INFINITY) + icon_state = "orszi" diff --git a/code/modules/reagents/reagent_containers/food/snacks/eggs.dm b/code/modules/reagents/reagent_containers/food/snacks/eggs.dm index bdcdd8bf628..e879b8bf826 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/eggs.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/eggs.dm @@ -213,3 +213,15 @@ reagent_data = list(/singleton/reagent/nutriment/protein/egg = list("rich, creamy eggs" = 10), /singleton/reagent/nutriment = list("toasted bread" = 5, "ham" = 3)) filling_color = "#ebcd49" bitesize = 3 + +/obj/item/reagent_containers/food/snacks/nakarka_omelette + name = "nakarka omelette" + desc = "A green omelette. The Nakarka cheese gives it a unique sort of kick. This dish is believed to originally be from Tret." + icon = 'icons/obj/item/reagent_containers/food/egg.dmi' + icon_state = "omelette_nakarka" + trash = /obj/item/trash/plate + filling_color = "#8fda18" + center_of_mass = list("x"=16, "y"=13) + bitesize = 1 + reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 5, /singleton/reagent/nutriment = 3) + reagent_data = list(/singleton/reagent/nutriment = list("sharp tanginess" = 5)) diff --git a/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm b/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm index d6618f21f6c..39639504d04 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm @@ -46,7 +46,7 @@ /obj/item/reagent_containers/food/snacks/nakarka_wedge name = "nakarka cheese wedge" - desc = "Zzztop calling it Nakarka cheeeze. Nakarka meanzzz cheeeze. You are literally calling it cheezzze cheezzze." + desc = "Zzztop calling it Nakarka cheezzze. You sound ridicoulouzzz. Nakarka meanzzz cheezzze. You are literally calling it cheezzze cheezzze." icon = 'icons/obj/item/reagent_containers/food/ingredients.dmi' icon_state = "nakarka_wedge" ingredient_name = "nakarka" diff --git a/code/modules/reagents/reagent_containers/food/snacks/noodles.dm b/code/modules/reagents/reagent_containers/food/snacks/noodles.dm index 44141b12bc4..e0a1a20bf77 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/noodles.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/noodles.dm @@ -170,3 +170,32 @@ reagents_to_add = list(/singleton/reagent/nutriment = 8) reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 5, "pumpkin squash" = 5, "creamy sauce" = 5)) filling_color = "#80d1e9" + +/obj/item/reagent_containers/food/snacks/ravioli/nakarka + name = "nakarka ravioli" + icon_state = "raviolinakarka" + desc = "Ravioli with Nakarka cheese filling in a sour cream and chives based sauce." + reagents_to_add = list(/singleton/reagent/nutriment = 10) + reagent_data = list(/singleton/reagent/nutriment = list("sharp tanginess" = 5, "pasta" = 4, "sour cream" = 4, "chives" = 3)) + +/obj/item/reagent_containers/food/snacks/fettuccine_alfredo + name = "fettuccine alfredo" + desc = "Pasta lathered in a white, buttery parmesan cheese and cream sauce. Classic Italian!" + icon = 'icons/obj/item/reagent_containers/food/noodles.dmi' + icon_state = "alfredo" + trash = /obj/item/trash/plate + filling_color = "#f8e8b1" + center_of_mass = list("x"=16, "y"=10) + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein/cheese = 2) + reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 5, "garlic" = 3), /singleton/reagent/nutriment/protein/cheese = list("creamy parmesan" = 5)) + +/obj/item/reagent_containers/food/snacks/fettuccine_alfredo/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_fettuccine_alfredo = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_fettuccine_alfredo) + if(0 to 49) + icon_state = "alfredo_half" + if(50 to INFINITY) + icon_state = "alfredo" diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index d2f010b144c..b51166e18ca 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -20,13 +20,13 @@ reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "berries" = 2)) /obj/item/reagent_containers/food/snacks/muffin/chocolate - name = "berry muffin" + name = "chocolate muffin" desc = "A delicious and spongy little cake, with chocolate chips." icon_state = "muffin_chocolate" reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "chocolate" = 2)) /obj/item/reagent_containers/food/snacks/muffin/whitechocolate - name = "chocolate muffin" + name = "white chocolate muffin" desc = "A delicious and spongy little cake, with white chocolate chips." icon_state = "muffin_whitechocolate" reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "white chocolate" = 2)) diff --git a/html/changelogs/Tomixcomics-letmoghescook.yml b/html/changelogs/Tomixcomics-letmoghescook.yml new file mode 100644 index 00000000000..e484a767b67 --- /dev/null +++ b/html/changelogs/Tomixcomics-letmoghescook.yml @@ -0,0 +1,61 @@ +################################ +# 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 12 new dishes (4 Unathi dishes, 2 Galatean dishes, 1 Tretian dish, 5 misc.)." + - bugfix: "Fixed the codex visual of Konaqu showing up wrong." + - bugfix: "Corrected a few muffin names that were showing up as the wrong kind of muffin." + - spellcheck: "Edited description of Nakarka cheese because the vaurcan accent was spelled incorrectly." diff --git a/icons/obj/item/reagent_containers/food/baked.dmi b/icons/obj/item/reagent_containers/food/baked.dmi index 1c5b1ffb32c..3887864d461 100644 Binary files a/icons/obj/item/reagent_containers/food/baked.dmi and b/icons/obj/item/reagent_containers/food/baked.dmi differ diff --git a/icons/obj/item/reagent_containers/food/burger.dmi b/icons/obj/item/reagent_containers/food/burger.dmi index e78a2144729..08684d97ff6 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/confections.dmi b/icons/obj/item/reagent_containers/food/confections.dmi index ec2e6173315..beeaba5837d 100644 Binary files a/icons/obj/item/reagent_containers/food/confections.dmi and b/icons/obj/item/reagent_containers/food/confections.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 2de0702a0b5..f42919613a5 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/cultural/unathi.dmi b/icons/obj/item/reagent_containers/food/cultural/unathi.dmi index 3332b247485..acd6895a21c 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/unathi.dmi and b/icons/obj/item/reagent_containers/food/cultural/unathi.dmi differ diff --git a/icons/obj/item/reagent_containers/food/egg.dmi b/icons/obj/item/reagent_containers/food/egg.dmi index af3f183307f..b01f00f6c76 100644 Binary files a/icons/obj/item/reagent_containers/food/egg.dmi and b/icons/obj/item/reagent_containers/food/egg.dmi differ diff --git a/icons/obj/item/reagent_containers/food/noodles.dmi b/icons/obj/item/reagent_containers/food/noodles.dmi index 5c1c1bc7570..a334ae50339 100644 Binary files a/icons/obj/item/reagent_containers/food/noodles.dmi and b/icons/obj/item/reagent_containers/food/noodles.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 42c5e1ea1a5..11a54556c8e 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ