diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/SignalControlledValveSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/SignalControlledValveSystem.cs index a114843750..f94785ac17 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/SignalControlledValveSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/SignalControlledValveSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Atmos.Piping.Binary.Components; -using Content.Server.DeviceLinking.Events; using Content.Server.DeviceLinking.Systems; +using Content.Shared.DeviceLinking.Events; namespace Content.Server.Atmos.Piping.Binary.EntitySystems; diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs index 93f7dcf111..e9f27a1958 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs @@ -2,14 +2,12 @@ using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.Monitor.Systems; using Content.Server.Atmos.Piping.Components; using Content.Server.Atmos.Piping.Unary.Components; -using Content.Server.DeviceLinking.Events; using Content.Server.DeviceLinking.Systems; using Content.Server.DeviceNetwork; using Content.Server.DeviceNetwork.Components; using Content.Server.DeviceNetwork.Systems; using Content.Server.NodeContainer.EntitySystems; using Content.Server.NodeContainer.Nodes; -using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Shared.Administration.Logs; using Content.Shared.Atmos; @@ -20,6 +18,7 @@ using Content.Shared.Atmos.Piping.Unary.Components; using Content.Shared.Atmos.Visuals; using Content.Shared.Audio; using Content.Shared.Database; +using Content.Shared.DeviceLinking.Events; using Content.Shared.DeviceNetwork; using Content.Shared.DoAfter; using Content.Shared.Examine; diff --git a/Content.Server/DeviceLinking/Components/Overload/SoundOnOverloadComponent.cs b/Content.Server/DeviceLinking/Components/Overload/SoundOnOverloadComponent.cs index b70ce950a1..2474f2500d 100644 --- a/Content.Server/DeviceLinking/Components/Overload/SoundOnOverloadComponent.cs +++ b/Content.Server/DeviceLinking/Components/Overload/SoundOnOverloadComponent.cs @@ -6,7 +6,7 @@ namespace Content.Server.DeviceLinking.Components.Overload; /// /// Plays a sound when a device link overloads. /// An overload happens when a device link sink is invoked to many times per tick -/// and it raises a +/// and it raises a /// [RegisterComponent] [Access(typeof(DeviceLinkOverloadSystem))] diff --git a/Content.Server/DeviceLinking/Components/Overload/SpawnOnOverloadComponent.cs b/Content.Server/DeviceLinking/Components/Overload/SpawnOnOverloadComponent.cs index 2ee24cf3d1..16df5c49f9 100644 --- a/Content.Server/DeviceLinking/Components/Overload/SpawnOnOverloadComponent.cs +++ b/Content.Server/DeviceLinking/Components/Overload/SpawnOnOverloadComponent.cs @@ -7,7 +7,7 @@ namespace Content.Server.DeviceLinking.Components.Overload; /// /// Spawns an entity when a device link overloads. /// An overload happens when a device link sink is invoked to many times per tick -/// and it raises a +/// and it raises a /// [RegisterComponent] [Access(typeof(DeviceLinkOverloadSystem))] diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs index 8ca6fd75c2..2ecbea195c 100644 --- a/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs +++ b/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs @@ -1,9 +1,7 @@ -using Content.Server.DeviceLinking.Components; -using Content.Server.DeviceLinking.Components.Overload; -using Content.Server.DeviceLinking.Events; +using Content.Server.DeviceLinking.Components.Overload; using Robust.Server.Audio; -using Robust.Server.GameObjects; using Robust.Shared.Audio; +using Content.Shared.DeviceLinking.Events; namespace Content.Server.DeviceLinking.Systems; diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs index f708237480..b895ec190e 100644 --- a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs +++ b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs @@ -1,5 +1,4 @@ using Content.Server.DeviceLinking.Components; -using Content.Server.DeviceLinking.Events; using Content.Server.DeviceNetwork; using Content.Server.DeviceNetwork.Components; using Content.Server.DeviceNetwork.Systems; diff --git a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs index fab9a306ae..145e2a7dfc 100644 --- a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs +++ b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs @@ -1,11 +1,10 @@ using Content.Server.DeviceLinking.Components; using Content.Server.DeviceNetwork; using Content.Server.Doors.Systems; -using Content.Shared.DeviceNetwork; +using Content.Shared.DeviceLinking.Events; using Content.Shared.Doors.Components; using Content.Shared.Doors; using JetBrains.Annotations; -using SignalReceivedEvent = Content.Server.DeviceLinking.Events.SignalReceivedEvent; namespace Content.Server.DeviceLinking.Systems { diff --git a/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs b/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs index 10c8a1700b..2bf71e4e94 100644 --- a/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs +++ b/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs @@ -1,6 +1,6 @@ using Content.Server.DeviceLinking.Components; using Content.Server.DeviceNetwork; -using SignalReceivedEvent = Content.Server.DeviceLinking.Events.SignalReceivedEvent; +using Content.Shared.DeviceLinking.Events; namespace Content.Server.DeviceLinking.Systems; diff --git a/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs b/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs index 538a191ab9..1f9d338c58 100644 --- a/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs +++ b/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs @@ -1,9 +1,7 @@ using Content.Server.DeviceLinking.Components; -using Content.Server.DeviceLinking.Events; +using Content.Shared.DeviceLinking.Events; using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Systems; -using Robust.Shared.Map; -using System.Numerics; namespace Content.Server.DeviceLinking.Systems; diff --git a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs index e6a5b37c27..eaab3c986f 100644 --- a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs +++ b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs @@ -1,13 +1,13 @@ using Content.Server.DeviceLinking.Components; using Content.Server.DeviceNetwork; using Content.Shared.DeviceLinking; +using Content.Shared.DeviceLinking.Events; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Popups; using Content.Shared.Timing; using Content.Shared.Tools.Systems; using Robust.Shared.Audio.Systems; -using SignalReceivedEvent = Content.Server.DeviceLinking.Events.SignalReceivedEvent; namespace Content.Server.DeviceLinking.Systems; diff --git a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs index 56a6f45c3b..dbae7790f9 100644 --- a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs +++ b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs @@ -1,7 +1,7 @@ using Content.Server.DeviceLinking.Components; -using Content.Server.DeviceLinking.Events; using Content.Server.DeviceNetwork; using Content.Shared.DeviceLinking; +using Content.Shared.DeviceLinking.Events; namespace Content.Server.DeviceLinking.Systems; diff --git a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs index b4ae1eb57a..a02e175065 100644 --- a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs +++ b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs @@ -1,7 +1,7 @@ using Content.Server.DeviceLinking.Components; -using Content.Server.DeviceLinking.Events; using Content.Shared.UserInterface; using Content.Shared.Access.Systems; +using Content.Shared.DeviceLinking.Events; using Content.Shared.MachineLinking; using Content.Shared.TextScreen; using Robust.Server.GameObjects; diff --git a/Content.Server/Disposal/Tube/Systems/DisposalSignalRouterSystem.cs b/Content.Server/Disposal/Tube/Systems/DisposalSignalRouterSystem.cs index 3a9fdbbf8d..f1fdedb522 100644 --- a/Content.Server/Disposal/Tube/Systems/DisposalSignalRouterSystem.cs +++ b/Content.Server/Disposal/Tube/Systems/DisposalSignalRouterSystem.cs @@ -1,7 +1,6 @@ -using Content.Server.DeviceLinking.Events; using Content.Server.DeviceLinking.Systems; -using Content.Server.Disposal.Tube; using Content.Server.Disposal.Tube.Components; +using Content.Shared.DeviceLinking.Events; namespace Content.Server.Disposal.Tube.Systems; diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs index b731626ff7..7dfdebf367 100644 --- a/Content.Server/Doors/Systems/AirlockSystem.cs +++ b/Content.Server/Doors/Systems/AirlockSystem.cs @@ -1,6 +1,6 @@ -using Content.Server.DeviceLinking.Events; using Content.Server.Power.Components; using Content.Server.Wires; +using Content.Shared.DeviceLinking.Events; using Content.Shared.Doors.Components; using Content.Shared.Doors.Systems; using Content.Shared.Interaction; diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs index ce4d201f28..99e8c97d53 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs @@ -1,6 +1,6 @@ -using Content.Server.DeviceLinking.Events; using Content.Server.DeviceLinking.Systems; using Content.Server.Explosion.Components; +using Content.Shared.DeviceLinking.Events; namespace Content.Server.Explosion.EntitySystems { diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 4f71cc4721..f0bd0c2127 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -2,7 +2,6 @@ using Content.Server.Administration.Logs; using Content.Server.Body.Systems; using Content.Server.Construction; using Content.Server.Explosion.EntitySystems; -using Content.Server.DeviceLinking.Events; using Content.Server.DeviceLinking.Systems; using Content.Server.Hands.Systems; using Content.Server.Kitchen.Components; @@ -17,6 +16,7 @@ using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reaction; using Content.Shared.Construction.EntitySystems; using Content.Shared.Database; +using Content.Shared.DeviceLinking.Events; using Content.Shared.Destructible; using Content.Shared.FixedPoint; using Content.Shared.Interaction; diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index bc4b80be97..53c60296d5 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -1,5 +1,3 @@ -using Content.Server.Administration.Logs; -using Content.Server.DeviceLinking.Events; using Content.Server.DeviceLinking.Systems; using Content.Server.DeviceNetwork; using Content.Server.DeviceNetwork.Systems; @@ -9,18 +7,14 @@ using Content.Server.Light.Components; using Content.Server.Power.Components; using Content.Shared.Audio; using Content.Shared.Damage; -using Content.Shared.Database; +using Content.Shared.DeviceLinking.Events; using Content.Shared.DoAfter; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; -using Content.Shared.Inventory; using Content.Shared.Light; using Content.Shared.Light.Components; -using Content.Shared.Popups; using Robust.Server.GameObjects; -using Robust.Shared.Audio; using Robust.Shared.Containers; -using Robust.Shared.Player; using Robust.Shared.Timing; using Robust.Shared.Audio.Systems; using Content.Shared.Damage.Systems; diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs index 494bc8c6f0..fa278278e2 100644 --- a/Content.Server/Physics/Controllers/ConveyorController.cs +++ b/Content.Server/Physics/Controllers/ConveyorController.cs @@ -1,7 +1,7 @@ -using Content.Server.DeviceLinking.Events; using Content.Server.DeviceLinking.Systems; using Content.Server.Materials; using Content.Shared.Conveyor; +using Content.Shared.DeviceLinking.Events; using Content.Shared.Destructible; using Content.Shared.Maps; using Content.Shared.Physics; diff --git a/Content.Server/Power/Generator/GeneratorSignalControlSystem.cs b/Content.Server/Power/Generator/GeneratorSignalControlSystem.cs index 4a42bcfffb..dfef20c4eb 100644 --- a/Content.Server/Power/Generator/GeneratorSignalControlSystem.cs +++ b/Content.Server/Power/Generator/GeneratorSignalControlSystem.cs @@ -1,5 +1,4 @@ -using System.ComponentModel; -using Content.Server.DeviceLinking.Events; +using Content.Shared.DeviceLinking.Events; using Content.Shared.Power.Generator; namespace Content.Server.Power.Generator; diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs index d3c5f8bb9c..b1efd8624c 100644 --- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs @@ -1,12 +1,12 @@ using System.Numerics; using System.Threading; using Content.Server.Administration.Logs; -using Content.Server.DeviceLinking.Events; using Content.Server.Power.Components; using Content.Server.Power.EntitySystems; using Content.Server.Projectiles; using Content.Server.Weapons.Ranged.Systems; using Content.Shared.Database; +using Content.Shared.DeviceLinking.Events; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.Lock; diff --git a/Content.Server/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs b/Content.Shared/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs similarity index 58% rename from Content.Server/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs rename to Content.Shared/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs index ef35603e88..0a1e4e046a 100644 --- a/Content.Server/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs +++ b/Content.Shared/DeviceLinking/Events/DeviceLinkOverloadedEvent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.DeviceLinking.Events; +namespace Content.Shared.DeviceLinking.Events; [ByRefEvent] public readonly record struct DeviceLinkOverloadedEvent; diff --git a/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs b/Content.Shared/DeviceLinking/Events/SignalReceivedEvent.cs similarity index 67% rename from Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs rename to Content.Shared/DeviceLinking/Events/SignalReceivedEvent.cs index c8c611103d..335a95cecc 100644 --- a/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs +++ b/Content.Shared/DeviceLinking/Events/SignalReceivedEvent.cs @@ -1,7 +1,6 @@ -using Content.Server.DeviceNetwork; using Content.Shared.DeviceNetwork; -namespace Content.Server.DeviceLinking.Events; +namespace Content.Shared.DeviceLinking.Events; [ByRefEvent] public readonly record struct SignalReceivedEvent(string Port, EntityUid? Trigger = null, NetworkPayload? Data = null);