Adjusted the spawn system for EOR to always spawn in CC and allows the player to spawn with a proper job in CC. #967

Merged

EchoOfNothing merged 1 commit from :systems/spawning/ccspawnfix into master

2026-10-05 20:10:55 +00:00

QuillTheCreature commented

2026-09-29 12:06:02 +00:00

Member

Other Ideas

We could argue to not disallow normal station spawns on EOR, this is up to Byrd maints what you all want.

I'm fine with both ways, but I personally wanted to allow the player to wear whatever swag they want in EOR in the last <10 minutes.

Short description

This PR basically does two small things:

Allows a player to spawn with their selected role in CC, this means a player can spawn in as CCI/CCJ (or even whatever normal station job) even when the round is already over.
And instead of randomly rolling what station to spawn the player on when it's EOR, the system forces a CC spawn now.

Why we need to add this

It's a bit silly that the EOR late join system randomly fails, randomly puts the player onto the station, and randomly onto CC.

Media (Video/Screenshots)

Checklist

I do not require assistance to complete the PR.
I have verified that the changes work before posting/requesting review of my PR.
I have added screenshots/videos of the changes, or this PR does not change in-game mechanics.
I have read the Pull Request and Changelog Guidelines and Byrd Station's Contributor Ruleset.

Breaking changes

Ingame Changelog

[guidelines]: https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html [ruleset]: https://rules.byrdstation.space/#h.vigrxrnffwji ## Other Ideas We could argue to not disallow normal station spawns on EOR, this is up to Byrd maints what you all want. I'm fine with both ways, but I personally wanted to allow the player to wear whatever swag they want in EOR in the last <10 minutes. ## Short description This PR basically does two small things: * Allows a player to spawn with their selected role in CC, this means a player can spawn in as CCI/CCJ (or even whatever normal station job) even when the round is already over. * And instead of randomly rolling what station to spawn the player on when it's EOR, the system forces a CC spawn now. ## Why we need to add this It's a bit silly that the EOR late join system randomly fails, randomly puts the player onto the station, and randomly onto CC. ## Media (Video/Screenshots) <video src="/attachments/46750eb7-97da-418e-8284-2c9621112998" title="Screencast_20260929_140517" controls></video> ## Checklist  - [x] I do not require assistance to complete the PR. - [x] I have verified that the changes work before posting/requesting review of my PR. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I have read the [Pull Request and Changelog Guidelines][guidelines] and [Byrd Station's Contributor Ruleset][ruleset]. ## Breaking changes  ### Ingame Changelog

Screencast_20260929_140517.webm

5.8 MiB

QuillTheCreature added 1 commit

2026-09-29 12:06:03 +00:00