diff --git a/Content.Client/Chat/ChatManager.cs b/Content.Client/Chat/ChatManager.cs index b59d039581..0292584fc7 100644 --- a/Content.Client/Chat/ChatManager.cs +++ b/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; diff --git a/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs b/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs index 344e2d0c2c..82cb1a6b69 100644 --- a/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs +++ b/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs @@ -1,10 +1,8 @@ -using Robust.Client.Graphics; -using Robust.Client.Interfaces.ResourceManagement; -using Robust.Shared.IoC; -using Robust.Shared.GameObjects; -using Content.Shared.GameObjects.Components.ActionBlocking; +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; diff --git a/Content.Client/GameObjects/Components/ActionBlocking/HandcuffComponent.cs b/Content.Client/GameObjects/Components/ActionBlocking/HandcuffComponent.cs index 62c2204cec..53c5dc2baa 100644 --- a/Content.Client/GameObjects/Components/ActionBlocking/HandcuffComponent.cs +++ b/Content.Client/GameObjects/Components/ActionBlocking/HandcuffComponent.cs @@ -1,8 +1,7 @@ -using Robust.Shared.GameObjects; -using Content.Shared.GameObjects.Components.ActionBlocking; -using Robust.Client.Graphics; +using Content.Shared.GameObjects.Components.ActionBlocking; using Robust.Client.GameObjects; -using Robust.Shared.Serialization; +using Robust.Client.Graphics; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.ActionBlocking { diff --git a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs b/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs index 0e6e534971..f776411554 100644 --- a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs +++ b/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; diff --git a/Content.Client/GameObjects/Components/Atmos/ExtinguisherVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/ExtinguisherVisualizer.cs index 6a33b51e00..b25f36b0a3 100644 --- a/Content.Client/GameObjects/Components/Atmos/ExtinguisherVisualizer.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs index add360dcce..fcf8a5b1f9 100644 --- a/Content.Client/GameObjects/Components/Atmos/PipeVisualizer.cs +++ b/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 diff --git a/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs index a4b8c9d3dd..233d3cbe90 100644 --- a/Content.Client/GameObjects/Components/Atmos/PumpVisualizer.cs +++ b/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 diff --git a/Content.Client/GameObjects/Components/Body/BodyManagerComponent.cs b/Content.Client/GameObjects/Components/Body/BodyManagerComponent.cs index 83df6704b7..8466a5e3d3 100644 --- a/Content.Client/GameObjects/Components/Body/BodyManagerComponent.cs +++ b/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; diff --git a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs b/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs index c5dfe18f44..ce75175add 100644 --- a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs +++ b/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; diff --git a/Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs b/Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs index 0616d736a8..16538f7da0 100644 --- a/Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs +++ b/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; - BankName = cstate.BankName; - BankBalance = cstate.BankBalance; - ShuttleCapacity = cstate.ShuttleCapacity; + BankId = cState.BankId; + BankName = cState.BankName; + BankBalance = cState.BankBalance; + ShuttleCapacity = cState.ShuttleCapacity; _menu.UpdateCargoCapacity(); _menu.UpdateBankData(); } diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs index 07ecba5030..c9dc935a46 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs +++ b/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; diff --git a/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs b/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs index 63760a880e..87565de6a2 100644 --- a/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using Content.Shared.GameObjects.Components.Medical; +using System.Collections.Generic; 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 diff --git a/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs b/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs index 6838794e8c..30d8418950 100644 --- a/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs +++ b/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; diff --git a/Content.Client/GameObjects/Components/CloningPod/CloningPodWindow.cs b/Content.Client/GameObjects/Components/CloningPod/CloningPodWindow.cs index 8cc1c3b909..accc6363c6 100644 --- a/Content.Client/GameObjects/Components/CloningPod/CloningPodWindow.cs +++ b/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 diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs b/Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs index 1bb74c1bee..dd359ccf85 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs +++ b/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 diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs b/Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs index 76d8a4fd48..54baa4339d 100644 --- a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs +++ b/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 diff --git a/Content.Client/GameObjects/Components/ExpendableLightVisualizer.cs b/Content.Client/GameObjects/Components/ExpendableLightVisualizer.cs index e24a50ea84..2ac0f1ad99 100644 --- a/Content.Client/GameObjects/Components/ExpendableLightVisualizer.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs b/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs index 26b1086f0a..5612a71f67 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs +++ b/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); - SendNetworkMessage(equipmessage); + var equipMessage = new ClientInventoryMessage(slot, ClientInventoryUpdate.Equip); + SendNetworkMessage(equipMessage); } public void SendUseMessage(Slots slot) diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs b/Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs index 2fd1c8ee66..2d102f8d15 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs +++ b/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)); }); diff --git a/Content.Client/GameObjects/Components/Interactable/ExpendableLightComponent.cs b/Content.Client/GameObjects/Components/Interactable/ExpendableLightComponent.cs index 7559d71356..5fbf3af3e4 100644 --- a/Content.Client/GameObjects/Components/Interactable/ExpendableLightComponent.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/Items/ItemComponent.cs b/Content.Client/GameObjects/Components/Items/ItemComponent.cs index b84e040fa4..4560b6171e 100644 --- a/Content.Client/GameObjects/Components/Items/ItemComponent.cs +++ b/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 diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs index ef909d9009..2a3205b95b 100644 --- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs +++ b/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); - RefreshContentsDisplay(cstate.ReagentQuantities, cstate.ContainedSolids); - var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cstate.ActiveButtonIndex); + _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy); + RefreshContentsDisplay(cState.ReagentQuantities, cState.ContainedSolids); + 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}"; } diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs b/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs index ab90668e24..f9508fa289 100644 --- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs +++ b/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(); - schedSound.Filename = "/Audio/Machines/microwave_loop.ogg"; - schedSound.AudioParams = audioParams; + var scheduledSound = new ScheduledSound(); + scheduledSound.Filename = "/Audio/Machines/microwave_loop.ogg"; + scheduledSound.AudioParams = audioParams; _loopingSoundComponent.StopAllSounds(); - _loopingSoundComponent.AddScheduledSound(schedSound); + _loopingSoundComponent.AddScheduledSound(scheduledSound); break; default: diff --git a/Content.Client/GameObjects/Components/LanternVisualizer.cs b/Content.Client/GameObjects/Components/LanternVisualizer.cs index 4508150c3a..4e90760f01 100644 --- a/Content.Client/GameObjects/Components/LanternVisualizer.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/LightBehaviourComponent.cs b/Content.Client/GameObjects/Components/LightBehaviourComponent.cs index 4e50dd2905..70dc1fc695 100644 --- a/Content.Client/GameObjects/Components/LightBehaviourComponent.cs +++ b/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.Client.Animations; -using Robust.Client.GameObjects.Components.Animations; -using System.Linq; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Client.GameObjects.Components { diff --git a/Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs b/Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs index dea7c697df..7eed8f3064 100644 --- a/Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs b/Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs index d637853960..fe92dc1896 100644 --- a/Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/Movement/ClimbingComponent.cs b/Content.Client/GameObjects/Components/Movement/ClimbingComponent.cs index 07f8c7c5b6..05694ab06a 100644 --- a/Content.Client/GameObjects/Components/Movement/ClimbingComponent.cs +++ b/Content.Client/GameObjects/Components/Movement/ClimbingComponent.cs @@ -1,8 +1,6 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Components; +using Content.Client.Interfaces.GameObjects.Components.Interaction; using Content.Shared.GameObjects.Components.Movement; -using Content.Client.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.Physics; +using Robust.Shared.GameObjects; namespace Content.Client.GameObjects.Components.Movement { diff --git a/Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs b/Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs index 8f5b4cf999..74842c704e 100644 --- a/Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs +++ b/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: diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs b/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs index 4345b68f5b..a568f031d6 100644 --- a/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs +++ b/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 diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs b/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs index 45104ed27a..94dc4adbc0 100644 --- a/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs +++ b/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 diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs b/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs index 8a588035ab..c042953269 100644 --- a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs +++ b/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 diff --git a/Content.Client/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs b/Content.Client/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs index c10c2bdc65..42cf4bc90e 100644 --- a/Content.Client/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs +++ b/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!; /// /// Invoked when the database gets updated. diff --git a/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs b/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs index 45794400b1..116eb21e06 100644 --- a/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs +++ b/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; - _menu.Populate(rstate.ServerCount, rstate.ServerNames, rstate.ServerIds, rstate.SelectedServerId); + if (!(state is SharedResearchClientComponent.ResearchClientBoundInterfaceState rState)) return; + _menu.Populate(rState.ServerCount, rState.ServerNames, rState.ServerIds, rState.SelectedServerId); } } diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs index 2cf1b964c4..5f8ada7730 100644 --- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs +++ b/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs @@ -66,12 +66,12 @@ namespace Content.Client.GameObjects.Components.Storage /// /// Copies received values from server about contents of storage container /// - /// - private void HandleStorageMessage(StorageHeldItemsMessage storagestate) + /// + private void HandleStorageMessage(StorageHeldItemsMessage storageState) { - StoredEntities = new Dictionary(storagestate.StoredEntities); - StorageSizeUsed = storagestate.StorageSizeUsed; - StorageCapacityMax = storagestate.StorageSizeMax; + StoredEntities = new Dictionary(storageState.StoredEntities); + StorageSizeUsed = storageState.StorageSizeUsed; + StorageCapacityMax = storageState.StorageSizeMax; Window.BuildEntityList(); } @@ -94,10 +94,10 @@ namespace Content.Client.GameObjects.Components.Storage /// /// Function for clicking one of the stored entity buttons in the UI, tells server to remove that entity /// - /// - private void Interact(EntityUid entityuid) + /// + private void Interact(EntityUid entityUid) { - SendNetworkMessage(new RemoveEntityMessage(entityuid)); + SendNetworkMessage(new RemoveEntityMessage(entityUid)); } /// @@ -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().GetEntity(entityuid.Key); + var entity = IoCManager.Resolve().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); } /// @@ -265,7 +265,7 @@ namespace Content.Client.GameObjects.Components.Storage /// 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; } diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs index 9de6ba9b71..e10246eb4f 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBoltActionBarrelComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBoltActionBarrelComponent.cs index 778cb19599..1f3fab4e44 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBoltActionBarrelComponent.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientPumpBarrelComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientPumpBarrelComponent.cs index a2c58b8bbb..7a0e15e432 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientPumpBarrelComponent.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientRevolverBarrelComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientRevolverBarrelComponent.cs index 3d5d94f5a8..a9c3c35759 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientRevolverBarrelComponent.cs +++ b/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 { diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs index 4c2f8d0131..d163427d50 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs +++ b/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(); - sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, $"bolt-open"); + sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-open"); } public override void OnChangeData(AppearanceComponent component) diff --git a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs index 9d8d341b94..c1c0addaa8 100644 --- a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs @@ -136,7 +136,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI var systemMessage = new SharedAiDebug.RequestPathfindingGraphMessage(); EntityManager.EntityNetManager.SendSystemNetworkMessage(systemMessage); } - + // TODO: Request region graph, although the client system messages didn't seem to be going through anymore // So need further investigation. } @@ -171,7 +171,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI { private IEyeManager _eyeManager; private IPlayerManager _playerManager; - + // TODO: Add a box like the debug one and show the most recent path stuff public override OverlaySpace Space => OverlaySpace.ScreenSpace; private readonly ShaderInstance _shader; @@ -181,21 +181,21 @@ namespace Content.Client.GameObjects.EntitySystems.AI // Graph debugging public readonly Dictionary> Graph = new Dictionary>(); private readonly Dictionary _graphColors = new Dictionary(); - + // Cached regions - public readonly Dictionary>> CachedRegions = + public readonly Dictionary>> CachedRegions = new Dictionary>>(); - - private readonly Dictionary> _cachedRegionColors = + + private readonly Dictionary> _cachedRegionColors = new Dictionary>(); - + // Regions - public readonly Dictionary>>> Regions = + public readonly Dictionary>>> Regions = new Dictionary>>>(); - - private readonly Dictionary>> _regionColors = + + private readonly Dictionary>> _regionColors = new Dictionary>>(); - + // Route debugging // As each pathfinder is very different you'll likely want to draw them completely different public readonly List AStarRoutes = new List(); @@ -252,7 +252,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI CachedRegions.Add(gridId, new Dictionary>()); _cachedRegionColors.Add(gridId, new Dictionary()); } - + foreach (var (region, nodes) in messageRegions) { CachedRegions[gridId][region] = nodes; @@ -264,7 +264,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI { _cachedRegionColors[gridId][region] = Color.Green.WithAlpha(0.3f); } - + Timer.Spawn(3000, () => { if (CachedRegions[gridId].ContainsKey(region)) @@ -296,12 +296,12 @@ namespace Content.Client.GameObjects.EntitySystems.AI screenTile.Y - 15.0f, screenTile.X + 15.0f, screenTile.Y + 15.0f); - + screenHandle.DrawRect(box, _cachedRegionColors[attachedEntity.Transform.GridID][region]); } } } - + public void UpdateRegions(GridId gridId, Dictionary>> messageRegions) { if (!Regions.ContainsKey(gridId)) @@ -309,13 +309,13 @@ namespace Content.Client.GameObjects.EntitySystems.AI Regions.Add(gridId, new Dictionary>>()); _regionColors.Add(gridId, new Dictionary>()); } - + var robustRandom = IoCManager.Resolve(); foreach (var (chunk, regions) in messageRegions) { Regions[gridId][chunk] = new Dictionary>(); _regionColors[gridId][chunk] = new Dictionary(); - + foreach (var (region, nodes) in regions) { Regions[gridId][chunk].Add(region, nodes); @@ -324,7 +324,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI } } } - + private void DrawRegions(DrawingHandleScreen screenHandle, Box2 viewport) { var attachedEntity = _playerManager.LocalPlayer?.ControlledEntity; @@ -347,7 +347,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI screenTile.Y - 15.0f, screenTile.X + 15.0f, screenTile.Y + 15.0f); - + screenHandle.DrawRect(box, _regionColors[attachedEntity.Transform.GridID][chunk][region]); } } @@ -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, - 1.0f - (score / highestgScore), + score / highestGScore, + 1.0f - (score / highestGScore), 0.1f)); } } diff --git a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs b/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs index e42e8585d8..d9ddadb357 100644 --- a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs +++ b/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; diff --git a/Content.Client/Instruments/InstrumentMenu.cs b/Content.Client/Instruments/InstrumentMenu.cs index 731f80eb87..76ea0a8c28 100644 --- a/Content.Client/Instruments/InstrumentMenu.cs +++ b/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; diff --git a/Content.Client/Interfaces/IClientGameTicker.cs b/Content.Client/Interfaces/IClientGameTicker.cs index 45e9a05faf..f7d2a994d9 100644 --- a/Content.Client/Interfaces/IClientGameTicker.cs +++ b/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 diff --git a/Content.Client/Sandbox/SandboxManager.cs b/Content.Client/Sandbox/SandboxManager.cs index 4696c6005e..330903d0e4 100644 --- a/Content.Client/Sandbox/SandboxManager.cs +++ b/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"); } diff --git a/Content.Client/State/GameScreenBase.cs b/Content.Client/State/GameScreenBase.cs index 915e5e4937..0e0c5bcb04 100644 --- a/Content.Client/State/GameScreenBase.cs +++ b/Content.Client/State/GameScreenBase.cs @@ -181,9 +181,9 @@ namespace Content.Client.State } */ - var transx = x.clicked.Transform; - var transy = y.clicked.Transform; - val = transx.Coordinates.Y.CompareTo(transy.Coordinates.Y); + var transX = x.clicked.Transform; + var transY = y.clicked.Transform; + val = transX.Coordinates.Y.CompareTo(transY.Coordinates.Y); if (val != 0) { return val; diff --git a/Content.Client/State/LobbyState.cs b/Content.Client/State/LobbyState.cs index 3059eb9529..0851b8c945 100644 --- a/Content.Client/State/LobbyState.cs +++ b/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 diff --git a/Content.Client/State/MainMenu.cs b/Content.Client/State/MainMenu.cs index 1ee2082f39..fba9bf5b33 100644 --- a/Content.Client/State/MainMenu.cs +++ b/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(); } /// @@ -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); diff --git a/Content.Client/StationEvents/RadiationPulseOverlay.cs b/Content.Client/StationEvents/RadiationPulseOverlay.cs index 2604419ed5..54c2785afb 100644 --- a/Content.Client/StationEvents/RadiationPulseOverlay.cs +++ b/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 { diff --git a/Content.Client/StationEvents/StationEventManager.cs b/Content.Client/StationEvents/StationEventManager.cs index eb1ce55416..b9d6e8f760 100644 --- a/Content.Client/StationEvents/StationEventManager.cs +++ b/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 { diff --git a/Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs b/Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs index 596d47e9ef..ebcb5cc7fb 100644 --- a/Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs +++ b/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 { diff --git a/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs b/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs index dde3fddac4..b737d39d78 100644 --- a/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs +++ b/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 VBoxContainer PlayerList; - public Label PlayerCount; + public readonly TabContainer MasterTabContainer; + public readonly VBoxContainer PlayerList; + public readonly Label PlayerCount; protected override Vector2? CustomSize => (500, 250); - private List _adminButtons = new List + private readonly List _adminButtons = new List { new KickCommandButton(), new DirectCommandButton("Admin Ghost", "aghost"), //TODO: teleport }; - private List _adminbusButtons = new List + private readonly List _adminbusButtons = new List { new SpawnEntitiesCommandButton(), new SpawnTilesCommandButton(), new StationEventsCommandButton(), }; - private List _debugButtons = new List + private readonly List _debugButtons = new List { new AddAtmosCommandButton(), new FillGasCommandButton(), }; - private List _roundButtons = new List + private readonly List _roundButtons = new List { new DirectCommandButton("Start Round", "startround"), new DirectCommandButton("End Round", "endround"), new DirectCommandButton("Restart Round", "restartround"), }; - private List _serverButtons = new List + private readonly List _serverButtons = new List { 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) @@ -232,7 +232,7 @@ namespace Content.Client.UserInterface.AdminMenu refreshButton.OnPressed += RefreshPlayerList; PlayerList = new VBoxContainer(); - + var playerVBox = new VBoxContainer { SizeFlagsVertical = SizeFlags.FillExpand, @@ -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().ProcessCommand($"events pause"); + IoCManager.Resolve().ProcessCommand("events pause"); }, }, new CommandUIButton @@ -495,7 +495,7 @@ namespace Content.Client.UserInterface.AdminMenu Name = "Resume", Handler = () => { - IoCManager.Resolve().ProcessCommand($"events resume"); + IoCManager.Resolve().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().Sessions.ToList(), 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().GetAllGrids().Where(g => (int) g.Index != 0).ToList(), @@ -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().GetAllGrids().Where(g => (int) g.Index != 0).ToList(), @@ -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 = () => diff --git a/Content.Client/UserInterface/KeyRebindControl.cs b/Content.Client/UserInterface/KeyRebindControl.cs deleted file mode 100644 index 805fa26b5d..0000000000 --- a/Content.Client/UserInterface/KeyRebindControl.cs +++ /dev/null @@ -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 -{ -} diff --git a/Content.Client/UserInterface/LobbyGui.cs b/Content.Client/UserInterface/LobbyGui.cs index 9c2ec94a34..2fbc9df8f0 100644 --- a/Content.Client/UserInterface/LobbyGui.cs +++ b/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 { diff --git a/Content.Client/UserInterface/RoundEndSummaryWindow.cs b/Content.Client/UserInterface/RoundEndSummaryWindow.cs index 2fdfac0e2c..78b6887e83 100644 --- a/Content.Client/UserInterface/RoundEndSummaryWindow.cs +++ b/Content.Client/UserInterface/RoundEndSummaryWindow.cs @@ -53,9 +53,9 @@ namespace Content.Client.UserInterface //Round end text if (!string.IsNullOrEmpty(roundEnd)) { - var roundendLabel = new RichTextLabel(); - roundendLabel.SetMarkup(Loc.GetString(roundEnd)); - RoundEndSummaryTab.AddChild(roundendLabel); + var roundEndLabel = new RichTextLabel(); + roundEndLabel.SetMarkup(Loc.GetString(roundEnd)); + 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); } diff --git a/Content.Client/UserInterface/StrippingMenu.cs b/Content.Client/UserInterface/StrippingMenu.cs index 3088bd4270..50411b0040 100644 --- a/Content.Client/UserInterface/StrippingMenu.cs +++ b/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 diff --git a/Content.Client/Utility/RangeExtensions.cs b/Content.Client/Utility/RangeExtensions.cs index 326d0735de..b32de2edf6 100644 --- a/Content.Client/Utility/RangeExtensions.cs +++ b/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; diff --git a/Content.IntegrationTests/ContentIntegrationTest.cs b/Content.IntegrationTests/ContentIntegrationTest.cs index 66141d1b9e..84cc3b8aee 100644 --- a/Content.IntegrationTests/ContentIntegrationTest.cs +++ b/Content.IntegrationTests/ContentIntegrationTest.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.IO; using System.Threading.Tasks; using Content.Client; diff --git a/Content.IntegrationTests/Tests/AI/AiControllerTest.cs b/Content.IntegrationTests/Tests/AI/AiControllerTest.cs index 6f9efaaa5b..05cb40616c 100644 --- a/Content.IntegrationTests/Tests/AI/AiControllerTest.cs +++ b/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 diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 67857a6aab..d3b226db54 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/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 { diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/CuffUnitTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/CuffUnitTest.cs index 682f01752a..182e3079b0 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/CuffUnitTest.cs +++ b/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 { diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs index e55218ef09..feb32163bd 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs +++ b/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 { diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs index 30a51e0491..ae2e53d836 100644 --- a/Content.IntegrationTests/Tests/GravityGridTest.cs +++ b/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 { diff --git a/Content.IntegrationTests/Tests/GridTileLookupTest.cs b/Content.IntegrationTests/Tests/GridTileLookupTest.cs index 137c6d7041..651c2c9482 100644 --- a/Content.IntegrationTests/Tests/GridTileLookupTest.cs +++ b/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; diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs index 7c7bbfbac4..c7377364ce 100644 --- a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs +++ b/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; diff --git a/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs b/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs index 14efdeb9fb..c9a8b982aa 100644 --- a/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs +++ b/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 { diff --git a/Content.IntegrationTests/Tests/PowerTest.cs b/Content.IntegrationTests/Tests/PowerTest.cs index 8d9e997c5e..bb355736a0 100644 --- a/Content.IntegrationTests/Tests/PowerTest.cs +++ b/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 { diff --git a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs b/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs index 2e115930ed..20785a777b 100644 --- a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs +++ b/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; diff --git a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs b/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs index 477c878491..fd4567ffba 100644 --- a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs +++ b/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; diff --git a/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs b/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs index 161772e72c..23c559ad47 100644 --- a/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs +++ b/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; diff --git a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs index d981b843e6..67821796b4 100644 --- a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs +++ b/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; diff --git a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs index 289a9ba96a..4f035aa1cd 100644 --- a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs +++ b/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; diff --git a/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs b/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs index d6a13d6794..3612b646ec 100644 --- a/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs +++ b/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; diff --git a/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs b/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs index 021e35de23..4e6a496871 100644 --- a/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs +++ b/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 diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs index 3d44f0429b..0846361441 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs +++ b/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 diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs index e1d1a7af0f..26f8443426 100644 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyPlayerExp.cs +++ b/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; diff --git a/Content.Server/Administration/WarpCommand.cs b/Content.Server/Administration/WarpCommand.cs index 5d35c4087d..d42716163f 100644 --- a/Content.Server/Administration/WarpCommand.cs +++ b/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 { diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs index 54bb5ad47c..ff35b50310 100644 --- a/Content.Server/Atmos/GasMixture.cs +++ b/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; diff --git a/Content.Server/Atmos/GasVaporComponent.cs b/Content.Server/Atmos/GasVaporComponent.cs index 243bc96f30..bb57f694ac 100644 --- a/Content.Server/Atmos/GasVaporComponent.cs +++ b/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 { diff --git a/Content.Server/Atmos/Reactions/PhoronFireReaction.cs b/Content.Server/Atmos/Reactions/PhoronFireReaction.cs index 1aaf80a0d6..e83301338d 100644 --- a/Content.Server/Atmos/Reactions/PhoronFireReaction.cs +++ b/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 diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs index da77173710..29ec566d77 100644 --- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs +++ b/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; diff --git a/Content.Server/Atmos/TileAtmosInfo.cs b/Content.Server/Atmos/TileAtmosInfo.cs index 23cc37e550..68a6dcfea1 100644 --- a/Content.Server/Atmos/TileAtmosInfo.cs +++ b/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 diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs index 6361574211..38f5f6ffaf 100644 --- a/Content.Server/Atmos/TileAtmosphere.cs +++ b/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; diff --git a/Content.Server/Body/BodyCommands.cs b/Content.Server/Body/BodyCommands.cs index 3769d78dfe..b7616933e6 100644 --- a/Content.Server/Body/BodyCommands.cs +++ b/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 { diff --git a/Content.Server/Body/Mechanisms/Mechanism.cs b/Content.Server/Body/Mechanisms/Mechanism.cs index 9b7a254155..e44170de2a 100644 --- a/Content.Server/Body/Mechanisms/Mechanism.cs +++ b/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; diff --git a/Content.Server/Chat/ChatCommands.cs b/Content.Server/Chat/ChatCommands.cs index 5359402df3..8ae70c0465 100644 --- a/Content.Server/Chat/ChatCommands.cs +++ b/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 { diff --git a/Content.Server/Chat/ChatManager.cs b/Content.Server/Chat/ChatManager.cs index f9174847a8..633a1cbdea 100644 --- a/Content.Server/Chat/ChatManager.cs +++ b/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 diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs index 140fcb424b..c42c6a5171 100644 --- a/Content.Server/EntryPoint.cs +++ b/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 { diff --git a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs b/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs index 83fd5e207f..3b39327e65 100644 --- a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs +++ b/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs @@ -117,7 +117,7 @@ namespace Content.Server.GameObjects.Components.Access if (!newAccessList.TrueForAll(x => _prototypeManager.HasIndex(x))) { - Logger.Warning($"Tried to write unknown access tag."); + Logger.Warning("Tried to write unknown access tag."); return; } var targetIdAccess = targetIdEntity.GetComponent(); diff --git a/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs b/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs index 78c25ce7e8..37398f455a 100644 --- a/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs +++ b/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 System.Collections.Generic; -using Content.Shared.Utility; -using Content.Server.GameObjects.Components.GUI; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.ActionBlocking { diff --git a/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs b/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs index 8b6f64d098..a94654965b 100644 --- a/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs +++ b/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.Server.GameObjects.EntitySystems; -using Content.Shared.GameObjects.Components.ActionBlocking; -using Content.Server.GameObjects.Components.Mobs; +using Robust.Shared.Log; using Robust.Shared.Maths; -using System; -using Content.Shared.Utility; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.ActionBlocking { diff --git a/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs b/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs index f5bfde7271..723c0cbe84 100644 --- a/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs +++ b/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 diff --git a/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs b/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs index 249df1639f..6710298441 100644 --- a/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs +++ b/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 { diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs index 24a44ae7d8..6626fe3bb8 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs +++ b/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 { /// /// Transfer gas from one to another. diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/PressurePumpComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/PressurePumpComponent.cs index 53ee049b00..c44fc5cdda 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/PressurePumpComponent.cs +++ b/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 { diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs index 1787cce772..614a7487af 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs @@ -1,10 +1,8 @@ -using Content.Server.Atmos; -using Content.Shared.Atmos; +using System; +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 { diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs index 921a7c92be..210c7d12ed 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs +++ b/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 { /// /// Transfers gas from the tile it is on to a . diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/DebugSiphonComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/DebugSiphonComponent.cs index 6aee5812b6..ddfdb1b512 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/DebugSiphonComponent.cs +++ b/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 { /// /// Placeholder example of scrubber functionality. diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs index 8176cdd315..ee5317b787 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs +++ b/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 { /// /// Transfers gas from a to the tile it is on. diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/DebugVentComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Vents/DebugVentComponent.cs index 211cbd440c..133d6e5b24 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/DebugVentComponent.cs +++ b/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 { /// /// Placeholder example of vent functionality. diff --git a/Content.Server/GameObjects/Components/Body/DroppedBodyPartComponent.cs b/Content.Server/GameObjects/Components/Body/DroppedBodyPartComponent.cs index 71dae107ba..db1ca227d4 100644 --- a/Content.Server/GameObjects/Components/Body/DroppedBodyPartComponent.cs +++ b/Content.Server/GameObjects/Components/Body/DroppedBodyPartComponent.cs @@ -1,11 +1,11 @@ #nullable enable using System.Collections.Generic; using System.Linq; -using Content.Shared.Interfaces.GameObjects.Components; using Content.Server.Body; using Content.Server.Utility; using Content.Shared.Body.Surgery; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs index ba62a048e7..fba1fcaf3b 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs @@ -20,7 +20,6 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using System; namespace Content.Server.GameObjects.Components.Chemistry { diff --git a/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs b/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs index bfab8543f6..ee91058f95 100644 --- a/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs +++ b/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs @@ -20,7 +20,6 @@ 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; diff --git a/Content.Server/GameObjects/Components/Damage/DamageCommands.cs b/Content.Server/GameObjects/Components/Damage/DamageCommands.cs index 5b4fe5b43a..d691892293 100644 --- a/Content.Server/GameObjects/Components/Damage/DamageCommands.cs +++ b/Content.Server/GameObjects/Components/Damage/DamageCommands.cs @@ -156,6 +156,7 @@ namespace Content.Server.GameObjects.Components.Damage public string Command => "godmode"; public string Description => "Makes your entity or another invulnerable to almost anything. May have irreversible changes."; public string Help => $"Usage: {Command} / {Command} "; + public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args) { IEntity entity; diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs index aaadca6f5e..5dacccd52d 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; @@ -57,7 +58,7 @@ namespace Content.Server.GameObjects.Components.Disposal if (holder.PreviousTube != null && DirectionTo(holder.PreviousTube) == ConnectableDirections()[0]) { var invalidDirections = new Direction[] { ConnectableDirections()[0], Direction.Invalid }; - var directions = System.Enum.GetValues(typeof(Direction)) + var directions = Enum.GetValues(typeof(Direction)) .Cast().Except(invalidDirections).ToList(); return _random.Pick(directions); } diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs index b615510c93..4e86275587 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs @@ -1,6 +1,11 @@ #nullable enable +using System; +using System.Collections.Generic; +using System.Text; using Content.Server.Interfaces.GameObjects.Components.Items; +using Content.Server.Utility; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.GameObjects.EntitySystems; @@ -13,10 +18,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; -using Content.Server.Utility; -using Content.Shared.Interfaces; using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalRouterComponent; namespace Content.Server.GameObjects.Components.Disposal @@ -121,7 +122,7 @@ namespace Content.Server.GameObjects.Components.Disposal return new DisposalRouterUserInterfaceState(""); } - var taglist = new System.Text.StringBuilder(); + var taglist = new StringBuilder(); foreach (var tag in _tags) { diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs index 2fb8728fc8..eb3adc6694 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs @@ -2,8 +2,8 @@ using System; using System.Linq; using Content.Shared.GameObjects.Components.Disposal; -using Content.Shared.GameObjects.Verbs; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Robust.Server.Console; using Robust.Server.GameObjects; diff --git a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs index b00e348ef8..4b9eb8deb4 100644 --- a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.Components.VendingMachines; -using Content.Server.Interfaces; using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces; @@ -15,7 +14,6 @@ using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/ExtinguisherCabinetFilledComponent.cs b/Content.Server/GameObjects/Components/ExtinguisherCabinetFilledComponent.cs index 6b93f63160..fcedb47bbc 100644 --- a/Content.Server/GameObjects/Components/ExtinguisherCabinetFilledComponent.cs +++ b/Content.Server/GameObjects/Components/ExtinguisherCabinetFilledComponent.cs @@ -1,6 +1,4 @@ -using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.ViewVariables; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components { diff --git a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs index 0352e86c3f..05d67a3356 100644 --- a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs @@ -8,7 +8,6 @@ using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; diff --git a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs index 9bffea6e02..4f98e213db 100644 --- a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/MopComponent.cs @@ -1,6 +1,5 @@ #nullable enable using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; diff --git a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs index 39a7d5250b..0112d0441f 100644 --- a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/HandsComponent.cs @@ -8,8 +8,8 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces.GameObjects.Components.Interaction; -using Content.Shared.GameObjects.Components.Body; using Content.Server.Interfaces.GameObjects.Components.Items; +using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystems; @@ -29,7 +29,6 @@ using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Players; using Robust.Shared.ViewVariables; -using Content.Server.GameObjects.Components.ActionBlocking; namespace Content.Server.GameObjects.Components.GUI { diff --git a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs b/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs index 8ae70d4317..4fc4896501 100644 --- a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs +++ b/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.Interfaces; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Gravity; using Content.Shared.GameObjects.Components.Interactable; @@ -15,7 +14,6 @@ using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs index da34c87cb6..6fa92fa82e 100644 --- a/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs @@ -8,12 +8,11 @@ using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.EntitySystemMessages; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.ViewVariables; -using Robust.Shared.Audio; namespace Content.Server.GameObjects.Components.Interactable { diff --git a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs index f1f4a8893d..150044b6d3 100644 --- a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs @@ -11,17 +11,17 @@ using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Interactable; -using Content.Shared.Interfaces.GameObjects.Components; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.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.Utility; using Robust.Shared.ViewVariables; -using Robust.Shared.Serialization; -using Content.Shared.GameObjects.EntitySystems; namespace Content.Server.GameObjects.Components.Interactable { diff --git a/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs b/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs index 540a922a26..6159aa7f52 100644 --- a/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs @@ -1,8 +1,4 @@ -using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.Interfaces.GameObjects.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.Prototypes; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Items { diff --git a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs index 2503662b8d..52cf806e84 100644 --- a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs @@ -1,5 +1,4 @@ using Content.Server.GameObjects.Components.Stack; -using Content.Server.Utility; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Maps; using Content.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/CustodialClosetFill.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/CustodialClosetFill.cs index b257da50c3..16180b57aa 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/Fill/CustodialClosetFill.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/CustodialClosetFill.cs @@ -1,7 +1,5 @@ using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; namespace Content.Server.GameObjects.Components.Items.Storage.Fill { diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs index 8b7f3b939c..34b1debb79 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs @@ -1,5 +1,4 @@ using Content.Server.GameObjects.Components.Access; -using Content.Server.Interfaces; using Content.Shared.GameObjects.Components.Storage; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.Verbs; @@ -11,7 +10,6 @@ using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs index 9c55256361..9f39ecbda7 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs @@ -4,9 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; -using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects.Components.Items; -using Content.Server.Utility; using Content.Shared.GameObjects.Components.Storage; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs index 514087c6da..5ea353c255 100644 --- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs +++ b/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs @@ -4,9 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Content.Server.GameObjects.Components.Body; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.ViewVariables; using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; @@ -16,6 +13,7 @@ using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameObjects; using Content.Server.Utility; using Content.Shared.Chemistry; +using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Power; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; @@ -27,12 +25,14 @@ using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Audio; +using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Content.Shared.GameObjects.Components.Body; using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.Timers; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Kitchen { diff --git a/Content.Server/GameObjects/Components/LightBehaviourComponent.cs b/Content.Server/GameObjects/Components/LightBehaviourComponent.cs index d36a4caa79..bae49f598a 100644 --- a/Content.Server/GameObjects/Components/LightBehaviourComponent.cs +++ b/Content.Server/GameObjects/Components/LightBehaviourComponent.cs @@ -1,5 +1,5 @@ -using Robust.Shared.GameObjects; -using Content.Shared.GameObjects.Components; +using Content.Shared.GameObjects.Components; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components { diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs b/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs index 23a386ff23..4cf3d9bb33 100644 --- a/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs +++ b/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs @@ -1,4 +1,6 @@ -using Content.Server.GameObjects.Components.Interactable; +using System.Collections.Generic; +using System.Threading.Tasks; +using Content.Server.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; @@ -7,8 +9,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; -using System.Collections.Generic; -using System.Threading.Tasks; namespace Content.Server.GameObjects.Components.MachineLinking { diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs b/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs index 5ed69e2d74..36390f2dd1 100644 --- a/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs +++ b/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs @@ -1,4 +1,6 @@ -using Content.Server.GameObjects.Components.Interactable; +using System.Collections.Generic; +using System.Threading.Tasks; +using Content.Server.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; @@ -9,8 +11,6 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System.Collections.Generic; -using System.Threading.Tasks; namespace Content.Server.GameObjects.Components.MachineLinking { diff --git a/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs b/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs index 4eefd651e3..13958ca08d 100644 --- a/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs @@ -1,6 +1,5 @@ #nullable enable using System; -using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Content.Server.GameObjects.Components.Mobs; @@ -23,7 +22,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Maths; -using Robust.Shared.Network; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Medical/HealingComponent.cs b/Content.Server/GameObjects/Components/Medical/HealingComponent.cs index ea1eb95f89..9a827c96d4 100644 --- a/Content.Server/GameObjects/Components/Medical/HealingComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/HealingComponent.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using Content.Server.GameObjects.Components.Body; using Content.Server.GameObjects.Components.Stack; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Body; @@ -7,8 +6,6 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Medical diff --git a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs index eb289fdc40..0e1b9fbaca 100644 --- a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs +++ b/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.Weapon.Melee; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Damage; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs b/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs index b0423e455b..c5b546e767 100644 --- a/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs @@ -1,5 +1,4 @@ -using System; -using Content.Server.GameObjects.Components.GUI; +using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Clothing; using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.GameObjects; diff --git a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs index 11bfa70cec..dd929b422e 100644 --- a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs @@ -1,6 +1,4 @@ #nullable enable -using System; -using Content.Server.GameObjects.Components.Body; using Content.Server.GameObjects.Components.Medical; using Content.Server.GameObjects.Components.Observer; using Content.Server.Interfaces.GameTicking; @@ -8,7 +6,6 @@ using Content.Server.Mobs; using Content.Server.Utility; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Damage; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects.Components.UserInterface; using Robust.Shared.GameObjects; @@ -21,7 +18,6 @@ using Robust.Shared.Serialization; using Robust.Shared.Timers; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; -using Serilog.Debugging; namespace Content.Server.GameObjects.Components.Mobs { @@ -180,20 +176,20 @@ namespace Content.Server.GameObjects.Components.Mobs if (!HasMind) { - message.AddMarkup(!dead - ? $"[color=red]" + - Loc.GetString( - "{0:They} {0:are} totally catatonic. The stresses of life in deep-space must have been too much for {0:them}. Any recovery is unlikely.", - Owner) + "[/color]" - : $"[color=purple]" + Loc.GetString("{0:Their} soul has departed.", Owner) + "[/color]"); + var aliveText = + $"[color=red]{Loc.GetString("{0:They} {0:are} totally catatonic. The stresses of life in deep-space must have been too much for {0:them}. Any recovery is unlikely.", Owner)}[/color]"; + var deadText = $"[color=purple]{Loc.GetString("{0:Their} soul has departed.", Owner)}[/color]"; + + message.AddMarkup(dead ? deadText : aliveText); } else if (Mind?.Session == null) { - if (!dead) - message.AddMarkup("[color=yellow]" + - Loc.GetString( - "{0:They} {0:have} a blank, absent-minded stare and appears completely unresponsive to anything. {0:They} may snap out of it soon.", - Owner) + "[/color]"); + if (dead) return; + + var text = + $"[color=yellow]{Loc.GetString("{0:They} {0:have} a blank, absent-minded stare and appears completely unresponsive to anything. {0:They} may snap out of it soon.", Owner)}[/color]"; + + message.AddMarkup(text); } } } diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs b/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs index c3482fe61e..845f6cfe92 100644 --- a/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs +++ b/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs @@ -1,10 +1,7 @@ -using Content.Server.Interfaces.Chat; +using System.Text.RegularExpressions; +using Content.Server.Interfaces.Chat; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using System; -using System.Collections.Generic; -using System.Text; -using System.Text.RegularExpressions; namespace Content.Server.GameObjects.Components.Mobs.Speech { diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/BackwardsAccentComponent.cs b/Content.Server/GameObjects/Components/Mobs/Speech/BackwardsAccentComponent.cs index af97bba4f8..3b3c2c3980 100644 --- a/Content.Server/GameObjects/Components/Mobs/Speech/BackwardsAccentComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/Speech/BackwardsAccentComponent.cs @@ -1,5 +1,5 @@ -using Robust.Shared.GameObjects; -using System; +using System; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Mobs.Speech { diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs b/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs index 5b0aa232f0..229bc46d2f 100644 --- a/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs @@ -1,8 +1,8 @@ -using Robust.Shared.GameObjects; +using System.Collections.Generic; +using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Random; -using System.Collections.Generic; namespace Content.Server.GameObjects.Components.Mobs.Speech { diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/SpanishAccentComponent.cs b/Content.Server/GameObjects/Components/Mobs/Speech/SpanishAccentComponent.cs index 4ae5cb4019..3bb050cb1d 100644 --- a/Content.Server/GameObjects/Components/Mobs/Speech/SpanishAccentComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/Speech/SpanishAccentComponent.cs @@ -1,11 +1,4 @@ -using Microsoft.CodeAnalysis.Operations; -using Microsoft.EntityFrameworkCore.Internal; -using Robust.Shared.GameObjects; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; +using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Mobs.Speech { diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/SpeechComponent.cs b/Content.Server/GameObjects/Components/Mobs/Speech/SpeechComponent.cs index b9b8a40670..1140770e9d 100644 --- a/Content.Server/GameObjects/Components/Mobs/Speech/SpeechComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/Speech/SpeechComponent.cs @@ -1,10 +1,9 @@ -using Robust.Server.Interfaces.Console; +using System; +using System.Linq; +using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; -using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using System; -using System.Linq; namespace Content.Server.GameObjects.Components.Mobs.Speech { diff --git a/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs b/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs index 641632a2f8..ae1df3aad4 100644 --- a/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs @@ -1,10 +1,14 @@ -using Content.Server.GameObjects.Components.Body; +using System; +using Content.Server.GameObjects.Components.Body; using Content.Server.GameObjects.EntitySystems.DoAfter; +using Content.Server.Utility; +using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.Verbs; using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; +using Content.Shared.Utility; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; @@ -16,9 +20,6 @@ using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System; -using Content.Server.Utility; -using Content.Shared.Utility; namespace Content.Server.GameObjects.Components.Movement { @@ -101,8 +102,8 @@ namespace Content.Server.GameObjects.Components.Movement var bodyManager = user.GetComponent(); - if (bodyManager.GetPartsOfType(Shared.GameObjects.Components.Body.BodyPartType.Leg).Count == 0 || - bodyManager.GetPartsOfType(Shared.GameObjects.Components.Body.BodyPartType.Foot).Count == 0) + if (bodyManager.GetPartsOfType(BodyPartType.Leg).Count == 0 || + bodyManager.GetPartsOfType(BodyPartType.Foot).Count == 0) { reason = Loc.GetString("You are unable to climb!"); return false; diff --git a/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs b/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs index 591cd4c761..f58a9be94a 100644 --- a/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs @@ -1,8 +1,8 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Maths; -using Content.Shared.Physics; -using Content.Shared.GameObjects.Components.Movement; +using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Physics; +using Robust.Shared.GameObjects; +using Robust.Shared.Maths; namespace Content.Server.GameObjects.Components.Movement { diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs index 7ded82a3dc..5d4bb54aac 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs @@ -1,12 +1,11 @@ -using Content.Server.Explosions; +using System; +using System.Collections.Generic; +using System.Linq; +using Content.Server.Explosions; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.Components.Power.AME; using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups { diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs index aa3ed5f326..fb584363ef 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs @@ -1,10 +1,10 @@ -using Content.Server.Atmos; +using System.Collections.Generic; +using Content.Server.Atmos; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Robust.Shared.GameObjects.Systems; using Robust.Shared.ViewVariables; -using System.Collections.Generic; namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups { diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs index 557035524f..81e21dae26 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs @@ -1,11 +1,11 @@ -using Content.Server.GameObjects.Components.NodeContainer.Nodes; -using Robust.Shared.Interfaces.Reflection; -using Robust.Shared.IoC; -using System; -using System.Collections.Generic; -using System.Reflection; +using System; + using System.Collections.Generic; + using System.Reflection; + using Content.Server.GameObjects.Components.NodeContainer.Nodes; + using Robust.Shared.Interfaces.Reflection; + using Robust.Shared.IoC; -namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups + namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups { public interface INodeGroupFactory { diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs index ddd2d57c9a..cfe74999ee 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs @@ -1,4 +1,7 @@ -using Content.Server.Atmos; +using System; +using System.Collections.Generic; +using System.Linq; +using Content.Server.Atmos; using Content.Server.GameObjects.Components.NodeContainer.NodeGroups; using Content.Server.Interfaces; using Content.Shared.GameObjects.Components.Atmos; @@ -8,9 +11,6 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; -using System.Linq; namespace Content.Server.GameObjects.Components.NodeContainer.Nodes { diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs index fbe2a6e0d5..6dd5a9f80c 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs @@ -6,7 +6,6 @@ using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.Utensil; -using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.GameObjects.Components.Utensil; using Content.Shared.Interfaces; diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs b/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs index f372ea3142..bad33210b3 100644 --- a/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs @@ -1,4 +1,6 @@ #nullable enable +using System.Linq; +using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameObjects.Components.NodeContainer; @@ -9,6 +11,7 @@ using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Power.AME; using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -21,9 +24,6 @@ using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Localization; using Robust.Shared.ViewVariables; -using System.Linq; -using System.Threading.Tasks; -using Content.Shared.Interfaces; namespace Content.Server.GameObjects.Components.Power.AME { diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEFuelContainerComponent.cs b/Content.Server/GameObjects/Components/Power/AME/AMEFuelContainerComponent.cs index af88584187..98e336608e 100644 --- a/Content.Server/GameObjects/Components/Power/AME/AMEFuelContainerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/AME/AMEFuelContainerComponent.cs @@ -1,8 +1,5 @@ using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Server.GameObjects.Components.Power.AME { diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs b/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs index 9dd4879e26..044b7f2a6e 100644 --- a/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs +++ b/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs @@ -1,6 +1,8 @@ -using Content.Server.GameObjects.Components.Interactable; +using System.Threading.Tasks; +using Content.Server.GameObjects.Components.Interactable; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; @@ -8,8 +10,6 @@ using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Localization; -using System.Threading.Tasks; -using Content.Shared.Interfaces; namespace Content.Server.GameObjects.Components.Power.AME { diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEShieldComponent.cs b/Content.Server/GameObjects/Components/Power/AME/AMEShieldComponent.cs index 7ae88049df..4aa9be4e4e 100644 --- a/Content.Server/GameObjects/Components/Power/AME/AMEShieldComponent.cs +++ b/Content.Server/GameObjects/Components/Power/AME/AMEShieldComponent.cs @@ -1,11 +1,9 @@ #nullable enable +using System; using Content.Shared.GameObjects.Components.Power.AME; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Server.GameObjects.Components.Power.AME { diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs index 152b4f4b60..afd4a4a524 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs @@ -2,10 +2,12 @@ using System.Threading.Tasks; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; +using Content.Server.GameObjects.Components.MachineLinking; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.EntitySystems; -using Content.Shared.GameObjects.Components.Damage; using Content.Shared.Damage; +using Content.Shared.GameObjects.Components.Damage; +using Content.Shared.Interfaces; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -20,8 +22,6 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Content.Server.GameObjects.Components.MachineLinking; -using Content.Shared.Interfaces; namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers { diff --git a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs index d649f5033e..a18c900d9f 100644 --- a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs @@ -1,5 +1,4 @@ using Content.Server.GameObjects.Components.Stack; -using Content.Server.Utility; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; using Robust.Server.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs index 2252ad1ea2..3d9768f7a6 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs @@ -1,9 +1,7 @@ -using System; using Content.Server.GameObjects.Components.Explosion; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Log; namespace Content.Server.GameObjects.Components.Projectiles { diff --git a/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs index 3a9c2f9a4f..aece1dcb86 100644 --- a/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs @@ -1,4 +1,3 @@ -using System; using Content.Server.GameObjects.Components.Weapon; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; diff --git a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs b/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs index 828ec9bb36..0fd2de6886 100644 --- a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs +++ b/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs @@ -2,14 +2,11 @@ using System.Diagnostics.CodeAnalysis; using Content.Server.GameObjects.Components.Conveyor; using Content.Server.GameObjects.Components.Items.Storage; -using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.EntitySystems; using Content.Shared.Construction; using Content.Shared.GameObjects.Components.Body; -using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Recycling; -using Content.Shared.GameObjects.Components.Rotation; using Content.Shared.Physics; using Robust.Server.GameObjects; using Robust.Shared.Containers; diff --git a/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs b/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs index 70071bc28b..f0e33db9ed 100644 --- a/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs +++ b/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs @@ -187,9 +187,13 @@ namespace Content.Server.GameObjects.Components.Suspicion return; } - var tooltip = IsTraitor() - ? Loc.GetString($"They were a [color=red]traitor[/color]!") - : Loc.GetString($"They were an [color=green]innocent[/color]!"); + var traitor = IsTraitor(); + var color = traitor ? "red" : "green"; + var role = traitor ? "traitor" : "innocent"; + var article = traitor ? "a" : "an"; + + var tooltip = Loc.GetString("They were {0} [color={1}]{2}[/color]!", Loc.GetString(article), color, + Loc.GetString(role)); message.AddMarkup(tooltip); } diff --git a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs index 4828df6dee..f29abc5d08 100644 --- a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs +++ b/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs @@ -3,10 +3,8 @@ using System.Diagnostics; using Content.Shared.Atmos; using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; -using Content.Shared.Maths; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs index 8fadffc4d1..1d52b2e8af 100644 --- a/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs +++ b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects.Components.Nutrition; -using Content.Server.Utility; using Content.Shared.GameObjects.Components.Utensil; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs index 77e6cdc879..951cbbdfe4 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs @@ -2,8 +2,10 @@ using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.EntitySystems; +using Content.Shared.Damage; using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Items; +using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; @@ -14,8 +16,6 @@ using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using Content.Shared.Damage; -using Content.Shared.Interfaces.GameObjects.Components; namespace Content.Server.GameObjects.Components.Weapon.Melee { diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs index b01f9a6a39..8bbb7229a7 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs @@ -7,7 +7,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.EntitySystemMessages; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Localization; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs index 9fe8b67eaf..cfdc792278 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs @@ -6,12 +6,14 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Projectiles; using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; using Content.Shared.Audio; +using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Physics; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; +using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; @@ -27,8 +29,6 @@ using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.Utility; -using Content.Shared.GameObjects.Components.Damage; -using Robust.Shared.GameObjects; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels { diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs index 2901b72457..87ba1d317f 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs @@ -7,7 +7,6 @@ using JetBrains.Annotations; using Robust.Server.AI; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; -using Robust.Server.Interfaces.Timing; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs b/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs index 1478595930..615589d45e 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs @@ -1,5 +1,4 @@ using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; diff --git a/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs index 7f620ad222..07b67cc560 100644 --- a/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs @@ -19,8 +19,8 @@ namespace Content.Server.GameObjects.EntitySystems { _lastUpdate += frameTime; if (_lastUpdate < UpdateDelay) return; - var atmoSystem = EntitySystemManager.GetEntitySystem(); - // creadth: everything exposable by atmo should be updated as well + var atmosSystem = EntitySystemManager.GetEntitySystem(); + // creadth: everything exposable by atmos should be updated as well foreach (var atmosExposedComponent in EntityManager.ComponentManager.EntityQuery()) { var tile = atmosExposedComponent.Owner.Transform.Coordinates.GetTileAtmosphere(_entityManager); diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs index 309d8e02ca..df8774634c 100644 --- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs @@ -4,8 +4,6 @@ using System.Collections.Generic; using System.Linq; using Content.Server.Atmos; using Content.Server.Atmos.Reactions; -using Content.Server.GameObjects.Components.Atmos; -using Content.Server.Interfaces; using Content.Shared.GameObjects.EntitySystems.Atmos; using JetBrains.Annotations; using Robust.Server.Interfaces.Timing; diff --git a/Content.Server/GameObjects/EntitySystems/CloningSystem.cs b/Content.Server/GameObjects/EntitySystems/CloningSystem.cs index e9bb60a850..5f4e9377b5 100644 --- a/Content.Server/GameObjects/EntitySystems/CloningSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/CloningSystem.cs @@ -2,10 +2,7 @@ using System.Linq; using Content.Server.GameObjects.Components.Medical; using Content.Server.Mobs; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; -using Content.Shared.GameObjects.Components.Medical; -using Microsoft.AspNetCore.Server.Kestrel.Core; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs index efc7d8d797..84507fe1b9 100644 --- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs +++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs @@ -1,10 +1,8 @@ #nullable enable using System; using System.Threading; -using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Physics; using Content.Shared.Utility; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; // ReSharper disable UnassignedReadonlyField diff --git a/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs b/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs index 70927c4975..317f288084 100644 --- a/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs @@ -1,7 +1,6 @@  -using JetBrains.Annotations; -using Robust.Shared.GameObjects.Systems; using Content.Server.GameObjects.Components.Interactable; +using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs index c9e29ebf27..8eb88fd9f9 100644 --- a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs @@ -6,11 +6,9 @@ using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems.Click; using Content.Server.Interfaces.GameObjects.Components.Items; using Content.Server.Throw; -using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Input; using Content.Shared.Interfaces; -using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Server.GameObjects.EntitySystemMessages; using Robust.Server.Interfaces.Player; @@ -23,6 +21,7 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Players; +using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; namespace Content.Server.GameObjects.EntitySystems { @@ -182,15 +181,15 @@ namespace Content.Server.GameObjects.EntitySystems private void HandleSmartEquipBackpack(ICommonSession session) { - HandleSmartEquip(session, EquipmentSlotDefines.Slots.BACKPACK); + HandleSmartEquip(session, Slots.BACKPACK); } private void HandleSmartEquipBelt(ICommonSession session) { - HandleSmartEquip(session, EquipmentSlotDefines.Slots.BELT); + HandleSmartEquip(session, Slots.BELT); } - private void HandleSmartEquip(ICommonSession session, EquipmentSlotDefines.Slots equipementSlot) + private void HandleSmartEquip(ICommonSession session, Slots equipmentSlot) { var plyEnt = ((IPlayerSession) session).AttachedEntity; @@ -201,11 +200,11 @@ namespace Content.Server.GameObjects.EntitySystems !plyEnt.TryGetComponent(out InventoryComponent inventoryComp)) return; - if (!inventoryComp.TryGetSlotItem(equipementSlot, out ItemComponent equipmentItem) + if (!inventoryComp.TryGetSlotItem(equipmentSlot, out ItemComponent equipmentItem) || !equipmentItem.Owner.TryGetComponent(out var storageComponent)) { plyEnt.PopupMessage(Loc.GetString("You have no {0} to take something out of!", - EquipmentSlotDefines.SlotNames[equipementSlot].ToLower())); + SlotNames[equipmentSlot].ToLower())); return; } @@ -220,7 +219,7 @@ namespace Content.Server.GameObjects.EntitySystems if (storageComponent.StoredEntities.Count == 0) { plyEnt.PopupMessage(Loc.GetString("There's nothing in your {0} to take out!", - EquipmentSlotDefines.SlotNames[equipementSlot].ToLower())); + SlotNames[equipmentSlot].ToLower())); } else { diff --git a/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs b/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs index a200300cf1..179668dc1e 100644 --- a/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs @@ -1,8 +1,6 @@ using Content.Server.GameObjects.Components; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.IoC; using Robust.Shared.Map; namespace Content.Server.GameObjects.EntitySystems diff --git a/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs b/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs index aa5b1a1ce7..de07fe0a8c 100644 --- a/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs @@ -1,4 +1,5 @@ -using Content.Server.GameObjects.Components.MachineLinking; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.MachineLinking; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; @@ -10,7 +11,6 @@ using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Players; -using System.Collections.Generic; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs b/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs index 2f436c922a..0a33eb0d3d 100644 --- a/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs @@ -1,16 +1,12 @@ using System.Collections.Generic; -using Content.Server.GameObjects.Components.Damage; -using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.StationEvents; using Content.Shared.Damage; -using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Body; using Content.Shared.GameObjects.Components.Damage; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.IoC; namespace Content.Server.GameObjects.EntitySystems.StationEvents { diff --git a/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs b/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs index 6ff103b01b..0ff87fdfdd 100644 --- a/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Text; -using Content.Server.StationEvents; +using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; +using Content.Server.StationEvents; using JetBrains.Annotations; using Robust.Server.Console; using Robust.Server.Interfaces.Player; @@ -196,7 +197,7 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents } // Stop events from happening in lobby and force active event to end if the round ends - if (_gameTicker.RunLevel != GameTicking.GameRunLevel.InRound) + if (_gameTicker.RunLevel != GameRunLevel.InRound) { if (CurrentEvent != null) { diff --git a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs index c48909ad1d..1e2a1cec4e 100644 --- a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs @@ -2,9 +2,7 @@ using System.Reflection; using Content.Shared.GameObjects.Verbs; using Robust.Server.Interfaces.Player; -using Robust.Shared.Containers; using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; diff --git a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs index e5538d9f54..43dd52eaa1 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs @@ -1,27 +1,26 @@ -using Content.Server.GameTicking.GameRules; -using Content.Server.Interfaces.Chat; -using Content.Server.Interfaces.GameTicking; -using Content.Server.Players; -using Robust.Server.Interfaces.Player; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; -using System.Collections.Generic; +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.PDA; using Content.Server.GameObjects.Components.Suspicion; -using Content.Server.Mobs.Roles; +using Content.Server.GameTicking.GameRules; +using Content.Server.Interfaces.Chat; +using Content.Server.Interfaces.GameTicking; using Content.Server.Mobs.Roles.Suspicion; +using Content.Server.Players; using Content.Shared.GameObjects.Components.Inventory; using Content.Shared.GameObjects.Components.PDA; using Content.Shared.Roles; +using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; namespace Content.Server.GameTicking.GamePresets { @@ -68,7 +67,7 @@ namespace Content.Server.GameTicking.GamePresets if (readyPlayers.Count == 0) { - _chatManager.DispatchServerAnnouncement($"No players readied up! Can't start Suspicion."); + _chatManager.DispatchServerAnnouncement("No players readied up! Can't start Suspicion."); return false; } diff --git a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs index dbcd8442b3..b7a680be96 100644 --- a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs +++ b/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs @@ -10,6 +10,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Configuration; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Localization; using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameTicking.GameRules @@ -32,7 +33,7 @@ namespace Content.Server.GameTicking.GameRules public override void Added() { - _chatManager.DispatchServerAnnouncement("The game is now a death match. Kill everybody else to win!"); + _chatManager.DispatchServerAnnouncement(Loc.GetString("The game is now a death match. Kill everybody else to win!")); _entityManager.EventBus.SubscribeEvent(EventSource.Local, this, OnHealthChanged); _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged; @@ -81,19 +82,15 @@ namespace Content.Server.GameTicking.GameRules winner = playerSession; } - if (winner == null) - { - _chatManager.DispatchServerAnnouncement("Everybody is dead, it's a stalemate!"); - } - else - { - // We have a winner! - _chatManager.DispatchServerAnnouncement($"{winner} wins the death match!"); - } + _chatManager.DispatchServerAnnouncement(winner == null + ? Loc.GetString("Everybody is dead, it's a stalemate!") + : Loc.GetString("{0} wins the death match!", winner)); - _chatManager.DispatchServerAnnouncement($"Restarting in 10 seconds."); + var restartDelay = 10; - Timer.Spawn(TimeSpan.FromSeconds(10), () => _gameTicker.RestartRound()); + _chatManager.DispatchServerAnnouncement(Loc.GetString("Restarting in {0} seconds.", restartDelay)); + + Timer.Spawn(TimeSpan.FromSeconds(restartDelay), () => _gameTicker.RestartRound()); } private void PlayerManagerOnPlayerStatusChanged(object sender, SessionStatusEventArgs e) diff --git a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs index 0161ab409a..42105ef069 100644 --- a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs +++ b/Content.Server/GameTicking/GameRules/RuleSuspicion.cs @@ -4,7 +4,6 @@ using Content.Server.GameObjects.Components.Suspicion; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; -using Content.Server.Mobs.Roles; using Content.Server.Mobs.Roles.Suspicion; using Content.Server.Players; using Content.Shared.GameObjects.Components.Damage; @@ -15,6 +14,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.Configuration; using Robust.Shared.IoC; +using Robust.Shared.Localization; using Timer = Robust.Shared.Timers.Timer; namespace Content.Server.GameTicking.GameRules @@ -36,10 +36,11 @@ namespace Content.Server.GameTicking.GameRules public override void Added() { - _chatManager.DispatchServerAnnouncement("There are traitors on the station! Find them, and kill them!"); + _chatManager.DispatchServerAnnouncement(Loc.GetString("There are traitors on the station! Find them, and kill them!")); - EntitySystem.Get().PlayGlobal("/Audio/Misc/tatoralert.ogg", AudioParams.Default, - (session) => session.ContentData().Mind?.HasRole() ?? false); + bool Predicate(IPlayerSession session) => session.ContentData()?.Mind?.HasRole() ?? false; + + EntitySystem.Get().PlayGlobal("/Audio/Misc/tatoralert.ogg", AudioParams.Default, Predicate); EntitySystem.Get().AccessType = DoorSystem.AccessTypes.AllowAllNoExternal; @@ -67,7 +68,7 @@ namespace Content.Server.GameTicking.GameRules { if (playerSession.AttachedEntity == null || !playerSession.AttachedEntity.TryGetComponent(out IDamageableComponent damageable) - || !playerSession.AttachedEntity.TryGetComponent(out SuspicionRoleComponent suspicionRole)) + || !playerSession.AttachedEntity.HasComponent()) { continue; } @@ -77,26 +78,28 @@ namespace Content.Server.GameTicking.GameRules continue; } - if (playerSession.ContentData().Mind.HasRole()) + var mind = playerSession.ContentData()?.Mind; + + if (mind != null && mind.HasRole()) traitorsAlive++; else innocentsAlive++; } - if ((innocentsAlive + traitorsAlive) == 0) + if (innocentsAlive + traitorsAlive == 0) { - _chatManager.DispatchServerAnnouncement("Everybody is dead, it's a stalemate!"); + _chatManager.DispatchServerAnnouncement(Loc.GetString("Everybody is dead, it's a stalemate!")); EndRound(Victory.Stalemate); } else if (traitorsAlive == 0) { - _chatManager.DispatchServerAnnouncement("The traitors are dead! The innocents win."); + _chatManager.DispatchServerAnnouncement(Loc.GetString("The traitors are dead! The innocents win.")); EndRound(Victory.Innocents); } else if (innocentsAlive == 0) { - _chatManager.DispatchServerAnnouncement("The innocents are dead! The traitors win."); + _chatManager.DispatchServerAnnouncement(Loc.GetString("The innocents are dead! The traitors win.")); EndRound(Victory.Traitors); } } @@ -115,20 +118,24 @@ namespace Content.Server.GameTicking.GameRules switch (victory) { case Victory.Innocents: - text = "The innocents have won!"; + text = Loc.GetString("The innocents have won!"); break; case Victory.Traitors: - text = "The traitors have won!"; + text = Loc.GetString("The traitors have won!"); break; default: - text = "Nobody wins!"; + text = Loc.GetString("Nobody wins!"); break; } _gameTicker.EndRound(text); - _chatManager.DispatchServerAnnouncement($"Restarting in 10 seconds."); + + var restartDelay = 10; + + _chatManager.DispatchServerAnnouncement(Loc.GetString("Restarting in {0} seconds.", restartDelay)); _checkTimerCancel.Cancel(); - Timer.Spawn(TimeSpan.FromSeconds(10), () => _gameTicker.RestartRound()); + + Timer.Spawn(TimeSpan.FromSeconds(restartDelay), () => _gameTicker.RestartRound()); } } } diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 5321719632..7c42e9df67 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -22,9 +22,7 @@ using Content.Server.Interfaces.GameTicking; using Content.Server.Mobs; using Content.Server.Mobs.Roles; using Content.Server.Players; -using Content.Shared; using Content.Shared.Chat; -using Content.Shared.GameObjects.Components.PDA; using Content.Shared.Network.NetMessages; using Content.Shared.Preferences; using Content.Shared.Roles; @@ -49,7 +47,6 @@ using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Map; -using Robust.Shared.Maths; using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Server/GameTicking/GameTickerCommands.cs b/Content.Server/GameTicking/GameTickerCommands.cs index 4d553fa68c..860f172a1a 100644 --- a/Content.Server/GameTicking/GameTickerCommands.cs +++ b/Content.Server/GameTicking/GameTickerCommands.cs @@ -365,7 +365,7 @@ namespace Content.Server.GameTicking shell.ExecuteCommand(player, $"addmap {mapId} false"); shell.ExecuteCommand(player, $"loadbp {mapId} \"{CommandParsing.Escape(mapName)}\""); - shell.ExecuteCommand(player, $"aghost"); + shell.ExecuteCommand(player, "aghost"); shell.ExecuteCommand(player, $"tp 0 0 {mapId}"); var newGridId = mapManager.GetAllGrids().Max(g => (int) g.Index); diff --git a/Content.Server/GlobalVerbs/PullingVerb.cs b/Content.Server/GlobalVerbs/PullingVerb.cs index b3b24617de..100fb6099b 100644 --- a/Content.Server/GlobalVerbs/PullingVerb.cs +++ b/Content.Server/GlobalVerbs/PullingVerb.cs @@ -3,7 +3,6 @@ using Content.Server.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.Verbs; -using Content.Shared.Physics; using Content.Shared.Physics.Pull; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects.Components; diff --git a/Content.Server/Interfaces/Chat/IChatManager.cs b/Content.Server/Interfaces/Chat/IChatManager.cs index eb06e54d78..9faee496eb 100644 --- a/Content.Server/Interfaces/Chat/IChatManager.cs +++ b/Content.Server/Interfaces/Chat/IChatManager.cs @@ -1,6 +1,5 @@ using Robust.Server.Interfaces.Player; using Robust.Shared.Interfaces.GameObjects; -using System; namespace Content.Server.Interfaces.Chat { diff --git a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs b/Content.Server/Interfaces/GameObjects/ISuicideAct.cs index a23353adac..161cba131d 100644 --- a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs +++ b/Content.Server/Interfaces/GameObjects/ISuicideAct.cs @@ -23,6 +23,5 @@ namespace Content.Server.Interfaces.GameObjects Radiation, Asphyxiation, Bloodloss - } } diff --git a/Content.Server/Mobs/Roles/Suspicion/SuspicionTraitorRole.cs b/Content.Server/Mobs/Roles/Suspicion/SuspicionTraitorRole.cs index d265bb23bf..e9c58f1f3d 100644 --- a/Content.Server/Mobs/Roles/Suspicion/SuspicionTraitorRole.cs +++ b/Content.Server/Mobs/Roles/Suspicion/SuspicionTraitorRole.cs @@ -1,14 +1,10 @@ using System.Collections.Generic; using System.Linq; using Content.Server.Interfaces.Chat; -using Content.Server.Mobs.Roles.Suspicion; using Content.Shared.Roles; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.Audio; -using Robust.Shared.GameObjects.Systems; using Robust.Shared.Localization; -namespace Content.Server.Mobs.Roles +namespace Content.Server.Mobs.Roles.Suspicion { public sealed class SuspicionTraitorRole : SuspicionRole { diff --git a/Content.Server/Sandbox/SandboxManager.cs b/Content.Server/Sandbox/SandboxManager.cs index df3d7c1a0d..192f7bfe0c 100644 --- a/Content.Server/Sandbox/SandboxManager.cs +++ b/Content.Server/Sandbox/SandboxManager.cs @@ -1,11 +1,10 @@ -using Content.Server.GameObjects.Components; using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; using Content.Shared.Sandbox; -using Robust.Server.Interfaces.Console; using Robust.Server.Console; +using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Placement; using Robust.Server.Interfaces.Player; using Robust.Server.Player; @@ -139,7 +138,7 @@ namespace Content.Server.Sandbox } var player = _playerManager.GetSessionByChannel(message.MsgChannel); - _shell.ExecuteCommand(player, $"suicide"); + _shell.ExecuteCommand(player, "suicide"); } private void UpdateSandboxStatusForAll() diff --git a/Content.Server/StationEvents/PowerGridCheck.cs b/Content.Server/StationEvents/PowerGridCheck.cs index 0bd41345a6..11ef585c5f 100644 --- a/Content.Server/StationEvents/PowerGridCheck.cs +++ b/Content.Server/StationEvents/PowerGridCheck.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Power; +using System.Collections.Generic; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.Components.Power.PowerNetComponents; using JetBrains.Annotations; using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; diff --git a/Content.Server/StationEvents/StationEvent.cs b/Content.Server/StationEvents/StationEvent.cs index 8d351aff8e..b99c1ced5b 100644 --- a/Content.Server/StationEvents/StationEvent.cs +++ b/Content.Server/StationEvents/StationEvent.cs @@ -1,5 +1,4 @@ using Content.Server.Interfaces.Chat; -using Robust.Server.GameObjects; using Robust.Shared.IoC; namespace Content.Server.StationEvents diff --git a/Content.Server/StationEvents/StationEventCommand.cs b/Content.Server/StationEvents/StationEventCommand.cs index 85f335b2ff..108baba460 100644 --- a/Content.Server/StationEvents/StationEventCommand.cs +++ b/Content.Server/StationEvents/StationEventCommand.cs @@ -6,7 +6,7 @@ using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Localization; -namespace Content.Client.Commands +namespace Content.Server.StationEvents { [UsedImplicitly] public sealed class StationEventCommand : IClientCommand diff --git a/Content.Server/Throw/ThrowHelper.cs b/Content.Server/Throw/ThrowHelper.cs index c347d3c3ef..669b1c8f02 100644 --- a/Content.Server/Throw/ThrowHelper.cs +++ b/Content.Server/Throw/ThrowHelper.cs @@ -4,6 +4,7 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Physics; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Physics; using Robust.Shared.Interfaces.Random; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; @@ -11,7 +12,6 @@ using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; using Robust.Shared.Random; -using Robust.Shared.Interfaces.Physics; namespace Content.Server.Throw { diff --git a/Content.Server/Utility/InventoryHelpers.cs b/Content.Server/Utility/InventoryHelpers.cs index ec998908ac..f178ea8e11 100644 --- a/Content.Server/Utility/InventoryHelpers.cs +++ b/Content.Server/Utility/InventoryHelpers.cs @@ -1,9 +1,7 @@ using Content.Server.GameObjects.Components.GUI; using Content.Server.GameObjects.Components.Items.Storage; -using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Map; using Robust.Shared.Prototypes; using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines; diff --git a/Content.Shared/Atmos/GasPrototype.cs b/Content.Shared/Atmos/GasPrototype.cs index 31827d2447..064ec0139d 100644 --- a/Content.Shared/Atmos/GasPrototype.cs +++ b/Content.Shared/Atmos/GasPrototype.cs @@ -1,6 +1,5 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; namespace Content.Shared.Atmos diff --git a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs index 6e183ebca6..6378613687 100644 --- a/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs +++ b/Content.Shared/Chat/ChatMaxMsgLengthMessage.cs @@ -1,9 +1,6 @@ using Lidgren.Network; using Robust.Shared.Interfaces.Network; using Robust.Shared.Network; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.Chat { diff --git a/Content.Shared/Chemistry/ReagentPrototype.cs b/Content.Shared/Chemistry/ReagentPrototype.cs index 14da28ea20..cb8b639242 100644 --- a/Content.Shared/Chemistry/ReagentPrototype.cs +++ b/Content.Shared/Chemistry/ReagentPrototype.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using Content.Shared.Interfaces; using Content.Shared.Interfaces.Chemistry; using Robust.Shared.IoC; @@ -6,7 +7,6 @@ using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using YamlDotNet.RepresentationModel; -using System; namespace Content.Shared.Chemistry { diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/EntryPoint.cs index ad446b324d..b69c107dde 100644 --- a/Content.Shared/EntryPoint.cs +++ b/Content.Shared/EntryPoint.cs @@ -1,15 +1,15 @@ using System; -using System.Collections.Generic; -using System.Globalization; -using Content.Shared.Maps; -using Robust.Shared.ContentPack; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.IoC; -using Robust.Shared.Localization; -using Robust.Shared.Localization.Macros; -using Robust.Shared.Prototypes; + using System.Collections.Generic; + using System.Globalization; + using Content.Shared.Maps; + using Robust.Shared.ContentPack; + using Robust.Shared.Interfaces.Map; + using Robust.Shared.IoC; + using Robust.Shared.Localization; + using Robust.Shared.Localization.Macros; + using Robust.Shared.Prototypes; -namespace Content.Shared + namespace Content.Shared { public class EntryPoint : GameShared { diff --git a/Content.Shared/GameObjects/Atmos/SharedPumpComponent.cs b/Content.Shared/GameObjects/Atmos/SharedPumpComponent.cs index 8546d9d071..fe16525766 100644 --- a/Content.Shared/GameObjects/Atmos/SharedPumpComponent.cs +++ b/Content.Shared/GameObjects/Atmos/SharedPumpComponent.cs @@ -1,6 +1,6 @@ -using Content.Shared.GameObjects.Components.Atmos; +using System; +using Content.Shared.GameObjects.Components.Atmos; using Robust.Shared.Serialization; -using System; namespace Content.Shared.GameObjects.Atmos { diff --git a/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs b/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs index 9d82443e31..ce5be9f0e6 100644 --- a/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs +++ b/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs @@ -1,9 +1,9 @@ -using Content.Shared.GameObjects.EntitySystems; +using System; +using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; using Robust.Shared.Maths; +using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using System; namespace Content.Shared.GameObjects.Components.ActionBlocking { diff --git a/Content.Shared/GameObjects/Components/ActionBlocking/SharedHandcuffComponent.cs b/Content.Shared/GameObjects/Components/ActionBlocking/SharedHandcuffComponent.cs index c707802918..6ab252ba2b 100644 --- a/Content.Shared/GameObjects/Components/ActionBlocking/SharedHandcuffComponent.cs +++ b/Content.Shared/GameObjects/Components/ActionBlocking/SharedHandcuffComponent.cs @@ -1,6 +1,6 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using System; namespace Content.Shared.GameObjects.Components.ActionBlocking { diff --git a/Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs b/Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs index f588dc44da..801e8a1b6e 100644 --- a/Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs +++ b/Content.Shared/GameObjects/Components/Atmos/SharedPipeComponent.cs @@ -1,5 +1,5 @@ -using Robust.Shared.Serialization; -using System; +using System; +using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Atmos { diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs index f580fcbfbd..d03330d41b 100644 --- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs +++ b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs @@ -1,8 +1,8 @@ -using Robust.Shared.GameObjects; +using System; +using System.Text.RegularExpressions; +using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; -using System; -using System.Text.RegularExpressions; namespace Content.Shared.GameObjects.Components.Disposal { diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs index f20d6248d4..76b1b353c2 100644 --- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs +++ b/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs @@ -1,9 +1,9 @@ #nullable enable +using System; +using System.Text.RegularExpressions; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; -using System; -using System.Text.RegularExpressions; namespace Content.Shared.GameObjects.Components.Disposal { diff --git a/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs b/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs index c498f21e8f..96a3ac63d2 100644 --- a/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs +++ b/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Content.Shared.GameObjects.Components.Inventory; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; diff --git a/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs index 3fdb287576..a9821a4665 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs @@ -1,10 +1,10 @@ -using Content.Shared.GameObjects.EntitySystems; +using System; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Physics; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Physics; using Robust.Shared.Serialization; -using System; namespace Content.Shared.GameObjects.Components.Movement { diff --git a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs index a0dede9bc6..27e8e5b8cf 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs @@ -1,8 +1,6 @@ #nullable enable using System; using Content.Shared.GameObjects.Components.Body; -using Content.Shared.GameObjects.Components.Mobs; -using Content.Shared.GameObjects.Components.Rotation; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.Configuration; diff --git a/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs index d232ffaa50..36bf78b73a 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedSlipperyComponent.cs @@ -8,7 +8,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Physics; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; diff --git a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs b/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs index e89789e363..d7233231f4 100644 --- a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs @@ -1,9 +1,7 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components.UserInterface; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.GameObjects.Components.Power.AME { diff --git a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEShieldComponent.cs b/Content.Shared/GameObjects/Components/Power/AME/SharedAMEShieldComponent.cs index f9af4d12ac..307be8f1b3 100644 --- a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEShieldComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/AME/SharedAMEShieldComponent.cs @@ -1,8 +1,6 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.GameObjects.Components.Power.AME { diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBatteryBarrelComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBatteryBarrelComponent.cs index 40ef9b47e1..d5f53122b1 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBatteryBarrelComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBatteryBarrelComponent.cs @@ -1,8 +1,6 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels { diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBoltActionBarrelComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBoltActionBarrelComponent.cs index f2e8e52b80..04c1b27e71 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBoltActionBarrelComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBoltActionBarrelComponent.cs @@ -1,8 +1,6 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels { diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedPumpBarrelComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedPumpBarrelComponent.cs index a577e11ad0..b4e457ea5c 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedPumpBarrelComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedPumpBarrelComponent.cs @@ -1,8 +1,6 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels { diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedRevolverBarrelComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedRevolverBarrelComponent.cs index 3ed085101b..99c5103af3 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedRevolverBarrelComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedRevolverBarrelComponent.cs @@ -1,8 +1,6 @@ -using Robust.Shared.GameObjects; +using System; +using Robust.Shared.GameObjects; using Robust.Shared.Serialization; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels { diff --git a/Content.Shared/GameObjects/EntitySystems/ActionBlockerSystem.cs b/Content.Shared/GameObjects/EntitySystems/ActionBlockerSystem.cs index f3db58a623..b0fc6baf20 100644 --- a/Content.Shared/GameObjects/EntitySystems/ActionBlockerSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/ActionBlockerSystem.cs @@ -1,5 +1,4 @@ -using System.Linq; -using Robust.Shared.GameObjects.Systems; +using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; namespace Content.Shared.GameObjects.EntitySystems diff --git a/Content.Shared/GameObjects/EntitySystems/Atmos/GasOverlayChunk.cs b/Content.Shared/GameObjects/EntitySystems/Atmos/GasOverlayChunk.cs index cc4ce2988c..67ef3bfa86 100644 --- a/Content.Shared/GameObjects/EntitySystems/Atmos/GasOverlayChunk.cs +++ b/Content.Shared/GameObjects/EntitySystems/Atmos/GasOverlayChunk.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections; using System.Collections.Generic; -using Robust.Shared.Interfaces.Timing; -using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Timing; using Robust.Shared.Utility; diff --git a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs b/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs index d8eaea3172..efbac23f91 100644 --- a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs +++ b/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs @@ -1,5 +1,4 @@ -using System; -using Content.Shared.GameObjects.Components.Mobs; +using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Shared.Containers; diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs index 8e8ad11fb4..3555878ffc 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs @@ -1,6 +1,5 @@ #nullable enable using System; -using Content.Shared.GameObjects.Components.Research; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs index 70341dbc78..aadfa594db 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using System.Collections.Generic; using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Shared/Physics/GasVaporController.cs b/Content.Shared/Physics/GasVaporController.cs index d58c15176d..ca544c47de 100644 --- a/Content.Shared/Physics/GasVaporController.cs +++ b/Content.Shared/Physics/GasVaporController.cs @@ -1,8 +1,5 @@ using Robust.Shared.Maths; using Robust.Shared.Physics; -using System; -using System.Collections.Generic; -using System.Text; namespace Content.Shared.Physics { diff --git a/Content.Shared/StationEvents/SharedStationEvent.cs b/Content.Shared/StationEvents/SharedStationEvent.cs index 8cecfb14df..837e8980ab 100644 --- a/Content.Shared/StationEvents/SharedStationEvent.cs +++ b/Content.Shared/StationEvents/SharedStationEvent.cs @@ -1,12 +1,10 @@ -using Lidgren.Network; +using System.Collections.Generic; +using System.IO; +using Lidgren.Network; using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Serialization; using Robust.Shared.IoC; using Robust.Shared.Network; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; namespace Content.Shared.StationEvents { diff --git a/Content.Shared/Utility/EntityCoordinatesExtensions.cs b/Content.Shared/Utility/EntityCoordinatesExtensions.cs index 9c38d0f08b..1e36f4f7b1 100644 --- a/Content.Shared/Utility/EntityCoordinatesExtensions.cs +++ b/Content.Shared/Utility/EntityCoordinatesExtensions.cs @@ -1,10 +1,8 @@ #nullable enable using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; -using Robust.Shared.IoC; using Robust.Shared.Map; -using Vector2 = Robust.Shared.Maths.Vector2; +using Robust.Shared.Maths; namespace Content.Shared.Utility { diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings index be0b3eff72..509a0e8dc3 100644 --- a/SpaceStation14.sln.DotSettings +++ b/SpaceStation14.sln.DotSettings @@ -57,30 +57,48 @@ True <data /> <data><IncludeFilters /><ExcludeFilters><Filter ModuleMask="*.UnitTesting" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /></ExcludeFilters></data> + True + True True + True + True + True True True + True True + True True <data /> <data><IncludeFilters /><ExcludeFilters><Filter ModuleMask="Lidgren.Network" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /></ExcludeFilters></data> + True True + True + True True True + True True True + True True True + True True True True True True + True + True True + True + True True True True True + True True True True @@ -88,12 +106,14 @@ True True True + True True True True True True True + True True True True @@ -103,15 +123,24 @@ True True True + True True True True True True + True + True + True + True + True True True True True + True True True + True + True True