Move some admin components to shared (#41677)

* AdminSystem-move-to-shared

* review

diff --git a/Content.Client/Administration/Components/KillSignComponent.cs b/Content.Client/Administration/Components/KillSignComponent.cs
deleted file mode 100644 (file)
index 91c44ef..0000000
--- a/Content.Client/Administration/Components/KillSignComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Administration.Components;
-using Robust.Shared.GameStates;
-
-namespace Content.Client.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class KillSignComponent : SharedKillSignComponent;

diff --git a/Content.Client/Administration/Systems/BufferingSystem.cs b/Content.Client/Administration/Systems/BufferingSystem.cs
new file mode 100644 (file)
index 0000000..e511bbf
--- /dev/null
+++ b/Content.Client/Administration/Systems/BufferingSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Administration.Systems;
+
+namespace Content.Client.Administration.Systems;
+
+public sealed class BufferingSystem : SharedBufferingSystem
+{
+}

diff --git a/Content.Client/Administration/Systems/KillSignSystem.cs b/Content.Client/Administration/Systems/KillSignSystem.cs
index c12f65f1f0fd2b0243ad7dbc9521ce9779127d52..f15cfe64422e6acf31a0963c32d56ef19006d594 100644 (file)
--- a/Content.Client/Administration/Systems/KillSignSystem.cs
+++ b/Content.Client/Administration/Systems/KillSignSystem.cs
@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Client.Administration.Components;
+using Content.Shared.Administration.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.Utility;
 

diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index b5dc64443109848578ab65ee331148c5b8adfb13..f75c84837700d3a32f08788fd60c724d891a56fc 100644 (file)
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using YamlDotNet.RepresentationModel;
 using Content.Server.Administration.Systems;
 using Content.Server.GameTicking;
 using Content.Server.Maps;
@@ -11,20 +12,18 @@ using Content.Server.Spawners.Components;
 using Content.Server.Station.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Roles;
+using Content.Shared.Station.Components;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
+using Robust.Shared.EntitySerialization;
+using Robust.Shared.EntitySerialization.Systems;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Map.Events;
 using Robust.Shared.Prototypes;
-using Content.Shared.Station.Components;
-using Robust.Shared.EntitySerialization;
-using Robust.Shared.EntitySerialization.Systems;
-using Robust.Shared.IoC;
 using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
-using Robust.Shared.Map.Events;
-
 namespace Content.IntegrationTests.Tests
 {
     [TestFixture]

diff --git a/Content.Server/Administration/Components/AdminMinigunComponent.cs b/Content.Server/Administration/Components/AdminMinigunComponent.cs
deleted file mode 100644 (file)
index 368d3d3..0000000
--- a/Content.Server/Administration/Components/AdminMinigunComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class AdminMinigunComponent : Component
-{
-
-}

diff --git a/Content.Server/Administration/Components/KillSignComponent.cs b/Content.Server/Administration/Components/KillSignComponent.cs
deleted file mode 100644 (file)
index 11479c3..0000000
--- a/Content.Server/Administration/Components/KillSignComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Administration.Components;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class KillSignComponent : SharedKillSignComponent;

diff --git a/Content.Server/Administration/Components/SuperBonkComponent.cs b/Content.Server/Administration/Components/SuperBonkComponent.cs
index 0ceeccd136d8df511efd82a29af68e18724f1829..9c20c4d88a4cc7ae41303c2dbefa38680acfc46b 100644 (file)
--- a/Content.Server/Administration/Components/SuperBonkComponent.cs
+++ b/Content.Server/Administration/Components/SuperBonkComponent.cs
@@ -6,7 +6,8 @@ namespace Content.Server.Administration.Components;
 /// <summary>
 /// Component to track the timer for the SuperBonk smite.
 /// </summary>
-[RegisterComponent, AutoGenerateComponentPause, Access(typeof(SuperBonkSystem))]
+[RegisterComponent, AutoGenerateComponentPause]
+[Access(typeof(SuperBonkSystem))]
 public sealed partial class SuperBonkComponent : Component
 {
     /// <summary>

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 617451f955dd29022d46f51af123496b7b7d7fb1..b7f88e6c3c7d12a2c12324348ba8c856e1ed4da6 100644 (file)
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -1,4 +1,5 @@
-using Content.Server.Administration.Components;
+using System.Numerics;
+using System.Threading;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
 using Content.Server.Electrocution;
@@ -17,12 +18,14 @@ using Content.Server.Tabletop.Components;
 using Content.Shared.Actions;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Components;
+using Content.Shared.Administration.Systems;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clumsy;
 using Content.Shared.Cluwne;
+using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Electrocution;
@@ -54,9 +57,6 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Spawners;
 using Robust.Shared.Utility;
-using System.Numerics;
-using System.Threading;
-using Content.Shared.Damage.Components;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.Administration.Systems;

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index ef102cb38a6b59c87a05ec2e63c1643619e67243..bd214578eaeae935d00dd4698ce9be3c2d71ea01 100644 (file)
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -1,11 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Server.Administration.Components;
 using Content.Server.Cargo.Components;
 using Content.Server.Doors.Systems;
 using Content.Server.Hands.Systems;
-using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
 using Content.Server.Station.Systems;
@@ -14,10 +12,11 @@ using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Administration;
+using Content.Shared.Administration.Components;
+using Content.Shared.Administration.Systems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Construction.Components;
-using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
 using Content.Shared.Database;
 using Content.Shared.Doors.Components;

diff --git a/Content.Server/Administration/Systems/BufferingSystem.cs b/Content.Server/Administration/Systems/BufferingSystem.cs
index f3df34e7d2e0b3d9a3ac22908edf28830b3fc1c7..71e5c4d5c6fe4c7e00ef42ce4013f89d8ac56c1e 100644 (file)
--- a/Content.Server/Administration/Systems/BufferingSystem.cs
+++ b/Content.Server/Administration/Systems/BufferingSystem.cs
@@ -1,12 +1,13 @@
 using System.Numerics;
-using Content.Server.Administration.Components;
 using Content.Shared.Administration;
+using Content.Shared.Administration.Components;
+using Content.Shared.Administration.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 
 namespace Content.Server.Administration.Systems;
 
-public sealed class BufferingSystem : EntitySystem
+public sealed class BufferingSystem : SharedBufferingSystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
 

diff --git a/Content.Shared/Administration/Components/AdminMinigunComponent.cs b/Content.Shared/Administration/Components/AdminMinigunComponent.cs
new file mode 100644 (file)
index 0000000..04a7aac
--- /dev/null
+++ b/Content.Shared/Administration/Components/AdminMinigunComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Administration.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class AdminMinigunComponent : Component;

diff --git a/Content.Server/Administration/Components/BufferingComponent.cs b/Content.Shared/Administration/Components/BufferingComponent.cs
similarity index 67%
rename from Content.Server/Administration/Components/BufferingComponent.cs
rename to Content.Shared/Administration/Components/BufferingComponent.cs
index 1f80376596914f274497538e812ff192513d640f..3d365d00aa0fb219212386bd30fb2c64e61df6ba 100644 (file)
--- a/Content.Server/Administration/Components/BufferingComponent.cs
+++ b/Content.Shared/Administration/Components/BufferingComponent.cs
@@ -1,22 +1,29 @@
-using Content.Server.Administration.Systems;
+using Content.Shared.Administration.Systems;
 
-namespace Content.Server.Administration.Components;
+namespace Content.Shared.Administration.Components;
 
-[RegisterComponent, Access(typeof(BufferingSystem))]
+[RegisterComponent]
+[Access(typeof(SharedBufferingSystem))]
 public sealed partial class BufferingComponent : Component
 {
     [DataField("minBufferTime")]
     public float MinimumBufferTime = 0.5f;
+
     [DataField("maxBufferTime")]
     public float MaximumBufferTime = 1.5f;
+
     [DataField("minTimeTilNextBuffer")]
     public float MinimumTimeTilNextBuffer = 10.0f;
+
     [DataField("maxTimeTilNextBuffer")]
     public float MaximumTimeTilNextBuffer = 120.0f;
-    [DataField("timeTilNextBuffer")]
+
+    [DataField]
     public float TimeTilNextBuffer = 15.0f;
-    [DataField("bufferingIcon")]
+
+    [DataField]
     public EntityUid? BufferingIcon = null;
-    [DataField("bufferingTimer")]
+
+    [DataField]
     public float BufferingTimer = 0.0f;
 }

diff --git a/Content.Shared/Administration/Components/DisarmProneComponent.cs b/Content.Shared/Administration/Components/DisarmProneComponent.cs
index 4ba11df8e23c23c8168e73db301cbca546d45087..86addab4f64245c5dda499ae7c291eada73288ab 100644 (file)
--- a/Content.Shared/Administration/Components/DisarmProneComponent.cs
+++ b/Content.Shared/Administration/Components/DisarmProneComponent.cs
@@ -8,7 +8,4 @@ namespace Content.Shared.Administration.Components;
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 [Access(typeof(SharedMeleeWeaponSystem))]
-public sealed partial class DisarmProneComponent : Component
-{
-
-}
+public sealed partial class DisarmProneComponent : Component;

diff --git a/Content.Shared/Administration/Components/SharedHeadstandComponent.cs b/Content.Shared/Administration/Components/HeadstandComponent.cs
similarity index 100%
rename from Content.Shared/Administration/Components/SharedHeadstandComponent.cs
rename to Content.Shared/Administration/Components/HeadstandComponent.cs

diff --git a/Content.Shared/Administration/Components/KillSignComponent.cs b/Content.Shared/Administration/Components/KillSignComponent.cs
new file mode 100644 (file)
index 0000000..34c3675
--- /dev/null
+++ b/Content.Shared/Administration/Components/KillSignComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Administration.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class KillSignComponent : Component;

diff --git a/Content.Shared/Administration/Components/SharedKillSignComponent.cs b/Content.Shared/Administration/Components/SharedKillSignComponent.cs
deleted file mode 100644 (file)
index 9a95454..0000000
--- a/Content.Shared/Administration/Components/SharedKillSignComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Administration.Components;
-
-[NetworkedComponent]
-public abstract partial class SharedKillSignComponent : Component
-{
-
-}

diff --git a/Content.Server/Administration/Components/StationInfiniteBatteryTargetComponent.cs b/Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs
similarity index 55%
rename from Content.Server/Administration/Components/StationInfiniteBatteryTargetComponent.cs
rename to Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs
index 5543d5ed8c4d43a9b2e163c18bc508293abf916d..d26527a47276e27c7f3a5d0bfb05401d67e6b0de 100644 (file)
--- a/Content.Server/Administration/Components/StationInfiniteBatteryTargetComponent.cs
+++ b/Content.Shared/Administration/Components/StationInfiniteBatteryTargetComponent.cs
@@ -1,10 +1,9 @@
-namespace Content.Server.Administration.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Administration.Components;
 
 /// <summary>
 /// This is used for the admin map-wide/station-wide/grid-wide infinite power trick.
 /// </summary>
-[RegisterComponent]
-public sealed partial class StationInfiniteBatteryTargetComponent : Component
-{
-
-}
+[RegisterComponent, NetworkedComponent]
+public sealed partial class StationInfiniteBatteryTargetComponent : Component;

diff --git a/Content.Server/Administration/Systems/AdminGunSystem.cs b/Content.Shared/Administration/Systems/AdminGunSystem.cs
similarity index 80%
rename from Content.Server/Administration/Systems/AdminGunSystem.cs
rename to Content.Shared/Administration/Systems/AdminGunSystem.cs
index 6270481a3c320195798f733030b844ee2307c256..28ff1427098474fd4b0da2e642a154a34de0b27e 100644 (file)
--- a/Content.Server/Administration/Systems/AdminGunSystem.cs
+++ b/Content.Shared/Administration/Systems/AdminGunSystem.cs
@@ -1,7 +1,7 @@
-using Content.Server.Administration.Components;
+using Content.Shared.Administration.Components;
 using Content.Shared.Weapons.Ranged.Events;
 
-namespace Content.Server.Administration.Systems;
+namespace Content.Shared.Administration.Systems;
 
 public sealed class AdminGunSystem : EntitySystem
 {

diff --git a/Content.Shared/Administration/Systems/SharedBufferingSystem.cs b/Content.Shared/Administration/Systems/SharedBufferingSystem.cs
new file mode 100644 (file)
index 0000000..a1f375e
--- /dev/null
+++ b/Content.Shared/Administration/Systems/SharedBufferingSystem.cs
@@ -0,0 +1,5 @@
+namespace Content.Shared.Administration.Systems;
+
+public abstract class SharedBufferingSystem : EntitySystem
+{
+}