Merge branch 'master' into master

code/modules/food_and_drinks/food.dm

@@ -1,6 +1,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 /// Food.
 ////////////////////////////////////////////////////////////////////////////////
+/// Note: When adding food items with dummy parents, make sure to add
+/// the parent to the exclusion list in code/__HELPERS/unsorted.dm's
+/// get_random_food proc.
+////////////////////////////////////////////////////////////////////////////////
 /obj/item/reagent_containers/food
 	possible_transfer_amounts = list()
 	volume = 50	//Sets the default container amount for all food items.

code/modules/food_and_drinks/kitchen_machinery/processor.dm

@@ -138,6 +138,10 @@
 	for (var/mob/M in src)
 		M.forceMove(drop_location())
 
+/obj/machinery/processor/container_resist(mob/living/user)
+	user.forceMove(drop_location())
+	user.visible_message("<span class='notice'>[user] crawls free of the processor!</span>")
+
 /obj/machinery/processor/slime
 	name = "slime processor"
 	desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating."