diff --git a/build/Version.props b/build/Version.props index f8cbd5f8fc..4448449308 100644 --- a/build/Version.props +++ b/build/Version.props @@ -7,7 +7,7 @@ 3.0.0 8.3.0 9.2.0 - 6.0.1 + 6.0.2 5.3.0 1.1.1 1.2.0 diff --git a/src/DMAPI/tgs.dm b/src/DMAPI/tgs.dm index de9533dc32..a379073193 100644 --- a/src/DMAPI/tgs.dm +++ b/src/DMAPI/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "6.0.1" +#define TGS_DMAPI_VERSION "6.0.2" // All functions and datums outside this document are subject to change with any version and should not be relied on. diff --git a/src/DMAPI/tgs/v3210/api.dm b/src/DMAPI/tgs/v3210/api.dm index 5b41e6a89d..245381b93e 100644 --- a/src/DMAPI/tgs/v3210/api.dm +++ b/src/DMAPI/tgs/v3210/api.dm @@ -160,7 +160,7 @@ var/datum/tgs_revision_information/test_merge/tm = new tm.number = text2num(I) var/list/entry = json[I] - tm.pull_request_commit = entry["commit"] + tm.head_commit = entry["commit"] tm.author = entry["author"] tm.title = entry["title"] . += tm diff --git a/tests/DMAPI/BasicOperation/Config.dm b/tests/DMAPI/BasicOperation/Config.dm index 1fff7f2a61..3cd3f332de 100644 --- a/tests/DMAPI/BasicOperation/Config.dm +++ b/tests/DMAPI/BasicOperation/Config.dm @@ -9,3 +9,4 @@ #define TGS_ERROR_LOG(message) world.log << "Err: [##message]" #define TGS_NOTIFY_ADMINS(event) #define TGS_CLIENT_COUNT 0 +#define TGS_V3_API diff --git a/tests/DMAPI/BasicOperation/Test.dm b/tests/DMAPI/BasicOperation/Test.dm index 23dbc6295c..d0119e52fc 100644 --- a/tests/DMAPI/BasicOperation/Test.dm +++ b/tests/DMAPI/BasicOperation/Test.dm @@ -17,7 +17,7 @@ var/list/world_params = params2list(world.params) if(!("test" in world_params) || world_params["test"] != "bababooey") text2file("Expected parameter test=bababooey but did not receive", "test_fail_reason.txt") - + world.log << "sleep2" sleep(150) world.log << "Terminating..."