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

Fix warning in recipe.dm

Browse Source
This commit is contained in:
Chompstation Bot
2021-06-19 23:44:05 +00:00
parent 5f76f2e855
commit b822ce1b6f
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/food/recipe.dm
View File

@@ -316,7 +316,16 @@
// When exact is true, extraneous ingredients will fail the recipe
// In both cases, the full complement of required inredients is still needed
/proc/select_recipe(var/list/datum/recipe/available_recipes, var/obj/obj as obj, var/exact)
<<<<<<< HEAD
var/list/datum/recipe/possible_recipes = list()
||||||| parent of 6b562b4953... Merge pull request #10707 from ShadowLarkens/patch-1
var/list/datum/recipe/possible_recipes = list()
var/highest_count = 0
var/count = 0
=======
var/highest_count = 0
var/count = 0
>>>>>>> 6b562b4953... Merge pull request #10707 from ShadowLarkens/patch-1
for (var/datum/recipe/recipe in available_recipes)
if(!recipe.check_reagents(obj.reagents, exact) || !recipe.check_items(obj, exact) || !recipe.check_fruit(obj, exact))
continue