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

removes atmos alarmable from scrubbers and vents

Browse Source
This commit is contained in:
vulppine
2022-08-19 23:59:59 -07:00
parent 906667abca
commit fbab3cd5aa
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
View File

@@ -181,7 +181,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
private void OnPacketRecv(EntityUid uid, GasVentPumpComponent component, DeviceNetworkPacketEvent args) private void OnPacketRecv(EntityUid uid, GasVentPumpComponent component, DeviceNetworkPacketEvent args)
{ {
if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn) if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn)
|| !EntityManager.TryGetComponent(uid, out AtmosAlarmableComponent? alarmable)
|| !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd)) || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd))
return; return;
@@ -202,7 +201,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
component.FromAirAlarmData(setData); component.FromAirAlarmData(setData);
UpdateState(uid, component); UpdateState(uid, component);
alarmable.IgnoreAlarms = setData.IgnoreAlarms;
payload.Add(DeviceNetworkConstants.Command, AirAlarmSystem.AirAlarmSetDataStatus); payload.Add(DeviceNetworkConstants.Command, AirAlarmSystem.AirAlarmSetDataStatus);
payload.Add(AirAlarmSystem.AirAlarmSetDataStatus, true); payload.Add(AirAlarmSystem.AirAlarmSetDataStatus, true);

2
Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
View File

@@ -147,7 +147,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
private void OnPacketRecv(EntityUid uid, GasVentScrubberComponent component, DeviceNetworkPacketEvent args) private void OnPacketRecv(EntityUid uid, GasVentScrubberComponent component, DeviceNetworkPacketEvent args)
{ {
if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn) if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn)
|| !EntityManager.TryGetComponent(uid, out AtmosAlarmableComponent? alarmable)
|| !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd)) || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd))
return; return;
@@ -168,7 +167,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
component.FromAirAlarmData(setData); component.FromAirAlarmData(setData);
UpdateState(uid, component); UpdateState(uid, component);
alarmable.IgnoreAlarms = setData.IgnoreAlarms;
payload.Add(DeviceNetworkConstants.Command, AirAlarmSystem.AirAlarmSetDataStatus); payload.Add(DeviceNetworkConstants.Command, AirAlarmSystem.AirAlarmSetDataStatus);
payload.Add(AirAlarmSystem.AirAlarmSetDataStatus, true); payload.Add(AirAlarmSystem.AirAlarmSetDataStatus, true);

3
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
View File

@@ -107,9 +107,6 @@
receiveFrequencyId: AtmosMonitor receiveFrequencyId: AtmosMonitor
transmitFrequencyId: AtmosMonitor transmitFrequencyId: AtmosMonitor
prefix: device-address-prefix-scrubber prefix: device-address-prefix-scrubber
- type: AtmosAlarmable
alarmedBy:
- AirAlarm
- type: Sprite - type: Sprite
netsync: false netsync: false
drawdepth: FloorObjects drawdepth: FloorObjects