Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-Pick PR #26312: Fix Puller Being Improperly Unset When Pulling Stops. #532

Merged
merged 1 commit into from
Jul 10, 2024

Conversation

VMSolidus
Copy link
Member

Mirror of PR #26312: Fix puller being improperly unset when pulling stops. from space-wizards space-wizards/space-station-14

a6c018d755ee4f35fb8e3ab597fa90c7592fe920

PR opened by nikthechampiongr at 2024-03-21 15:07:50 UTC


PR changed 1 files with 8 additions and 6 deletions.

The PR had the following labels:


Original Body

fixes #26310

About the PR

This pr fixes the bug with people being unable to move while in cuffs if they were previously pulled even if they were no longer being pulled.

Why / Balance

A security cadet should not be able to merge my legs with the ground by simply touching me while I'm in cuffs.

Technical details

When unpulled, the pullableComp has its puller field set to null after the message signifying the pulling has stopped has been sent. Since the component has a field to determine whether its owner is being pulled which is determined by the puller field, systems listening on the event would think that the owner of the component was still being pulled.

As a result, when the message was fired and the SharedCuffableSystem checked whether it should allow the cuffed person to move it thought they were still being pulled and as such didn't allow them to move.

I spent some time trying to determine whether setting the puller to null earlier would have other negative effects, however to my understanding of the code and the systems that listen to the message I believe this is now the correct behavior. Still just in case @metalgearsloth please check this out thanks.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑

  • fix: You can now move again if you stop being pulled while in cuffs.

Fix puller not being improperly unset on PullableComponent while being unpulled.

When unpulled, the pullableComp has its puller field set to null after the message signifying the pulling has stopped
has been sent. Since the component has a field to determine whether its owner is being pulled which is determined by
the puller field, systems listening on the event would think that the owner of the component was still being pulled.
@github-actions github-actions bot added the Changes: C# Changes any cs files label Jul 10, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 1258961 into Simple-Station:master Jul 10, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants