Merge branch 'master' into 2024-09-21-CaveEvent

whatston3 · Sep 27, 2024 · a4289ad · a4289ad
2 parents d533819 + fc95ec3
commit a4289ad
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 1 deletion.
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -22,6 +22,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using Content.Server.Corvax.Respawn; // Frontier
+using Content.Shared.Traits.Assorted; // Frontier
 
 namespace Content.Server.GameTicking
 {
@@ -261,6 +262,12 @@ private void SpawnPlayer(ICommonSession player,
                 EntityManager.AddComponent<OwOAccentComponent>(mob);
             }
 
+            // Frontier - Remove Bing Legs
+            if (player.UserId == new Guid("{8a276323-a24c-4503-ba41-916463e02de8}"))
+            {
+                EntityManager.AddComponent<LegsParalyzedComponent>(mob);
+            }
+
             _stationJobs.TryAssignJob(station, jobPrototype, player.UserId);
 
             if (lateJoin)

diff --git a/Content.Shared/_EstacaoPirata/Cards/Stack/CardStackSystem.cs b/Content.Shared/_EstacaoPirata/Cards/Stack/CardStackSystem.cs
@@ -368,6 +368,9 @@ private void OnInteractUsing(InteractUsingEvent args)
         if (args.Handled)
             return;
 
+        if (args.Target == args.Used)
+            return;
+
         // This checks if the user is using an item with Stack component
         if (TryComp(args.Used, out CardStackComponent? usedStack))
         {
@@ -432,6 +435,10 @@ private void OnActivate(EntityUid uid, CardStackComponent component, ActivateInW
         {
             OnInteractHand(args.Target, component, args.User);
         }
+        else if (activeItem == args.Target)
+        {
+            return;
+        }
         else if (TryComp<CardStackComponent>(activeItem, out var cardStack))
         {
             TransferNLastCardFromStacks(args.User, 1, args.Target, component, activeItem.Value, cardStack);

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -7363,3 +7363,23 @@ Entries:
       message: updated Bazaar with directional fans, fuel locker and atmos update.
   id: 5321
   time: '2024-09-25T22:53:57.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Remove
+      message: Removed Bing Guss legs
+  id: 5322
+  time: '2024-09-26T22:11:13.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Using a hand or deck of cards in-hand currently does nothing.
+  id: 5323
+  time: '2024-09-26T22:47:52.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Add
+      message: >-
+        Contraband crates are now actually redeemable for doubloons at the
+        Pirate's Cove on the plunder exchange console.
+  id: 5324
+  time: '2024-09-26T22:48:33.0000000+00:00'
diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml
@@ -4912,7 +4912,7 @@ entities:
     - type: Transform
       pos: 4.5399175,2.4303112
       parent: 1
-- proto: ComputerBroken
+- proto: ComputerContrabandPalletConsolePirate
   entities:
   - uid: 686
     components:

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
@@ -108,6 +108,7 @@
   - type: Contraband
     turnInValues:
       FrontierUplinkCoin: 3
+      Doubloon: 2
   - type: DisableShipyardSale
     reason: shipyard-console-contraband-onboard
     allowedShipyardTypes:
@@ -144,6 +145,7 @@
   - type: Contraband
     turnInValues:
       FrontierUplinkCoin: 3
+      Doubloon: 2
   - type: DisableShipyardSale
     reason: shipyard-console-contraband-onboard
     allowedShipyardTypes:
@@ -180,6 +182,7 @@
   - type: Contraband
     turnInValues:
       FrontierUplinkCoin: 3
+      Doubloon: 2
   - type: DisableShipyardSale
     reason: shipyard-console-contraband-onboard
     allowedShipyardTypes: