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

WHOOPSIE DAISY (fix MetaStation *ALWAYS* loading in CI) #5164

Merged
merged 1 commit into from
Jan 29, 2025
Merged

WHOOPSIE DAISY (fix MetaStation *ALWAYS* loading in CI) #5164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion code/__DEFINES/maps.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,13 @@ Always compile, always use that verb, and always make sure that it works for wha
#define MAP_MAXZ 6

/// Path for the next_map.json file, if someone, for some messed up reason, wants to change it.
#define PATH_TO_NEXT_MAP_JSON (world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") ? "data/next_map.json" : "data/next_map.[world.port].json") // monkestation edit: messed up cat here, i changed it (added world.port to it if there's no debugger attached)
// monkestation start: messed up cat here, i changed it (added world.port to it if there's no debugger attached)
#ifdef UNIT_TESTS
#define PATH_TO_NEXT_MAP_JSON "data/next_map.json"
#else
#define PATH_TO_NEXT_MAP_JSON (world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") ? "data/next_map.json" : "data/next_map.[world.port].json")
#endif
// monkestation end

/// List of directories we can load map .json files from
#define MAP_DIRECTORY_MAPS "_maps"
Expand Down
Loading