Skip to content

Commit ac657e4

Browse files
authored
Revert AirAlarm States + Networking (#3772)
<!-- IT'S NOT WIZDENS REPO, IF YOU WANT TO ADD YOUR CHANGES ON ALL SERVERS, CREATE PR TO WIZDENS REPO --> ## Short description <!-- What do you propose to change with your PR? --> Reverts AirAlarms saving states and AirAlarms networked. I will get around to redoing them at a later date ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> The PR for AirAlarms saving states was merged untested (They were waiting for someone to test them) and turns out they stop Dev from loading. ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> ## Checks <!-- check boxes for faster reviewing of your PR --> - [X] I do not require assistance to complete the PR. - [X] Before posting/requesting review of a PR, I have verified that the changes work. - [X] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [X] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. No Changelog
2 parents 86674e8 + 9f0d649 commit ac657e4

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
using Content.Shared.DeviceLinking;
66
using Robust.Shared.Network;
77
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
8-
using Robust.Shared.GameStates; // Starlight
98

109
namespace Content.Server.Atmos.Monitor.Components;
1110

12-
[RegisterComponent, NetworkedComponent] // Starlight Edit: Added NetworkedComponent
11+
[RegisterComponent]
1312
public sealed partial class AirAlarmComponent : Component
1413
{
1514
[DataField] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering;

Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ private void OnUpdateAlarmMode(EntityUid uid, AirAlarmComponent component, AirAl
309309
private void OnUpdateAutoMode(EntityUid uid, AirAlarmComponent component, AirAlarmUpdateAutoModeMessage args)
310310
{
311311
component.AutoMode = args.Enabled;
312-
Dirty(uid, component); // Starlight
313312

314313
_adminLogger.Add(LogType.AtmosDeviceSetting, LogImpact.Medium, $"{ToPrettyString(args.Actor)} changed {ToPrettyString(uid)} auto mode to {args.Enabled}");
315314
UpdateUI(uid, component);
@@ -438,7 +437,6 @@ private void OnAtmosAlarm(EntityUid uid, AirAlarmComponent component, AtmosAlarm
438437

439438
// send high to new state's port, along with updating the cached state
440439
component.State = args.AlarmType;
441-
Dirty(uid, component); // Starlight
442440
_deviceLink.SendSignal(uid, GetPort(component), true, source);
443441
}
444442

@@ -480,7 +478,6 @@ public void SetMode(EntityUid uid, string origin, AirAlarmMode mode, bool uiOnly
480478

481479

482480
controller.CurrentMode = mode;
483-
Dirty(uid, controller); // Starlight
484481

485482
// setting it to UI only means we don't have
486483
// to deal with the issue of not-single-owner

0 commit comments

Comments
 (0)