Done

Content.Shared/_CorvaxNext/TurretControl/Components/TurretControllableComponent.cs

@@ -0,0 +1,4 @@
+namespace Content.Shared._CorvaxNext.TurretControl.Components;
+
+[RegisterComponent]
+public sealed partial class TurretControllableComponent : Component;

Content.Shared/_CorvaxNext/TurretControl/Components/TurretControllerComponent.cs

@@ -0,0 +1,4 @@
+namespace Content.Shared._CorvaxNext.TurretControl.Components;
+
+[RegisterComponent]
+public sealed partial class TurretControllerComponent : Component;

Content.Shared/_CorvaxNext/TurretControl/TurretControlSystem.cs

@@ -1,18 +1,14 @@
+using Content.Shared._CorvaxNext.TurretControl.Components;
 using Content.Shared.NPC.Components;
 using Content.Shared.NPC.Prototypes;
 using Content.Shared.NPC.Systems;
-using Content.Shared.Tag;
 using Content.Shared.Verbs;
 
 namespace Content.Shared._CorvaxNext.TurretControl;
 
 public sealed class TurretControlSystem : EntitySystem
 {
     [Dependency] private readonly NpcFactionSystem _faction = default!;
-    [Dependency] private readonly TagSystem _tag = default!;
-
-    [ValidatePrototypeId<TagPrototype>]
-    private const string ControlTag = "StationAi";
 
     [ValidatePrototypeId<NpcFactionPrototype>]
     private const string Passive = "TurretPassive";
@@ -25,12 +21,12 @@ public sealed class TurretControlSystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<TurretControlComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
+        SubscribeLocalEvent<TurretControllableComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
     }
 
-    private void OnGetVerbs(Entity<TurretControlComponent> entity, ref GetVerbsEvent<Verb> e)
+    private void OnGetVerbs(Entity<TurretControllableComponent> entity, ref GetVerbsEvent<Verb> e)
     {
-        if (!_tag.HasTag(e.User, ControlTag))
+        if (!HasComp<TurretControllerComponent>(e.User))
             return;
 
         if (!TryComp<NpcFactionMemberComponent>(entity, out var factionMember))

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -98,6 +98,7 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 30
   # Corvax-End
+  - type: TurretController # Corvax-Next-TurretControl
 
 - type: entity
   id: ActionAGhostShowSolar

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -438,6 +438,7 @@
   - type: Speech
     speechVerb: Robotic
     speechSounds: Borg
+  - type: TurretController # Corvax-Next-TurretControl
   - type: Tag
     tags:
     - HideContextMenu

Resources/Prototypes/_CorvaxNext/Entities/Objects/Weapons/Guns/turrets.yml

@@ -6,4 +6,4 @@
   - type: NpcFactionMember
     factions:
     - TurretPeace
-  - type: TurretControl
+  - type: TurretControllable