diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6693b3684ef..2a7348e7282 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,7 +93,7 @@ jobs: redis-version: 6 - name: Compile & Run Unit Tests run: | - tools/ci/install_byond.sh + tools/ci/install_byond.sh '${{ matrix.byondtype }}' source $HOME/BYOND/byond/bin/byondsetup tools/ci/dm.sh -DCIBUILDING paradise.dme echo '${{ matrix.maptype }}' > data/next_map.txt diff --git a/code/controllers/subsystem/profiler.dm b/code/controllers/subsystem/profiler.dm index 9acfc20831a..cf6c31983f4 100644 --- a/code/controllers/subsystem/profiler.dm +++ b/code/controllers/subsystem/profiler.dm @@ -38,11 +38,11 @@ SUBSYSTEM_DEF(profiler) // You cant proc-call onto /world /datum/controller/subsystem/profiler/proc/StartProfiling() world.Profile(PROFILE_START) - world.Profile(PROFILE_START, type = "sendmaps") + world.Profile(PROFILE_START, "sendmaps") /datum/controller/subsystem/profiler/proc/StopProfiling() world.Profile(PROFILE_STOP) - world.Profile(PROFILE_STOP, type = "sendmaps") + world.Profile(PROFILE_STOP, "sendmaps") // Write the file while also cost tracking /datum/controller/subsystem/profiler/proc/DumpFile() @@ -51,7 +51,7 @@ SUBSYSTEM_DEF(profiler) // FETCH PROC PROFILE // // Fetch info - var/current_profile_data = world.Profile(PROFILE_REFRESH, format = "json") + var/current_profile_data = world.Profile(PROFILE_REFRESH, "json") nfetch_cost = MC_AVERAGE(nfetch_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) CHECK_TICK // this shouldnt sleep given its being called from fire() but ehhhhhhhhhhhhhhhh @@ -73,7 +73,7 @@ SUBSYSTEM_DEF(profiler) // FETCH MAPTICK PROFILE // // Fetch info - var/current_sendmaps_data = world.Profile(PROFILE_REFRESH, type = "sendmaps", format = "json") + var/current_sendmaps_data = world.Profile(PROFILE_REFRESH, "sendmaps", "json") mfetch_cost = MC_AVERAGE(mfetch_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) CHECK_TICK diff --git a/config/example/config.toml b/config/example/config.toml index 59d2582b9d9..2017bcd1219 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -338,7 +338,7 @@ byond_account_age_threshold = 3 # Maximum CIDs a client can have attached to them before they trip a warning max_client_cid_history = 20 # Enable automatic profiling of rounds to profile.json -enable_auto_profiler = true +enable_auto_profiler = false # REVERT THIS AFTER 515 BECOMES NOT BUSTED # Auto disable OOC when round starts? auto_disable_ooc = true # Enable/disable the breaking of bones