Typo, redundant string interpolation, namespaces and imports cleanup (#2068)

* Readonly, typos and redundant string interpolations

* Namespaces

* Optimize imports

* Address reviews

* but actually

* Localize missing strings

* Remove redundant vars

Content.Client/Chat/ChatManager.cs

@@ -5,7 +5,6 @@ using Content.Shared.Chat;
 using Robust.Client.Console;
 using Robust.Client.Interfaces.Graphics.ClientEye;
 using Robust.Client.Interfaces.UserInterface;
-using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;

Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs

@@ -1,10 +1,8 @@
-using Robust.Client.Graphics;
+using Content.Shared.GameObjects.Components.ActionBlocking;
-using Robust.Client.Interfaces.ResourceManagement;
-using Robust.Shared.IoC;
-using Robust.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.ActionBlocking;
 using Content.Shared.Preferences.Appearance;
 using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 

Content.Client/GameObjects/Components/ActionBlocking/HandcuffComponent.cs

@@ -1,8 +1,7 @@
-using Robust.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.ActionBlocking;
-using Content.Shared.GameObjects.Components.ActionBlocking;
-using Robust.Client.Graphics;
 using Robust.Client.GameObjects;
-using Robust.Shared.Serialization;
+using Robust.Client.Graphics;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.GameObjects.Components.ActionBlocking
 {

Content.Client/GameObjects/Components/Actor/CharacterInterface.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.UserInterface;
-using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.Input;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.Input;

Content.Client/GameObjects/Components/Atmos/ExtinguisherVisualizer.cs

@@ -1,4 +1,5 @@
 using System;
+using Content.Shared.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
@@ -6,7 +7,6 @@ using Robust.Client.GameObjects.Components.Animations;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Animations;
 using Robust.Shared.Maths;
-using Content.Shared.GameObjects.Components;
 
 namespace Content.Client.GameObjects.Components.Atmos
 {

Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs

@@ -1,15 +1,15 @@
-using Content.Shared.GameObjects.Components.Atmos;
+using System;
+using Content.Shared.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Client.Graphics;
+using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.GameObjects.Components.Renderable;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Utility;
-using System;
 using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs

@@ -1,4 +1,5 @@
-using Content.Shared.GameObjects.Atmos;
+using System;
+using Content.Shared.GameObjects.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -9,7 +10,6 @@ using Robust.Shared.GameObjects.Components.Renderable;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Utility;
-using System;
 using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Body/BodyManagerComponent.cs

@@ -4,7 +4,6 @@ using Content.Client.GameObjects.Components.MedicalScanner;
 using Content.Client.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.GameObjects.Components.Body;
 using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Medical;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;

Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Globalization;
 using Content.Shared.Body.Scanner;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;

Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs

@@ -87,17 +87,17 @@ namespace Content.Client.GameObjects.Components.Cargo
         {
             base.UpdateState(state);
 
-            if (!(state is CargoConsoleInterfaceState cstate))
+            if (!(state is CargoConsoleInterfaceState cState))
                 return;
-            if (RequestOnly != cstate.RequestOnly)
+            if (RequestOnly != cState.RequestOnly)
             {
-                RequestOnly = cstate.RequestOnly;
+                RequestOnly = cState.RequestOnly;
                 _menu.UpdateRequestOnly();
             }
-            BankId = cstate.BankId;
+            BankId = cState.BankId;
-            BankName = cstate.BankName;
+            BankName = cState.BankName;
-            BankBalance = cstate.BankBalance;
+            BankBalance = cState.BankBalance;
-            ShuttleCapacity = cstate.ShuttleCapacity;
+            ShuttleCapacity = cState.ShuttleCapacity;
             _menu.UpdateCargoCapacity();
             _menu.UpdateBankData();
         }

Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs

@@ -5,7 +5,6 @@ using JetBrains.Annotations;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent;
 

Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs

@@ -1,12 +1,7 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Medical;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
 
 namespace Content.Client.GameObjects.Components.CloningPod

Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs

@@ -1,5 +1,4 @@
 using System;
-using Content.Shared.GameObjects.Components.Medical;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;

Content.Client/GameObjects/Components/CloningPod/CloningPodWindow.cs

@@ -9,7 +9,6 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Robust.Shared.Localization;
 using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
 
 namespace Content.Client.GameObjects.Components.CloningPod

Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs

@@ -2,7 +2,6 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.Localization;
 using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalRouterComponent;
 
 namespace Content.Client.GameObjects.Components.Disposal

Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs

@@ -2,7 +2,6 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.Localization;
 using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalTaggerComponent;
 
 namespace Content.Client.GameObjects.Components.Disposal

Content.Client/GameObjects/Components/ExpendableLightVisualizer.cs

@@ -2,7 +2,6 @@
 using Content.Shared.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using System;
 
 namespace Content.Client.GameObjects.Components
 {

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

@@ -169,8 +169,8 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
 
         public void SendEquipMessage(Slots slot)
         {
-            var equipmessage = new ClientInventoryMessage(slot, ClientInventoryUpdate.Equip);
+            var equipMessage = new ClientInventoryMessage(slot, ClientInventoryUpdate.Equip);
-            SendNetworkMessage(equipmessage);
+            SendNetworkMessage(equipMessage);
         }
 
         public void SendUseMessage(Slots slot)

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

@@ -6,8 +6,8 @@ using JetBrains.Annotations;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.ViewVariables;
 using Robust.Shared.Localization;
+using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 
 namespace Content.Client.GameObjects.Components.HUD.Inventory
@@ -56,7 +56,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
             {
                 foreach (var (slot, name) in Inventory)
                 {
-                    _strippingMenu.AddButton(EquipmentSlotDefines.SlotNames[slot], name, (ev) =>
+                    _strippingMenu.AddButton(SlotNames[slot], name, (ev) =>
                     {
                         SendMessage(new StrippingInventoryButtonPressed(slot));
                     });

Content.Client/GameObjects/Components/Interactable/ExpendableLightComponent.cs

@@ -1,7 +1,6 @@
 
 using Content.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects;
-using Robust.Client.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Interactable
 {

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

@@ -10,9 +10,9 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Renderable;
 using Robust.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.IoC;
+using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
-using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Items

Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs

@@ -77,15 +77,15 @@ namespace Content.Client.GameObjects.Components.Kitchen
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
-            if (!(state is MicrowaveUpdateUserInterfaceState cstate))
+            if (!(state is MicrowaveUpdateUserInterfaceState cState))
             {
                 return;
             }
-            _menu.ToggleBusyDisableOverlayPanel(cstate.IsMicrowaveBusy);
+            _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy);
-            RefreshContentsDisplay(cstate.ReagentQuantities, cstate.ContainedSolids);
+            RefreshContentsDisplay(cState.ReagentQuantities, cState.ContainedSolids);
-            var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cstate.ActiveButtonIndex);
+            var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cState.ActiveButtonIndex);
             currentlySelectedTimeButton.Pressed = true;
-            var label = cstate.ActiveButtonIndex <= 0 ? Loc.GetString("INSTANT") : cstate.CurrentCookTime.ToString();
+            var label = cState.ActiveButtonIndex <= 0 ? Loc.GetString("INSTANT") : cState.CurrentCookTime.ToString();
             _menu._cookTimeInfoLabel.Text = $"{Loc.GetString("COOK TIME")}: {label}";
         }
 

Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs

@@ -35,11 +35,11 @@ namespace Content.Client.GameObjects.Components.Kitchen
                     sprite.LayerSetState(MicrowaveVisualizerLayers.BaseUnlit, "mw_running_unlit");
                     var audioParams = AudioParams.Default;
                     audioParams.Loop = true;
-                    var schedSound = new ScheduledSound();
+                    var scheduledSound = new ScheduledSound();
-                    schedSound.Filename = "/Audio/Machines/microwave_loop.ogg";
+                    scheduledSound.Filename = "/Audio/Machines/microwave_loop.ogg";
-                    schedSound.AudioParams = audioParams;
+                    scheduledSound.AudioParams = audioParams;
                     _loopingSoundComponent.StopAllSounds();
-                    _loopingSoundComponent.AddScheduledSound(schedSound);
+                    _loopingSoundComponent.AddScheduledSound(scheduledSound);
                     break;
 
                 default:

Content.Client/GameObjects/Components/LanternVisualizer.cs

@@ -1,13 +1,10 @@
 using System;
-using Content.Shared.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Client.GameObjects.Components.Animations;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components
 {

Content.Client/GameObjects/Components/LightBehaviourComponent.cs

@@ -1,19 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using Content.Shared.GameObjects.Components;
+using Robust.Client.Animations;
 using Robust.Client.GameObjects;
+using Robust.Client.GameObjects.Components.Animations;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Random;
+using Robust.Shared.Interfaces.Serialization;
 using Robust.Shared.IoC;
-using Robust.Shared.Serialization;
-using Robust.Shared.ViewVariables;
-using Content.Shared.GameObjects.Components;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
-using Robust.Shared.Interfaces.Serialization;
+using Robust.Shared.Serialization;
-using Robust.Client.Animations;
+using Robust.Shared.ViewVariables;
-using Robust.Client.GameObjects.Components.Animations;
-using System.Linq;
 
 namespace Content.Client.GameObjects.Components
 {

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

@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Client.GameObjects.Components.ActionBlocking;
+using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Appearance;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using Content.Client.GameObjects.Components.ActionBlocking;
 
 namespace Content.Client.GameObjects.Components.Mobs
 {

Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs

@@ -1,5 +1,5 @@
-using Robust.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Movement;
+using Robust.Shared.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Movement
 {

Content.Client/GameObjects/Components/Movement/ClimbingComponent.cs

@@ -1,8 +1,6 @@
-using Robust.Shared.GameObjects;
+using Content.Client.Interfaces.GameObjects.Components.Interaction;
-using Robust.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.Components.Movement;
-using Content.Client.Interfaces.GameObjects.Components.Interaction;
+using Robust.Shared.GameObjects;
-using Content.Shared.Physics;
 
 namespace Content.Client.GameObjects.Components.Movement
 {

Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs

@@ -83,9 +83,8 @@ namespace Content.Client.GameObjects.Components.PDA
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
-            DebugTools.Assert((state is PDAUBoundUserInterfaceState));
+            DebugTools.Assert(state is PDAUBoundUserInterfaceState);
 
-            var cstate = (PDAUBoundUserInterfaceState)state;
             switch (state)
             {
                 case PDAUpdateState msg:

Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs

@@ -1,9 +1,6 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent;
 
 namespace Content.Client.GameObjects.Components.Power.AME

Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs

@@ -1,9 +1,6 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEShieldComponent;
 
 namespace Content.Client.GameObjects.Components.Power.AME

Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs

@@ -5,9 +5,6 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent;
 
 namespace Content.Client.GameObjects.Components.Power.AME

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

@@ -11,7 +11,7 @@ namespace Content.Client.GameObjects.Components.Research
     [ComponentReference(typeof(SharedLatheDatabaseComponent))]
     public class ProtolatheDatabaseComponent : SharedProtolatheDatabaseComponent
     {
-        [Dependency] private IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         /// <summary>
         ///     Invoked when the database gets updated.

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

@@ -37,8 +37,8 @@ namespace Content.Client.GameObjects.Components.Research
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
-            if (!(state is SharedResearchClientComponent.ResearchClientBoundInterfaceState rstate)) return;
+            if (!(state is SharedResearchClientComponent.ResearchClientBoundInterfaceState rState)) return;
-            _menu.Populate(rstate.ServerCount, rstate.ServerNames, rstate.ServerIds, rstate.SelectedServerId);
+            _menu.Populate(rState.ServerCount, rState.ServerNames, rState.ServerIds, rState.SelectedServerId);
 
         }
     }

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

@@ -66,12 +66,12 @@ namespace Content.Client.GameObjects.Components.Storage
         /// <summary>
         /// Copies received values from server about contents of storage container
         /// </summary>
-        /// <param name="storagestate"></param>
+        /// <param name="storageState"></param>
-        private void HandleStorageMessage(StorageHeldItemsMessage storagestate)
+        private void HandleStorageMessage(StorageHeldItemsMessage storageState)
         {
-            StoredEntities = new Dictionary<EntityUid, int>(storagestate.StoredEntities);
+            StoredEntities = new Dictionary<EntityUid, int>(storageState.StoredEntities);
-            StorageSizeUsed = storagestate.StorageSizeUsed;
+            StorageSizeUsed = storageState.StorageSizeUsed;
-            StorageCapacityMax = storagestate.StorageSizeMax;
+            StorageCapacityMax = storageState.StorageSizeMax;
             Window.BuildEntityList();
         }
 
@@ -94,10 +94,10 @@ namespace Content.Client.GameObjects.Components.Storage
         /// <summary>
         /// Function for clicking one of the stored entity buttons in the UI, tells server to remove that entity
         /// </summary>
-        /// <param name="entityuid"></param>
+        /// <param name="entityUid"></param>
-        private void Interact(EntityUid entityuid)
+        private void Interact(EntityUid entityUid)
         {
-            SendNetworkMessage(new RemoveEntityMessage(entityuid));
+            SendNetworkMessage(new RemoveEntityMessage(entityUid));
         }
 
         /// <summary>
@@ -198,21 +198,21 @@ namespace Content.Client.GameObjects.Components.Storage
             {
                 EntityList.DisposeAllChildren();
 
-                var storagelist = StorageEntity.StoredEntities;
+                var storageList = StorageEntity.StoredEntities;
 
-                foreach (var entityuid in storagelist)
+                foreach (var entityUid in storageList)
                 {
-                    var entity = IoCManager.Resolve<IEntityManager>().GetEntity(entityuid.Key);
+                    var entity = IoCManager.Resolve<IEntityManager>().GetEntity(entityUid.Key);
 
                     var button = new EntityButton()
                     {
-                        EntityuID = entityuid.Key,
+                        EntityUid = entityUid.Key,
                         MouseFilter = MouseFilterMode.Stop,
                     };
                     button.ActualButton.OnToggled += OnItemButtonToggled;
                     //Name and Size labels set
                     button.EntityName.Text = entity.Name;
-                    button.EntitySize.Text = string.Format("{0}", entityuid.Value);
+                    button.EntitySize.Text = string.Format("{0}", entityUid.Value);
 
                     //Gets entity sprite and assigns it to button texture
                     if (entity.TryGetComponent(out ISpriteComponent sprite))
@@ -226,12 +226,12 @@ namespace Content.Client.GameObjects.Components.Storage
                 //Sets information about entire storage container current capacity
                 if (StorageEntity.StorageCapacityMax != 0)
                 {
-                    Information.Text = String.Format("Items: {0}, Stored: {1}/{2}", storagelist.Count,
+                    Information.Text = String.Format("Items: {0}, Stored: {1}/{2}", storageList.Count,
                         StorageEntity.StorageSizeUsed, StorageEntity.StorageCapacityMax);
                 }
                 else
                 {
-                    Information.Text = String.Format("Items: {0}", storagelist.Count);
+                    Information.Text = String.Format("Items: {0}", storageList.Count);
                 }
             }
 
@@ -243,7 +243,7 @@ namespace Content.Client.GameObjects.Components.Storage
             {
                 var control = (EntityButton) args.Button.Parent;
                 args.Button.Pressed = false;
-                StorageEntity.Interact(control.EntityuID);
+                StorageEntity.Interact(control.EntityUid);
             }
 
             /// <summary>
@@ -265,7 +265,7 @@ namespace Content.Client.GameObjects.Components.Storage
         /// </summary>
         private class EntityButton : PanelContainer
         {
-            public EntityUid EntityuID { get; set; }
+            public EntityUid EntityUid { get; set; }
             public Button ActualButton { get; }
             public SpriteView EntitySpriteView { get; }
             public Control EntityControl { get; }

Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs

@@ -1,4 +1,5 @@
-using Content.Client.UserInterface.Stylesheets;
+using System;
+using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
 using Robust.Client.Graphics.Drawing;
@@ -7,7 +8,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
-using System;
 
 namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
 {

Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBoltActionBarrelComponent.cs

@@ -1,4 +1,5 @@
-using Content.Client.UserInterface.Stylesheets;
+using System;
+using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
@@ -8,7 +9,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
-using System;
 
 namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
 {

Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientPumpBarrelComponent.cs

@@ -1,4 +1,5 @@
-using Content.Client.UserInterface.Stylesheets;
+using System;
+using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
@@ -8,9 +9,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
 {

Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientRevolverBarrelComponent.cs

@@ -1,5 +1,4 @@
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Utility;
-using Content.Client.Utility;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
 using Robust.Client.Graphics;
@@ -8,10 +7,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices.ComTypes;
-using System.Text;
 
 namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
 {

Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs

@@ -13,7 +13,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualize
         {
             base.InitializeEntity(entity);
             var sprite = entity.GetComponent<ISpriteComponent>();
-            sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, $"bolt-open");
+            sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-open");
         }
 
         public override void OnChangeData(AppearanceComponent component)

Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs

@@ -380,7 +380,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI
         {
             foreach (var route in AStarRoutes)
             {
-                var highestgScore = route.GScores.Values.Max();
+                var highestGScore = route.GScores.Values.Max();
 
                 foreach (var (tile, score) in route.GScores)
                 {
@@ -399,8 +399,8 @@ namespace Content.Client.GameObjects.EntitySystems.AI
 
                     screenHandle.DrawRect(box, new Color(
                         0.0f,
-                        score / highestgScore,
+                        score / highestGScore,
-                        1.0f - (score / highestgScore),
+                        1.0f - (score / highestGScore),
                         0.1f));
                 }
             }

Content.Client/GameObjects/EntitySystems/DragDropSystem.cs

@@ -16,7 +16,6 @@ using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
@@ -35,7 +34,6 @@ namespace Content.Client.GameObjects.EntitySystems
         [Dependency] private readonly IInputManager _inputManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
 
         // drag will be triggered when mouse leaves this deadzone around the click position.
         private const float DragDeadzone = 2f;

Content.Client/Instruments/InstrumentMenu.cs

@@ -1,7 +1,6 @@
 using Content.Client.GameObjects.Components.Instruments;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
-using Content.Shared.Utility;
 using Robust.Client.Audio.Midi;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.Interfaces.UserInterface;

Content.Client/Interfaces/IClientGameTicker.cs

@@ -1,6 +1,6 @@
-using Robust.Shared.Network;
+using System;
-using System;
 using System.Collections.Generic;
+using Robust.Shared.Network;
 using static Content.Shared.SharedGameTicker;
 
 namespace Content.Client.Interfaces

Content.Client/Sandbox/SandboxManager.cs

@@ -1,12 +1,9 @@
 using System;
 using Content.Client.UserInterface;
-using Content.Client.GameObjects.EntitySystems;
 using Content.Shared.Input;
 using Content.Shared.Sandbox;
 using Robust.Client.Console;
-using Robust.Client.Interfaces.Console;
 using Robust.Client.Interfaces.Input;
-using Robust.Client.Interfaces.Graphics.Lighting;
 using Robust.Client.Interfaces.Placement;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
@@ -213,7 +210,7 @@ namespace Content.Client.Sandbox
 
         private void OnToggleSubfloorButtonClicked(BaseButton.ButtonEventArgs args)
         {
-            ToggleSubfloor();
+            ToggleSubFloor();
         }
 
         private void OnShowMarkersButtonClicked(BaseButton.ButtonEventArgs args)
@@ -278,7 +275,7 @@ namespace Content.Client.Sandbox
             _console.ProcessCommand("togglelight");
         }
 
-        private void ToggleSubfloor()
+        private void ToggleSubFloor()
         {
             _console.ProcessCommand("showsubfloor");
         }

Content.Client/State/GameScreenBase.cs

@@ -181,9 +181,9 @@ namespace Content.Client.State
                 }
                 */
 
-                var transx = x.clicked.Transform;
+                var transX = x.clicked.Transform;
-                var transy = y.clicked.Transform;
+                var transY = y.clicked.Transform;
-                val = transx.Coordinates.Y.CompareTo(transy.Coordinates.Y);
+                val = transX.Coordinates.Y.CompareTo(transY.Coordinates.Y);
                 if (val != 0)
                 {
                     return val;

Content.Client/State/LobbyState.cs

@@ -1,4 +1,6 @@
-using Content.Client.Interfaces;
+using System;
+using System.Linq;
+using Content.Client.Interfaces;
 using Content.Client.Interfaces.Chat;
 using Content.Client.UserInterface;
 using Content.Shared.Input;
@@ -16,8 +18,6 @@ using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Linq;
 using static Content.Shared.SharedGameTicker;
 
 namespace Content.Client.State

Content.Client/State/MainMenu.cs

@@ -36,7 +36,7 @@ namespace Content.Client.State
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
 
         private MainMenuControl _mainMenuControl;
-        private OptionsMenu OptionsMenu;
+        private OptionsMenu _optionsMenu;
         private bool _isConnecting;
 
         // ReSharper disable once InconsistentNaming
@@ -56,7 +56,7 @@ namespace Content.Client.State
 
             _client.RunLevelChanged += RunLevelChanged;
 
-            OptionsMenu = new OptionsMenu();
+            _optionsMenu = new OptionsMenu();
         }
 
         /// <inheritdoc />
@@ -66,7 +66,7 @@ namespace Content.Client.State
             _netManager.ConnectFailed -= _onConnectFailed;
 
             _mainMenuControl.Dispose();
-            OptionsMenu.Dispose();
+            _optionsMenu.Dispose();
         }
 
         private void QuitButtonPressed(BaseButton.ButtonEventArgs args)
@@ -76,7 +76,7 @@ namespace Content.Client.State
 
         private void OptionsButtonPressed(BaseButton.ButtonEventArgs args)
         {
-            OptionsMenu.OpenCentered();
+            _optionsMenu.OpenCentered();
         }
 
         private void DirectConnectButtonPressed(BaseButton.ButtonEventArgs args)
@@ -315,7 +315,7 @@ namespace Content.Client.State
 
                 VersionLabel = new Label
                 {
-                    Text = $"v0.1"
+                    Text = "v0.1"
                 };
 
                 LayoutContainer.SetAnchorPreset(VersionLabel, LayoutContainer.LayoutPreset.BottomRight);

Content.Client/StationEvents/RadiationPulseOverlay.cs

@@ -13,7 +13,7 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
-using Color = Robust.Shared.Maths.Color;
+using Robust.Shared.Maths;
 
 namespace Content.Client.StationEvents
 {

Content.Client/StationEvents/StationEventManager.cs

@@ -1,9 +1,9 @@
 #nullable enable
+using System;
+using System.Collections.Generic;
 using Content.Shared.StationEvents;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
-using System;
-using System.Collections.Generic;
 
 namespace Content.Client.StationEvents
 {

Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs

@@ -1,11 +1,11 @@
-using Content.Shared.Input;
+using System.Collections.Generic;
+using Content.Shared.Input;
 using Robust.Client.Console;
 using Robust.Client.Interfaces.Input;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
-using System.Collections.Generic;
 
 namespace Content.Client.UserInterface.AdminMenu
 {

Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs

@@ -1,4 +1,7 @@
 #nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Content.Client.GameObjects.EntitySystems;
 using Content.Client.StationEvents;
 using Content.Shared.Atmos;
@@ -18,54 +21,51 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
 namespace Content.Client.UserInterface.AdminMenu
 {
     public class AdminMenuWindow : SS14Window
     {
-        public TabContainer MasterTabContainer;
+        public readonly TabContainer MasterTabContainer;
-        public VBoxContainer PlayerList;
+        public readonly VBoxContainer PlayerList;
-        public Label PlayerCount;
+        public readonly Label PlayerCount;
 
         protected override Vector2? CustomSize => (500, 250);
 
-        private List<CommandButton> _adminButtons = new List<CommandButton>
+        private readonly List<CommandButton> _adminButtons = new List<CommandButton>
         {
             new KickCommandButton(),
             new DirectCommandButton("Admin Ghost", "aghost"),
             //TODO: teleport
         };
-        private List<CommandButton> _adminbusButtons = new List<CommandButton>
+        private readonly List<CommandButton> _adminbusButtons = new List<CommandButton>
         {
             new SpawnEntitiesCommandButton(),
             new SpawnTilesCommandButton(),
             new StationEventsCommandButton(),
         };
-        private List<CommandButton> _debugButtons = new List<CommandButton>
+        private readonly List<CommandButton> _debugButtons = new List<CommandButton>
         {
             new AddAtmosCommandButton(),
             new FillGasCommandButton(),
         };
-        private List<CommandButton> _roundButtons = new List<CommandButton>
+        private readonly List<CommandButton> _roundButtons = new List<CommandButton>
         {
             new DirectCommandButton("Start Round", "startround"),
             new DirectCommandButton("End Round", "endround"),
             new DirectCommandButton("Restart Round", "restartround"),
         };
-        private List<CommandButton> _serverButtons = new List<CommandButton>
+        private readonly List<CommandButton> _serverButtons = new List<CommandButton>
         {
             new DirectCommandButton("Reboot", "restart"),
             new DirectCommandButton("Shutdown", "shutdown"),
         };
 
         private static readonly Color SeparatorColor = Color.FromHex("#3D4059");
-        private class HSeperator : Control
+        private class HSeparator : Control
         {
-            public HSeperator()
+            public HSeparator()
             {
                 AddChild(new PanelContainer {
                     PanelOverride = new StyleBoxFlat
@@ -135,7 +135,7 @@ namespace Content.Client.UserInterface.AdminMenu
                     header
                 }
             });
-            PlayerList.AddChild(new HSeperator());
+            PlayerList.AddChild(new HSeparator());
 
             var useAltColor = false;
             foreach (var player in sessions)
@@ -464,7 +464,7 @@ namespace Content.Client.UserInterface.AdminMenu
             public override string RequiredCommand => "events";
             public override string? SubmitText => "Run";
 
-            private CommandUIDropDown _eventsDropDown = new CommandUIDropDown
+            private readonly CommandUIDropDown _eventsDropDown = new CommandUIDropDown
             {
                 Name = "Event",
                 GetData = () =>
@@ -487,7 +487,7 @@ namespace Content.Client.UserInterface.AdminMenu
                     Name = "Pause",
                     Handler = () =>
                     {
-                        IoCManager.Resolve<IClientConsole>().ProcessCommand($"events pause");
+                        IoCManager.Resolve<IClientConsole>().ProcessCommand("events pause");
                     },
                 },
                 new CommandUIButton
@@ -495,7 +495,7 @@ namespace Content.Client.UserInterface.AdminMenu
                     Name = "Resume",
                     Handler = () =>
                     {
-                        IoCManager.Resolve<IClientConsole>().ProcessCommand($"events resume");
+                        IoCManager.Resolve<IClientConsole>().ProcessCommand("events resume");
                     },
                 },
             };
@@ -511,14 +511,14 @@ namespace Content.Client.UserInterface.AdminMenu
             public override string Name => "Kick";
             public override string RequiredCommand => "kick";
 
-            private CommandUIDropDown _playerDropDown = new CommandUIDropDown
+            private readonly CommandUIDropDown _playerDropDown = new CommandUIDropDown
             {
                 Name = "Player",
                 GetData = () => IoCManager.Resolve<IPlayerManager>().Sessions.ToList<object>(),
                 GetDisplayName = (obj) => $"{((IPlayerSession) obj).Name} ({((IPlayerSession) obj).AttachedEntity?.Name})",
                 GetValueFromData = (obj) => ((IPlayerSession) obj).Name,
             };
-            private CommandUILineEdit _reason = new CommandUILineEdit
+            private readonly CommandUILineEdit _reason = new CommandUILineEdit
             {
                 Name = "Reason"
             };
@@ -540,7 +540,7 @@ namespace Content.Client.UserInterface.AdminMenu
             public override string Name => "Add Atmos";
             public override string RequiredCommand => "addatmos";
 
-            private CommandUIDropDown _grid = new CommandUIDropDown
+            private readonly CommandUIDropDown _grid = new CommandUIDropDown
             {
                 Name = "Grid",
                 GetData = () => IoCManager.Resolve<IMapManager>().GetAllGrids().Where(g => (int) g.Index != 0).ToList<object>(),
@@ -564,7 +564,7 @@ namespace Content.Client.UserInterface.AdminMenu
             public override string Name => "Fill Gas";
             public override string RequiredCommand => "fillgas";
 
-            private CommandUIDropDown _grid = new CommandUIDropDown
+            private readonly CommandUIDropDown _grid = new CommandUIDropDown
             {
                 Name = "Grid",
                 GetData = () => IoCManager.Resolve<IMapManager>().GetAllGrids().Where(g => (int) g.Index != 0).ToList<object>(),
@@ -572,7 +572,7 @@ namespace Content.Client.UserInterface.AdminMenu
                 GetValueFromData = (obj) => ((IMapGrid) obj).Index.ToString(),
             };
 
-            private CommandUIDropDown _gas = new CommandUIDropDown
+            private readonly CommandUIDropDown _gas = new CommandUIDropDown
             {
                 Name = "Gas",
                 GetData = () =>

Content.Client/UserInterface/KeyRebindControl.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.Input;
-using Robust.Client.Input;
-using Robust.Client.Interfaces.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.Timing;
-using Robust.Shared.Utility;
-
-#nullable enable
-
-namespace Content.Client.UserInterface
-{
-}

Content.Client/UserInterface/LobbyGui.cs

@@ -9,8 +9,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using System;
-using System.Collections.Generic;
 
 namespace Content.Client.UserInterface
 {

Content.Client/UserInterface/RoundEndSummaryWindow.cs

@@ -53,9 +53,9 @@ namespace Content.Client.UserInterface
             //Round end text
             if (!string.IsNullOrEmpty(roundEnd))
             {
-                var roundendLabel = new RichTextLabel();
+                var roundEndLabel = new RichTextLabel();
-                roundendLabel.SetMarkup(Loc.GetString(roundEnd));
+                roundEndLabel.SetMarkup(Loc.GetString(roundEnd));
-                RoundEndSummaryTab.AddChild(roundendLabel);
+                RoundEndSummaryTab.AddChild(roundEndLabel);
             }
 
             //Duration
@@ -72,27 +72,27 @@ namespace Content.Client.UserInterface
             //Put observers at the bottom of the list. Put antags on top.
             var manifestSortedList = info.OrderBy(p => p.Observer).ThenBy(p => !p.Antag);
             //Create labels for each player info.
-            foreach (var plyinfo in manifestSortedList)
+            foreach (var playerInfo in manifestSortedList)
             {
                 var playerInfoText = new RichTextLabel()
                 {
                     SizeFlagsVertical = SizeFlags.Fill,
                 };
 
-                if (plyinfo.Observer)
+                if (playerInfo.Observer)
                 {
                     playerInfoText.SetMarkup(
                         Loc.GetString("[color=gray]{0}[/color] was [color=lightblue]{1}[/color], an observer.",
-                                        plyinfo.PlayerOOCName, plyinfo.PlayerICName));
+                                        playerInfo.PlayerOOCName, playerInfo.PlayerICName));
                 }
                 else
                 {
                     //TODO: On Hover display a popup detailing more play info.
                     //For example: their antag goals and if they completed them sucessfully.
-                    var icNameColor = plyinfo.Antag ? "red" : "white";
+                    var icNameColor = playerInfo.Antag ? "red" : "white";
                     playerInfoText.SetMarkup(
                         Loc.GetString("[color=gray]{0}[/color] was [color={1}]{2}[/color] playing role of [color=orange]{3}[/color].",
-                                        plyinfo.PlayerOOCName, icNameColor, plyinfo.PlayerICName, Loc.GetString(plyinfo.Role)));
+                                        playerInfo.PlayerOOCName, icNameColor, playerInfo.PlayerICName, Loc.GetString(playerInfo.Role)));
                 }
                 innerScrollContainer.AddChild(playerInfoText);
             }

Content.Client/UserInterface/StrippingMenu.cs

@@ -3,7 +3,6 @@ using Content.Client.UserInterface.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
 namespace Content.Client.UserInterface

Content.Client/Utility/RangeExtensions.cs

@@ -4,7 +4,6 @@ using Robust.Client.Player;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.GameObjects.Components;
-using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using static Content.Shared.GameObjects.EntitySystems.SharedInteractionSystem;

Content.IntegrationTests/ContentIntegrationTest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Content.Client;

Content.IntegrationTests/Tests/AI/AiControllerTest.cs

@@ -11,7 +11,6 @@ using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests.AI

Content.IntegrationTests/Tests/EntityTest.cs

@@ -10,9 +10,7 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using Logger = Robust.Shared.Log.Logger;
 
 namespace Content.IntegrationTests.Tests
 {

Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/CuffUnitTest.cs

@@ -1,20 +1,20 @@
 #nullable enable
 
+using System.Linq;
 using System.Threading.Tasks;
+using Content.Client.GameObjects.Components.Items;
+using Content.Server.Body;
+using Content.Server.GameObjects.Components.ActionBlocking;
+using Content.Server.GameObjects.Components.Body;
+using Content.Server.Interfaces.GameObjects.Components.Items;
+using Content.Shared.Body.Part;
+using Content.Shared.GameObjects.Components.Body;
 using NUnit.Framework;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Content.Server.GameObjects.Components.ActionBlocking;
-using System.Linq;
-using Content.Server.GameObjects.Components.Body;
-using Content.Shared.Body.Part;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Server.Interfaces.GameObjects.Components.Items;
 using Robust.Shared.Prototypes;
-using Content.Server.Body;
-using Content.Client.GameObjects.Components.Items;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
 {

Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs

@@ -1,14 +1,14 @@
 #nullable enable
 
 using System.Threading.Tasks;
+using Content.Server.GameObjects.Components.Movement;
+using Content.Shared.Physics;
 using NUnit.Framework;
+using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Shared.Physics;
-using Robust.Shared.GameObjects.Components;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.Movement
 {

Content.IntegrationTests/Tests/GravityGridTest.cs

@@ -7,7 +7,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Content.IntegrationTests.Tests
 {

Content.IntegrationTests/Tests/GridTileLookupTest.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -6,7 +5,6 @@ using NUnit.Framework;
 using Robust.Server.GameObjects.EntitySystems.TileLookup;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 

Content.IntegrationTests/Tests/InventoryHelpersTest.cs

@@ -3,7 +3,6 @@ using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Inventory;
 using NUnit.Framework;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;

Content.IntegrationTests/Tests/MindEntityDeletionTest.cs

@@ -10,7 +10,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Content.IntegrationTests.Tests
 {

Content.IntegrationTests/Tests/PowerTest.cs

@@ -1,14 +1,13 @@
-using Content.Server.GameObjects.Components.Power;
+using System.Threading.Tasks;
+using Content.Server.GameObjects.Components.Power;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Content.Shared.Utility;
 using NUnit.Framework;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
-using System.Threading.Tasks;
-using Content.Shared.Utility;
 
 namespace Content.IntegrationTests.Tests
 {

Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Server.GameObjects.EntitySystems.StationEvents;
 using NUnit.Framework;
 using Robust.Shared.GameObjects.Systems;

Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs

@@ -1,7 +1,6 @@
 using Content.Server.AI.Utility;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.Utility;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Utility;
 using Robust.Shared.Interfaces.GameObjects;

Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs

@@ -1,6 +1,5 @@
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Server.Utility;
 using Content.Shared.Utility;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;

Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs

@@ -2,7 +2,6 @@
 using Content.Server.AI.Utility;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.Utility;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Utility;
 using Robust.Shared.Containers;

Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs

@@ -2,7 +2,6 @@
 using Content.Server.GameObjects.Components.GUI;
 using Content.Server.GameObjects.Components.Items.Storage;
 using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Server.Utility;
 using Content.Shared.Utility;
 using Robust.Shared.Containers;
 using Robust.Shared.Interfaces.GameObjects;

Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using Content.Server.AI.Operators.Sequences;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.Containers;
-using Content.Server.AI.Utility.Considerations.Hands;
 using Content.Server.AI.Utility.Considerations.Movement;
 using Content.Server.AI.Utility.Considerations.Nutrition.Drink;
 using Content.Server.AI.WorldState;

Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs

@@ -1,6 +1,5 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Damage;
 
 namespace Content.Server.AI.Utility.Considerations.Combat

Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs

@@ -6,12 +6,9 @@ using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.Combat.Melee;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.AI;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.EntitySystems.AI;
-using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Combat.Melee

Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs

@@ -4,13 +4,10 @@ using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.Actions.Combat.Melee;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.Combat.Melee;
-using Content.Server.AI.Utils;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.GameObjects.Components.Movement;
 using Content.Server.GameObjects.EntitySystems.AI;
-using Content.Shared.GameObjects.Components.Body;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.IoC;
 

Content.Server/Administration/WarpCommand.cs

@@ -9,7 +9,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Content.Server.Administration
 {

Content.Server/Atmos/GasMixture.cs

@@ -9,8 +9,6 @@ using Content.Server.Interfaces;
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.Serialization;
-using Robust.Shared.IoC;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 

Content.Server/Atmos/GasVaporComponent.cs

@@ -1,5 +1,7 @@
-using Content.Shared.Physics;
+using Content.Server.Atmos.Reactions;
-using Content.Server.Atmos.Reactions;
+using Content.Server.Interfaces;
+using Content.Shared.Atmos;
+using Content.Shared.Physics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
@@ -8,9 +10,6 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using Content.Server.Interfaces;
-using Content.Shared.Atmos;
-using Robust.Shared.Map;
 
 namespace Content.Server.Atmos
 {

Content.Server/Atmos/Reactions/PhoronFireReaction.cs

@@ -1,12 +1,9 @@
 #nullable enable
 using System;
 using Content.Server.Interfaces;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Atmos;
-using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
 namespace Content.Server.Atmos.Reactions

Content.Server/Atmos/Reactions/TritiumFireReaction.cs

@@ -1,8 +1,6 @@
 #nullable enable
 using Content.Server.Interfaces;
-using Content.Server.Interfaces.GameObjects.Components.Interaction;
 using Content.Shared.Atmos;
-using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;

Content.Server/Atmos/TileAtmosInfo.cs

@@ -1,6 +1,5 @@
 using System;
 using Content.Shared.Atmos;
-using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Atmos

Content.Server/Atmos/TileAtmosphere.cs

@@ -10,7 +10,6 @@ using Content.Server.Utility;
 using Content.Shared.Atmos;
 using Content.Shared.Audio;
 using Content.Shared.Maps;
-using Content.Shared.Utility;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects.EntitySystems;
 using Robust.Server.GameObjects.EntitySystems.TileLookup;

Content.Server/Body/BodyCommands.cs

@@ -1,4 +1,6 @@
 #nullable enable
+using System;
+using System.Linq;
 using Content.Server.GameObjects.Components.Body;
 using Content.Shared.Body.Part;
 using Content.Shared.Damage;
@@ -12,8 +14,6 @@ using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using System;
-using System.Linq;
 
 namespace Content.Server.Body
 {

Content.Server/Body/Mechanisms/Mechanism.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using Content.Server.Body.Mechanisms.Behaviors;
 using Content.Server.GameObjects.Components.Body;
-using Content.Server.GameObjects.Components.Metabolism;
 using Content.Shared.Body.Mechanism;
 using Content.Shared.GameObjects.Components.Body;
 using Robust.Shared.IoC;

Content.Server/Chat/ChatCommands.cs

@@ -8,6 +8,7 @@ using Content.Server.Interfaces.GameObjects;
 using Content.Server.Observer;
 using Content.Server.Players;
 using Content.Server.Utility;
+using Content.Shared.Damage;
 using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.Interfaces;
 using Robust.Server.Interfaces.Console;
@@ -16,7 +17,6 @@ using Robust.Shared.Enums;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Content.Shared.Damage;
 
 namespace Content.Server.Chat
 {

Content.Server/Chat/ChatManager.cs

@@ -1,4 +1,6 @@
-using Content.Server.GameObjects.Components.Observer;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.GameObjects.Components.Observer;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.Chat;
@@ -11,9 +13,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using static Content.Server.Interfaces.Chat.IChatManager;
 
 namespace Content.Server.Chat

Content.Server/EntryPoint.cs

@@ -1,9 +1,10 @@
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.WorldState;
+using Content.Server.Body.Network;
+using Content.Server.GameObjects.Components.Mobs.Speech;
 using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
 using Content.Server.Interfaces;
 using Content.Server.Interfaces.Chat;
-using Content.Server.Body.Network;
 using Content.Server.Interfaces.GameTicking;
 using Content.Server.Interfaces.PDA;
 using Content.Server.Sandbox;
@@ -15,7 +16,6 @@ using Robust.Shared.Interfaces.Log;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Timing;
-using Content.Server.GameObjects.Components.Mobs.Speech;
 
 namespace Content.Server
 {

Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs

@@ -117,7 +117,7 @@ namespace Content.Server.GameObjects.Components.Access
 
             if (!newAccessList.TrueForAll(x => _prototypeManager.HasIndex<AccessLevelPrototype>(x)))
             {
-                Logger.Warning($"Tried to write unknown access tag.");
+                Logger.Warning("Tried to write unknown access tag.");
                 return;
             }
             var targetIdAccess = targetIdEntity.GetComponent<AccessComponent>();

Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs

@@ -1,27 +1,27 @@
-using Robust.Server.GameObjects;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.GameObjects.EntitySystems.DoAfter;
+using Content.Server.Interfaces.GameObjects.Components.Items;
+using Content.Shared.GameObjects.Components.ActionBlocking;
+using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Interfaces;
+using Content.Shared.Utility;
+using Robust.Server.GameObjects;
+using Robust.Server.GameObjects.Components.Container;
+using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Localization;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Robust.Shared.ViewVariables;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.ActionBlocking;
-using Content.Shared.GameObjects.Verbs;
-using Content.Server.GameObjects.Components.Items.Storage;
 using Robust.Shared.Log;
-using System.Linq;
-using Robust.Server.GameObjects.Components.Container;
-using Robust.Server.GameObjects.EntitySystems;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Shared.Maths;
-using System;
+using Robust.Shared.ViewVariables;
-using System.Collections.Generic;
-using Content.Shared.Utility;
-using Content.Server.GameObjects.Components.GUI;
 
 namespace Content.Server.GameObjects.Components.ActionBlocking
 {

Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs

@@ -1,22 +1,21 @@
-using Content.Server.GameObjects.EntitySystems.DoAfter;
+using System;
+using Content.Server.GameObjects.Components.GUI;
+using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.GameObjects.EntitySystems.DoAfter;
+using Content.Shared.GameObjects.Components.ActionBlocking;
 using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Utility;
+using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.IoC;
-using Content.Server.GameObjects.Components.GUI;
-using Robust.Shared.Serialization;
-using Robust.Shared.Log;
 using Robust.Shared.Localization;
-using Robust.Shared.ViewVariables;
+using Robust.Shared.Log;
-using Robust.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.ActionBlocking;
-using Content.Server.GameObjects.Components.Mobs;
 using Robust.Shared.Maths;
-using System;
+using Robust.Shared.Serialization;
-using Content.Shared.Utility;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.ActionBlocking
 {

Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs

@@ -1,6 +1,5 @@
 using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.Temperature;
-using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.Components.Atmos

Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs

@@ -3,11 +3,10 @@ using System.Runtime.CompilerServices;
 using Content.Server.GameObjects.Components.Mobs;
 using Content.Server.Interfaces.GameObjects;
 using Content.Shared.Atmos;
-using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.Damage;
+using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.Server.GameObjects.Components.Atmos
 {

Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs

@@ -1,15 +1,15 @@
-using Content.Server.Atmos;
+using System.Linq;
+using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.NodeContainer;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
-using Content.Shared.GameObjects.Components.Atmos;
 using Content.Shared.GameObjects.Atmos;
+using Content.Shared.GameObjects.Components.Atmos;
 using Robust.Server.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using System.Linq;
 
-namespace Content.Server.GameObjects.Components.Atmos.Piping
+namespace Content.Server.GameObjects.Components.Atmos.Piping.Pumps
 {
     /// <summary>
     ///     Transfer gas from one <see cref="PipeNode"/> to another.

Content.Server/GameObjects/Components/Atmos/Piping/Pumps/PressurePumpComponent.cs

@@ -1,8 +1,8 @@
-using Content.Server.Atmos;
+using System;
+using Content.Server.Atmos;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using System;
 
 namespace Content.Server.GameObjects.Components.Atmos.Piping.Pumps
 {

Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs

@@ -1,10 +1,8 @@
-using Content.Server.Atmos;
+using System;
-using Content.Shared.Atmos;
+using Content.Server.Atmos;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Diagnostics;
 
 namespace Content.Server.GameObjects.Components.Atmos.Piping.Pumps
 {

Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs

@@ -1,17 +1,17 @@
-using Content.Server.Atmos;
+using System.Linq;
+using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.NodeContainer;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Atmos;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Log;
-using Robust.Shared.ViewVariables;
-using System.Linq;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Atmos.Piping
+namespace Content.Server.GameObjects.Components.Atmos.Piping.Scrubbers
 {
     /// <summary>
     ///     Transfers gas from the tile it is on to a <see cref="PipeNode"/>.

Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/DebugSiphonComponent.cs

@@ -1,7 +1,7 @@
 using Content.Server.Atmos;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Atmos.Piping
+namespace Content.Server.GameObjects.Components.Atmos.Piping.Scrubbers
 {
     /// <summary>
     ///     Placeholder example of scrubber functionality.

Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs

@@ -1,17 +1,17 @@
-using Content.Server.Atmos;
+using System.Linq;
+using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.NodeContainer;
 using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.GameObjects.Atmos;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Log;
-using Robust.Shared.ViewVariables;
-using System.Linq;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Atmos.Piping
+namespace Content.Server.GameObjects.Components.Atmos.Piping.Vents
 {
     /// <summary>
     ///     Transfers gas from a <see cref="PipeNode"/> to the tile it is on.

Content.Server/GameObjects/Components/Atmos/Piping/Vents/DebugVentComponent.cs

@@ -1,7 +1,7 @@
 using Content.Server.Atmos;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Atmos.Piping
+namespace Content.Server.GameObjects.Components.Atmos.Piping.Vents
 {
     /// <summary>
     ///     Placeholder example of vent functionality.