From 3d3de873ff2995fb33e9755f9af04a0252dbae40 Mon Sep 17 00:00:00 2001 From: Flipp Syder <76629141+vulppine@users.noreply.github.com> Date: Fri, 16 Sep 2022 22:34:52 -0700 Subject: [PATCH] Adds a power check to OnAtmosAlarm for firelocks (#11369) * firelocks when alarmed will now use tryclose instead of emergencypressurestop * just adds a power check to OnAtmosAlarm, instead * restores emergencypressurestop usage, adds a newline to an if --- Content.Server/Doors/Systems/FirelockSystem.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs index cdc6be575f..0aceb87568 100644 --- a/Content.Server/Doors/Systems/FirelockSystem.cs +++ b/Content.Server/Doors/Systems/FirelockSystem.cs @@ -156,7 +156,11 @@ namespace Content.Server.Doors.Systems private void OnAtmosAlarm(EntityUid uid, FirelockComponent component, AtmosAlarmEvent args) { - if (!TryComp(uid, out var doorComponent)) return; + if (!this.IsPowered(uid, EntityManager)) + return; + + if (!TryComp(uid, out var doorComponent)) + return; if (args.AlarmType == AtmosAlarmType.Normal || args.AlarmType == AtmosAlarmType.Warning) {