Skip to content

MP Main's Brig Expansion#12159

Open
antlersss wants to merge 82 commits into
cmss13-devs:masterfrom
antlersss:brig
Open

MP Main's Brig Expansion#12159
antlersss wants to merge 82 commits into
cmss13-devs:masterfrom
antlersss:brig

Conversation

@antlersss

@antlersss antlersss commented Apr 29, 2026

Copy link
Copy Markdown
Contributor

About the pull request

Completely remodels the brig to accomplish the following things:

  1. Expands the size of the yard and allow prisoners more options to entertain themselves during their sentences
  2. Streamlines the processing... process of prisoners by moving rooms closer together (evidence storage, holding, brig medical)
  3. Moves the interrogation room to be adjacent to the yard, allowing for interrogation RP without the need to pause a prisoner's timer or delay their brigging process
  4. Adds a visition area to streamline the process of marines wishing to visit and interact with their comerades
  5. Adds multi-dimensionality to the brig with a subfloor
  6. Adds additional document filing cabinets

The additions and remappings have been given a thorough testing process by button-mashing every shutter in the brig and slamming my face into every door with and without an ID on.

Fixes #9979

Explain why it's good for the game

I think the brig, despite its several remodels throughout the course of CM, still had some things that it lacked. I drew from my experience as an MP player to determine what could be improved the most in the Almayer's brig.

Also, Steelpoint said that I could.

Testing Photographs and Procedure

Screenshots & Videos image image image image image image image

Changelog

🆑 Antlers
maptweak: Completely remodeled the brig
maptweak: Moved interrogation to be accessible by brigged prisoners without pausing their timers
maptweak: Moved the armory and execution rooms to a new lower level of the brig
maptweak: Expanded the CMP's office
maptweak: Expanded brig holding
maptweak: Expanded the yard
maptweak: Expanded the execution room
maptweak: Added an attachment vendor to the MP prep area (rejoice! I don't have to steal from your preps anymore)
mapadd: Added a basketball court to the yard
mapadd: Added a kitchenette to the yard
mapadd: Added a visitation area to the brig
mapadd: Added a new brig lobby area
add: Plastic knives now have the basic sharpness trait and can cut food crudely
add: Added a new mobile TV stand in brig storage
add: Added a guaranteed black market tuner in brig evidence storage
fix: CMP's office now requires CMP's credentials to access
fix: Document chest drawers now no longer grow into regular ones when items are placed inside
fix: Knife utensils will no longer scoop up food onto themselves, and instead will try to cut
code: Added new brig areas
code: Repathed plastic utensils to be subtypes of their respective normal utensils
del: Removed the MP bunk areas
del: Removed the yard hydroponics area (groceries are available in the kitchenette)
/:cl:

@antlersss antlersss requested a review from Nanu308 as a code owner April 29, 2026 03:24
@github-project-automation github-project-automation Bot moved this to Awaiting Review in Review Backlog Apr 29, 2026
@cmss13-ci cmss13-ci Bot added Mapping did you remember to save in tgm format? Fix Fix one bug, make ten more Code Improvement Make the code longer Removal snap size/XXL Denotes a PR that changes 2000+ lines, ignoring generated files. labels Apr 29, 2026
antlersss and others added 19 commits April 28, 2026 23:41
f348dd7: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
f348dd7: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
f348dd7: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
f348dd7: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
f348dd7: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@cm13-github

Copy link
Copy Markdown
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github

Copy link
Copy Markdown
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jun 30, 2026
61cdf54: maps/map_files/USS_Almayer/USS_Almayer.dmm

Automatically commited by: tools\mapmerge2\fixup.py

@Drulikar Drulikar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

No update paths script is present and is required because of repathing is now performed in this PR. See https://github.com/cmss13-devs/cmss13/blob/master/.github/CONTRIBUTING.md#a-note-on-prs-altering-maps

But even still whats the point of repathing pknife to be under knife? You are just making it play the sfx of bladeslice twice now... Additionally why then should pfork still exist?

@Drulikar Drulikar marked this pull request as draft July 1, 2026 00:25
@cmss13-ci cmss13-ci Bot added size/L Denotes a PR that changes 200-799 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 2000+ lines, ignoring generated files. labels Jul 1, 2026
@github-project-automation github-project-automation Bot moved this from Partially Approved / Mergeable to Changes Requested in Review Backlog Jul 1, 2026
@antlersss antlersss marked this pull request as ready for review July 1, 2026 00:43
@antlersss

antlersss commented Jul 1, 2026

Copy link
Copy Markdown
Contributor Author

No update paths script is present and is required because of repathing is now performed in this PR. See https://github.com/cmss13-devs/cmss13/blob/master/.github/CONTRIBUTING.md#a-note-on-prs-altering-maps

Added.

But even still whats the point of repathing pknife to be under knife? You are just making it play the sfx of bladeslice twice now... Additionally why then should pfork still exist?

Plastic utensils are now a subtype of their respective utensils to allow changes to the main utensil to reflect in the plastic version. This is used to prevent knives from scooping up food cleanly without adding two different checks for the knife and pknife.

Comment thread code/game/objects/items/reagent_containers/food/snacks.dm Outdated
Comment thread code/game/objects/items/tools/kitchen_tools.dm Outdated
Comment thread code/game/objects/items/tools/kitchen_tools.dm Outdated
@cmss13-ci cmss13-ci Bot added the Feature Feature coder badge label Jul 1, 2026
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>

@Drulikar Drulikar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Also after a brief deliberation with other maintainers; even you indirectly trying to reference what was not allowed should not be present. All this note serves is "maintainers didn't allow something - go research what was supposed to be here"

Comment thread code/modules/paperwork/paper.dm Outdated
Comment thread maps/map_files/USS_Almayer/USS_Almayer.dmm Outdated

@Drulikar Drulikar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

code again

@github-project-automation github-project-automation Bot moved this from Changes Requested to Partially Approved / Mergeable in Review Backlog Jul 1, 2026
@Steelpoint Steelpoint added the Mapping Approved adds 500 new dict keys label Jul 4, 2026

@Steelpoint Steelpoint left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Mapping LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Code Improvement Make the code longer Feature Feature coder badge Fix Fix one bug, make ten more Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Removal snap size/L Denotes a PR that changes 200-799 lines, ignoring generated files. Sprites Remove the soul from the game.

Projects

Status: Partially Approved / Mergeable

Development

Successfully merging this pull request may close these issues.

Provost Listening device in brig causes all messages for the Provost fax responder to appear twice.