Fix queen check not checking affected z_levels + No Hijack Hive Collapse#11906
Open
Drulikar wants to merge 3 commits intocmss13-devs:masterfrom
Open
Fix queen check not checking affected z_levels + No Hijack Hive Collapse#11906Drulikar wants to merge 3 commits intocmss13-devs:masterfrom
Drulikar wants to merge 3 commits intocmss13-devs:masterfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the pull request
This PR is a follow up to #7773 simply making it where the queen is still checked to be in whatever is the relevant Z levels per
cmss13/code/game/gamemodes/game_mode.dm
Lines 122 to 125 in 7b2625e
cmss13/code/game/gamemodes/colonialmarines/colonialmarines.dm
Lines 602 to 631 in 7b2625e
Additionally, we don't want to check for hive collapse during hijack because normally a hive collapse is either marine minor/major. But this could potentially return as just always a xeno minor if needed.
Explain why it's good for the game
Fixes issues where say the queen and the rest of her hive hops off a crashed almayer and the round doesn't end.
Should also fix #11516
Testing Photographs and Procedure
Screenshots & Videos
Tunnel still doesn't end round:

But going to a Z level that isn't checked anymore does matter:

Changelog
🆑 Drathek
fix: Fixed queen no forfeit check not checking the relevant Z levels (namely regarding hijack/FTL)
fix: Fixed potential for hive collapse during hijack
/:cl: