From e346238472aa16a1f39d70f82bb6c3bd805812ec Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Thu, 27 Oct 2022 18:13:11 +0100
Subject: [PATCH 1/2] DMAPI 515 compat for TGS3

---
 build/Version.props        | 2 +-
 src/DMAPI/tgs.dm           | 2 +-
 src/DMAPI/tgs/v3210/api.dm | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/Version.props b/build/Version.props
index 2cab724f17..e8cb350332 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -8,7 +8,7 @@
     <TgsApiVersion>9.7.0</TgsApiVersion>
     <TgsApiLibraryVersion>10.1.0</TgsApiLibraryVersion>
     <TgsClientVersion>11.1.0</TgsClientVersion>
-    <TgsDmapiVersion>6.0.5</TgsDmapiVersion>
+    <TgsDmapiVersion>6.0.6</TgsDmapiVersion>
     <TgsInteropVersion>5.3.0</TgsInteropVersion>
     <TgsHostWatchdogVersion>1.2.0</TgsHostWatchdogVersion>
     <TgsContainerScriptVersion>1.2.0</TgsContainerScriptVersion>
diff --git a/src/DMAPI/tgs.dm b/src/DMAPI/tgs.dm
index 51bf6e66f7..83e06658c5 100644
--- a/src/DMAPI/tgs.dm
+++ b/src/DMAPI/tgs.dm
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.0.5"
+#define TGS_DMAPI_VERSION "6.0.6"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
diff --git a/src/DMAPI/tgs/v3210/api.dm b/src/DMAPI/tgs/v3210/api.dm
index 9bcc801897..3c218d5b10 100644
--- a/src/DMAPI/tgs/v3210/api.dm
+++ b/src/DMAPI/tgs/v3210/api.dm
@@ -99,7 +99,11 @@
 	if(skip_compat_check && !fexists(SERVICE_INTERFACE_DLL))
 		TGS_ERROR_LOG("Service parameter present but no interface DLL detected. This is symptomatic of running a service less than version 3.1! Please upgrade.")
 		return
+	#if DM_VERSION >= 515
+	call_ext(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(instance_name, command) //trust no retval
+	#else
 	call(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(instance_name, command) //trust no retval
+	#endif
 	return TRUE
 
 /datum/tgs_api/v3210/OnTopic(T)

From 9a7c8d44ba29aebcffc7c0cc7768185a7297e9a3 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Thu, 27 Oct 2022 18:20:44 +0100
Subject: [PATCH 2/2] Bump bump

---
 .github/workflows/ci-suite.yml                     | 4 ++--
 tests/Tgstation.Server.Tests/Instance/ByondTest.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml
index c00b2cb4e4..43714e3cf8 100644
--- a/.github/workflows/ci-suite.yml
+++ b/.github/workflows/ci-suite.yml
@@ -51,8 +51,8 @@ jobs:
   dmapi-build:
     name: Build DMAPI
     env:
-      BYOND_MAJOR: 513
-      BYOND_MINOR: 1536
+      BYOND_MAJOR: 515
+      BYOND_MINOR: 1592
     runs-on: ubuntu-latest
     steps:
     - name: Install x86 libc Dependencies
diff --git a/tests/Tgstation.Server.Tests/Instance/ByondTest.cs b/tests/Tgstation.Server.Tests/Instance/ByondTest.cs
index db83ca4ad3..92dca4144d 100644
--- a/tests/Tgstation.Server.Tests/Instance/ByondTest.cs
+++ b/tests/Tgstation.Server.Tests/Instance/ByondTest.cs
@@ -22,7 +22,7 @@ namespace Tgstation.Server.Tests.Instance
 {
 	sealed class ByondTest : JobsRequiredTest
 	{
-		public static readonly Version TestVersion = new (513, 1536);
+		public static readonly Version TestVersion = new (515, 1592);
 
 		readonly IByondClient byondClient;