diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index 86103861511..5a8cbb37e58 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs @@ -287,9 +287,16 @@ private bool CanSell(EntityUid uid, TransformComponent xform) { if (_mobQuery.HasComponent(uid)) { - return false; + if (_mobQuery.GetComponent(uid).CurrentState == MobState.Alive) + { + return false; + } + + return true; } + + // Recursively check for mobs at any point. var children = xform.ChildEnumerator; while (children.MoveNext(out var child))