Merge remote-tracking branch 'upstream/master'

2025-12-09 16:12:17 +00:00 · 2018-10-24 22:07:16 +01:00
parent 9517ba8877 1ce67ab74d
commit eac48b5283
11 changed files with 29 additions and 27 deletions
--- a/code/modules/food/kitchen/cooking_machines/_cooker.dm
+++ b/code/modules/food/kitchen/cooking_machines/_cooker.dm
@@ -130,6 +130,7 @@
 	if(istype(cooking_obj, /obj/item/weapon/holder))
 		for(var/mob/living/M in cooking_obj.contents)
 			M.death()
+			qdel(M)

 	// Cook the food.
 	var/cook_path