Skip to content

[MDB IGNORE] Makes outpost ingame mapsize match the mapped size, allows larger outpost maps, kind of - #6265

Merged
prodirus merged 15 commits into
shiptest-ss13:masterfrom
rye-rice:overmap_patch
Nov 14, 2026
Merged

prodirus merged 15 commits into
shiptest-ss13:masterfrom
rye-rice:overmap_patch

Conversation

@rye-rice

@rye-rice rye-rice commented May 9, 2026

Copy link
Copy Markdown
Member

About The Pull Request

This in short, fixes some weird mapzone stuff to prevent some deadspace inbetween the outpost map ending and the border. This means you can have larger outpost maps, in theory. However, one would have to prevent the map from loading if FULL_INIT isnt on to prevent errors when loading on a local build. But it should now load without any bugs.

Why It's Good For The Game

This has always bugged me and i heard rumors that maybe someone wanted a larger sized outpost.

Changelog

🆑
fix: Outpost maps should no longer have space in between their borders and edges.
/:cl:

@rye-rice
rye-rice requested a review from MarkSuckerberg as a code owner May 9, 2026 00:32
@github-actions github-actions Bot added the Code change Watch something violently break. label May 9, 2026
@thearbiber

Copy link
Copy Markdown
Contributor

thank you so much

@rye-rice
rye-rice requested a review from a team as a code owner May 31, 2026 05:53
@github-actions github-actions Bot added the Map Change Tile placing is hard. Thank you for your service. label May 31, 2026
@rye-rice

Copy link
Copy Markdown
Member Author

Made this better to resemble static overmap objects better

@Erikafox Erikafox left a comment

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.

This is jank and weird and it needs to not be so we don't have weird mapgen problems. Just make the outpost explicitly use a whole z level or something.

main_template.width,
main_template.height,
ALLOCATION_QUADRANT,
QUADRANT_MAP_SIZE

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.

The allocation and quadrant size need to actually match the size of the outpost. I suggest you just make the outpost spawn an entire z level for itself so it's not a weird annoying pain in the ass.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

As the borders are mapped in with the map, it IS matching the outpost map size


var/turf/spawn_turf = locate(vlevel.low_x,vlevel.low_y,vlevel.z_value)

main_template.load(vlevel.get_unreserved_bottom_left_turf())

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.

why not just use this proc?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

get_unreserved_bottom_left_turf() is for getting the most bottom left non-border turf, since we map in the border with the map, we need to get the true bottom left of the vlevel to load the map on

@github-actions

github-actions Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

This PR has been inactive for a month. This means it is at risk of being auto closed in a week, 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 All falls to entropy eventually. label Jul 1, 2026
@github-actions github-actions Bot closed this Jul 9, 2026
@generalthrax generalthrax reopened this Jul 9, 2026
@generalthrax generalthrax removed the Stale All falls to entropy eventually. label Jul 9, 2026
rye-rice and others added 6 commits July 14, 2026 21:59
Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Signed-off-by: rye-rice <58402542+rye-rice@users.noreply.github.com>
This reverts commit 62004ed.
@rye-rice

Copy link
Copy Markdown
Member Author

This is jank and weird and it needs to not be so we don't have weird mapgen problems. Just make the outpost explicitly use a whole z level or something.

To be honest, I probably should have said this when review was sent, but I think thats out of scope, it's not that i disagree with you, but this was meant to be a small and quick improvement; it is now is absolutely much better than how outposts are handled ingame rn; if you look at agini's map edge on live you will notice a lot of empty space as the game generates map borders wayyy outside the map's height. This tries to make outposts have parity with how punchcards load maps, hence some of the changes seeming odd

@rye-rice rye-rice changed the title Makes outpost ingame mapsize match the mapped size, allows larger outpost maps, kind of [MDB IGNORE] Makes outpost ingame mapsize match the mapped size, allows larger outpost maps, kind of Jul 15, 2026
@github-actions

Copy link
Copy Markdown
Contributor

This PR has been inactive for a month. This means it is at risk of being auto closed in a week, 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 All falls to entropy eventually. label Aug 15, 2026
@github-actions github-actions Bot closed this Aug 23, 2026
@Erikafox
Erikafox dismissed their stale review October 28, 2026 00:15

going to merge this after the trifuge

@github-actions github-actions Bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 28, 2026
@github-actions

Copy link
Copy Markdown
Contributor

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

@prodirus
prodirus requested review from a team and FalloutFalcon as code owners November 14, 2026 22:56
@github-actions github-actions Bot added Config Watch us shake head admins violently until this gets merged. DME Edit Sprites A bikeshed full of soulless bikes. TGUI Sound USSR Anthem 2.66 MB file. Dependencies GitHub Our very own Babylon. Ship Ship successfully tested. Ruin Ruin successfully tested. labels Nov 14, 2026
@github-actions github-actions Bot removed Merge Conflict Use Git Hooks, you're welcome. Config Watch us shake head admins violently until this gets merged. DME Edit Sprites A bikeshed full of soulless bikes. Sound USSR Anthem 2.66 MB file. Dependencies Ship Ship successfully tested. Ruin Ruin successfully tested. labels Nov 14, 2026
@prodirus
prodirus added this pull request to the merge queue Nov 14, 2026
Merged via the queue into shiptest-ss13:master with commit 2d4daca Nov 14, 2026
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Code change Watch something violently break. GitHub Our very own Babylon. Map Change Tile placing is hard. Thank you for your service. Test Merge Candidate You do it for free. TGUI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants