tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Air alarm mode sent to all linked air alarms from a single air alarm (#11454)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Flipp Syder
2022-10-16 03:18:14 -07:00
committed by GitHub
parent 94c9c9a45c
commit 26883a7ec9
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
View File

@@ -266,7 +266,7 @@ public sealed class AirAlarmSystem : EntitySystem
var addr = string.Empty; var addr = string.Empty;
if (EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn)) addr = netConn.Address; if (EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn)) addr = netConn.Address;
if (AccessCheck(uid, args.Session.AttachedEntity, component)) if (AccessCheck(uid, args.Session.AttachedEntity, component))
SetMode(uid, addr, args.Mode, true, false); SetMode(uid, addr, args.Mode, false);
else else
UpdateUI(uid, component); UpdateUI(uid, component);
} }
@@ -317,11 +317,11 @@ public sealed class AirAlarmSystem : EntitySystem
if (args.AlarmType == AtmosAlarmType.Danger) if (args.AlarmType == AtmosAlarmType.Danger)
{ {
SetMode(uid, addr, AirAlarmMode.WideFiltering, true, false); SetMode(uid, addr, AirAlarmMode.WideFiltering, false);
} }
else if (args.AlarmType == AtmosAlarmType.Normal || args.AlarmType == AtmosAlarmType.Warning) else if (args.AlarmType == AtmosAlarmType.Normal || args.AlarmType == AtmosAlarmType.Warning)
{ {
SetMode(uid, addr, AirAlarmMode.Filtering, true, false); SetMode(uid, addr, AirAlarmMode.Filtering, false);
} }
UpdateUI(uid, component); UpdateUI(uid, component);
@@ -336,11 +336,14 @@ public sealed class AirAlarmSystem : EntitySystem
/// </summary> /// </summary>
/// <param name="origin">The origin address of this mode set. Used for network sync.</param> /// <param name="origin">The origin address of this mode set. Used for network sync.</param>
/// <param name="mode">The mode to set the alarm to.</param> /// <param name="mode">The mode to set the alarm to.</param>
/// <param name="sync">Whether to sync this mode change to the network or not. Defaults to false.</param>
/// <param name="uiOnly">Whether this change is for the UI only, or if it changes the air alarm's operating mode. Defaults to true.</param> /// <param name="uiOnly">Whether this change is for the UI only, or if it changes the air alarm's operating mode. Defaults to true.</param>
public void SetMode(EntityUid uid, string origin, AirAlarmMode mode, bool sync = false, bool uiOnly = true, AirAlarmComponent? controller = null) public void SetMode(EntityUid uid, string origin, AirAlarmMode mode, bool uiOnly = true, AirAlarmComponent? controller = null)
{ {
if (!Resolve(uid, ref controller)) return; if (!Resolve(uid, ref controller) || controller.CurrentMode == mode)
{
return;
}
controller.CurrentMode = mode; controller.CurrentMode = mode;
// setting it to UI only means we don't have // setting it to UI only means we don't have
@@ -377,7 +380,7 @@ public sealed class AirAlarmSystem : EntitySystem
// setting sync deals with the issue of air alarms // setting sync deals with the issue of air alarms
// in the same network needing to have the same mode // in the same network needing to have the same mode
// as other alarms // as other alarms
if (sync) SyncMode(uid, mode); SyncMode(uid, mode);
} }
/// <summary> /// <summary>
@@ -432,7 +435,8 @@ public sealed class AirAlarmSystem : EntitySystem
return; return;
case AirAlarmSetMode: case AirAlarmSetMode:
if (!args.Data.TryGetValue(AirAlarmSetMode, out AirAlarmMode alarmMode)) break; if (!args.Data.TryGetValue(AirAlarmSetMode, out AirAlarmMode alarmMode))
break;
SetMode(uid, args.SenderAddress, alarmMode, uiOnly: false); SetMode(uid, args.SenderAddress, alarmMode, uiOnly: false);

6
Content.Server/Atmos/Monitor/WireActions/AirAlarmPanicWire.cs
View File

@@ -44,7 +44,7 @@ public sealed class AirAlarmPanicWire : BaseWireAction
{ {
if (EntityManager.TryGetComponent<DeviceNetworkComponent>(wire.Owner, out var devNet)) if (EntityManager.TryGetComponent<DeviceNetworkComponent>(wire.Owner, out var devNet))
{ {
_airAlarmSystem.SetMode(wire.Owner, devNet.Address, AirAlarmMode.Panic, true, false); _airAlarmSystem.SetMode(wire.Owner, devNet.Address, AirAlarmMode.Panic, false);
} }
return true; return true;
@@ -56,7 +56,7 @@ public sealed class AirAlarmPanicWire : BaseWireAction
&& EntityManager.TryGetComponent<AirAlarmComponent>(wire.Owner, out var alarm) && EntityManager.TryGetComponent<AirAlarmComponent>(wire.Owner, out var alarm)
&& alarm.CurrentMode == AirAlarmMode.Panic) && alarm.CurrentMode == AirAlarmMode.Panic)
{ {
_airAlarmSystem.SetMode(wire.Owner, devNet.Address, AirAlarmMode.Filtering, true, false, alarm); _airAlarmSystem.SetMode(wire.Owner, devNet.Address, AirAlarmMode.Filtering, false, alarm);
} }
@@ -67,7 +67,7 @@ public sealed class AirAlarmPanicWire : BaseWireAction
{ {
if (EntityManager.TryGetComponent<DeviceNetworkComponent>(wire.Owner, out var devNet)) if (EntityManager.TryGetComponent<DeviceNetworkComponent>(wire.Owner, out var devNet))
{ {
_airAlarmSystem.SetMode(wire.Owner, devNet.Address, AirAlarmMode.Panic, true, false); _airAlarmSystem.SetMode(wire.Owner, devNet.Address, AirAlarmMode.Panic, false);
} }
return true; return true;