diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index e959bc077111..74d5699a45a0 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -188,3 +188,6 @@ DEFINE_BITFIELD(food_flags, list( // Venues for the barbots. #define VENUE_RESTAURANT "Restaurant Venue" #define VENUE_BAR "Bar Venue" + +/// How much milk is needed to make butter on a reagent grinder +#define MILK_TO_BUTTER_COEFF 25 diff --git a/code/datums/components/crafting/_recipes.dm b/code/datums/components/crafting/_recipes.dm index 56f8ed239705..77e0ed72c3cf 100644 --- a/code/datums/components/crafting/_recipes.dm +++ b/code/datums/components/crafting/_recipes.dm @@ -43,6 +43,10 @@ var/delete_contents = TRUE /datum/crafting_recipe/New() + if(!name && result) + var/atom/atom_result = result + name = initial(atom_result.name) + if(!(result in reqs)) blacklist += result if(tool_behaviors) diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index c7f773d82701..4b3e84a26ab6 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -461,9 +461,9 @@ if(!istext(result)) //We made an item and didn't get a fail message if(ismob(user) && isitem(result)) //In case the user is actually possessing a non mob like a machine user.put_in_hands(result) - else + else if(!istype(result, /obj/effect/spawner)) result.forceMove(user.drop_location()) - to_chat(user, span_notice("[crafting_recipe.name] constructed.")) + to_chat(user, span_notice("Constructed [crafting_recipe.name].")) user.investigate_log("crafted [crafting_recipe]", INVESTIGATE_CRAFTING) crafting_recipe.on_craft_completion(user, result) else @@ -503,7 +503,7 @@ data["category"] = recipe.category // Name, Description - data["name"] = recipe.name || initial(atom.name) + data["name"] = recipe.name if(ispath(recipe.result, /datum/reagent)) var/datum/reagent/reagent = recipe.result diff --git a/code/game/machinery/computer/orders/order_items/cook/order_veggies.dm b/code/game/machinery/computer/orders/order_items/cook/order_veggies.dm index 996972c61d25..506920986dd2 100644 --- a/code/game/machinery/computer/orders/order_items/cook/order_veggies.dm +++ b/code/game/machinery/computer/orders/order_items/cook/order_veggies.dm @@ -26,7 +26,7 @@ name = "Cabbage" item_path = /obj/item/food/grown/cabbage -/datum/orderable_item/veggies/beets +/datum/orderable_item/veggies/onion name = "Onion" item_path = /obj/item/food/grown/onion diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm index 6abaa3e348f9..8e0edafc7b66 100644 --- a/code/game/objects/items/food/burgers.dm +++ b/code/game/objects/items/food/burgers.dm @@ -648,3 +648,16 @@ icon_state = "custburg" tastes = list("bun") foodtypes = GRAIN + +/obj/item/food/burger/sloppy_moe + name = "sloppy moe" + desc = "Ground meat mixed with onions and barbeque sauce, sloppily plopped onto a burger bun. Delicious, but guaranteed to get your hands dirty." + icon_state = "sloppy_moe" + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/protein = 8, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("juicy meat" = 4, "BBQ sauce" = 3, "onions" = 2, "bun" = 2) + foodtypes = GRAIN | MEAT | VEGETABLES + venue_value = FOOD_PRICE_NORMAL diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm index e0d7b140dc10..f35a121d5a94 100644 --- a/code/game/objects/items/food/cake.dm +++ b/code/game/objects/items/food/cake.dm @@ -640,3 +640,28 @@ icon_state = "weddingcake_slice" tastes = list("cake" = 3, "frosting" = 1) foodtypes = GRAIN | DAIRY | SUGAR + +/obj/item/food/cake/pineapple_cream_cake + name = "pineapple cream cake" + desc = "A vibrant cake with a layer of thick cream and pineapple on top." + icon_state = "pineapple_cream_cake" + food_reagents = list( + /datum/reagent/consumable/nutriment = 30, + /datum/reagent/consumable/sugar = 15, + /datum/reagent/consumable/nutriment/vitamin = 15, + ) + tastes = list("cake" = 2, "cream" = 3, "pineapple" = 4) + foodtypes = GRAIN | DAIRY | SUGAR | FRUIT | PINEAPPLE + slice_type = /obj/item/food/cakeslice/pineapple_cream_cake + +/obj/item/food/cakeslice/pineapple_cream_cake + name = "pineapple cream cake slice" + desc = "A vibrant cake with a layer of thick cream and pineapple on top." + icon_state = "pineapple_cream_cake_slice" + food_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/sugar = 3, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("cake" = 2, "cream" = 3, "pineapple" = 4) + foodtypes = GRAIN | DAIRY | SUGAR | FRUIT | PINEAPPLE diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm index e246c7476e9a..7f60ff93e7d7 100644 --- a/code/game/objects/items/food/meatdish.dm +++ b/code/game/objects/items/food/meatdish.dm @@ -671,6 +671,7 @@ /obj/item/food/nugget name = "chicken nugget" + desc = "A \"chicken\" nugget vaguely shaped like something." food_reagents = list( /datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 2, @@ -828,6 +829,7 @@ /obj/item/food/kebab/fiesta name = "fiesta skewer" + desc = "Variety of meats and vegetables on a stick." icon_state = "fiestaskewer" food_reagents = list( /datum/reagent/consumable/nutriment/protein = 12, @@ -963,3 +965,86 @@ tastes = list("juicy meat" = 3, "onions" = 1, "garlic" = 1, "ketchup" = 1) foodtypes = MEAT | VEGETABLES w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/sweet_and_sour_meatballs + name = "sweet and sour meatballs" + desc = "Golden meatballs glazed in a sticky savory sauce, served with pineapple and pepper chunks." + icon = 'icons/obj/food/meat.dmi' + icon_state = "sweet_and_sour_meatballs" + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 10, + /datum/reagent/consumable/nutriment/vitamin = 8, + /datum/reagent/consumable/nutriment = 8, + ) + tastes = list("meat" = 5, "savory sauce" = 4, "tangy pineapple" = 3, "pepper" = 2) + foodtypes = MEAT | VEGETABLES | FRUIT | PINEAPPLE + +/obj/item/food/kebab/pineapple_skewer + name = "pineapple skewer" + desc = "Chunks of glazed meat skewered on a rod with pineapple slices. Surprisingly not bad!" + icon = 'icons/obj/food/meat.dmi' + icon_state = "pineapple_skewer" + food_reagents = list( + /datum/reagent/consumable/nutriment/protein = 10, + /datum/reagent/consumable/nutriment/vitamin = 8, + ) + tastes = list("juicy meat" = 4, "pineapple" = 3) + foodtypes = MEAT | FRUIT | PINEAPPLE + +/obj/item/food/futomaki_sushi_roll + name = "futomaki sushi roll" + desc = "A roll of futomaki sushi, made of boiled egg, fish, and cucumber. Sliceable" + icon_state = "futomaki_sushi_roll" + food_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/protein = 8, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2, "cucumber" = 2) + foodtypes = VEGETABLES | SEAFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/futomaki_sushi_roll/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/futomaki_sushi_slice, 4, screentip_verb = "Chop") + +/obj/item/food/futomaki_sushi_slice + name = "futomaki sushi slice" + desc = "A slice of futomaki sushi, made of boiled egg, fish, and cucumber." + icon_state = "futomaki_sushi_slice" + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/nutriment/protein = 2, + /datum/reagent/consumable/nutriment/vitamin = 1, + ) + tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2, "cucumber" = 2) + foodtypes = VEGETABLES | SEAFOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/philadelphia_sushi_roll + name = "Philadelphia sushi roll" + desc = "A roll of Philadelphia sushi, made of cheese, fish, and cucumber. Sliceable" + icon_state = "philadelphia_sushi_roll" + food_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/protein = 8, + /datum/reagent/consumable/nutriment/vitamin = 8, + ) + tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cucumber" = 2) + foodtypes = VEGETABLES | SEAFOOD | DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/philadelphia_sushi_roll/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/philadelphia_sushi_slice, 4, screentip_verb = "Chop") + +/obj/item/food/philadelphia_sushi_slice + name = "Philadelphia sushi slice" + desc = "A roll of Philadelphia sushi, made of cheese, fish, and cucumber." + icon_state = "philadelphia_sushi_slice" + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/nutriment/protein = 2, + /datum/reagent/consumable/nutriment/vitamin = 2, + ) + tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cucumber" = 2) + foodtypes = VEGETABLES | SEAFOOD | DAIRY + w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/food/mexican.dm b/code/game/objects/items/food/mexican.dm index 57f7b718124e..5c99b29b9fa1 100644 --- a/code/game/objects/items/food/mexican.dm +++ b/code/game/objects/items/food/mexican.dm @@ -304,3 +304,16 @@ tastes = list("zesty rice" = 1, "tomato sauce" = 3,) foodtypes = VEGETABLES w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/pineapple_salsa + name = "pineapple salsa" + desc = "A not-so liquid salsa made of pineapples, tomatoes, onions, and chilis. Makes for delightfully contrasting flavors." + icon = 'icons/obj/food/mexican.dmi' + icon_state = "pineapple_salsa" + food_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("pineapple" = 4, "tomato" = 3, "onion" = 2, "chili" = 2) + foodtypes = VEGETABLES | FRUIT | PINEAPPLE + w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index e64eaa22c038..3346aba6754a 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -230,7 +230,7 @@ name = "stick of butter" desc = "A stick of delicious, golden, fatty goodness." icon_state = "butter" - food_reagents = list(/datum/reagent/consumable/nutriment = 5) + food_reagents = list(/datum/reagent/consumable/nutriment = 15) tastes = list("butter" = 1) foodtypes = DAIRY w_class = WEIGHT_CLASS_SMALL @@ -262,6 +262,18 @@ trash_type = /obj/item/stack/rods food_flags = FOOD_FINGER_FOOD +/obj/item/food/butter/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/butterslice, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice") + +/obj/item/food/butterslice + name = "butter slice" + desc = "A slice of butter, for your buttering needs." + icon_state = "butterslice" + food_reagents = list(/datum/reagent/consumable/nutriment = 5) + tastes = list("butter" = 1) + foodtypes = DAIRY + w_class = WEIGHT_CLASS_SMALL + /obj/item/food/onionrings name = "onion rings" desc = "Onion slices coated in batter." @@ -481,3 +493,144 @@ tastes = list("potato" = 1, "cheese" = 1) foodtypes = GRAIN | VEGETABLES | MEAT w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/stuffed_eggplant + name = "stuffed eggplant" + desc = "A cooked half of an eggplant, with the insides scooped out and mixed with meat, cheese, and veggies." + icon_state = "stuffed_eggplant" + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/nutriment/protein = 4, + ) + tastes = list("cooked eggplant" = 5, "cheese" = 4, "ground meat" = 3, "veggies" = 2) + foodtypes = VEGETABLES | MEAT | DAIRY + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/moussaka + name = "moussaka" + desc = "A layered Mediterranean dish made of eggplants, mixed veggies, and meat with a topping of bechamel sauce. Sliceable" + icon_state = "moussaka" + food_reagents = list( + /datum/reagent/consumable/nutriment = 30, + /datum/reagent/consumable/nutriment/vitamin = 10, + /datum/reagent/consumable/nutriment/protein = 20, + ) + tastes = list("cooked eggplant" = 5, "potato" = 1, "baked veggies" = 2, "meat" = 4, "bechamel sauce" = 3) + foodtypes = MEAT | DAIRY | VEGETABLES + +/obj/item/food/moussaka/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/moussaka_slice, 4, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut") + +/obj/item/food/moussaka_slice + name = "moussaka slice" + desc = "A layered Mediterranean dish made of eggplants, mixed veggies, and meat with a topping of bechamel sauce. Delish!" + icon_state = "moussaka_slice" + food_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 2, + /datum/reagent/consumable/nutriment/protein = 5, + ) + tastes = list("cooked eggplant" = 5, "potato" = 1, "baked veggies" = 2, "meat" = 4, "bechamel sauce" = 3) + foodtypes = MEAT | DAIRY | VEGETABLES + +/obj/item/food/candied_pineapple + name = "candied pineapple" + desc = "A chunk of pineapple coated in sugar and dried into a chewy treat." + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + icon_state = "candied_pineapple_1" + base_icon_state = "candied_pineapple" + tastes = list("sugar" = 2, "chewy pineapple" = 4) + foodtypes = FRUIT | SUGAR + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_TINY + +/obj/item/food/candied_pineapple/Initialize(mapload) + . = ..() + icon_state = "[base_icon_state]_[rand(1, 3)]" + +/obj/item/food/raw_pita_bread + name = "raw pita bread" + desc = "a sticky disk of raw pita bread." + icon = 'icons/obj/food/food_ingredients.dmi' + icon_state = "raw_pita_bread" + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("dough" = 2) + foodtypes = GRAIN + w_class = WEIGHT_CLASS_TINY + +/obj/item/food/raw_pita_bread/make_grillable() + AddComponent(/datum/component/grillable, /obj/item/food/pita_bread, rand(15 SECONDS, 30 SECONDS), TRUE, TRUE) + +/obj/item/food/raw_pita_bread/make_bakeable() + AddComponent(/datum/component/bakeable, /obj/item/food/pita_bread, rand(15 SECONDS, 30 SECONDS), TRUE, TRUE) + +/obj/item/food/pita_bread + name = "pita bread" + desc = "a multi-purposed sweet flatbread of Mediterranean origins." + icon = 'icons/obj/food/food_ingredients.dmi' + icon_state = "pita_bread" + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/nutriment/vitamin = 3, + ) + tastes = list("pita bread" = 2) + foodtypes = GRAIN + w_class = WEIGHT_CLASS_TINY + burns_on_grill = TRUE + burns_in_oven = TRUE + +/obj/item/food/tzatziki_sauce + name = "tzatziki sauce" + desc = "A garlic-based sauce or dip widely used in Mediterranean and Middle Eastern cuisine. Delicious on its own when dipped with pita bread or vegetables." + icon_state = "tzatziki_sauce" + food_reagents = list( + /datum/reagent/consumable/nutriment = 5, + /datum/reagent/consumable/nutriment/vitamin = 5, + ) + tastes = list("garlic" = 4, "cucumber" = 2, "olive oil" = 2) + foodtypes = VEGETABLES + w_class = WEIGHT_CLASS_TINY + +/obj/item/food/tzatziki_and_pita_bread + name = "tzatziki and pita bread" + desc = "Tzatziki sauce, now with pita bread for dipping. Very healthy and delicious all in one." + icon_state = "tzatziki_and_pita_bread" + food_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 8, + ) + tastes = list("pita bread" = 4, "tzatziki sauce" = 2, "olive oil" = 2) + foodtypes = VEGETABLES | GRAIN + w_class = WEIGHT_CLASS_TINY + +/obj/item/food/grilled_beef_gyro + name = "grilled beef gyro" + desc = "A traditional Greek dish of meat wrapped in pita bread with tomato, cabbage, onion, and tzatziki sauce." + icon_state = "grilled_beef_gyro" + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 8, + /datum/reagent/consumable/nutriment/protein = 6, + ) + tastes = list("pita bread" = 4, "tender meat" = 2, "tzatziki sauce" = 2, "mixed veggies" = 2) + foodtypes = VEGETABLES | GRAIN | MEAT + w_class = WEIGHT_CLASS_TINY + +/obj/item/food/vegetarian_gyro + name = "vegetarian gyro" + desc = "A traditional Greek gyro with cucumbers substituted for meat. Still full of intense flavor and very nourishing." + icon_state = "vegetarian_gyro" + food_reagents = list( + /datum/reagent/consumable/nutriment = 10, + /datum/reagent/consumable/nutriment/vitamin = 12, + ) + tastes = list("pita bread" = 4, "cucumber" = 2, "tzatziki sauce" = 2, "mixed veggies" = 2) + foodtypes = VEGETABLES | GRAIN + w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index cd7d4f5d71cb..94babd0cf901 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -487,3 +487,48 @@ tastes = list("peanut butter" = 1, "peanuts" = 1, "cream" = 1) foodtypes = GRAIN | JUNKFOOD | SUGAR | NUTS w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/cookie/chocolate_chip_cookie + name = "chocolate chip cookie" + desc = "A delightful-smelling chocolate chip cookie. Where's the milk?" + icon_state = "COOKIE!!!" + food_reagents = list(/datum/reagent/consumable/nutriment = 5) + tastes = list("soft cookie" = 2, "chocolate" = 3) + foodtypes = GRAIN | SUGAR | DAIRY + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/cookie/snickerdoodle + name = "snickerdoodle" + desc = "A soft cookie made from vanilla and cinnamon." + icon_state = "snickerdoodle" + food_reagents = list(/datum/reagent/consumable/nutriment = 5) + tastes = list("soft cookie" = 2, "vanilla" = 3) + foodtypes = GRAIN | SUGAR | DAIRY + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/cookie/macaron + name = "macaron" + desc = "A sandwich-like confectionary with a soft cookie shell and a creamy meringue center." + food_reagents = list(/datum/reagent/consumable/nutriment = 6) + icon_state = "macaron_1" + base_icon_state = "macaron" + tastes = list("wafer" = 2, "creamy meringue" = 3) + foodtypes = GRAIN | SUGAR | DAIRY + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_TINY + +/obj/item/food/cookie/macaron/Initialize(mapload) + . = ..() + icon_state = "[base_icon_state]_[rand(1, 4)]" + +/obj/item/food/cookie/thumbprint_cookie + name = "thumbprint cookie" + desc = "A cookie with a thumb-sized indent in the middle made for fillings. This one is filled with cherry jelly" + icon_state = "thumbprint_cookie" + food_reagents = list(/datum/reagent/consumable/nutriment = 6) + tastes = list("cookie" = 2, "cherry jelly" = 3) + foodtypes = GRAIN | SUGAR | FRUIT + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm index a9d884ecaee2..6cf2bbc81d1d 100644 --- a/code/game/objects/items/food/spaghetti.dm +++ b/code/game/objects/items/food/spaghetti.dm @@ -148,3 +148,81 @@ ) tastes = list("cheese" = 1, "breadcrumbs" = 1, "pasta" = 1) foodtypes = GRAIN | DAIRY + +/obj/item/food/spaghetti/shoyu_tonkotsu_ramen + name = "shoyu tonkotsu ramen" + desc = "A simple ramen made of meat, egg, onion, and a sheet of seaweed." + icon_state = "shoyu_tonkotsu_ramen" + trash_type = /obj/item/reagent_containers/cup/bowl + food_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/nutriment/protein = 6, + ) + tastes = list("noodles" = 5, "meat" = 3, "egg" = 4, "dried seaweed" = 2) + foodtypes = GRAIN | MEAT | VEGETABLES + +/obj/item/food/spaghetti/kitakata_ramen + name = "kitakata ramen" + desc = "A hearty ramen composed of meat, mushrooms, onion, and garlic. Often given to the sick to comfort them" + icon_state = "kitakata_ramen" + trash_type = /obj/item/reagent_containers/cup/bowl + food_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/nutriment/vitamin = 6, + /datum/reagent/consumable/nutriment/protein = 8, + ) + tastes = list("noodles" = 5, "meat" = 4, "mushrooms" = 3, "onion" = 2) + foodtypes = GRAIN | MEAT | VEGETABLES + +/obj/item/food/spaghetti/kitsune_udon + name = "kitsune udon" + desc = "A vegetarian udon made of fried tofu and onions, made sweet and savory with sugar and soy sauce. The name comes from an old folktale about a fox enjoying fried tofu." + icon_state = "kitsune_udon" + trash_type = /obj/item/reagent_containers/cup/bowl + food_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/vitamin = 10, + /datum/reagent/consumable/nutriment/protein = 4, + ) + tastes = list("noodles" = 5, "tofu" = 4, "sugar" = 3, "soy sauce" = 2) + foodtypes = GRAIN | VEGETABLES + +/obj/item/food/spaghetti/nikujaga + name = "nikujaga" + desc = "A delightful Japanese stew of noodles, onions, potatoes, and meat with mixed vegetables." + icon_state = "nikujaga" + trash_type = /obj/item/reagent_containers/cup/bowl + food_reagents = list( + /datum/reagent/consumable/nutriment = 16, + /datum/reagent/consumable/nutriment/vitamin = 12, + /datum/reagent/consumable/nutriment/protein = 8, + ) + tastes = list("noodles" = 5, "meat" = 4, "potato" = 3, "onion" = 2, "mixed veggies" = 2) + foodtypes = GRAIN | VEGETABLES | MEAT + +/obj/item/food/spaghetti/pho + name = "pho" + desc = "A Vietnamese dish made of noodles, vegetables, herbs, and meat. Makes for a very popular street food." + icon_state = "pho" + trash_type = /obj/item/reagent_containers/cup/bowl + food_reagents = list( + /datum/reagent/consumable/nutriment = 12, + /datum/reagent/consumable/nutriment/vitamin = 8, + /datum/reagent/consumable/nutriment/protein = 8, + ) + tastes = list("noodles" = 5, "meat" = 4, "cabbage" = 3, "onion" = 2, "herbs" = 2) + foodtypes = GRAIN | VEGETABLES | MEAT + +/obj/item/food/spaghetti/pad_thai + name = "pad thai" + desc = "A stir-fried noodle dish popular in Thailand made of peanuts, tofu, lime, and onions." + icon_state = "pad_thai" + trash_type = /obj/item/reagent_containers/cup/bowl + food_reagents = list( + /datum/reagent/consumable/nutriment = 15, + /datum/reagent/consumable/nutriment/vitamin = 10, + /datum/reagent/consumable/nutriment/protein = 4, + ) + tastes = list("noodles" = 5, "fried tofu" = 4, "lime" = 2, "peanut" = 3, "onion" = 2) + foodtypes = GRAIN | VEGETABLES | NUTS | FRUIT diff --git a/code/game/objects/items/food/vegetables.dm b/code/game/objects/items/food/vegetables.dm index f36f3f09a811..4c529befbd1b 100644 --- a/code/game/objects/items/food/vegetables.dm +++ b/code/game/objects/items/food/vegetables.dm @@ -153,3 +153,40 @@ /obj/item/food/poutine/Initialize(mapload) . = ..() AddElement(/datum/element/dunkable, 10) + +/obj/item/food/sauteed_eggplant + name = "sauteed eggplant" + desc = "Thick-cut slices of eggplant sauteed in oil and minced garlic, creating a soft, crispy, healthy snack." + icon_state = "sauteed_eggplant" + food_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 4, + ) + tastes = list("fried eggplant" = 4, "garlic" = 2, "olive oil" = 3) + foodtypes = VEGETABLES + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/baba_ghanoush + name = "baba ghanoush" + desc = "A thick dip made from mashed eggplant, olive oil, garlic, and lemon juice with some pita bread for dipping. You'll either love it or hate it." + icon_state = "baba_ghanoush" + trash_type = /obj/item/reagent_containers/cup/bowl + food_reagents = list( + /datum/reagent/consumable/nutriment = 8, + /datum/reagent/consumable/nutriment/vitamin = 6, + ) + tastes = list("mashed eggplant" = 5, "pita bread" = 4, "garlic" = 3, "olive oil" = 4, "lemon juice" = 2) + foodtypes = VEGETABLES | GRAIN + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/falafel + name = "falafel" + desc = "Beans, herbs, onions, and garlic mashed together and formed into a ball, then deep-fried. The herbs give the interior a unique green color." + icon_state = "falafel" + food_reagents = list( + /datum/reagent/consumable/nutriment = 6, + /datum/reagent/consumable/nutriment/vitamin = 2, + ) + tastes = list("fava beans" = 5, "garlic" = 3, "onion" = 2, "fresh herbs" = 4) + foodtypes = VEGETABLES + w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/granters/crafting/_crafting_granter.dm b/code/game/objects/items/granters/crafting/_crafting_granter.dm index a4d2b46877a6..8a4afb65dfbc 100644 --- a/code/game/objects/items/granters/crafting/_crafting_granter.dm +++ b/code/game/objects/items/granters/crafting/_crafting_granter.dm @@ -6,6 +6,7 @@ . = ..() if(!user.mind) return - for(var/datum/crafting_recipe/crafting_recipe_type as anything in crafting_recipe_types) + for(var/crafting_recipe_type in crafting_recipe_types) user.mind.teach_crafting_recipe(crafting_recipe_type) - to_chat(user, span_notice("You learned how to make [initial(crafting_recipe_type.name)].")) + var/datum/crafting_recipe/recipe = locate(crafting_recipe_type) in GLOB.crafting_recipes + to_chat(user, span_notice("You learned how to make [recipe.name].")) diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm index 469909030d2c..037a23d56d67 100644 --- a/code/modules/food_and_drinks/recipes/processor_recipes.dm +++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm @@ -97,6 +97,7 @@ /datum/food_processor_process/spidereggs input = /obj/item/food/spidereggs + blacklist = list(/obj/item/food/spidereggs/processed) output = /obj/item/food/spidereggs/processed /datum/food_processor_process/potato diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index fdcfba5174ab..90a9e82d9f90 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -572,7 +572,10 @@ drink_type = VEGETABLES | FRUIT // ?? /datum/chemical_reaction/food/soup/tomatosoup - required_reagents = list(/datum/reagent/water = 50) + required_reagents = list( + /datum/reagent/water = 50, + /datum/reagent/consumable/cream = 5 + ) required_ingredients = list( /obj/item/food/grown/tomato = 2, ) @@ -1126,7 +1129,7 @@ /obj/item/food/grown/onion = 2, /obj/item/food/grown/chili = 1, /obj/item/food/grown/garlic = 1, - /obj/item/food/butter = 1, + /obj/item/food/butterslice = 1, /obj/item/food/boiledrice = 1, ) results = list( @@ -1473,12 +1476,12 @@ /datum/chemical_reaction/food/soup/cheese required_reagents = list( /datum/reagent/water = 30, - /datum/reagent/consumable/flour = 10, /datum/reagent/consumable/milk = 10, ) required_ingredients = list( + /obj/item/food/doughslice = 2, /obj/item/food/cheese/wedge = 2, - /obj/item/food/butter = 1, + /obj/item/food/butterslice = 1, /obj/item/food/grown/potato/sweet = 1, ) results = list( @@ -1689,7 +1692,7 @@ required_ingredients = list( /obj/item/food/cheese/firm_cheese_slice = 1, /obj/item/food/cheese/curd_cheese = 1, - /obj/item/food/butter = 1, + /obj/item/food/butterslice = 1, ) results = list( /datum/reagent/consumable/nutriment/soup/cheese_porridge = 30, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm index 364904f448e4..e78efd293ffc 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -89,7 +89,7 @@ time = 40 reqs = list(/obj/item/food/grown/garlic = 1, /obj/item/food/breadslice/plain = 1, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/garlicbread category = CAT_BREAD @@ -98,7 +98,7 @@ name = "Butter Biscuit" reqs = list( /obj/item/food/bun = 1, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/butterbiscuit category = CAT_BREAD @@ -107,7 +107,7 @@ name = "Butterdog" reqs = list( /obj/item/food/bun = 1, - /obj/item/food/butter = 3, + /obj/item/food/butter = 1, ) result = /obj/item/food/butterdog category = CAT_BREAD @@ -127,7 +127,7 @@ reqs = list( /obj/item/food/doughslice = 1, /datum/reagent/consumable/salt = 1, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/raw_breadstick category = CAT_BREAD @@ -137,7 +137,7 @@ reqs = list( /obj/item/food/doughslice = 1, /datum/reagent/consumable/sugar = 1, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/raw_croissant category = CAT_BREAD @@ -189,7 +189,7 @@ name = "Buttered Toast" reqs = list( /obj/item/food/breadslice/plain = 1, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/butteredtoast category = CAT_BREAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index 16075d970cae..5ef95ca8ab64 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -200,15 +200,6 @@ category = CAT_BURGER /datum/crafting_recipe/food/spellburger - name = "Spell burger" - reqs = list( - /obj/item/clothing/head/wizard/fake = 1, - /obj/item/food/bun = 1 - ) - result = /obj/item/food/burger/spell - category = CAT_BURGER - -/datum/crafting_recipe/food/spellburger2 name = "Spell burger" reqs = list( /obj/item/clothing/head/wizard = 1, @@ -395,3 +386,14 @@ ) result = /obj/item/food/burger/crazy category = CAT_BURGER + +/datum/crafting_recipe/food/sloppy_moe + name = "Sloppy moe" + reqs = list( + /obj/item/food/bun = 1, + /obj/item/food/meat/cutlet = 2, + /obj/item/food/onion_slice = 1, + /datum/reagent/consumable/bbqsauce = 5, + ) + result = /obj/item/food/burger/sloppy_moe + category = CAT_BURGER diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index 37b7a00b7eb0..b70b3b9114c1 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -257,3 +257,13 @@ ) result = /obj/item/food/cake/wedding category = CAT_CAKE + +/datum/crafting_recipe/food/pineapple_cream_cake + name = "Pineapple cream cake" + reqs = list( + /obj/item/food/cake/plain = 1, + /obj/item/food/grown/pineapple = 1, + /datum/reagent/consumable/cream = 20, + ) + result = /obj/item/food/cake/pineapple_cream_cake + category = CAT_CAKE diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm index 5735e5946cae..707d199cba8f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm @@ -48,6 +48,7 @@ var/datum/chemical_reaction/chemical_reaction = new reaction() setup_chemical_reaction_details(chemical_reaction) qdel(chemical_reaction) + ..() /** * Sets up information for our recipe based on the chemical reaction we have set. @@ -270,6 +271,10 @@ result = /obj/item/food/pastrybase category = CAT_BREAD +/datum/crafting_recipe/food/knife/butterslice + reqs = list(/obj/item/food/butter = 1) + result = /obj/item/food/butterslice + /datum/crafting_recipe/food/knife/doughball reqs = list(/obj/item/food/doughslice = 1) result = /obj/item/food/bait/doughball @@ -552,7 +557,7 @@ result = /datum/reagent/consumable/flour /datum/crafting_recipe/food/grinder/butter - reqs = list(/datum/reagent/consumable/milk = 15) + reqs = list(/datum/reagent/consumable/milk = MILK_TO_BUTTER_COEFF) result = /obj/item/food/butter steps = list("Put into grinder and mix") @@ -645,10 +650,6 @@ reqs = list(/obj/item/food/tempehstarter = 1) result = /obj/item/food/tempeh -/datum/crafting_recipe/food/processor/yakiimo - reqs = list(/obj/item/food/grown/potato/sweet = 1) - result = /obj/item/food/yakiimo - /datum/crafting_recipe/food/processor/popsicle_stick reqs = list(/obj/item/grown/log = 1) result = /obj/item/popsicle_stick @@ -796,7 +797,7 @@ /datum/crafting_recipe/food/oven/yakiimo reqs = list(/obj/item/food/grown/potato/sweet = 1) result = /obj/item/food/yakiimo - category = CAT_SALAD + category = CAT_MISCFOOD /datum/crafting_recipe/food/oven/reispan reqs = list(/obj/item/food/rice_dough = 1) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm index ec5db9baf149..ccb0b975cb74 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm @@ -375,7 +375,7 @@ name = "Korta brittle slab" reqs = list( /obj/item/food/grown/korta_nut = 2, - /obj/item/food/butter = 1, + /obj/item/food/butterslice = 1, /datum/reagent/consumable/korta_nectar = 5, /datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/salt = 2 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm index 774c8ed5b464..b184347a38fc 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm @@ -188,7 +188,7 @@ name = "Martian fried noodles" reqs = list( /obj/item/food/spaghetti/boilednoodles = 1, - /obj/item/food/peanuts/salted = 1, + /obj/item/food/grown/peanut = 2, /obj/item/food/meat/cutlet = 1, /obj/item/food/onion_slice = 1, /obj/item/food/egg = 1, @@ -669,7 +669,7 @@ reqs = list( /obj/item/food/cake/plain = 1, /obj/item/food/grown/ambrosia/vulgaris = 1, - /obj/item/food/butter = 1, //monkestation edit: no butterslices yet, is intended to be 2 slices + /obj/item/food/butterslice = 2, ) result = /obj/item/food/cake/spekkoek category = CAT_MARTIAN @@ -700,7 +700,7 @@ name = "Boh loh yah" reqs = list( /obj/item/food/doughslice = 1, - /obj/item/food/butter = 1, //monkestation edit: no butterslices yet, is intended to be 1 slice + /obj/item/food/butterslice = 1, /datum/reagent/consumable/sugar = 5, ) result = /obj/item/food/boh_loh_yah diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index 7997e3c67c62..fcb25b39ba8d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -145,7 +145,7 @@ name = "Pig in a Blanket" reqs = list( /obj/item/food/bun = 1, - /obj/item/food/butter = 1, + /obj/item/food/butterslice = 1, /obj/item/food/meat/cutlet = 1 ) result = /obj/item/food/pigblanket @@ -295,3 +295,24 @@ ) result = /obj/item/food/raw_meatloaf category = CAT_MEAT + +/datum/crafting_recipe/food/sweet_and_sour_meatballs + name = "Sweet and sour meatballs" + reqs = list( + /obj/item/food/meatball = 3, + /obj/item/food/pineappleslice = 1, + /obj/item/food/grown/bell_pepper = 1, + /datum/reagent/consumable/sugar = 5, + ) + result = /obj/item/food/sweet_and_sour_meatballs + category = CAT_MEAT + +/datum/crafting_recipe/food/pineapple_skewer + name = "Pineapple skewer" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/food/pineappleslice = 2, + /obj/item/food/meat/cutlet = 2, + ) + result = /obj/item/food/kebab/pineapple_skewer + category = CAT_MEAT diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm index 267cdea69b32..8778ee976ef2 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm @@ -190,3 +190,14 @@ ) result = /obj/item/food/spanish_rice category = CAT_MEXICAN + +/datum/crafting_recipe/food/pineapple_salsa + name = "Pineapple salsa" + reqs = list( + /obj/item/food/pineappleslice = 2, + /obj/item/food/grown/tomato = 1, + /obj/item/food/grown/onion = 1, + /obj/item/food/grown/chili = 1, + ) + result = /obj/item/food/pineapple_salsa + category = CAT_MEXICAN diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index c7807653fc54..bda81c6be73e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -156,7 +156,7 @@ reqs = list( /obj/item/organ/internal/brain = 1, /obj/item/organ/internal/heart = 1, - /obj/item/food/butter = 10, + /obj/item/food/butter = 4, /obj/item/food/meat/slab = 5, /datum/reagent/blood = 50, /datum/reagent/teslium = 1 //To shock the whole thing into life @@ -225,7 +225,7 @@ reqs = list( /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/flour = 5, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/bechamel_sauce category = CAT_MISCFOOD @@ -276,7 +276,7 @@ reqs = list( /obj/item/food/grown/potato = 2, /obj/item/food/grown/garlic = 1, - /obj/item/food/butter = 1, + /obj/item/food/butterslice = 1, ) result = /obj/item/food/mashed_potatoes category = CAT_MISCFOOD @@ -345,7 +345,7 @@ name = "Buttered baked potato" reqs = list( /obj/item/food/baked_potato = 1, - /obj/item/food/butter = 1, + /obj/item/food/butterslice = 1, ) result = /obj/item/food/buttered_baked_potato category = CAT_MISCFOOD @@ -427,3 +427,128 @@ result = /obj/item/storage/fancy/pickles_jar category = CAT_MISCFOOD delete_contents = FALSE + +/datum/crafting_recipe/food/sauteed_eggplant + name = "Sauteed eggplant" + reqs = list( + /obj/item/food/grown/eggplant = 1, + /obj/item/food/grown/garlic = 1, + /datum/reagent/consumable/quality_oil = 3, + ) + result = /obj/item/food/sauteed_eggplant + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/stuffed_eggplant + name = "Stuffed eggplant" + reqs = list( + /obj/item/food/grown/eggplant = 1, + /obj/item/food/grown/garlic = 1, + /obj/item/food/grown/cabbage = 1, + /obj/item/food/cheese/wedge = 1, + /obj/item/food/meat/cutlet = 1, + ) + result = /obj/item/food/stuffed_eggplant + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/baba_ghanoush + name = "Baba ghanoush" + reqs = list( + /obj/item/reagent_containers/cup/bowl = 1, + /obj/item/food/pita_bread = 1, + /obj/item/food/grown/eggplant = 1, + /obj/item/food/grown/garlic = 1, + /datum/reagent/consumable/quality_oil = 5, + /datum/reagent/consumable/lemonjuice = 3, + ) + result = /obj/item/food/baba_ghanoush + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/moussaka + name = "Moussaka" + reqs = list( + /obj/item/food/grown/eggplant = 2, + /obj/item/food/grown/garlic = 1, + /obj/item/food/grown/onion = 1, + /obj/item/food/meat/cutlet = 1, + /obj/item/food/bechamel_sauce = 1, + ) + result = /obj/item/food/moussaka + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/falafel + name = "Falafel" + reqs = list( + /obj/item/food/grown/soybeans = 1, + /obj/item/food/grown/garlic = 1, + /obj/item/food/grown/onion = 1, + /obj/item/food/grown/herbs = 1, + ) + result = /obj/item/food/falafel + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/candied_pineapple + name = "Candied pineapple" + reqs = list( + /obj/item/food/pineappleslice = 1, + /datum/reagent/consumable/sugar = 2, + /datum/reagent/water = 2, + ) + result = /obj/item/food/candied_pineapple + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/tzatziki_sauce + name = "Tzatziki sauce" + reqs = list( + /obj/item/food/grown/cucumber = 1, + /datum/reagent/consumable/quality_oil = 2, + /obj/item/food/grown/garlic = 1, + /datum/reagent/consumable/salt = 1, + ) + result = /obj/item/food/tzatziki_sauce + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/tzatziki_and_pita_bread + name = "Tzatziki and pita bread" + reqs = list( + /obj/item/food/tzatziki_sauce = 1, + /obj/item/food/pita_bread = 1, + ) + result = /obj/item/food/tzatziki_and_pita_bread + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/grilled_beef_gyro + name = "Grilled beef gyro" + reqs = list( + /obj/item/food/tzatziki_sauce = 1, + /obj/item/food/pita_bread = 1, + /obj/item/food/meat/cutlet = 2, + /obj/item/food/grown/cabbage = 1, + /obj/item/food/grown/tomato = 1, + /obj/item/food/grown/onion = 1, + ) + result = /obj/item/food/grilled_beef_gyro + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/vegetarian_gyro + name = "Vegetarian gyro" + reqs = list( + /obj/item/food/tzatziki_sauce = 1, + /obj/item/food/pita_bread = 1, + /obj/item/food/grown/cucumber = 1, + /obj/item/food/grown/cabbage = 1, + /obj/item/food/grown/tomato = 1, + /obj/item/food/grown/onion = 1, + ) + result = /obj/item/food/vegetarian_gyro + category = CAT_MISCFOOD + +/datum/crafting_recipe/food/raw_pita_bread + name = "Raw pita bread" + reqs = list( + /datum/reagent/consumable/flour = 10, + /datum/reagent/water = 5, + /datum/reagent/consumable/quality_oil = 2, + /datum/reagent/consumable/sugar = 2, + ) + result = /obj/item/food/raw_pita_bread + category = CAT_MISCFOOD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm index fadfe23a87e2..880b51a3909b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm @@ -112,7 +112,7 @@ name = "Buttered baked corn" reqs = list( /obj/item/food/oven_baked_corn = 1, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/buttered_baked_corn category = CAT_MOTH @@ -317,7 +317,7 @@ /datum/crafting_recipe/food/raw_mothic_garlic reqs = list( /obj/item/food/mothic_pizza_dough = 1, - /obj/item/food/butter = 1, + /obj/item/food/butterslice = 1, /obj/item/food/grown/garlic = 1, /obj/item/food/grown/herbs = 1 ) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index ecc38887db4b..3ce319b1985a 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -603,7 +603,7 @@ /datum/reagent/consumable/sugar = 5, /obj/item/food/egg = 2, /datum/reagent/consumable/coco = 5, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/raw_brownie_batter category = CAT_PASTRY @@ -616,7 +616,7 @@ /obj/item/food/egg = 2, /datum/reagent/consumable/coco = 5, /datum/reagent/consumable/peanut_butter = 5, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/peanut_butter_brownie_batter category = CAT_PASTRY @@ -631,3 +631,40 @@ ) result = /obj/item/food/crunchy_peanut_butter_tart category = CAT_PASTRY + +/datum/crafting_recipe/food/chocolate_chip_cookie + name = "Chocolate chip cookie" + reqs = list( + /obj/item/food/pastrybase = 1, + /obj/item/food/chocolatebar = 1, + ) + result = /obj/item/food/cookie/chocolate_chip_cookie + category = CAT_PASTRY + +/datum/crafting_recipe/food/snickerdoodle + name = "Snickerdoodle" + reqs = list( + /obj/item/food/pastrybase = 1, + /datum/reagent/consumable/vanilla = 5, + ) + result = /obj/item/food/cookie/snickerdoodle + category = CAT_PASTRY + +/datum/crafting_recipe/food/thumbprint_cookie + name = "Thumbprint cookie" + reqs = list( + /obj/item/food/pastrybase = 1, + /datum/reagent/consumable/cherryjelly = 5, + ) + result = /obj/item/food/cookie/thumbprint_cookie + category = CAT_PASTRY + +/datum/crafting_recipe/food/macaron + name = "Macaron" + reqs = list( + /datum/reagent/consumable/eggwhite = 2, + /datum/reagent/consumable/cream = 5, + /datum/reagent/consumable/flour = 5, + ) + result = /obj/item/food/cookie/macaron + category = CAT_PASTRY diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm index 1cfc38948a3a..93851558cffe 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm @@ -200,7 +200,7 @@ /datum/crafting_recipe/food/baklava name = "Baklava pie" reqs = list( - /obj/item/food/butter = 2, + /obj/item/food/butterslice = 2, /obj/item/food/tortilla = 4, //Layers /obj/item/seeds/wheat/oat = 4 ) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm index 0e56a3e1d561..60c7de2e3333 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm @@ -121,3 +121,27 @@ ) result = /obj/item/food/fish_poke category = CAT_SEAFOOD + +/datum/crafting_recipe/food/futomaki_sushi_roll + name ="Futomaki sushi roll" + reqs = list( + /obj/item/food/seaweedsheet = 1, + /obj/item/food/boiledrice = 1, + /obj/item/food/boiledegg = 1, + /obj/item/food/fishmeat = 1, + /obj/item/food/grown/cucumber = 1, + ) + result = /obj/item/food/futomaki_sushi_roll + category = CAT_SEAFOOD + +/datum/crafting_recipe/food/philadelphia_sushi_roll + name ="Philadelphia sushi roll" + reqs = list( + /obj/item/food/seaweedsheet = 1, + /obj/item/food/boiledrice = 1, + /obj/item/food/cheese/wedge = 1, + /obj/item/food/fishmeat = 1, + /obj/item/food/grown/cucumber = 1, + ) + result = /obj/item/food/philadelphia_sushi_roll + category = CAT_SEAFOOD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm index 297f761bab32..589235eacb70 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm @@ -64,7 +64,7 @@ name = "Butter Noodles" reqs = list( /obj/item/food/spaghetti/boiledspaghetti = 1, - /obj/item/food/butter = 1 + /obj/item/food/butterslice = 1 ) result = /obj/item/food/spaghetti/butternoodles category = CAT_SPAGHETTI @@ -80,3 +80,80 @@ ) result = /obj/item/food/spaghetti/mac_n_cheese category = CAT_SPAGHETTI + +/datum/crafting_recipe/food/shoyu_tonkotsu_ramen + name = "Shoyu Tonkotsu ramen" + reqs = list( + /obj/item/reagent_containers/cup/bowl = 1, + /obj/item/food/spaghetti/boiledspaghetti = 1, + /obj/item/food/boiledegg = 1, + /obj/item/food/seaweedsheet = 1, + /obj/item/food/meat/cutlet = 1, + /obj/item/food/grown/onion = 1, + ) + result = /obj/item/food/spaghetti/shoyu_tonkotsu_ramen + category = CAT_SPAGHETTI + +/datum/crafting_recipe/food/kitakata_ramen + name = "Kitakata ramen" + reqs = list( + /obj/item/reagent_containers/cup/bowl = 1, + /obj/item/food/spaghetti/boiledspaghetti = 1, + /obj/item/food/meat/cutlet = 2, + /obj/item/food/grown/onion = 1, + /obj/item/food/grown/mushroom/chanterelle = 1, + /obj/item/food/grown/garlic = 1, + ) + result = /obj/item/food/spaghetti/kitakata_ramen + category = CAT_SPAGHETTI + +/datum/crafting_recipe/food/kitsune_udon + name = "Kitsune udon" + reqs = list( + /obj/item/reagent_containers/cup/bowl = 1, + /obj/item/food/spaghetti/boiledspaghetti = 1, + /obj/item/food/tofu = 2, + /obj/item/food/grown/onion = 1, + /datum/reagent/consumable/soysauce = 5, + /datum/reagent/consumable/sugar = 5, + ) + result = /obj/item/food/spaghetti/kitsune_udon + category = CAT_SPAGHETTI + +/datum/crafting_recipe/food/nikujaga + name = "Nikujaga" + reqs = list( + /obj/item/reagent_containers/cup/bowl = 1, + /obj/item/food/spaghetti/boiledspaghetti = 1, + /obj/item/food/meat/cutlet = 2, + /obj/item/food/grown/potato = 1, + /obj/item/food/grown/carrot = 1, + /obj/item/food/grown/peas = 1, + ) + result = /obj/item/food/spaghetti/nikujaga + category = CAT_SPAGHETTI + +/datum/crafting_recipe/food/pho + name = "Pho" + reqs = list( + /obj/item/reagent_containers/cup/bowl = 1, + /obj/item/food/spaghetti/boiledspaghetti = 1, + /obj/item/food/meat/cutlet = 1, + /obj/item/food/grown/onion = 1, + /obj/item/food/grown/cabbage = 1, + ) + result = /obj/item/food/spaghetti/pho + category = CAT_SPAGHETTI + +/datum/crafting_recipe/food/pad_thai + name = "Pad thai" + reqs = list( + /obj/item/reagent_containers/cup/bowl = 1, + /obj/item/food/spaghetti/boiledspaghetti = 1, + /obj/item/food/tofu = 1, + /obj/item/food/grown/onion = 1, + /obj/item/food/grown/peanut = 1, + /obj/item/food/grown/citrus/lime = 1, + ) + result = /obj/item/food/spaghetti/pad_thai + category = CAT_SPAGHETTI diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index f72c548396a8..2434c0da6a8b 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -1,4 +1,3 @@ -#define MILK_TO_BUTTER_COEFF 15 /obj/machinery/reagentgrinder name = "\improper All-In-One Grinder" @@ -362,5 +361,3 @@ var/amount = beaker.reagents.get_reagent_amount(/datum/reagent/consumable/cream) beaker.reagents.remove_reagent(/datum/reagent/consumable/cream, amount) beaker.reagents.add_reagent(/datum/reagent/consumable/whipped_cream, amount) - -#undef MILK_TO_BUTTER_COEFF diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi index a49423ba87cf..9faca25854e2 100644 Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 4eabc5e0ab4d..9b7b0d11855b 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/food_ingredients.dmi b/icons/obj/food/food_ingredients.dmi index 30825da02431..e0799ed71088 100644 Binary files a/icons/obj/food/food_ingredients.dmi and b/icons/obj/food/food_ingredients.dmi differ diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi index b010ced4ead9..dec295bcbf0b 100644 Binary files a/icons/obj/food/meat.dmi and b/icons/obj/food/meat.dmi differ diff --git a/icons/obj/food/mexican.dmi b/icons/obj/food/mexican.dmi index 44bcc5f2e7ba..ba02c15a0b57 100644 Binary files a/icons/obj/food/mexican.dmi and b/icons/obj/food/mexican.dmi differ diff --git a/icons/obj/food/piecake.dmi b/icons/obj/food/piecake.dmi index 36adf23eb821..1fc5c954bb51 100644 Binary files a/icons/obj/food/piecake.dmi and b/icons/obj/food/piecake.dmi differ diff --git a/icons/obj/food/spaghetti.dmi b/icons/obj/food/spaghetti.dmi index 23b50af2a8d4..1c97a45e7b78 100644 Binary files a/icons/obj/food/spaghetti.dmi and b/icons/obj/food/spaghetti.dmi differ