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

Seperating every port and starboard hallway areas into three areas each (fore midship aft) #5699

Merged
merged 10 commits into from
Feb 22, 2024

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Feb 11, 2024

About the pull request

1-Main idea is to split each Hallway area port and starboard into three areas.(fore midship aft)
2-Clean up the map to remove emergency shutter that are not acting as a frontier between areas.
3-removed unused areas.
4-rebuild structure of hallway area to have /lower and /upper areas.

Explain why it's good for the game

1-Mainly good to allow better use of health monitor.
2-trying to standardize how emergency shutter are placed on the almayer
3-4 are refactor with no impact on player.

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
maptweak: split each Hallway area port and starboard into three areas.(fore midship aft)
maptweak: change the area around north and south west staircase to remove emergency shutters.
maptweak: change the area west of squad preparation room to remove emergency shutter.
maptweak: change the area west of lower engi to make emergency shutter be at the frontier of the area.
/:cl:

@Huffie56 Huffie56 added this to the USS Almayer Updates/Changes milestone Feb 11, 2024
@github-actions github-actions bot added the Mapping did you remember to save in tgm format? label Feb 11, 2024
@Huffie56 Huffie56 marked this pull request as ready for review February 11, 2024 09:52
@Huffie56 Huffie56 changed the title Seperating every port and starboard into three area each (fore midship aft) Seperating every port and starboard hallway areas into three areas each (fore midship aft) Feb 11, 2024
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 Feb 19, 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.

@Huffie56 Huffie56 marked this pull request as draft February 19, 2024 08:04
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 19, 2024
@cm13-github
Copy link
Contributor

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

@Huffie56 Huffie56 marked this pull request as ready for review February 19, 2024 19:18
@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Feb 20, 2024
code/game/area/almayer.dm Show resolved Hide resolved
@Nanu308 Nanu308 marked this pull request as draft February 20, 2024 02:14
@Huffie56 Huffie56 marked this pull request as ready for review February 20, 2024 08:23
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.

seems fine now

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Feb 22, 2024
@Nanu308 Nanu308 added this pull request to the merge queue Feb 22, 2024
Merged via the queue into cmss13-devs:master with commit 530b749 Feb 22, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Feb 22, 2024
@Huffie56 Huffie56 deleted the almayer.dm branch February 22, 2024 14:53
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?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants