Merge pull request Simple-Station#268 from FoxxoTrystan/dark-portal-w…

…hitelist Dark Portal Etheral Fix
Mnemotechnician · Oct 20, 2024 · 9bdf9c2 · 9bdf9c2
2 parents 26e753b + 59cf36b
commit 9bdf9c2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Content.Server/Shadowkin/EtherealStunItemSystem.cs b/Content.Server/Shadowkin/EtherealStunItemSystem.cs
@@ -21,7 +21,8 @@ private void OnUseInHand(EntityUid uid, EtherealStunItemComponent component, Use
     {
         foreach (var ent in _lookup.GetEntitiesInRange(uid, component.Radius))
         {
-            if (!TryComp<EtherealComponent>(ent, out var ethereal))
+            if (!TryComp<EtherealComponent>(ent, out var ethereal)
+                || !ethereal.CanBeStunned)
                 continue;
 
             RemComp(ent, ethereal);

diff --git a/Content.Shared/Shadowkin/EtherealComponent.cs b/Content.Shared/Shadowkin/EtherealComponent.cs
@@ -23,6 +23,9 @@ public sealed partial class EtherealComponent : Component
     [DataField]
     public float DarkenRate = 0.084f;
 
+    [DataField]
+    public bool CanBeStunned = true;
+
     public List<EntityUid> DarkenedLights = new();
 
     public float DarkenAccumulator;

diff --git a/Resources/Prototypes/Floof/Entities/Structures/shadowkin.yml b/Resources/Prototypes/Floof/Entities/Structures/shadowkin.yml
@@ -75,6 +75,7 @@
     randomTeleport: false
   - type: DarkPortal
   - type: Ethereal
+    canBeStunned: false
 
 - type: entity
   name: Shadowkin Portal Spawner