From 4b350d1849bdff6eee9070e5d8fd36b142dccaf6 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Wed, 3 Mar 2021 18:42:49 -0600 Subject: [PATCH] Fixes crafted foods not getting reagents from its contents (#57258) --- code/datums/components/food/edible.dm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index ea0ea545107..cce7ed7336e 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -194,20 +194,9 @@ Behavior that's still missing from this component that original food items had t this_food.reagents.multiply_reagents(CRAFTED_FOOD_BASE_REAGENT_MODIFIER) - for(var/obj/item/crafted_part in this_food.contents) + for(var/obj/item/food/crafted_part in parts_list) crafted_part.reagents?.trans_to(this_food.reagents, crafted_part.reagents.maximum_volume, CRAFTED_FOOD_INGREDIENT_REAGENT_MODIFIER) - var/list/objects_to_delete = list() - - // Remove all non recipe objects from the contents - for(var/content_object in this_food.contents) - for(var/recipe_object in recipe.real_parts) - if(istype(content_object, recipe_object)) - continue - objects_to_delete += content_object - - QDEL_LIST(objects_to_delete) - SSblackbox.record_feedback("tally", "food_made", 1, type) /datum/component/edible/proc/OnMicrowaved(datum/source, obj/machinery/microwave/used_microwave)