From 91d9a31842f49b980e46b7bc16f1865dbf769974 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 8 Oct 2017 10:46:13 -0400 Subject: [PATCH 1/3] Fixes GetTestMerges() returning an empty list --- DMAPI/st_interface.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DMAPI/st_interface.dm b/DMAPI/st_interface.dm index f1fd8af563..07e6a40bff 100644 --- a/DMAPI/st_interface.dm +++ b/DMAPI/st_interface.dm @@ -2,7 +2,7 @@ SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(reboot_mode, REBOOT_MODE_NORMAL) SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(server_tools_api_compatible, FALSE) /proc/GetTestMerges() - if(RunningService() && fexists(SERVICE_PR_TEST_JSON)) + if(RunningService(TRUE) && fexists(SERVICE_PR_TEST_JSON)) . = json_decode(file2text(SERVICE_PR_TEST_JSON)) if(.) return From 65225b67da222e3e4f8c473b3b8e43e81a0d32bc Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 8 Oct 2017 10:46:38 -0400 Subject: [PATCH 2/3] Version bump API to 3.1.0.2 --- DMAPI/server_tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DMAPI/server_tools.dm b/DMAPI/server_tools.dm index 6f40d9827a..b4b0c4c00f 100644 --- a/DMAPI/server_tools.dm +++ b/DMAPI/server_tools.dm @@ -1,4 +1,4 @@ -// /tg/station 13 server tools API v3.1.0.1 +// /tg/station 13 server tools API v3.1.0.2 //CONFIGURATION //use this define if you want to do configuration outside of this file From 660a21b0e9c3a40ba91731c4fc243128c2e0ae9f Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 8 Oct 2017 10:49:24 -0400 Subject: [PATCH 3/3] Update it where it counts --- DMAPI/server_tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DMAPI/server_tools.dm b/DMAPI/server_tools.dm index b4b0c4c00f..88daeb3667 100644 --- a/DMAPI/server_tools.dm +++ b/DMAPI/server_tools.dm @@ -64,7 +64,7 @@ //IMPLEMENTATION -#define SERVICE_API_VERSION_STRING "3.1.0.1" +#define SERVICE_API_VERSION_STRING "3.1.0.2" #define REBOOT_MODE_NORMAL 0 #define REBOOT_MODE_HARD 1