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

Brig Area Update/Refactor #5723

Merged
merged 12 commits into from
Feb 27, 2024
Merged

Brig Area Update/Refactor #5723

merged 12 commits into from
Feb 27, 2024

Conversation

ItsVyzo
Copy link
Contributor

@ItsVyzo ItsVyzo commented Feb 14, 2024

About the pull request

Updates Brig Areas to be more concise with new design

Also alters dropship hijack crash areas

Explain why it's good for the game

People in X area of brig, hiding/dead/dying etc. are much easier to find. Also Mapper OCD

Dropship doors landing in space = bad

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑 LTNTS
add: brig areas: warden office, MP bunks, starboard hallway, interrogation room, evidence storage
spellcheck: changes brig surgery to brig medical
code: removed some brig areas from hijack, added other brig areas
/:cl:

@github-actions github-actions bot added Mapping did you remember to save in tgm format? Feature Feature coder badge Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors labels Feb 14, 2024
@ItsVyzo ItsVyzo changed the title Brig Area Update/Refactor [MDP IGNORE] Brig Area Update/Refactor Feb 14, 2024
@Huffie56 Huffie56 added this to the USS Almayer Updates/Changes milestone Feb 14, 2024
@ItsVyzo ItsVyzo changed the title [MDP IGNORE] Brig Area Update/Refactor Brig Area Update/Refactor Feb 18, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 19, 2024
@cm13-github
Copy link
Contributor

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

@Nanu308 Nanu308 marked this pull request as draft February 20, 2024 01:29
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.

New Areas but no placed APC's for those areas and rooms that were added?

@ItsVyzo
Copy link
Contributor Author

ItsVyzo commented Feb 20, 2024

New Areas but no placed APC's for those areas and rooms that were added?

I need to stop forgetting things q=q

fixing

@ItsVyzo ItsVyzo marked this pull request as ready for review February 23, 2024 19:49
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 24, 2024
@cm13-github
Copy link
Contributor

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

@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 Feb 24, 2024
@cm13-github
Copy link
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 Feb 24, 2024
@Nanu308 Nanu308 marked this pull request as draft February 25, 2024 09:11
@ItsVyzo ItsVyzo marked this pull request as ready for review February 25, 2024 20:58
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 26, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 26, 2024
@cm13-github
Copy link
Contributor

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

@ItsVyzo ItsVyzo requested a review from Nanu308 February 26, 2024 22:10
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Feb 27, 2024
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.

lgtm

@Nanu308 Nanu308 added this pull request to the merge queue Feb 27, 2024
Merged via the queue into cmss13-devs:master with commit 6533f9c Feb 27, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Feb 27, 2024
@ItsVyzo ItsVyzo deleted the brigareaupdate branch February 27, 2024 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants