From 100603ece6c064389827db37d8f492d681c99f97 Mon Sep 17 00:00:00 2001
From: paige404 <59348003+paige404@users.noreply.github.com>
Date: Mon, 26 May 2025 06:29:33 -0400
Subject: [PATCH] Sentient items no longer count as party members (#1317)

---
 .../_CP14/DemiplaneTraveling/CP14DemiplaneTravelingSystem.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Content.Server/_CP14/DemiplaneTraveling/CP14DemiplaneTravelingSystem.cs b/Content.Server/_CP14/DemiplaneTraveling/CP14DemiplaneTravelingSystem.cs
index 8f302bba7b..2361534bfd 100644
--- a/Content.Server/_CP14/DemiplaneTraveling/CP14DemiplaneTravelingSystem.cs
+++ b/Content.Server/_CP14/DemiplaneTraveling/CP14DemiplaneTravelingSystem.cs
@@ -7,6 +7,7 @@ using Content.Shared._CP14.Demiplane;
 using Content.Shared._CP14.Demiplane.Components;
 using Content.Shared._CP14.DemiplaneTraveling;
 using Content.Shared.Ghost;
+using Content.Shared.Item;
 using Content.Shared.Movement.Pulling.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
@@ -120,6 +121,10 @@ public sealed partial class CP14DemiplaneTravelingSystem : EntitySystem
                 if (!_interaction.InRangeUnobstructed(ent, uid))
                     continue;
 
+                // Talking swords are not party members, and should not be teleported separately from their wielders
+                if (HasComp<ItemComponent>(ent))
+                    continue;
+
                 teleportedEnts.Add(ent);
             }