-
Notifications
You must be signed in to change notification settings - Fork 522
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prevent Banished in Larva Queue and Set Queue Time for Cryoing (#3885)
# About the pull request This PR makes it so the larva queue can check if the candidate is currently in the banishment list for a hive. Join as xeno checks this, but xeno candidates (even before the queue) never has. A note of banishment is added to the queue message if join as xeno is used to check queue placement, but otherwise they just simply won't have queue messages until some hive core they aren't banished from ticks. The reason why they personally have a number at all though is because that was a check for all possible xeno hives. If say both the normal hive and greeno hive cores were ticking, there were 10 ghosts total, and 2 were banished from the normal hive, the queue length for the greeno hive would have 10 people, and the queue length for the normal hive would have 8 people, but otherwise the queue is shared. This PR also makes it so entering a cryopod sets your queue time; otherwise any marine that cryos (even if its say two hours in a game) would be basically the front of the queue (the time would still just be their join time). # Explain why it's good for the game Banished players should stay banished until the queen changes her mind or dies. Cryo'd marines also shouldn't get prioritized over people who have been waiting. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> (Message below was also tweaked to also include "Your queue number won't update until there is a hive you aren't banished from.") ![image](https://github.com/cmss13-devs/cmss13/assets/76988376/3664fbe4-4d56-446b-a918-350e77ec1ed9) </details> # Changelog :cl: Drathek fix: Banished players will no longer be candidates for hives they are banished from. fix: Cryoing will now set your larva queue time so you don't get prioritized over others that have been waiting. admin: Shuttle intoTheSunset will set larva queue time the same as other situations. /:cl:
- Loading branch information
Showing
7 changed files
with
38 additions
and
14 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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