From 16ad87368824e9c9f97711ce1e0e3e045c32430d Mon Sep 17 00:00:00 2001 From: wrexbe <81056464+wrexbe@users.noreply.github.com> Date: Thu, 12 May 2022 22:30:30 -0700 Subject: [PATCH] Move disarmed event (#8130) --- Content.Server/CombatMode/CombatModeSystem.cs | 6 ------ .../DisarmedEvent.cs} | 2 +- Content.Server/Hands/Systems/HandsSystem.cs | 14 +++++++------- .../Kitchen/Components/MicrowaveComponent.cs | 6 ------ .../CrematoriumEntityStorageComponent.cs | 8 +------- .../Recycling/Components/RecyclerComponent.cs | 8 -------- Content.Server/Stunnable/StunSystem.cs | 7 +------ Content.Server/Toilet/ToiletSystem.cs | 4 ---- 8 files changed, 10 insertions(+), 45 deletions(-) rename Content.Server/{Act/IDisarmedAct.cs => CombatMode/DisarmedEvent.cs} (93%) diff --git a/Content.Server/CombatMode/CombatModeSystem.cs b/Content.Server/CombatMode/CombatModeSystem.cs index 66e5acaffe..f10e6e6824 100644 --- a/Content.Server/CombatMode/CombatModeSystem.cs +++ b/Content.Server/CombatMode/CombatModeSystem.cs @@ -1,5 +1,3 @@ -using System.Diagnostics; -using Content.Server.Act; using Content.Server.Actions.Events; using Content.Server.Administration.Logs; using Content.Server.Hands.Components; @@ -11,10 +9,6 @@ using Content.Shared.CombatMode; using Content.Shared.Database; using JetBrains.Annotations; using Robust.Shared.Audio; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Localization; -using Robust.Shared.Maths; using Robust.Shared.Player; using Robust.Shared.Random; diff --git a/Content.Server/Act/IDisarmedAct.cs b/Content.Server/CombatMode/DisarmedEvent.cs similarity index 93% rename from Content.Server/Act/IDisarmedAct.cs rename to Content.Server/CombatMode/DisarmedEvent.cs index c63a36eda3..8d3e3fdc74 100644 --- a/Content.Server/Act/IDisarmedAct.cs +++ b/Content.Server/CombatMode/DisarmedEvent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Act +namespace Content.Server.CombatMode { public sealed class DisarmedEvent : HandledEntityEventArgs { diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs index faaffbbf33..c9aa1935ac 100644 --- a/Content.Server/Hands/Systems/HandsSystem.cs +++ b/Content.Server/Hands/Systems/HandsSystem.cs @@ -1,22 +1,26 @@ + using System.Linq; -using Content.Server.Act; using Content.Server.Administration.Logs; +using Content.Server.CombatMode; using Content.Server.Hands.Components; using Content.Server.Popups; +using Content.Server.Pulling; using Content.Server.Stack; using Content.Server.Storage.Components; using Content.Server.Storage.EntitySystems; using Content.Server.Strip; using Content.Server.Stunnable; using Content.Shared.ActionBlocker; -using Content.Shared.Database; using Content.Shared.Hands; using Content.Shared.Hands.Components; -using Content.Shared.Stunnable; +using Content.Shared.Hands.EntitySystems; using Content.Shared.Input; using Content.Shared.Inventory; using Content.Shared.Physics.Pull; using Content.Shared.Popups; +using Content.Shared.Pulling.Components; +using Content.Shared.Stunnable; +using Content.Shared.Throwing; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Server.Player; @@ -27,10 +31,6 @@ using Robust.Shared.Map; using Robust.Shared.Player; using Robust.Shared.Players; using Robust.Shared.Utility; -using Content.Shared.Pulling.Components; -using Content.Server.Pulling; -using Content.Shared.Hands.EntitySystems; -using Content.Shared.Throwing; namespace Content.Server.Hands.Systems { diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index 38bb42950c..ed84f8269c 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -1,19 +1,13 @@ using System.Linq; -using Content.Server.Act; -using Content.Server.Chat.Managers; using Content.Server.Chemistry.Components.SolutionManager; using Content.Server.Chemistry.EntitySystems; -using Content.Server.Popups; using Content.Server.Power.Components; using Content.Server.Temperature.Components; using Content.Server.Temperature.Systems; using Content.Server.UserInterface; -using Content.Shared.Body.Components; -using Content.Shared.Body.Part; using Content.Shared.FixedPoint; using Content.Shared.Kitchen; using Content.Shared.Kitchen.Components; -using Content.Shared.Popups; using Content.Shared.Power; using Content.Shared.Sound; using Content.Shared.Tag; diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs index 7d601d5df9..d638fc60de 100644 --- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs @@ -1,16 +1,10 @@ + using System.Threading; -using Content.Server.Act; -using Content.Server.Chat.Managers; -using Content.Server.GameTicking; -using Content.Server.Players; -using Content.Server.Popups; using Content.Server.Storage.Components; using Content.Shared.Interaction; using Content.Shared.Morgue; using Content.Shared.Popups; using Content.Shared.Sound; -using Content.Shared.Standing; -using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Player; diff --git a/Content.Server/Recycling/Components/RecyclerComponent.cs b/Content.Server/Recycling/Components/RecyclerComponent.cs index 94f506995c..da389e513f 100644 --- a/Content.Server/Recycling/Components/RecyclerComponent.cs +++ b/Content.Server/Recycling/Components/RecyclerComponent.cs @@ -1,13 +1,5 @@ -using Content.Server.Act; -using Content.Server.Chat.Managers; -using Content.Server.GameTicking; -using Content.Server.Players; -using Content.Server.Popups; -using Content.Shared.Body.Components; -using Content.Shared.Popups; using Content.Shared.Recycling; using Content.Shared.Sound; -using Robust.Server.GameObjects; namespace Content.Server.Recycling.Components { diff --git a/Content.Server/Stunnable/StunSystem.cs b/Content.Server/Stunnable/StunSystem.cs index 8a5e22bcc2..117238ecc7 100644 --- a/Content.Server/Stunnable/StunSystem.cs +++ b/Content.Server/Stunnable/StunSystem.cs @@ -1,17 +1,12 @@ -using System; -using Content.Server.Act; using Content.Server.Administration.Logs; +using Content.Server.CombatMode; using Content.Server.Popups; -using Content.Shared.Administration.Logs; using Content.Shared.Audio; using Content.Shared.Database; using Content.Shared.Popups; using Content.Shared.StatusEffect; using Content.Shared.Stunnable; using Robust.Shared.Audio; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Localization; using Robust.Shared.Player; using Robust.Shared.Random; diff --git a/Content.Server/Toilet/ToiletSystem.cs b/Content.Server/Toilet/ToiletSystem.cs index 5ece6dc126..5860bbc24b 100644 --- a/Content.Server/Toilet/ToiletSystem.cs +++ b/Content.Server/Toilet/ToiletSystem.cs @@ -1,4 +1,3 @@ -using Content.Server.Act; using Content.Server.Buckle.Components; using Content.Server.Popups; using Content.Server.Storage.Components; @@ -13,9 +12,6 @@ using Content.Shared.Interaction.Events; using Content.Shared.Toilet; using Content.Shared.Tools.Components; using Robust.Shared.Audio; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Localization; using Robust.Shared.Player; using Robust.Shared.Random;