Bring back the prisoner role #511
Conversation
This reverts commit d73f485.
Prisoners are now forced to spawn in the prison again.
github-actions
bot
added
S: Needs Review
Changes: C#
|
Can you make sure to also do this for Gladiators, to make sure they correctly spawn in the Arena brig? It's been awkward on Arena for the gladiators not correctly spawning in the prison, and just being left to wander the station. |
|
@evilexecutive This is tested and works for Gladiators too - I've updated the PR description to mention that 🙂 |
|
Exciting! There's more maps than just Edge and Tortuga that should have prisoner roles, though. |
|
@Colin-Tel I've only reverted the commit I saw that commented the role numbers out, which happens to only be the two maps that were available initially on rebase. I'm not familiar enough with the role or the maps to know which ones should have prisoner roles, how many, and if they have spawners set up for them already. I figured I'd play it safe and leave that decision for the mappers to tune their maps as they see fit. |
|
One moment, I can make the changes to the map prototypes for you. |
Yaaay, we love confinement!
Add a drain to the cell area
|
Ah, they were (almost) all there already! I should have checked 😅 |
|
@DebugOk this should be ready for your review, looks concise enough to me 🥴 |
Do you mind making corpsman on Hive [ 1, 1] as well? I guess I don't see the reason in restricting it any longer. |
* Revert "Removes Prisoner selection from maps (#262)" This reverts commit d73f485. * Fix alwaysUseSpawner, add DesiredSpawnPointType Prisoners are now forced to spawn in the prison again. * Updated map prototypes for prisoner Yaaay, we love confinement! * Update asterisk.yml Add a drain to the cell area--------- Co-authored-by: Colin-Tel <[email protected]> (cherry picked from commit 003f262)
(cherry picked from commit cb3fa24)
# Description Fixes job requirements using wrong locales Happened because one function had role-timer- as its default locale prefix and the other that called the first had null as the default. --- <details><summary><h1>Media</h1></summary><p>   </p></details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - fix: Job requirements are now displayed correctly.
About the PR
Prisoners now spawn in the prison again, even when late-joining. Re-enabled prisoner role selection.
Gladiators and Prison Guards use the same system, and as such now also always spawn on their job spawner as they used to.
Why / Balance
Fixes #261.
Technical details
Fixes
alwaysUseSpawnerby adding adesiredSpawnPointTypeargument toSpawnPlayerCharacterOnStationandPlayerSpawningEvent. This is checked inSpawnPointSystem.OnSpawnPlayer(...)to force them to spawn at their job spawner.Media
Breaking changes
N/A
Changelog
🆑