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

Move xeno grab cooldown change to just ctrl+click logic #4246

Merged
merged 1 commit into from
Sep 5, 2023

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Aug 24, 2023

About the pull request

This PR is a followup to #4204 that introduced a cooldown to grabbing to fix an exploit. Unfortunately this broke logic for xeno grab intent click though because that logic pre-emptively is adjusting next_move (that xenos just override and ignore anyways), so now the cooldown check is added to just ctrl+click. Technically this means that human ctrl+click could be affected by this change, but I haven't currently found any effects of this.

Explain why it's good for the game

Fixes #4244

Testing Photographs and Procedure

Screenshots & Videos

https://youtu.be/BMRnHIa967Q

Changelog

🆑 Drathek
fix: Fixed xeno grab intent
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Aug 24, 2023
@Rubenbl4des Rubenbl4des mentioned this pull request Aug 24, 2023
3 tasks
@gitbirb gitbirb mentioned this pull request Aug 26, 2023
3 tasks
@fighterslam fighterslam mentioned this pull request Aug 26, 2023
3 tasks
@morrowwolf morrowwolf added this pull request to the merge queue Sep 5, 2023
Merged via the queue into cmss13-devs:master with commit 73355dc Sep 5, 2023
27 checks passed
cm13-github added a commit that referenced this pull request Sep 5, 2023
@Katskan Katskan mentioned this pull request Sep 5, 2023
3 tasks
@Drulikar Drulikar deleted the Fix_Xeno_Grab branch September 9, 2023 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Xenomorph Grab Intent doesn't work
2 participants