Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new brig remap x3 #5027

Merged
merged 12 commits into from
Dec 14, 2023
Merged

new brig remap x3 #5027

merged 12 commits into from
Dec 14, 2023

Conversation

ItsVyzo
Copy link
Contributor

@ItsVyzo ItsVyzo commented Nov 24, 2023

About the pull request

Fully remaps the brig to feel more interconnected and better use up unused space.

Cryo Room: One room to fit all
APC Room: Central to Brig // Some APCs in different locations for ease of use
CMP Office: Moved
Warden Office: Moved next to CMP's office - new bedroom - oversees courtyard and can check if maint breach happens
Execution: Isolated viewing room, next to perma.
Evidence: Expanded evidence room, with printer, file storage and other detectivey needs.
Armory: Larger in size, added sectech
Equipment room: Larger - more chargers - food machines
Medical room: tiny expansion
Cells: Two new cells
Break room: Take a break - have a donut

Explain why it's good for the game

Makes it easier to navigate brig (in theory) adds more cells for use, and better uses up empty space in the brig. Interconnects the brig to feel more wholesome.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑 LTNTS
maptweak: remapped brig to be more concise, more interconnected, and easier to navigate. And added more cells for when needed.
qol: adds RiotTech (SecTech but for Riot Control with Rubber Bullets - obvs Code Blue+ only)
qol: CMP's locker requires Armory access to open now
qol: suspects are now colored nardo gray in security list
/:cl:

@github-actions github-actions bot added Mapping did you remember to save in tgm format? Quality of Life Make the game harder to play labels Nov 24, 2023
@ItsVyzo ItsVyzo requested a review from Nanu308 November 24, 2023 23:44
@Nanu308
Copy link
Member

Nanu308 commented Nov 25, 2023

This PR is missing other recent Almayer changes now and reverting them, gotta fix that

@Nanu308 Nanu308 marked this pull request as draft November 25, 2023 03:58
@ItsVyzo ItsVyzo marked this pull request as ready for review November 25, 2023 04:28
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Nov 26, 2023
Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

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

mapping lgtm, get code changes approved

Copy link
Member

Choose a reason for hiding this comment

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

Mapping is in the clear, get the code changes cleared next

@harryob harryob marked this pull request as draft November 27, 2023 10:44
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 29, 2023
@ItsVyzo ItsVyzo marked this pull request as ready for review December 3, 2023 09:09
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 3, 2023
@cm13-github
Copy link
Contributor

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

@ItsVyzo ItsVyzo requested a review from fira as a code owner December 3, 2023 15:09
@fira fira changed the title new brig remap x3 [MDB IGNORE] [IDB IGNORE] new brig remap x3 Dec 3, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 3, 2023
@cm13-github
Copy link
Contributor

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

@fira fira changed the title [MDB IGNORE] [IDB IGNORE] new brig remap x3 new brig remap x3 Dec 4, 2023
@Nanu308
Copy link
Member

Nanu308 commented Dec 4, 2023

I was intending to merge this prior to USS Almayer being closed, so this is still approved for map merge.

Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Dec 12, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 12, 2023
@cm13-github
Copy link
Contributor

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

@ItsVyzo ItsVyzo requested a review from harryob December 12, 2023 09:25
@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Dec 13, 2023
@harryob harryob added this pull request to the merge queue Dec 14, 2023
Merged via the queue into cmss13-devs:master with commit 7eac6c3 Dec 14, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 14, 2023
@ItsVyzo ItsVyzo deleted the new_brig_remap branch December 15, 2023 23:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Quality of Life Make the game harder to play
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants