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

Melee attacks no longer lock inputs #16082

Closed
wants to merge 5 commits into from
Closed

Melee attacks no longer lock inputs #16082

wants to merge 5 commits into from

Conversation

Xander3359
Copy link
Contributor

@Xander3359 Xander3359 commented Jun 15, 2024 •
edited by github-actions bot
Loading

About The Pull Request

Makes it so attacking no longer checks next_move, but rather checks last_attack

Why It's Good For The Game

Melee input locking is cringe and should go away

Changelog

🆑
qol: melee attacking no longer locks your inputs
/:cl:

@tgstation-server tgstation-server added the Quality of Life Minor changes that make the game nicer to play label Jun 15, 2024
@belltop1
Copy link

Greatest PR in history.

@Lauwma
Copy link
Contributor

Lauwma commented Jun 15, 2024

Machete finally useful ?

@chizzy376
Copy link
Contributor

vali claymore buff of the millennia

QualityVan
QualityVan reviewed Jun 15, 2024
View reviewed changes
code/_onclick/ai.dm Outdated Show resolved Hide resolved
TiviPlus
TiviPlus requested changes Jun 21, 2024
View reviewed changes
Copy link
Member

@TiviPlus TiviPlus left a comment

Choose a reason for hiding this comment

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

Tming to test

code/_onclick/item_attack.dm Outdated Show resolved Hide resolved
@TiviPlus TiviPlus added the Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. label Jun 21, 2024
comfyorange added a commit that referenced this pull request Jun 21, 2024
@comfyorange
TGS Test Merge (#16082)
da94159
@MiniMeatwad
Copy link
Contributor

There's still a delay on inventory and HUD buttons if you punch, and PBs with a gun still cause you to be unable to fire.

@github-actions github-actions bot added the Merge Conflict Pull request is in a conflicted state with base branch. label Jun 22, 2024
@github-actions GitHub Actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 3 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale Pull request is awaiting delayed author response and may be closed. label Jun 30, 2024
@tgstation-server tgstation-server removed Merge Conflict Pull request is in a conflicted state with base branch. Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. labels Jun 30, 2024
@TiviPlus TiviPlus added Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. and removed Stale Pull request is awaiting delayed author response and may be closed. labels Jun 30, 2024
comfyorange added a commit that referenced this pull request Jun 30, 2024
@comfyorange
TGS Test Merge (#16082)
a6d45d7
comfyorange added a commit that referenced this pull request Jun 30, 2024
@comfyorange
TGS Test Merge (#16082)
f13386b
comfyorange added a commit that referenced this pull request Jul 1, 2024
@comfyorange
TGS Test Merge (#16082)
b63080e
comfyorange added a commit that referenced this pull request Jul 1, 2024
@comfyorange
TGS Test Merge (#16082)
9ae3849
comfyorange added a commit that referenced this pull request Jul 1, 2024
@comfyorange
TGS Test Merge (#16082)
1afd31d
comfyorange added a commit that referenced this pull request Jul 1, 2024
@comfyorange
TGS Test Merge (#16082)
fe0502a
Lumipharon
Lumipharon requested changes Jul 1, 2024
View reviewed changes
Copy link
Contributor

@Lumipharon Lumipharon left a comment

Choose a reason for hiding this comment

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

This has some issues.
The CD is only applied on MOB attackby, so excludes alt attacks (i.e. right click), punch attacks, and attacking anything that's not a mob.

@Lumipharon Lumipharon added Do Not Merge Pull request should not be merged due to design conflict or being a temporary change. and removed Test Merge Candidate This PR has been reviewed and is ready for testing, unless something changes. labels Jul 1, 2024
@Cpol-CzHa Cpol-CzHa mentioned this pull request Jul 1, 2024
Open
comfyorange added a commit that referenced this pull request Jul 2, 2024
@comfyorange
TGS Test Merge (#16082)
9745f07
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 9, 2024

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 3 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale Pull request is awaiting delayed author response and may be closed. label Jul 9, 2024
@github-actions github-actions bot closed this Jul 13, 2024
@Looking4bros
Copy link

F

1 similar comment
@Zangeiti
Copy link

F

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

@MLGTASTICa MLGTASTICa MLGTASTICa left review comments

@QualityVan QualityVan QualityVan left review comments

@TiviPlus TiviPlus TiviPlus requested changes

@Lumipharon Lumipharon Lumipharon requested changes

@Kuro020 Kuro020 Kuro020 approved these changes

Assignees
No one assigned
Labels
Do Not Merge Pull request should not be merged due to design conflict or being a temporary change. Quality of Life Minor changes that make the game nicer to play Stale Pull request is awaiting delayed author response and may be closed.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.