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.

Sign up for GitHub

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

Jump to bottom

Failed to cherry-pick PR #26434: Minor cleanup of cuffablesystem #453

Closed
SimpleStation14 opened this issue Jun 11, 2024 · 0 comments · May be fixed by #904
Closed

Failed to cherry-pick PR #26434: Minor cleanup of cuffablesystem #453

SimpleStation14 opened this issue Jun 11, 2024 · 0 comments · May be fixed by #904
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot Status: Derelict Has not been active for a while

Comments

@SimpleStation14
Copy link
Member

Failed to cherry-pick PR: Git error: 1 uncommitted change would be overwritten by merge; class=Merge (22); code=Conflict (-13)

PR body below

Mirror of PR #26434: Minor cleanup of cuffablesystem from space-wizards space-wizards/space-station-14

4630e94c661f7af35610e24b7bd337bc30ef9fd5

PR opened by nikthechampiongr at 2024-03-25 20:07:32 UTC - merged at 2024-03-26 19:15:08 UTC

PR changed 2 files with 61 additions and 54 deletions.

The PR had the following labels:

Original Body

fixes #26331

About the PR

When cuffs stop being pulled they no longer try to uncuff themselves.

Did some todos on the cuffable system and removed some dead stuff.

Technical details

The bool Used is in the Handcuff component now so we can check whether a cuff is actually being used to cuff someone. We have to do this because the VirtualItemDeletedEvent does not allow us to distinguish between the virtual item being deleted by pulling, or anything else(E.g. rejuvenate).

For self uncuffing, in order to have a proper CanInteract check the cuff's own component has its CanStillInteract bool set to true for the duration of the check so the cuffablesystem does not block itself instead of doing a partial check.

Removed some unused dependencies and use statements.

Made popups predicted, I would make the handling of makeshift cuffs being broken as well but it looks that still can't be properly predicted.

Media

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

Changelog

🆑

  • fix: Handcuffs will no longer try to uncuff themselves when they stop being dragged.
@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Jun 11, 2024
@Pspritechologist Pspritechologist added the Status: Derelict Has not been active for a while label Jun 11, 2024
@VMSolidus VMSolidus mentioned this issue Sep 14, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot Status: Derelict Has not been active for a while
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Port Ghost Bar VMSolidus/Einstein-Engines
2 participants
@Pspritechologist @SimpleStation14