diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index dce8ea06f91..2270374fb86 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs @@ -323,6 +323,10 @@ private bool CanSell(EntityUid uid, TransformComponent xform) // Frontier: Look for blacklisted items and stop the selling of the container. if (_blacklistQuery.HasComponent(uid)) return false; + + // Frontier: allow selling dead mobs + if (_mobQuery.TryComp(uid, out var mob) && mob.CurrentState != MobState.Dead) + return false; // End Frontier var complete = IsBountyComplete(uid, out var bountyEntities); @@ -338,11 +342,6 @@ private bool CanSell(EntityUid uid, TransformComponent xform) return false; } - // Frontier: allow selling dead mobs - if (_mobQuery.TryComp(uid, out var mob)) - return mob.CurrentState == MobState.Dead; - // End Frontier - return true; }