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

Desant fix #16114

Merged
merged 2 commits into from
Jun 29, 2024
Merged

Desant fix #16114

merged 2 commits into from
Jun 29, 2024

Conversation

Lumipharon
Copy link
Contributor

@Lumipharon Lumipharon commented Jun 18, 2024

About The Pull Request

Fixes razor, sticky and fire effecting desants when they shouldn't really.

Why It's Good For The Game

Less strange interactions on top of a tank

Changelog

🆑
fix: fixed tank desants being effected by razor, sticky and fire the vehicle crosses
/:cl:

@tgstation-server tgstation-server added the Fix Fixes an issue with the game. label Jun 18, 2024
@TiviPlus
Copy link
Member

Do we not have a flag we can use here that they get when riding?

comfyorange added a commit that referenced this pull request Jun 18, 2024
comfyorange added a commit that referenced this pull request Jun 19, 2024
comfyorange added a commit that referenced this pull request Jun 19, 2024
comfyorange added a commit that referenced this pull request Jun 19, 2024
@Lumipharon
Copy link
Contributor Author

This is good to merge, all 3 already check for flags, but we want desants explicitly to be immune even without the flags.

comfyorange added a commit that referenced this pull request Jun 19, 2024
comfyorange added a commit that referenced this pull request Jun 20, 2024
comfyorange added a commit that referenced this pull request Jun 20, 2024
comfyorange added a commit that referenced this pull request Jun 20, 2024
comfyorange added a commit that referenced this pull request Jun 21, 2024
comfyorange added a commit that referenced this pull request Jun 21, 2024
comfyorange added a commit that referenced this pull request Jun 21, 2024
comfyorange added a commit that referenced this pull request Jun 22, 2024
comfyorange added a commit that referenced this pull request Jun 22, 2024
comfyorange added a commit that referenced this pull request Jun 22, 2024
comfyorange added a commit that referenced this pull request Jun 23, 2024
comfyorange added a commit that referenced this pull request Jun 25, 2024
comfyorange added a commit that referenced this pull request Jun 26, 2024
comfyorange added a commit that referenced this pull request Jun 26, 2024
comfyorange added a commit that referenced this pull request Jun 26, 2024
comfyorange added a commit that referenced this pull request Jun 26, 2024
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 27, 2024
@Lumipharon
Copy link
Contributor Author

@TiviPlus pls

@Lumipharon Lumipharon requested a review from TiviPlus June 27, 2024 00:52
comfyorange added a commit that referenced this pull request Jun 27, 2024
comfyorange added a commit that referenced this pull request Jun 27, 2024
comfyorange added a commit that referenced this pull request Jun 29, 2024
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.

I hope you realize thsi code is disgusting

@TiviPlus TiviPlus merged commit 4ec0952 into tgstation:master Jun 29, 2024
35 checks passed
github-actions bot added a commit that referenced this pull request Jun 29, 2024
@Lumipharon Lumipharon deleted the atom_enter_fix branch June 29, 2024 09:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fixes an issue with the game. Stale Pull request is awaiting delayed author response and may be closed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants