From 72bd2289b1f4e4642fc6e616a09a3fdd66eb4612 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 22 Sep 2022 19:14:26 +0200 Subject: [PATCH] [MIRROR] fixes oven taking damage after del [MDB IGNORE] (#16364) * fixes oven taking damage after del (#70033) * fixes oven taking damage after del * fixes oven taking damage after del Co-authored-by: ShizCalev --- code/modules/food_and_drinks/machinery/oven.dm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/code/modules/food_and_drinks/machinery/oven.dm b/code/modules/food_and_drinks/machinery/oven.dm index 1b98ef4f173..2806b2acf33 100644 --- a/code/modules/food_and_drinks/machinery/oven.dm +++ b/code/modules/food_and_drinks/machinery/oven.dm @@ -164,15 +164,10 @@ if(OVEN_SMOKE_STATE_GOOD) particles = new /particles/smoke/steam/mild -/obj/machinery/oven/crowbar_act(mob/living/user, obj/item/I) - . = ..() - if(flags_1 & NODECONSTRUCT_1) - return - if(default_deconstruction_crowbar(I, ignore_panel = TRUE)) - return +/obj/machinery/oven/crowbar_act(mob/living/user, obj/item/tool) + return default_deconstruction_crowbar(tool, ignore_panel = TRUE) /obj/machinery/oven/wrench_act(mob/living/user, obj/item/tool) - . = ..() default_unfasten_wrench(user, tool, time = 2 SECONDS) return TOOL_ACT_TOOLTYPE_SUCCESS