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

Nearby buckling fixes #23459

Merged
merged 3 commits into from
Dec 16, 2023
Merged

Nearby buckling fixes #23459

merged 3 commits into from
Dec 16, 2023

Conversation

HMBGERDO
Copy link
Contributor

@HMBGERDO HMBGERDO commented Dec 3, 2023 •
edited
Loading

What Does This PR Do

fixes random hitting of person you're trying to buckle, it was because delayed proc was used in MouseDrop_T

Why It's Good For The Game

Bugs bad

Testing

Compiled, tried bucking on objects with modified user_buckle_mob proc

Changelog

🆑
fix: Random hits when you nearby buckle person are gone
/:cl:

@DGamerL
Copy link
Member

DGamerL commented Dec 3, 2023

image

Intended in the orignal PR. Please talk to the design team first before making a "Quick revert" PR like this.
I won't advocate for closing this, as it also does a fix..
Do contact the design team however.

@Daylight2
Copy link
Contributor

I like how it is right now. Fixes the rare but very annoying scenario of fighting someone in melee and getting buckled to a chair mid strafe, and then getting clowned on because you can't move.

@HMBGERDO
Copy link
Contributor Author

HMBGERDO commented Dec 3, 2023

original PR is here: #22828

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Dec 3, 2023
@HMBGERDO
Copy link
Contributor Author

HMBGERDO commented Dec 3, 2023

okay, FINE, reverting part of the PR is gone, there is only fix left, which should be in the codebase

@farie82 farie82 added the Fix This PR will fix an issue in the game label Dec 7, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Dec 7, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Dec 13, 2023
S34NW
S34NW approved these changes Dec 13, 2023
View reviewed changes
Copy link
Member

@S34NW S34NW left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update from upstream/master for merge please

@S34NW S34NW merged commit 5ec1418 into ParadiseSS13:master Dec 16, 2023
11 checks passed
Oyu07 pushed a commit to Oyu07/Paradise that referenced this pull request Jan 2, 2024
@HMBGERDO @Oyu07
Nearby buckling fixes (ParadiseSS13#23459)
ec53ebd 
* no timer when buckle ontop of chair, no random hits when buckling

* revert revert, right
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@S34NW S34NW S34NW approved these changes

@Sirryan2002 Sirryan2002 Sirryan2002 approved these changes

Assignees
No one assigned
Labels
-Status: Awaiting merge This PR is ready for merge Fix This PR will fix an issue in the game
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@HMBGERDO @DGamerL @Daylight2 @S34NW @Sirryan2002 @farie82 @ParadiseSS13-Bot