From 10dae485bc9542bd3e086f72dcbd811d55ae442f Mon Sep 17 00:00:00 2001 From: Tkdrg Date: Sat, 24 Oct 2015 12:55:30 -0300 Subject: [PATCH] Stops fire alarms from triggering every tick This was triggering fire alarms every tick whenever there was a fire, which lagged quite a bit. Thanks to Aranclanos for pointing it out. --- code/game/machinery/alarm.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index b29c928227b..d1a86f5d3ee 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1111,7 +1111,8 @@ FIRE ALARM if (stat & (NOPOWER|BROKEN)) // can't activate alarm if it's unpowered or broken. return var/area/A = get_area(src) - A.firealert(src) + if(!A.fire) + A.firealert(src) //playsound(src.loc, 'sound/ambience/signal.ogg', 75, 0) return