From 7a9456b459dd1fbb391a183d89c7e8b21df1aece Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Wed, 6 Jul 2022 00:07:04 +0000 Subject: [PATCH] Update TGS DMAPI --- code/__DEFINES/tgs.dm | 4 +++- code/modules/tgs/README.md | 2 +- code/modules/tgs/v3210/api.dm | 2 +- code/modules/tgs/v5/api.dm | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index af09ab67110d7c..51bf6e66f7cc58 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "6.0.3" +#define TGS_DMAPI_VERSION "6.0.5" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -102,6 +102,8 @@ // #define TGS_EVENT_WORLD_REBOOT 20 /// Watchdog event when TgsInitializationComplete() is called. No parameters. #define TGS_EVENT_WORLD_PRIME 21 +// DMAPI also doesnt implement this +// #define TGS_EVENT_DREAM_DAEMON_LAUNCH 22 // OTHER ENUMS diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md index 445cee41f57c35..6319028d8106db 100644 --- a/code/modules/tgs/README.md +++ b/code/modules/tgs/README.md @@ -7,7 +7,7 @@ This folder should be placed on it's own inside a codebase that wishes to use th - The other versioned folders contain code for the different DMAPI versions. - [v3210](./v3210) contains the final TGS3 API. - [v4](./v4) is the legacy DMAPI 4 (Used in TGS 4.0.X versions). - - [v5](./v5) is the current DMAPI version used by TGS4 >=4.1. + - [v5](./v5) is the current DMAPI version used by TGS >=4.1. - [LICENSE](./LICENSE) is the MIT license for the DMAPI. APIs communicate with TGS in two ways. All versions implement TGS -> DM communication using /world/Topic. DM -> TGS communication, called the bridge method, is different for each version. diff --git a/code/modules/tgs/v3210/api.dm b/code/modules/tgs/v3210/api.dm index 640321c8642e46..9bcc8018971711 100644 --- a/code/modules/tgs/v3210/api.dm +++ b/code/modules/tgs/v3210/api.dm @@ -70,7 +70,7 @@ commit = logs[2] else TGS_ERROR_LOG("Error parsing commit logs") - + logs = TGS_FILE2LIST(".git/logs/refs/remotes/origin/master") if(logs.len) logs = splittext(logs[logs.len], " ") diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 704ff873c0a1ef..572944ed401e98 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -269,7 +269,7 @@ if(!result) return - //okay so the standard TGS4 proceedure is: right before rebooting change the port to whatever was sent to us in the above json's data parameter + //okay so the standard TGS proceedure is: right before rebooting change the port to whatever was sent to us in the above json's data parameter var/port = result[DMAPI5_BRIDGE_RESPONSE_NEW_PORT] if(!isnum(port))