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

Conversion of obj/item/fish into /obj/item/reagent_container/food/fish and addition of fish oil #14857

Merged
merged 14 commits into from Jul 28, 2023

made slice_product work with all atoms and resolved merge conflicts

b31064c
Select commit
Failed to load commit list.
Merged

Conversion of obj/item/fish into /obj/item/reagent_container/food/fish and addition of fish oil #14857

made slice_product work with all atoms and resolved merge conflicts
b31064c
Select commit
Failed to load commit list.
MapDiffBot-2 / MapDiffBot2 succeeded Jul 28, 2023 in 48s

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 - assets/maps/prefabs/largetest.dmm (Z-level: 1)

Modified region: (1, 10) -> (96, 99)

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 - assets/maps/prefabs/planet/prefab_planet_bear_den.dmm (Z-level: 1)

Modified region: (7, 10) -> (11, 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 - assets/maps/prefabs/space/prefab_adrift_cargo_router.dmm (Z-level: 1)

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

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 - assets/maps/random_rooms/3x5/beachroom.dmm (Z-level: 1)

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

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 - assets/maps/random_rooms/5x3/cats.dmm (Z-level: 1)

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

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

Modified region: (156, 193) -> (160, 197)

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

Modified region: (147, 124) -> (151, 128)

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

Modified region: (172, 187) -> (176, 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/cogmap2.dmm (Z-level: 1)

Modified region: (91, 197) -> (95, 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/donut2.dmm (Z-level: 1)

Modified region: (54, 90) -> (58, 94)

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

Modified region: (184, 126) -> (188, 130)

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

Modified region: (104, 145) -> (108, 149)

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

Modified region: (89, 138) -> (265, 282)

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

Modified region: (123, 187) -> (127, 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/unused/chiron.dmm (Z-level: 1)

Modified region: (140, 145) -> (144, 149)

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

Modified region: (75, 86) -> (79, 90)

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

Modified region: (165, 74) -> (215, 228)

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

Modified region: (167, 123) -> (171, 127)

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

Modified region: (152, 135) -> (193, 176)

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

Modified region: (124, 150) -> (128, 154)

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

Modified region: (116, 108) -> (120, 112)

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

Modified region: (39, 45) -> (43, 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/unused/ozymandias.dmm (Z-level: 1)

Modified region: (180, 152) -> (184, 156)

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

Modified region: (162, 161) -> (166, 165)

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/unused/setpieces/SHARED_biodomeExpanded.dmm (Z-level: 1)

Modified region: (161, 46) -> (165, 50)

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

Modified region: (191, 163) -> (195, 167)

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

Modified region: (38, 102) -> (126, 195)

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