Skip to content

Commit

Permalink
Merge pull request #3938 from MistakeNot4892/rework/recipes
Browse files Browse the repository at this point in the history
Removing a duplicate proc on donk pockets.
  • Loading branch information
out-of-phaze authored Apr 25, 2024
2 parents 97c322b + 89295ef commit beca896
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
8 changes: 4 additions & 4 deletions code/modules/food/cooking/recipes/recipe_baked.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,20 @@
result = /obj/item/chems/food/donut/chaos

/decl/recipe/baked/donut
display_name = "Plain Donut"
display_name = "plain donut"
reagents = list(/decl/material/liquid/nutriment/sugar = 5)
items = list(
/obj/item/chems/food/dough
)
result = /obj/item/chems/food/donut

/decl/recipe/baked/donut/jelly
display_name = "Berry Jelly Donut"
display_name = "berry jelly donut"
reagents = list(/decl/material/liquid/drink/juice/berry = 5, /decl/material/liquid/nutriment/sugar = 5)
result = /obj/item/chems/food/donut/jelly

/decl/recipe/baked/donut/jelly/cherry
display_name = "Cherry Jelly Donut"
display_name = "cherry jelly donut"
reagents = list(/decl/material/liquid/nutriment/cherryjelly = 5, /decl/material/liquid/nutriment/sugar = 5)

/decl/recipe/baked/meatbread
Expand Down Expand Up @@ -230,7 +230,7 @@
result = /obj/item/chems/food/plumphelmetbiscuit

/decl/recipe/baked/plumphelmetbiscuitvegan
display_name = "Vegan Plump Biscuit"
display_name = "vegan plump biscuit"
fruit = list("plumphelmet" = 1)
reagents = list(/decl/material/liquid/nutriment/flour = 10, /decl/material/liquid/water = 10)
result = /obj/item/chems/food/plumphelmetbiscuit
Expand Down
6 changes: 0 additions & 6 deletions code/modules/food/cooking/recipes/recipes_microwave.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,3 @@
if(!being_cooked.warm)
return TRUE
return FALSE

/decl/recipe/donkpocket/produce_result(obj/container)
for(var/obj/item/chems/food/donkpocket/being_cooked in container.get_contained_external_atoms())
if(!being_cooked.warm)
warm_up(being_cooked)
return list(being_cooked)
6 changes: 3 additions & 3 deletions mods/content/xenobiology/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
return combined_food_products

/decl/recipe/slimetoast
display_name = "Slime Toast"
display_name = "slime toast"
reagents = list(/decl/material/liquid/slimejelly = 5)
items = list(
/obj/item/chems/food/slice/bread,
)
result = /obj/item/chems/food/jelliedtoast/slime

/decl/recipe/slimedonut
display_name = "Slime Jelly Donut"
display_name = "slime jelly donut"
reagents = list(/decl/material/liquid/slimejelly = 5, /decl/material/liquid/nutriment/sugar = 5)
items = list(
/obj/item/chems/food/dough
)
result = /obj/item/chems/food/donut/jelly/slime

/decl/recipe/slimesandwich
display_name = "Slime Sandwich"
display_name = "slime sandwich"
reagents = list(/decl/material/liquid/slimejelly = 5)
items = list(
/obj/item/chems/food/slice/bread = 2,
Expand Down

0 comments on commit beca896

Please sign in to comment.