fix

fospas · Jan 2, 2025 · 97a343e · 97a343e
1 parent 8a51d81
commit 97a343e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Content.Shared/_Cats/TurretControl/Components/TurretControllerComponent.cs b/Content.Shared/_Cats/TurretControl/Components/TurretControllerComponent.cs
@@ -1,4 +1,10 @@
+using Robust.Shared.Prototypes;
+
 namespace Content.Shared._Cats.TurretControl.Components;
 
 [RegisterComponent]
-public sealed partial class TurretControllerComponent : Component;
+public sealed partial class TurretControllerComponent : Component
+{
+    [DataField]
+    public ComponentRegistry RequiredComponents = [];
+}
diff --git a/Content.Shared/_Cats/TurretControl/TurretControlSystem.cs b/Content.Shared/_Cats/TurretControl/TurretControlSystem.cs
@@ -26,9 +26,13 @@ public override void Initialize()
 
     private void OnGetVerbs(Entity<TurretControllableComponent> entity, ref GetVerbsEvent<Verb> e)
     {
-        if (!HasComp<TurretControllerComponent>(e.User))
+        if (!TryComp<TurretControllerComponent>(e.User, out var controller))
             return;
 
+        foreach (var component in controller.RequiredComponents)
+            if (!HasComp(e.User, component.Value.Component.GetType()))
+                return;
+
         if (!TryComp<NpcFactionMemberComponent>(entity, out var factionMember))
             return;
 

diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -437,6 +437,8 @@
     speechVerb: Robotic
     speechSounds: Borg
   - type: TurretController # Cats-TurretControl
+    requiredComponents:
+    - type: StationAiHeld
   - type: Tag
     tags:
     - HideContextMenu