cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for duplicate tortilla recipe and flatbread/tortilla recipe conflict

Browse Source
This commit is contained in:
Rykka
2020-07-28 12:07:16 -04:00
parent 8b919013f2
commit bd5d102a35
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/food/recipes_microwave.dm
View File

@@ -738,7 +738,8 @@ I said no!
) )
result = /obj/item/weapon/reagent_containers/food/snacks/porkbowl result = /obj/item/weapon/reagent_containers/food/snacks/porkbowl
/datum/recipe/tortilla /datum/recipe/microwavetortilla
reagents = list("flour" = 5, "water" = 5)
items = list( items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
) )

7
code/modules/food/recipes_oven.dm
View File

@@ -82,6 +82,13 @@
) )
result = /obj/item/weapon/reagent_containers/food/snacks/flatbread 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 /datum/recipe/meatbread
appliance = OVEN appliance = OVEN
items = list( items = list(