From cdc7bb6b82f0f3c2bbcd776971cc5a291866d669 Mon Sep 17 00:00:00 2001 From: OrbisAnima Date: Tue, 2 Jul 2024 14:24:19 -0300 Subject: [PATCH] Fixes the Basic Sandwich (#84552) ## About The Pull Request Fixes the basic sandwich recipe from having the incorrect ingredients and incorrect food types. Now its consistent with its description, taste and ingredients. ## Why It's Good For The Game Makes things consistent, gives a vegetable recipe the vegetable ingredient, and meat and dairy ingredients the meat and dairy tags. Fixes downstream: https://github.com/NovaSector/NovaSector/issues/1318 ## Changelog :cl: fix: Fixed the basic Sandwich recipe and tags, now it matches the description and original intent. /:cl: --- code/game/objects/items/food/sandwichtoast.dm | 2 +- .../food_and_drinks/recipes/tablecraft/recipes_sandwich.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm index e440a1039e6..47a7b563e08 100644 --- a/code/game/objects/items/food/sandwichtoast.dm +++ b/code/game/objects/items/food/sandwichtoast.dm @@ -9,7 +9,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, ) tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1) - foodtypes = GRAIN | VEGETABLES + foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_SMALL crafting_complexity = FOOD_COMPLEXITY_3 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 7761a57fcfd..742e8c1f3c8 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -10,6 +10,7 @@ name = "Sandwich" reqs = list( /obj/item/food/breadslice/plain = 2, + /obj/item/food/grown/cabbage = 1, /obj/item/food/meat/steak = 1, /obj/item/food/cheese/wedge = 1 )