From 64dd3b08603e262d83b0f63e27cbdac055c17984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= Date: Sat, 13 Jun 2020 16:10:26 +0200 Subject: [PATCH] Moves SharedInteractionSystem to Content.Shared namespace --- Content.Client/State/GameScreenBase.cs | 2 +- Content.Server/GameObjects/Components/WiresComponent.cs | 1 + .../GameObjects/EntitySystems/Click/InteractionSystem.cs | 1 + Content.Server/GameObjects/EntitySystems/HandsSystem.cs | 1 + Content.Server/Utility/InteractionChecks.cs | 1 + .../GameObjects/EntitySystems/ExamineSystemShared.cs | 1 - .../GameObjects/EntitySystems/SharedInteractionSystem.cs | 3 +-- 7 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Content.Client/State/GameScreenBase.cs b/Content.Client/State/GameScreenBase.cs index edf6bb6ebf..745c0ec999 100644 --- a/Content.Client/State/GameScreenBase.cs +++ b/Content.Client/State/GameScreenBase.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using Content.Client.GameObjects.Components; -using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects; +using Content.Shared.GameObjects.EntitySystems; using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Interfaces.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; diff --git a/Content.Server/GameObjects/Components/WiresComponent.cs b/Content.Server/GameObjects/Components/WiresComponent.cs index 312dcc3c87..60d0dd0dc0 100644 --- a/Content.Server/GameObjects/Components/WiresComponent.cs +++ b/Content.Server/GameObjects/Components/WiresComponent.cs @@ -8,6 +8,7 @@ using Content.Server.Interfaces; using Content.Server.Interfaces.GameObjects; using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components.Interactable; +using Content.Shared.GameObjects.EntitySystems; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index 1252e24b9d..40c1cb24c2 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -5,6 +5,7 @@ using Content.Server.GameObjects.Components.Timing; using Content.Server.Interfaces.GameObjects; using Content.Server.Utility; using Content.Shared.GameObjects.Components.Inventory; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Input; using JetBrains.Annotations; using Robust.Server.GameObjects.EntitySystems; diff --git a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs index 578a94cb84..0c4cc5d9d7 100644 --- a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/HandsSystem.cs @@ -20,6 +20,7 @@ using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Players; using System; +using Content.Shared.GameObjects.EntitySystems; namespace Content.Server.GameObjects.EntitySystems { diff --git a/Content.Server/Utility/InteractionChecks.cs b/Content.Server/Utility/InteractionChecks.cs index 3588c61944..17fdf6f54b 100644 --- a/Content.Server/Utility/InteractionChecks.cs +++ b/Content.Server/Utility/InteractionChecks.cs @@ -1,5 +1,6 @@ using System; using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Content.Shared.Physics; using Robust.Shared.GameObjects.Systems; diff --git a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs b/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs index fb24f9c6c7..80f4c88e7c 100644 --- a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs +++ b/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs @@ -1,4 +1,3 @@ -using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Mobs; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; diff --git a/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs index 158f0e5ff6..872cddbc5f 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs @@ -4,13 +4,12 @@ using Content.Shared.Physics; using JetBrains.Annotations; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Physics; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; -namespace Content.Server.GameObjects.EntitySystems +namespace Content.Shared.GameObjects.EntitySystems { /// /// Governs interactions during clicking on entities