cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

the fucker (#22103)

Browse Source
This commit is contained in:
wonderinghost
2024-06-03 17:38:42 -04:00
committed by GitHub
parent 365be0d414
commit 56ab363709
2 changed files with 370 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

818
_maps/map_files/GaxStation/GaxStation.dmm
View File

File diff suppressed because it is too large Load Diff

2
tools/mapmerge2/mapmerge.py
View File

@@ -88,7 +88,7 @@ def main(settings):
shutil.copyfile(fname, fname + ".before") shutil.copyfile(fname, fname + ".before")
old_map = DMM.from_file(fname + ".backup") old_map = DMM.from_file(fname + ".backup")
new_map = DMM.from_file(fname) new_map = DMM.from_file(fname)
merge_map(new_map, old_map).to_file(fname, settings.tgm) merge_map(new_map, old_map).to_file(fname, tgm=settings.tgm)
if __name__ == '__main__': if __name__ == '__main__':
main(frontend.read_settings()) main(frontend.read_settings())