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

Fixes queen not being able to spawn #6077

Merged
merged 9 commits into from
Apr 5, 2024
Merged

Fixes queen not being able to spawn #6077

merged 9 commits into from
Apr 5, 2024

Conversation

vero5123
Copy link
Contributor

@vero5123 vero5123 commented Apr 3, 2024

About the pull request

Fixes #5999

Explain why it's good for the game

bug fix

Changelog

🆑
fix: fixes queen getting stuck in the lobby if they take too long
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Apr 3, 2024
code/game/gamemodes/cm_initialize.dm Outdated Show resolved Hide resolved
code/game/gamemodes/cm_initialize.dm Outdated Show resolved Hide resolved
code/game/gamemodes/cm_initialize.dm Outdated Show resolved Hide resolved
code/game/gamemodes/colonialmarines/xenovsxeno.dm Outdated Show resolved Hide resolved
code/game/jobs/job/antag/xeno/queen.dm Outdated Show resolved Hide resolved
code/game/jobs/job/antag/xeno/queen.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft April 4, 2024 00:27
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
@vero5123 vero5123 marked this pull request as ready for review April 4, 2024 15:50
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

So this code is functional, even in the situation where someone evolves before the queen picks a location. But you ought to also adjust QUEEN_SPAWN_TIMEOUT to be ~1 minute or so. It took approximately 1 minute and 20s for me as a larva spawn to evolve to queen.

code/game/gamemodes/cm_initialize.dm Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft April 4, 2024 16:55
@vero5123 vero5123 marked this pull request as ready for review April 4, 2024 17:33
@vero5123
Copy link
Contributor Author

vero5123 commented Apr 4, 2024

So this code is functional, even in the situation where someone evolves before the queen picks a location.

Surprised?

@Drulikar
Copy link
Contributor

Drulikar commented Apr 5, 2024

So this code is functional, even in the situation where someone evolves before the queen picks a location.

Surprised?

Not what I'm conveying. What I was conveying is this probably wouldn't even be necessary if the timer didn't allow people to evolve before queen is forced to pick a location. But I don't know how client disconnects might get handled so the code is fine to have that logic since it should kick them back to lobby even if disconnected - or at least tries to.

@Drulikar Drulikar added this pull request to the merge queue Apr 5, 2024
Merged via the queue into cmss13-devs:master with commit 1e59864 Apr 5, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Apr 5, 2024
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Queen fails to respawn sometimes when selecting a location
2 participants