juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sentient items no longer count as party members (#1317)

Browse Source
This commit is contained in:
paige404
2025-05-26 06:29:33 -04:00
committed by GitHub
parent a1323c7b29
commit 100603ece6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/_CP14/DemiplaneTraveling/CP14DemiplaneTravelingSystem.cs
View File

@@ -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);
}