cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8515 from Rykka-Stormheart/shep-dev-flat-dough

Browse Source 
Fix for flatbread/tortilla recipe conflict, and missing trash icons
This commit is contained in:
Novacat
2020-07-29 06:58:14 -04:00
committed by GitHub
parent b065396aba f18b9daf6f
commit dd52bc19af
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/recipes_microwave.dm
+2 -1
View File
@@ -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
)
code/modules/food/recipes_oven.dm
+7
View File
@@ -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