From bd5d102a354966604d20d2243cd7a4e64fe295db Mon Sep 17 00:00:00 2001 From: Rykka Date: Tue, 28 Jul 2020 12:07:16 -0400 Subject: [PATCH] Fix for duplicate tortilla recipe and flatbread/tortilla recipe conflict --- code/modules/food/recipes_microwave.dm | 3 ++- code/modules/food/recipes_oven.dm | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index c9190ca259..1245c7e021 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -738,7 +738,8 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/porkbowl -/datum/recipe/tortilla +/datum/recipe/microwavetortilla + reagents = list("flour" = 5, "water" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough ) diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index f34a668122..3f89560372 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -81,6 +81,13 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough ) result = /obj/item/weapon/reagent_containers/food/snacks/flatbread + +/datum/recipe/tortilla + reagents = list("flour" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough + ) + result = /obj/item/weapon/reagent_containers/food/snacks/tortilla /datum/recipe/meatbread appliance = OVEN