Rider static analysis (#433)

* Non-accessed local variable

* Merge cast and type checks.

* StringComparison.Ordinal added for better culture support

* Supposed code improvement in launcher. Remove unused code.

* Update ExplosionHelper.cs

Unintentional change.

* Optimized Import

* Add Robust.Shared.Utility import where it was deleted

* Other random suggestion

* Improve my comment

Content.Benchmarks/ColorInterpolateBenchmark.cs

@@ -1,12 +1,10 @@
-using System;
-using System.Runtime.CompilerServices;
 #if NETCOREAPP
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
+using System;
+using System.Runtime.CompilerServices;
 using BenchmarkDotNet.Attributes;
-using Robust.Shared.Interfaces.Random;
-using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using SysVector4 = System.Numerics.Vector4;

Content.Benchmarks/ComponentManagerGetAllComponents.cs

@@ -29,7 +29,7 @@ namespace Content.Benchmarks
             dummyReg.SetupGet(p => p.Type).Returns(typeof(DummyComponent));
             dummyReg.SetupGet(p => p.NetID).Returns((uint?) null);
             dummyReg.SetupGet(p => p.NetworkSynchronizeExistence).Returns(false);
-            dummyReg.SetupGet(p => p.References).Returns(new Type[] {typeof(DummyComponent)});
+            dummyReg.SetupGet(p => p.References).Returns(new [] {typeof(DummyComponent)});
 
             var componentFactory = new Mock<IComponentFactory>();
             componentFactory.Setup(p => p.GetComponent<DummyComponent>()).Returns(new DummyComponent());

Content.Client/Chat/ChatBox.cs

@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using Content.Shared.Chat;
 using Robust.Client.Graphics.Drawing;
-using Robust.Client.Input;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Input;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
-using Robust.Shared.Localization;
-using Robust.Shared.IoC;
-using Robust.Shared.Input;
 
 namespace Content.Client.Chat
 {

Content.Client/ClientNotifyManager.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using Content.Client.Interfaces;
 using Content.Shared;
-using Robust.Client;
 using Robust.Client.Interfaces.Console;
 using Robust.Client.Interfaces.Graphics.ClientEye;
 using Robust.Client.Interfaces.Input;

Content.Client/Construction/ConstructionMenu.cs

@@ -225,7 +225,7 @@ namespace Content.Client.Construction
             PopulateTree(string.IsNullOrWhiteSpace(str) ? null : str.ToLowerInvariant());
         }
 
-        void OnBuildPressed(Button.ButtonEventArgs args)
+        void OnBuildPressed(BaseButton.ButtonEventArgs args)
         {
             var prototype = (ConstructionPrototype) RecipeList.Selected.Metadata;
             if (prototype == null)
@@ -332,7 +332,7 @@ namespace Content.Client.Construction
                     {
                         var found = false;
                         // TODO: don't run ToLowerInvariant() constantly.
-                        if (prototype.Name.ToLowerInvariant().IndexOf(searchTerm) != -1)
+                        if (prototype.Name.ToLowerInvariant().IndexOf(searchTerm, StringComparison.Ordinal) != -1)
                         {
                             found = true;
                         }
@@ -341,7 +341,7 @@ namespace Content.Client.Construction
                             foreach (var keyw in prototype.Keywords.Concat(prototype.CategorySegments))
                             {
                                 // TODO: don't run ToLowerInvariant() constantly.
-                                if (keyw.ToLowerInvariant().IndexOf(searchTerm) != -1)
+                                if (keyw.ToLowerInvariant().IndexOf(searchTerm, StringComparison.Ordinal) != -1)
                                 {
                                     found = true;
                                     break;
@@ -369,7 +369,7 @@ namespace Content.Client.Construction
 
         private static int ComparePrototype(ConstructionPrototype x, ConstructionPrototype y)
         {
-            return x.Name.CompareTo(y.Name);
+            return String.Compare(x.Name, y.Name, StringComparison.Ordinal);
         }
 
         class CategoryNode

Content.Client/Construction/ConstructionPlacementHijack.cs

@@ -1,14 +1,11 @@
 using Content.Client.GameObjects.Components.Construction;
 using Content.Shared.Construction;
-using Robust.Client.Graphics;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.Placement;
-using Robust.Client.ResourceManagement;
 using Robust.Client.Utility;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Content.Client.Construction
 {
@@ -46,7 +43,6 @@ namespace Content.Client.Construction
         {
             base.StartHijack(manager);
 
-            var res = IoCManager.Resolve<IResourceCache>();
             manager.CurrentBaseSprite = Prototype.Icon.DirFrame0();
         }
     }

Content.Client/EscapeMenuOwner.cs

@@ -10,7 +10,6 @@ using Robust.Shared.Interfaces.Configuration;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client

Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs

@@ -1,3 +1,6 @@
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Access;
@@ -6,7 +9,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using Robust.Shared.Utility;
 using static Content.Shared.GameObjects.Components.Access.SharedIdCardConsoleComponent;
 
 namespace Content.Client.GameObjects.Components.Access

Content.Client/GameObjects/Components/DamageableComponent.cs

@@ -20,9 +20,8 @@ namespace Content.Client.GameObjects
         {
             base.HandleComponentState(curState, nextState);
 
-            if(curState is DamageComponentState)
+            if(curState is DamageComponentState damagestate)
             {
-                var damagestate = (DamageComponentState)curState;
                 CurrentDamage = damagestate.CurrentDamage;
             }
         }

Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs

@@ -1,17 +1,16 @@
-using System;
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Client.GameObjects.Components.Clothing;
 using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.Storage;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage;

Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;using System.Collections.Generic;
 using System.Linq;
 using Content.Client.GameObjects.Components.Storage;
 using Content.Client.Utility;
@@ -12,7 +14,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using Robust.Shared.Utility;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 
 namespace Content.Client.GameObjects
@@ -55,7 +56,7 @@ namespace Content.Client.GameObjects
             void AddButton(out InventoryButton variable, Slots slot, string textureName)
             {
                 var texture = _resourceCache.GetTexture($"/Textures/UserInterface/Inventory/{textureName}.png");
-                var storageTexture = _resourceCache.GetTexture($"/Textures/UserInterface/Inventory/back.png");
+                var storageTexture = _resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png");
                 variable = new InventoryButton(slot, texture, storageTexture)
                 {
                     OnPressed = AddToInventory,
@@ -170,7 +171,7 @@ namespace Content.Client.GameObjects
                 void AddButton(Slots slot, string textureName, Vector2 position)
                 {
                     var texture = resourceCache.GetTexture($"/Textures/UserInterface/Inventory/{textureName}.png");
-                    var storageTexture = resourceCache.GetTexture($"/Textures/UserInterface/Inventory/back.png");
+                    var storageTexture = resourceCache.GetTexture("/Textures/UserInterface/Inventory/back.png");
                     var button = new InventoryButton(slot, texture, storageTexture)
                     {
                         Position = position

Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs

@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
+using System.Collections.Generic;
 using System.Linq;
 using Content.Client.Interfaces.GameObjects;
 using Content.Client.UserInterface;
@@ -10,7 +13,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects

Content.Client/GameObjects/Components/LowWallComponent.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Contracts;
 using Content.Client.GameObjects.Components.IconSmoothing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
@@ -179,7 +180,7 @@ namespace Content.Client.GameObjects.Components
             }
         }
 
-        [System.Diagnostics.Contracts.Pure]
+        [Pure]
         private (bool connected, bool lowWall) MatchingWall(IEnumerable<IEntity> candidates)
         {
             foreach (var entity in candidates)

Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs

@@ -1,18 +1,15 @@
-using System.Collections.Generic;
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
 using System.Text;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Utility;
 using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerComponent;
 
 namespace Content.Client.GameObjects.Components.MedicalScanner
 {
     public class MedicalScannerWindow : SS14Window
     {
-        public MedicalScannerWindow()
-        {
-        }
-
         public void Populate(MedicalScannerBoundUserInterfaceState state)
         {
             Contents.RemoveAllChildren();

Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Client.UserInterface;
@@ -14,7 +13,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Mobs
 {

Content.Client/GameObjects/Components/Mobs/SpeciesVisualizer2D.cs

@@ -1,18 +1,12 @@
 using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Maths;
 
 namespace Content.Client.GameObjects.Components.Mobs
 {
     public class SpeciesVisualizer2D : AppearanceVisualizer
     {
-        public override void InitializeEntity(IEntity entity)
-        {
-            base.InitializeEntity(entity);
-        }
-
         public override void OnChangeData(AppearanceComponent component)
         {
             base.OnChangeData(component);
@@ -20,7 +14,7 @@ namespace Content.Client.GameObjects.Components.Mobs
             var sprite = component.Owner.GetComponent<ISpriteComponent>();
             if (component.TryGetData<SharedSpeciesComponent.MobState>(SharedSpeciesComponent.MobVisuals.RotationState, out var state))
             {
-                switch (state) 
+                switch (state)
                 {
                     case SharedSpeciesComponent.MobState.Stand:
                         sprite.Rotation = 0;
@@ -32,4 +26,4 @@ namespace Content.Client.GameObjects.Components.Mobs
             }
         }
     }
-}
+}

Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer2D.cs

@@ -35,7 +35,7 @@ namespace Content.Client.GameObjects.Components.Nutrition
             }
             else
             {
-                sprite.LayerSetState(0, $"icon-0");
+                sprite.LayerSetState(0, "icon-0");
             }
         }
     }

Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs

@@ -3,7 +3,6 @@ using Content.Client.UserInterface;
 using Content.Shared.GameObjects.Components.Power;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Client.Graphics.Drawing;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects.Components.UserInterface;
@@ -153,7 +152,7 @@ namespace Content.Client.GameObjects.Components.Power
                 var chargeLabel = new Label {Text = "Charge:"};
                 ChargeBar = new ProgressBar
                 {
-                    SizeFlagsHorizontal = Control.SizeFlags.FillExpand,
+                    SizeFlagsHorizontal = SizeFlags.FillExpand,
                     MinValue = 0.0f,
                     MaxValue = 1.0f,
                     Page = 0.0f,

Content.Client/GameObjects/Components/Power/SmesVisualizer2D.cs

@@ -2,11 +2,6 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Content.Client.GameObjects.Components.Power
 {

Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs

@@ -87,7 +87,7 @@ namespace Content.Client.GameObjects.Components.Research
                     if (!_prototypeManager.TryIndex(msg.ID, out LatheRecipePrototype recipe)) break;
                     queueMenu?.SetInfo(recipe);
                     break;
-                case SharedLatheComponent.LatheStoppedProducingRecipeMessage msg:
+                case SharedLatheComponent.LatheStoppedProducingRecipeMessage _:
                     queueMenu?.ClearInfo();
                     break;
                 case SharedLatheComponent.LatheFullQueueMessage msg:

Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs

@@ -1,6 +1,5 @@
 using Content.Shared.GameObjects.Components.Research;
 using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects.Components.UserInterface;
 
 namespace Content.Client.GameObjects.Components.Research

Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs

@@ -1,6 +1,4 @@
-using System;
+using Robust.Client.UserInterface.Controls;
-using Content.Shared.GameObjects.Components.Research;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;

Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs

@@ -2,9 +2,7 @@ using Content.Client.Research;
 using Content.Shared.GameObjects.Components.Research;
 using Content.Shared.Research;
 using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.Log;
 
 namespace Content.Client.GameObjects.Components.Research
 {

Content.Client/GameObjects/Components/Research/TechnologyDatabaseComponent.cs

@@ -4,7 +4,6 @@ using Content.Shared.Research;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
-using SixLabors.ImageSharp.Processing;
 
 namespace Content.Client.GameObjects.Components.Research
 {

Content.Client/GameObjects/Components/Sound/SoundComponent.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Content.Shared.GameObjects.Components.Sound;
 using Robust.Client.GameObjects.EntitySystems;
@@ -82,7 +81,7 @@ namespace Content.Client.GameObjects.Components.Sound
                     StopScheduledSound(msg.Filename);
                     break;
 
-                case StopAllSoundsMessage msg:
+                case StopAllSoundsMessage _:
                     StopAllSounds();
                     break;
             }

Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs

@@ -10,7 +10,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
-using Robust.Shared.Serialization;
 
 namespace Content.Client.GameObjects.Components.Storage
 {
@@ -39,11 +38,6 @@ namespace Content.Client.GameObjects.Components.Storage
             base.OnRemove();
         }
 
-        public override void ExposeData(ObjectSerializer serializer)
-        {
-            base.ExposeData(serializer);
-        }
-
         public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
             IComponent component = null)
         {
@@ -54,10 +48,10 @@ namespace Content.Client.GameObjects.Components.Storage
                     HandleStorageMessage(msg);
                     break;
                 //Opens the UI
-                case OpenStorageUIMessage msg:
+                case OpenStorageUIMessage _:
                     OpenUI();
                     break;
-                case CloseStorageUIMessage msg:
+                case CloseStorageUIMessage _:
                     CloseUI();
                     break;
             }

Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs

@@ -2,14 +2,7 @@
 using Content.Shared.GameObjects.Components.VendingMachines;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.IoC;
-using Robust.Shared.Prototypes;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Content.Client.GameObjects.Components.VendingMachines
 {

Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer2D.cs

@@ -1,5 +1,4 @@
 using System;
-using Content.Client.GameObjects.Components.Doors;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Client.GameObjects.Components.Animations;

Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs

@@ -1,9 +1,7 @@
-using System;
 using Content.Shared.GameObjects.Components.Weapons.Ranged;
 using Content.Shared.Utility;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Log;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Weapons/Ranged/HitscanWeaponVisualizer2D.cs

@@ -2,7 +2,6 @@
 using Content.Shared.Utility;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 

Content.Client/GameObjects/Components/Wires/WiresMenu.cs

@@ -1,7 +1,5 @@
-using System.Collections.Generic;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Content.Shared.GameObjects.Components.SharedWiresComponent;

Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs

@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.GameObjects.Components.Weapons.Melee;
 using Content.Shared.GameObjects.Components.Weapons.Melee;

Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs

@@ -1,6 +1,5 @@
 using Content.Client.GameObjects.Components.Weapons.Ranged;
 using Content.Client.Interfaces.GameObjects;
-using Content.Shared.Input;
 using Robust.Client.GameObjects.EntitySystems;
 using Robust.Client.Interfaces.Graphics.ClientEye;
 using Robust.Client.Interfaces.Input;

Content.Client/GameObjects/EntitySystems/WindowSystem.cs

@@ -1,12 +1,9 @@
 using System.Collections.Generic;
 using Content.Client.GameObjects.Components;
-using Content.Client.GameObjects.Components.IconSmoothing;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.Transform;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Map;
 
 namespace Content.Client.GameObjects.EntitySystems
 {

Content.Client/Graphics/Overlays/CircleMaskOverlay.cs

@@ -2,7 +2,6 @@
 using Robust.Client.Graphics.Overlays;
 using Robust.Client.Graphics.Shaders;
 using Robust.Client.Interfaces.Graphics.ClientEye;
-using Robust.Client.Interfaces.Graphics.Overlays;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;

Content.Client/Graphics/Overlays/GradientCircleMask.cs

@@ -2,7 +2,6 @@
 using Robust.Client.Graphics.Overlays;
 using Robust.Client.Graphics.Shaders;
 using Robust.Client.Interfaces.Graphics.ClientEye;
-using Robust.Client.Interfaces.Graphics.Overlays;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;

Content.Client/Interfaces/Chat/IChatManager.cs

@@ -1,5 +1,4 @@
 using Content.Client.Chat;
-using Robust.Client;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Timing;
 

Content.Client/Interfaces/IClientGameTicker.cs

@@ -1,5 +1,3 @@
-using Content.Client.UserInterface;
-using Robust.Client;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Interfaces

Content.Client/Interfaces/IClientNotifyManager.cs

@@ -1,5 +1,4 @@
 using Content.Shared.Interfaces;
-using Robust.Client;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 

Content.Client/Parallax/ParallaxGenerator.cs

@@ -3,16 +3,15 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using Nett;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.Primitives;
 using Robust.Client.Utility;
 using Robust.Shared.Interfaces.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Noise;
 using Robust.Shared.Random;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Advanced;
-using BlendFactor = Robust.Shared.Maths.Color.BlendFactor;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Primitives;
 
 namespace Content.Client.Parallax
 {
@@ -84,8 +83,8 @@ namespace Content.Client.Parallax
             private readonly uint Octaves = 3;
             private readonly float Threshold;
             private readonly float Power = 1;
-            private readonly BlendFactor SrcFactor = BlendFactor.One;
+            private readonly Color.BlendFactor SrcFactor = Color.BlendFactor.One;
-            private readonly BlendFactor DstFactor = BlendFactor.One;
+            private readonly Color.BlendFactor DstFactor = Color.BlendFactor.One;
 
             public LayerNoise(TomlTable table)
             {
@@ -131,12 +130,12 @@ namespace Content.Client.Parallax
 
                 if (table.TryGetValue("sourcefactor", out tomlObject))
                 {
-                    SrcFactor = (BlendFactor) Enum.Parse(typeof(BlendFactor), tomlObject.Get<string>());
+                    SrcFactor = (Color.BlendFactor) Enum.Parse(typeof(Color.BlendFactor), tomlObject.Get<string>());
                 }
 
                 if (table.TryGetValue("destfactor", out tomlObject))
                 {
-                    DstFactor = (BlendFactor) Enum.Parse(typeof(BlendFactor), tomlObject.Get<string>());
+                    DstFactor = (Color.BlendFactor) Enum.Parse(typeof(Color.BlendFactor), tomlObject.Get<string>());
                 }
 
                 if (table.TryGetValue("power", out tomlObject))
@@ -208,8 +207,8 @@ namespace Content.Client.Parallax
             private readonly Color CloseColor = Color.White;
             private readonly Color FarColor = Color.Black;
 
-            private readonly BlendFactor SrcFactor = BlendFactor.One;
+            private readonly Color.BlendFactor SrcFactor = Color.BlendFactor.One;
-            private readonly BlendFactor DstFactor = BlendFactor.One;
+            private readonly Color.BlendFactor DstFactor = Color.BlendFactor.One;
 
             // Noise mask stuff.
             private readonly bool Masked;
@@ -238,12 +237,12 @@ namespace Content.Client.Parallax
 
                 if (table.TryGetValue("sourcefactor", out tomlObject))
                 {
-                    SrcFactor = (BlendFactor) Enum.Parse(typeof(BlendFactor), tomlObject.Get<string>());
+                    SrcFactor = (Color.BlendFactor) Enum.Parse(typeof(Color.BlendFactor), tomlObject.Get<string>());
                 }
 
                 if (table.TryGetValue("destfactor", out tomlObject))
                 {
-                    DstFactor = (BlendFactor) Enum.Parse(typeof(BlendFactor), tomlObject.Get<string>());
+                    DstFactor = (Color.BlendFactor) Enum.Parse(typeof(Color.BlendFactor), tomlObject.Get<string>());
                 }
 
                 if (table.TryGetValue("farcolor", out tomlObject))

Content.Client/Parallax/ParallaxOverlay.cs

@@ -4,7 +4,6 @@ using Robust.Client.Graphics.Drawing;
 using Robust.Client.Graphics.Overlays;
 using Robust.Client.Graphics.Shaders;
 using Robust.Client.Interfaces.Graphics.ClientEye;
-using Robust.Client.Interfaces.Graphics.Overlays;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;

Content.Client/Research/LatheMenu.cs

@@ -1,6 +1,8 @@
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
 using System.Collections.Generic;
 using Content.Client.GameObjects.Components.Research;
-using Content.Shared.GameObjects.Components.Research;
 using Content.Shared.Materials;
 using Content.Shared.Research;
 using Robust.Client.UserInterface;
@@ -10,8 +12,6 @@ using Robust.Client.Utility;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timers;
-using Robust.Shared.Utility;
 
 namespace Content.Client.Research
 {
@@ -219,9 +219,8 @@ namespace Content.Client.Research
         public void PopulateList()
         {
             Items.Clear();
-            for (var i = 0; i < _shownRecipes.Count; i++)
+            foreach (var prototype in _shownRecipes)
             {
-                var prototype = _shownRecipes[i];
                 Items.AddItem(prototype.Name, prototype.Icon.Frame0());
             }
 

Content.Client/Research/ResearchConsoleMenu.cs

@@ -2,13 +2,11 @@ using System.Collections.Generic;
 using Content.Client.GameObjects.Components.Research;
 using Content.Shared.Research;
 using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.Utility;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 

Content.Client/UserInterface/EscapeMenu.cs

@@ -1,8 +1,6 @@
 using Robust.Client.Console;
-using Robust.Client.Interfaces.Graphics;
 using Robust.Client.Interfaces.Placement;
 using Robust.Client.Interfaces.ResourceManagement;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Interfaces.Configuration;

Content.Client/UserInterface/StatusEffectsUI.cs

@@ -1,9 +1,5 @@
-using Content.Client.Utility;
-using Robust.Client.Graphics;
-using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.IoC;
 
 namespace Content.Client.UserInterface
 {

Content.Client/VendingMachines/VendingMachineMenu.cs

@@ -1,13 +1,13 @@
-using Content.Client.GameObjects.Components.VendingMachines;
+using System.Collections.Generic;
-using Robust.Client.UserInterface.Controls;
+using Content.Client.GameObjects.Components.VendingMachines;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
-using System.Collections.Generic;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Interfaces.ResourceManagement;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Content.Shared.GameObjects.Components.VendingMachines.SharedVendingMachineComponent;
 

Content.IntegrationTests/ConnectTest.cs

@@ -6,7 +6,6 @@ using Robust.Shared.Enums;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
-using Robust.UnitTesting;
 
 namespace Content.IntegrationTests
 {

Content.IntegrationTests/ContentIntegrationTest.cs

@@ -13,7 +13,7 @@ namespace Content.IntegrationTests
         {
             options = options ?? new ClientIntegrationOptions();
             // ReSharper disable once RedundantNameQualifier
-            options.ClientContentAssembly = typeof(Client.EntryPoint).Assembly;
+            options.ClientContentAssembly = typeof(EntryPoint).Assembly;
             options.SharedContentAssembly = typeof(Shared.EntryPoint).Assembly;
             options.BeforeStart += () =>
             {

Content.IntegrationTests/StartTest.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Robust.Shared.Exceptions;
-using Robust.UnitTesting;
 
 namespace Content.IntegrationTests
 {

Content.Server/AI/StaticBarkerProcessor.cs

@@ -1,10 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Content.Server.Interfaces.Chat;
-using JetBrains.Annotations;
 using Robust.Server.AI;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;

Content.Server/AI/WanderProcessor.cs

@@ -6,7 +6,6 @@ using Content.Server.Interfaces.Chat;
 using Content.Shared.Physics;
 using Robust.Server.AI;
 using Robust.Server.GameObjects;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Physics;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;

Content.Server/Chat/ChatManager.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Server.GameObjects;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.Chat;

Content.Server/Chemistry/ExplosionReactionEffect.cs

@@ -1,11 +1,8 @@
 using System;
 using Content.Server.Explosions;
-using Content.Server.GameObjects.Components.Explosive;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Server.GameObjects.Components.Chemistry;
 using Content.Shared.Interfaces;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 
 namespace Content.Server.Chemistry

Content.Server/Explosions/ExplosionHelper.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Maps;
@@ -119,7 +116,7 @@ namespace Content.Server.Explosions
             entitySystemManager.GetEntitySystem<AudioSystem>().Play("/Audio/effects/explosion.ogg", coords);
 
             // Knock back cameras of all players in the area.
-            
+
             var playerManager = IoCManager.Resolve<IPlayerManager>();
             //var selfPos = Owner.Transform.WorldPosition; //vec2
             var selfPos = coords.ToWorld(mapManager).Position;

Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs

@@ -168,8 +168,8 @@ namespace Content.Server.GameObjects.Components.Construction
             }
         }
 
-        private static Dictionary<StackType, ConstructionStepMaterial.MaterialType> StackTypeMap
+        private static Dictionary<StackType, MaterialType> StackTypeMap
-        = new Dictionary<StackType, ConstructionStepMaterial.MaterialType>
+        = new Dictionary<StackType, MaterialType>
         {
             { StackType.Cable, MaterialType.Cable },
             { StackType.Glass, MaterialType.Glass },

Content.Server/GameObjects/Components/Damage/BreakableComponent.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;
@@ -7,7 +6,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 

Content.Server/GameObjects/Components/Damage/DamageThreshold.cs

@@ -1,5 +1,5 @@
-using Content.Shared.GameObjects;
+using System;
-using System;
+using Content.Shared.GameObjects;
 
 namespace Content.Server.GameObjects
 {
@@ -21,7 +21,7 @@ namespace Content.Server.GameObjects
 
         public override bool Equals(Object obj)
         {
-            return obj is DamageThreshold && this == (DamageThreshold)obj;
+            return obj is DamageThreshold threshold && this == threshold;
         }
         public override int GetHashCode()
         {

Content.Server/GameObjects/Components/Damage/DamageableComponent.cs

@@ -4,14 +4,13 @@ using System.Linq;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.GameObjects;
+using Robust.Server.Console;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using Robust.Server.Console;
 
 namespace Content.Server.GameObjects
 {

Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Shared.GameObjects;
@@ -7,7 +6,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;

Content.Server/GameObjects/Components/Damage/ResistanceSet.cs

@@ -1,6 +1,6 @@
-using Content.Shared.GameObjects;
+using System;
-using System;
 using System.Collections.Generic;
+using Content.Shared.GameObjects;
 
 namespace Content.Server.GameObjects
 {

Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs

@@ -1,4 +1,5 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Explosions;
+using Content.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
@@ -6,7 +7,6 @@ using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
-using Content.Server.Explosions;
 
 namespace Content.Server.GameObjects.Components.Explosive
 {

Content.Server/GameObjects/Components/GUI/InventoryComponent.cs

@@ -1,4 +1,7 @@
-using System;
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.EntitySystems;
@@ -11,11 +14,10 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
-using Robust.Shared.Utility;
+using Robust.Shared.Map;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage;
-using IComponent = Robust.Shared.Interfaces.GameObjects.IComponent;
 
 namespace Content.Server.GameObjects
 {
@@ -275,7 +277,7 @@ namespace Content.Server.GameObjects
                         if (activeHand != null)
                         {
                             interactionSystem.Interaction(Owner, activeHand.Owner, itemContainedInSlot.Owner,
-                                new Robust.Shared.Map.GridCoordinates());
+                                new GridCoordinates());
                         }
                         else if (Unequip(msg.Inventoryslot))
                         {

Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs

@@ -1,4 +1,7 @@
-using System;
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
+using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameObjects;
@@ -15,7 +18,6 @@ using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects

Content.Server/GameObjects/Components/Interactable/Tools/BaseTool.cs

@@ -1,8 +1,9 @@
-using Robust.Shared.GameObjects;
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
-using Robust.Shared.Serialization;
+// ReSharper disable once RedundantUsingDirective
 using Robust.Shared.Utility;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using YamlDotNet.RepresentationModel;
 
 namespace Content.Server.GameObjects.Components.Interactable.Tools
 {

Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs

@@ -1,5 +1,4 @@
-using System;
+using Content.Server.GameObjects.EntitySystems;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Maps;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;

Content.Server/GameObjects/Components/Interactable/Tools/WelderComponent.cs

@@ -4,7 +4,6 @@ using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
@@ -15,7 +14,7 @@ namespace Content.Server.GameObjects.Components.Interactable.Tools
     /// Tool used to weld metal together, light things on fire, or melt into constituent parts
     /// </summary>
     [RegisterComponent]
-    class WelderComponent : ToolComponent, EntitySystems.IUse, EntitySystems.IExamine
+    class WelderComponent : ToolComponent, IUse, IExamine
     {
         SpriteComponent spriteComponent;
 

Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs

@@ -1,3 +1,6 @@
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
 using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems;
@@ -5,7 +8,6 @@ using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Items;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 
 namespace Content.Server.GameObjects

Content.Server/GameObjects/Components/Items/Storage/Fill/ToolLockerFillComponent.cs

@@ -1,10 +1,8 @@
-using System;
+using Robust.Server.Interfaces.GameObjects;
-using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill

Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs

@@ -1,10 +1,8 @@
-using System;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill

Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Medical;

Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs

@@ -1,4 +1,3 @@
-using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 

Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/DamageThresholdTemplates.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Mobs;
-using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.Server.GameObjects
 {

Content.Server/GameObjects/Components/Mobs/DamageThresholdTemplates/HumanTemplate.cs

@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects;
+using System;
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Mobs;
+using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Mobs;
 using JetBrains.Annotations;
-using ScreenEffects = Content.Shared.GameObjects.Components.Mobs.ScreenEffects;
 
 namespace Content.Server.GameObjects
 {
@@ -46,7 +46,7 @@ namespace Content.Server.GameObjects
                     var totaldamage = damage.CurrentDamage[DamageType.Total];
                     if (totaldamage > critvalue)
                     {
-                        throw new System.InvalidOperationException(); //these should all be below the crit value, possibly going over multiple thresholds at once?
+                        throw new InvalidOperationException(); //these should all be below the crit value, possibly going over multiple thresholds at once?
                     }
                     var modifier = totaldamage / (critvalue / normalstates); //integer division floors towards zero
                     statusEffectsComponent?.ChangeStatus(StatusEffect.Health,
@@ -70,7 +70,7 @@ namespace Content.Server.GameObjects
 
                     return;
                 default:
-                    throw new System.InvalidOperationException();
+                    throw new InvalidOperationException();
             }
         }
     }

Content.Server/GameObjects/Components/Mobs/FootstepSoundComponent.cs

@@ -1,12 +1,4 @@
 using Robust.Shared.GameObjects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Content.Server.Mobs;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Mobs
 {

Content.Server/GameObjects/Components/Mobs/SpeciesComponent.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
+using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Server.GameObjects;
 using Robust.Shared.ContentPack;
@@ -179,8 +180,8 @@ namespace Content.Server.GameObjects
                     bruteDamage += 30;
                     break;
             }
-            Owner.GetComponent<DamageableComponent>().TakeDamage(Shared.GameObjects.DamageType.Brute, bruteDamage);
+            Owner.GetComponent<DamageableComponent>().TakeDamage(DamageType.Brute, bruteDamage);
-            Owner.GetComponent<DamageableComponent>().TakeDamage(Shared.GameObjects.DamageType.Heat, burnDamage);
+            Owner.GetComponent<DamageableComponent>().TakeDamage(DamageType.Heat, burnDamage);
         }
     }
 

Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs

@@ -4,7 +4,6 @@ using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Nutrition;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;

Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs

@@ -4,7 +4,6 @@ using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Nutrition;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;

Content.Server/GameObjects/Components/Power/ApcComponent.cs

@@ -6,7 +6,6 @@ using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.UserInterface;
 
 namespace Content.Server.GameObjects.Components.Power
 {

Content.Server/GameObjects/Components/Power/PowerDevice.cs

@@ -9,8 +9,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
-using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
@@ -21,7 +19,7 @@ namespace Content.Server.GameObjects.Components.Power
     /// Component that requires power to function
     /// </summary>
     [RegisterComponent]
-    public class PowerDeviceComponent : Component, EntitySystems.IExamine
+    public class PowerDeviceComponent : Component, IExamine
     {
         public override string Name => "PowerDevice";
 

Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs

@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
+using System.Collections.Generic;
 using System.Linq;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
@@ -6,7 +9,6 @@ using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Power

Content.Server/GameObjects/Components/Power/PowerStorageComponent.cs

@@ -1,16 +1,12 @@
-using Content.Shared.GameObjects.Components.Power;
+using System;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Components.Power;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
-using System;
-using System.Globalization;
-using Content.Server.GameObjects.EntitySystems;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
-using YamlDotNet.RepresentationModel;
 
 namespace Content.Server.GameObjects.Components.Power
 {

Content.Server/GameObjects/Components/Power/Powernet.cs

@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.EntitySystems;
+using System;
+using System.Collections.Generic;
+using Content.Shared.GameObjects.EntitySystems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using System;
-using System.Collections.Generic;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Power

Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs

@@ -1,12 +1,10 @@
 using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.Maps;
 using Robust.Server.GameObjects;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Transform;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 
 namespace Content.Server.GameObjects.Components.Power
 {

Content.Server/GameObjects/Components/Research/LatheComponent.cs

@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+// Only unused on .NET Core due to KeyValuePair.Deconstruct
+// ReSharper disable once RedundantUsingDirective
+using Robust.Shared.Utility;
+using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Power;
 using Content.Server.GameObjects.Components.Stack;
 using Content.Server.GameObjects.EntitySystems;
@@ -9,9 +12,7 @@ using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.Timers;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Research

Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs

@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Research;
 using Content.Shared.Research;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 
 namespace Content.Server.GameObjects.Components.Research
 {

Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs

@@ -4,9 +4,7 @@ using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.GameObjects.Systems;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 

Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs

@@ -3,17 +3,14 @@ using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Audio;
 using Content.Shared.GameObjects.Components.Research;
 using Content.Shared.Research;
-using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Server.Interfaces.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 

Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs

@@ -1,6 +1,5 @@
 using Content.Server.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 

Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs

@@ -1,12 +1,9 @@
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Runtime.InteropServices.WindowsRuntime;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Research;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 

Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs

@@ -1,9 +1,6 @@
 using Content.Shared.GameObjects.Components.Research;
 using Content.Shared.Research;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.GameObjects.Components.Research
 {

Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs

@@ -1,10 +1,8 @@
-using System;
+using Content.Shared.Audio;
-using Content.Shared.Audio;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;

Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs

@@ -1,21 +1,21 @@
 using System;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.VendingMachines;
-using Content.Shared.VendingMachines;
-using Robust.Server.GameObjects.Components.UserInterface;
-using Robust.Server.Interfaces.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Timers;
-using Robust.Shared.Utility;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.GameObjects.Components.Power;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Components.VendingMachines;
+using Content.Shared.VendingMachines;
 using Robust.Server.GameObjects;
+using Robust.Server.GameObjects.Components.UserInterface;
+using Robust.Server.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Random;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timers;
+using Robust.Shared.Utility;
 using static Content.Shared.GameObjects.Components.SharedWiresComponent;
 
 namespace Content.Server.GameObjects.Components.VendingMachines

Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs

@@ -1,15 +1,15 @@
 using System;
-using Content.Server.GameObjects.EntitySystems;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.ViewVariables;
 using System.Collections.Generic;
+using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Components.Weapons.Ranged;
 using Content.Shared.Interfaces;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Server.Interfaces.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
 {

Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Content.Server.GameObjects.Components.Sound;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects;
@@ -14,7 +13,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;

Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeaponComponent.cs

@@ -1,11 +1,7 @@
 using System;
-using Content.Server.GameObjects.Components.Interactable;
 using Content.Server.GameObjects.Components.Sound;
-using Content.Shared.GameObjects;
 using Robust.Server.GameObjects.Components.Container;
-using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
 
 namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile

Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs

@@ -1,16 +1,11 @@
-using System;
+using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Projectiles;
 using Content.Server.GameObjects.Components.Sound;
 using Robust.Server.GameObjects;
-using Robust.Server.GameObjects.EntitySystems;
-using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;

Content.Server/GameObjects/ContainerSlot.cs

@@ -1,8 +1,8 @@
 using System;
+using System.Collections.Generic;
 using Robust.Server.GameObjects.Components.Container;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
-using System.Collections.Generic;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects

Content.Server/GameObjects/EntitySystems/ActSystem.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
-using Content.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.EntitySystems
 {

Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs

@@ -15,7 +15,6 @@ using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Players;
 
 namespace Content.Server.GameObjects.EntitySystems

Content.Server/GameObjects/EntitySystems/MoverSystem.cs

@@ -1,31 +1,29 @@
-using System;
+using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.Components;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.Components.Movement;
+using Content.Server.GameObjects.Components.Sound;
 using Content.Server.Interfaces.GameObjects.Components.Movement;
 using Content.Shared.Audio;
+using Content.Shared.GameObjects.Components.Inventory;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Server.Interfaces.Player;
 using Robust.Server.Interfaces.Timing;
-using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Transform;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Input;
 using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.Map;
+using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
-using Content.Server.GameObjects.Components.Sound;
-using Content.Shared.GameObjects.Components.Inventory;
-using Robust.Shared.Interfaces.Random;
-using Robust.Shared.Log;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameObjects.EntitySystems