Skip to content

Commit

Permalink
Merge pull request #495 from Salted-Zen/boiledspagettinonfried
Browse files Browse the repository at this point in the history
Un-fries your boiled spagetti
  • Loading branch information
dwasint authored Nov 5, 2023
2 parents d1c154d + 5652218 commit 2c95cda
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions code/modules/food_and_drinks/recipes/soup_mixtures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
mix_message = "You smell something good coming from the steaming pot of soup."
reaction_tags = REACTION_TAG_FOOD | REACTION_TAG_EASY
reaction_flags = REACTION_NON_INSTANT
var/Nonsouprecipe = FALSE

// General soup guideline:
// - Soups should produce 60-90 units (3-4 servings)
Expand Down Expand Up @@ -188,14 +189,14 @@
continue

// Things that had reagents or ingredients in the soup will get deleted
if((!isnull(ingredient.reagents) || is_type_in_list(ingredient, required_ingredients)) && !is_type_in_list(ingredient, outputted_ingredients))
if((!isnull(ingredient.reagents) || is_type_in_list(ingredient, required_ingredients)) && !is_type_in_list(ingredient, outputted_ingredients) && !Nonsouprecipe) //monkeedit
// Send everything left behind
transfer_ingredient_reagents(ingredient, holder)
// Delete, it's done
qdel(ingredient)

// Everything else will just get fried
else
if (!Nonsouprecipe) //monkeedit
ingredient.AddElement(/datum/element/fried_item, 30)

//LAZYNULL(pot.added_ingredients)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
outputted_ingredients = list(/obj/item/food/spaghetti/boiledspaghetti = 1)
results = list(/datum/reagent/water = 5)
max_outputs = 10
Nonsouprecipe = TRUE

0 comments on commit 2c95cda

Please sign in to comment.