Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

number of things, fixing warnings, AtmosAlarmType instead of AtmosMonitorAlarmType

Browse Source
This commit is contained in:
vulppine
2022-08-29 07:37:26 -07:00
parent cb5ffe0f3d
commit e0bf77490d
24 changed files with 177 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
View File

@@ -39,12 +39,12 @@ public sealed class FireAlarmSystem : EntitySystem
{
if (!_atmosAlarmable.TryGetHighestAlert(uid, out var alarm))
{
alarm = AtmosMonitorAlarmType.Normal;
alarm = AtmosAlarmType.Normal;
}
if (alarm == AtmosMonitorAlarmType.Normal)
if (alarm == AtmosAlarmType.Normal)
{
_atmosAlarmable.ForceAlert(uid, AtmosMonitorAlarmType.Danger);
_atmosAlarmable.ForceAlert(uid, AtmosAlarmType.Danger);
}
else
{
@@ -58,7 +58,7 @@ public sealed class FireAlarmSystem : EntitySystem
if (TryComp<AtmosAlarmableComponent>(uid, out var alarmable))
{
// Remove the atmos alarmable component permanently from this device.
_atmosAlarmable.ForceAlert(uid, AtmosMonitorAlarmType.Emagged, alarmable);
_atmosAlarmable.ForceAlert(uid, AtmosAlarmType.Emagged, alarmable);
RemCompDeferred<AtmosAlarmableComponent>(uid);
}
}