mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-15 17:19:29 +01:00
RoxyandGitHub
cad488c54c
## About The Pull Request Reset several TG maps to the upstream state they were in in the latest commit of our last upstream pull (https://github.com/tgstation/tgstation/commit/7e87521ba4c6fa88ac8836e88083873d6f1a259a) **NOTE: This has absolutely no effect on the maps contents, the differences in our version and upstream's were purely in TGM keys** ## Why It's Good For The Game At some point, presumably years ago, edits were made to these TG maps and then undone by way of editing the map instead of reverting the commit, the way the TGM map format works made it change some of the map keys in such a way that it differed from upstream's files, but remained identical in terms of map contents. The purpose of the PR is just to reset the files so that during upstream pulls it doesn't have to do auto merge resolution because of the differing keys. ## Proof Of Testing ``` dmm-tools.exe diff-maps .\_maps\map_files\Deltastation\DeltaStation2.dmm D:\Projects\tgstation\_maps\map_files\Deltastation\DeltaStation2.dmm .\_maps\map_files\Deltastation\DeltaStation2.dmm D:\Projects\tgstation\_maps\map_files\Deltastation\DeltaStation2.dmm dmm-tools.exe diff-maps .\_maps\map_files\IceBoxStation\IceBoxStation.dmm D:\Projects\tgstation\_maps\map_files\IceBoxStation\IceBoxStation.dmm .\_maps\map_files\IceBoxStation\IceBoxStation.dmm D:\Projects\tgstation\_maps\map_files\IceBoxStation\IceBoxStation.dmm dmm-tools.exe diff-maps .\_maps\map_files\MetaStation\MetaStation.dmm D:\Projects\tgstation\_maps\map_files\MetaStation\MetaStation.dmm .\_maps\map_files\MetaStation\MetaStation.dmm D:\Projects\tgstation\_maps\map_files\MetaStation\MetaStation.dmm dmm-tools.exe diff-maps .\_maps\map_files\NebulaStation\NebulaStation.dmm D:\Projects\tgstation\_maps\map_files\NebulaStation\NebulaStation.dmm .\_maps\map_files\NebulaStation\NebulaStation.dmm D:\Projects\tgstation\_maps\map_files\NebulaStation\NebulaStation.dmm dmm-tools.exe diff-maps .\_maps\map_files\generic\CentCom.dmm D:\Projects\tgstation\_maps\map_files\generic\CentCom.dmm .\_maps\map_files\generic\CentCom.dmm D:\Projects\tgstation\_maps\map_files\generic\CentCom.dmm dmm-tools.exe diff-maps .\_maps\map_files\tramstation\tramstation.dmm D:\Projects\tgstation\_maps\map_files\tramstation\tramstation.dmm .\_maps\map_files\tramstation\tramstation.dmm D:\Projects\tgstation\_maps\map_files\tramstation\tramstation.dmm ``` These are map diffs run for all 6 maps, the bubber repo is on the current master branch, and the tg repo is checked out to the commit mentioned above, the lack of output except for the map name indicates the two maps are identical in contents. ## Changelog N/A