Merge pull request #6914 from Citadel-Station-13/upstream-merge-38054

[MIRROR] Eatting fried items actually consumes the item

code/modules/food_and_drinks/food/snacks_bread.dm

@@ -209,6 +209,17 @@
 		qdel(fried)
 	else
 		fried.forceMove(src)
+		trash = fried
+
+/obj/item/reagent_containers/food/snacks/deepfryholder/Destroy()
+	if(trash)
+		QDEL_NULL(trash)
+	. = ..()
+
+/obj/item/reagent_containers/food/snacks/deepfryholder/On_Consume(mob/living/eater)
+	if(trash)
+		QDEL_NULL(trash)
+	..()
 
 /obj/item/reagent_containers/food/snacks/deepfryholder/proc/fry(cook_time = 30)
 	switch(cook_time)

code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

@@ -85,6 +85,9 @@ God bless America.
 	if(!reagents.has_reagent("cooking_oil"))
 		to_chat(user, "<span class='warning'>[src] has no cooking oil to fry with!</span>")
 		return
+	if(I.resistance_flags & INDESTRUCTIBLE)
+		to_chat(user, "<span class='warning'>You don't feel it would be wise to fry [I]...</span>")
+		return
 	if(istype(I, /obj/item/reagent_containers/food/snacks/deepfryholder))
 		to_chat(user, "<span class='userdanger'>Your cooking skills are not up to the legendary Doublefry technique.</span>")
 		return