Skip to content

Adding channelled melee attacks.#5372

Draft
MistakeNot4892 wants to merge 1 commit into
NebulaSS13:devfrom
MistakeNot4892:feature/melee
Draft

Adding channelled melee attacks.#5372
MistakeNot4892 wants to merge 1 commit into
NebulaSS13:devfrom
MistakeNot4892:feature/melee

Conversation

@MistakeNot4892

@MistakeNot4892 MistakeNot4892 commented May 15, 2026

Copy link
Copy Markdown
Contributor

Opening for visibility/diff.

Description of changes

Adds melee charge attacks.

Why and what will this PR improve

More involved melee system.

TODO

  • Update clickdrag system to tick periodically instead of only on atom change (so that cursor state can be changed properly). Split into separate PR.
  • Replace temporary icons.
  • Other stuff probably

Authorship

Myself and Penny to date I believe. Will update this closer to merge.

Changelog

Will update closer to merge.

@MistakeNot4892 MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label May 15, 2026
@MistakeNot4892 MistakeNot4892 force-pushed the feature/melee branch 5 times, most recently from 7b7ea76 to 6fa0bc1 Compare May 15, 2026 14:53
@MistakeNot4892

MistakeNot4892 commented May 15, 2026

Copy link
Copy Markdown
Contributor Author
image

Also now depends on #5373

EDIT: 'solved' by having the mouseup proc set waitfor = FALSE. In any other language I would be worried about a thread safety violation since it's now diddling the SSclickdrag lists in parallel, but... should be fine I guess.

@MistakeNot4892 MistakeNot4892 added the has dependencies This PR should not be merged prior to any PRs linked in body or comments. label May 15, 2026
@MistakeNot4892 MistakeNot4892 force-pushed the feature/melee branch 4 times, most recently from 30ef088 to 7e39b3e Compare May 16, 2026 04:06
@MistakeNot4892

Copy link
Copy Markdown
Contributor Author

Depends on #5373.

Fix add_mouse_pointer not updating on icon_index change
Add missing attacking cursor definition
Add cap to hits per melee attack profile
Post-cherry-pick tweaks to charged melee system.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

has dependencies This PR should not be merged prior to any PRs linked in body or comments. work in progress This PR is under development and shouldn't be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant