From edc6695e5494328a67919c528f462dc0a5aaa863 Mon Sep 17 00:00:00 2001 From: Spaghetti-bit Date: Sun, 7 Jul 2024 15:46:30 -0700 Subject: [PATCH] Checks for emagged on firealarms to properly disable them from activating unless pulled manually. (#26170) --- code/game/machinery/firealarm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 0ec1bb2b8f7..27e34b3a390 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -217,7 +217,7 @@ FIRE ALARM /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() if(.) //damage received - if(obj_integrity > 0 && !(stat & BROKEN) && buildstage != 0) + if(obj_integrity > 0 && !(stat & BROKEN) && buildstage != 0 && !emagged) if(prob(33)) alarm()