Merge pull request #130 from Mirag1993/Мердж-с-оффами

Automatic TGS DMAPI Update (shiptest-ss13#2454)
CeladonSS13 · Nov 10, 2023 · 284f245 · 284f245
2 parents 0d1701d + 6ff4b48
commit 284f245
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.6.1"
+#define TGS_DMAPI_VERSION "6.6.2"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm
@@ -12,8 +12,13 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null)
 	src.version = version
 
 /datum/tgs_api/proc/TerminateWorld()
-	del(world)
-	sleep(1) // https://www.byond.com/forum/post/2894866
+	while(TRUE)
+		TGS_DEBUG_LOG("About to terminate world. Tick: [world.time], sleep_offline: [world.sleep_offline]")
+		world.sleep_offline = FALSE // https://www.byond.com/forum/post/2894866
+		del(world)
+		world.sleep_offline = FALSE // just in case, this is BYOND after all...
+		sleep(1)
+		TGS_DEBUG_LOG("BYOND DIDN'T TERMINATE THE WORLD!!! TICK IS: [world.time], sleep_offline: [world.sleep_offline]")
 
 /datum/tgs_api/latest
 	parent_type = /datum/tgs_api/v5