From b2fd370bc78f6e2ce42d60f73ded9283624e8a1b Mon Sep 17 00:00:00 2001
From: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Date: Wed, 13 Sep 2023 23:51:10 -0400
Subject: [PATCH] Guardians (Holo and holoclown) have syndicate faction ai
 (#19816)

---
 Content.Server/Guardian/GuardianSystem.cs            | 11 -----------
 .../Prototypes/Entities/Mobs/Player/guardian.yml     | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index 4283869a25..f34b765ac7 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -300,11 +300,6 @@ namespace Content.Server.Guardian
                 RetractGuardian(hostUid, hostComponent, guardianUid, guardianComponent);
         }
 
-        private bool CanRelease(EntityUid guardian)
-        {
-            return HasComp<ActorComponent>(guardian);
-        }
-
         private void ReleaseGuardian(EntityUid host, GuardianHostComponent hostComponent, EntityUid guardian, GuardianComponent guardianComponent)
         {
             if (guardianComponent.GuardianLoose)
@@ -313,12 +308,6 @@ namespace Content.Server.Guardian
                 return;
             }
 
-            if (!CanRelease(guardian))
-            {
-                _popupSystem.PopupEntity(Loc.GetString("guardian-no-soul"), host, host);
-                return;
-            }
-
             DebugTools.Assert(hostComponent.GuardianContainer.Contains(guardian));
             hostComponent.GuardianContainer.Remove(guardian);
             DebugTools.Assert(!hostComponent.GuardianContainer.Contains(guardian));
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 9be87dfe96..a6c65c8f05 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -130,6 +130,12 @@
           map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
           color: "#40a7d7"
           shader: unshaded
+    - type: NpcFactionMember
+      factions: 
+        - Syndicate
+    - type: HTN
+      rootTask:
+        task: SimpleHumanoidHostileCompound
 
 # From Wizard deck of cards
 - type: entity
@@ -232,6 +238,12 @@
     - type: RandomMetadata
       nameSegments:
       - names_clown
+    - type: NpcFactionMember
+      factions: 
+        - Syndicate
+    - type: HTN
+      rootTask:
+        task: SimpleHumanoidHostileCompound
 
 - type: entity
   id: ActionToggleGuardian