MP Main's Brig Expansion#12159
Conversation
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
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
61cdf54: maps/map_files/USS_Almayer/USS_Almayer.dmm Automatically commited by: tools\mapmerge2\fixup.py
Drulikar
left a comment
There was a problem hiding this comment.
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?
Added.
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. |
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
Drulikar
left a comment
There was a problem hiding this comment.
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"
About the pull request
Completely remodels the brig to accomplish the following things:
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
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: