No More Instant Grab Combos

[Tirochora]

Description

So, as it stands before this PR, somebody could do a combo like, say, the judo throw, by ctrl-clicking and then instantly rightclicking, throwing somebody else to the ground within the blink of an eye. With this PR, that shouldn't happen - grabbing follows the same rules as attacking (either punching or shoving), and uses the same cooldown.

---

TODO

• [x] Grabbing people puts your unarmed attacks on cooldown
• [x] Unarmed attacking someone puts your grab on cooldown

---

Media

https://github.com/user-attachments/assets/22d4eadb-2ec1-4e6c-9ad3-dbdd36c6f3cd

---

Changelog

:cl:

• tweak: grabbing somebody mid-combo now obeys the same laws as every other attack, so no more instant judo throws

[coderabbitai[bot]]

Walkthrough

This pull request involves two primary changes. The PullerComponent class has had a non-visible character removed from the using directive for Content.Shared._Goobstation.MartialArts, leaving the functionality unchanged. In the PullingSystem, the TryGrab method's signature has been updated to accept a puller entity that includes both a PullerComponent and a MeleeWeaponComponent. The internal logic has been revised accordingly to manage these components and their interactions, enforcing attack cooldowns and grab timing.

Changes

File	Summary of Change
Content.Shared/.../PullerComponent.cs	Removed non-visible character from using directive for Content.Shared._Goobstation.MartialArts; functionality remains unchanged.
Content.Shared/.../PullingSystem.cs	Updated TryGrab method signature to accept a puller entity with both PullerComponent and MeleeWeaponComponent; modified internal logic to handle new component structure, including cooldowns, attack timings, and grab stage management; cleaned up using directives.

Suggested reviewers

• Remuchi
• sleepyyapril

Poem

🚀 In the code of the stars, we make our stand,
With Puller and Melee, united, hand in hand.
A non-visible ghost now banished from sight,
Our grabbing mechanics shine ever so bright.
Together we code, with purpose and might,
Defending our realm from the Sol Alliance blight! ⚔️

---

📜 Recent review details

Configuration used: CodeRabbit UI Review profile: CHILL Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 81847c9525f7c9b061e6a44eaa1b706dc696c85f and 98cf9129623e1f26ffac9e0fb721c83b05dc591d.

📒 Files selected for processing (1)

• Content.Shared/Movement/Pulling/Systems/PullingSystem.cs (3 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

• Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

⏰ Context from checks skipped due to timeout of 90000ms (6)

• GitHub Check: Test Packaging
• GitHub Check: build (ubuntu-latest)
• GitHub Check: YAML map schema validator
• GitHub Check: YAML Linter
• GitHub Check: build (ubuntu-latest)
• GitHub Check: Label

✨ Finishing Touches

• [ ] 📝 Generate Docstrings

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.