feat: add new hardware storage lab room, update prisoner containment room#8556
Merged
chaosvolt merged 5 commits intocataclysmbn:mainfrom Apr 18, 2026
Merged
feat: add new hardware storage lab room, update prisoner containment room#8556chaosvolt merged 5 commits intocataclysmbn:mainfrom
chaosvolt merged 5 commits intocataclysmbn:mainfrom
Conversation
Contributor
|
Autofix has formatted code style violation in this PR. I edit commits locally (e.g: git, github desktop) and want to keep autofix
I do not want the automated commit
If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose of change (The Why)
Labs have been mostly untouched for a while now, and are getting pretty stale. Also, the prisoner containment room never made much sense and was unbalanced. Not only is it not very logical for a prisoner containment room to have drugs as the main loot, but the risk reward was way off, with the idea of opening the prison doors to get to 4 boxes that might have drugs being almost never worth it.
Describe the solution (The How)
Adds a new hardware storage room, which contains electronic bits, cleaning supplies (top secret labs have janitors too!), misc tools and rarely electronics and power tools.

Gives the prisoner containment room a new, more logical layout, and changes the shelves from spawning drugs to spawning security guard gear (low level guns and some armor). Retains the mechanic of letting out the prisoners if you want to get drugs (there's only two boxes now, but I buffed the spawn rate of drugs in those boxes).

Describe alternatives you've considered
boring labs
Testing
debug teleported through multiple labs, rooms spawn and look as expected
Additional context
might buff the spawn rate of the guard lockers, considering the armory exists. I also plan on adding more stuff to labs later on.
Checklist
Mandatory
closes #1234in Summary of the PR so it can be closed automatically.mainso it won't cause conflict when updatingmainbranch later.