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

Remove some criminal if checks (#3261)

Browse Source
This commit is contained in:
DrSmugleaf
2021-02-16 20:14:21 +01:00
committed by GitHub
parent b30bccc03b
commit 3c54c755ce
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs
View File

@@ -433,7 +433,7 @@ namespace Content.Client.ParticleAccelerator
_shouldContinueAnimating = false; _shouldContinueAnimating = false;
_alarmControl.StopAnimation("warningAnim"); _alarmControl.StopAnimation("warningAnim");
_alarmControl.Visible = false; _alarmControl.Visible = false;
if (maxState == ParticleAcceleratorPowerState.Level3 && enabled == true && assembled == true) if (maxState == ParticleAcceleratorPowerState.Level3 && enabled && assembled)
{ {
_shouldContinueAnimating = true; _shouldContinueAnimating = true;
_alarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim"); _alarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim");

6
Content.Server/GameObjects/Components/GUI/HandsComponent.cs
View File

@@ -22,11 +22,11 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Network;
using Robust.Shared.Players; using Robust.Shared.Players;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using Robust.Shared.Map;
using Robust.Shared.Network;
namespace Content.Server.GameObjects.Components.GUI namespace Content.Server.GameObjects.Components.GUI
{ {
@@ -244,7 +244,7 @@ namespace Content.Server.GameObjects.Components.GUI
return hand != null && return hand != null &&
hand.Enabled && hand.Enabled &&
hand.Container.CanInsert(item.Owner) == true; hand.Container.CanInsert(item.Owner);
} }
/// <summary> /// <summary>

12
Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs
View File

@@ -23,12 +23,9 @@ namespace Content.Server.GameObjects.EntitySystems
public bool SignalLinkerKeybind(NetUserId id, bool? enable) 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)) if (_transmitters.ContainsKey(id))
{ {
@@ -45,7 +42,7 @@ namespace Content.Server.GameObjects.EntitySystems
_transmitters.Add(id, null); _transmitters.Add(id, null);
} }
else if (enable == false) else
{ {
if (!_transmitters.ContainsKey(id)) if (!_transmitters.ContainsKey(id))
{ {
@@ -58,7 +55,8 @@ namespace Content.Server.GameObjects.EntitySystems
CommandBinds.Unregister<SignalLinkerSystem>(); CommandBinds.Unregister<SignalLinkerSystem>();
} }
} }
return enable == true;
return enable.Value;
} }
private bool HandleUse(ICommonSession session, EntityCoordinates coords, EntityUid uid) private bool HandleUse(ICommonSession session, EntityCoordinates coords, EntityUid uid)