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(ent)) + continue; + teleportedEnts.Add(ent); }