Merge branch 'development'

code/modules/food/recipes_microwave.dm

@@ -146,9 +146,10 @@ I said no!
 	proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
 		being_cooked.heat()
 	make_food(var/obj/container as obj)
-		var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container)
-		warm_up(being_cooked)
-		return being_cooked
+		. = ..(container)
+		for (var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/D in .)
+			if (!D.warm)
+				warm_up(D)
 
 /datum/recipe/donkpocket/warm
 	reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour
@@ -156,11 +157,6 @@ I said no!
 		/obj/item/weapon/reagent_containers/food/snacks/donkpocket
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
-	make_food(var/obj/container as obj)
-		var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = locate() in container
-		if(being_cooked && !being_cooked.warm)
-			warm_up(being_cooked)
-		return being_cooked
 
 
 
@@ -300,9 +296,10 @@ I said no!
 	reagents = list("water" = 5, "vodka" = 5, "amatoxin" = 5)
 	result = /obj/item/weapon/reagent_containers/food/snacks/amanitajelly
 	make_food(var/obj/container as obj)
-		var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked = ..(container)
-		being_cooked.reagents.del_reagent("amatoxin")
-		return being_cooked
+
+		. = ..(container)
+		for (var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked in .)
+			being_cooked.reagents.del_reagent("amatoxin")
 
 /datum/recipe/meatballsoup
 	fruit = list("carrot" = 1, "potato" = 1)
@@ -653,9 +650,10 @@ I said no!
 	items = list(/obj/item/weapon/reagent_containers/food/snacks/meatball)
 	result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
 	make_food(var/obj/container as obj)
-		var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..(container)
-		being_cooked.reagents.del_reagent("toxin")
-		return being_cooked
+
+		. = ..(container)
+		for (var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked in .)
+			being_cooked.reagents.del_reagent("toxin")
 
 
 

code/modules/food/recipes_oven.dm

@@ -226,12 +226,35 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
 	make_food(var/obj/container as obj)
-		var/obj/item/weapon/paper/paper = locate() in container
-		paper.loc = null //prevent deletion
-		var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..(container)
-		paper.loc = being_cooked
-		being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
-		return being_cooked
+
+		var/obj/item/weapon/paper/paper
+
+		//Fuck fortune cookies. This is a quick hack
+		//Duplicate the item searching code with a special case for paper
+		for (var/i in items)
+			var/obj/item/I = locate(i) in container
+			if (!paper  && istype(I, /obj/item/weapon/paper))
+				paper = I
+				continue
+
+			if (I)
+				qdel(I)
+
+		//Then store and null out the items list so it wont delete any paper
+		var/list/L = items.Copy()
+		items = null
+		. = ..(container)
+
+		//Restore items list, so that making fortune cookies once doesnt break the oven
+		items = L
+
+
+		for (var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked in .)
+			paper.loc = being_cooked
+			being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
+			return
+
+
 	check_items(var/obj/container as obj)
 		. = ..()
 		if (.)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -979,12 +979,18 @@
 	proc/cooltime()
 		if (src.warm)
 			spawn(4200)
-				src.warm = 0
-				for(var/reagent in heated_reagents)
-					src.reagents.del_reagent(reagent)
-				src.name = initial(name)
+				if(src)
+					src.warm = 0
+					for(var/reagent in heated_reagents)
+						src.reagents.del_reagent(reagent)
+					src.name = initial(name)
 		return
 
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/cook()
+	..()
+	if (!warm)
+		heat()
+
 /obj/item/weapon/reagent_containers/food/snacks/brainburger
 	name = "brainburger"
 	desc = "A strange looking burger. It looks almost sentient."