From 4b2d7b702ad29e9b2aae74f6fcea4fead1c96f5d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 9 Oct 2017 20:02:08 -0400 Subject: [PATCH 1/2] Update server tools API to 3.1.0.2 (#31451) --- code/__DEFINES/server_tools.dm | 4 ++-- code/modules/server_tools/st_interface.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/server_tools.dm b/code/__DEFINES/server_tools.dm index 2773965d9c..9547c381c1 100644 --- a/code/__DEFINES/server_tools.dm +++ b/code/__DEFINES/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 @@ -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 diff --git a/code/modules/server_tools/st_interface.dm b/code/modules/server_tools/st_interface.dm index 10b7f920e8..39bebbbb3d 100644 --- a/code/modules/server_tools/st_interface.dm +++ b/code/modules/server_tools/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