Cargo Sell - fix order of checks, no selling station pets. (new-front…

…iers-14#2354)

* Review sale precondition check order

* Frontier pets shouldn't be sold

* Push dead mob check above recursive chunk

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

@@ -10,6 +10,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 using Robust.Shared.Audio;
+using Content.Shared.Mind.Components; // Frontier
 
 namespace Content.Server.Cargo.Systems;
 
@@ -319,15 +320,14 @@ private void GetPalletGoods(EntityUid consoleUid, EntityUid gridUid, out HashSet
 
     private bool CanSell(EntityUid uid, TransformComponent xform)
     {
-        if (_mobQuery.HasComponent(uid))
-        {
-            if (_mobQuery.GetComponent(uid).CurrentState == MobState.Alive)
-            {
-                return false;
-            }
+        // Frontier: Look for blacklisted items and stop the selling of the container.
+        if (_blacklistQuery.HasComponent(uid))
+            return false;
 
-            return true;
-        }
+        // 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);
 
@@ -342,12 +342,6 @@ private bool CanSell(EntityUid uid, TransformComponent xform)
                 return false;
         }
 
-        // Look for blacklisted items and stop the selling of the container.
-        if (_blacklistQuery.HasComponent(uid))
-        {
-            return false;
-        }
-
         return true;
     }
 

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -825,6 +825,7 @@
     attributes:
       proper: true
       gender: male
+  - type: CargoSellBlacklist # Frontier
 
 - type: entity
   name: Tropico

Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml

@@ -40,6 +40,7 @@
       - Cat
       - PetsNT
   - type: ShowJobIcons
+  - type: CargoSellBlacklist
 
 - type: entity
   name: Clarpy
@@ -85,6 +86,7 @@
     factions:
       - Cat
       - PirateNF
+  - type: CargoSellBlacklist
 
 - type: entity
   name: Cappy
@@ -146,12 +148,13 @@
   - type: InteractionPopup
     interactSuccessSound:
       path: /Audio/_NF/Animals/nfsdcat_meow.ogg
+  - type: CargoSellBlacklist
 
 - type: entity
   name: Clugg
   parent: [NFMobPet, MobCatCaracalGhost]
   id: MobCatClugg
-  description: 
+  description:
   components:
   - type: Sprite
     drawdepth: Mobs
@@ -180,7 +183,7 @@
   name: Mistake
   parent: MobCatGhost
   id: MobCatMistake
-  description: ???
+  description: "???"
   components:
   - type: Sprite
     drawdepth: Mobs
@@ -256,4 +259,5 @@
       - enum.DamageStateVisualLayers.Base:
           kobold: YipYipColors
       - horns:
-          horns_curled: YipYipHornColors
+          horns_curled: YipYipHornColors
+  - type: CargoSellBlacklist