Skip to content

Combination of all active Major Map PRs [MDB Ignore] [DO NOT MERGE]#12166

Closed
Steelpoint wants to merge 655 commits into
cmss13-devs:masterfrom
Steelpoint:CombinedMapPR
Closed

Combination of all active Major Map PRs [MDB Ignore] [DO NOT MERGE]#12166
Steelpoint wants to merge 655 commits into
cmss13-devs:masterfrom
Steelpoint:CombinedMapPR

Conversation

@Steelpoint

@Steelpoint Steelpoint commented May 3, 2026

Copy link
Copy Markdown
Contributor

About the pull request

A combination of all active map PRs for test merge purposes.

#12322
#11666
#10925
#10823
#10611
#8387

Explain why it's good for the game

Easier mass testing of maps.

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑
mapadd: Test merges Abyssal Station
mapadd: Test merges Cape River Mining Colony
mapadd: Test merges Sekhmet Swamp
mapadd: Test merges White Antre Research Facility
mapadd: Test merges Navalis Platform 13
mapadd: Test merges Fort McNeil
/:cl:

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jun 3, 2026
@cm13-github

Copy link
Copy Markdown
Contributor

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

@cmss13-ci cmss13-ci Bot added size/L Denotes a PR that changes 200-799 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 2000+ lines, ignoring generated files. labels Jun 3, 2026
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jun 3, 2026
@cm13-github

Copy link
Copy Markdown
Contributor

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

@cmss13-ci cmss13-ci Bot added size/XXL Denotes a PR that changes 2000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 200-799 lines, ignoring generated files. labels Jun 3, 2026
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jun 3, 2026
@cm13-github

Copy link
Copy Markdown
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jun 3, 2026
@cm13-github

Copy link
Copy Markdown
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 Jun 3, 2026
@cm13-github

Copy link
Copy Markdown
Contributor

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

Comment on lines +240 to +241
bound_x = 96
bound_y = 96

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

#12368
This has moved where the bounds start for the filtration machine meaning they're offset from where they should be. At least on Trijent. Haven't checked anywhere else they're used.

Image

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jun 5, 2026
@cm13-github

Copy link
Copy Markdown
Contributor

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

@cmss13-ci

cmss13-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
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

@cmss13-ci cmss13-ci Bot added the Stale beg a maintainer to review your PR label Jun 22, 2026
@MistChristmas MistChristmas added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jun 22, 2026
@Steelpoint Steelpoint closed this Jun 22, 2026
@github-project-automation github-project-automation Bot moved this from Awaiting Review to Closed in Review Backlog Jun 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Do Not Merge If you merge this PR, I will annihilate you Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code size/XXL Denotes a PR that changes 2000+ lines, ignoring generated files. Sound Blast 5 minutes of bass boosted music to our players Sprites Remove the soul from the game. Stale Exempt PR can't go stale

Projects

Status: Closed

Development

Successfully merging this pull request may close these issues.

7 participants