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

Upstream Merge The Prequel #206

Merged
merged 583 commits into from
Jan 17, 2025

Merge remote-tracking branch 'nova/master' into upsterrrrrrrrreem,

ccbc171
Select commit
Loading
Failed to load commit list.
Merged

Upstream Merge The Prequel #206

Merge remote-tracking branch 'nova/master' into upsterrrrrrrrreem,
ccbc171
Select commit
Loading
Failed to load commit list.
MapDiffBot-2 / MapDiffBot2 (1/3) succeeded Jan 16, 2025 in 2m 44s

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/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm (Z-level: 1)

Modified region: (1, 1) -> (2, 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/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm (Z-level: 1)

Modified region: (22, 21) -> (26, 25)

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/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm (Z-level: 1)

Modified region: (10, 8) -> (14, 12)

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/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm (Z-level: 1)

Modified region: (29, 32) -> (33, 36)

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/RandomRuins/LavaRuins/nova/lavaland_surface_interdyne_base1.dmm (Z-level: 1)

Modified region: (20, 8) -> (24, 12)

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/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm (Z-level: 1)

Modified region: (2, 2) -> (6, 6)

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/RandomRuins/SpaceRuins/anomaly_research.dmm (Z-level: 1)

Modified region: (1, 1) -> (51, 35)

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/RandomRuins/SpaceRuins/bigderelict1.dmm (Z-level: 1)

Modified region: (34, 17) -> (38, 21)

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/RandomRuins/SpaceRuins/bus.dmm (Z-level: 1)

Modified region: (5, 10) -> (9, 14)

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/RandomRuins/SpaceRuins/dangerous_research.dmm (Z-level: 1)

Modified region: (19, 23) -> (23, 27)

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/RandomRuins/SpaceRuins/garbagetruck4.dmm (Z-level: 1)

Modified region: (1, 1) -> (9, 6)

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/RandomRuins/SpaceRuins/interdyne.dmm (Z-level: 1)

Modified region: (15, 3) -> (19, 7)

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/RandomRuins/SpaceRuins/meatderelict.dmm (Z-level: 1)

Modified region: (21, 8) -> (31, 15)

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/RandomRuins/SpaceRuins/mimesvsclowns.dmm (Z-level: 1)

Modified region: (4, 5) -> (15, 12)

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/RandomRuins/SpaceRuins/nova/blackmarket.dmm (Z-level: 1)

Modified region: (11, 1) -> (17, 6)

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/RandomRuins/SpaceRuins/nova/cargodiselost.dmm (Z-level: 1)

Modified region: (6, 14) -> (10, 18)

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/RandomRuins/SpaceRuins/nova/crash.dmm (Z-level: 1)

Modified region: (1, 1) -> (2, 9)

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/RandomRuins/SpaceRuins/nova/des_two.dmm (Z-level: 1)

Modified region: (19, 19) -> (29, 23)

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/RandomRuins/SpaceRuins/nova/ghostship.dmm (Z-level: 1)

Modified region: (1, 1) -> (27, 19)

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/RandomRuins/SpaceRuins/nova/piratefort.dmm (Z-level: 1)

Modified region: (5, 33) -> (13, 39)

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/RandomRuins/SpaceRuins/nova/port_tarkon.dmm (Z-level: 1)

Modified region: (18, 43) -> (48, 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/RandomRuins/SpaceRuins/nova/scrapheap.dmm (Z-level: 1)

Modified region: (19, 1) -> (33, 22)

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/RandomRuins/SpaceRuins/nova/shuttlescrap.dmm (Z-level: 1)

Modified region: (1, 1) -> (3, 9)

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/RandomRuins/SpaceRuins/nova/spacehotel.dmm (Z-level: 1)

Modified region: (35, 45) -> (39, 49)

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/RandomRuins/SpaceRuins/nova/waypointstation.dmm (Z-level: 1)

Modified region: (3, 2) -> (38, 56)

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/RandomRuins/SpaceRuins/nova/whiteshipruin_box.dmm (Z-level: 1)

Modified region: (1, 3) -> (3, 13)

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/RandomRuins/SpaceRuins/nova/wreckedfriendship.dmm (Z-level: 1)

Modified region: (1, 1) -> (32, 21)

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/RandomRuins/SpaceRuins/nova/wreckedhomestead.dmm (Z-level: 1)

Modified region: (12, 32) -> (16, 36)

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/RandomRuins/SpaceRuins/old_infiltrator.dmm (Z-level: 1)

Modified region: (8, 16) -> (16, 22)

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/RandomRuins/SpaceRuins/prison_shuttle.dmm (Z-level: 1)

Modified region: (1, 1) -> (6, 6)

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/RandomRuins/SpaceRuins/russian_derelict.dmm (Z-level: 1)

Modified region: (25, 33) -> (56, 76)

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/RandomRuins/SpaceRuins/shuttlerelic.dmm (Z-level: 1)

Modified region: (9, 7) -> (13, 11)

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/RandomRuins/SpaceRuins/the_faceoff.dmm (Z-level: 1)

Modified region: (8, 8) -> (25, 24)

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/RandomRuins/SpaceRuins/the_outlet.dmm (Z-level: 1)

Modified region: (11, 31) -> (15, 35)

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/RandomZLevels/moonoutpost19.dmm (Z-level: 1)

Modified region: (126, 97) -> (132, 102)

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/RandomZLevels/mothership_astrum.dmm (Z-level: 1)

Modified region: (165, 175) -> (173, 186)

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/deathmatch/arena_station.dmm (Z-level: 1)

Modified region: (21, 3) -> (25, 7)

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/deathmatch/species_warfare.dmm (Z-level: 1)

Modified region: (3, 10) -> (7, 21)

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_files/Birdshot/birdshot.dmm (Z-level: 1)

Modified region: (45, 81) -> (157, 191)

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_files/Deltastation/DeltaStation2.dmm (Z-level: 1)

Modified region: (73, 64) -> (212, 174)

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_files/IceBoxStation/IceBoxStation.dmm (Z-level: 2)

Modified region: (103, 122) -> (158, 179)

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_files/IceBoxStation/IceBoxStation.dmm (Z-level: 3)

Modified region: (132, 96) -> (235, 159)

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_files/MetaStation/MetaStation.dmm (Z-level: 1)

Modified region: (52, 80) -> (149, 175)

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_files/NSVBlueshift/Blueshift.dmm (Z-level: 1)

Modified region: (65, 83) -> (69, 87)

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_files/NSVBlueshift/Blueshift.dmm (Z-level: 2)

Modified region: (132, 74) -> (169, 159)

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_files/NebulaStation/NebulaStation.dmm (Z-level: 1)

Modified region: (106, 99) -> (163, 173)

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_files/NebulaStation/NebulaStation.dmm (Z-level: 2)

Modified region: (55, 74) -> (170, 181)

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