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

Pubby fixes #533

Merged
merged 24 commits into from
Mar 5, 2024
Merged

Pubby fixes #533

merged 24 commits into from
Mar 5, 2024

Conversation

Mortisduem
Copy link

Re added changes to the Sec Mech, Bit Runner, and Bugs found in the Miner Office

Connected Power in Miner Office and reconnected disposal loop in the same area at the door
Moved Bit Den and added vender
Reconnected Power to New Net runner den
-Shrank the size of the atmos work  area.
-Adjusted disposal Loop to include Chapel and Library.
-Added Mail Routing helpers
Replaced arrows on Tannhauser Relay Shuttle to solid colors due to them breaking when the shuttle returns to Cent Com
@ORCACommander
Copy link

map file is broken and can you please run the installer for the merge hooks

Copy link

@ORCACommander ORCACommander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failed on: ./_maps/map_files/PubbyStation/PubbyStation.dmm
Traceback (most recent call last):
File "/usr/lib/python3.10/runpy.py", line 196, in _run_module_as_main
return _run_code(code, main_globals, None,
File "/usr/lib/python3.10/runpy.py", line 86, in _run_code
exec(code, run_globals)
File "/home/runner/work/Tannhauser-Gate/Tannhauser-Gate/tools/mapmerge2/dmm_test.py", line 39, in
_main()
File "/home/runner/work/Tannhauser-Gate/Tannhauser-Gate/tools/mapmerge2/dmm_test.py", line 33, in _main
return _self_test()
File "/home/runner/work/Tannhauser-Gate/Tannhauser-Gate/tools/mapmerge2/dmm_test.py", line 16, in _self_test
DMM.from_file(fullpath)
File "/home/runner/work/Tannhauser-Gate/Tannhauser-Gate/tools/mapmerge2/dmm.py", line 26, in from_file
return _parse(f.read())
File "/home/runner/work/Tannhauser-Gate/Tannhauser-Gate/tools/mapmerge2/dmm.py", line 569, in _parse
raise ValueError(f"dmm failed to parse, check for a syntax error near or after key {max_key!r}")
ValueError: dmm failed to parse, check for a syntax error near or after key 'hBn'
Error: Process completed with exit code 1.

@Mortisduem
Copy link
Author

Only Screenshot test is failing, map tests pass.

Current Pubby changes ready for merge

@ORCACommander ORCACommander merged commit 8800809 into master Mar 5, 2024
22 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants