Merge branch 'master' into ship-category-audit

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/Changelog/Frontier.yml

@@ -5001,3 +5001,15 @@ Entries:
       message: Added chem dispenser to Caduceus.
   id: 5464
   time: '2024-10-28T10:57:57.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added five new posters related to goblins.
+  id: 5465
+  time: '2024-10-31T04:34:56.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Tweak
+      message: 'Critical mobs can no longer be sold.  '
+  id: 5466
+  time: '2024-11-01T15:59:22.0000000+00:00'

Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml

@@ -98,6 +98,10 @@
       - NFPosterContrabandFsbLogo # Frontier
       - NFPosterContrabandFsbStasis # Frontier
       - NFPosterContrabandFsbApothecary # Frontier
+      - NFPosterContrabandEatShrooms # Frontier
+      - NFPosterContrabandKillerFashion # Frontier
+      - NFPosterContrabandGoblinFront # Frontier
+      - NFPosterContrabandGoblinate # Frontier
     chance: 1
 
 - type: entity
@@ -157,4 +161,5 @@
       - PosterLegitRenault
       - PosterLegitNTTGC
       - NFPosterLegitMagnusWatching # Frontier
+      - NFPosterLegitGoblinTinkerer # Frontier
     chance: 1

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

Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml

@@ -8,6 +8,16 @@
     sprite: _NF/Structures/Wallmounts/posters.rsi
     state: nf_poster1_legit
 
+- type: entity
+  parent: PosterBase
+  id: NFPosterLegitGoblinTinkerer
+  name: "Tinkering!"
+  description: "This poster depicts a cheerful goblin engineer telling you that explosions are the spice of tinkering."
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/posters.rsi
+    state: nf_poster2_legit
+
 - type: entity
   parent: PosterBase
   id: NFPosterContrabandLvhiStation
@@ -37,7 +47,7 @@
   - type: Sprite
     sprite: _NF/Structures/Wallmounts/posters.rsi
     state: nf_poster3_contraband
-    
+
 - type: entity
   parent: PosterBase
   id: NFPosterContrabandFsbLogo
@@ -47,7 +57,7 @@
   - type: Sprite
     sprite: _NF/Structures/Wallmounts/posters.rsi
     state: nf_poster4_contraband
-    
+
 - type: entity
   parent: PosterBase
   id: NFPosterContrabandFsbStasis
@@ -57,7 +67,7 @@
   - type: Sprite
     sprite: _NF/Structures/Wallmounts/posters.rsi
     state: nf_poster5_contraband
-    
+
 - type: entity
   parent: PosterBase
   id: NFPosterContrabandFsbApothecary
@@ -67,7 +77,7 @@
   - type: Sprite
     sprite: _NF/Structures/Wallmounts/posters.rsi
     state: nf_poster6_contraband
-      
+
 - type: entity
   parent: PosterBase
   id: NFPosterContrabandFsbSpirit
@@ -77,7 +87,7 @@
   - type: Sprite
     sprite: _NF/Structures/Wallmounts/posters.rsi
     state: nf_poster7_contraband
-            
+
 - type: entity
   parent: PosterBase
   id: NFPosterContrabandEmsCoords
@@ -87,3 +97,43 @@
   - type: Sprite
     sprite: _NF/Structures/Wallmounts/posters.rsi
     state: nf_poster8_contraband
+
+- type: entity
+  parent: PosterBase
+  id: NFPosterContrabandEatShrooms
+  name: "Eat Shrooms!"
+  description: "Eat Shrooms!"
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/posters.rsi
+    state: nf_poster12_contraband
+
+- type: entity
+  parent: PosterBase
+  id: NFPosterContrabandKillerFashion
+  name: "Da Burkin' Fashion"
+  description: "A printed copy of what appears to be a hand-drawn poster of a goblin in a tattered tunic with a spear."
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/posters.rsi
+    state: nf_poster13_contraband
+
+- type: entity
+  parent: PosterBase
+  id: NFPosterContrabandGoblinFront
+  name: "Goblinkin, Unite!"
+  description: "A poster rallying goblins to unite and fight for their rights."
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/posters.rsi
+    state: nf_poster14_contraband
+
+- type: entity
+  parent: PosterBase
+  id: NFPosterContrabandGoblinate
+  name: "Da Great Space Goblinate!"
+  description: "A poster calling to restore The Great Goblinate in all its former glory."
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/posters.rsi
+    state: nf_poster15_contraband

Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-4.0",
-    "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband by erhardsteinhauer (discord/github), nf_poster4,5,6,7_contraband by dustylens (discord/github) nf_poster8_contraband by incongruenciaastrologica (discord)",
+    "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster2_legit (Based on poster31 from cmss13 https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi), nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband, nt_poster12_contraband (inspired by poster11 from https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi and painting Rainbow Swirl by Saira Scott), nt_poster13_contraband (used poster1 as background from cmss13 https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi), nt_poster14_contraband (Resprited poster19 from cmss13 https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi), nt_poster15_contraband by erhardsteinhauer (discord/github), nf_poster4,5,6,7_contraband by dustylens (discord/github) nf_poster8_contraband by incongruenciaastrologica (discord)",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "nf_poster1_legit"
         },
+        {
+            "name": "nf_poster2_legit"
+        },
         {
             "name": "nf_poster1_contraband"
         },
@@ -33,6 +36,18 @@
         },
         {
             "name": "nf_poster8_contraband"
+        },
+        {
+            "name": "nf_poster12_contraband"
+        },
+        {
+            "name": "nf_poster13_contraband"
+        },
+        {
+            "name": "nf_poster14_contraband"
+        },
+        {
+            "name": "nf_poster15_contraband"
         }
     ]
 }