Revert "Merge branch 'master' of https://github.com/SPLURT-Station/S.…

…P.L.U.R.T-Station-13" This reverts commit a27a8d2, reversing changes made to a43fec1.
Kush1Push1 · Oct 23, 2023 · 3502fa7 · 3502fa7
1 parent 48a5a97
commit 3502fa7
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 30 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.0"
+#define TGS_DMAPI_VERSION "6.5.3"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
@@ -129,13 +129,6 @@
 /// DreamDaemon Ultrasafe security level.
 #define TGS_SECURITY_ULTRASAFE 2
 
-/// DreamDaemon public visibility level.
-#define TGS_VISIBILITY_PUBLIC 0
-/// DreamDaemon private visibility level.
-#define TGS_VISIBILITY_PRIVATE 1
-/// DreamDaemon invisible visibility level.
-#define TGS_VISIBILITY_INVISIBLE 2
-
 //REQUIRED HOOKS
 
 /**
@@ -465,10 +458,6 @@
 /world/proc/TgsSecurityLevel()
 	return
 
-/// Returns the current BYOND visibility level as a TGS_VISIBILITY_ define if TGS is present, null otherwise. Requires TGS to be using interop API version 5 or higher otherwise the string "___unimplemented" wil be returned. This function may sleep if the call to [/world/proc/TgsNew] is sleeping!
-/world/proc/TgsVisibility()
-	return
-
 /// Returns a list of active [/datum/tgs_revision_information/test_merge]s if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping!
 /world/proc/TgsTestMerges()
 	return

diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm
@@ -153,9 +153,4 @@
 /world/TgsSecurityLevel()
 	var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs)
 	if(api)
-		return api.SecurityLevel()
-
-/world/TgsVisibility()
-	var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs)
-	if(api)
-		return api.Visibility()
+		api.SecurityLevel()
diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm
@@ -57,6 +57,3 @@ TGS_PROTECT_DATUM(/datum/tgs_api)
 
 /datum/tgs_api/proc/SecurityLevel()
 	return TGS_UNIMPLEMENTED
-
-/datum/tgs_api/proc/Visibility()
-	return TGS_UNIMPLEMENTED
diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm
@@ -1 +1 @@
-"5.6.2"
+"5.6.1"
diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm
@@ -48,7 +48,6 @@
 #define DMAPI5_RUNTIME_INFORMATION_REVISION "revision"
 #define DMAPI5_RUNTIME_INFORMATION_TEST_MERGES "testMerges"
 #define DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL "securityLevel"
-#define DMAPI5_RUNTIME_INFORMATION_VISIBILITY "visibility"
 
 #define DMAPI5_CHAT_UPDATE_CHANNELS "channels"
 

diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
@@ -4,7 +4,6 @@
 
 	var/instance_name
 	var/security_level
-	var/visibility
 
 	var/reboot_mode = TGS_REBOOT_MODE_NORMAL
 
@@ -55,7 +54,6 @@
 
 	version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION])
 	security_level = runtime_information[DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL]
-	visibility = runtime_information[DMAPI5_RUNTIME_INFORMATION_VISIBILITY]
 	instance_name = runtime_information[DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME]
 
 	var/list/revisionData = runtime_information[DMAPI5_RUNTIME_INFORMATION_REVISION]
@@ -254,7 +252,3 @@
 /datum/tgs_api/v5/SecurityLevel()
 	RequireInitialBridgeResponse()
 	return security_level
-
-/datum/tgs_api/v5/Visibility()
-	RequireInitialBridgeResponse()
-	return visibility
diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm
@@ -48,7 +48,6 @@
 #undef DMAPI5_RUNTIME_INFORMATION_REVISION
 #undef DMAPI5_RUNTIME_INFORMATION_TEST_MERGES
 #undef DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL
-#undef DMAPI5_RUNTIME_INFORMATION_VISIBILITY
 
 #undef DMAPI5_CHAT_UPDATE_CHANNELS