From 7a66fc185407286654cb09c84aabe95a103d6439 Mon Sep 17 00:00:00 2001 From: Neerti Date: Mon, 22 Apr 2019 00:28:44 -0400 Subject: [PATCH] Merge pull request #6125 from Heroman3003/fire-alarm-deconstruction Fixes ability to deconstruct fire alarms --- code/game/machinery/alarm.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index e74174d9219..62f35df91e9 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -876,6 +876,11 @@ FIRE ALARM /obj/machinery/firealarm/attackby(obj/item/W as obj, mob/user as mob) add_fingerprint(user) + if(alarm_deconstruction_screwdriver(user, W)) + return + if(alarm_deconstruction_wirecutters(user, W)) + return + if(panel_open) if(istype(W, /obj/item/device/multitool)) detecting = !(detecting)