Update: implemented blacklist and ensured live mobs are not sold (inc…

…luding you, the player)

Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

@@ -34,6 +34,7 @@
 using Content.Shared.Stacks;
 using Robust.Shared.Prototypes;
 using Content.Shared.Coordinates;
+using Content.Shared.Mobs;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -393,7 +394,8 @@ private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell, ou
                 // - anything anchored (e.g. light fixtures)
                 // - anything blacklisted (e.g. players).
                 if (toSell.Contains(ent) ||
-                    (xformQuery.TryGetComponent(ent, out var xform) && xform.Anchored))
+                    xformQuery.TryGetComponent(ent, out var xform) &&
+                    (xform.Anchored || !CanSell(ent, xform)))
                     continue;
 
                 if (blacklistQuery.HasComponent(ent))
@@ -408,6 +410,39 @@ private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell, ou
         }
     }
 
+    private bool CanSell(EntityUid uid, TransformComponent xform)
+    {
+        if (TryComp<MobStateComponent>(uid, out var mobstate))
+        {
+            if (mobstate.CurrentState == MobState.Alive)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        // Recursively check for mobs at any point.
+        var children = xform.ChildEnumerator;
+        var xformQuery = GetEntityQuery<TransformComponent>();
+        while (children.MoveNext(out var child))
+        {
+
+            if (xformQuery.TryGetComponent(child.Value, out var childXform) && !CanSell(child.Value,childXform))
+                return false;
+        }
+
+        var blacklistQuery = GetEntityQuery<CargoSellBlacklistComponent>();
+
+        // Look for blacklisted items and stop the selling of the container.
+        if (blacklistQuery.HasComponent(uid))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
     private void BuyHooks(EntityUid uid)
     {
         if (TryComp<MaterialComponent>(uid, out var material) && !HasComp<StackPriceComponent>(uid))

Content.Server/Cargo/Systems/CargoSystem.cs

@@ -6,6 +6,7 @@
 using Content.Shared.Containers.ItemSlots;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
+using Content.Shared.Mobs.Components;
 
 namespace Content.Server.Cargo.Systems;
 

Resources/Prototypes/Entities/Mobs/Player/observer.yml

@@ -56,3 +56,4 @@
     baseSprintSpeed: 8
     baseWalkSpeed: 5
   - type: MovementIgnoreGravity
+  - type: CargoSellBlacklist