From 7c703fc7122e2b5808b66987548280ea87cb4d94 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Thu, 13 Mar 2025 20:06:35 +0100 Subject: [PATCH] Food types are now passed down when cooking from recipes. (#89706) ## About The Pull Request ~~I have some beef with the cooking system.~~ Cooking recipes are coded in a way that disregard the possibility for their components to have different foodtype flags than the ones you would find normally find. For example, if I wanted to make corned beef, but instead of a standard steak, I used a killer tomato "steak", the result would still have the meat food type, even if none of the components has it. I've had to resort to a few hacky lines of code to manipulate the food types from the edible component, but that can be easily fixed if #89687 is merged. ## Why It's Good For The Game This also makes cooking recipes less strict about their food types and can help us spot inconsistencies with recipes. ## Changelog :cl: qol: Food types are now passed down when cooking from recipes. For example, a plate of corned "beef" made from giant killer tomato slabs no longer counts as meat but only vegetables now. fix: Fixed a metric ton of inconsistencies with food types and recipes. fix: Dank-pockets (the weed variant) can now be microwaved. /:cl: --- .../icemoon_underground_syndielab.dmm | 5 +- .../SpaceRuins/hauntedtradingpost.dmm | 6 +- code/game/objects/items/food/_food.dm | 16 +++ code/game/objects/items/food/bread.dm | 32 +++--- code/game/objects/items/food/burgers.dm | 30 +++--- code/game/objects/items/food/cake.dm | 22 ++--- code/game/objects/items/food/cheese.dm | 5 - code/game/objects/items/food/donkpocket.dm | 98 ++++++++++++++----- code/game/objects/items/food/donuts.dm | 16 ++- code/game/objects/items/food/egg.dm | 4 +- code/game/objects/items/food/frozen.dm | 10 +- code/game/objects/items/food/lizard.dm | 90 ++++++++++++----- code/game/objects/items/food/martian.dm | 81 +++++++-------- code/game/objects/items/food/meatdish.dm | 46 ++++----- code/game/objects/items/food/meatslab.dm | 5 +- code/game/objects/items/food/mexican.dm | 20 ++-- code/game/objects/items/food/misc.dm | 18 ++-- code/game/objects/items/food/moth.dm | 26 ++--- code/game/objects/items/food/pastries.dm | 57 ++++++----- code/game/objects/items/food/pie.dm | 65 ++++++------ code/game/objects/items/food/pizza.dm | 25 ++--- code/game/objects/items/food/salad.dm | 16 +-- code/game/objects/items/food/sandwichtoast.dm | 8 +- code/game/objects/items/food/snacks.dm | 2 +- code/game/objects/items/food/soup.dm | 2 +- code/game/objects/items/food/sweets.dm | 10 +- code/game/objects/items/food/vegetables.dm | 4 +- code/modules/events/holiday/easter.dm | 6 +- .../food_and_drinks/recipes/food_mixtures.dm | 29 ++++++ .../recipes/tablecraft/recipes_bread.dm | 11 ++- .../recipes/tablecraft/recipes_burger.dm | 9 ++ .../recipes/tablecraft/recipes_cake.dm | 9 ++ .../recipes/tablecraft/recipes_egg.dm | 6 ++ .../recipes/tablecraft/recipes_frozen.dm | 5 + .../recipes/tablecraft/recipes_lizard.dm | 49 +++++++--- .../recipes/tablecraft/recipes_martian.dm | 65 +++++++++++- .../recipes/tablecraft/recipes_meat.dm | 16 +++ .../recipes/tablecraft/recipes_mexican.dm | 8 ++ .../recipes/tablecraft/recipes_misc.dm | 24 +++++ .../recipes/tablecraft/recipes_moth.dm | 21 +++- .../recipes/tablecraft/recipes_pastry.dm | 79 +++++++++++---- .../recipes/tablecraft/recipes_pie.dm | 20 ++++ .../recipes/tablecraft/recipes_pizza.dm | 50 +++++----- .../recipes/tablecraft/recipes_salad.dm | 1 + .../recipes/tablecraft/recipes_sandwich.dm | 8 ++ .../recipes/tablecraft/recipes_seafood.dm | 14 ++- .../recipes/tablecraft/recipes_spaghetti.dm | 2 + code/modules/hydroponics/grown/chili.dm | 8 +- code/modules/hydroponics/grown/citrus.dm | 2 +- code/modules/hydroponics/grown/eggplant.dm | 2 +- code/modules/hydroponics/grown/garlic.dm | 1 + code/modules/hydroponics/grown/onion.dm | 2 + code/modules/hydroponics/grown/pumpkin.dm | 3 +- code/modules/hydroponics/grown/tomato.dm | 4 +- code/modules/mining/lavaland/ash_flora.dm | 2 + code/modules/unit_tests/focus_only_tests.dm | 3 + code/modules/vending/donk.dm | 2 +- .../UpdatePaths/Scripts/89706_dankpocket.txt | 2 + 58 files changed, 804 insertions(+), 378 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/89706_dankpocket.txt diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm index 8a3b8d7a004..195c9677f6d 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm @@ -245,9 +245,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/mineral/plastitanium/red, /area/ruin/syndielab) -"oA" = ( -/turf/open/floor/iron/dark/textured, -/area/ruin/syndielab) "oY" = ( /obj/effect/mapping_helpers/apc/syndicate_access, /obj/effect/mapping_helpers/apc/full_charge, @@ -1082,7 +1079,7 @@ Xt Xt AR Jc -oA +ey FJ AR qC diff --git a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm index 384350f35a1..424d3a9e56c 100644 --- a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm @@ -5744,11 +5744,11 @@ pixel_y = 12; pixel_x = -6 }, -/obj/item/food/dankpocket{ +/obj/item/food/donkpocket/dank{ pixel_x = -10 }, -/obj/item/food/dankpocket, -/obj/item/food/dankpocket{ +/obj/item/food/donkpocket/dank, +/obj/item/food/donkpocket/dank{ pixel_x = 10 }, /obj/machinery/light/warm/directional/east, diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm index 85f6ae71732..091c8a9949a 100644 --- a/code/game/objects/items/food/_food.dm +++ b/code/game/objects/items/food/_food.dm @@ -122,3 +122,19 @@ AddComponent(/datum/component/germ_sensitive, mapload) if(!preserved_food) AddComponent(/datum/component/decomposition, mapload, decomp_req_handle, decomp_flags = foodtypes, decomp_result = decomp_type, ant_attracting = ant_attracting, custom_time = decomposition_time, stink_particles = decomposition_particles) + +/obj/item/food/CheckParts(list/parts, datum/crafting_recipe/food/current_recipe) + . = ..() + if(!istype(current_recipe)) + return + + var/made_with_food = FALSE + var/final_foodtypes = current_recipe.added_foodtypes + for(var/obj/item/food/ingredient in parts) + made_with_food = TRUE + final_foodtypes |= ingredient.foodtypes + if(!made_with_food) + return + final_foodtypes &= ~current_recipe.removed_foodtypes + ///Update the foodtypes + AddComponentFrom(SOURCE_EDIBLE_INNATE, /datum/component/edible, foodtypes = final_foodtypes) diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm index 56ebddc23d8..24435f799cd 100644 --- a/code/game/objects/items/food/bread.dm +++ b/code/game/objects/items/food/bread.dm @@ -104,7 +104,7 @@ /datum/reagent/consumable/nutriment/protein = 12, ) tastes = list("bread" = 10, "meat" = 10) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN | MEAT | DAIRY venue_value = FOOD_PRICE_CHEAP slice_type = /obj/item/food/breadslice/meat crafting_complexity = FOOD_COMPLEXITY_3 @@ -119,7 +119,7 @@ /datum/reagent/consumable/nutriment/protein = 2.4, ) tastes = list("bread" = 1, "meat" = 1) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN | MEAT | DAIRY crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/bread/sausage @@ -159,7 +159,7 @@ /datum/reagent/consumable/nutriment/protein = 15, ) tastes = list("bread" = 10, "acid" = 10) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN | MEAT | DAIRY slice_type = /obj/item/food/breadslice/xenomeat crafting_complexity = FOOD_COMPLEXITY_3 @@ -173,7 +173,7 @@ /datum/reagent/consumable/nutriment/protein = 3, ) tastes = list("bread" = 10, "acid" = 10) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN | MEAT | DAIRY crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/bread/spidermeat @@ -187,7 +187,7 @@ /datum/reagent/consumable/nutriment/protein = 12, ) tastes = list("bread" = 10, "cobwebs" = 5) - foodtypes = GRAIN | MEAT | TOXIC + foodtypes = GRAIN|MEAT|DAIRY|TOXIC slice_type = /obj/item/food/breadslice/spidermeat crafting_complexity = FOOD_COMPLEXITY_3 @@ -202,7 +202,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("bread" = 10, "cobwebs" = 5) - foodtypes = GRAIN | MEAT | TOXIC + foodtypes = GRAIN|MEAT|DAIRY|TOXIC crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/bread/banana @@ -214,7 +214,7 @@ /datum/reagent/consumable/banana = 20, ) tastes = list("bread" = 10) // bananjuice will also flavour - foodtypes = GRAIN | FRUIT + foodtypes = GRAIN | FRUIT | MEAT slice_type = /obj/item/food/breadslice/banana crafting_complexity = FOOD_COMPLEXITY_3 @@ -227,7 +227,7 @@ /datum/reagent/consumable/banana = 4, ) tastes = list("bread" = 10) - foodtypes = GRAIN | FRUIT + foodtypes = GRAIN | FRUIT | MEAT crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/bread/tofu @@ -240,7 +240,7 @@ /datum/reagent/consumable/nutriment/protein = 10, ) tastes = list("bread" = 10, "tofu" = 10) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN | VEGETABLES | DAIRY venue_value = FOOD_PRICE_TRASH slice_type = /obj/item/food/breadslice/tofu crafting_complexity = FOOD_COMPLEXITY_3 @@ -255,7 +255,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("bread" = 10, "tofu" = 10) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN | VEGETABLES | DAIRY crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/bread/creamcheese @@ -294,7 +294,7 @@ /datum/reagent/consumable/nutriment/vitamin = 10, ) tastes = list("bread" = 10, "silence" = 10) - foodtypes = GRAIN | FRUIT + foodtypes = GRAIN | FRUIT | VEGETABLES slice_type = /obj/item/food/breadslice/mimana crafting_complexity = FOOD_COMPLEXITY_3 @@ -309,7 +309,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("bread" = 10, "silence" = 10) - foodtypes = GRAIN | FRUIT + foodtypes = GRAIN | FRUIT | VEGETABLES crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/bread/empty @@ -449,7 +449,7 @@ ) bite_consumption = 3 tastes = list("bread" = 1, "garlic" = 1, "butter" = 1) - foodtypes = GRAIN + foodtypes = VEGETABLES|GRAIN|DAIRY venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_2 @@ -463,7 +463,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("butter" = 1, "biscuit" = 1) - foodtypes = GRAIN | BREAKFAST + foodtypes = GRAIN | BREAKFAST | DAIRY w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_CHEAP crafting_complexity = FOOD_COMPLEXITY_2 @@ -498,7 +498,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("raw egg" = 2, "soaked bread" = 1) - foodtypes = GRAIN | RAW | BREAKFAST + foodtypes = GRAIN | RAW | BREAKFAST | MEAT w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -515,7 +515,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("french toast" = 1, "syrup" = 1, "golden deliciousness" = 1) - foodtypes = GRAIN | BREAKFAST + foodtypes = GRAIN | BREAKFAST | MEAT w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm index 54e400d1d50..c5d5cd35367 100644 --- a/code/game/objects/items/food/burgers.dm +++ b/code/game/objects/items/food/burgers.dm @@ -48,7 +48,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) tastes = list("bun" = 2, "long pig" = 4) - foodtypes = MEAT | GRAIN | GORE + foodtypes = MEAT | GRAIN venue_value = FOOD_PRICE_CHEAP crafting_complexity = FOOD_COMPLEXITY_2 @@ -70,7 +70,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("bun" = 4, "corgi meat" = 2) - foodtypes = GRAIN | MEAT | GORE + foodtypes = GRAIN | MEAT venue_value = FOOD_PRICE_EXOTIC crafting_complexity = FOOD_COMPLEXITY_2 @@ -98,7 +98,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("bun" = 4, "fish" = 4) - foodtypes = GRAIN | SEAFOOD + foodtypes = GRAIN | SEAFOOD | DAIRY venue_value = FOOD_PRICE_EXOTIC crafting_complexity = FOOD_COMPLEXITY_3 @@ -176,7 +176,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("bun" = 2, "a bad joke" = 4) - foodtypes = GRAIN | FRUIT + foodtypes = GRAIN venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_2 @@ -395,7 +395,7 @@ /datum/reagent/consumable/nutriment/vitamin = 10, ) tastes = list("bun" = 4, "magic" = 2) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_2 @@ -452,7 +452,7 @@ bite_consumption = 7 max_volume = 100 tastes = list("bun" = 4, "type two diabetes" = 10) - foodtypes = GRAIN | MEAT | DAIRY + foodtypes = GRAIN | MEAT | DAIRY | VEGETABLES venue_value = FOOD_PRICE_EXOTIC crafting_complexity = FOOD_COMPLEXITY_5 @@ -474,7 +474,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("extreme heat" = 4, "bun" = 2) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN | MEAT | VEGETABLES venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 @@ -488,7 +488,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("dead rat" = 4, "bun" = 2) - foodtypes = GRAIN | MEAT | GORE + foodtypes = GRAIN | MEAT | GORE | RAW venue_value = FOOD_PRICE_CHEAP crafting_complexity = FOOD_COMPLEXITY_2 @@ -589,7 +589,7 @@ /datum/reagent/consumable/bbqsauce = 1, ) tastes = list("bun" = 2, "pork patty" = 4) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN | MEAT | SUGAR | VEGETABLES venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 @@ -604,12 +604,14 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("muffin" = 2, "bacon" = 3) - foodtypes = GRAIN | MEAT | BREAKFAST + foodtypes = GRAIN | MEAT | BREAKFAST | FRIED venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/burger/chicken - name = "chicken sandwich" //Apparently the proud people of Americlapstan object to this thing being called a burger. Apparently McDonald's just calls it a burger in Europe as to not scare and confuse us. + name = "chicken sandwich" + //Apparently the proud people of Americlapstan object to this thing being called a burger. + //Apparently McDonald's just calls it a burger in Europe as to not scare and confuse us. desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize disarming people on the space frontier." icon_state = "chickenburger" food_reagents = list( @@ -620,7 +622,7 @@ /datum/reagent/consumable/nutriment/fat/oil = 2, ) tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1) - foodtypes = GRAIN | MEAT | FRIED + foodtypes = GRAIN | MEAT venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 @@ -655,7 +657,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("bun" = 2, "beef patty" = 4, "cheese" = 2, "beef soaked in chili" = 3, "a smoking flare" = 2) - foodtypes = GRAIN | MEAT | DAIRY + foodtypes = GRAIN | MEAT | DAIRY | VEGETABLES crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/burger/crazy/Initialize(mapload) @@ -686,6 +688,6 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("juicy meat" = 4, "BBQ sauce" = 3, "onions" = 2, "bun" = 2) - foodtypes = GRAIN | MEAT | VEGETABLES + foodtypes = MEAT|VEGETABLES|GRAIN venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm index b161410bc3f..17453300117 100644 --- a/code/game/objects/items/food/cake.dm +++ b/code/game/objects/items/food/cake.dm @@ -130,7 +130,7 @@ /datum/reagent/consumable/nutriment/protein = 5, ) tastes = list("cake" = 4, "cream cheese" = 3) - foodtypes = GRAIN | DAIRY + foodtypes = GRAIN | DAIRY | SUGAR venue_value = FOOD_PRICE_CHEAP slice_type = /obj/item/food/cakeslice/cheese crafting_complexity = FOOD_COMPLEXITY_3 @@ -371,7 +371,7 @@ desc = "A hollow cake with real pumpkin." icon_state = "pumpkinspicecake" tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) - foodtypes = GRAIN | DAIRY | VEGETABLES | SUGAR + foodtypes = GRAIN|DAIRY|SUGAR|VEGETABLES venue_value = FOOD_PRICE_CHEAP slice_type = /obj/item/food/cakeslice/pumpkinspice crafting_complexity = FOOD_COMPLEXITY_3 @@ -381,7 +381,7 @@ desc = "A spicy slice of pumpkin goodness." icon_state = "pumpkinspicecakeslice" tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) - foodtypes = GRAIN | DAIRY | VEGETABLES | SUGAR + foodtypes = GRAIN|DAIRY|SUGAR|VEGETABLES crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/cake/berry_vanilla_cake // blackberry strawberries vanilla cake @@ -482,7 +482,7 @@ /datum/reagent/fuel/oil = 15, ) tastes = list("acid" = 3, "metal" = 4, "glass" = 5) - foodtypes = GRAIN | GROSS + foodtypes = GRAIN|DAIRY|SUGAR|GROSS slice_type = /obj/item/food/cakeslice/hardware_cake_slice crafting_complexity = FOOD_COMPLEXITY_3 @@ -497,7 +497,7 @@ /datum/reagent/fuel/oil = 3, ) tastes = list("acid" = 3, "metal" = 4, "glass" = 5) - foodtypes = GRAIN | GROSS + foodtypes = GRAIN|DAIRY|SUGAR|GROSS crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/cake/vanilla_cake @@ -511,7 +511,7 @@ /datum/reagent/consumable/vanilla = 15, ) tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10) - foodtypes = GRAIN | SUGAR | DAIRY + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR slice_type = /obj/item/food/cakeslice/vanilla_slice crafting_complexity = FOOD_COMPLEXITY_3 @@ -526,7 +526,7 @@ /datum/reagent/consumable/vanilla = 3, ) tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10) - foodtypes = GRAIN | SUGAR | DAIRY + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/cake/clown_cake @@ -539,7 +539,7 @@ /datum/reagent/consumable/banana = 15, ) tastes = list("cake" = 1, "sugar" = 1, "joy" = 10) - foodtypes = GRAIN | SUGAR | DAIRY + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR slice_type = /obj/item/food/cakeslice/clown_slice crafting_complexity = FOOD_COMPLEXITY_5 crafted_food_buff = /datum/status_effect/food/trait/waddle @@ -554,7 +554,7 @@ /datum/reagent/consumable/banana = 3, ) tastes = list("cake" = 1, "sugar" = 1, "joy" = 10) - foodtypes = GRAIN | SUGAR | DAIRY + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR crafting_complexity = FOOD_COMPLEXITY_5 crafted_food_buff = /datum/status_effect/food/trait/waddle @@ -570,7 +570,7 @@ /datum/reagent/consumable/berryjuice = 5, ) tastes = list("cake" = 4, "violets" = 2, "jam" = 2) - foodtypes = GRAIN | DAIRY | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR|VEGETABLES slice_type = /obj/item/food/cakeslice/trumpet crafting_complexity = FOOD_COMPLEXITY_4 @@ -586,7 +586,7 @@ /datum/reagent/consumable/berryjuice = 1, ) tastes = list("cake" = 4, "violets" = 2, "jam" = 2) - foodtypes = GRAIN | DAIRY | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR|VEGETABLES crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/cake/brioche diff --git a/code/game/objects/items/food/cheese.dm b/code/game/objects/items/food/cheese.dm index 38372fee3c0..07443fff98b 100644 --- a/code/game/objects/items/food/cheese.dm +++ b/code/game/objects/items/food/cheese.dm @@ -94,7 +94,6 @@ /datum/reagent/consumable/cream = 1, ) tastes = list("cream" = 1, "cheese" = 1) - foodtypes = DAIRY w_class = WEIGHT_CLASS_SMALL rat_heal = 35 crafting_complexity = FOOD_COMPLEXITY_2 @@ -109,7 +108,6 @@ name = "cheese curds" desc = "Not to be mistaken for curd cheese. Tasty deep fried." icon_state = "cheese_curds" - foodtypes = DAIRY w_class = WEIGHT_CLASS_SMALL rat_heal = 35 crafting_complexity = FOOD_COMPLEXITY_2 @@ -123,7 +121,6 @@ desc = "Firm aged cheese, similar in texture to firm tofu. Due to its lack of moisture it's particularly useful for cooking with, as it doesn't melt easily." icon_state = "firm_cheese" tastes = list("aged cheese" = 1) - foodtypes = DAIRY | VEGETABLES w_class = WEIGHT_CLASS_SMALL rat_heal = 35 crafting_complexity = FOOD_COMPLEXITY_3 @@ -136,7 +133,6 @@ desc = "A slice of firm cheese. Perfect for grilling or making into delicious pesto." icon_state = "firm_cheese_slice" tastes = list("aged cheese" = 1) - foodtypes = DAIRY | VEGETABLES w_class = WEIGHT_CLASS_SMALL rat_heal = 10 crafting_complexity = FOOD_COMPLEXITY_3 @@ -149,7 +145,6 @@ desc = "Delicious, creamy, and cheesy, all in one simple package." icon_state = "mozzarella" tastes = list("mozzarella" = 1) - foodtypes = DAIRY w_class = WEIGHT_CLASS_SMALL rat_heal = 10 crafting_complexity = FOOD_COMPLEXITY_2 diff --git a/code/game/objects/items/food/donkpocket.dm b/code/game/objects/items/food/donkpocket.dm index 4cbf83ce631..f5e382942f7 100644 --- a/code/game/objects/items/food/donkpocket.dm +++ b/code/game/objects/items/food/donkpocket.dm @@ -8,7 +8,7 @@ /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 2, ) - tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) + tastes = list("umami" = 2, "dough" = 2, "laziness" = 1) foodtypes = GRAIN food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL @@ -39,7 +39,7 @@ /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/medicine/omnizine = 6, ) - tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) + tastes = list("umami" = 2, "dough" = 2, "laziness" = 1) foodtypes = GRAIN // Warmed donk pockets will burn if you leave them in the oven or microwave. @@ -47,7 +47,16 @@ baking_time_short = 10 SECONDS baking_time_long = 15 SECONDS -/obj/item/food/dankpocket +/obj/item/food/donkpocket/homemade + foodtypes = MEAT|GRAIN + tastes = list("meat" = 2, "dough" = 2, "comfiness" = 1) + warm_type = /obj/item/food/donkpocket/warm/homemade + +/obj/item/food/donkpocket/warm/homemade + foodtypes = MEAT|GRAIN + tastes = list("meat" = 2, "dough" = 2, "comfiness" = 1) + +/obj/item/food/donkpocket/dank name = "\improper Dank-pocket" desc = "The food of choice for the seasoned botanist." icon_state = "dankpocket" @@ -56,8 +65,29 @@ /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4, ) - tastes = list("meat" = 2, "dough" = 2) - foodtypes = GRAIN | VEGETABLES + tastes = list("weed" = 2, "dough" = 2) + foodtypes = GRAIN|VEGETABLES + crafting_complexity = FOOD_COMPLEXITY_2 + warm_type = /obj/item/food/donkpocket/warm/dank + +/obj/item/food/donkpocket/dank/make_bakeable() + AddComponent(/datum/component/bakeable, warm_type, rand(baking_time_short, baking_time_long), TRUE, TRUE, child_added_reagents) + +/obj/item/food/donkpocket/dank/make_microwaveable() + AddElement(/datum/element/microwavable, warm_type, child_added_reagents) + +/obj/item/food/donkpocket/warm/dank + name = "warm Dank-pocket" + desc = "The food of choice for the seasoned botanist." + icon_state = "dankpocket" + food_reagents = list( + /datum/reagent/toxin/lipolicide = 3, + /datum/reagent/drug/space_drugs = 3, + /datum/reagent/consumable/nutriment = 4, + /datum/reagent/medicine/omnizine = 2, + ) + tastes = list("weed" = 2, "dough" = 2) + foodtypes = GRAIN|VEGETABLES crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/donkpocket/spicy @@ -69,8 +99,8 @@ /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/capsaicin = 2, ) - tastes = list("meat" = 2, "dough" = 2, "spice" = 1) - foodtypes = GRAIN + tastes = list("umami" = 2, "dough" = 2, "spice" = 1) + foodtypes = VEGETABLES|GRAIN warm_type = /obj/item/food/donkpocket/warm/spicy /obj/item/food/donkpocket/spicy/make_bakeable() @@ -89,8 +119,17 @@ /datum/reagent/medicine/omnizine = 2, /datum/reagent/consumable/capsaicin = 5, ) - tastes = list("meat" = 2, "dough" = 2, "weird spices" = 2) - foodtypes = GRAIN + tastes = list("umami" = 2, "dough" = 2, "weird spices" = 2) + foodtypes = VEGETABLES|GRAIN + +/obj/item/food/donkpocket/spicy/homemade + tastes = list("meat" = 2, "dough" = 2, "spice" = 1) + foodtypes = MEAT|VEGETABLES|GRAIN + warm_type = /obj/item/food/donkpocket/warm/spicy/homemade + +/obj/item/food/donkpocket/warm/spicy/homemade + tastes = list("meat" = 2, "dough" = 2, "weird spices" = 1) + foodtypes = MEAT|VEGETABLES|GRAIN /obj/item/food/donkpocket/teriyaki name = "\improper Teriyaki-pocket" @@ -101,7 +140,7 @@ /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/soysauce = 2, ) - tastes = list("meat" = 2, "dough" = 2, "soy sauce" = 2) + tastes = list("umami" = 2, "dough" = 2, "soy sauce" = 2) foodtypes = GRAIN warm_type = /obj/item/food/donkpocket/warm/teriyaki @@ -121,9 +160,18 @@ /datum/reagent/medicine/omnizine = 2, /datum/reagent/consumable/soysauce = 2, ) - tastes = list("meat" = 2, "dough" = 2, "soy sauce" = 2) + tastes = list("umami" = 2, "dough" = 2, "soy sauce" = 2) foodtypes = GRAIN +/obj/item/food/donkpocket/teriyaki/homemade + tastes = list("meat" = 2, "dough" = 2, "soy sauce" = 2) + foodtypes = MEAT|GRAIN + warm_type = /obj/item/food/donkpocket/warm/teriyaki/homemade + +/obj/item/food/donkpocket/warm/teriyaki/homemade + tastes = list("meat" = 2, "dough" = 2, "soy sauce" = 2) + foodtypes = MEAT|GRAIN + /obj/item/food/donkpocket/pizza name = "\improper Pizza-pocket" desc = "Delicious, cheesy and surprisingly filling." @@ -133,8 +181,8 @@ /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/tomatojuice = 2, ) - tastes = list("meat" = 2, "dough" = 2, "cheese"= 2) - foodtypes = GRAIN + tastes = list("tomato" = 2, "dough" = 2, "cheese"= 2) + foodtypes = VEGETABLES|GRAIN|DAIRY warm_type = /obj/item/food/donkpocket/warm/pizza /obj/item/food/donkpocket/pizza/make_bakeable() @@ -153,8 +201,8 @@ /datum/reagent/medicine/omnizine = 2, /datum/reagent/consumable/tomatojuice = 2, ) - tastes = list("meat" = 2, "dough" = 2, "melty cheese"= 2) - foodtypes = GRAIN + tastes = list("tomato" = 2, "dough" = 2, "melty cheese"= 2) + foodtypes = VEGETABLES|GRAIN|DAIRY /obj/item/food/donkpocket/honk name = "\improper Honk-pocket" @@ -165,7 +213,7 @@ /datum/reagent/consumable/banana = 4, ) tastes = list("banana" = 2, "dough" = 2, "children's antibiotics" = 1) - foodtypes = GRAIN + foodtypes = GRAIN|FRUIT|SUGAR warm_type = /obj/item/food/donkpocket/warm/honk crafting_complexity = FOOD_COMPLEXITY_3 var/static/list/honk_added_reagents = list( @@ -190,7 +238,7 @@ /datum/reagent/consumable/laughter = 6, ) tastes = list("banana" = 2, "dough" = 2, "children's antibiotics" = 1) - foodtypes = GRAIN + foodtypes = GRAIN|FRUIT|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/donkpocket/berry @@ -202,7 +250,7 @@ /datum/reagent/consumable/berryjuice = 3, ) tastes = list("dough" = 2, "jam" = 2) - foodtypes = GRAIN + foodtypes = GRAIN|FRUIT|SUGAR warm_type = /obj/item/food/donkpocket/warm/berry /obj/item/food/donkpocket/berry/make_bakeable() @@ -221,7 +269,7 @@ /datum/reagent/consumable/berryjuice = 3, ) tastes = list("dough" = 2, "warm jam" = 2) - foodtypes = GRAIN + foodtypes = GRAIN|FRUIT|SUGAR /obj/item/food/donkpocket/gondola name = "\improper Gondola-pocket" @@ -233,7 +281,7 @@ /datum/reagent/gondola_mutation_toxin = 5, ) tastes = list("meat" = 2, "dough" = 2, "inner peace" = 1) - foodtypes = GRAIN + foodtypes = GRAIN|MEAT warm_type = /obj/item/food/donkpocket/warm/gondola var/static/list/gondola_added_reagents = list( @@ -258,7 +306,7 @@ /datum/reagent/gondola_mutation_toxin = 10, ) tastes = list("meat" = 2, "dough" = 2, "inner peace" = 1) - foodtypes = GRAIN + foodtypes = GRAIN|MEAT /obj/item/food/donkpocket/deluxe name = "\improper Donk-pocket Deluxe" @@ -271,7 +319,7 @@ /datum/reagent/medicine/omnizine = 2, ) tastes = list("quality meat" = 2, "dough" = 2, "raw fanciness" = 1) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN|MEAT|VEGETABLES crafting_complexity = FOOD_COMPLEXITY_4 warm_type = /obj/item/food/donkpocket/warm/deluxe @@ -296,7 +344,7 @@ /datum/reagent/medicine/omnizine = 10, ) tastes = list("quality meat" = 2, "dough" = 2, "fanciness" = 1) - foodtypes = GRAIN | MEAT | FRIED + foodtypes = GRAIN|MEAT|VEGETABLES|FRIED /obj/item/food/donkpocket/deluxe/nocarb name = "\improper Meat-pocket" @@ -308,7 +356,7 @@ /datum/reagent/medicine/omnizine = 2, ) tastes = list("raw meat" = 2, "more meat" = 2, "no carbs" = 1) - foodtypes = MEAT | RAW + foodtypes = MEAT|RAW crafting_complexity = FOOD_COMPLEXITY_4 warm_type = /obj/item/food/donkpocket/warm/deluxe/nocarb @@ -360,4 +408,4 @@ /datum/reagent/medicine/omnizine = 10, ) tastes = list("rice patty" = 2, "fried dough" = 2, "peppery kick" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN | VEGETABLES | FRIED diff --git a/code/game/objects/items/food/donuts.dm b/code/game/objects/items/food/donuts.dm index 5a7c6a87145..5542925b2d3 100644 --- a/code/game/objects/items/food/donuts.dm +++ b/code/game/objects/items/food/donuts.dm @@ -8,7 +8,7 @@ bite_consumption = 5 food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 3) tastes = list("donut" = 1) - foodtypes = JUNKFOOD | GRAIN | SUGAR | BREAKFAST + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR|FRIED|BREAKFAST food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -61,6 +61,7 @@ tastes = list("donut" = 3, "chaos" = 1) is_decorated = TRUE crafting_complexity = FOOD_COMPLEXITY_3 + foodtypes = GRAIN|DAIRY|JUNKFOOD|FRIED|BREAKFAST /obj/item/food/donut/chaos/Initialize(mapload) . = ..() @@ -88,7 +89,7 @@ /datum/reagent/consumable/ketchup = 3, ) tastes = list("meat" = 1) - foodtypes = JUNKFOOD | MEAT | GORE | FRIED | BREAKFAST + foodtypes = GRAIN|DAIRY|JUNKFOOD|FRIED|BREAKFAST|MEAT|GORE is_decorated = TRUE crafting_complexity = FOOD_COMPLEXITY_3 @@ -102,6 +103,7 @@ /datum/reagent/consumable/berryjuice = 3, /datum/reagent/consumable/sprinkles = 1, //Extra sprinkles to reward frosting ) + foodtypes = parent_type::foodtypes|FRUIT decorated_icon = "donut_homer" /obj/item/food/donut/trumpet @@ -127,6 +129,7 @@ /datum/reagent/consumable/applejuice = 3, /datum/reagent/consumable/sprinkles = 1, ) + foodtypes = parent_type::foodtypes|FRUIT tastes = list("donut" = 3, "green apples" = 1) is_decorated = TRUE @@ -167,6 +170,7 @@ /datum/reagent/consumable/blumpkinjuice = 3, /datum/reagent/consumable/sprinkles = 1, ) + foodtypes = parent_type::foodtypes|VEGETABLES tastes = list("donut" = 2, "blumpkin" = 1) is_decorated = TRUE crafting_complexity = FOOD_COMPLEXITY_3 @@ -224,7 +228,7 @@ ) extra_reagent = /datum/reagent/consumable/berryjuice tastes = list("jelly" = 1, "donut" = 3) - foodtypes = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR | BREAKFAST + foodtypes = parent_type::foodtypes|FRUIT // Jelly donuts don't have holes, but look the same on the outside /obj/item/food/donut/jelly/in_box_sprite() @@ -313,6 +317,7 @@ /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1, ) + foodtypes = parent_type::foodtypes|VEGETABLES tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1) is_decorated = TRUE crafting_complexity = FOOD_COMPLEXITY_3 @@ -364,7 +369,7 @@ name = "jelly donut" desc = "You jelly?" extra_reagent = /datum/reagent/toxin/slimejelly - foodtypes = JUNKFOOD | GRAIN | FRIED | TOXIC | SUGAR | BREAKFAST + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR|FRIED|BREAKFAST|TOXIC /obj/item/food/donut/jelly/slimejelly/plain icon_state = "jelly" @@ -380,6 +385,7 @@ /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1, ) //Extra sprinkles to reward frosting + foodtypes = parent_type::foodtypes|FRUIT /obj/item/food/donut/jelly/slimejelly/trumpet name = "spaceman's jelly donut" @@ -408,6 +414,7 @@ ) tastes = list("jelly" = 1, "donut" = 3, "green apples" = 1) is_decorated = TRUE + foodtypes = parent_type::foodtypes|FRUIT /obj/item/food/donut/jelly/slimejelly/caramel name = "caramel jelly donut" @@ -452,6 +459,7 @@ tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1) is_decorated = TRUE crafting_complexity = FOOD_COMPLEXITY_3 + foodtypes = parent_type::foodtypes|VEGETABLES /obj/item/food/donut/jelly/slimejelly/bungo name = "bungo jelly donut" diff --git a/code/game/objects/items/food/egg.dm b/code/game/objects/items/food/egg.dm index d184c7598fd..abf832b8074 100644 --- a/code/game/objects/items/food/egg.dm +++ b/code/game/objects/items/food/egg.dm @@ -312,7 +312,7 @@ GLOBAL_VAR_INIT(chicks_from_eggs, 0) ) w_class = WEIGHT_CLASS_SMALL tastes = list("egg" = 1, "bacon" = 1, "bun" = 1) - foodtypes = MEAT | BREAKFAST | GRAIN + foodtypes = MEAT|BREAKFAST|GRAIN|FRIED venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 @@ -327,7 +327,7 @@ GLOBAL_VAR_INIT(chicks_from_eggs, 0) /datum/reagent/consumable/nutriment/vitamin = 3, ) tastes = list("egg" = 1) - foodtypes = MEAT | VEGETABLES + foodtypes = MEAT|VEGETABLES|FRIED w_class = WEIGHT_CLASS_TINY crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm index 775c4a545e8..4728ecc1e76 100644 --- a/code/game/objects/items/food/frozen.dm +++ b/code/game/objects/items/food/frozen.dm @@ -25,7 +25,7 @@ /datum/reagent/consumable/ice = 4, ) tastes = list("ice cream" = 2, "berry" = 2) - foodtypes = FRUIT | DAIRY | SUGAR + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR food_flags = FOOD_FINGER_FOOD crafting_complexity = FOOD_COMPLEXITY_3 crafted_food_buff = /datum/status_effect/food/chilling @@ -42,7 +42,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) tastes = list("blue cherries" = 2, "ice cream" = 2) - foodtypes = FRUIT | DAIRY | SUGAR + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 crafted_food_buff = /datum/status_effect/food/chilling @@ -62,7 +62,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("ice cream" = 1, "banana" = 1) - foodtypes = FRUIT | DAIRY | SUGAR + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 crafted_food_buff = /datum/status_effect/food/chilling @@ -82,7 +82,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) - foodtypes = FRUIT | DAIRY | SUGAR + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR crafting_complexity = FOOD_COMPLEXITY_4 crafted_food_buff = /datum/status_effect/food/chilling @@ -437,7 +437,7 @@ /datum/reagent/consumable/sugar = 2, ) tastes = list("chopped hazelnuts", "waffle") - foodtypes = DAIRY | SUGAR + foodtypes = GRAIN|DAIRY|SUGAR venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 crafted_food_buff = /datum/status_effect/food/chilling diff --git a/code/game/objects/items/food/lizard.dm b/code/game/objects/items/food/lizard.dm index a91831b3883..9976bc6e17a 100644 --- a/code/game/objects/items/food/lizard.dm +++ b/code/game/objects/items/food/lizard.dm @@ -13,7 +13,7 @@ /datum/reagent/blood = 3, ) tastes = list("meat" = 1, "black pudding" = 1) - foodtypes = MEAT + foodtypes = MEAT|RAW w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_1 @@ -46,7 +46,7 @@ /datum/reagent/consumable/salt = 5, ) tastes = list("meat" = 1, "salt" = 1) - foodtypes = MEAT | GORE + foodtypes = MEAT|RAW|GORE w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_1 @@ -119,7 +119,7 @@ icon_state = "pate" food_reagents = list(/datum/reagent/consumable/nutriment/protein = 5) tastes = list("liver" = 1) - foodtypes = MEAT + foodtypes = MEAT|VEGETABLES w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -193,7 +193,7 @@ /datum/reagent/consumable/garlic = 2, ) tastes = list("snails" = 1, "garlic" = 1, "oil" = 1) - foodtypes = MEAT | VEGETABLES + foodtypes = MEAT|VEGETABLES w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -209,7 +209,7 @@ /datum/reagent/consumable/nutriment/fat/oil = 1, ) tastes = list("black pudding" = 1, "batter" = 1, "oil" = 1) - foodtypes = MEAT | FRIED + foodtypes = MEAT|NUTS|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -272,7 +272,7 @@ /datum/reagent/consumable/capsaicin = 1, ) tastes = list("fish" = 1, "acid" = 1, "onion" = 1, "heat" = 1) - foodtypes = SEAFOOD | VEGETABLES + foodtypes = VEGETABLES|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -287,7 +287,7 @@ /datum/reagent/consumable/capsaicin = 1, ) tastes = list("meat" = 1, "sweet" = 1, "heat" = 1) - foodtypes = GORE | MEAT | BUGS + foodtypes = MEAT|VEGETABLES|BUGS|GORE w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -331,7 +331,7 @@ /datum/reagent/consumable/nutriment = 2, ) tastes = list("fish" = 2, "potatoes" = 1, "carrots" = 1) - foodtypes = SEAFOOD + foodtypes = VEGETABLES|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -365,6 +365,9 @@ foodtypes = VEGETABLES | NUTS crafting_complexity = FOOD_COMPLEXITY_2 +/obj/item/food/spaghetti/nizaya/egg + foodtypes = parent_type::foodtypes | MEAT + /obj/item/food/spaghetti/snail_nizaya name = "desert snail nizaya" desc = "A high class pasta dish from Tizira's vineyard region of Valyngia. Traditionally made with only the finest Tiziran wine... but the human swill will do, in a pinch." @@ -403,7 +406,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("peppery sweet" = 1, "veggies" = 1, "gnocchi" = 1) - foodtypes = VEGETABLES | SUGAR | NUTS + foodtypes = VEGETABLES|NUTS|SUGAR crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/spaghetti/mushroom_nizaya @@ -416,7 +419,7 @@ /datum/reagent/consumable/nutriment/vitamin = 10, ) tastes = list("savouriness" = 1, "nuttiness" = 1, "gnocchi" = 1) - foodtypes = VEGETABLES + foodtypes = VEGETABLES|NUTS crafting_complexity = FOOD_COMPLEXITY_4 //Dough Dishes @@ -431,12 +434,20 @@ tastes = list("potato" = 1, "earthy heat" = 1) foodtypes = VEGETABLES | NUTS crafting_complexity = FOOD_COMPLEXITY_1 + var/bread_type = /obj/item/food/bread/root + var/flat_type = /obj/item/food/flatrootdough /obj/item/food/rootdough/make_bakeable() - AddComponent(/datum/component/bakeable, /obj/item/food/bread/root, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE) + AddComponent(/datum/component/bakeable, bread_type, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE) /obj/item/food/rootdough/make_processable() - AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/flatrootdough, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Flatten") + AddElement(/datum/element/processable, TOOL_ROLLINGPIN, flat_type, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Flatten") + +/obj/item/food/rootdough/egg + desc = "A root based dough, made with nuts, tubers and eggs. Used in a wide range of Tiziran cooking." + foodtypes = parent_type::foodtypes | MEAT + bread_type = /obj/item/food/bread/root/egg + flat_type = /obj/item/food/flatrootdough/egg /obj/item/food/flatrootdough name = "flat rootdough" @@ -447,12 +458,19 @@ tastes = list("potato" = 1, "earthy heat" = 1) foodtypes = VEGETABLES | NUTS crafting_complexity = FOOD_COMPLEXITY_1 + var/process_type = /obj/item/food/rootdoughslice + var/grill_type = /obj/item/food/root_flatbread /obj/item/food/flatrootdough/make_processable() - AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/rootdoughslice, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice") + AddElement(/datum/element/processable, TOOL_KNIFE, process_type, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice") /obj/item/food/flatrootdough/make_grillable() - AddComponent(/datum/component/grillable, /obj/item/food/root_flatbread, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE) + AddComponent(/datum/component/grillable, grill_type, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE) + +/obj/item/food/flatrootdough/egg + foodtypes = parent_type::foodtypes | MEAT + process_type = /obj/item/food/rootdoughslice/egg + grill_type = /obj/item/food/root_flatbread/egg /obj/item/food/rootdoughslice name = "rootdough ball" @@ -464,6 +482,11 @@ tastes = list("potato" = 1, "earthy heat" = 1) foodtypes = VEGETABLES | NUTS crafting_complexity = FOOD_COMPLEXITY_1 + var/process_type = /obj/item/food/spaghetti/nizaya + var/bake_type = /obj/item/food/rootroll + +/obj/item/food/rootdoughslice/egg + foodtypes = parent_type::foodtypes | MEAT /obj/item/food/rootdoughslice/make_processable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/spaghetti/nizaya, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice") @@ -471,6 +494,10 @@ /obj/item/food/rootdoughslice/make_bakeable() AddComponent(/datum/component/bakeable, /obj/item/food/rootroll, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE) +/obj/item/food/rootdoughslice/egg + process_type = /obj/item/food/spaghetti/nizaya/egg + bake_type = /obj/item/food/rootroll/egg + /obj/item/food/root_flatbread name = "root flatbread" desc = "A plain grilled root flatbread. Can be topped with a variety of foods that lizards like to eat." @@ -481,6 +508,9 @@ foodtypes = VEGETABLES | NUTS crafting_complexity = FOOD_COMPLEXITY_2 +/obj/item/food/root_flatbread/egg + foodtypes = parent_type::foodtypes | MEAT + /obj/item/food/rootroll name = "rootroll" desc = "A dense, chewy roll, made from roots. A nice companion to a bowl of soup." @@ -492,6 +522,9 @@ foodtypes = VEGETABLES | NUTS crafting_complexity = FOOD_COMPLEXITY_2 +/obj/item/food/rootroll/egg + foodtypes = parent_type::foodtypes | MEAT + //Bread Dishes /obj/item/food/bread/root @@ -510,6 +543,10 @@ . = ..() AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/bread/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 8) +/obj/item/food/bread/root/egg + foodtypes = parent_type::foodtypes | MEAT + slice_type = /obj/item/food/breadslice/root/egg + /obj/item/food/breadslice/root name = "rootbread slice" desc = "A slice of dense, chewy rootbread." @@ -524,6 +561,9 @@ . = ..() AddComponent(/datum/component/customizable_reagent_holder, null, CUSTOM_INGREDIENT_ICON_STACK) +/obj/item/food/breadslice/root/egg + foodtypes = parent_type::foodtypes | MEAT + //Pizza Dishes /obj/item/food/pizza/flatbread icon = 'icons/obj/food/lizard.dmi' @@ -581,7 +621,7 @@ /datum/reagent/consumable/nutriment/protein = 10, ) tastes = list("bread" = 1, "meat" = 1) - foodtypes = MEAT | NUTS | GORE + foodtypes = MEAT|VEGETABLES|RAW|NUTS crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pizza/flatbread/stinging @@ -594,7 +634,7 @@ /datum/reagent/consumable/honey = 2, ) tastes = list("bread" = 1, "sweetness" = 1, "stinging" = 1, "slime" = 1) - foodtypes = BUGS | NUTS | SEAFOOD | GORE + foodtypes = MEAT|VEGETABLES|NUTS|SEAFOOD|BUGS|GORE crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pizza/flatbread/zmorgast // Name is based off of the Swedish dish Smörgåstårta @@ -620,7 +660,7 @@ /datum/reagent/consumable/bbqsauce = 2, ) tastes = list("bread" = 1, "fish" = 1) - foodtypes = SEAFOOD | NUTS + foodtypes = VEGETABLES|NUTS|SEAFOOD crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/pizza/flatbread/mushroom @@ -856,7 +896,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("peanut butter" = 1, "jelly" = 1, "rootbread" = 2) - foodtypes = FRUIT | NUTS + foodtypes = FRUIT|VEGETABLES|NUTS crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/rootbread_peanut_butter_banana @@ -871,7 +911,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("peanut butter" = 1, "banana" = 1, "rootbread" = 2) - foodtypes = FRUIT | NUTS + foodtypes = FRUIT|VEGETABLES|NUTS crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/burger/plain/korta @@ -884,7 +924,7 @@ /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 1, ) - foodtypes = NUTS | MEAT + foodtypes = MEAT|VEGETABLES|NUTS crafting_complexity = FOOD_COMPLEXITY_3 //Gotta make the dough, +1 /obj/item/food/burger/rat/korta @@ -898,7 +938,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("dead rat" = 4, "bun" = 2) - foodtypes = NUTS | MEAT | GORE + foodtypes = NUTS | MEAT | GORE | VEGETABLES | RAW crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/burger/rootguffin @@ -913,7 +953,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("muffin" = 2, "bacon" = 3) - foodtypes = NUTS | MEAT | BREAKFAST + foodtypes = NUTS | MEAT | BREAKFAST | VEGETABLES | FRIED venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_4 @@ -929,7 +969,7 @@ /datum/reagent/consumable/bbqsauce = 1, ) tastes = list("bun" = 2, "pork patty" = 4) - foodtypes = NUTS | MEAT + foodtypes = NUTS | MEAT | VEGETABLES | SUGAR venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_4 @@ -946,7 +986,7 @@ /datum/reagent/consumable/nutriment/fat/oil = 2, ) tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1) - foodtypes = NUTS | MEAT | FRIED + foodtypes = NUTS | MEAT | VEGETABLES venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_4 @@ -961,7 +1001,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("bun" = 4, "fish" = 4) - foodtypes = NUTS | SEAFOOD + foodtypes = VEGETABLES | NUTS | SEAFOOD venue_value = FOOD_PRICE_EXOTIC crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/code/game/objects/items/food/martian.dm b/code/game/objects/items/food/martian.dm index ef288a8bed7..b1d8fee480b 100644 --- a/code/game/objects/items/food/martian.dm +++ b/code/game/objects/items/food/martian.dm @@ -108,7 +108,7 @@ /datum/reagent/consumable/capsaicin = 2 ) tastes = list("chilli heat" = 1, "umami" = 1) - foodtypes = SEAFOOD | VEGETABLES + foodtypes = VEGETABLES|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -123,7 +123,7 @@ /datum/reagent/consumable/nutriment = 2 ) tastes = list("meat" = 1, "breadcrumbs" = 1) - foodtypes = MEAT | GRAIN + foodtypes = MEAT|FRIED|GRAIN w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -194,7 +194,7 @@ food_reagents = list( /datum/reagent/consumable/nutriment = 3 ) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN crafting_complexity = FOOD_COMPLEXITY_3 // Fried Rice @@ -272,7 +272,7 @@ /datum/reagent/consumable/nutriment/vitamin = 10, ) tastes = list("rice" = 1, "cheese" = 1, "meatball" = 1, "olives" = 1, "herbs" = 1) - foodtypes = MEAT | GRAIN | VEGETABLES | DAIRY + foodtypes = MEAT | GRAIN | VEGETABLES | DAIRY | FRUIT w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -341,7 +341,7 @@ /datum/reagent/consumable/nutriment = 8, ) tastes = list("fried noodles" = 1, "meat" = 1, "breadcrumbs" = 1, "veggies" = 1) - foodtypes = MEAT | VEGETABLES | GRAIN + foodtypes = MEAT|VEGETABLES|GRAIN|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -392,7 +392,7 @@ /datum/reagent/medicine/omnizine = 5, ) tastes = list("masterful curry" = 1, "rice" = 1) - foodtypes = GRAIN | MEAT | VEGETABLES + foodtypes = MEAT|VEGETABLES|GRAIN|FRUIT|SUGAR w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_5 //Extensive and secretly guarded. Was previously 2 and I thought it was pathetic. @@ -422,7 +422,7 @@ /datum/reagent/consumable/nutriment/protein = 6, ) tastes = list("bun" = 1, "fried pork" = 2, "egg" = 1, "cheese" = 1, "ketchup" = 1) - foodtypes = MEAT | GRAIN | DAIRY | VEGETABLES + foodtypes = MEAT|GRAIN|DAIRY|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -438,7 +438,7 @@ /datum/reagent/consumable/capsaicin = 1, ) tastes = list("meat" = 1, "bacon" = 1, "kimchi" = 1, "salad" = 1, "rice bread" = 1) - foodtypes = MEAT | GRAIN | VEGETABLES + foodtypes = MEAT|VEGETABLES|GRAIN|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -469,7 +469,7 @@ /datum/reagent/consumable/capsaicin = 1, ) tastes = list("egg" = 1, "meat" = 1, "kimchi" = 1, "mozzarella" = 1) - foodtypes = MEAT | DAIRY | VEGETABLES | GRAIN + foodtypes = MEAT|VEGETABLES|GRAIN|DAIRY|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -484,7 +484,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("egg" = 1, "toast" = 1, "pork" = 1, "pineapple" = 1, "cheese" = 1) - foodtypes = MEAT | DAIRY | VEGETABLES | GRAIN | PINEAPPLE | BREAKFAST + foodtypes = MEAT|GRAIN|FRUIT|DAIRY|FRIED|PINEAPPLE|BREAKFAST w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -545,7 +545,7 @@ /datum/reagent/consumable/nutriment/fat/oil = 2, ) tastes = list("taco meat" = 1, "batter" = 1, "corn" = 1, "cheese" = 1) - foodtypes = MEAT | GRAIN | FRIED | VEGETABLES | DAIRY + foodtypes = MEAT|GRAIN|FRIED|VEGETABLES|DAIRY|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 //Batter AND Cargo ingredients. @@ -559,7 +559,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("batter" = 1, "cabbage" = 1, "onion" = 1, "worcestershire sauce" = 1) - foodtypes = SEAFOOD | GRAIN | FRIED | VEGETABLES + foodtypes = GRAIN|FRIED|VEGETABLES|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 //Cargo stuff and batter. @@ -595,7 +595,7 @@ /datum/reagent/consumable/worcestershire = 2, ) tastes = list("sausage" = 1, "spicy sauce" = 1, "fries" = 1) - foodtypes = MEAT | VEGETABLES + foodtypes = MEAT|VEGETABLES|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 //Cargo ingredients and a few steps. @@ -610,7 +610,7 @@ /datum/reagent/consumable/peanut_butter = 1, ) tastes = list("blood" = 1, "nuts" = 1, "herbs" = 1) - foodtypes = MEAT | NUTS | GRAIN + foodtypes = MEAT|FRIED|NUTS|GRAIN w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -654,7 +654,7 @@ /datum/reagent/consumable/nutriment = 10, ) tastes = list("bread" = 1, "egg" = 1, "meat" = 1, "onion" = 1) - foodtypes = GRAIN | MEAT | VEGETABLES | FRIED | BREAKFAST + foodtypes = MEAT|VEGETABLES|GRAIN|BREAKFAST w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -685,7 +685,7 @@ /datum/reagent/consumable/nutriment/vitamin = 8, ) tastes = list("bread" = 1, "spicy fries" = 1, "mayonnaise" = 1, "curry" = 1, "meat" = 1) - foodtypes = MEAT | GRAIN | VEGETABLES | FRIED + foodtypes = MEAT|VEGETABLES|GRAIN|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -699,7 +699,7 @@ /datum/reagent/consumable/nutriment/protein = 8, ) tastes = list("rice" = 1, "burger" = 1, "gravy" = 1, "egg" = 1) - foodtypes = MEAT | GRAIN | VEGETABLES + foodtypes = MEAT|VEGETABLES|GRAIN|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -730,7 +730,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("sausage" = 1, "pineapple" = 1, "onion" = 1, "teriyaki" = 1) - foodtypes = MEAT | VEGETABLES | FRUIT | PINEAPPLE + foodtypes = MEAT|VEGETABLES|GRAIN|FRUIT|PINEAPPLE w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 custom_price = PAYCHECK_CREW * 1.2 @@ -761,7 +761,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/char = 2) tastes = list("octopus" = 1) - foodtypes = SEAFOOD | FRIED + foodtypes = SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -775,7 +775,7 @@ /datum/reagent/consumable/nutriment/protein = 6, ) tastes = list("steak" = 1, "potato" = 1) - foodtypes = MEAT | VEGETABLES | FRIED + foodtypes = MEAT|VEGETABLES|GRAIN|DAIRY|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -791,7 +791,7 @@ /datum/reagent/consumable/garlic = 1, ) tastes = list("ham" = 1, "garlic rice" = 1, "egg" = 1) - foodtypes = MEAT | GRAIN | VEGETABLES | BREAKFAST + foodtypes = MEAT|GRAIN|FRIED|BREAKFAST|VEGETABLES w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -837,7 +837,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("chicken" = 1, "coconut" = 1, "curry" = 1) - foodtypes = MEAT | VEGETABLES | FRUIT + foodtypes = MEAT|GRAIN|FRUIT w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -897,13 +897,13 @@ /datum/reagent/consumable/nutriment/protein = 8, ) tastes = list("curry" = 1, "meat" = 1, "breadcrumbs" = 1, "rice" = 1) - foodtypes = MEAT | VEGETABLES | GRAIN + foodtypes = MEAT|GRAIN|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/salad/beef_bowl name = "beef bowl" - desc = "A tasty mix of stewed beef and onion, served over rice. Typical toppings include pickled ginger, chilli powder, and fried eggs." + desc = "A tasty mix of stewed beef, onion and dashi, served over rice. Typical toppings include pickled ginger, chilli powder, and fried eggs." icon = 'icons/obj/food/martian.dmi' icon_state = "beef_bowl" food_reagents = list( @@ -912,7 +912,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("beef" = 25, "onion" = 25, "chili heat" = 15, "rice" = 34, "soul" = 1) //I pour my soul into this bowl - foodtypes = MEAT | VEGETABLES | GRAIN + foodtypes = MEAT|VEGETABLES|GRAIN|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -929,7 +929,7 @@ /datum/reagent/consumable/salt = 2, ) tastes = list("seafood" = 1, "rice" = 1, "garlic" = 1, "ginger" = 1, "numbing heat" = 1, "salt" = 1) - foodtypes = SEAFOOD | VEGETABLES | GRAIN + foodtypes = VEGETABLES|GRAIN|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 //A few Cargo ingredients @@ -944,7 +944,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("seafood" = 1, "rice" = 1, "egg" = 1, "onion" = 1) - foodtypes = SEAFOOD | MEAT | VEGETABLES | GRAIN + foodtypes = MEAT|VEGETABLES|GRAIN|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -959,7 +959,7 @@ /datum/reagent/toxin/slimejelly = 4, ) tastes = list("grit" = 1, "slime" = 1, "gristle" = 1, "rice" = 1, "Mystery Food X" = 1) - foodtypes = GROSS | GRAIN | TOXIC + foodtypes = VEGETABLES|GRAIN|FRUIT|SEAFOOD|GROSS|TOXIC w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -977,7 +977,7 @@ /datum/reagent/consumable/garlic = 1, ) tastes = list("yoghurt" = 1, "garlic" = 1, "lemon" = 1, "egg" = 1, "chilli heat" = 1) - foodtypes = DAIRY | VEGETABLES | MEAT | BREAKFAST + foodtypes = MEAT|VEGETABLES|DAIRY|FRIED|BREAKFAST w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -993,7 +993,7 @@ /datum/reagent/consumable/orangejuice = 4, ) tastes = list("meat" = 1, "crepes" = 1, "orange" = 1) - foodtypes = MEAT | DAIRY | VEGETABLES | FRUIT + foodtypes = MEAT|GRAIN|FRUIT|SUGAR|ORANGES w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -1008,7 +1008,7 @@ /datum/reagent/consumable/nutriment/vitamin = 15 ) tastes = list("winter spices" = 2, "ambrosia vulgaris" = 2, "cake" = 5) - foodtypes = GRAIN | SUGAR | DAIRY + foodtypes = VEGETABLES|GRAIN|DAIRY|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/cake/spekkoek/make_processable() @@ -1020,7 +1020,7 @@ icon = 'icons/obj/food/martian.dmi' icon_state = "spekkoek_slice" tastes = list("winter spices" = 2, "ambrosia vulgaris" = 2, "cake" = 5) - foodtypes = GRAIN | SUGAR | DAIRY + foodtypes = VEGETABLES|GRAIN|DAIRY|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/salad/pineapple_foster @@ -1036,7 +1036,7 @@ /datum/reagent/consumable/milk = 4 ) tastes = list("pineapple" = 1, "vanilla" = 1, "caramel" = 1, "ice cream" = 1) - foodtypes = FRUIT | DAIRY | PINEAPPLE + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR|PINEAPPLE w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -1051,7 +1051,7 @@ /datum/reagent/consumable/sugar = 4, ) tastes = list("custard" = 1, "vanilla" = 1, "sweet pastry" = 1) - foodtypes = DAIRY | GRAIN + foodtypes = GRAIN|FRUIT|DAIRY w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -1080,7 +1080,7 @@ /datum/reagent/consumable/sugar = 1, ) tastes = list("banana" = 1, "batter" = 1) - foodtypes = GRAIN | FRUIT | FRIED + foodtypes = GRAIN|FRUIT|FRIED|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 //Fried goodness, oil scawy. @@ -1095,7 +1095,7 @@ /datum/reagent/consumable/sugar = 1, ) tastes = list("pineapple" = 1, "batter" = 1) - foodtypes = GRAIN | FRUIT | FRIED | PINEAPPLE + foodtypes = GRAIN|FRUIT|FRIED|PINEAPPLE|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -1143,7 +1143,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("cold pineapple" = 1, "chocolate" = 1) - foodtypes = SUGAR | PINEAPPLE + foodtypes = SUGAR|FRUIT|PINEAPPLE crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/popsicle/sea_salt @@ -1172,7 +1172,7 @@ /datum/reagent/consumable/berryjuice = 4 ) tastes = list("berry" = 1, "tofu" = 1) - foodtypes = FRUIT | VEGETABLES + foodtypes = FRUIT|SUGAR|VEGETABLES crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/popsicle/topsicle/banana @@ -1195,6 +1195,7 @@ /datum/reagent/consumable/sugar = 6, /datum/reagent/consumable/pineapplejuice = 4 ) + foodtypes = FRUIT|SUGAR|VEGETABLES|PINEAPPLE tastes = list("pineapple" = 1, "tofu" = 1) // Ballpark Food @@ -1209,7 +1210,7 @@ /datum/reagent/consumable/nutriment = 6 ) tastes = list("sausage" = 1, "relish" = 1, "onion" = 1, "fruity salsa" = 1) - foodtypes = FRUIT | MEAT | PINEAPPLE | VEGETABLES | GRAIN + foodtypes = MEAT|VEGETABLES|GRAIN|FRUIT|PINEAPPLE|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 //Uses Sambal custom_price = PAYCHECK_CREW * 2 @@ -1225,7 +1226,7 @@ /datum/reagent/consumable/capsaicin = 1, ) tastes = list("frickles" = 1) - foodtypes = VEGETABLES | GRAIN + foodtypes = VEGETABLES|GRAIN|FRIED|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 //batter and cargo stuff. diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm index bf7222b31f7..830f647c8e2 100644 --- a/code/game/objects/items/food/meatdish.dm +++ b/code/game/objects/items/food/meatdish.dm @@ -16,7 +16,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1) - foodtypes = SEAFOOD | FRIED + foodtypes = VEGETABLES|GRAIN|SEAFOOD|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -172,7 +172,7 @@ ) bite_consumption = 1 tastes = list("fish" = 1, "breadcrumbs" = 1) - foodtypes = SEAFOOD | FRIED + foodtypes = GRAIN|SEAFOOD|FRIED w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_EXOTIC crafting_complexity = FOOD_COMPLEXITY_2 @@ -215,7 +215,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("boiled rice" = 4, "carrots" = 2, "potato" = 2) - foodtypes = VEGETABLES + foodtypes = VEGETABLES|GRAIN w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -231,7 +231,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("boiled rice" = 4, "carrots" = 2, "potato" = 2) - foodtypes = VEGETABLES + foodtypes = VEGETABLES|GRAIN w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -246,7 +246,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("boiled rice" = 4, "fish" = 2, "spicyness" = 2) - foodtypes = VEGETABLES | SEAFOOD + foodtypes = VEGETABLES|GRAIN|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -264,14 +264,14 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("boiled rice" = 4, "fish" = 2, "spicyness" = 2) - foodtypes = VEGETABLES | SEAFOOD + foodtypes = VEGETABLES|GRAIN|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 // empty sushi for custom sushi /obj/item/food/sushi/empty name = "sushi" - foodtypes = NONE + foodtypes = VEGETABLES tastes = list() icon_state = "vegetariansushiroll" desc = "A roll of customized sushi." @@ -282,7 +282,7 @@ /obj/item/food/sushislice/empty name = "sushi slice" - foodtypes = NONE + foodtypes = VEGETABLES tastes = list() icon_state = "vegetariansushislice" desc = "A slice of customized sushi." @@ -295,7 +295,7 @@ icon_state = "nigiri_sushi" food_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nutriment/protein = 2) tastes = list("boiled rice" = 4, "fish filet" = 2, "soy sauce" = 2) - foodtypes = SEAFOOD | VEGETABLES + foodtypes = VEGETABLES|GRAIN|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -309,7 +309,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/nutriment/protein = 2, ) - foodtypes = SEAFOOD | MEAT | VEGETABLES + foodtypes = MEAT|VEGETABLES|GRAIN tastes = list("rice and meat" = 4, "lettuce" = 2, "soy sauce" = 2) trash_type = /obj/item/reagent_containers/cup/bowl w_class = WEIGHT_CLASS_SMALL @@ -326,7 +326,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/nutriment/protein = 2, ) - foodtypes = SEAFOOD | VEGETABLES + foodtypes = VEGETABLES|GRAIN|SEAFOOD tastes = list("rice and fish" = 4, "lettuce" = 2, "soy sauce" = 2) trash_type = /obj/item/reagent_containers/cup/bowl w_class = WEIGHT_CLASS_SMALL @@ -655,7 +655,7 @@ /datum/reagent/consumable/garlic = 1, ) tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) - foodtypes = MEAT + foodtypes = MEAT|GRAIN|VEGETABLES w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -675,7 +675,7 @@ ) bite_consumption = 3 tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) - foodtypes = MEAT + foodtypes = MEAT|GRAIN|VEGETABLES w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -735,12 +735,12 @@ ) bite_consumption = 4 tastes = list("meat" = 1, "the colour green" = 1) - foodtypes = MEAT + foodtypes = MEAT|BUGS w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/sashimi - name = "carp sashimi" + name = "spider sashimi" desc = "Celebrate surviving an attack from hostile alien lifeforms by hospitalising yourself. You sure hope whoever made this is skilled." icon = 'icons/obj/food/meat.dmi' icon_state = "sashimi" @@ -750,7 +750,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("fish" = 1, "hot peppers" = 1) - foodtypes = SEAFOOD + foodtypes = MEAT|SEAFOOD|BUGS w_class = WEIGHT_CLASS_TINY //total price of this dish is 20 and a small amount more for soy sauce, all of which are available at the orders console venue_value = FOOD_PRICE_CHEAP @@ -853,7 +853,7 @@ /datum/reagent/consumable/tomatojuice = 10, ) tastes = list("meat" = 3, "pasta" = 3, "tomato" = 2, "cheese" = 2) - foodtypes = MEAT | DAIRY | GRAIN + foodtypes = MEAT|VEGETABLES|GRAIN|DAIRY venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 @@ -920,7 +920,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("rat meat" = 1, "metal" = 1) - foodtypes = MEAT | GORE + foodtypes = MEAT|RAW|GORE venue_value = FOOD_PRICE_CHEAP /obj/item/food/kebab/rat/double @@ -1156,7 +1156,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("sausage" = 1, "bacon" = 1, "egg" = 1, "tomato" = 1, "mushrooms" = 1, "bread" = 1, "beans" = 1) - foodtypes = MEAT | VEGETABLES | GRAIN | BREAKFAST + foodtypes = MEAT|VEGETABLES|GRAIN|DAIRY|FRIED|BREAKFAST w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_EXOTIC crafting_complexity = FOOD_COMPLEXITY_5 @@ -1249,7 +1249,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2, "cucumber" = 2) - foodtypes = VEGETABLES | SEAFOOD + foodtypes = MEAT|VEGETABLES|GRAIN|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -1266,7 +1266,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2, "cucumber" = 2) - foodtypes = VEGETABLES | SEAFOOD + foodtypes = VEGETABLES|GRAIN|DAIRY|SEAFOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -1280,7 +1280,7 @@ /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 + foodtypes = VEGETABLES|GRAIN|SEAFOOD|DAIRY w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -1297,6 +1297,6 @@ /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 + foodtypes = VEGETABLES|GRAIN|SEAFOOD|DAIRY w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index ed391a57bd2..c195b76f1ca 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -512,7 +512,6 @@ name = "[source_item.name] steak" /obj/item/food/meat/steak/plain - foodtypes = MEAT /obj/item/food/meat/steak/plain/human tastes = list("tender meat" = 1) @@ -549,6 +548,7 @@ /obj/item/food/meat/steak/spider name = "spider steak" tastes = list("cobwebs" = 1) + foodtypes = parent_type::foodtypes | TOXIC /obj/item/food/meat/steak/goliath name = "goliath steak" @@ -557,7 +557,6 @@ icon_state = "goliathsteak" trash_type = null tastes = list("meat" = 1, "rock" = 1) - foodtypes = MEAT /obj/item/food/meat/steak/gondola name = "gondola steak" @@ -679,6 +678,7 @@ name = "raw spider cutlet" tastes = list("cobwebs" = 1) blood_decal_type = /obj/effect/decal/cleanable/insectguts + foodtypes = parent_type::foodtypes | TOXIC /obj/item/food/meat/rawcutlet/spider/make_grillable() AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/spider, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE) @@ -768,6 +768,7 @@ /obj/item/food/meat/cutlet/spider name = "spider cutlet" tastes = list("cobwebs" = 1) + foodtypes = parent_type::foodtypes | TOXIC /obj/item/food/meat/cutlet/gondola name = "gondola cutlet" diff --git a/code/game/objects/items/food/mexican.dm b/code/game/objects/items/food/mexican.dm index 3dc6adc1079..5f46e4f917e 100644 --- a/code/game/objects/items/food/mexican.dm +++ b/code/game/objects/items/food/mexican.dm @@ -26,7 +26,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("torilla" = 2, "beans" = 3) - foodtypes = GRAIN + foodtypes = VEGETABLES|GRAIN w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_2 @@ -42,7 +42,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("torilla" = 2, "beans" = 3, "cheese" = 1) - foodtypes = GRAIN | DAIRY + foodtypes = VEGETABLES|GRAIN|DAIRY w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_EXOTIC crafting_complexity = FOOD_COMPLEXITY_3 @@ -58,7 +58,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("torilla" = 2, "meat" = 4) - foodtypes = GRAIN | MEAT + foodtypes = VEGETABLES|GRAIN|MEAT w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_EXOTIC crafting_complexity = FOOD_COMPLEXITY_3 @@ -75,7 +75,7 @@ /datum/reagent/consumable/nutriment/vitamin = 3, ) tastes = list("torilla" = 2, "beans" = 3, "hot peppers" = 1) - foodtypes = GRAIN + foodtypes = VEGETABLES|GRAIN w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_LEGENDARY crafting_complexity = FOOD_COMPLEXITY_3 @@ -122,7 +122,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("nachos" = 2, "hot pepper" = 1) - foodtypes = VEGETABLES | FRIED | DAIRY + foodtypes = VEGETABLES|FRIED|GRAIN w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_CHEAP crafting_complexity = FOOD_COMPLEXITY_2 @@ -178,7 +178,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1) - foodtypes = MEAT | GRAIN + foodtypes = MEAT|VEGETABLES|GRAIN w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -211,7 +211,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("peppers" = 1, "salsa" = 3, "tortilla chips" = 1, "onion" = 1) - foodtypes = VEGETABLES + foodtypes = VEGETABLES|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -279,7 +279,7 @@ /datum/reagent/consumable/nutriment/protein = 6, ) tastes = list("crunchy taco shell" = 1, "cabbage" = 3, "tomatoes" = 1, "ground meat" = 1, "cheese" = 1) - foodtypes = GRAIN | VEGETABLES | MEAT | DAIRY + foodtypes = MEAT|VEGETABLES|GRAIN|DAIRY|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -294,7 +294,7 @@ /datum/reagent/consumable/nutriment/protein = 6, ) tastes = list("crunchy taco shell" = 1, "ground meat" = 1) - foodtypes = GRAIN | MEAT + foodtypes = MEAT|GRAIN|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -325,7 +325,7 @@ ) trash_type = /obj/item/reagent_containers/cup/bowl tastes = list("zesty rice" = 1, "tomato sauce" = 3,) - foodtypes = VEGETABLES + foodtypes = VEGETABLES|GRAIN w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 46ee44cd544..c1d46fb029f 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -278,7 +278,7 @@ ) w_class = WEIGHT_CLASS_NORMAL tastes = list("melon" = 1) - foodtypes = FRUIT + foodtypes = VEGETABLES|FRUIT|ORANGES w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -353,7 +353,7 @@ /datum/reagent/consumable/salt = 8, ) tastes = list("bran" = 4, "raisins" = 3, "salt" = 1) - foodtypes = GRAIN | FRUIT | BREAKFAST + foodtypes = SUGAR|GRAIN|FRUIT|BREAKFAST w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -510,7 +510,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) tastes = list("juicy meat" = 1, "rice" = 1, "cabbage" = 1) - foodtypes = MEAT | VEGETABLES + foodtypes = MEAT|VEGETABLES|GRAIN w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -553,7 +553,7 @@ /datum/reagent/consumable/nutriment/protein = 4, ) tastes = list("granola" = 1, "nuts" = 1, "chocolate" = 1, "raisin" = 1) - foodtypes = GRAIN | NUTS | FRUIT | SUGAR | DAIRY + foodtypes = GRAIN|NUTS|FRUIT|SUGAR w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -567,7 +567,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("rice" = 1, "dried seaweed" = 1) - foodtypes = VEGETABLES + foodtypes = VEGETABLES|GRAIN w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -580,7 +580,7 @@ name = "onigiri" desc = "A ball of cooked rice surrounding a filling formed into a triangular shape and wrapped in seaweed." icon_state = "onigiri" - foodtypes = VEGETABLES + foodtypes = VEGETABLES|GRAIN tastes = list() /obj/item/food/pacoca @@ -689,7 +689,7 @@ /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 + foodtypes = MEAT|VEGETABLES|GRAIN|DAIRY crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/moussaka/make_processable() @@ -705,7 +705,7 @@ /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 + foodtypes = MEAT|VEGETABLES|GRAIN|DAIRY crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/candied_pineapple @@ -718,7 +718,7 @@ icon_state = "candied_pineapple_1" base_icon_state = "candied_pineapple" tastes = list("sugar" = 2, "chewy pineapple" = 4) - foodtypes = FRUIT | SUGAR + foodtypes = SUGAR|FRUIT|PINEAPPLE food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_TINY crafting_complexity = FOOD_COMPLEXITY_1 diff --git a/code/game/objects/items/food/moth.dm b/code/game/objects/items/food/moth.dm index 367a3f29b5c..eeaa02cebc8 100644 --- a/code/game/objects/items/food/moth.dm +++ b/code/game/objects/items/food/moth.dm @@ -67,7 +67,7 @@ /datum/reagent/consumable/salt = 2, ) tastes = list("seeds" = 1, "nuts" = 1, "chocolate" = 1, "salt" = 1, "popcorn" = 1, "potato" = 1) - foodtypes = GRAIN | NUTS | VEGETABLES | SUGAR + foodtypes = JUNKFOOD|GRAIN|FRIED|NUTS|VEGETABLES w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -94,7 +94,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("cheese" = 1, "tofu" = 1, "veggies" = 1) - foodtypes = DAIRY | VEGETABLES + foodtypes = DAIRY|VEGETABLES|GRAIN w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -126,7 +126,7 @@ /datum/reagent/consumable/capsaicin = 1, ) tastes = list("cheese" = 1, "oil" = 1, "chili" = 1, "fries" = 1) - foodtypes = DAIRY | VEGETABLES + foodtypes = VEGETABLES|DAIRY|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_5 @@ -172,7 +172,7 @@ /datum/reagent/consumable/nutriment/vitamin = 10, ) tastes = list("cheese" = 1, "pesto" = 1, "pasta" = 1) - foodtypes = VEGETABLES | GRAIN | NUTS | RAW + foodtypes = VEGETABLES|GRAIN|DAIRY|NUTS|RAW w_class = WEIGHT_CLASS_NORMAL crafting_complexity = FOOD_COMPLEXITY_5 @@ -189,7 +189,7 @@ /datum/reagent/consumable/nutriment/vitamin = 18, ) tastes = list("cheese" = 1, "pesto" = 1, "pasta" = 1) - foodtypes = VEGETABLES | GRAIN | NUTS + foodtypes = VEGETABLES|GRAIN|DAIRY|NUTS w_class = WEIGHT_CLASS_NORMAL crafting_complexity = FOOD_COMPLEXITY_5 @@ -206,7 +206,7 @@ /datum/reagent/consumable/nutriment/vitamin = 3, ) tastes = list("cheese" = 1, "pesto" = 1, "pasta" = 1) - foodtypes = VEGETABLES | GRAIN | NUTS + foodtypes = VEGETABLES|GRAIN|DAIRY|NUTS w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_5 @@ -300,7 +300,7 @@ /datum/reagent/consumable/char = 1, ) tastes = list("corn" = 1, "chili" = 1, "char" = 1) - foodtypes = VEGETABLES | DAIRY + foodtypes = VEGETABLES|JUNKFOOD|DAIRY|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -347,7 +347,7 @@ /datum/reagent/consumable/nutriment/protein = 6, ) tastes = list("creamy cheese" = 1, "breading" = 1, "oil" = 1) - foodtypes = DAIRY | GRAIN | FRIED + foodtypes = GRAIN|DAIRY|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -469,7 +469,7 @@ /datum/reagent/consumable/nutriment/protein = 6, ) tastes = list("bacon" = 1, "eggs" = 1) - foodtypes = MEAT | GRAIN + foodtypes = MEAT|GRAIN|FRIED w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_4 @@ -485,7 +485,7 @@ /datum/reagent/consumable/nutriment = 10, ) tastes = list("cornmeal" = 1, "cheese" = 1, "eggplant" = 1, "tomato sauce" = 1) - foodtypes = DAIRY | GRAIN + foodtypes = VEGETABLES|GRAIN|DAIRY w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_5 @@ -786,7 +786,7 @@ /datum/reagent/consumable/nutriment/vitamin = 3, ) tastes = list("dough" = 1, "garlic" = 1, "butter" = 1) - foodtypes = GRAIN | VEGETABLES | RAW + foodtypes = GRAIN|VEGETABLES|RAW|DAIRY crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/raw_mothic_garlic/make_bakeable() @@ -804,7 +804,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) tastes = list("crust" = 1, "garlic" = 1, "butter" = 1) - foodtypes = GRAIN | VEGETABLES | DAIRY | NUTS + foodtypes = GRAIN|VEGETABLES|DAIRY slice_type = /obj/item/food/pizzaslice/mothic_garlic boxtag = "Garlic Bread alla Moffuchi" crafting_complexity = FOOD_COMPLEXITY_4 @@ -815,7 +815,7 @@ icon = 'icons/obj/food/moth.dmi' icon_state = "garlic_slice" tastes = list("dough" = 1, "garlic" = 1, "butter" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN|VEGETABLES|DAIRY crafting_complexity = FOOD_COMPLEXITY_4 //Bread diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index 556c0a0bda9..a46802c496a 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -11,7 +11,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("muffin" = 1) - foodtypes = GRAIN | SUGAR | BREAKFAST + foodtypes = GRAIN|DAIRY|SUGAR|BREAKFAST food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -21,7 +21,7 @@ icon_state = "berrymuffin" desc = "A delicious and spongy little cake, with berries." tastes = list("muffin" = 3, "berry" = 1) - foodtypes = GRAIN | FRUIT | SUGAR | BREAKFAST + foodtypes = GRAIN|DAIRY|SUGAR|BREAKFAST|FRUIT venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 @@ -31,7 +31,7 @@ alpha = 125 desc = "My stomach is a graveyard! No living being can quench my bloodthirst!" tastes = list("muffin" = 3, "spookiness" = 1) - foodtypes = GRAIN | FRUIT | SUGAR | BREAKFAST + foodtypes = GRAIN|DAIRY|SUGAR|BREAKFAST|FRUIT crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/muffin/booberry/Initialize(mapload, starting_reagent_purity, no_base_reagents) @@ -44,7 +44,7 @@ base_icon_state = "moffin" desc = "A delicious and spongy little cake." tastes = list("muffin" = 3, "dust" = 1, "lint" = 1) - foodtypes = CLOTH | GRAIN | SUGAR | BREAKFAST + foodtypes = CLOTH|DAIRY|GRAIN|SUGAR|BREAKFAST crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/muffin/moffin/Initialize(mapload) @@ -72,7 +72,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("waffles" = 1) - foodtypes = GRAIN | SUGAR | BREAKFAST + foodtypes = GRAIN|DAIRY|BREAKFAST w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -90,7 +90,7 @@ /datum/reagent/consumable/nutriment/protein = 4, ) tastes = list("waffles" = 7, "people" = 1) - foodtypes = GRAIN | MEAT + foodtypes = MEAT|GRAIN|DAIRY w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -104,7 +104,7 @@ /datum/reagent/consumable/nutriment/protein = 2, ) tastes = list("waffles" = 7, "the colour green" = 1) - foodtypes = GRAIN + foodtypes = VEGETABLES|GRAIN|DAIRY w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -119,7 +119,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("waffles" = 1, "mushrooms" = 1) - foodtypes = GRAIN | VEGETABLES | SUGAR | BREAKFAST + foodtypes = GRAIN|DAIRY|VEGETABLES|BREAKFAST w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -155,7 +155,7 @@ trash_type = /obj/item/paper/paperslip/fortune food_reagents = list(/datum/reagent/consumable/nutriment = 5) tastes = list("cookie" = 1) - foodtypes = GRAIN | SUGAR + foodtypes = GRAIN|SUGAR|DAIRY food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -187,7 +187,7 @@ /datum/reagent/consumable/sugar = 6, ) tastes = list("sweetness" = 1) - foodtypes = GRAIN | JUNKFOOD | SUGAR + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/cookie/sugar/Initialize(mapload, seasonal_changes = TRUE) @@ -206,7 +206,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("biscuit" = 3, "chocolate" = 1) - foodtypes = GRAIN | JUNKFOOD + foodtypes = JUNKFOOD|GRAIN|DAIRY|SUGAR w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -219,7 +219,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("cookie" = 2, "oat" = 1) - foodtypes = GRAIN + foodtypes = GRAIN|DAIRY crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/cookie/raisin @@ -231,7 +231,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("cookie" = 1, "raisins" = 1) - foodtypes = GRAIN | FRUIT + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/poppypretzel @@ -243,7 +243,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("pretzel" = 1) - foodtypes = GRAIN | SUGAR + foodtypes = GRAIN|DAIRY|SUGAR food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -257,7 +257,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("mushroom" = 1, "biscuit" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = VEGETABLES|GRAIN|DAIRY food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -311,7 +311,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("cake" = 3, "cherry" = 1) - foodtypes = GRAIN | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -334,6 +334,9 @@ /datum/reagent/consumable/liquidelectricity/enriched = 3, ) tastes = list("cake" = 3, "caramel" = 2, "zap" = 1) + foodtypes = GRAIN|DAIRY|VEGETABLES|SUGAR + food_flags = FOOD_FINGER_FOOD + w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 crafted_food_buff = /datum/status_effect/food/trait/shockimmune @@ -346,7 +349,7 @@ /datum/reagent/consumable/honey = 6, ) tastes = list("pastry" = 1, "sweetness" = 1) - foodtypes = GRAIN | SUGAR + foodtypes = GRAIN|DAIRY|SUGAR w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -372,7 +375,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment = 5) tastes = list("cream" = 2, "waffle" = 1) bite_consumption = 4 - foodtypes = DAIRY | SUGAR + foodtypes = DAIRY | SUGAR | GRAIN food_flags = FOOD_FINGER_FOOD crafting_complexity = FOOD_COMPLEXITY_2 max_volume = 10 //The max volumes scales up with the number of scoops of ice cream served. @@ -432,7 +435,7 @@ /datum/reagent/consumable/peanut_butter = 5, ) tastes = list("peanut butter" = 2, "cookie" = 1) - foodtypes = GRAIN | JUNKFOOD | NUTS + foodtypes = GRAIN|DAIRY|JUNKFOOD|NUTS crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/raw_brownie_batter @@ -445,7 +448,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("raw brownie batter" = 1) - foodtypes = GRAIN | JUNKFOOD | SUGAR | BREAKFAST + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR|BREAKFAST crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/raw_brownie_batter/make_bakeable() @@ -461,7 +464,7 @@ /datum/reagent/consumable/sugar = 12, ) tastes = list("brownie" = 1, "chocolatey goodness" = 1) - foodtypes = GRAIN | JUNKFOOD | SUGAR + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR|BREAKFAST w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -478,7 +481,7 @@ /datum/reagent/consumable/sugar = 3, ) tastes = list("brownie" = 1, "chocolatey goodness" = 1) - foodtypes = GRAIN | JUNKFOOD | SUGAR + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR|BREAKFAST w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -493,7 +496,7 @@ /datum/reagent/consumable/peanut_butter = 4, ) tastes = list("raw brownie batter" = 1) - foodtypes = GRAIN | JUNKFOOD | SUGAR | NUTS + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR|BREAKFAST|NUTS crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/peanut_butter_brownie_batter/make_bakeable() @@ -510,7 +513,7 @@ /datum/reagent/consumable/peanut_butter = 20, ) tastes = list("brownie" = 1, "chocolatey goodness" = 1, "peanut butter" = 1) - foodtypes = GRAIN | JUNKFOOD | SUGAR | NUTS + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR|BREAKFAST|NUTS w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -528,7 +531,7 @@ /datum/reagent/consumable/peanut_butter = 5, ) tastes = list("brownie" = 1, "chocolatey goodness" = 1) - foodtypes = GRAIN | JUNKFOOD | SUGAR + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR|BREAKFAST|NUTS w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -543,7 +546,7 @@ /datum/reagent/consumable/peanut_butter = 5, ) tastes = list("peanut butter" = 1, "peanuts" = 1, "cream" = 1) - foodtypes = GRAIN | JUNKFOOD | SUGAR | NUTS + foodtypes = GRAIN|DAIRY|JUNKFOOD|SUGAR|NUTS w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -591,7 +594,7 @@ icon_state = "thumbprint_cookie" food_reagents = list(/datum/reagent/consumable/nutriment = 6) tastes = list("cookie" = 2, "cherry jelly" = 3) - foodtypes = GRAIN | SUGAR | FRUIT + foodtypes = GRAIN|DAIRY|SUGAR|FRUIT food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm index fae0edd7a20..de9d7bb2c49 100644 --- a/code/game/objects/items/food/pie.dm +++ b/code/game/objects/items/food/pie.dm @@ -6,7 +6,7 @@ max_volume = 80 food_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("pie" = 1) - foodtypes = GRAIN + foodtypes = GRAIN | DAIRY venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_2 /// type is spawned 5 at a time and replaces this pie when processed by cutting tool @@ -24,7 +24,7 @@ w_class = WEIGHT_CLASS_TINY food_reagents = list(/datum/reagent/consumable/nutriment = 2) tastes = list("pie" = 1, "uncertainty" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN | DAIRY crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/pie/plain @@ -36,7 +36,6 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("pie" = 1) - foodtypes = GRAIN crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/pie/plain/Initialize(mapload) @@ -47,14 +46,12 @@ name = "pie" desc = "A custom pie made by a crazed chef." icon_state = "pie_custom" - foodtypes = GRAIN slice_type = /obj/item/food/pieslice/empty /obj/item/food/pieslice/empty name = "pie slice" desc = "A custom pie slice made by a crazed chef." icon_state = "pie_custom_slice" - foodtypes = GRAIN /obj/item/food/pieslice/empty/Initialize(mapload) . = ..() @@ -70,7 +67,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("pie" = 1) - foodtypes = GRAIN | DAIRY | SUGAR + foodtypes = GRAIN|DAIRY|SUGAR|FRUIT var/stunning = TRUE crafting_complexity = FOOD_COMPLEXITY_3 @@ -99,7 +96,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("pie" = 1, "blackberries" = 1) - foodtypes = GRAIN | FRUIT | SUGAR + foodtypes = GRAIN|FRUIT|DAIRY|SUGAR venue_value = FOOD_PRICE_NORMAL crafting_complexity = FOOD_COMPLEXITY_3 @@ -113,7 +110,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) tastes = list("pie" = 1, "meat" = 1, "salmon" = 1) - foodtypes = GRAIN | SUGAR | MEAT | FRUIT + foodtypes = GRAIN|DAIRY|SUGAR|MEAT|FRUIT crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/pie/meatpie @@ -126,7 +123,7 @@ /datum/reagent/consumable/nutriment/protein = 2, ) tastes = list("pie" = 1, "meat" = 1) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN|DAIRY|MEAT venue_value = FOOD_PRICE_NORMAL slice_type = /obj/item/food/pieslice/meatpie crafting_complexity = FOOD_COMPLEXITY_3 @@ -136,7 +133,7 @@ desc = "Oh nice, meat pie!" icon_state = "meatpie_slice" tastes = list("pie" = 1, "meat" = 1) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN|DAIRY|MEAT crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pie/tofupie @@ -149,7 +146,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("pie" = 1, "tofu" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN|DAIRY|VEGETABLES slice_type = /obj/item/food/pieslice/tofupie crafting_complexity = FOOD_COMPLEXITY_3 @@ -158,7 +155,7 @@ desc = "Oh nice, meat pie- WAIT A MINUTE!!" icon_state = "meatpie_slice" tastes = list("pie" = 1, "disappointment" = 1, "tofu" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN|DAIRY|VEGETABLES crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pie/amanita_pie @@ -173,7 +170,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("pie" = 1, "mushroom" = 1) - foodtypes = GRAIN | VEGETABLES | TOXIC | GROSS + foodtypes = GRAIN|DAIRY|VEGETABLES|TOXIC|GROSS crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pie/plump_pie @@ -185,7 +182,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("pie" = 1, "mushroom" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN|DAIRY|VEGETABLES crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pie/plump_pie/Initialize(mapload) @@ -210,7 +207,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("pie" = 1, "meat" = 1, "acid" = 1) - foodtypes = GRAIN | MEAT + foodtypes = MEAT|GRAIN|DAIRY slice_type = /obj/item/food/pieslice/xemeatpie crafting_complexity = FOOD_COMPLEXITY_3 @@ -219,7 +216,7 @@ desc = "Oh god... Is that still moving?" icon_state = "xenopie_slice" tastes = list("pie" = 1, "acid" = 1, "meat" = 1) - foodtypes = GRAIN | MEAT + foodtypes = GRAIN|DAIRY|MEAT crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pie/applepie @@ -231,7 +228,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) tastes = list("pie" = 1, "apple" = 1) - foodtypes = GRAIN | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR slice_type = /obj/item/food/pieslice/apple crafting_complexity = FOOD_COMPLEXITY_3 @@ -240,7 +237,7 @@ desc = "A slice of comfy apple pie, warm autumn memories ahead." icon_state = "applepie_slice" tastes = list("pie" = 1, "apples" = 1) - foodtypes = GRAIN | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 @@ -253,7 +250,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) tastes = list("pie" = 7, "Nicole Paige Brooks" = 2) - foodtypes = GRAIN | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR slice_type = /obj/item/food/pieslice/cherry crafting_complexity = FOOD_COMPLEXITY_3 @@ -262,7 +259,7 @@ desc = "A slice of delicious cherry pie, I hope it's morellos!" icon_state = "cherrypie_slice" tastes = list("pie" = 1, "apples" = 1) - foodtypes = GRAIN | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pie/pumpkinpie @@ -274,7 +271,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) tastes = list("pie" = 1, "pumpkin" = 1) - foodtypes = GRAIN | VEGETABLES | SUGAR + foodtypes = GRAIN|DAIRY|VEGETABLES|SUGAR slice_type = /obj/item/food/pieslice/pumpkin crafting_complexity = FOOD_COMPLEXITY_3 @@ -283,7 +280,7 @@ desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." icon_state = "pumpkinpieslice" tastes = list("pie" = 1, "pumpkin" = 1) - foodtypes = GRAIN | VEGETABLES | SUGAR + foodtypes = GRAIN|DAIRY|VEGETABLES|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pie/appletart @@ -296,7 +293,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("pie" = 1, "apple" = 1, "expensive metal" = 1) - foodtypes = GRAIN | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/pie/grapetart @@ -308,7 +305,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("pie" = 1, "grape" = 1) - foodtypes = GRAIN | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/pie/mimetart @@ -321,7 +318,7 @@ /datum/reagent/consumable/nothing = 10, ) tastes = list("nothing" = 3) - foodtypes = GRAIN + foodtypes = GRAIN|DAIRY|SUGAR crafted_food_buff = /datum/status_effect/food/trait/mute /obj/item/food/pie/berrytart @@ -333,7 +330,7 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) tastes = list("pie" = 1, "berries" = 2) - foodtypes = GRAIN | FRUIT + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR /obj/item/food/pie/cocolavatart name = "chocolate lava tart" @@ -344,7 +341,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("pie" = 1, "dark chocolate" = 3) - foodtypes = GRAIN | SUGAR + foodtypes = GRAIN|DAIRY|SUGAR /obj/item/food/pie/blumpkinpie name = "blumpkin pie" @@ -355,7 +352,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("pie" = 1, "a mouthful of pool water" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN|DAIRY|VEGETABLES|SUGAR slice_type = /obj/item/food/pieslice/blumpkin crafting_complexity = FOOD_COMPLEXITY_3 @@ -364,7 +361,7 @@ desc = "A slice of blumpkin pie, with whipped cream on top. Is this edible?" icon_state = "blumpkinpieslice" tastes = list("pie" = 1, "a mouthful of pool water" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN|DAIRY|VEGETABLES|SUGAR crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/pie/dulcedebatata @@ -398,7 +395,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("mint" = 1, "pie" = 1) - foodtypes = GRAIN | FRUIT | SUGAR + foodtypes = GRAIN|DAIRY|FRUIT|SUGAR slice_type = /obj/item/food/pieslice/frostypie crafting_complexity = FOOD_COMPLEXITY_3 @@ -419,7 +416,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("nuts" = 1, "pie" = 1) - foodtypes = NUTS | SUGAR + foodtypes = GRAIN|DAIRY|SUGAR slice_type = /obj/item/food/pieslice/baklava yield = 6 crafting_complexity = FOOD_COMPLEXITY_4 @@ -429,7 +426,7 @@ desc = "A portion of a delightful healthy snack made of nut layers with thin bread" icon_state = "baklavaslice" tastes = list("nuts" = 1, "pie" = 1) - foodtypes = NUTS | SUGAR + foodtypes = GRAIN|DAIRY|SUGAR crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/pie/frenchsilkpie @@ -490,7 +487,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("pie" = 1, "the far off year of 2010" = 1) - foodtypes = GRAIN + foodtypes = GRAIN|DAIRY crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/pie/bacid_pie @@ -502,7 +499,7 @@ /datum/reagent/consumable/liquidelectricity/enriched = 18 ) tastes = list("battery acid" = 2, "electricity" = 2, "a cyber world" = 2) - foodtypes = TOXIC + foodtypes = GRAIN|DAIRY|TOXIC slice_type = /obj/item/food/pieslice/bacid_pie yield = 4 crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm index b3de33e9ecd..33aefddd187 100644 --- a/code/game/objects/items/food/pizza.dm +++ b/code/game/objects/items/food/pizza.dm @@ -296,8 +296,8 @@ /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5, ) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) - foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "umami" = 1, "laziness" = 1) + foodtypes = GRAIN|VEGETABLES|DAIRY|JUNKFOOD slice_type = /obj/item/food/pizzaslice/donkpocket boxtag = "Bangin' Donk" crafting_complexity = FOOD_COMPLEXITY_3 @@ -305,7 +305,7 @@ /obj/item/food/pizza/donkpocket/raw name = "raw donkpocket pizza" icon_state = "donkpocketpizza_raw" - foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD | RAW + foodtypes = GRAIN|VEGETABLES|DAIRY|JUNKFOOD|RAW slice_type = null /obj/item/food/pizza/donkpocket/raw/make_bakeable() @@ -315,8 +315,8 @@ name = "donkpocket pizza slice" desc = "Smells like donkpocket." icon_state = "donkpocketpizzaslice" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1) - foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "umami" = 1, "laziness" = 1) + foodtypes = GRAIN|VEGETABLES|DAIRY|JUNKFOOD /obj/item/food/pizza/dank name = "dank pizza" @@ -458,12 +458,13 @@ tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2) slice_type = /obj/item/food/pizzaslice/arnold boxtag = "9mm Pepperoni" + foodtypes = MEAT|GRAIN|DAIRY|VEGETABLES crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/pizza/arnold/raw name = "raw Arnold pizza" icon_state = "arnoldpizza_raw" - foodtypes = GRAIN | DAIRY | VEGETABLES | RAW + foodtypes = MEAT|GRAIN|DAIRY|VEGETABLES|RAW slice_type = null /obj/item/food/pizza/arnold/raw/make_bakeable() @@ -539,14 +540,14 @@ ) tastes = list("pure electricity" = 4, "pizza" = 2) slice_type = /obj/item/food/pizzaslice/energy - foodtypes = TOXIC + foodtypes = GRAIN|TOXIC boxtag = "24 Hour Energy" crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/pizza/energy/raw name = "raw energy pizza" icon_state = "energypizza_raw" - foodtypes = TOXIC + foodtypes = GRAIN|TOXIC|RAW slice_type = null /obj/item/food/pizza/energy/raw/make_bakeable() @@ -557,7 +558,7 @@ desc = "You're thinking about using this to power your modsuit. You should avoid eating this if you aren't an Ethereal." icon_state ="energypizzaslice" tastes = list("pure electricity" = 4, "pizza" = 2) - foodtypes = TOXIC + foodtypes = GRAIN|TOXIC crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/raw_meat_calzone @@ -570,7 +571,7 @@ /datum/reagent/consumable/nutriment/protein = 2, ) tastes = list("raw dough" = 1, "raw meat" = 1, "cheese" = 1, "tomato sauce" = 1) - foodtypes = GRAIN | RAW | DAIRY | MEAT + foodtypes = GRAIN|VEGETABLES|DAIRY|MEAT|RAW w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -587,7 +588,7 @@ /datum/reagent/consumable/nutriment/protein = 6, ) tastes = list("baked dough" = 1, "juicy meat" = 1, "melted cheese" = 1, "tomato sauce" = 1) - foodtypes = GRAIN | DAIRY | MEAT + foodtypes = GRAIN|VEGETABLES|DAIRY|MEAT w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 @@ -600,7 +601,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("raw dough" = 1, "vegetables" = 1, "tomato sauce" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN|VEGETABLES|RAW w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm index ed9c1ba545b..58dffd65a60 100644 --- a/code/game/objects/items/food/salad.dm +++ b/code/game/objects/items/food/salad.dm @@ -36,7 +36,7 @@ icon_state = "validsalad" food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/doctor_delight = 8, /datum/reagent/consumable/nutriment/vitamin = 6) tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1) - foodtypes = VEGETABLES | MEAT | FRIED | FRUIT + foodtypes = VEGETABLES | MEAT | FRIED /obj/item/food/salad/fruit name = "fruit salad" @@ -44,7 +44,7 @@ icon_state = "fruitsalad" food_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 5) tastes = list("fruit" = 1) - foodtypes = FRUIT + foodtypes = FRUIT|ORANGES crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/salad/jungle @@ -129,7 +129,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("rice" = 1, "cheese" = 1) - foodtypes = GRAIN | DAIRY + foodtypes = GRAIN|DAIRY|VEGETABLES venue_value = FOOD_PRICE_EXOTIC crafting_complexity = FOOD_COMPLEXITY_3 @@ -143,7 +143,7 @@ /datum/reagent/consumable/nutriment/vitamin = 4, ) tastes = list("rice" = 1, "egg" = 1) - foodtypes = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017 + foodtypes = MEAT|VEGETABLES|GRAIN crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/salad/edensalad @@ -266,7 +266,7 @@ /datum/reagent/consumable/nutriment = 14, ) tastes = list("healthy greens" = 2, "olive dressing" = 1, "feta cheese" = 1) - foodtypes = VEGETABLES | DAIRY + foodtypes = VEGETABLES|FRUIT|DAIRY crafting_complexity = FOOD_COMPLEXITY_4 /obj/item/food/salad/caesar_salad @@ -303,7 +303,7 @@ /datum/reagent/consumable/nutriment/protein = 4, ) tastes = list("creamy potatoes" = 2, "eggs" = 2, "mayonnaise" = 1, "onions" = 1) - foodtypes = VEGETABLES | BREAKFAST + foodtypes = MEAT|VEGETABLES|BREAKFAST crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/salad/spinach_fruit_salad @@ -315,7 +315,7 @@ /datum/reagent/consumable/nutriment = 12, ) tastes = list("spinach" = 2, "berries" = 2, "pineapple" = 2, "dressing" = 1) - foodtypes = VEGETABLES | FRUIT + foodtypes = VEGETABLES|FRUIT|PINEAPPLE crafting_complexity = FOOD_COMPLEXITY_3 /obj/item/food/salad/antipasto_salad @@ -328,5 +328,5 @@ /datum/reagent/consumable/nutriment/protein = 6, ) tastes = list("lettuce" = 2, "salami" = 2, "mozzarella cheese" = 2, "tomatoes" = 2, "dressing" = 1) - foodtypes = VEGETABLES | DAIRY | MEAT + foodtypes = MEAT|VEGETABLES|FRUIT|DAIRY crafting_complexity = FOOD_COMPLEXITY_4 diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm index ebf934b341a..4c29252bd94 100644 --- a/code/game/objects/items/food/sandwichtoast.dm +++ b/code/game/objects/items/food/sandwichtoast.dm @@ -96,7 +96,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("butter" = 1, "toast" = 1) - foodtypes = GRAIN | BREAKFAST + foodtypes = GRAIN | BREAKFAST | DAIRY food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -119,7 +119,7 @@ /obj/item/food/jelliedtoast/slime food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/toxin/slimejelly = 8, /datum/reagent/consumable/nutriment/vitamin = 4) - foodtypes = GRAIN | TOXIC | SUGAR | BREAKFAST + foodtypes = GRAIN | TOXIC | BREAKFAST /obj/item/food/twobread name = "two bread" @@ -242,7 +242,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("bread" = 2, "Britain" = 1, "butter" = 1, "toast" = 1) - foodtypes = GRAIN + foodtypes = GRAIN|DAIRY crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/sandwich/death @@ -255,7 +255,7 @@ /datum/reagent/consumable/nutriment/vitamin = 6, ) tastes = list("bread" = 1, "meat" = 1, "tomato sauce" = 1, "death" = 1) - foodtypes = GRAIN | MEAT + foodtypes = MEAT|VEGETABLES|GRAIN eat_time = 4 SECONDS // Makes it harder to force-feed this to people as a weapon, as funny as that is. var/static/list/correct_clothing = list(/obj/item/clothing/under/rank/civilian/cookjorts, /obj/item/clothing/under/shorts/jeanshorts) diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm index deb222033ba..dfdd0e5bbe7 100644 --- a/code/game/objects/items/food/snacks.dm +++ b/code/game/objects/items/food/snacks.dm @@ -94,7 +94,7 @@ ) junkiness = 20 tastes = list("salt" = 1, "crisps" = 1) - foodtypes = JUNKFOOD | FRIED + foodtypes = VEGETABLES|JUNKFOOD|FRIED w_class = WEIGHT_CLASS_SMALL /obj/item/food/chips/make_leave_trash() diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm index e1482b17a81..450893e2cfc 100644 --- a/code/game/objects/items/food/soup.dm +++ b/code/game/objects/items/food/soup.dm @@ -32,7 +32,7 @@ /datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/nutriment/vitamin = 2, ) - foodtypes = SUGAR | DAIRY + foodtypes = SUGAR | DAIRY | JUNKFOOD | GRAIN crafting_complexity = FOOD_COMPLEXITY_2 /obj/item/food/bowled/spacylibertyduff diff --git a/code/game/objects/items/food/sweets.dm b/code/game/objects/items/food/sweets.dm index fcd5707f013..7088c2fe275 100644 --- a/code/game/objects/items/food/sweets.dm +++ b/code/game/objects/items/food/sweets.dm @@ -128,7 +128,7 @@ /datum/reagent/consumable/sugar = 1, ) tastes = list("chocolate" = 3, "oranges" = 1) - foodtypes = JUNKFOOD | SUGAR | ORANGES + foodtypes = JUNKFOOD|FRUIT|SUGAR|ORANGES food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_2 @@ -143,7 +143,7 @@ /datum/reagent/consumable/coco = 1, ) tastes = list("chocolate" = 1) - foodtypes = DAIRY | JUNKFOOD | SUGAR + foodtypes = JUNKFOOD|SUGAR food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_TINY @@ -176,7 +176,7 @@ /datum/reagent/consumable/nutriment/vitamin = 3, ) tastes = list("chocolate" = 1, "peanuts" = 1) - foodtypes = DAIRY | SUGAR | JUNKFOOD | NUTS + foodtypes = SUGAR|JUNKFOOD|NUTS crafting_complexity = FOOD_COMPLEXITY_1 /obj/item/food/bonbon/peanut_butter_cup @@ -188,7 +188,7 @@ /datum/reagent/consumable/nutriment/vitamin = 3, ) tastes = list("chocolate" = 1, "peanut butter" = 1) - foodtypes = DAIRY | SUGAR | JUNKFOOD | NUTS + foodtypes = SUGAR|JUNKFOOD|NUTS crafting_complexity = FOOD_COMPLEXITY_1 // Gum @@ -342,7 +342,7 @@ /datum/reagent/medicine/omnizine = 2, ) //lollipop, but vitamins = toxins tastes = list("cobwebs" = 1, "sugar" = 2) - foodtypes = JUNKFOOD | SUGAR | BUGS + foodtypes = JUNKFOOD|SUGAR|MEAT|BUGS food_flags = FOOD_FINGER_FOOD slot_flags = ITEM_SLOT_MASK crafting_complexity = FOOD_COMPLEXITY_1 diff --git a/code/game/objects/items/food/vegetables.dm b/code/game/objects/items/food/vegetables.dm index 8c0962106b1..000ada0907c 100644 --- a/code/game/objects/items/food/vegetables.dm +++ b/code/game/objects/items/food/vegetables.dm @@ -126,7 +126,7 @@ /datum/reagent/consumable/nutriment/vitamin = 2, ) tastes = list("fries" = 3, "cheese" = 1) - foodtypes = VEGETABLES | DAIRY + foodtypes = VEGETABLES|DAIRY|FRIED w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_CHEAP preserved_food = TRUE @@ -158,7 +158,7 @@ icon_state = "poutine" food_reagents = list(/datum/reagent/consumable/nutriment = 7) tastes = list("potato" = 3, "gravy" = 1, "squeaky cheese" = 1) - foodtypes = VEGETABLES | FRIED | MEAT + foodtypes = VEGETABLES|DAIRY|FRIED|MEAT w_class = WEIGHT_CLASS_SMALL venue_value = FOOD_PRICE_CHEAP preserved_food = TRUE diff --git a/code/modules/events/holiday/easter.dm b/code/modules/events/holiday/easter.dm index d10fb681cc5..dad3f31ba89 100644 --- a/code/modules/events/holiday/easter.dm +++ b/code/modules/events/holiday/easter.dm @@ -158,7 +158,7 @@ /datum/reagent/consumable/sugar = 1 ) result = /obj/item/food/hotcrossbun - + added_foodtypes = SUGAR | BREAKFAST category = CAT_BREAD /datum/crafting_recipe/food/briochecake @@ -178,6 +178,7 @@ bite_consumption = 3 food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2) crafting_complexity = FOOD_COMPLEXITY_2 + foodtypes = MEAT /datum/crafting_recipe/food/scotchegg name = "Scotch egg" @@ -188,6 +189,7 @@ /obj/item/food/meatball = 1 ) result = /obj/item/food/scotchegg + removed_foodtypes = BREAKFAST category = CAT_EGG /datum/crafting_recipe/food/mammi @@ -198,6 +200,7 @@ /datum/reagent/consumable/milk = 5 ) result = /obj/item/food/bowled/mammi + added_foodtypes = DAIRY category = CAT_MISCFOOD /obj/item/food/chocolatebunny @@ -206,6 +209,7 @@ icon_state = "chocolatebunny" food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2, /datum/reagent/consumable/nutriment/vitamin = 1) crafting_complexity = FOOD_COMPLEXITY_1 + foodtypes = JUNKFOOD | SUGAR /datum/crafting_recipe/food/chocolatebunny name = "Chocolate bunny" diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index e8456d880ed..e90f3ac6dbc 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -1,6 +1,10 @@ /datum/crafting_recipe/food mass_craftable = TRUE crafting_flags = parent_type::crafting_flags | CRAFT_TRANSFERS_REAGENTS | CRAFT_CLEARS_REAGENTS + ///The food types that are added to the result when the recipe is completed + var/added_foodtypes = NONE + ///The food types that are removed to the result when the recipe is completed + var/removed_foodtypes = NONE /datum/crafting_recipe/food/on_craft_completion(mob/user, atom/result) SHOULD_CALL_PARENT(TRUE) @@ -12,6 +16,31 @@ . = ..() parts |= reqs + //rarely, but a few cooking recipes (cake cat & co) don't result food items. + if(!PERFORM_ALL_TESTS(focus_only/check_foodtypes) || non_craftable || !ispath(result, /obj/item/food)) + return + + // Food made from these recipes should inherit the food types of the food ingredients used in it + // 'added_foodtypes' and 'added_foodtypes' exist to add and remove (un)desiderable types + // If the food types of the result don't match when spawned compared to when crafted (with base ingredients), throw a warning. + var/made_with_food = FALSE + var/actual_foodtypes = added_foodtypes + for(var/req_path in reqs) + if(!ispath(req_path, /obj/item/food)) + continue + var/obj/item/food/ingredient = req_path + made_with_food = TRUE + actual_foodtypes |= initial(ingredient.foodtypes) + if(!made_with_food) + return + actual_foodtypes &= ~removed_foodtypes + var/obj/item/food/result_path = result + var/result_foodtypes = initial(result_path.foodtypes) + if(result_foodtypes != actual_foodtypes) + var/text_flags = jointext(bitfield_to_list(result_foodtypes, FOOD_FLAGS),"|") + var/text_craft_flags = jointext(bitfield_to_list(actual_foodtypes, FOOD_FLAGS),"|") + stack_trace("the foodtypes of [result_path] are [text_flags] when spawned but [text_craft_flags] when crafted.") + /datum/crafting_recipe/food/crafting_ui_data() var/list/data = list() 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 d0517272d77..c09767282c3 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -40,6 +40,7 @@ /obj/item/food/sausage = 2, ) result = /obj/item/food/bread/sausage + removed_foodtypes = BREAKFAST category = CAT_BREAD /datum/crafting_recipe/food/banananutbread @@ -51,6 +52,7 @@ /obj/item/food/grown/banana = 1 ) result = /obj/item/food/bread/banana + removed_foodtypes = BREAKFAST category = CAT_BREAD /datum/crafting_recipe/food/tofubread @@ -101,6 +103,7 @@ /obj/item/food/butterslice = 1 ) result = /obj/item/food/butterbiscuit + added_foodtypes = BREAKFAST category = CAT_BREAD /datum/crafting_recipe/food/butterdog @@ -117,7 +120,7 @@ time = 40 reqs = list(/datum/reagent/consumable/salt = 1, /datum/reagent/consumable/blackpepper = 1, - /obj/item/food/pastrybase = 2 + /obj/item/food/doughslice = 2, ) result = /obj/item/food/baguette category = CAT_BREAD @@ -174,6 +177,7 @@ /obj/item/food/breadslice/plain = 1 ) result = /obj/item/food/jelliedtoast/slime + added_foodtypes = TOXIC | BREAKFAST category = CAT_BREAD /datum/crafting_recipe/food/jelliedyoast @@ -183,6 +187,7 @@ /obj/item/food/breadslice/plain = 1 ) result = /obj/item/food/jelliedtoast/cherry + added_foodtypes = FRUIT | SUGAR | BREAKFAST category = CAT_BREAD /datum/crafting_recipe/food/butteredtoast @@ -192,6 +197,7 @@ /obj/item/food/butterslice = 1 ) result = /obj/item/food/butteredtoast + added_foodtypes = BREAKFAST category = CAT_BREAD /datum/crafting_recipe/food/twobread @@ -210,6 +216,8 @@ /obj/item/food/grown/mushroom/amanita = 1 ) result = /obj/item/food/breadslice/moldy + removed_foodtypes = VEGETABLES|GRAIN + added_foodtypes = GROSS category = CAT_BREAD /datum/crafting_recipe/food/breadcat @@ -233,4 +241,5 @@ /datum/reagent/consumable/milk = 5 ) result = /obj/item/food/raw_frenchtoast + added_foodtypes = BREAKFAST 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 2953f8408ac..9f857a73a9b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -43,6 +43,7 @@ /obj/item/food/bun = 1 ) result = /obj/item/food/burger/appendix + added_foodtypes = MEAT | GORE category = CAT_BURGER /datum/crafting_recipe/food/brainburger @@ -52,6 +53,7 @@ /obj/item/food/bun = 1 ) result = /obj/item/food/burger/brain + added_foodtypes = MEAT | GORE category = CAT_BURGER /datum/crafting_recipe/food/xenoburger @@ -233,6 +235,7 @@ ) result = /obj/item/food/burger/superbite + removed_foodtypes = BREAKFAST category = CAT_BURGER /datum/crafting_recipe/food/slimeburger @@ -242,6 +245,7 @@ /obj/item/food/bun = 1 ) result = /obj/item/food/burger/jelly/slime + added_foodtypes = TOXIC category = CAT_BURGER /datum/crafting_recipe/food/jellyburger @@ -251,6 +255,7 @@ /obj/item/food/bun = 1 ) result = /obj/item/food/burger/jelly/cherry + added_foodtypes = FRUIT category = CAT_BURGER /datum/crafting_recipe/food/fivealarmburger @@ -279,6 +284,7 @@ /obj/item/food/bun = 1 ) result = /obj/item/food/burger/baseball + added_foodtypes = GROSS category = CAT_BURGER /datum/crafting_recipe/food/baconburger @@ -289,6 +295,7 @@ ) result = /obj/item/food/burger/baconburger + removed_foodtypes = BREAKFAST category = CAT_BURGER /datum/crafting_recipe/food/empoweredburger @@ -299,6 +306,7 @@ ) result = /obj/item/food/burger/empoweredburger + added_foodtypes = TOXIC category = CAT_BURGER /datum/crafting_recipe/food/catburger @@ -310,6 +318,7 @@ /obj/item/organ/tail/cat = 1, ) result = /obj/item/food/burger/catburger + added_foodtypes = GORE category = CAT_BURGER /datum/crafting_recipe/food/crabburger 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 86956ba861c..de8a2f4e57d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -75,6 +75,7 @@ /datum/reagent/consumable/caramel = 2 ) result = /obj/item/food/cake/birthday + added_foodtypes = JUNKFOOD category = CAT_CAKE /datum/crafting_recipe/food/energycake @@ -94,6 +95,7 @@ /obj/item/food/cake/plain = 1 ) result = /obj/item/food/cake/brain + added_foodtypes = MEAT | GORE category = CAT_CAKE /datum/crafting_recipe/food/slimecake @@ -129,6 +131,7 @@ /obj/item/food/cake/plain = 4 ) result = /obj/item/food/cake/pound_cake + added_foodtypes = JUNKFOOD category = CAT_CAKE /datum/crafting_recipe/food/hardwarecake @@ -139,6 +142,7 @@ /datum/reagent/toxin/acid = 5 ) result = /obj/item/food/cake/hardware_cake + added_foodtypes = GROSS category = CAT_CAKE /datum/crafting_recipe/food/berry_chocolate_cake @@ -149,6 +153,7 @@ /obj/item/food/grown/berries = 5 ) result = /obj/item/food/cake/berry_chocolate_cake + removed_foodtypes = JUNKFOOD category = CAT_CAKE /datum/crafting_recipe/food/pavlovacream @@ -160,6 +165,7 @@ /obj/item/food/grown/berries = 5 ) result = /obj/item/food/cake/pavlova + added_foodtypes = SUGAR|DAIRY category = CAT_CAKE /datum/crafting_recipe/food/pavlovakorta @@ -171,6 +177,7 @@ /obj/item/food/grown/berries = 5 ) result = /obj/item/food/cake/pavlova/nuts + added_foodtypes = SUGAR|NUTS category = CAT_CAKE /datum/crafting_recipe/food/berry_vanilla_cake @@ -212,6 +219,7 @@ /datum/reagent/consumable/berryjuice = 5 ) result = /obj/item/food/cake/trumpet + added_foodtypes = FRUIT category = CAT_CAKE @@ -238,6 +246,7 @@ /datum/reagent/consumable/ethanol/rum = 5 ) result = /obj/item/food/cake/fruit + removed_foodtypes = JUNKFOOD category = CAT_CAKE /datum/crafting_recipe/food/plumcake diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm index 7b8c071b3a5..c2de18daf0e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm @@ -19,6 +19,8 @@ /obj/item/food/cheese/wedge = 2 ) result = /obj/item/food/omelette + added_foodtypes = BREAKFAST + removed_foodtypes = RAW category = CAT_EGG /datum/crafting_recipe/food/chocolateegg @@ -28,6 +30,7 @@ /obj/item/food/chocolatebar = 1 ) result = /obj/item/food/chocolateegg + removed_foodtypes = MEAT|BREAKFAST //This recipe is very wrong, please change it ffs category = CAT_EGG /datum/crafting_recipe/food/eggsbenedict @@ -50,6 +53,7 @@ /obj/item/food/grown/corn = 1 ) result = /obj/item/food/salad/eggbowl + removed_foodtypes = BREAKFAST category = CAT_EGG /datum/crafting_recipe/food/wrap @@ -59,6 +63,7 @@ /obj/item/food/grown/cabbage = 1, ) result = /obj/item/food/eggwrap + removed_foodtypes = BREAKFAST category = CAT_EGG /datum/crafting_recipe/food/chawanmushi @@ -70,5 +75,6 @@ /obj/item/food/grown/mushroom/chanterelle = 1 ) result = /obj/item/food/chawanmushi + removed_foodtypes = BREAKFAST category = CAT_EGG diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index 0e71758b063..8ac20e53398 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -32,6 +32,7 @@ /obj/item/food/icecream = 1 ) result = /obj/item/food/spacefreezy + added_foodtypes = FRUIT category = CAT_ICE /datum/crafting_recipe/food/sundae @@ -67,6 +68,7 @@ /obj/item/food/icecream = 1 ) result = /obj/item/food/cornuto + removed_foodtypes = JUNKFOOD category = CAT_ICE //////////////////////////SNOW CONES/////////////////////// @@ -295,6 +297,8 @@ /datum/reagent/consumable/sugar = 2 ) result = /obj/item/food/popsicle/jumbo + added_foodtypes = DAIRY + removed_foodtypes = JUNKFOOD category = CAT_ICE /datum/crafting_recipe/food/licorice_creamsicle @@ -320,4 +324,5 @@ /datum/reagent/consumable/sugar = 2 ) result = /obj/item/food/popsicle/meatsicle + added_foodtypes = SUGAR category = CAT_ICE 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 d9f9cd16fe9..8b7a523f78e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm @@ -17,6 +17,7 @@ /datum/reagent/consumable/blackpepper = 5 ) result = /obj/item/food/raw_headcheese + added_foodtypes = GORE category = CAT_LIZARD /datum/crafting_recipe/food/shredded_lungs @@ -33,6 +34,7 @@ ) result = /obj/item/food/shredded_lungs + added_foodtypes = MEAT|GORE category = CAT_LIZARD /datum/crafting_recipe/food/tsatsikh @@ -56,6 +58,7 @@ /obj/item/food/grown/onion = 1 ) result = /obj/item/food/liver_pate + removed_foodtypes = RAW category = CAT_LIZARD /datum/crafting_recipe/food/moonfish_caviar @@ -78,6 +81,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/lizard_escargot + removed_foodtypes = GORE category = CAT_LIZARD /datum/crafting_recipe/food/fried_blood_sausage @@ -88,6 +92,8 @@ /datum/reagent/water = 5 ) result = /obj/item/food/fried_blood_sausage + added_foodtypes = FRIED|NUTS + removed_foodtypes = RAW category = CAT_LIZARD /datum/crafting_recipe/food/lizard_fries @@ -110,6 +116,7 @@ /datum/reagent/consumable/salt = 3 ) result = /obj/item/food/brain_pate + added_foodtypes = MEAT|GORE category = CAT_LIZARD /datum/crafting_recipe/food/crispy_headcheese @@ -175,22 +182,12 @@ /obj/item/food/meat/steak = 1, /obj/item/food/bbqribs = 1 ) + removed_foodtypes = SUGAR result = /obj/item/food/lizard_surf_n_turf category = CAT_LIZARD /datum/crafting_recipe/food/rootdough - name = "Rootdough" - reqs = list( - /obj/item/food/grown/potato = 2, - /obj/item/food/egg = 1, - /datum/reagent/consumable/korta_flour = 5, - /datum/reagent/water = 10 - ) - result = /obj/item/food/rootdough - category = CAT_LIZARD - -/datum/crafting_recipe/food/rootdough2 - name = "Rootdough" + name = "Rootdough (Without Eggs)" reqs = list( /obj/item/food/grown/potato = 2, /datum/reagent/consumable/soymilk = 15, @@ -198,8 +195,20 @@ /datum/reagent/water = 10 ) result = /obj/item/food/rootdough + added_foodtypes = NUTS category = CAT_LIZARD +/datum/crafting_recipe/food/rootdough/with_eggs + name = "Rootdough (With Eggs)" + reqs = list( + /obj/item/food/grown/potato = 2, + /obj/item/food/egg = 1, + /datum/reagent/consumable/korta_flour = 5, + /datum/reagent/water = 10 + ) + result = /obj/item/food/rootdough/egg + removed_foodtypes = RAW + /datum/crafting_recipe/food/snail_nizaya name = "Desert snail nizaya" reqs = list( @@ -209,6 +218,7 @@ /datum/reagent/consumable/ethanol/wine = 5 ) result = /obj/item/food/spaghetti/snail_nizaya + removed_foodtypes = GORE category = CAT_LIZARD /datum/crafting_recipe/food/garlic_nizaya @@ -233,6 +243,7 @@ /datum/reagent/consumable/korta_nectar = 5 ) result = /obj/item/food/spaghetti/demit_nizaya + added_foodtypes = SUGAR category = CAT_LIZARD /datum/crafting_recipe/food/mushroom_nizaya @@ -308,6 +319,7 @@ /obj/item/organ/liver = 1 ) result = /obj/item/food/pizza/flatbread/zmorgast + removed_foodtypes = RAW category = CAT_LIZARD /datum/crafting_recipe/food/fish_flatbread @@ -339,6 +351,7 @@ /datum/reagent/consumable/korta_milk = 5 ) result = /obj/item/food/pizza/flatbread/nutty + removed_foodtypes = VEGETABLES //This is so nuts category = CAT_LIZARD /datum/crafting_recipe/food/emperor_roll @@ -371,6 +384,8 @@ /datum/reagent/consumable/vinegar = 2 ) result = /obj/item/food/black_eggs + added_foodtypes = GORE|BREAKFAST + removed_foodtypes = RAW category = CAT_LIZARD /datum/crafting_recipe/food/patzikula @@ -382,18 +397,21 @@ /obj/item/food/egg = 2 ) result = /obj/item/food/patzikula + removed_foodtypes = RAW + added_foodtypes = BREAKFAST category = CAT_LIZARD /datum/crafting_recipe/food/korta_brittle name = "Korta brittle slab" reqs = list( /obj/item/food/grown/korta_nut = 2, - /obj/item/food/butterslice = 1, /datum/reagent/consumable/korta_nectar = 5, /datum/reagent/consumable/sugar = 5, + /datum/reagent/consumable/nutriment/fat/oil = 3, /datum/reagent/consumable/salt = 2 ) result = /obj/item/food/cake/korta_brittle + added_foodtypes = SUGAR category = CAT_LIZARD /datum/crafting_recipe/food/korta_ice @@ -405,6 +423,7 @@ /obj/item/food/grown/berries = 1 ) result = /obj/item/food/snowcones/korta_ice + added_foodtypes = SUGAR|NUTS category = CAT_LIZARD /datum/crafting_recipe/food/candied_mushrooms @@ -416,6 +435,7 @@ /datum/reagent/consumable/salt = 1 ) result = /obj/item/food/kebab/candied_mushrooms + added_foodtypes = SUGAR category = CAT_LIZARD /datum/crafting_recipe/food/sauerkraut @@ -434,6 +454,7 @@ /datum/reagent/consumable/korta_flour = 5 ) result = /obj/item/food/lizard_dumplings + added_foodtypes = NUTS category = CAT_LIZARD /datum/crafting_recipe/food/steeped_mushrooms @@ -453,6 +474,7 @@ /datum/reagent/consumable/cherryjelly = 5 ) result = /obj/item/food/rootbread_peanut_butter_jelly + added_foodtypes = FRUIT category = CAT_LIZARD /datum/crafting_recipe/food/rootbreadpbb @@ -463,6 +485,7 @@ /obj/item/food/grown/banana = 1 ) result = /obj/item/food/rootbread_peanut_butter_banana + added_foodtypes = FRUIT category = CAT_LIZARD // Soups 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 a0f60b19221..d903a2c5700 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm @@ -48,6 +48,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/sambal + added_foodtypes = SEAFOOD //Until we have easy to get shrimp to add to the recipe category = CAT_MARTIAN /datum/crafting_recipe/food/katsu_fillet @@ -57,6 +58,8 @@ /obj/item/food/breadslice/reispan = 1, ) result = /obj/item/food/katsu_fillet + removed_foodtypes = RAW + added_foodtypes = FRIED category = CAT_MARTIAN /datum/crafting_recipe/food/rice_dough @@ -83,6 +86,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/hurricane_rice + removed_foodtypes = RAW|BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/ikareis @@ -97,6 +101,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/ikareis + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/hawaiian_fried_rice @@ -111,6 +116,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/hawaiian_fried_rice + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/ketchup_fried_rice @@ -126,6 +132,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/ketchup_fried_rice + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/mediterranean_fried_rice @@ -140,6 +147,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/mediterranean_fried_rice + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/egg_fried_rice @@ -151,6 +159,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/egg_fried_rice + removed_foodtypes = BREAKFAST|RAW category = CAT_MARTIAN /datum/crafting_recipe/food/bibimbap @@ -165,6 +174,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/bibimbap + removed_foodtypes = RAW|BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/bulgogi_noodles @@ -208,6 +218,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/martian_fried_noodles + removed_foodtypes = RAW category = CAT_MARTIAN /datum/crafting_recipe/food/simple_fried_noodles @@ -238,6 +249,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/setagaya_curry + removed_foodtypes = RAW|JUNKFOOD|BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/big_blue_burger @@ -252,6 +264,7 @@ /datum/reagent/consumable/nutriment/soup/teriyaki = 4, ) result = /obj/item/food/burger/big_blue + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/chappy_patty @@ -264,6 +277,7 @@ /datum/reagent/consumable/ketchup = 3, ) result = /obj/item/food/burger/chappy + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/king_katsu_sandwich @@ -277,6 +291,7 @@ /obj/item/food/grown/tomato = 1, ) result = /obj/item/food/king_katsu_sandwich + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/marte_cubano_sandwich @@ -288,6 +303,7 @@ /obj/item/food/cheese/wedge = 1, ) result = /obj/item/food/marte_cubano_sandwich + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/little_shiro_sandwich @@ -301,6 +317,7 @@ /obj/item/food/grown/herbs = 1, ) result = /obj/item/food/little_shiro_sandwich + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/croque_martienne @@ -336,6 +353,7 @@ /datum/reagent/consumable/worcestershire = 3, ) result = /obj/item/food/takoyaki + added_foodtypes = GRAIN|FRIED category = CAT_MARTIAN /datum/crafting_recipe/food/russian_takoyaki @@ -347,6 +365,7 @@ /datum/reagent/consumable/capsaicin = 3, ) result = /obj/item/food/takoyaki/russian + added_foodtypes = GRAIN|FRIED category = CAT_MARTIAN /datum/crafting_recipe/food/tacoyaki @@ -359,6 +378,7 @@ /obj/item/food/cheese/wedge = 1, ) result = /obj/item/food/takoyaki/taco + added_foodtypes = GRAIN|FRIED|SEAFOOD category = CAT_MARTIAN /datum/crafting_recipe/food/okonomiyaki @@ -371,6 +391,7 @@ /obj/item/food/grown/potato/sweet = 1, ) result = /obj/item/food/okonomiyaki + added_foodtypes = GRAIN|FRIED|SEAFOOD category = CAT_MARTIAN /datum/crafting_recipe/food/brat_kimchi @@ -381,6 +402,7 @@ /datum/reagent/consumable/sugar = 3, ) result = /obj/item/food/brat_kimchi + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/tonkatsuwurst @@ -392,6 +414,7 @@ /datum/reagent/consumable/red_bay = 2, ) result = /obj/item/food/tonkatsuwurst + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/ti_hoeh_koe @@ -403,6 +426,8 @@ /datum/reagent/blood = 5, ) result = /obj/item/food/kebab/ti_hoeh_koe + removed_foodtypes = JUNKFOOD|VEGETABLES|BREAKFAST + added_foodtypes = MEAT|FRIED category = CAT_MARTIAN /datum/crafting_recipe/food/kitzushi @@ -414,6 +439,8 @@ /obj/item/food/grown/chili = 1, ) result = /obj/item/food/kitzushi + removed_foodtypes = BREAKFAST + added_foodtypes = FRIED category = CAT_MARTIAN /datum/crafting_recipe/food/epok_epok @@ -426,6 +453,8 @@ /datum/reagent/consumable/curry_powder = 3, ) result = /obj/item/food/epok_epok + removed_foodtypes = BREAKFAST + added_foodtypes = FRIED category = CAT_MARTIAN /datum/crafting_recipe/food/roti_john @@ -439,6 +468,8 @@ /datum/reagent/consumable/mayonnaise = 3, ) result = /obj/item/food/roti_john + added_foodtypes = BREAKFAST + removed_foodtypes = RAW category = CAT_MARTIAN /datum/crafting_recipe/food/izakaya_fries @@ -473,6 +504,7 @@ /datum/reagent/consumable/gravy = 5, ) result = /obj/item/food/loco_moco + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/wild_duck_fries @@ -516,6 +548,7 @@ /obj/item/food/breadslice/reispan = 1, ) result = /obj/item/food/steak_croquette + added_foodtypes = FRIED category = CAT_MARTIAN /datum/crafting_recipe/food/chapsilog @@ -539,6 +572,8 @@ /obj/item/food/onion_slice = 1, ) result = /obj/item/food/chap_hash + removed_foodtypes = RAW + added_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/agedashi_tofu @@ -550,6 +585,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/agedashi_tofu + added_foodtypes = SEAFOOD category = CAT_MARTIAN /datum/crafting_recipe/food/po_kok_gai @@ -562,6 +598,8 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/po_kok_gai + added_foodtypes = FRUIT + removed_foodtypes = RAW|BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/huoxing_tofu @@ -574,6 +612,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/huoxing_tofu + removed_foodtypes = RAW category = CAT_MARTIAN /datum/crafting_recipe/food/feizhou_ji @@ -585,6 +624,7 @@ /datum/reagent/consumable/vinegar = 5, ) result = /obj/item/food/feizhou_ji + removed_foodtypes = RAW category = CAT_MARTIAN /datum/crafting_recipe/food/galinha_de_cabidela @@ -597,6 +637,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/galinha_de_cabidela + removed_foodtypes = RAW category = CAT_MARTIAN /datum/crafting_recipe/food/katsu_curry @@ -608,6 +649,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/katsu_curry + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/beef_bowl @@ -620,6 +662,8 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/beef_bowl + removed_foodtypes = BREAKFAST + added_foodtypes = SEAFOOD category = CAT_MARTIAN /datum/crafting_recipe/food/salt_chilli_bowl @@ -634,6 +678,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/salt_chilli_bowl + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/kansai_bowl @@ -647,6 +692,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/kansai_bowl + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/eigamudo_curry @@ -660,6 +706,8 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/eigamudo_curry + removed_foodtypes = BREAKFAST + added_foodtypes = GROSS|TOXIC category = CAT_MARTIAN /datum/crafting_recipe/food/cilbir @@ -672,6 +720,7 @@ /datum/reagent/consumable/nutriment/fat/oil/olive = 2, ) result = /obj/item/food/cilbir + added_foodtypes = DAIRY category = CAT_MARTIAN /datum/crafting_recipe/food/peking_duck_crepes @@ -683,6 +732,7 @@ /datum/reagent/consumable/ethanol/cognac = 2, ) result = /obj/item/food/peking_duck_crepes + removed_foodtypes = BREAKFAST category = CAT_MARTIAN /datum/crafting_recipe/food/vulgaris_spekkoek @@ -716,6 +766,7 @@ /datum/reagent/consumable/sugar = 2, ) result = /obj/item/food/pastel_de_nata + removed_foodtypes = MEAT|RAW category = CAT_MARTIAN /datum/crafting_recipe/food/boh_loh_yah @@ -726,6 +777,7 @@ /datum/reagent/consumable/sugar = 5, ) result = /obj/item/food/boh_loh_yah + added_foodtypes = PINEAPPLE // someone thought it's funny to give it this foodtype smh category = CAT_MARTIAN /datum/crafting_recipe/food/banana_fritter @@ -735,6 +787,7 @@ /datum/reagent/consumable/martian_batter = 2 ) result = /obj/item/food/banana_fritter + added_foodtypes = GRAIN|FRIED|SEAFOOD category = CAT_MARTIAN /datum/crafting_recipe/food/pineapple_fritter @@ -744,6 +797,7 @@ /datum/reagent/consumable/martian_batter = 2 ) result = /obj/item/food/pineapple_fritter + added_foodtypes = GRAIN|FRIED|SEAFOOD category = CAT_MARTIAN /datum/crafting_recipe/food/kasei_dango @@ -756,6 +810,7 @@ /datum/reagent/consumable/grenadine = 2, ) result = /obj/item/food/kebab/kasei_dango + added_foodtypes = GRAIN category = CAT_MARTIAN /datum/crafting_recipe/food/pb_ice_cream_mochi @@ -767,6 +822,7 @@ /obj/item/food/icecream = 1, ) result = /obj/item/food/pb_ice_cream_mochi + added_foodtypes = NUTS category = CAT_MARTIAN /datum/crafting_recipe/food/frozen_pineapple_pop @@ -777,6 +833,7 @@ /obj/item/popsicle_stick = 1, ) result = /obj/item/food/popsicle/pineapple_pop + removed_foodtypes = JUNKFOOD category = CAT_MARTIAN /datum/crafting_recipe/food/sea_salt_pop @@ -799,6 +856,7 @@ /obj/item/popsicle_stick = 1, ) result = /obj/item/food/popsicle/topsicle + added_foodtypes = SUGAR|FRUIT category = CAT_MARTIAN /datum/crafting_recipe/food/banana_topsicle @@ -810,9 +868,10 @@ /obj/item/popsicle_stick = 1, ) result = /obj/item/food/popsicle/topsicle/banana + added_foodtypes = SUGAR|FRUIT category = CAT_MARTIAN -/datum/crafting_recipe/food/berry_topsicle +/datum/crafting_recipe/food/pineapple_topsicle name = "Pineapple topsicle" reqs = list( /obj/item/food/tofu = 1, @@ -821,6 +880,7 @@ /obj/item/popsicle_stick = 1, ) result = /obj/item/food/popsicle/topsicle/pineapple + added_foodtypes = SUGAR|FRUIT|PINEAPPLE category = CAT_MARTIAN /datum/crafting_recipe/food/plasma_dog_supreme @@ -842,6 +902,7 @@ /datum/reagent/consumable/red_bay = 1, ) result = /obj/item/food/frickles + added_foodtypes = GRAIN|FRIED|SEAFOOD category = CAT_MARTIAN /datum/crafting_recipe/food/raw_ballpark_pretzel @@ -851,6 +912,7 @@ /datum/reagent/consumable/salt = 2, ) result = /obj/item/food/raw_ballpark_pretzel + added_foodtypes = RAW category = CAT_MARTIAN /datum/crafting_recipe/food/raw_ballpark_tsukune @@ -873,6 +935,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/sprout_bowl + removed_foodtypes = BREAKFAST category = CAT_MARTIAN // Soups 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 9244f4c54f3..ffefd116ba2 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -60,6 +60,7 @@ /obj/item/food/meat/cutlet/spider = 2 ) result = /obj/item/food/spidereggsham + removed_foodtypes = TOXIC category = CAT_MEAT ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// @@ -71,6 +72,7 @@ /obj/item/seeds/plump = 1 ) result = /obj/item/food/tempehstarter + added_foodtypes = GROSS category = CAT_MEAT /datum/crafting_recipe/food/cornedbeef @@ -91,6 +93,7 @@ ) tool_paths = list(/obj/item/lighter) result = /obj/item/food/bearsteak + added_foodtypes = ALCOHOL category = CAT_MEAT /datum/crafting_recipe/food/stewedsoymeat @@ -177,6 +180,7 @@ /obj/item/food/meat/cutlet = 2 ) result = /obj/item/food/salad/ricepork + removed_foodtypes = BREAKFAST category = CAT_MEAT /datum/crafting_recipe/food/ribs @@ -187,6 +191,7 @@ /obj/item/stack/rods = 2 ) result = /obj/item/food/bbqribs + added_foodtypes = SUGAR category = CAT_MEAT /datum/crafting_recipe/food/meatclown @@ -219,6 +224,7 @@ /obj/item/food/meat/cutlet = 1 ) result = /obj/item/food/salad/gumbo + removed_foodtypes = BREAKFAST category = CAT_MEAT @@ -230,6 +236,8 @@ /datum/reagent/consumable/corn_starch = 5, ) result = /obj/item/food/fried_chicken + removed_foodtypes = RAW + added_foodtypes = FRIED category = CAT_MEAT /datum/crafting_recipe/food/beef_stroganoff @@ -246,6 +254,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/beef_stroganoff + added_foodtypes = DAIRY category = CAT_MEAT /datum/crafting_recipe/food/beef_wellington @@ -261,6 +270,7 @@ /datum/reagent/consumable/blackpepper = 2 ) result = /obj/item/food/beef_wellington + removed_foodtypes = BREAKFAST category = CAT_MEAT /datum/crafting_recipe/food/korta_wellington @@ -276,6 +286,7 @@ /datum/reagent/consumable/blackpepper = 2 ) result = /obj/item/food/korta_wellington + removed_foodtypes = BREAKFAST category = CAT_MEAT /datum/crafting_recipe/food/full_roast @@ -294,6 +305,7 @@ /datum/reagent/consumable/blackpepper = 2 ) result = /obj/item/food/roast_dinner + added_foodtypes = GRAIN category = CAT_MEAT /datum/crafting_recipe/food/full_roast_lizzy @@ -313,6 +325,7 @@ /datum/reagent/consumable/blackpepper = 2 ) result = /obj/item/food/roast_dinner_lizzy + added_foodtypes = NUTS category = CAT_MEAT /datum/crafting_recipe/food/full_roast_tofu @@ -331,6 +344,7 @@ /datum/reagent/consumable/blackpepper = 2 ) result = /obj/item/food/roast_dinner_tofu + added_foodtypes = GRAIN category = CAT_MEAT /datum/crafting_recipe/food/full_english @@ -354,6 +368,8 @@ /datum/reagent/consumable/nutriment/vitamin = 5, ) result = /obj/item/food/canned/envirochow + removed_foodtypes = RAW|GORE + added_foodtypes = GROSS category = CAT_MEAT /datum/crafting_recipe/food/meatloaf 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 3dbd7093a74..2991d9d5c11 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm @@ -49,6 +49,7 @@ /obj/item/food/tortilla = 1 ) result = /obj/item/food/nachos + added_foodtypes = FRIED category = CAT_MEXICAN /datum/crafting_recipe/food/cheesynachos @@ -59,6 +60,7 @@ /obj/item/food/tortilla = 1 ) result = /obj/item/food/cheesynachos + added_foodtypes = FRIED category = CAT_MEXICAN /datum/crafting_recipe/food/cubannachos @@ -69,6 +71,7 @@ /obj/item/food/tortilla = 1 ) result = /obj/item/food/cubannachos + added_foodtypes = FRIED category = CAT_MEXICAN /datum/crafting_recipe/food/taco @@ -124,6 +127,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/chipsandsalsa + removed_foodtypes = JUNKFOOD category = CAT_MEXICAN /datum/crafting_recipe/food/classic_chimichanga @@ -135,6 +139,7 @@ /obj/item/food/grown/onion = 1, ) result = /obj/item/food/classic_chimichanga + added_foodtypes = FRIED category = CAT_MEXICAN /datum/crafting_recipe/food/vegetarian_chimichanga @@ -146,6 +151,7 @@ /obj/item/food/grown/chili = 1, ) result = /obj/item/food/vegetarian_chimichanga + added_foodtypes = FRIED category = CAT_MEXICAN /datum/crafting_recipe/food/classic_hard_shell_taco @@ -178,6 +184,7 @@ /obj/item/food/grown/onion = 1, ) result = /obj/item/food/refried_beans + added_foodtypes = FRIED category = CAT_MEXICAN /datum/crafting_recipe/food/spanish_rice @@ -190,6 +197,7 @@ /datum/reagent/consumable/blackpepper = 1, ) result = /obj/item/food/spanish_rice + removed_foodtypes = BREAKFAST category = CAT_MEXICAN /datum/crafting_recipe/food/pineapple_salsa 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 9e145500a17..e2c09cfe02c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -10,6 +10,7 @@ /obj/item/food/grown/apple = 1 ) result = /obj/item/food/candiedapple + added_foodtypes = JUNKFOOD|SUGAR category = CAT_MISCFOOD /datum/crafting_recipe/food/spiderlollipop @@ -20,6 +21,8 @@ /obj/item/food/spiderling = 1 ) result = /obj/item/food/spiderlollipop + added_foodtypes = JUNKFOOD|SUGAR + removed_foodtypes = TOXIC category = CAT_MISCFOOD /datum/crafting_recipe/food/chococoin @@ -66,6 +69,7 @@ /datum/reagent/consumable/gravy = 3 ) result = /obj/item/food/poutine + added_foodtypes = MEAT category = CAT_MISCFOOD /datum/crafting_recipe/food/beans @@ -95,6 +99,7 @@ ) parts = list(/obj/item/reagent_containers/cup/glass/bottle/vodka = 1) result = /obj/item/food/melonkeg + added_foodtypes = ALCOHOL category = CAT_MISCFOOD /datum/crafting_recipe/food/honeybar @@ -104,6 +109,7 @@ /datum/reagent/consumable/honey = 5 ) result = /obj/item/food/honeybar + added_foodtypes = SUGAR category = CAT_MISCFOOD /datum/crafting_recipe/food/powercrepe @@ -117,6 +123,7 @@ /obj/item/melee/sabre = 1 ) result = /obj/item/food/powercrepe + added_foodtypes = FRUIT|SUGAR category = CAT_MISCFOOD /datum/crafting_recipe/food/branrequests @@ -126,6 +133,8 @@ /obj/item/food/no_raisin = 1, ) result = /obj/item/food/branrequests + removed_foodtypes = JUNKFOOD + added_foodtypes = BREAKFAST category = CAT_MISCFOOD /datum/crafting_recipe/food/ricepudding @@ -137,6 +146,8 @@ /obj/item/food/boiledrice = 1 ) result = /obj/item/food/salad/ricepudding + added_foodtypes = DAIRY|SUGAR + removed_foodtypes = BREAKFAST category = CAT_MISCFOOD /datum/crafting_recipe/food/risotto @@ -149,6 +160,7 @@ /obj/item/food/grown/mushroom/chanterelle = 1 ) result = /obj/item/food/salad/risotto + removed_foodtypes = BREAKFAST category = CAT_MISCFOOD /datum/crafting_recipe/food/butterbear //ITS ALIVEEEEEE! @@ -173,6 +185,7 @@ /obj/item/food/meat/slab/rawcrab = 1 ) result = /obj/item/food/crab_rangoon + removed_foodtypes = RAW category = CAT_SEAFOOD /datum/crafting_recipe/food/royalcheese @@ -228,6 +241,7 @@ /obj/item/food/butterslice = 1 ) result = /obj/item/food/bechamel_sauce + added_foodtypes = GRAIN category = CAT_MISCFOOD /datum/crafting_recipe/food/pierogi @@ -249,6 +263,7 @@ /obj/item/food/grown/tomato = 1, ) result = /obj/item/food/stuffed_cabbage + removed_foodtypes = BREAKFAST category = CAT_MISCFOOD /datum/crafting_recipe/food/granola_bar @@ -260,6 +275,7 @@ /obj/item/food/no_raisin = 1, ) result = /obj/item/food/granola_bar + removed_foodtypes = JUNKFOOD category = CAT_MISCFOOD /datum/crafting_recipe/food/onigiri @@ -269,6 +285,7 @@ /obj/item/food/seaweedsheet = 1, ) result = /obj/item/food/onigiri + removed_foodtypes = BREAKFAST category = CAT_MISCFOOD /datum/crafting_recipe/food/mashed_potatoes @@ -289,6 +306,7 @@ /datum/reagent/consumable/salt = 2, ) result = /obj/item/food/pacoca + added_foodtypes = SUGAR category = CAT_MISCFOOD /datum/crafting_recipe/food/springroll @@ -301,6 +319,7 @@ /datum/reagent/water = 10, ) result = /obj/item/food/springroll + added_foodtypes = GRAIN category = CAT_MISCFOOD /datum/crafting_recipe/food/caramel_popcorn @@ -310,6 +329,7 @@ /datum/reagent/consumable/caramel = 3, ) result = /obj/item/food/popcorn/caramel + added_foodtypes = SUGAR category = CAT_MISCFOOD /datum/crafting_recipe/food/salty_popcorn @@ -339,6 +359,7 @@ /obj/item/food/grown/mushroom/amanita = 3 ) result = /obj/item/food/bowled/amanitajelly + added_foodtypes = TOXIC category = CAT_MISCFOOD /datum/crafting_recipe/food/buttered_baked_potato @@ -359,6 +380,7 @@ /obj/item/food/grown/cabbage = 1, ) result = /obj/item/food/loaded_baked_potato + removed_foodtypes = BREAKFAST category = CAT_MISCFOOD /datum/crafting_recipe/food/cheese_pierogi @@ -415,6 +437,7 @@ /datum/reagent/consumable/peanut_butter = 2, ) result = /obj/item/food/bonbon/peanut_butter_cup + added_foodtypes = NUTS category = CAT_MISCFOOD /datum/crafting_recipe/pickles_jar @@ -494,6 +517,7 @@ /datum/reagent/water = 2, ) result = /obj/item/food/candied_pineapple + added_foodtypes = SUGAR category = CAT_MISCFOOD /datum/crafting_recipe/food/tzatziki_sauce 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 aeb27f026b2..2597a70d501 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm @@ -53,6 +53,7 @@ /obj/item/food/onion_slice = 1 ) result = /obj/item/food/squeaking_stir_fry + removed_foodtypes = BREAKFAST category = CAT_MOTH /datum/crafting_recipe/food/sweet_chili_cabbage_wrap @@ -96,6 +97,7 @@ /obj/item/food/cheese/firm_cheese_slice = 1 ) result = /obj/item/food/raw_green_lasagne + added_foodtypes = RAW category = CAT_MOTH /datum/crafting_recipe/food/raw_baked_rice @@ -107,6 +109,8 @@ /obj/item/food/grown/potato = 2, ) result = /obj/item/food/raw_baked_rice + removed_foodtypes = BREAKFAST + added_foodtypes = RAW category = CAT_MOTH /datum/crafting_recipe/food/buttered_baked_corn @@ -146,9 +150,9 @@ reqs = list( /obj/item/food/cheese/mozzarella = 1, /obj/item/food/breadslice/plain = 2, - /obj/item/food/tomato_sauce = 1 ) result = /obj/item/food/mozzarella_sticks + added_foodtypes = FRIED category = CAT_MOTH /datum/crafting_recipe/food/raw_stuffed_peppers @@ -181,6 +185,8 @@ /datum/reagent/consumable/cornmeal_batter = 5 ) result = /obj/item/food/mac_balls + removed_foodtypes = JUNKFOOD + added_foodtypes = FRIED category = CAT_MOTH /datum/crafting_recipe/food/hua_mulan_congee @@ -192,6 +198,8 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/bowled/hua_mulan_congee + removed_foodtypes = BREAKFAST + added_foodtypes = GRAIN category = CAT_MOTH /datum/crafting_recipe/food/fried_eggplant_polenta @@ -244,6 +252,7 @@ /obj/item/reagent_containers/cup/bowl = 1, ) result = /obj/item/food/salad/cotton_salad + added_foodtypes = CLOTH category = CAT_MOTH /datum/crafting_recipe/food/moth_kachumbari @@ -269,6 +278,7 @@ /obj/item/food/grown/herbs = 1 ) result = /obj/item/food/raw_mothic_margherita + added_foodtypes = RAW category = CAT_PIZZA /datum/crafting_recipe/food/raw_mothic_firecracker @@ -280,6 +290,7 @@ /obj/item/food/grown/ghost_chili = 1 ) result = /obj/item/food/raw_mothic_firecracker + added_foodtypes = RAW category = CAT_PIZZA /datum/crafting_recipe/food/raw_mothic_five_cheese @@ -293,6 +304,7 @@ /obj/item/food/cheese/cheese_curds = 1 ) result = /obj/item/food/raw_mothic_five_cheese + added_foodtypes = RAW category = CAT_PIZZA /datum/crafting_recipe/food/raw_mothic_white_pie @@ -305,6 +317,7 @@ /obj/item/food/grown/herbs = 1 ) result = /obj/item/food/raw_mothic_white_pie + added_foodtypes = RAW category = CAT_PIZZA /datum/crafting_recipe/food/raw_mothic_pesto @@ -315,6 +328,7 @@ /obj/item/food/cheese/mozzarella = 1 ) result = /obj/item/food/raw_mothic_pesto + added_foodtypes = RAW category = CAT_PIZZA /datum/crafting_recipe/food/raw_mothic_garlic @@ -325,6 +339,7 @@ /obj/item/food/grown/herbs = 1 ) result = /obj/item/food/raw_mothic_garlic + added_foodtypes = RAW category = CAT_PIZZA /datum/crafting_recipe/food/moth_cheese_cakes @@ -337,6 +352,8 @@ /datum/reagent/consumable/honey = 5 ) result = /obj/item/food/moth_cheese_cakes + added_foodtypes = GRAIN|FRIED + removed_foodtypes = JUNKFOOD category = CAT_MOTH /datum/crafting_recipe/food/mothmallow @@ -348,6 +365,7 @@ /datum/reagent/consumable/ethanol/rum = 5 ) result = /obj/item/food/cake/mothmallow + added_foodtypes = SUGAR category = CAT_MOTH /datum/crafting_recipe/food/moffin @@ -358,6 +376,7 @@ /obj/item/stack/sheet/cloth = 1, ) result = /obj/item/food/muffin/moffin + added_foodtypes = CLOTH|SUGAR|BREAKFAST category = CAT_MOTH // Soups 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 130fcb57b69..75f52d816c3 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -11,6 +11,8 @@ /obj/item/food/pastrybase = 1 ) result = /obj/item/food/donut/plain + added_foodtypes = JUNKFOOD|SUGAR|BREAKFAST|FRIED + removed_foodtypes = RAW category = CAT_PASTRY // It is so stupid that we have to do this but because food crafting clears all reagents that got added during init, @@ -29,6 +31,7 @@ /datum/reagent/consumable/capsaicin = 5, /obj/item/food/pastrybase = 1 ) + added_foodtypes = JUNKFOOD|BREAKFAST|FRIED result = /obj/item/food/donut/chaos /datum/crafting_recipe/food/donut/meat @@ -38,6 +41,7 @@ /obj/item/food/meat/rawcutlet = 1, /obj/item/food/pastrybase = 1 ) + added_foodtypes = JUNKFOOD|BREAKFAST|FRIED|GORE result = /obj/item/food/donut/meat /datum/crafting_recipe/food/donut/jelly @@ -46,6 +50,7 @@ /datum/reagent/consumable/berryjuice = 5, /obj/item/food/pastrybase = 1 ) + added_foodtypes = parent_type::added_foodtypes|FRUIT result = /obj/item/food/donut/jelly/plain /datum/crafting_recipe/food/donut/slimejelly @@ -54,6 +59,7 @@ /datum/reagent/toxin/slimejelly = 5, /obj/item/food/pastrybase = 1 ) + added_foodtypes = parent_type::added_foodtypes|TOXIC result = /obj/item/food/donut/jelly/slimejelly/plain @@ -63,6 +69,7 @@ /datum/reagent/consumable/berryjuice = 3, /obj/item/food/donut/plain = 1 ) + added_foodtypes = parent_type::added_foodtypes|FRUIT result = /obj/item/food/donut/berry /datum/crafting_recipe/food/donut/trumpet @@ -80,6 +87,7 @@ /datum/reagent/consumable/applejuice = 3, /obj/item/food/donut/plain = 1 ) + added_foodtypes = parent_type::added_foodtypes|FRUIT result = /obj/item/food/donut/apple /datum/crafting_recipe/food/donut/caramel @@ -104,6 +112,7 @@ /datum/reagent/consumable/blumpkinjuice = 3, /obj/item/food/donut/plain = 1 ) + added_foodtypes = VEGETABLES result = /obj/item/food/donut/blumpkin /datum/crafting_recipe/food/donut/bungo @@ -179,6 +188,7 @@ /datum/reagent/consumable/blumpkinjuice = 3, /obj/item/food/donut/jelly/plain = 1 ) + added_foodtypes = parent_type::added_foodtypes|VEGETABLES result = /obj/item/food/donut/jelly/blumpkin /datum/crafting_recipe/food/donut/jelly/bungo @@ -213,6 +223,7 @@ /datum/reagent/consumable/berryjuice = 3, /obj/item/food/donut/jelly/slimejelly/plain = 1 ) + added_foodtypes = parent_type::added_foodtypes|FRUIT result = /obj/item/food/donut/jelly/slimejelly/berry /datum/crafting_recipe/food/donut/slimejelly/trumpet @@ -230,6 +241,7 @@ /datum/reagent/consumable/applejuice = 3, /obj/item/food/donut/jelly/slimejelly/plain = 1 ) + added_foodtypes = parent_type::added_foodtypes|FRUIT result = /obj/item/food/donut/jelly/slimejelly/apple /datum/crafting_recipe/food/donut/slimejelly/caramel @@ -254,6 +266,7 @@ /datum/reagent/consumable/blumpkinjuice = 3, /obj/item/food/donut/jelly/slimejelly/plain = 1 ) + added_foodtypes = parent_type::added_foodtypes|VEGETABLES result = /obj/item/food/donut/jelly/slimejelly/blumpkin /datum/crafting_recipe/food/donut/slimejelly/bungo @@ -289,6 +302,7 @@ /obj/item/food/pastrybase = 2 ) result = /obj/item/food/waffles + added_foodtypes = BREAKFAST category = CAT_PASTRY @@ -308,6 +322,7 @@ /obj/item/food/meat/slab/human = 2 ) result = /obj/item/food/soylentgreen + removed_foodtypes = GORE|RAW category = CAT_PASTRY @@ -318,6 +333,7 @@ /obj/item/food/pastrybase = 2 ) result = /obj/item/food/rofflewaffles + added_foodtypes = VEGETABLES|BREAKFAST category = CAT_PASTRY ////////////////////////////////////////////////DONKPOCCKETS//////////////////////////////////////////////// @@ -326,50 +342,50 @@ time = 15 name = "Donk-pocket" reqs = list( - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, /obj/item/food/meatball = 1 ) - result = /obj/item/food/donkpocket + result = /obj/item/food/donkpocket/homemade category = CAT_PASTRY /datum/crafting_recipe/food/dankpocket time = 15 name = "Dank-pocket" reqs = list( - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, /obj/item/food/grown/cannabis = 1 ) - result = /obj/item/food/dankpocket + result = /obj/item/food/donkpocket/dank category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/spicy time = 15 name = "Spicy-pocket" reqs = list( - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, /obj/item/food/meatball = 1, /obj/item/food/grown/chili = 1 ) - result = /obj/item/food/donkpocket/spicy + result = /obj/item/food/donkpocket/spicy/homemade category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/teriyaki time = 15 name = "Teriyaki-pocket" reqs = list( - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, /obj/item/food/meatball = 1, /datum/reagent/consumable/soysauce = 3 ) - result = /obj/item/food/donkpocket/teriyaki + result = /obj/item/food/donkpocket/teriyaki/homemade category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/pizza time = 15 name = "Pizza-pocket" reqs = list( - /obj/item/food/pastrybase = 1, - /obj/item/food/meatball = 1, + /obj/item/food/doughslice = 1, + /obj/item/food/cheese/wedge = 1, /obj/item/food/grown/tomato = 1 ) result = /obj/item/food/donkpocket/pizza @@ -379,28 +395,30 @@ time = 15 name = "Honk-Pocket" reqs = list( - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, /obj/item/food/grown/banana = 1, /datum/reagent/consumable/sugar = 3 ) result = /obj/item/food/donkpocket/honk + added_foodtypes = FRUIT|SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/berry time = 15 name = "Berry-pocket" reqs = list( - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, /obj/item/food/grown/berries = 1 ) result = /obj/item/food/donkpocket/berry + added_foodtypes = FRUIT|SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/gondola time = 15 name = "Gondola-pocket" reqs = list( - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, /obj/item/food/meatball = 1, /datum/reagent/gondola_mutation_toxin = 5 ) @@ -411,13 +429,14 @@ time = 15 name = "Deluxe Donk-pocket" reqs = list( - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, /obj/item/food/meatball = 1, /obj/item/food/meat/bacon = 1, /obj/item/food/onion_slice/red = 1 ) result = /obj/item/food/donkpocket/deluxe category = CAT_PASTRY + removed_foodtypes = BREAKFAST crafting_flags = parent_type::crafting_flags | CRAFT_MUST_BE_LEARNED /datum/crafting_recipe/food/donkpocket/deluxe/nocarb @@ -430,18 +449,20 @@ /obj/item/food/grown/herbs = 1 ) result = /obj/item/food/donkpocket/deluxe/nocarb + removed_foodtypes = VEGETABLES //The herbs are only to enhance the flavor category = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/deluxe/vegan time = 15 name = "Deluxe Donk-roll" reqs = list( - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, /obj/item/food/boiledrice = 1, /obj/item/food/grown/bell_pepper = 1, - /obj/item/food/tofu = 2 + /obj/item/food/tofu = 2, ) result = /obj/item/food/donkpocket/deluxe/vegan + removed_foodtypes = BREAKFAST category = CAT_PASTRY ////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// @@ -453,6 +474,7 @@ /datum/reagent/consumable/milk = 5, /obj/item/food/pastrybase = 1 ) + added_foodtypes = BREAKFAST|SUGAR|DAIRY result = /obj/item/food/muffin category = CAT_PASTRY @@ -464,6 +486,7 @@ /obj/item/food/grown/berries = 1 ) result = /obj/item/food/muffin/berry + added_foodtypes = BREAKFAST|SUGAR|FRUIT|DAIRY category = CAT_PASTRY /datum/crafting_recipe/food/booberrymuffin @@ -475,6 +498,7 @@ /obj/item/ectoplasm = 1 ) result = /obj/item/food/muffin/booberry + added_foodtypes = BREAKFAST|SUGAR|DAIRY category = CAT_PASTRY ////////////////////////////////////////////OTHER//////////////////////////////////////////// @@ -489,6 +513,7 @@ /obj/item/food/bread/plain = 1 ) result = /obj/item/food/khachapuri + added_foodtypes = MEAT category = CAT_PASTRY /datum/crafting_recipe/food/sugarcookie @@ -499,6 +524,7 @@ /obj/item/food/pastrybase = 1 ) result = /obj/item/food/cookie/sugar + added_foodtypes = JUNKFOOD|SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/spookyskull @@ -510,6 +536,7 @@ /datum/reagent/consumable/milk = 5 ) result = /obj/item/food/cookie/sugar/spookyskull + added_foodtypes = JUNKFOOD|SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/spookycoffin @@ -521,6 +548,7 @@ /datum/reagent/consumable/coffee = 5 ) result = /obj/item/food/cookie/sugar/spookycoffin + added_foodtypes = JUNKFOOD|SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/fortunecookie @@ -534,6 +562,7 @@ /obj/item/paper = 1 ) result = /obj/item/food/fortunecookie + added_foodtypes = SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/poppypretzel @@ -544,6 +573,7 @@ /obj/item/food/pastrybase = 1 ) result = /obj/item/food/poppypretzel + added_foodtypes = SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/plumphelmetbiscuit @@ -561,7 +591,7 @@ name = "Cracker" reqs = list( /datum/reagent/consumable/salt = 1, - /obj/item/food/pastrybase = 1, + /obj/item/food/doughslice = 1, ) result = /obj/item/food/cracker category = CAT_PASTRY @@ -593,6 +623,7 @@ /obj/item/food/grown/oat = 1 ) result = /obj/item/food/cookie/raisin + removed_foodtypes = JUNKFOOD category = CAT_PASTRY /datum/crafting_recipe/food/cherrycupcake @@ -602,6 +633,7 @@ /obj/item/food/grown/cherries = 1 ) result = /obj/item/food/cherrycupcake + added_foodtypes = SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/bluecherrycupcake @@ -611,6 +643,7 @@ /obj/item/food/grown/bluecherries = 1 ) result = /obj/item/food/cherrycupcake/blue + added_foodtypes = SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/jupitercupcake @@ -621,6 +654,7 @@ /datum/reagent/consumable/caramel = 3, ) result = /obj/item/food/jupitercupcake + added_foodtypes = SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/honeybun @@ -630,6 +664,7 @@ /datum/reagent/consumable/honey = 5 ) result = /obj/item/food/honeybun + added_foodtypes = SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/cannoli @@ -640,6 +675,7 @@ /datum/reagent/consumable/sugar = 3 ) result = /obj/item/food/cannoli + added_foodtypes = SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/peanut_butter_cookie @@ -649,6 +685,7 @@ /obj/item/food/pastrybase = 1 ) result = /obj/item/food/cookie/peanut_butter + added_foodtypes = JUNKFOOD|NUTS category = CAT_PASTRY /datum/crafting_recipe/food/raw_brownie_batter @@ -661,6 +698,8 @@ /obj/item/food/butterslice = 1 ) result = /obj/item/food/raw_brownie_batter + added_foodtypes = GRAIN|JUNKFOOD|BREAKFAST|SUGAR + removed_foodtypes = MEAT|RAW category = CAT_PASTRY /datum/crafting_recipe/food/peanut_butter_brownie_batter @@ -674,6 +713,8 @@ /obj/item/food/butterslice = 1 ) result = /obj/item/food/peanut_butter_brownie_batter + added_foodtypes = GRAIN|JUNKFOOD|BREAKFAST|SUGAR|NUTS + removed_foodtypes = MEAT|RAW category = CAT_PASTRY /datum/crafting_recipe/food/crunchy_peanut_butter_tart @@ -685,6 +726,7 @@ /datum/reagent/consumable/cream = 5, ) result = /obj/item/food/crunchy_peanut_butter_tart + added_foodtypes = JUNKFOOD|SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/chocolate_chip_cookie @@ -694,6 +736,7 @@ /obj/item/food/chocolatebar = 1, ) result = /obj/item/food/cookie/chocolate_chip_cookie + removed_foodtypes = JUNKFOOD category = CAT_PASTRY /datum/crafting_recipe/food/snickerdoodle @@ -703,6 +746,7 @@ /datum/reagent/consumable/vanilla = 5, ) result = /obj/item/food/cookie/snickerdoodle + added_foodtypes = SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/thumbprint_cookie @@ -712,6 +756,7 @@ /datum/reagent/consumable/cherryjelly = 5, ) result = /obj/item/food/cookie/thumbprint_cookie + added_foodtypes = FRUIT|SUGAR category = CAT_PASTRY /datum/crafting_recipe/food/macaron 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 a215ecdd750..5eff8da6318 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm @@ -11,6 +11,7 @@ /obj/item/food/grown/banana = 1 ) result = /obj/item/food/pie/cream + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/meatpie @@ -49,6 +50,7 @@ /obj/item/food/grown/cherries = 1 ) result = /obj/item/food/pie/cherrypie + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/berryclafoutis @@ -58,6 +60,7 @@ /obj/item/food/grown/berries = 1 ) result = /obj/item/food/pie/berryclafoutis + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/bearypie @@ -68,6 +71,7 @@ /obj/item/food/meat/steak/bear = 1 ) result = /obj/item/food/pie/bearypie + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/amanitapie @@ -77,6 +81,7 @@ /obj/item/food/grown/mushroom/amanita = 1 ) result = /obj/item/food/pie/amanita_pie + added_foodtypes = TOXIC|GROSS category = CAT_PIE /datum/crafting_recipe/food/plumppie @@ -95,6 +100,7 @@ /obj/item/food/grown/apple = 1 ) result = /obj/item/food/pie/applepie + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/pumpkinpie @@ -106,6 +112,7 @@ /obj/item/food/grown/pumpkin = 1 ) result = /obj/item/food/pie/pumpkinpie + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/goldenappletart @@ -117,6 +124,7 @@ /obj/item/food/grown/apple/gold = 1 ) result = /obj/item/food/pie/appletart + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/grapetart @@ -128,6 +136,7 @@ /obj/item/food/grown/grapes = 3 ) result = /obj/item/food/pie/grapetart + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/mimetart @@ -140,6 +149,7 @@ ) result = /obj/item/food/pie/mimetart category = CAT_PIE + added_foodtypes = SUGAR crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED /datum/crafting_recipe/food/berrytart @@ -152,6 +162,7 @@ ) result = /obj/item/food/pie/berrytart category = CAT_PIE + added_foodtypes = SUGAR crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED /datum/crafting_recipe/food/cocolavatart @@ -165,6 +176,8 @@ ) result = /obj/item/food/pie/cocolavatart category = CAT_PIE + added_foodtypes = SUGAR + removed_foodtypes = JUNKFOOD crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED /datum/crafting_recipe/food/blumpkinpie @@ -176,6 +189,7 @@ /obj/item/food/grown/pumpkin/blumpkin = 1 ) result = /obj/item/food/pie/blumpkinpie + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/dulcedebatata @@ -186,6 +200,7 @@ /obj/item/food/grown/potato/sweet = 2 ) result = /obj/item/food/pie/dulcedebatata + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/frostypie @@ -195,6 +210,7 @@ /obj/item/food/grown/bluecherries = 1 ) result = /obj/item/food/pie/frostypie + added_foodtypes = FRUIT|SUGAR category = CAT_PIE /datum/crafting_recipe/food/baklava @@ -205,6 +221,7 @@ /obj/item/seeds/wheat/oat = 4 ) result = /obj/item/food/pie/baklava + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/frenchsilkpie @@ -215,6 +232,8 @@ /obj/item/food/chocolatebar = 2, ) result = /obj/item/food/pie/frenchsilkpie + removed_foodtypes = JUNKFOOD + added_foodtypes = SUGAR category = CAT_PIE /datum/crafting_recipe/food/shepherds_pie @@ -244,4 +263,5 @@ /obj/item/stock_parts/power_store/cell = 2, ) result = /obj/item/food/pie/bacid_pie + added_foodtypes = TOXIC category = CAT_PIE diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm index f67071a86f5..56d31a233e7 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -3,14 +3,17 @@ ////////////////////////////////////////////////PIZZA!!!//////////////////////////////////////////////// -/datum/crafting_recipe/food/margheritapizza +/datum/crafting_recipe/food/pizza + added_foodtypes = RAW + category = CAT_PIZZA + +/datum/crafting_recipe/food/pizza/margherita reqs = list( /obj/item/food/flatdough = 1, /obj/item/food/cheese/wedge = 4, /obj/item/food/grown/tomato = 1 ) result = /obj/item/food/pizza/margherita/raw - category = CAT_PIZZA /datum/crafting_recipe/food/meatpizza reqs = list( @@ -20,9 +23,8 @@ /obj/item/food/grown/tomato = 1 ) result = /obj/item/food/pizza/meat/raw - category = CAT_PIZZA -/datum/crafting_recipe/food/arnold +/datum/crafting_recipe/food/pizza/arnold reqs = list( /obj/item/food/flatdough = 1, /obj/item/food/meat/rawcutlet = 3, @@ -31,38 +33,37 @@ /obj/item/food/grown/tomato = 1 ) result = /obj/item/food/pizza/arnold/raw - category = CAT_PIZZA -/datum/crafting_recipe/food/mushroompizza +/datum/crafting_recipe/food/pizza/mushroom reqs = list( /obj/item/food/flatdough = 1, - /obj/item/food/grown/mushroom = 5 + /obj/item/food/grown/mushroom = 5, + /obj/item/food/cheese/wedge = 1, ) result = /obj/item/food/pizza/mushroom/raw - category = CAT_PIZZA -/datum/crafting_recipe/food/vegetablepizza +/datum/crafting_recipe/food/pizza/vegetable reqs = list( /obj/item/food/flatdough = 1, /obj/item/food/grown/eggplant = 1, /obj/item/food/grown/carrot = 1, /obj/item/food/grown/corn = 1, - /obj/item/food/grown/tomato = 1 + /obj/item/food/grown/tomato = 1, + /obj/item/food/cheese/wedge = 1, ) result = /obj/item/food/pizza/vegetable/raw - category = CAT_PIZZA -/datum/crafting_recipe/food/donkpocketpizza +/datum/crafting_recipe/food/pizza/donkpocket reqs = list( /obj/item/food/flatdough = 1, /obj/item/food/donkpocket = 3, /obj/item/food/cheese/wedge = 1, /obj/item/food/grown/tomato = 1 ) + added_foodtypes = parent_type::added_foodtypes|JUNKFOOD result = /obj/item/food/pizza/donkpocket/raw - category = CAT_PIZZA -/datum/crafting_recipe/food/dankpizza +/datum/crafting_recipe/food/pizza/dank reqs = list( /obj/item/food/flatdough = 1, /obj/item/food/grown/ambrosia/vulgaris = 3, @@ -70,9 +71,8 @@ /obj/item/food/grown/tomato = 1 ) result = /obj/item/food/pizza/dank/raw - category = CAT_PIZZA -/datum/crafting_recipe/food/sassysagepizza +/datum/crafting_recipe/food/pizza/sassysage reqs = list( /obj/item/food/flatdough = 1, /obj/item/food/raw_meatball = 3, @@ -80,9 +80,8 @@ /obj/item/food/grown/tomato = 1 ) result = /obj/item/food/pizza/sassysage/raw - category = CAT_PIZZA -/datum/crafting_recipe/food/pineapplepizza +/datum/crafting_recipe/food/pizza/pineapple reqs = list( /obj/item/food/flatdough = 1, /obj/item/food/meat/rawcutlet = 2, @@ -91,25 +90,24 @@ /obj/item/food/grown/tomato = 1 ) result = /obj/item/food/pizza/pineapple/raw - category = CAT_PIZZA -/datum/crafting_recipe/food/antspizza +/datum/crafting_recipe/food/pizza/ants reqs = list( /obj/item/food/pizzaslice/margherita = 1, /datum/reagent/ants = 4 ) result = /obj/item/food/pizzaslice/ants - category = CAT_PIZZA + added_foodtypes = BUGS -/datum/crafting_recipe/food/energypizza +/datum/crafting_recipe/food/pizza/energy reqs = list( /obj/item/food/flatdough = 1, /obj/item/stock_parts/power_store/cell = 2, ) result = /obj/item/food/pizza/energy/raw - category = CAT_PIZZA + added_foodtypes = parent_type::added_foodtypes|TOXIC -/datum/crafting_recipe/food/raw_meat_calzone +/datum/crafting_recipe/food/pizza/raw_meat_calzone name = "Meat calzone" reqs = list( /obj/item/food/flatdough = 1, @@ -118,9 +116,8 @@ /obj/item/food/grown/tomato = 1, ) result = /obj/item/food/raw_meat_calzone - category = CAT_PIZZA -/datum/crafting_recipe/food/raw_vegetarian_calzone +/datum/crafting_recipe/food/pizza/raw_vegetarian_calzone name = "Vegetarian calzone" reqs = list( /obj/item/food/flatdough = 1, @@ -129,4 +126,3 @@ /obj/item/food/grown/onion = 1, ) result = /obj/item/food/raw_vegetarian_calzone - category = CAT_PIZZA diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index 0bd29c51054..45b01b16e21 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -32,6 +32,7 @@ /obj/item/food/meatball = 1 ) result = /obj/item/food/salad/validsalad + added_foodtypes = FRIED category = CAT_SALAD /datum/crafting_recipe/food/melonfruitbowl diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm index 742e8c1f3c8..13c017d309b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -32,6 +32,7 @@ /datum/reagent/toxin/slimejelly = 5, /obj/item/food/breadslice/plain = 2, ) + added_foodtypes = TOXIC result = /obj/item/food/sandwich/jelly/slime category = CAT_SANDWICH @@ -41,6 +42,7 @@ /datum/reagent/consumable/cherryjelly = 5, /obj/item/food/breadslice/plain = 2, ) + added_foodtypes = FRUIT|SUGAR result = /obj/item/food/sandwich/jelly/cherry category = CAT_SANDWICH @@ -50,6 +52,7 @@ /obj/item/food/breadslice/plain = 2, /obj/item/clothing/mask/fakemoustache = 1 ) + added_foodtypes = GROSS result = /obj/item/food/sandwich/notasandwich category = CAT_SANDWICH @@ -61,6 +64,7 @@ /obj/item/food/sausage = 1 ) result = /obj/item/food/hotdog + removed_foodtypes = BREAKFAST category = CAT_SANDWICH /datum/crafting_recipe/food/danish_hotdog @@ -73,6 +77,7 @@ /obj/item/food/grown/onion = 1, ) result = /obj/item/food/danish_hotdog + removed_foodtypes = BREAKFAST category = CAT_SANDWICH /datum/crafting_recipe/food/blt @@ -94,6 +99,7 @@ /datum/reagent/consumable/cherryjelly = 5 ) result = /obj/item/food/sandwich/peanut_butter_jelly + added_foodtypes = FRUIT|NUTS category = CAT_SANDWICH /datum/crafting_recipe/food/peanut_butter_banana_sandwich @@ -104,6 +110,7 @@ /obj/item/food/grown/banana = 1 ) result = /obj/item/food/sandwich/peanut_butter_banana + added_foodtypes = NUTS category = CAT_SANDWICH /datum/crafting_recipe/food/philly_cheesesteak @@ -136,4 +143,5 @@ /obj/item/food/butteredtoast = 1, ) result = /obj/item/food/sandwich/toast_sandwich + removed_foodtypes = BREAKFAST category = CAT_SANDWICH 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 60c7de2e333..1589dbc5383 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm @@ -6,6 +6,7 @@ /obj/item/food/fishmeat/carp = 1 ) result = /obj/item/food/cubancarp + added_foodtypes = GRAIN|FRIED category = CAT_SEAFOOD /datum/crafting_recipe/food/fishandchips @@ -25,6 +26,7 @@ /obj/item/food/fishmeat = 1 ) result = /obj/item/food/fishfingers + added_foodtypes = FRIED category = CAT_SEAFOOD /datum/crafting_recipe/food/fishfry @@ -35,16 +37,18 @@ /obj/item/food/fishmeat = 1 ) result = /obj/item/food/fishfry + added_foodtypes = FRIED category = CAT_SEAFOOD /datum/crafting_recipe/food/sashimi - name = "Sashimi" + name = "Spider Sashimi" reqs = list( /datum/reagent/consumable/soysauce = 5, /obj/item/food/spidereggs = 1, /obj/item/food/fishmeat = 1 ) result = /obj/item/food/sashimi + removed_foodtypes = TOXIC category = CAT_SEAFOOD /datum/crafting_recipe/food/fishtaco @@ -56,6 +60,7 @@ /obj/item/food/grown/cabbage = 1 ) result = /obj/item/food/taco/fish + category = CAT_SEAFOOD /datum/crafting_recipe/food/vegetariansushiroll @@ -67,6 +72,7 @@ /obj/item/food/grown/potato = 1 ) result = /obj/item/food/vegetariansushiroll + removed_foodtypes = BREAKFAST category = CAT_SEAFOOD /datum/crafting_recipe/food/spicyfiletroll @@ -79,6 +85,7 @@ /obj/item/food/grown/onion = 1 ) result = /obj/item/food/spicyfiletsushiroll + removed_foodtypes = BREAKFAST category = CAT_SEAFOOD /datum/crafting_recipe/food/nigiri_sushi @@ -90,6 +97,7 @@ /datum/reagent/consumable/soysauce = 2 ) result = /obj/item/food/nigiri_sushi + removed_foodtypes = BREAKFAST category = CAT_SEAFOOD /datum/crafting_recipe/food/meat_poke @@ -105,6 +113,7 @@ /obj/item/food/grown/cucumber = 1, ) result = /obj/item/food/meat_poke + removed_foodtypes = BREAKFAST category = CAT_SEAFOOD /datum/crafting_recipe/food/fish_poke @@ -120,6 +129,7 @@ /obj/item/food/grown/cucumber = 1, ) result = /obj/item/food/fish_poke + removed_foodtypes = BREAKFAST category = CAT_SEAFOOD /datum/crafting_recipe/food/futomaki_sushi_roll @@ -132,6 +142,7 @@ /obj/item/food/grown/cucumber = 1, ) result = /obj/item/food/futomaki_sushi_roll + removed_foodtypes = BREAKFAST category = CAT_SEAFOOD /datum/crafting_recipe/food/philadelphia_sushi_roll @@ -144,4 +155,5 @@ /obj/item/food/grown/cucumber = 1, ) result = /obj/item/food/philadelphia_sushi_roll + removed_foodtypes = BREAKFAST 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 edf82287373..da85e0159fb 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm @@ -92,6 +92,7 @@ /obj/item/food/grown/onion = 1, ) result = /obj/item/food/spaghetti/shoyu_tonkotsu_ramen + removed_foodtypes = BREAKFAST category = CAT_SPAGHETTI /datum/crafting_recipe/food/kitakata_ramen @@ -168,4 +169,5 @@ /datum/reagent/consumable/blackpepper = 2, ) result = /obj/item/food/spaghetti/carbonara + removed_foodtypes = BREAKFAST|RAW category = CAT_SPAGHETTI diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 1d9aaa8468e..c6c5f0d9724 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -25,7 +25,7 @@ desc = "It's spicy! Wait... IT'S BURNING ME!!" icon_state = "chilipepper" bite_consumption_mod = 2 - foodtypes = FRUIT + foodtypes = VEGETABLES wine_power = 20 // Ice Chili @@ -51,7 +51,7 @@ desc = "It's a mutant strain of chili." icon_state = "icepepper" bite_consumption_mod = 5 - foodtypes = FRUIT + foodtypes = VEGETABLES wine_power = 30 // Ghost Chili @@ -78,7 +78,7 @@ desc = "It seems to be vibrating gently." icon_state = "ghostchilipepper" bite_consumption_mod = 5 - foodtypes = FRUIT + foodtypes = VEGETABLES wine_power = 50 // Bell Pepper @@ -103,7 +103,7 @@ name = "bell pepper" desc = "A big mild pepper that's good for many things." icon_state = "bell_pepper" - foodtypes = FRUIT + foodtypes = VEGETABLES /obj/item/food/grown/bell_pepper/make_bakeable() AddComponent(/datum/component/bakeable, /obj/item/food/roasted_bell_pepper, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE) diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 6bfc8bc203a..f23bb43305b 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -55,7 +55,7 @@ name = "orange" desc = "It's a tangy fruit." icon_state = "orange" - foodtypes = ORANGES + foodtypes = ORANGES | FRUIT juice_typepath = /datum/reagent/consumable/orangejuice distill_reagent = /datum/reagent/consumable/ethanol/triple_sec diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm index a135c4a2cbe..bf0bb01943c 100644 --- a/code/modules/hydroponics/grown/eggplant.dm +++ b/code/modules/hydroponics/grown/eggplant.dm @@ -20,7 +20,7 @@ name = "eggplant" desc = "Maybe there's a chicken inside?" icon_state = "eggplant" - foodtypes = FRUIT + foodtypes = VEGETABLES wine_power = 20 // Egg-Plant diff --git a/code/modules/hydroponics/grown/garlic.dm b/code/modules/hydroponics/grown/garlic.dm index 755d0c2920a..96a32c37a45 100644 --- a/code/modules/hydroponics/grown/garlic.dm +++ b/code/modules/hydroponics/grown/garlic.dm @@ -18,3 +18,4 @@ icon_state = "garlic" tastes = list("garlic" = 1) wine_power = 10 + foodtypes = VEGETABLES diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm index 4287bf9eb3e..45f4d1251de 100644 --- a/code/modules/hydroponics/grown/onion.dm +++ b/code/modules/hydroponics/grown/onion.dm @@ -24,6 +24,7 @@ icon_state = "onion" tastes = list("onions" = 1) wine_power = 30 + foodtypes = VEGETABLES /obj/item/food/grown/onion/make_processable() AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/onion_slice, 2, 15, screentip_verb = "Cut") @@ -63,6 +64,7 @@ icon_state = "onionslice" food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2) w_class = WEIGHT_CLASS_TINY + foodtypes = VEGETABLES /obj/item/food/onion_slice/make_bakeable() AddComponent(/datum/component/bakeable, /obj/item/food/onionrings, rand(15 SECONDS, 20 SECONDS), TRUE, TRUE) diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm index dce207302c3..edfa985b4b1 100644 --- a/code/modules/hydroponics/grown/pumpkin.dm +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -23,7 +23,7 @@ desc = "It's large and scary." icon_state = "pumpkin" bite_consumption_mod = 2 - foodtypes = FRUIT + foodtypes = VEGETABLES juice_typepath = /datum/reagent/consumable/pumpkinjuice wine_power = 20 ///Which type of lantern this gourd produces when carved. @@ -56,7 +56,6 @@ desc = "The pumpkin's toxic sibling." icon_state = "blumpkin" bite_consumption_mod = 3 - foodtypes = FRUIT juice_typepath = /datum/reagent/consumable/blumpkinjuice wine_power = 50 carved_type = /obj/item/clothing/head/utility/hardhat/pumpkinhead/blumpkin diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index 1459887d6fa..65a40fd14e6 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -22,7 +22,7 @@ desc = "I say to-mah-to, you say tom-mae-to." icon_state = "tomato" splat_type = /obj/effect/decal/cleanable/food/tomato_smudge - foodtypes = FRUIT + foodtypes = VEGETABLES grind_results = list(/datum/reagent/consumable/ketchup = 0) juice_typepath = /datum/reagent/consumable/tomatojuice distill_reagent = /datum/reagent/consumable/enzyme @@ -46,7 +46,7 @@ icon_state = "bloodtomato" bite_consumption_mod = 3 splat_type = /obj/effect/gibspawner/generic - foodtypes = FRUIT | GORE + foodtypes = VEGETABLES | GORE grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood = 0) distill_reagent = /datum/reagent/consumable/ethanol/bloody_mary diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 3a813aebd14..4aa17da2b6e 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -190,6 +190,7 @@ max_integrity = 100 seed = /obj/item/seeds/lavaland/polypore wine_power = 20 + foodtypes = VEGETABLES /obj/item/food/grown/ash_flora/Initialize(mapload) . = ..() @@ -226,6 +227,7 @@ icon_state = "cactus_fruit" seed = /obj/item/seeds/lavaland/cactus wine_power = 50 + foodtypes = FRUIT /obj/item/food/grown/ash_flora/seraka name = "seraka cap" diff --git a/code/modules/unit_tests/focus_only_tests.dm b/code/modules/unit_tests/focus_only_tests.dm index 5530d7418a7..bd2596e16d6 100644 --- a/code/modules/unit_tests/focus_only_tests.dm +++ b/code/modules/unit_tests/focus_only_tests.dm @@ -56,3 +56,6 @@ /// Checks icon states generated at runtime are valid /datum/unit_test/focus_only/runtime_icon_states + +/// Checks that foodtypes are the same for food whether it's spawned or crafted (with the exact required types) +/datum/unit_test/focus_only/check_foodtypes diff --git a/code/modules/vending/donk.dm b/code/modules/vending/donk.dm index 8814745d6b8..e3851bee7f1 100644 --- a/code/modules/vending/donk.dm +++ b/code/modules/vending/donk.dm @@ -18,7 +18,7 @@ ) contraband = list( /obj/item/food/waffles = 2, - /obj/item/food/dankpocket = 2, + /obj/item/food/donkpocket/dank = 2, /obj/item/food/donkpocket/gondola = 1, ) premium = list( diff --git a/tools/UpdatePaths/Scripts/89706_dankpocket.txt b/tools/UpdatePaths/Scripts/89706_dankpocket.txt new file mode 100644 index 00000000000..8f663909e72 --- /dev/null +++ b/tools/UpdatePaths/Scripts/89706_dankpocket.txt @@ -0,0 +1,2 @@ +# dankpockets are now a subtype of donkpockets +/obj/item/food/dankpocket : /obj/item/food/donkpocket/dank{@OLD}