From a37455c2f5c3cedc25418f5850fd3b08a6008cc5 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 27 Sep 2024 01:11:12 +0300 Subject: [PATCH 1/6] Update GameTicker.Spawning.cs (#1966) --- Content.Server/GameTicking/GameTicker.Spawning.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index e3c41a5e8a4..02458b64178 100644 --- 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(mob); } + // Frontier - Remove Bing Legs + if (player.UserId == new Guid("{8a276323-a24c-4503-ba41-916463e02de8}")) + { + EntityManager.AddComponent(mob); + } + _stationJobs.TryAssignJob(station, jobPrototype, player.UserId); if (lateJoin) From 1c138acca06cd5835399f732c278bacb0e70ba85 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 26 Sep 2024 22:11:42 +0000 Subject: [PATCH 2/6] Automatic Changelog (#1966) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bc0e7df2514..179af50c160 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -7363,3 +7363,9 @@ 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' From a0304fe36e829f7791821d02f3ffc22246a667da Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Thu, 26 Sep 2024 18:47:51 -0400 Subject: [PATCH 3/6] No in-hand draw into the same hand (#2038) --- .../_EstacaoPirata/Cards/Stack/CardStackSystem.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Content.Shared/_EstacaoPirata/Cards/Stack/CardStackSystem.cs b/Content.Shared/_EstacaoPirata/Cards/Stack/CardStackSystem.cs index 8317c3cef92..8901dbe574a 100644 --- 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(activeItem, out var cardStack)) { TransferNLastCardFromStacks(args.User, 1, args.Target, component, activeItem.Value, cardStack); From c2b7fb2ce79f60d9fb80f2d389f88fa32eae78c6 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 26 Sep 2024 22:48:20 +0000 Subject: [PATCH 4/6] Automatic Changelog (#2038) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 179af50c160..00eba1399b6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -7369,3 +7369,9 @@ Entries: 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' From fa4dd0f0597fc4582a33afd404fa3387ddfc870c Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Thu, 26 Sep 2024 18:48:32 -0400 Subject: [PATCH 5/6] Pirate contraband turn-in (#2078) --- Resources/Maps/_NF/POI/cove.yml | 2 +- .../_NF/Entities/Structures/Storage/Crates/crates.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml index d7325a329a8..3dae1b23b29 100644 --- 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 index 4aba170ffe7..8a24285c3fa 100644 --- 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: From fc95ec36a34e0a8b5a5957d47e3aecd907f08bba Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 26 Sep 2024 22:49:02 +0000 Subject: [PATCH 6/6] Automatic Changelog (#2078) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 00eba1399b6..0c8fe623e5e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -7375,3 +7375,11 @@ Entries: 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'