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

Merge Upstream 03.12.2024 #1677

Merged
merged 52 commits into from
Dec 3, 2024

Merge remote-tracking branch 'upstream/master' into merge-upstream

5df7ede
Select commit
Loading
Failed to load commit list.
Merged

Merge Upstream 03.12.2024 #1677

Merge remote-tracking branch 'upstream/master' into merge-upstream
5df7ede
Select commit
Loading
Failed to load commit list.
MapDiffBot-2 / MapDiffBot2 (2/2) succeeded Dec 3, 2024 in 0s

Map renderings

Please file any issues here.

Github may fail to render some images, appearing as cropped on large map changes. Please use the raw links in this case.

Maps with diff:

Details

MODIFIED - _maps/map_files220/RandomZLevels/spacebattle.dmm (Z-level: 1)

Modified region: (71, 106) -> (175, 201)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
MODIFIED - _maps/map_files220/RandomZLevels/wildwest.dmm (Z-level: 1)

Modified region: (73, 38) -> (77, 42)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
MODIFIED - _maps/map_files220/generic/Admin_Zone.dmm (Z-level: 1)

Modified region: (17, 136) -> (249, 254)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
MODIFIED - _maps/map_files220/generic/Lavaland.dmm (Z-level: 1)

Modified region: (15, 5) -> (70, 47)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
MODIFIED - _maps/map_files220/generic/centcomm.dmm (Z-level: 1)

Modified region: (3, 31) -> (235, 225)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
MODIFIED - _maps/map_files220/generic/centcomm_test.dmm (Z-level: 1)

Modified region: (17, 243) -> (23, 254)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
MODIFIED - _maps/map_files220/shuttles/ferry_medical.dmm (Z-level: 1)

Modified region: (3, 1) -> (7, 4)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
MODIFIED - _maps/map_files220/stations/boxstation.dmm (Z-level: 1)

Modified region: (43, 17) -> (229, 198)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
MODIFIED - _maps/map_files220/stations/deltastation.dmm (Z-level: 1)

Modified region: (13, 24) -> (229, 215)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
MODIFIED - _maps/map_files220/stations/metastation.dmm (Z-level: 1)

Modified region: (39, 53) -> (222, 203)

Raw links: Old - New - Diff

Old New Difference
If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above If the image doesn't load, use the raw link above
View more details on MapDiffBot-2