diff --git a/src/DMAPI/tgs/core/core.dm b/src/DMAPI/tgs/core/core.dm index b15fd2c261..198ddc7d07 100644 --- a/src/DMAPI/tgs/core/core.dm +++ b/src/DMAPI/tgs/core/core.dm @@ -8,17 +8,19 @@ TGS_ERROR_LOG("Found unsupported API version: [tgs_version]. If this is a valid version please report this, backporting is done on demand.") return + TGS_INFO_LOG("Activating API for version [tgs_version]") var/datum/tgs_api/new_api = new path - TGS_INFO_LOG("Activated tgstation-server API for version [tgs_version]") var/result = new_api.OnWorldNew(event_handler ? event_handler : new /datum/tgs_event_handler/tgs_default) if(result && result != TGS_UNIMPLEMENTED) TGS_WRITE_GLOBAL(tgs, new_api) + else + TGS_ERROR_LOG("Failed to activate API!") /world/proc/SelectTgsApi(tgs_version) //remove the old 3.0 header tgs_version = replacetext(tgs_version, "/tg/station 13 Server v", "") - + var/list/version_bits = splittext(tgs_version, ".") var/super = text2num(version_bits[1]) diff --git a/src/DMAPI/tgs/v3210/api.dm b/src/DMAPI/tgs/v3210/api.dm index 210d2ac88d..1c04be9212 100644 --- a/src/DMAPI/tgs/v3210/api.dm +++ b/src/DMAPI/tgs/v3210/api.dm @@ -57,6 +57,8 @@ return splittext(trim_left(trim_right(file2text(filename))), "\n") /datum/tgs_api/v3210/OnWorldNew(datum/tgs_event_handler/event_handler) //don't use event handling in this version + . = FALSE + comms_key = world.params[SERVICE_WORLD_PARAM] instance_name = world.params[SERVICE_INSTANCE_PARAM] if(!instance_name) @@ -72,9 +74,10 @@ if(world.system_type != MS_WINDOWS) TGS_ERROR_LOG("This API version is only supported on Windows. Not running on Windows. Aborting initialization!") - return FALSE + return ListServiceCustomCommands(TRUE) ExportService("[SERVICE_REQUEST_API_VERSION] [ApiVersion()]", TRUE) + return TRUE //nothing to do for v3 /datum/tgs_api/v3210/OnInitializationComplete()