diff --git a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs b/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs index c4c6832430..785777aacb 100644 --- a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs +++ b/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs @@ -433,7 +433,7 @@ namespace Content.Client.ParticleAccelerator _shouldContinueAnimating = false; _alarmControl.StopAnimation("warningAnim"); _alarmControl.Visible = false; - if (maxState == ParticleAcceleratorPowerState.Level3 && enabled == true && assembled == true) + if (maxState == ParticleAcceleratorPowerState.Level3 && enabled && assembled) { _shouldContinueAnimating = true; _alarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim"); diff --git a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs index 0c0e2a4cae..d3a6fe78b2 100644 --- a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs @@ -22,11 +22,11 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Network; using Robust.Shared.Players; using Robust.Shared.ViewVariables; -using Robust.Shared.Map; -using Robust.Shared.Network; namespace Content.Server.GameObjects.Components.GUI { @@ -244,7 +244,7 @@ namespace Content.Server.GameObjects.Components.GUI return hand != null && hand.Enabled && - hand.Container.CanInsert(item.Owner) == true; + hand.Container.CanInsert(item.Owner); } /// diff --git a/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs b/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs index f955f8d787..11e106f64b 100644 --- a/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs @@ -23,12 +23,9 @@ namespace Content.Server.GameObjects.EntitySystems public bool SignalLinkerKeybind(NetUserId id, bool? enable) { - if (enable == null) - { - enable = !_transmitters.ContainsKey(id); - } + enable ??= !_transmitters.ContainsKey(id); - if (enable == true) + if (enable.Value) { if (_transmitters.ContainsKey(id)) { @@ -45,7 +42,7 @@ namespace Content.Server.GameObjects.EntitySystems _transmitters.Add(id, null); } - else if (enable == false) + else { if (!_transmitters.ContainsKey(id)) { @@ -58,7 +55,8 @@ namespace Content.Server.GameObjects.EntitySystems CommandBinds.Unregister(); } } - return enable == true; + + return enable.Value; } private bool HandleUse(ICommonSession session, EntityCoordinates coords, EntityUid uid)