From 4afa5e75b024d7343b4de1af1f03c3a743949f6c Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 27 May 2020 21:08:29 -0400 Subject: [PATCH] AHHHH WTFFF --- build/Version.props | 2 +- src/DMAPI/tgs/v4/api.dm | 4 +++- src/DMAPI/tgs/v5/api.dm | 2 ++ tests/DMAPI/LongRunning/Test.dm | 1 + tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs | 3 --- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build/Version.props b/build/Version.props index a5d010ffb8..bda24b2315 100644 --- a/build/Version.props +++ b/build/Version.props @@ -5,7 +5,7 @@ 4.3.0 6.5.0 7.1.0 - 5.2.1 + 5.2.2 0.4.0 1.1.0 diff --git a/src/DMAPI/tgs/v4/api.dm b/src/DMAPI/tgs/v4/api.dm index 1dc98f811e..5e7f3c60be 100644 --- a/src/DMAPI/tgs/v4/api.dm +++ b/src/DMAPI/tgs/v4/api.dm @@ -114,12 +114,14 @@ /datum/tgs_api/v4/OnInitializationComplete() Export(TGS4_COMM_SERVER_PRIMED) - var/tgs4_secret_sleep_offline_sauce = 24051994 + var/tgs4_secret_sleep_offline_sauce = 29051994 var/old_sleep_offline = world.sleep_offline world.sleep_offline = tgs4_secret_sleep_offline_sauce sleep(1) if(world.sleep_offline == tgs4_secret_sleep_offline_sauce) //if not someone changed it world.sleep_offline = old_sleep_offline + else + TGS_WARNING_LOG("world.sleep_offline unexpectedly changed!") /datum/tgs_api/v4/OnTopic(T) var/list/params = params2list(T) diff --git a/src/DMAPI/tgs/v5/api.dm b/src/DMAPI/tgs/v5/api.dm index 8ca85faf05..9dab17c935 100644 --- a/src/DMAPI/tgs/v5/api.dm +++ b/src/DMAPI/tgs/v5/api.dm @@ -94,6 +94,8 @@ sleep(1) if(world.sleep_offline == tgs4_secret_sleep_offline_sauce) //if not someone changed it world.sleep_offline = old_sleep_offline + else + TGS_WARNING_LOG("world.sleep_offline unexpectedly changed!") /datum/tgs_api/v5/proc/TopicResponse(error_message = null) var/list/response = list() diff --git a/tests/DMAPI/LongRunning/Test.dm b/tests/DMAPI/LongRunning/Test.dm index 73b84e952b..ee7eaf56ea 100644 --- a/tests/DMAPI/LongRunning/Test.dm +++ b/tests/DMAPI/LongRunning/Test.dm @@ -1,4 +1,5 @@ /world/New() + log << "Initial value of sleep_offline: [sleep_offline]" TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_ULTRASAFE) StartAsync() diff --git a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs index 59066cfaf5..2bb6f3b260 100644 --- a/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs +++ b/tests/Tgstation.Server.Tests/Instance/WatchdogTest.cs @@ -260,9 +260,6 @@ namespace Tgstation.Server.Tests.Instance { throw; } - catch - { - } } async Task DeployTestDme(string dmeName, DreamDaemonSecurity deploymentSecurity, CancellationToken cancellationToken)