Merge pull request #3258 from Citadel-Station-13/upstream-merge-31451

[MIRROR] Update server tools API to 3.1.0.2

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

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