From 1b9d28716cf6fc538747b96efbf71dd86611a155 Mon Sep 17 00:00:00 2001 From: fox Date: Wed, 4 Dec 2024 14:59:23 +0300 Subject: [PATCH 1/4] Various fixes and tweaks --- Content.Client/Jittering/JitteringSystem.cs | 3 ++- Content.Server/Carrying/CarryingSystem.cs | 15 +++++++++++---- .../Floof => Floof/Language}/scugsign.yml | 0 3 files changed, 13 insertions(+), 5 deletions(-) rename Resources/Prototypes/{Language/Floof => Floof/Language}/scugsign.yml (100%) diff --git a/Content.Client/Jittering/JitteringSystem.cs b/Content.Client/Jittering/JitteringSystem.cs index 185bd490d3b..e143f50d484 100644 --- a/Content.Client/Jittering/JitteringSystem.cs +++ b/Content.Client/Jittering/JitteringSystem.cs @@ -45,7 +45,8 @@ private void OnShutdown(EntityUid uid, JitteringComponent jittering, ComponentSh private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, AnimationCompletedEvent args) { - if(args.Key != _jitterAnimationKey) + // FLoofstation - avoid restarting the jittering animation on entites that already stopped jittering + if(args.Key != _jitterAnimationKey || jittering.LifeStage >= ComponentLifeStage.Stopping) return; if (TryComp(uid, out AnimationPlayerComponent? animationPlayer) diff --git a/Content.Server/Carrying/CarryingSystem.cs b/Content.Server/Carrying/CarryingSystem.cs index 857c3861a74..ed5bb36ea5b 100644 --- a/Content.Server/Carrying/CarryingSystem.cs +++ b/Content.Server/Carrying/CarryingSystem.cs @@ -162,11 +162,17 @@ private void OnMobStateChanged(EntityUid uid, CarryingComponent component, MobSt /// private void OnInteractionAttempt(EntityUid uid, BeingCarriedComponent component, InteractionAttemptEvent args) { - if (args.Target == null) + // Floofstation - function body reviewed + Predicate isChildOfCarrier = null!; // C# doesn't have local functions eugh + isChildOfCarrier = (childXForm) => childXForm.ParentUid == component.Carrier + || (childXForm.ParentUid is {Valid: true} parent && isChildOfCarrier(Transform(parent))); + + if (args.Target == null // Allow self-interacts + || isChildOfCarrier(Transform(args.Target.Value))) // Allow interacting with everything on the carriee return; + // Also check if the interacted-with entity is on the carrier and cancel the event if not var targetParent = Transform(args.Target.Value).ParentUid; - if (args.Target.Value != component.Carrier && targetParent != component.Carrier && targetParent != uid) args.Cancel(); } @@ -201,8 +207,9 @@ private void OnStandAttempt(EntityUid uid, BeingCarriedComponent component, Stan private void OnInteractedWith(EntityUid uid, BeingCarriedComponent component, GettingInteractedWithAttemptEvent args) { - if (args.Uid != component.Carrier) - args.Cancel(); + // Floofstation - why. + // if (args.Uid != component.Carrier) + // args.Cancel(); } private void OnPullAttempt(EntityUid uid, BeingCarriedComponent component, PullAttemptEvent args) diff --git a/Resources/Prototypes/Language/Floof/scugsign.yml b/Resources/Prototypes/Floof/Language/scugsign.yml similarity index 100% rename from Resources/Prototypes/Language/Floof/scugsign.yml rename to Resources/Prototypes/Floof/Language/scugsign.yml From 3363b226703cfb29f8b45c39d574fe77343a039d Mon Sep 17 00:00:00 2001 From: Fansana <116083121+Fansana@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:45:16 +0100 Subject: [PATCH 2/4] Update publish-testing.yml --- .github/workflows/publish-testing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-testing.yml b/.github/workflows/publish-testing.yml index dcbc74a3dd6..44ef248fc08 100644 --- a/.github/workflows/publish-testing.yml +++ b/.github/workflows/publish-testing.yml @@ -4,9 +4,9 @@ concurrency: group: publish on: - workflow_dispatch: - schedule: - - cron: '0 6 * * *' + push: + branches: + - master jobs: build: From 8390f729c7480f1cc2d3169892fb28fb18799f08 Mon Sep 17 00:00:00 2001 From: Fansana <116083121+Fansana@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:45:49 +0100 Subject: [PATCH 3/4] Update publish-stable.yml --- .github/workflows/publish-stable.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-stable.yml b/.github/workflows/publish-stable.yml index 18ce423a461..d1857697a18 100644 --- a/.github/workflows/publish-stable.yml +++ b/.github/workflows/publish-stable.yml @@ -2,9 +2,11 @@ name: Publish stable concurrency: group: publish - on: - workflow_dispatch: + push: + branches: + - stable # or the branch where merge requests are being merged into (e.g., 'master') + jobs: build: From 3fcbf6baee33a81e63363b1e12c9ff500c393075 Mon Sep 17 00:00:00 2001 From: FloofStation Changelogs <175611579+Floof-Station-Bot@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:34:20 +0000 Subject: [PATCH 4/4] Automatic Changelog Update (#393) --- Resources/Changelog/Floof.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml index e0ef04a8289..1dadfd07d62 100644 --- a/Resources/Changelog/Floof.yml +++ b/Resources/Changelog/Floof.yml @@ -1695,3 +1695,15 @@ Entries: id: 223 time: '2024-12-03T16:25:05.0000000+00:00' url: https://github.com/Fansana/floofstation1/pull/392 +- author: Mnemotechnician + changes: + - type: Tweak + message: >- + You can now interact with carried entities, and carried entities + themselves can freely interact with items inside their + bags/clothing/etc. + - type: Fix + message: Jittering should no longer leave your character visually off-set. + id: 224 + time: '2024-12-05T16:33:52.0000000+00:00' + url: https://github.com/Fansana/floofstation1/pull/393