diff --git a/.gitignore b/.gitignore index 65443a2650c..6de02452edd 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,6 @@ site # mapmanip-generated DMM files _maps/map_files/**/*.mapmanipout.dmm + +# byond version manager tracking file +.byondversion diff --git a/code/__DEFINES/_init.dm b/code/__DEFINES/_init.dm index 3562b9a6101..ed2acc7e5b9 100644 --- a/code/__DEFINES/_init.dm +++ b/code/__DEFINES/_init.dm @@ -5,9 +5,14 @@ // This allows us to get the real details of everything lagging at server start. world.Profile(PROFILE_START) #if defined(ENABLE_BYOND_TRACY) - var/tracy_init = CALL_EXT("prof.dll", "init")() // Setup Tracy integration - if(tracy_init != "0") - CRASH("Tracy init error: [tracy_init]") + var/init = call_ext("prof.dll", "init")() + + if(length(init) != 0 && init[1] == ".") // if first character is ., then it returned the output filename + world.log << "Tracy output file: [init]" + + else if("0" != init) + CRASH("Tracy init error: [init]") + #endif // After that, the debugger is initialized. // Doing it this early makes it possible to set breakpoints in the New() diff --git a/paradise.dme b/paradise.dme index d7f30ef7281..bbd805d3f8e 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1752,12 +1752,12 @@ #include "code\modules\buildmode\submodes\link.dm" #include "code\modules\buildmode\submodes\mapgen.dm" #include "code\modules\buildmode\submodes\offer.dm" +#include "code\modules\buildmode\submodes\portal.dm" #include "code\modules\buildmode\submodes\save.dm" #include "code\modules\buildmode\submodes\say.dm" #include "code\modules\buildmode\submodes\throwing.dm" #include "code\modules\buildmode\submodes\tilt.dm" #include "code\modules\buildmode\submodes\variable_edit.dm" -#include "code\modules\buildmode\submodes\portal.dm" #include "code\modules\client\2fa.dm" #include "code\modules\client\client_defines.dm" #include "code\modules\client\client_procs.dm" diff --git a/prof.dll b/prof.dll index 279f16de361..2e36b321b16 100644 Binary files a/prof.dll and b/prof.dll differ