diff --git a/code/datums/supplypacks/galley.dm b/code/datums/supplypacks/galley.dm index a83cd61d6de..a4d2bc5407a 100644 --- a/code/datums/supplypacks/galley.dm +++ b/code/datums/supplypacks/galley.dm @@ -4,8 +4,11 @@ /decl/hierarchy/supply_pack/galley/food name = "General - Kitchen supplies" contains = list(/obj/item/chems/condiment/flour = 6, + /obj/item/chems/condiment/yeast = 1, /obj/item/chems/drinks/milk = 4, /obj/item/chems/drinks/soymilk = 2, + /obj/item/food/dairy/butter/stick = 2, + /obj/item/food/dairy/butter/stick/margarine = 2, /obj/item/box/fancy/egg_box = 2, /obj/item/food/tofu = 4, /obj/item/food/butchery/meat = 4, @@ -50,8 +53,11 @@ containername = "egg crate" /decl/hierarchy/supply_pack/galley/milk - name = "Perishables - Milk" - contains = list(/obj/item/chems/drinks/milk = 3) + name = "Perishables - Dairy" + contains = list( + /obj/item/chems/drinks/milk = 3, + /obj/item/food/dairy/butter/stick = 2 + ) containertype = /obj/structure/closet/crate/freezer containername = "milk crate" @@ -143,3 +149,18 @@ ) containertype = /obj/structure/largecrate containername = "soda dispenser crate" + + +/decl/hierarchy/supply_pack/galley/flour + name = "Non-perishables - Flour" + contains = list( + /obj/item/chems/condiment/flour = 3 + ) + containername = "yeast crate" + +/decl/hierarchy/supply_pack/galley/yeast + name = "Non-perishables - Yeast" + contains = list( + /obj/item/chems/condiment/yeast = 3 + ) + containername = "yeast crate" diff --git a/code/datums/trading/traders/food.dm b/code/datums/trading/traders/food.dm index 9da8de14c9a..148940297ac 100644 --- a/code/datums/trading/traders/food.dm +++ b/code/datums/trading/traders/food.dm @@ -187,6 +187,9 @@ /obj/item/food/sliceable = TRADER_SUBTYPES_ONLY, /obj/item/food/sliceable/pizza = TRADER_BLACKLIST_ALL, /obj/item/food/sliceable/xenomeatbread = TRADER_BLACKLIST, + /obj/item/food/piecrust = TRADER_BLACKLIST, + /obj/item/food/unleaveneddough = TRADER_BLACKLIST, + /obj/item/food/dough = TRADER_BLACKLIST, /obj/item/food/sliceable/flatdough = TRADER_BLACKLIST, /obj/item/food/sliceable/braincake = TRADER_BLACKLIST, /obj/item/food/pie = TRADER_THIS_TYPE, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 04af062f6ec..5dc98f40fb3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -6,6 +6,7 @@ return list( /obj/item/chems/condiment/large/salt = 1, /obj/item/chems/condiment/flour = 7, + /obj/item/chems/condiment/yeast = 1, /obj/item/chems/condiment/sugar = 2 ) @@ -32,6 +33,8 @@ return list( /obj/item/chems/drinks/milk = 6, /obj/item/chems/drinks/soymilk = 4, + /obj/item/food/dairy/butter/stick = 2, + /obj/item/food/dairy/butter/stick/margarine = 2, /obj/item/box/fancy/egg_box = 4 ) diff --git a/code/modules/food/assembled.dm b/code/modules/food/assembled.dm index d417823a07d..aa026d89cb4 100644 --- a/code/modules/food/assembled.dm +++ b/code/modules/food/assembled.dm @@ -211,14 +211,14 @@ ) return combined_food_products -/obj/item/food/sliceable/flatdough/get_combined_food_products() +/obj/item/food/sliceable/piecrust/get_combined_food_products() var/static/list/combined_food_products = list( /obj/item/food/butchery/cutlet = /obj/item/food/meatpie/raw, - /obj/item/food/tofu = /obj/item/food/tofupie/raw, - /obj/item/food/xenomeat = /obj/item/food/xemeatpie/raw, - "apple" = /obj/item/food/applepie/raw, - "berries" = /obj/item/food/berryclafoutis/raw, - "plumphelmet" = /obj/item/food/plump_pie/raw + /obj/item/food/tofu = /obj/item/food/tofupie/raw, + /obj/item/food/xenomeat = /obj/item/food/xemeatpie/raw, + "apple" = /obj/item/food/applepie/raw, + "berries" = /obj/item/food/berryclafoutis/raw, + "plumphelmet" = /obj/item/food/plump_pie/raw ) return combined_food_products diff --git a/code/modules/food/cooking/recipes/recipe_baked.dm b/code/modules/food/cooking/recipes/recipe_baked.dm index ad1cd0eb6ab..48cddc3a499 100644 --- a/code/modules/food/cooking/recipes/recipe_baked.dm +++ b/code/modules/food/cooking/recipes/recipe_baked.dm @@ -41,27 +41,27 @@ /decl/recipe/baked/amanita_pie reagents = list(/decl/material/liquid/amatoxin = 5) - items = list(/obj/item/food/sliceable/flatdough) + items = list(/obj/item/food/unleaveneddough) result = /obj/item/food/amanita_pie /decl/recipe/baked/pumpkinpie fruit = list("pumpkin" = 1) reagents = list(/decl/material/liquid/nutriment/sugar = 5) - items = list(/obj/item/food/sliceable/flatdough) + items = list(/obj/item/food/unleaveneddough) reagent_mix = REAGENT_REPLACE // no raw flour result = /obj/item/food/sliceable/pumpkinpie /decl/recipe/baked/bananapie fruit = list("banana" = 1) reagents = list(/decl/material/liquid/nutriment/sugar = 5) - items = list(/obj/item/food/sliceable/flatdough) + items = list(/obj/item/food/unleaveneddough) result = /obj/item/food/bananapie /decl/recipe/baked/cherrypie fruit = list("cherries" = 1) reagents = list(/decl/material/liquid/nutriment/sugar = 10) items = list( - /obj/item/food/sliceable/flatdough, + /obj/item/food/unleaveneddough, ) result = /obj/item/food/cherrypie @@ -207,10 +207,9 @@ /decl/recipe/baked/bread display_name = "loaf of bread" items = list( - /obj/item/food/dough = 2, - /obj/item/food/egg + /obj/item/food/dough = 2 ) - reagent_mix = REAGENT_REPLACE // no raw egg/flour + reagent_mix = REAGENT_REPLACE // no raw dough result = /obj/item/food/sliceable/bread /decl/recipe/baked/jelliedtoast @@ -242,7 +241,7 @@ /decl/recipe/baked/appletart fruit = list("goldapple" = 1) - items = list(/obj/item/food/sliceable/flatdough) + items = list(/obj/item/food/piecrust) reagent_mix = REAGENT_REPLACE // no raw flour result = /obj/item/food/appletart @@ -269,7 +268,7 @@ /decl/recipe/baked/flatbread items = list( - /obj/item/food/sliceable/flatdough + /obj/item/food/unleaveneddough ) result = /obj/item/food/flatbread diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm index d10e4597e8a..d517a217017 100644 --- a/code/modules/random_map/drop/drop_types.dm +++ b/code/modules/random_map/drop/drop_types.dm @@ -92,11 +92,13 @@ var/global/list/datum/supply_drop_loot/supply_drop /datum/supply_drop_loot/food/New() ..() contents = list( + /obj/item/chems/condiment/yeast, /obj/item/chems/condiment/flour, /obj/item/chems/condiment/flour, /obj/item/chems/condiment/flour, /obj/item/chems/drinks/milk, /obj/item/chems/drinks/milk, + /obj/item/food/dairy/butter/stick, /obj/item/box/fancy/egg_box, /obj/item/food/tofu, /obj/item/food/tofu, diff --git a/code/modules/reagents/reactions/reaction_recipe_food.dm b/code/modules/reagents/reactions/reaction_recipe_food.dm index c46c8001689..469c67b5cde 100644 --- a/code/modules/reagents/reactions/reaction_recipe_food.dm +++ b/code/modules/reagents/reactions/reaction_recipe_food.dm @@ -93,21 +93,51 @@ mix_message = "The flour thickens the processed meat until it clumps." obj_result = /obj/item/food/meatball/raw +/decl/chemical_reaction/recipe/food/piecrust + name = "Butter Pie Crust" + required_reagents = list( + /decl/material/liquid/nutriment/sugar = 1, + /decl/material/solid/sodiumchloride = 1, + /decl/material/liquid/nutriment/flour = 10, + /decl/material/liquid/water = 5, + /decl/material/liquid/nutriment/butter = 1 + ) + mix_message = "The solution smooths out into a pie crust." + obj_result = /obj/item/food/piecrust + // Trying to get the chemical recipe overlaps with dough sorted out. + maximum_temperature = 60 CELSIUS + +/decl/chemical_reaction/recipe/food/piecrust/margarine + name = "Shortening Pie Crust" + required_reagents = list( + /decl/material/liquid/nutriment/sugar = 1, + /decl/material/solid/sodiumchloride = 1, + /decl/material/liquid/nutriment/flour = 10, + /decl/material/liquid/water = 5, + /decl/material/liquid/nutriment/margarine = 1 + ) + /decl/chemical_reaction/recipe/food/dough - name = "Plain dough" + name = "Dough (Leavened)" required_reagents = list( - /decl/material/solid/organic/meat/egg = 3, + /decl/material/liquid/nutriment/yeast = 1, /decl/material/liquid/nutriment/flour = 10, /decl/material/liquid/water = 10 ) - mix_message = "The solution folds and thickens into a large ball of dough." + mix_message = "The solution rises into a large ball of leavened dough." obj_result = /obj/item/food/dough + minimum_temperature = 60 CELSIUS -/decl/chemical_reaction/recipe/food/soydough - name = "Soy dough" - required_reagents = list(/decl/material/liquid/nutriment/plant_protein = 3, /decl/material/liquid/nutriment/flour = 10, /decl/material/liquid/water = 10) - mix_message = "The solution folds and thickens into a large ball of dough." - obj_result = /obj/item/food/dough +/decl/chemical_reaction/recipe/food/dough/unleavened + name = "Dough (Unleavened)" + required_reagents = list( + /decl/material/solid/sodiumchloride = 1, + /decl/material/liquid/nutriment/flour = 10, + /decl/material/liquid/water = 10 + ) + mix_message = "The solution swells into a round of unleavened dough." + obj_result = /obj/item/food/unleaveneddough + inhibitors = list(/decl/material/liquid/nutriment/yeast) /decl/chemical_reaction/recipe/food/syntiflesh name = "Synthetic Meat" diff --git a/code/modules/reagents/reagent_containers/food/bread.dm b/code/modules/reagents/reagent_containers/food/bread.dm index 7214ecd1a9d..8692588139a 100644 --- a/code/modules/reagents/reagent_containers/food/bread.dm +++ b/code/modules/reagents/reagent_containers/food/bread.dm @@ -131,4 +131,4 @@ center_of_mass = @'{"x":16,"y":16}' nutriment_desc = list("bread" = 3) nutriment_amt = 3 - nutriment_type = /decl/material/liquid/nutriment/bread \ No newline at end of file + nutriment_type = /decl/material/liquid/nutriment/bread diff --git a/code/modules/reagents/reagent_containers/food/dough.dm b/code/modules/reagents/reagent_containers/food/dough.dm index 4179bb07eaa..feac2e9bbec 100644 --- a/code/modules/reagents/reagent_containers/food/dough.dm +++ b/code/modules/reagents/reagent_containers/food/dough.dm @@ -19,24 +19,42 @@ to_chat(user, "You flatten the dough.") qdel(src) +/obj/item/food/unleaveneddough + name = "flat unleavened dough" + desc = "A flattened lump of dough, made without yeast." + icon = 'icons/obj/food_ingredients.dmi' + icon_state = "flat dough" + center_of_mass = @'{"x":16,"y":16}' + backyard_grilling_product = /obj/item/food/flatbread + backyard_grilling_announcement = "is baked into a simple flatbread." + nutriment_amt = 4 + nutriment_desc = "raw dough" + +/obj/item/food/piecrust + name = "pie crust" + desc = "A dense, buttery pie crust, ready for filling." + icon = 'icons/obj/food_ingredients.dmi' + icon_state = "flat dough" + center_of_mass = @'{"x":16,"y":16}' + nutriment_amt = 4 + nutriment_desc = "raw pie crust" + // slicable into 3x doughslices /obj/item/food/sliceable/flatdough - name = "flat dough" - desc = "A flattened dough." + name = "flat leavened dough" + desc = "A flattened lump of dough, made with yeast." icon = 'icons/obj/food_ingredients.dmi' icon_state = "flat dough" slice_path = /obj/item/food/doughslice slice_num = 3 center_of_mass = @'{"x":16,"y":16}' utensil_flags = UTENSIL_FLAG_COLLECT | UTENSIL_FLAG_SLICE + nutriment_amt = 4 + nutriment_desc = "raw dough" + // TODO: pizza base with no toppings? Some other round leavened bread product? backyard_grilling_product = /obj/item/food/flatbread backyard_grilling_announcement = "is baked into a simple flatbread." -/obj/item/food/sliceable/flatdough/populate_reagents() - . = ..() - add_to_reagents(/decl/material/solid/organic/meat, 1) - add_to_reagents(/decl/material/liquid/nutriment, 3) - /obj/item/food/doughslice name = "dough slice" desc = "A building block of an impressive dish." diff --git a/code/modules/reagents/reagent_containers/food/sliceable/loaves.dm b/code/modules/reagents/reagent_containers/food/sliceable/loaves.dm index 3b5b09f5d90..8a033bca73b 100644 --- a/code/modules/reagents/reagent_containers/food/sliceable/loaves.dm +++ b/code/modules/reagents/reagent_containers/food/sliceable/loaves.dm @@ -136,6 +136,7 @@ bitesize = 2 center_of_mass = @'{"x":16,"y":4}' whole_path = /obj/item/food/sliceable/bread + nutriment_type = /decl/material/liquid/nutriment/bread /obj/item/food/slice/bread/filled filled = TRUE diff --git a/maps/away/casino/casino.dmm b/maps/away/casino/casino.dmm index 5469eb5157d..5ba01268413 100644 --- a/maps/away/casino/casino.dmm +++ b/maps/away/casino/casino.dmm @@ -2821,6 +2821,7 @@ /obj/item/box/fancy/egg_box, /obj/item/box/fancy/egg_box, /obj/item/chems/condiment/flour, +/obj/item/chems/condiment/yeast, /obj/item/chems/condiment/sugar, /turf/floor/tiled, /area/casino/casino_kitchen) @@ -2836,6 +2837,7 @@ "in" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/chems/condiment/flour, +/obj/item/chems/condiment/yeast, /turf/floor/tiled, /area/casino/casino_kitchen) "io" = ( diff --git a/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm b/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm index 0d6bf2a30fd..68c3b87c18e 100644 --- a/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm +++ b/maps/random_ruins/exoplanet_ruins/crashed_pod/crashed_pod.dmm @@ -958,6 +958,7 @@ /obj/item/chems/condiment/enzyme, /obj/item/chems/drinks/milk, /obj/item/chems/drinks/milk, +/obj/item/food/dairy/butter/stick, /obj/item/trash/liquidfood, /obj/item/trash/liquidfood, /obj/item/beartrap, diff --git a/maps/shaded_hills/shaded_hills-inn.dmm b/maps/shaded_hills/shaded_hills-inn.dmm index de8567244ab..95801654156 100644 --- a/maps/shaded_hills/shaded_hills-inn.dmm +++ b/maps/shaded_hills/shaded_hills-inn.dmm @@ -1070,6 +1070,7 @@ "Gu" = ( /obj/structure/table/marble, /obj/item/chems/condiment/flour, +/obj/item/chems/condiment/yeast, /obj/item/chems/condiment/sugar, /obj/item/chems/condiment/large/salt, /obj/abstract/landmark/organize/horizontal, diff --git a/maps/tradeship/tradeship-2.dmm b/maps/tradeship/tradeship-2.dmm index dfc44411c1e..e1e4e005b2e 100644 --- a/maps/tradeship/tradeship-2.dmm +++ b/maps/tradeship/tradeship-2.dmm @@ -640,6 +640,7 @@ /obj/item/chems/condiment/flour, /obj/item/chems/condiment/flour, /obj/item/chems/condiment/flour, +/obj/item/chems/condiment/yeast, /turf/floor/tiled, /area/ship/trade/crew/kitchen) "bm" = ( diff --git a/mods/content/corporate/away_sites/lar_maria/lar_maria-2.dmm b/mods/content/corporate/away_sites/lar_maria/lar_maria-2.dmm index e94323e0847..cc042aa3f94 100644 --- a/mods/content/corporate/away_sites/lar_maria/lar_maria-2.dmm +++ b/mods/content/corporate/away_sites/lar_maria/lar_maria-2.dmm @@ -2612,6 +2612,7 @@ /obj/structure/table/marble, /obj/machinery/door/firedoor, /obj/item/chems/condiment/flour, +/obj/item/chems/condiment/yeast, /obj/item/box/fancy/egg_box, /turf/floor/tiled/white, /area/lar_maria/mess_hall) diff --git a/mods/content/government/away_sites/icarus/icarus-1.dmm b/mods/content/government/away_sites/icarus/icarus-1.dmm index 6aeeeab0b1f..c8e7884a12b 100644 --- a/mods/content/government/away_sites/icarus/icarus-1.dmm +++ b/mods/content/government/away_sites/icarus/icarus-1.dmm @@ -559,6 +559,7 @@ dir = 4 }, /obj/item/chems/condiment/flour, +/obj/item/chems/condiment/yeast, /turf/floor/tiled, /area/icarus/vessel) "ce" = (