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

Fix marines not getting first dibs if they ghost #3802

Merged
merged 2 commits into from
Jul 13, 2023

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Jul 5, 2023

About the pull request

This PR fixes an issue where hugged marines that burst were not getting first dibs on the larva if they ghosted. Previously the mind maybe wasn't cleared out to find the ghost mob, but it currently is.

NOTE: The existing check requiring the marine to be nested is still in place to get first dibs. I'm honestly not sure if this check should still exist. On one hand I can agree it might be hard for the marine trying to get help to suddenly become the larva and switch gears - they are still going to be in the mindset of a marine that the larva should die. But its also sort of weird to only get the first dibs if nested. If xenos are unnesting hugged marines just before they pop, thats already a mechanic abuse that should be ahelped; but ideally there wouldn't be anything to be abused. Also, some may consider this kind of larva undesirable anyways so maybe they'd prefer the marine to have it... So let me know if I should just remove the nested check on line 151.

Explain why it's good for the game

Fixes an unintended consequence of ghosting when hugged that would prevent that marine from getting their first dibs on the larva.

Testing Photographs and Procedure

Screenshots & Videos

dibs

Changelog

🆑 Drathek
fix: Fix ghosting preventing first dibs on the larva in a hugged marine
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Jul 5, 2023
@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 ~ 7 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 beg a maintainer to review your PR label Jul 13, 2023
Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

Lgtm

@Zonespace27 Zonespace27 added this pull request to the merge queue Jul 13, 2023
Merged via the queue into cmss13-devs:master with commit 5f5fcd2 Jul 13, 2023
github-actions bot added a commit that referenced this pull request Jul 13, 2023
cm13-github added a commit that referenced this pull request Jul 13, 2023
@Drulikar Drulikar deleted the Fix_Marine_First_Dibs branch July 13, 2023 23:22
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 Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants