diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index e19d88b1c2..87813e88b2 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -7,6 +7,7 @@ using Content.Server.Station.Systems; using Content.Shared.Body.Components; using Content.Shared.Buckle.Components; using Content.Shared.Doors.Components; +using Content.Shared.Ghost; using Content.Shared.Maps; using Content.Shared.Parallax; using Content.Shared.Shuttles.Components; @@ -77,6 +78,7 @@ public sealed partial class ShuttleSystem private EntityQuery _bodyQuery; private EntityQuery _buckleQuery; + private EntityQuery _ghostQuery; private EntityQuery _physicsQuery; private EntityQuery _statusQuery; private EntityQuery _xformQuery; @@ -85,6 +87,7 @@ public sealed partial class ShuttleSystem { _bodyQuery = GetEntityQuery(); _buckleQuery = GetEntityQuery(); + _ghostQuery = GetEntityQuery(); _physicsQuery = GetEntityQuery(); _statusQuery = GetEntityQuery(); _xformQuery = GetEntityQuery(); @@ -718,6 +721,11 @@ public sealed partial class ShuttleSystem continue; } + if (_ghostQuery.HasComponent(ent)) + { + continue; + } + if (_bodyQuery.TryGetComponent(ent, out var mob)) { var gibs = _bobby.GibBody(ent, body: mob);