diff --git a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs index 93f704fe21..643b0ce782 100644 --- a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs @@ -11,8 +11,8 @@ namespace Content.Server.Atmos.Monitor.Components; [RegisterComponent] public sealed partial class AirAlarmComponent : Component { - [ViewVariables] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering; - [ViewVariables] public bool AutoMode { get; set; } = true; + [DataField] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering; + [DataField] public bool AutoMode { get; set; } = true; // Remember to null this afterwards. [ViewVariables] public IAirAlarmModeUpdate? CurrentModeUpdater { get; set; } diff --git a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs index eac8dc8312..4400387dc8 100644 --- a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs +++ b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs @@ -5,31 +5,25 @@ namespace Content.Server.Atmos.Piping.Trinary.Components [RegisterComponent] public sealed partial class GasFilterComponent : Component { - [ViewVariables(VVAccess.ReadWrite)] - [DataField("enabled")] - public bool Enabled { get; set; } = true; + [DataField] + public bool Enabled = true; - [ViewVariables(VVAccess.ReadWrite)] [DataField("inlet")] - public string InletName { get; set; } = "inlet"; + public string InletName = "inlet"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("filter")] - public string FilterName { get; set; } = "filter"; + public string FilterName = "filter"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("outlet")] - public string OutletName { get; set; } = "outlet"; + public string OutletName = "outlet"; - [ViewVariables(VVAccess.ReadWrite)] + [DataField] + public float TransferRate = Atmospherics.MaxTransferRate; - [DataField("transferRate")] - public float TransferRate { get; set; } = Atmospherics.MaxTransferRate; + [DataField] + public float MaxTransferRate = Atmospherics.MaxTransferRate; - [DataField("maxTransferRate")] - public float MaxTransferRate { get; set; } = Atmospherics.MaxTransferRate; - - [ViewVariables(VVAccess.ReadWrite)] - public Gas? FilteredGas { get; set; } + [DataField] + public Gas? FilteredGas; } } diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs index 33168d9db9..b2143283f7 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs @@ -9,26 +9,25 @@ namespace Content.Server.Atmos.Piping.Unary.Components [Access(typeof(GasVentScrubberSystem))] public sealed partial class GasVentScrubberComponent : Component { - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public bool Enabled { get; set; } = false; - [ViewVariables] + [DataField] public bool IsDirty { get; set; } = false; - [ViewVariables(VVAccess.ReadWrite)] [DataField("outlet")] public string OutletName { get; set; } = "pipe"; - [ViewVariables] - public readonly HashSet FilterGases = new(GasVentScrubberData.DefaultFilterGases); + [DataField] + public HashSet FilterGases = new(GasVentScrubberData.DefaultFilterGases); - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public ScrubberPumpDirection PumpDirection { get; set; } = ScrubberPumpDirection.Scrubbing; /// /// Target volume to transfer. If is enabled, actual transfer rate will be much higher. /// - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public float TransferRate { get => _transferRate; @@ -37,18 +36,17 @@ namespace Content.Server.Atmos.Piping.Unary.Components private float _transferRate = Atmospherics.MaxTransferRate; - [ViewVariables(VVAccess.ReadWrite)] - [DataField("maxTransferRate")] + [DataField] public float MaxTransferRate = Atmospherics.MaxTransferRate; /// /// As pressure difference approaches this number, the effective volume rate may be smaller than /// - [DataField("maxPressure")] + [DataField] public float MaxPressure = Atmospherics.MaxOutputPressure; - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public bool WideNet { get; set; } = false; public GasVentScrubberData ToAirAlarmData()