From 5567fac8db2e4b37411e76dd59e2ae4128e386c1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 2 Sep 2022 12:31:14 +0200 Subject: [PATCH] [MIRROR] fixes runtime when deconstruct() on a grill with no item in it. [MDB IGNORE] (#16004) * fixes runtime when deconstruct() on a grill with no item in it. (#69602) * fixes runtime when deconstruct() on a grill with no item in it. Co-authored-by: ShizCalev --- code/modules/food_and_drinks/machinery/grill.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/machinery/grill.dm b/code/modules/food_and_drinks/machinery/grill.dm index d625b628538..69230f3f0cd 100644 --- a/code/modules/food_and_drinks/machinery/grill.dm +++ b/code/modules/food_and_drinks/machinery/grill.dm @@ -116,7 +116,8 @@ return TRUE /obj/machinery/grill/deconstruct(disassembled = TRUE) - finish_grill() + if(grilled_item) + finish_grill() if(!(flags_1 & NODECONSTRUCT_1)) new /obj/item/stack/sheet/iron(loc, 5) new /obj/item/stack/rods(loc, 5) @@ -134,9 +135,10 @@ return ..() /obj/machinery/grill/proc/finish_grill() - SEND_SIGNAL(grilled_item, COMSIG_GRILL_FOOD, grilled_item, grill_time) + if(grilled_item) + SEND_SIGNAL(grilled_item, COMSIG_GRILL_FOOD, grilled_item, grill_time) + UnregisterSignal(grilled_item, COMSIG_GRILL_COMPLETED) grill_time = 0 - UnregisterSignal(grilled_item, COMSIG_GRILL_COMPLETED) grill_loop.stop() ///Called when a food is transformed by the grillable component