Move ActorComponent to shared (#21293)

diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 0b9de6993eb293b295faa8d650e4d4c4c60c1473..66135279d57fb38dc14d544b208b7fbcce84f4ef 100644 (file)
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -49,7 +49,7 @@ public sealed class CargoTest
         await pair.CleanReturnAsync();
     }
     [Test]
-    public async Task NoCargoBountyArbitageTest()
+    public async Task NoCargoBountyArbitrageTest()
     {
         await using var pair = await PoolManager.GetServerClient();
         var server = pair.Server;

diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs
index 3ec767c200d63fce82ace5d9373d29222e7b5c46..147ac70a6d589f0d52863c1d6e6ee0f5ba8dd083 100644 (file)
--- a/Content.Server/Access/Systems/AccessOverriderSystem.cs
+++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Interaction;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
+using Robust.Shared.Player;
 using static Content.Shared.Access.Components.AccessOverriderComponent;
 
 namespace Content.Server.Access.Systems;

diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs
index b2e7f4e6cc0443545ae603310aeeec1b6476e8d3..97c1fa0656c63a37d48620ab361d49fda0a42718 100644 (file)
--- a/Content.Server/Administration/Commands/SetOutfitCommand.cs
+++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs
@@ -9,8 +9,8 @@ using Content.Shared.Inventory;
 using Content.Shared.PDA;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
-using Robust.Server.GameObjects;
 using Robust.Shared.Console;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Administration.Commands

diff --git a/Content.Server/Administration/Logs/Converters/EntityUidConverter.cs b/Content.Server/Administration/Logs/Converters/EntityUidConverter.cs
index 2fc1a2b627ec5a2829f218bb0a7bb9cb32e47829..78d81af33ce5d05f62b7b400ff4f5bb87137d9d1 100644 (file)
--- a/Content.Server/Administration/Logs/Converters/EntityUidConverter.cs
+++ b/Content.Server/Administration/Logs/Converters/EntityUidConverter.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Administration.Logs.Converters;
 

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 6fe526af11d92e042fb0ec5ab7e792e44879a203..245fad4b33c1c4fd2c9e78d6dbe6abf9efea5717 100644 (file)
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -7,10 +7,8 @@ using Content.Shared.Humanoid;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Verbs;
-using Robust.Server.GameObjects;
 using Robust.Shared.Utility;
-using Content.Server.GameTicking.Rules.Components;
-using System.Linq;
+using Robust.Shared.Player;
 
 namespace Content.Server.Administration.Systems;
 

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index b52e56009df10fb0f23cb1882d80ae0d0da38924..d7df3faee2bfd44b4d6a659bee91349887d20cfa 100644 (file)
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -1,12 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Server.Administration.Commands;
 using Content.Server.Administration.Components;
 using Content.Server.Atmos;
 using Content.Server.Atmos.Components;
 using Content.Server.Cargo.Components;
-using Content.Server.Damage.Components;
 using Content.Server.Doors.Systems;
 using Content.Server.Hands.Systems;
 using Content.Server.Power.Components;
@@ -30,12 +28,12 @@ using Content.Shared.PDA;
 using Content.Shared.Stacks;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
-using Robust.Server.GameObjects;
 using Robust.Server.Physics;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Administration.Systems;

diff --git a/Content.Server/Anomaly/AnomalySystem.Scanner.cs b/Content.Server/Anomaly/AnomalySystem.Scanner.cs
index caff031ace9768acbf72f3f720de93ba0bf11575..30b3d994979a517fc5837f546fc8515f3f8bc62e 100644 (file)
--- a/Content.Server/Anomaly/AnomalySystem.Scanner.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Scanner.cs
@@ -3,7 +3,7 @@ using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Anomaly;

diff --git a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
index 0d7ad48f888e8d9cb4ed27d852c6f07bac505c48..16ddf1f933900633473b4401ef3ec4375b2439c9 100644 (file)
--- a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
@@ -9,6 +9,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using static Content.Shared.Atmos.Components.GasAnalyzerComponent;
 
 namespace Content.Server.Atmos.EntitySystems

diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
index 0ef49be46aa4037da408af167989416559ba4941..190ac9d5c988e7ba1fc58ac80a5581a941ac24c9 100644 (file)
--- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
@@ -15,11 +15,11 @@ using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Monitor.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.DeviceLinking;
-using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Atmos.Monitor.Systems;
 

diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
index e857b02b944b64d461f42a315e784ac9f560f3d0..75167dfbc25506b532762d3d1ee0384650c9cb70 100644 (file)
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs
@@ -15,6 +15,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 {

diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index 19ad8175aad00348eb19bc5f56def4a0532547b0..66bd28eaac7b11a90a1434dc332e18250d2c0801 100644 (file)
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -18,6 +18,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Atmos.Piping.Binary.EntitySystems
 {

diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index 69a0178a018b882bb2599f3d948f49de5391f4bd..7032e7fe0e969a5ca58ef95b15e28e3455b3c00a 100644 (file)
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -14,6 +14,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
 {

diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
index ce2213d535b62ea63b4533d5b779db556d186c33..f6ad51fb24c4ee993ed44b4102802aabaaabf6a2 100644 (file)
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs
@@ -14,6 +14,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
 {

diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index 416e2e4f649ada61aad69733a874931229fda768..14a1e5e456baff2abaf6f610add0ea2e211d8f9e 100644 (file)
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -17,6 +17,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Lock;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
+using Robust.Shared.Player;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems;
 

diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
index 708651d5cd06b6268093af29c127435881d45679..6b085d133ed577ed343331022cd78764656efe71 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
@@ -1,6 +1,5 @@
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Components;
-using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
@@ -15,8 +14,7 @@ using Content.Shared.DoAfter;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Verbs;
 using Content.Shared.Stacks;
-using Robust.Server.GameObjects;
-using Content.Shared.Popups;
+using Robust.Shared.Player;
 
 namespace Content.Server.Chemistry.EntitySystems;
 

diff --git a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
index 99f8c1a517b8c3f0279a06604800dd220926bfe8..d2666417cf8fc9954250cc3789d9cdfe479db00c 100644 (file)
--- a/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs
@@ -4,12 +4,12 @@ using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
+using Robust.Shared.Player;
 
 namespace Content.Server.Chemistry.EntitySystems
 {

diff --git a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
index 7dc3b8489dfeeb58cdde1a1c6c95cbfd544cf37a..a087ebdd49c13043dfbe15b79607b18cf6ab66c3 100644 (file)
--- a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
+++ b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
@@ -5,6 +5,7 @@ using Content.Shared.IdentityManagement.Components;
 using Content.Shared.Prototypes;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 

diff --git a/Content.Server/Configurable/ConfigurationSystem.cs b/Content.Server/Configurable/ConfigurationSystem.cs
index c134c1a87d9809568f3cfa72f242a448c35b7569..eb31149ecae48ade3dd74f5e5dd4cf51f3764856 100644 (file)
--- a/Content.Server/Configurable/ConfigurationSystem.cs
+++ b/Content.Server/Configurable/ConfigurationSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Tools.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
+using Robust.Shared.Player;
 using static Content.Shared.Configurable.ConfigurationComponent;
 
 namespace Content.Server.Configurable;

diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs
index d225df2daea12c9355134ad687721fc7acbed397..16385d4d7ef8368a327c2e0cc1b95a63955d64cf 100644 (file)
--- a/Content.Server/Crayon/CrayonSystem.cs
+++ b/Content.Server/Crayon/CrayonSystem.cs
@@ -12,8 +12,8 @@ using Content.Shared.Interaction.Events;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 
 namespace Content.Server.Crayon;
 

diff --git a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
index 457fab4bb28414dc027a38ea04442194460b43ff..5bc30cce5daef698b1a692bddbd847c4f104f090 100644 (file)
--- a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
+++ b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
@@ -4,8 +4,7 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Stunnable;
-using Robust.Server.GameObjects;
-using Robust.Server.Player;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;

diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
index c250761687119c28012847531c84a879f59cd79e..a977a44287a1c19de3f23872882759186c7be9db 100644 (file)
--- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs
@@ -17,6 +17,7 @@ using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 

diff --git a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
index 7993ccc07d5d886c9f8a500df9b06006da3b82cd..1a819ab0fb186d790b60203cca3617324ed74ee1 100644 (file)
--- a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
+++ b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
@@ -7,6 +7,7 @@ using Content.Server.Power.Components;
 using Content.Shared.Disposal;
 using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Disposal.Mailing;
 

diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index baec99b6a57e755dba38d24ec4f5eaf7436d263a..0e56d0fb184c5a791550e5bfa2efaea5f0f78ad1 100644 (file)
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -32,6 +32,7 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 

diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs
index dd6f121353de22799bdaad5baa8951fb2b68372e..e234ba330434d441ad8a1b043c97475fabb3387e 100644 (file)
--- a/Content.Server/Doors/Systems/AirlockSystem.cs
+++ b/Content.Server/Doors/Systems/AirlockSystem.cs
@@ -6,10 +6,9 @@ using Content.Shared.Doors;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
 using Content.Shared.Interaction;
-using Robust.Server.GameObjects;
 using Content.Shared.Wires;
 using Content.Shared.Prying.Components;
-using Robust.Shared.Prototypes;
+using Robust.Shared.Player;
 
 namespace Content.Server.Doors.Systems;
 

diff --git a/Content.Server/Examine/ExamineSystem.cs b/Content.Server/Examine/ExamineSystem.cs
index 3447810896f7ed2a9a9f313a0055f7514a5fef94..bb7e07d23547684544e76f81b72bb777e2fe0551 100644 (file)
--- a/Content.Server/Examine/ExamineSystem.cs
+++ b/Content.Server/Examine/ExamineSystem.cs
@@ -3,7 +3,7 @@ using Content.Server.Verbs;
 using Content.Shared.Examine;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Examine

diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
index 69704ddb562bfa0f37461c29301cf4f569b0bec5..acf7cbd80dcc4a38e731566bef0a22c70a228a56 100644 (file)
--- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
@@ -10,6 +10,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 // todo: remove this stinky LINQy
 

diff --git a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
index 94eeb5de565e68b85bc0401c80197ae87b6783ce..01fd97d9a7962552c8de4ca7e38a7eb54515bd58 100644 (file)
--- a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs
@@ -2,8 +2,8 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.KillTracking;
 using Content.Shared.Chat;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 namespace Content.Server.GameTicking.Rules;

diff --git a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
index 738883fff38fff807c27a7020984e7740aadaf57..94f4072243ff60be1252d16268f92d9ed268f907 100644 (file)
--- a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
@@ -1,15 +1,14 @@
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Players;
 using Content.Server.Station.Systems;
 using Content.Shared.Chat;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mobs;
 using Content.Shared.Players;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 

diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 6789be390eb668590d04cc9e9261d8b643842f42..9a0b74e2dfa8a2c2aeffcddecf58bb70fb9a662b 100644 (file)
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -20,6 +20,7 @@ using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Ghost

diff --git a/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs b/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs
index bbf7813c161e3b1de753eff83b456b324022b746..7dc5fc55ab7121d725ff8592d3f14b7d4ff25fba 100644 (file)
--- a/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs
+++ b/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.Explosion.EntitySystems;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.GhostKick;
 

diff --git a/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs b/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs
index 58cf415a250acf55e2a3e8bd651cc22b5955cd37..cf7f6843434d51e55ee29a246d530f36fece5d51 100644 (file)
--- a/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs
+++ b/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs
@@ -2,7 +2,7 @@
 using Content.Server.Popups;
 using Content.Shared.Interaction;
 using Content.Shared.Storage;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Holiday.Christmas;
 

diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.Modifier.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.Modifier.cs
index b47fe71714083645a88d22dc75ed6ba0beca6f51..05a8b0622216f8f6f575e83b34092048895176f3 100644 (file)
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.Modifier.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.Modifier.cs
@@ -3,6 +3,7 @@ using Content.Shared.Administration;
 using Content.Shared.Humanoid;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Humanoid;

diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs
index 9237a1f7dd40e4a7300b64b230971d2936f19eea..8d4e8eb818a967c409c6b1527929e82ff9c8a072 100644 (file)
--- a/Content.Server/Interaction/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -1,19 +1,10 @@
-
-
-using Content.Server.Administration.Logs;
-using Content.Server.Pulling;
 using Content.Shared.ActionBlocker;
-using Content.Shared.DragDrop;
-using Content.Shared.Input;
 using Content.Shared.Interaction;
-using Content.Shared.Pulling.Components;
 using Content.Shared.Storage;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Map;
-using Robust.Shared.Random;
+using Robust.Shared.Player;
 
 namespace Content.Server.Interaction
 {

diff --git a/Content.Server/KillTracking/KillTrackingSystem.cs b/Content.Server/KillTracking/KillTrackingSystem.cs
index 177f28ddc89178f44b85978da0fc5d30fd078ced..afb4283e82d2436da8d33897d729bd8a386f5acf 100644 (file)
--- a/Content.Server/KillTracking/KillTrackingSystem.cs
+++ b/Content.Server/KillTracking/KillTrackingSystem.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.KillTracking;
 

diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index 98bfe702b6aa4bb1f7bba142c48d65bac931c64f..5c539720a3b46df7a8b37c93a95607cdbb57dae1 100644 (file)
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -18,6 +18,7 @@ using Content.Shared.MassMedia.Systems;
 using Content.Shared.PDA;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Server.MassMedia.Systems;

diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index fd8f8fd76790e59aaac0b55cf69b24f006fd585c..a0ca94197ea668d17d06b4efd5f6f2fd87e84cb1 100644 (file)
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -20,6 +20,7 @@ using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
 
 namespace Content.Server.Mech.Systems;
 

diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 6e2f7fdf368cf6ef4a549d598060052948b1f1c3..cde361ec74c1324a99aeb14e08bf9a57866514e5 100644 (file)
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Mobs.Components;
 using Robust.Server.GameObjects;
 using Content.Server.Temperature.Components;
 using Content.Server.Body.Components;
+using Robust.Shared.Player;
 
 namespace Content.Server.Medical
 {

diff --git a/Content.Server/Mind/Commands/RenameCommand.cs b/Content.Server/Mind/Commands/RenameCommand.cs
index 2d65adc5082284dd6afb35ff00e0cd8a1d8d85c9..bb7d89ddf59c2cbf1e367165eb2e5c160915bfc0 100644 (file)
--- a/Content.Server/Mind/Commands/RenameCommand.cs
+++ b/Content.Server/Mind/Commands/RenameCommand.cs
@@ -9,9 +9,9 @@ using Content.Shared.Administration;
 using Content.Shared.Mind;
 using Content.Shared.PDA;
 using Content.Shared.StationRecords;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Console;
+using Robust.Shared.Player;
 
 namespace Content.Server.Mind.Commands;
 

diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs
index 9d0a6b4a857b5c048dfc24279e12b9e3598f64f5..0f6a6fc9b097dc36ab385f03050d7dce0eb2cf83 100644 (file)
--- a/Content.Server/Mobs/CritMobActionsSystem.cs
+++ b/Content.Server/Mobs/CritMobActionsSystem.cs
@@ -6,7 +6,7 @@ using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Robust.Server.Console;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Mobs;
 

diff --git a/Content.Server/Morgue/MorgueSystem.cs b/Content.Server/Morgue/MorgueSystem.cs
index b300336cd2ecb6de05a59ddc88deb5a167ccdb17..91fb0ab9f1f127f609d3f6f9b5b19145a30a572a 100644 (file)
--- a/Content.Server/Morgue/MorgueSystem.cs
+++ b/Content.Server/Morgue/MorgueSystem.cs
@@ -3,7 +3,7 @@ using Content.Shared.Body.Components;
 using Content.Shared.Examine;
 using Content.Shared.Morgue;
 using Content.Shared.Morgue.Components;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Morgue;
 

diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs
index 02dc4ceea6c0f2d688e0e00bf91627954deacd65..7d33133a37675b67d1396e506789c076d27ed850 100644 (file)
--- a/Content.Server/NPC/Systems/NPCSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSystem.cs
@@ -7,6 +7,7 @@ using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
+using Robust.Shared.Player;
 
 namespace Content.Server.NPC.Systems
 {

diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
index 875c328bcb950b46fa8540ea2df3bb916d53fb1c..e8e456c0eafbef88e559979300fcb436424561fd 100644 (file)
--- a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
@@ -9,7 +9,7 @@ using Content.Shared.Nutrition.AnimalHusbandry;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Storage;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 

diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs
index d3dac3edaacb423af5bc8689b697317918a3a81e..e9505b5e6fd2343a3f744ef9535d3155191a6607 100644 (file)
--- a/Content.Server/PAI/PAISystem.cs
+++ b/Content.Server/PAI/PAISystem.cs
@@ -6,9 +6,9 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.Mind.Components;
 using Content.Shared.PAI;
 using Content.Shared.Popups;
-using Robust.Server.GameObjects;
 using Robust.Shared.Random;
 using System.Text;
+using Robust.Shared.Player;
 
 namespace Content.Server.PAI;
 

diff --git a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorLimiterWireAction.cs b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorLimiterWireAction.cs
index 09700e2193ba3ae222f2360f6d3c30e60b5854c7..0cbd47c233a859eb15f822a19b3420c1df2bcbdf 100644 (file)
--- a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorLimiterWireAction.cs
+++ b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorLimiterWireAction.cs
@@ -5,7 +5,7 @@ using Content.Server.Wires;
 using Content.Shared.Popups;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Wires;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.ParticleAccelerator.Wires;
 

diff --git a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorStrengthWireAction.cs b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorStrengthWireAction.cs
index 857759067157dc18230d2b9488e6b391cc6e43cd..65fa76ee413d109ff3f096f69b21cd0d0d72cbef 100644 (file)
--- a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorStrengthWireAction.cs
+++ b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorStrengthWireAction.cs
@@ -3,8 +3,7 @@ using Content.Server.ParticleAccelerator.EntitySystems;
 using Content.Server.Wires;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Wires;
-using Robust.Server.GameObjects;
-using Robust.Shared.Random;
+using Robust.Shared.Player;
 
 namespace Content.Server.ParticleAccelerator.Wires;
 

diff --git a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorToggleWireAction.cs b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorToggleWireAction.cs
index 00c5845713b43f57786fd1db5747b452f873b1bc..c43403edd412b500beb240594d49ca9db9b8eda2 100644 (file)
--- a/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorToggleWireAction.cs
+++ b/Content.Server/ParticleAccelerator/Wires/ParticleAcceleratorToggleWireAction.cs
@@ -3,7 +3,7 @@ using Content.Server.ParticleAccelerator.EntitySystems;
 using Content.Server.Wires;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Wires;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.ParticleAccelerator.Wires;
 

diff --git a/Content.Server/Physics/Controllers/RandomWalkController.cs b/Content.Server/Physics/Controllers/RandomWalkController.cs
index dc5608887e95a6c7e80d13bbe3713a6f0612179e..4a93a9e706a12bcc4bcd346390fd96ee0ff6af18 100644 (file)
--- a/Content.Server/Physics/Controllers/RandomWalkController.cs
+++ b/Content.Server/Physics/Controllers/RandomWalkController.cs
@@ -4,6 +4,7 @@ using Content.Shared.Throwing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Controllers;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 

diff --git a/Content.Server/Pinpointer/StationMapSystem.cs b/Content.Server/Pinpointer/StationMapSystem.cs
index daf9df25ba8f452ed55cc9108beee9051f4b44b0..0460f08f13889bd80d180b6cf27f3ad537fe545d 100644 (file)
--- a/Content.Server/Pinpointer/StationMapSystem.cs
+++ b/Content.Server/Pinpointer/StationMapSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.PowerCell;
 using Content.Shared.Pinpointer;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Pinpointer;
 

diff --git a/Content.Server/Points/PointSystem.cs b/Content.Server/Points/PointSystem.cs
index 56831980d0f9b2bd2ce6ef9e02ab37f1eb426c2f..a71294db9d23aaf339fc3d1213d2a3adc0904afe 100644 (file)
--- a/Content.Server/Points/PointSystem.cs
+++ b/Content.Server/Points/PointSystem.cs
@@ -2,9 +2,9 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.Points;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Server.GameStates;
 using Robust.Server.Player;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Points;

diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
index 436149f076886f9a4292ed63ff1e48c459008ad1..adaad492dc21345bfbce7c2c578917d97f0e3de3 100644 (file)
--- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
+++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs
@@ -5,8 +5,8 @@ using Content.Shared.Inventory.Events;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
 using Content.Shared.Radio.EntitySystems;
-using Robust.Server.GameObjects;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 
 namespace Content.Server.Radio.EntitySystems;
 

diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
index 4f9099d0af70fe4280f92294d8137c6b84dcc1ef..fa00514e610c0a15dfbdd1153a9aa9c14ba760c6 100644 (file)
--- a/Content.Server/Radio/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -7,9 +7,9 @@ using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Radio;
 using Content.Shared.Radio.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Replays;
 using Robust.Shared.Utility;

diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
index b1ab1ac020b8bd062706708f8d3ecacc4feaa9f8..06d845b72c41c5ec5d6358eda84b0962b7beb271 100644 (file)
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -18,6 +18,7 @@ using Content.Shared.Silicons.Laws.Components;
 using Content.Shared.Stunnable;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
 

diff --git a/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs b/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs
index 815b0224c8a2a5e6466c02c13463af49ffb4b64f..4299bcda07379dc3ebc8d3253a6c3144844c517d 100644 (file)
--- a/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Database;
 using Content.Shared.Speech.Components;
 using Content.Shared.Speech.EntitySystems;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Speech.EntitySystems;
 

diff --git a/Content.Server/SprayPainter/SprayPainterSystem.cs b/Content.Server/SprayPainter/SprayPainterSystem.cs
index 1b44b7b0ba0e11dc5b26c89308b542510879bac1..763b7697d3443e09c8437edb9b3b51c76653bc98 100644 (file)
--- a/Content.Server/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Server/SprayPainter/SprayPainterSystem.cs
@@ -11,6 +11,7 @@ using Content.Shared.SprayPainter;
 using Content.Shared.Interaction;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.SprayPainter;
 

diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index 9600ea6c8fef57f193f6435a027e0391946d7aeb..0435a6bea60886a6c64c996bdba7fb2ccd178af5 100644 (file)
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -10,6 +10,7 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Store;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.Store.Systems;
 

diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index a8ddf1a986bdbe9a41cc0fb2fe9b215b8aa9c1b8..75374e7de502c2d692ae0651b69912cacdaecb21 100644 (file)
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -18,6 +18,7 @@ using Content.Shared.Strip;
 using Content.Shared.Strip.Components;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Strip

diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
index b4054a290dad9a34987d16d2703388aec3926ea7..f411001bd3a3dda79540ab3ce49aa3ae69b7bc2e 100644 (file)
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech;
 using Content.Server.Speech.Components;
-using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using static Content.Server.Chat.Systems.ChatSystem;
 
 namespace Content.Server.SurveillanceCamera;

diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
index 17eee198b8fb2119db003bd955ec4d68391ce7ed..7b1dff0b6bc9b6f4cd05146f7eadcfddab68ada1 100644 (file)
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
@@ -5,6 +5,7 @@ using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.SurveillanceCamera;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.SurveillanceCamera;
 

diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
index ae17ca4f8f868951604a5ee0e8f1aa399d86a669..ac417230267677fc033c62d1d70c6e0d93268ac0 100644 (file)
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs
@@ -1,14 +1,13 @@
-using Content.Server.Administration.Managers;
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Server.Ghost.Components;
 using Content.Server.Power.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.SurveillanceCamera;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.SurveillanceCamera;

diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index f159ec52d9bb27ade7f78375f46198e511ce26fe..410ba9f7540d89949a42723e85d465f85aa1822a 100644 (file)
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.DeviceNetwork;
 using Content.Shared.SurveillanceCamera;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.SurveillanceCamera;
@@ -58,7 +59,7 @@ public sealed class SurveillanceCameraSystem : EntitySystem
         SubscribeLocalEvent<SurveillanceCameraComponent, SurveillanceCameraSetupSetName>(OnSetName);
         SubscribeLocalEvent<SurveillanceCameraComponent, SurveillanceCameraSetupSetNetwork>(OnSetNetwork);
         SubscribeLocalEvent<SurveillanceCameraComponent, GetVerbsEvent<AlternativeVerb>>(AddVerbs);
-        
+
         SubscribeLocalEvent<SurveillanceCameraComponent, EmpPulseEvent>(OnEmpPulse);
         SubscribeLocalEvent<SurveillanceCameraComponent, EmpDisabledRemoved>(OnEmpDisabledRemoved);
     }

diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs
index b81331d62ee2c56132053f7cb49d4f47119e1fc7..4376ec4bc61d86e8698b4e768caabc8aaf71faff 100644 (file)
--- a/Content.Server/Tabletop/TabletopSystem.cs
+++ b/Content.Server/Tabletop/TabletopSystem.cs
@@ -11,6 +11,7 @@ using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Tabletop

diff --git a/Content.Server/UserInterface/IntrinsicUISystem.cs b/Content.Server/UserInterface/IntrinsicUISystem.cs
index 27b682cd41e642bd621034ccbf2876b47764aa42..fa725e524a0a449cdda26c9ce7e3ce74d503fde1 100644 (file)
--- a/Content.Server/UserInterface/IntrinsicUISystem.cs
+++ b/Content.Server/UserInterface/IntrinsicUISystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Actions;
 using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.UserInterface;
 

diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs
index fdd5f3a9f42d537c2a335185494c31aedc116c2c..1df66b608cdb25f2ba1bf88a680ac6eda9252eb2 100644 (file)
--- a/Content.Server/VoiceMask/VoiceMaskSystem.cs
+++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs
@@ -6,6 +6,7 @@ using Content.Shared.Inventory.Events;
 using Content.Shared.Preferences;
 using Content.Shared.VoiceMask;
 using Robust.Server.GameObjects;
+using Robust.Shared.Player;
 
 namespace Content.Server.VoiceMask;