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

Hive collapse when less than 4 xenos is still a marine major. #5442

Merged
merged 1 commit into from
Jan 24, 2024

Conversation

TheGamerdk
Copy link
Contributor

About the pull request

Why below 4 xenos? Because 15 xenos without a Queen is still a threat, 3 xenos can easily be killed.

(I don't like chasing lurkers down for 5 minutes after everyone else is dead)

Explain why it's good for the game

I must have my Marine Major, not this silly Marine Minor. A single lurker being alive isn't a big deal

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: A hive collapse (No new Queen) while at 3 xenos or below is now a marine major, instead of a minor.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Jan 13, 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 ~ 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 Jan 21, 2024
Copy link
Contributor

@Birdtalon Birdtalon left a comment

Choose a reason for hiding this comment

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

Marines say its a marine major whatever the outcome.

@Birdtalon Birdtalon added this pull request to the merge queue Jan 24, 2024
Merged via the queue into cmss13-devs:master with commit e9a9ccf Jan 24, 2024
54 checks passed
cm13-github added a commit that referenced this pull request Jan 24, 2024
github-merge-queue bot pushed a commit that referenced this pull request Mar 31, 2024
# About the pull request

Fixes a runtime in
`/datum/game_mode/colonialmarines/check_queen_status()` which was
stopping the 'Marine Minor' round result (Hive collapse) from being set.
(Added by a tiny mistake in #5442)
```
runtime error: type mismatch: cannot compare /list (/list) to 3
 - proc name: check queen status (/datum/game_mode/colonialmarines/check_queen_status)
 -   source file: code/game/gamemodes/colonialmarines/colonialmarines.dm,335
 -   usr: null
 -   src: Distress Signal (/datum/game_mode/colonialmarines)
 -   call stack:
 - Distress Signal (/datum/game_mode/colonialmarines): check queen status("xeno_hive_normal")
```
The `totalXenos` list itself was being compared to the number instead of
the list's length, which aborted the proc before `round_finished` could
be set.
I've gone through all of this year's game logs just to double check, and
there hasn't been a 'Marine Minor Victory' since the 24th of January.

# Explain why it's good for the game
Marines get a slightly worse victory condition again. (woo!)

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: Fixed a runtime error preventing a 'Marine Minor' (Hive collapse)
roundend state.
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants