Merge pull request #3906 from eswordthecat/fix-candy

Fixed #2790, EVERYTHING IS CANDY.

code/modules/food/cooking_machines.dm

@@ -75,20 +75,23 @@ var/global/ingredientLimit = 10
 	..()
 
 /obj/machinery/cooking/New()
-	if(src.foodChoices)
+	if (ticker)
-		src.foodChoices = src.getFoodChoices()
+		initialize()
-		var/list/L[src.foodChoices.len]
+
-		var/obj/item/foodPath
-		for(. in src.foodChoices)
-			foodPath = .
-			L[initial(foodPath.name)] = foodPath
-		src.foodChoices = L
-	if(src.cooks_in_reagents) //if we can cook in something
-		del(src.reagents) //get rid of that
-		reagents = new (cks_max_volume) //maximum volume is set by the machine var
-		reagents.my_atom = src
 	return ..()
 
+/obj/machinery/cooking/initialize()
+	if (foodChoices)
+		var/obj/item/food
+
+		for (var/path in getFoodChoices())
+			food = path
+
+			foodChoices.Add(list(initial(food.name) = path))
+
+	if (cooks_in_reagents) // if we can cook in something
+		create_reagents(cks_max_volume) // maximum volume is set by the machine var
+
 /obj/machinery/cooking/proc/getFoodChoices()
 	return (typesof(/obj/item/weapon/reagent_containers/food/snacks/customizable/cook)-(/obj/item/weapon/reagent_containers/food/snacks/customizable/cook))
 
@@ -223,12 +226,13 @@ var/global/ingredientLimit = 10
 
 /obj/machinery/cooking/candy/validateIngredient(var/obj/item/I)
 	. = ..()
-	if((. == "valid") && (!foodNesting))
+
-		for(. in src.foodChoices)
+	if ((. == "valid") && (!foodNesting))
-			if(findtext(I.name,.))
+		for (var/food in foodChoices)
+			if (findtext(I.name, food))
 				. = "It's already candy."
+
 				break
-	return
 
 /obj/machinery/cooking/candy/makeFood(var/foodType)
 	var/old_food = src.ingredient.name

html/changelogs/iconleap-candy.yml

@@ -0,0 +1,6 @@
+author: iconleap
+
+delete-after: True
+
+changes: 
+  - bugfix: Fixed everything is candy at candy machine.