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.

Sign up for GitHub

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

Jump to bottom

[Solaris Ridge] Aesthetic Update V2 #6602

Merged
merged 10 commits into from
Sep 1, 2024
Merged

[Solaris Ridge] Aesthetic Update V2 #6602

merged 10 commits into from
Sep 1, 2024

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jul 1, 2024 •
edited
Loading

About the pull request

Continuation of this PR: #6152

--

Effects a significant aesthetic makeover over parts of Solaris Ridge.

This PR focuses more on the Northern half of the colony. I intend to followup in the future with doing more work on the southern half and the caves.

--

Explain why it's good for the game

I feel a long term goal of mapping should be to enhance our older maps to make them look far more "alive", lived in and aesthetically pleasing. But keeping the spirit of the similar layout of the original map.

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
maptweak: The northern half of the main colony of Solaris Ridge has received an aesthetic upgrade.

/:cl:

@Steelpoint Steelpoint requested a review from Nanu308 as a code owner July 1, 2024 17:35
@github-actions github-actions bot added the Mapping did you remember to save in tgm format? label Jul 1, 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 added the Merge Conflict PR can't be merged because it touched too much code label Jul 10, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 11, 2024
@cm13-github
Copy link
Contributor

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

Nanu308
Nanu308 requested changes Jul 18, 2024
View reviewed changes
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.

See comments, yet to finish review on main map changes

maps/map_files/BigRed/standalone/medbay-v3.dmm Show resolved Hide resolved
maps/map_files/BigRed/standalone/crashlanding-offices.dmm Show resolved Hide resolved
maps/map_files/BigRed/standalone/crashlanding-eva.dmm Show resolved Hide resolved
maps/map_files/BigRed/sprinkles/40.viro_open.dmm Show resolved Hide resolved
maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm Show resolved Hide resolved
maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm Show resolved Hide resolved
maps/map_files/BigRed/sprinkles/35.filtration_restored.dmm Show resolved Hide resolved
maps/map_files/BigRed/sprinkles/25.lz1containers_scramble.dmm Show resolved Hide resolved
maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm Show resolved Hide resolved
maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm Show resolved Hide resolved
@Nanu308 Nanu308 marked this pull request as draft July 18, 2024 00:46
@Steelpoint
Copy link
Contributor Author

First round of requested changes have been made.

@Steelpoint Steelpoint marked this pull request as ready for review July 18, 2024 16:57
@github-actions GitHub Actions
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 Jul 26, 2024
Nanu308
Nanu308 requested changes Jul 28, 2024
View reviewed changes
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.

See Comments

maps/map_files/BigRed/BigRed.dmm Show resolved Hide resolved
@Nanu308 Nanu308 removed the Stale beg a maintainer to review your PR label Jul 28, 2024
@Nanu308 Nanu308 marked this pull request as draft July 28, 2024 13:29
@Steelpoint
Copy link
Contributor Author

Requested changes made.

@Steelpoint Steelpoint marked this pull request as ready for review July 29, 2024 08:48
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 7, 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 Aug 11, 2024
@cm13-github
Copy link
Contributor

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

Nanu308
Nanu308 approved these changes Sep 1, 2024
View reviewed changes
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, might need some further concrete spots to make it visually more in line but good for now

@Nanu308 Nanu308 added this pull request to the merge queue Sep 1, 2024
Merged via the queue into cmss13-devs:master with commit ddd38a0 Sep 1, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Sep 1, 2024
@cm13-github
Automatic changelog for PR #6602 [ci skip]
a8d5f17
@Steelpoint
Copy link
Contributor Author

I'll almost certainly do more touch-ups in the future in-between my UPP map PR.

@Steelpoint Steelpoint deleted the SolarisUpdate branch September 1, 2024 17:59
@Steelpoint Steelpoint mentioned this pull request Sep 2, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nanu308 Nanu308 Nanu308 approved these changes

Assignees
No one assigned
Labels
Mapping did you remember to save in tgm format?
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Steelpoint @cm13-github @Nanu308