From 2ec77d2d9b79052ee59c0990fa5a1eec0afbd2dd Mon Sep 17 00:00:00 2001 From: oranges Date: Wed, 4 Oct 2017 12:47:28 +1300 Subject: [PATCH] Merge pull request #31237 from Cyberboss/STAPIUpdate Server tools API update to 3.1.0.1 --- code/__DEFINES/server_tools.dm | 9 ++++++--- code/modules/server_tools/st_interface.dm | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/server_tools.dm b/code/__DEFINES/server_tools.dm index b86a54959f..2773965d9c 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 +// /tg/station 13 server tools API v3.1.0.1 //CONFIGURATION //use this define if you want to do configuration outside of this file @@ -21,6 +21,8 @@ #define SERVER_TOOLS_LOG(message) log_world("SERVICE: [##message]") //Notify current in-game administrators of a string `event` #define SERVER_TOOLS_NOTIFY_ADMINS(event) message_admins(##event) +//The current amount of connected clients +#define SERVER_TOOLS_CLIENT_COUNT GLOB.clients.len #endif //Required hooks: @@ -62,7 +64,7 @@ //IMPLEMENTATION -#define SERVICE_API_VERSION_STRING "3.1.0.0" +#define SERVICE_API_VERSION_STRING "3.1.0.1" #define REBOOT_MODE_NORMAL 0 #define REBOOT_MODE_HARD 1 @@ -78,12 +80,13 @@ #define SERVICE_CMD_GRACEFUL_SHUTDOWN "graceful_shutdown" #define SERVICE_CMD_WORLD_ANNOUNCE "world_announce" #define SERVICE_CMD_LIST_CUSTOM "list_custom_commands" +#define SERVICE_CMD_API_COMPATIBLE "api_compat" +#define SERVICE_CMD_PLAYER_COUNT "client_count" #define SERVICE_CMD_PARAM_KEY "serviceCommsKey" #define SERVICE_CMD_PARAM_COMMAND "command" #define SERVICE_CMD_PARAM_SENDER "sender" #define SERVICE_CMD_PARAM_CUSTOM "custom" -#define SERVICE_CMD_API_COMPATIBLE "api_compat" #define SERVICE_JSON_PARAM_HELPTEXT "help_text" #define SERVICE_JSON_PARAM_ADMINONLY "admin_only" diff --git a/code/modules/server_tools/st_interface.dm b/code/modules/server_tools/st_interface.dm index 12fb5a85c2..10b7f920e8 100644 --- a/code/modules/server_tools/st_interface.dm +++ b/code/modules/server_tools/st_interface.dm @@ -89,6 +89,8 @@ SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(server_tools_api_compatible, FALSE) return "No message set!" SERVER_TOOLS_WORLD_ANNOUNCE(msg) return "SUCCESS" + if(SERVICE_CMD_PLAYER_COUNT) + return "[SERVER_TOOLS_CLIENT_COUNT]" if(SERVICE_CMD_LIST_CUSTOM) return json_encode(ListServiceCustomCommands(FALSE)) else