diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm
index e164a4ec96..7c0811ec59 100644
--- a/code/__DEFINES/tgs.dm
+++ b/code/__DEFINES/tgs.dm
@@ -1,253 +1,343 @@
-//tgstation-server DMAPI
+// tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "5.1.1"
+#define TGS_DMAPI_VERSION "5.2.1"
 
-//All functions and datums outside this document are subject to change with any version and should not be relied on
+// All functions and datums outside this document are subject to change with any version and should not be relied on.
 
-//CONFIGURATION
+// CONFIGURATION
 
-//create this define if you want to do configuration outside of this file
+/// Create this define if you want to do TGS configuration outside of this file.
 #ifndef TGS_EXTERNAL_CONFIGURATION
 
-//Comment this out once you've filled in the below
+// Comment this out once you've filled in the below.
 #error TGS API unconfigured
 
-//Uncomment this if you wish to allow the game to interact with TGS 3
-//This will raise the minimum required security level of your game to TGS_SECURITY_TRUSTED due to it utilizing call()()
+// Uncomment this if you wish to allow the game to interact with TGS 3.
+// This will raise the minimum required security level of your game to TGS_SECURITY_TRUSTED due to it utilizing call()()
 //#define TGS_V3_API
 
-//Required interfaces (fill in with your codebase equivalent):
+// Required interfaces (fill in with your codebase equivalent):
 
-//create a global variable named `Name` and set it to `Value`
+/// Create a global variable named `Name` and set it to `Value`.
 #define TGS_DEFINE_AND_SET_GLOBAL(Name, Value)
 
-//Read the value in the global variable `Name`
+/// Read the value in the global variable `Name`.
 #define TGS_READ_GLOBAL(Name)
 
-//Set the value in the global variable `Name` to `Value`
+/// Set the value in the global variable `Name` to `Value`.
 #define TGS_WRITE_GLOBAL(Name, Value)
 
-//Disallow ANYONE from reflecting a given `path`, security measure to prevent in-game use of DD -> TGS capabilities
+/// Disallow ANYONE from reflecting a given `path`, security measure to prevent in-game use of DD -> TGS capabilities.
 #define TGS_PROTECT_DATUM(Path)
 
-//Display an announcement `message` from the server to all players
+/// Display an announcement `message` from the server to all players.
 #define TGS_WORLD_ANNOUNCE(message)
 
-//Notify current in-game administrators of a string `event`
+/// Notify current in-game administrators of a string `event`.
 #define TGS_NOTIFY_ADMINS(event)
 
-//Write an info `message` to a server log
+/// Write an info `message` to a server log.
 #define TGS_INFO_LOG(message)
 
-//Write an warning `message` to a server log
+/// Write an warning `message` to a server log.
 #define TGS_WARNING_LOG(message)
 
-//Write an error `message` to a server log
+/// Write an error `message` to a server log.
 #define TGS_ERROR_LOG(message)
 
-//Get the number of connected /clients
+/// Get the number of connected /clients.
 #define TGS_CLIENT_COUNT
 
 #endif
 
-//EVENT CODES
+// EVENT CODES
 
-#define TGS_EVENT_REBOOT_MODE_CHANGE -1	//Before a reboot mode change, extras parameters are the current and new reboot mode enums
-#define TGS_EVENT_PORT_SWAP -2	//Before a port change is about to happen, extra parameters is new port
-#define TGS_EVENT_INSTANCE_RENAMED -3	//Before the instance is renamed, extra parameter is the new name
-#define TGS_EVENT_WATCHDOG_REATTACH -4	//After the watchdog reattaches to DD, extra parameter is the new /datum/tgs_version of the server
+/// Before a reboot mode change, extras parameters are the current and new reboot mode enums
+#define TGS_EVENT_REBOOT_MODE_CHANGE -1
+/// Before a port change is about to happen, extra parameters is new port
+#define TGS_EVENT_PORT_SWAP -2
+/// Before the instance is renamed, extra parameter is the new name
+#define TGS_EVENT_INSTANCE_RENAMED -3
+/// After the watchdog reattaches to DD, extra parameter is the new [/datum/tgs_version] of the server
+#define TGS_EVENT_WATCHDOG_REATTACH -4
 
-//See the descriptions for the parameters of these codes here: https://github.com/tgstation/tgstation-server/blob/master/src/Tgstation.Server.Host/Components/EventType.cs
+/// When the repository is reset to its origin reference. Parameters: Reference name, Commit SHA
 #define TGS_EVENT_REPO_RESET_ORIGIN 0
+/// When the repository performs a checkout. Parameters: Checkout git object
 #define TGS_EVENT_REPO_CHECKOUT 1
+/// When the repository performs a fetch operation. No parameters
 #define TGS_EVENT_REPO_FETCH 2
+/// When the repository merges a pull request. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user
 #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3
+/// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path
 #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4
+/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND
 #define TGS_EVENT_BYOND_INSTALL_START 5
+/// When a BYOND install operation fails. Parameters: Error message
 #define TGS_EVENT_BYOND_INSTALL_FAIL 6
+/// When the active BYOND version changes.  Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND
 #define TGS_EVENT_BYOND_ACTIVE_VERSION_CHANGE 7
+/// When the compiler starts running. Parameters: Game directory path, origin commit SHA
 #define TGS_EVENT_COMPILE_START 8
+/// When a compile is cancelled. No parameters
 #define TGS_EVENT_COMPILE_CANCELLED 9
+/// When a compile fails. Parameters: Game directory path, [TRUE]/[FALSE] based on if the cause for failure was DMAPI validation
 #define TGS_EVENT_COMPILE_FAILURE 10
-#define TGS_EVENT_COMPILE_COMPLETE 11 // Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the TGS_EVENT_DEPLOYMENT_COMPLETE instead
+/// When a compile operation completes. Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the [TGS_EVENT_DEPLOYMENT_COMPLETE] instead. Parameters: Game directory path
+#define TGS_EVENT_COMPILE_COMPLETE 11
+/// When an automatic update for the current instance begins. No parameters
 #define TGS_EVENT_INSTANCE_AUTO_UPDATE_START 12
+/// When the repository encounters a merge conflict: Parameters: Base SHA, target SHA, base reference, target reference
 #define TGS_EVENT_REPO_MERGE_CONFLICT 13
+/// When a deployment completes. No Parameters
 #define TGS_EVENT_DEPLOYMENT_COMPLETE 14
+/// Before the watchdog shuts down. Not sent for graceful shutdowns. No parameters.
 #define TGS_EVENT_WATCHDOG_SHUTDOWN 15
+/// Before the watchdog detaches for a TGS update/restart. No parameters.
 #define TGS_EVENT_WATCHDOG_DETACH 16
 
-//OTHER ENUMS
+// OTHER ENUMS
 
+/// The server will reboot normally.
 #define TGS_REBOOT_MODE_NORMAL 0
+/// The server will stop running on reboot.
 #define TGS_REBOOT_MODE_SHUTDOWN 1
+/// The watchdog will restart on reboot.
 #define TGS_REBOOT_MODE_RESTART 2
 
+/// DreamDaemon Trusted security level.
 #define TGS_SECURITY_TRUSTED 0
+/// DreamDaemon Safe security level.
 #define TGS_SECURITY_SAFE 1
+/// DreamDaemon Ultrasafe security level.
 #define TGS_SECURITY_ULTRASAFE 2
 
 //REQUIRED HOOKS
 
-//Call this somewhere in /world/New() that is always run
-//IMPORTANT: This function may sleep!
-//event_handler: optional user defined event handler. The default behaviour is to broadcast the event in english to all connected admin channels
-//minimum_required_security_level: The minimum required security level to run the game in which the DMAPI is integrated
+/**
+  * Call this somewhere in [/world/proc/New] that is always run. This function may sleep!
+  *
+  * * event_handler - Optional user defined [/datum/tgs_event_handler].
+  * * minimum_required_security_level: The minimum required security level to run the game in which the DMAPI is integrated. Can be one of [TGS_SECURITY_ULTRASAFE], [TGS_SECURITY_SAFE], or [TGS_SECURITY_TRUSTED].
+  */
 /world/proc/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE)
 	return
 
-//Call this when your initializations are complete and your game is ready to play before any player interactions happen
-//This may use world.sleep_offline to make this happen so ensure no changes are made to it while this call is running
-//Most importantly, before this point, note that any static files or directories may be in use by another server. Your code should account for this
-//This function should not be called before ..() in /world/New()
+/**
+  * Call this when your initializations are complete and your game is ready to play before any player interactions happen.
+  *
+  * This may use [/world/var/sleep_offline] to make this happen so ensure no changes are made to it while this call is running.
+  * Before this point, note that any static files or directories may be in use by another server. Your code should account for this.
+  * This function should not be called before ..() in [/world/proc/New].
+  */
 /world/proc/TgsInitializationComplete()
 	return
 
-//Put this at the start of /world/Topic()
+/// Put this at the start of [/world/proc/Topic].
 #define TGS_TOPIC var/tgs_topic_return = TgsTopic(args[1]); if(tgs_topic_return) return tgs_topic_return
 
-//Call this at the beginning of world/Reboot(reason)
+/**
+  * Call this at the beginning of [world/proc/Reboot].
+  */
 /world/proc/TgsReboot()
 	return
 
-//DATUM DEFINITIONS
-//unless otherwise specified all datums defined here should be considered read-only, warranty void if written
+// DATUM DEFINITIONS
+// All datums defined here should be considered read-only
 
-//represents git revision information about the current world build
+/// Represents git revision information.
 /datum/tgs_revision_information
-	var/commit			//full sha of compiled commit
-	var/origin_commit	//full sha of last known remote commit. This may be null if the TGS repository is not currently tracking a remote branch
+	/// Full SHA of the commit.
+	var/commit
+	/// Full sha of last known remote commit. This may be null if the TGS repository is not currently tracking a remote branch.
+	var/origin_commit
 
-//represents a version of tgstation-server
+/// Represents a version.
 /datum/tgs_version
-	var/suite			//The suite/major version, can be >=3
+	/// The suite/major version number
+	var/suite
 
-	//this group of variables can be null to represent a wild card
-	var/minor					//The minor version
-	var/patch					//The patch version
-	var/deprecated_patch		//The legacy version
+	// This group of variables can be null to represent a wild card
+	/// The minor version number. null for wildcards
+	var/minor
+	/// The patch version number. null for wildcards
+	var/patch
 
-	var/raw_parameter			//The unparsed parameter
-	var/deprefixed_parameter	//The version only bit of raw_parameter
+	/// Legacy version number. Generally null
+	var/deprecated_patch
 
-//if the tgs_version is a wildcard version
+	/// Unparsed string value
+	var/raw_parameter
+	/// String value minus prefix
+	var/deprefixed_parameter
+
+/**
+  * Returns [TRUE]/[FALSE] based on if the [/datum/tgs_version] contains wildcards.
+  */
 /datum/tgs_version/proc/Wildcard()
 	return
 
-//if the tgs_version equals some other_version
+/**
+  * Returns [TRUE]/[FALSE] based on if the [/datum/tgs_version] equals some other version.
+  *
+  * other_version - The [/datum/tgs_version] to compare against.
+  */
 /datum/tgs_version/proc/Equals(datum/tgs_version/other_version)
 	return
 
-//represents a merge of a GitHub pull request
+/// Represents a merge of a GitHub pull request.
 /datum/tgs_revision_information/test_merge
-	var/number				//pull request number
-	var/title				//pull request title
-	var/body				//pull request body
-	var/author				//pull request github author
-	var/url					//link to pull request html
-	var/pull_request_commit	//commit of the pull request when it was merged
-	var/time_merged			//timestamp of when the merge commit for the pull request was created
-	var/comment				//optional comment left by the one who initiated the test merge
+	/// The pull request number.
+	var/number
+	/// The pull request title when it was merged.
+	var/title
+	/// The pull request body when it was merged.
+	var/body
+	/// The GitHub username of the pull request's author.
+	var/author
+	/// An http URL to the pull request.
+	var/url
+	/// The SHA of the pull request when that was merged.
+	var/pull_request_commit
+	/// ISO 8601 timestamp of when the pull request was merged.
+	var/time_merged
+	/// (Nullable) Comment left by the TGS user who initiated the merge..
+	var/comment
 
-//represents a connected chat channel
+/// Represents a connected chat channel.
 /datum/tgs_chat_channel
-	var/id					//internal channel representation
-	var/friendly_name		//user friendly channel name
-	var/connection_name		//the name of the configured chat connection
-	var/is_admin_channel	//if the server operator has marked this channel for game admins only
-	var/is_private_channel	//if this is a private chat channel
-	var/custom_tag					//user defined string associated with channel
+	/// TGS internal channel ID.
+	var/id
+	/// User friendly name of the channel.
+	var/friendly_name
+	/// Name of the chat connection. This is the IRC server address or the Discord guild.
+	var/connection_name
+	/// [TRUE]/[FALSE] based on if the server operator has marked this channel for game admins only.
+	var/is_admin_channel
+	/// [TRUE]/[FALSE] if the channel is a private message channel for a [/datum/tgs_chat_user].
+	var/is_private_channel
+	/// Tag string associated with the channel in TGS
+	var/custom_tag
 
-//represents a chat user
+// Represents a chat user
 /datum/tgs_chat_user
-	var/id							//Internal user representation, requires channel to be unique
-	var/friendly_name				//The user's public name
-	var/mention						//The text to use to ping this user in a message
-	var/datum/tgs_chat_channel/channel	//The /datum/tgs_chat_channel this user was from
+	/// TGS internal user ID.
+	var/id
+	// The user's display name.
+	var/friendly_name
+	// The string to use to ping this user in a message.
+	var/mention
+	/// The [/datum/tgs_chat_channel] the user was from
+	var/datum/tgs_chat_channel/channel
 
-//user definable callback for handling events
-//extra parameters may be specified depending on the event
+/**
+  * User definable callback for handling TGS events.
+  *
+  * event_code - One of the TGS_EVENT_ defines. Extra parameters will be documented in each
+  */
 /datum/tgs_event_handler/proc/HandleEvent(event_code, ...)
 	set waitfor = FALSE
 	return
 
-//user definable chat command
+/// User definable chat command
 /datum/tgs_chat_command
-	var/name = ""			//the string to trigger this command on a chat bot. e.g. TGS3_BOT: do_this_command
-	var/help_text = ""		//help text for this command
-	var/admin_only = FALSE	//set to TRUE if this command should only be usable by registered chat admins
+	/// The string to trigger this command on a chat bot. e.g `@bot name ...` or `!tgs name ...`
+	var/name = ""
+	/// The help text displayed for this command
+	var/help_text = ""
+	/// If this command should be available to game administrators only
+	var/admin_only = FALSE
 
-//override to implement command
-//sender: The tgs_chat_user who send to command
-//params: The trimmed string following the command name
-//The return value will be stringified and sent to the appropriate chat
+/**
+  * Process command activation. Should return a string to respond to the issuer with.
+  *
+  * sender - The [/datum/tgs_chat_user] who issued the command.
+  * params - The trimmed string following the command `/datum/tgs_chat_command/var/name].
+  */
 /datum/tgs_chat_command/proc/Run(datum/tgs_chat_user/sender, params)
 	CRASH("[type] has no implementation for Run()")
 
-//FUNCTIONS
+// API FUNCTIONS
 
-//Returns the respective supported /datum/tgs_version of the API
+/// Returns the maximum supported [/datum/tgs_version] of the DMAPI.
 /world/proc/TgsMaximumAPIVersion()
 	return
 
+/// Returns the minimum supported [/datum/tgs_version] of the DMAPI.
 /world/proc/TgsMinimumAPIVersion()
 	return
 
-//Returns TRUE if the world was launched under the server tools and the API matches, FALSE otherwise
-//No function below this succeeds if it returns FALSE or if TgsNew() has yet to be called
+/**
+  * Returns [TRUE] if DreamDaemon was launched under TGS, the API matches, and was properly initialized. [FALSE] will be returned otherwise.
+  */
 /world/proc/TgsAvailable()
 	return
 
-//Forces a hard reboot of BYOND by ending the process
-//unlike del(world) clients will try to reconnect
-//If the service has not requested a shutdown, the next server will take over
+// No function below this succeeds if it TgsAvailable() returns FALSE or if TgsNew() has yet to be called.
+
+/**
+  * Forces a hard reboot of DreamDaemon by ending the process.
+  *
+  * Unlike del(world) clients will try to reconnect.
+  * If TGS has not requested a [TGS_REBOOT_MODE_SHUTDOWN] DreamDaemon will be launched again
+  */
 /world/proc/TgsEndProcess()
 	return
 
-//Send a message to non-admin connected chats
-//message: The message to send
-//admin_only: If TRUE, message will instead be sent to only admin connected chats
-/world/proc/TgsTargetedChatBroadcast(message, admin_only)
+/**
+  * Send a message to connected chats.
+  *
+  * message - The string to send.
+  * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies.
+  */
+/world/proc/TgsTargetedChatBroadcast(message, admin_only = FALSE)
 	return
 
-//Send a private message to a specific user
-//message: The message to send
-//user: The /datum/tgs_chat_user to send to
+/**
+  * Send a private message to a specific user.
+  *
+  * message - The string to send.
+  * user: The [/datum/tgs_chat_user] to PM.
+  */
 /world/proc/TgsChatPrivateMessage(message, datum/tgs_chat_user/user)
 	return
 
-//The following functions will sleep if a call to TgsNew() is sleeping
+// The following functions will sleep if a call to TgsNew() is sleeping
 
-//Sends a message to connected game chats
-//message: The message to send
-//channels: optional channels to limit the broadcast to
-/world/proc/TgsChatBroadcast(message, list/channels)
+/**
+  * Send a message to connected chats that are flagged as game-related in TGS.
+  *
+  * message - The string to send.
+  * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to.
+  */
+/world/proc/TgsChatBroadcast(message, list/channels = null)
 	return
 
-//Gets the current /datum/tgs_version of the server tools running the server
+/// Returns the current [/datum/tgs_version] of TGS if it is running the server, null otherwise.
 /world/proc/TgsVersion()
 	return
 
-//Gets the current /datum/tgs_version of the DMAPI being used
+/// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise.
 /world/proc/TgsApiVersion()
 	return
 
-//Gets the name of the TGS instance running the game
+/// Returns the name of the TGS instance running the game if TGS is present, null otherwise.
 /world/proc/TgsInstanceName()
 	return
 
-//Get the current `/datum/tgs_revision_information`
+/// Return the current [/datum/tgs_revision_information] of the running server if TGS is present, null otherwise.
 /world/proc/TgsRevision()
 	return
 
-//Get the current BYOND security level
+/// Returns the current BYOND security level as a TGS_SECURITY_ define if TGS is present, null otherwise.
 /world/proc/TgsSecurityLevel()
 	return
 
-//Gets a list of active `/datum/tgs_revision_information/test_merge`s
+/// Returns a list of active [/datum/tgs_revision_information/test_merge]s if TGS is present, null otherwise.
 /world/proc/TgsTestMerges()
 	return
 
-//Gets a list of connected tgs_chat_channel
+/// Returns a list of connected [/datum/tgs_chat_channel]s if TGS is present, null otherwise.
 /world/proc/TgsChatChannelInfo()
 	return
 
diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm
index a3324121bf..731be64183 100644
--- a/code/datums/tgs_event_handler.dm
+++ b/code/datums/tgs_event_handler.dm
@@ -1,3 +1,6 @@
+/datum/tgs_event_handler/impl
+	var/datum/timedevent/reattach_timer
+
 /datum/tgs_event_handler/impl/HandleEvent(event_code, ...)
 	switch(event_code)
 		if(TGS_EVENT_REBOOT_MODE_CHANGE)
@@ -18,3 +21,19 @@
 		if(TGS_EVENT_DEPLOYMENT_COMPLETE)
 			message_admins("TGS: Deployment complete!")
 			to_chat(world, "<span class='boldannounce'>Server updated, changes will be applied on the next round...</span>")
+		if(TGS_EVENT_WATCHDOG_DETACH)
+			message_admins("TGS restarting...")
+			reattach_timer = addtimer(CALLBACK(src, .proc/LateOnReattach), 1 MINUTES)
+		if(TGS_EVENT_WATCHDOG_REATTACH)
+			var/datum/tgs_version/old_version = world.TgsVersion()
+			var/datum/tgs_version/new_version = args[2]
+			if(!old_version.Equals(new_version))
+				to_chat(world, "<span class='boldannounce'>TGS updated to v[old_version.deprefixed_parameter]</span>")
+			else
+				message_admins("TGS: Back online")
+			if(reattach_timer)
+				deltimer(reattach_timer)
+				reattach_timer = null
+
+/datum/tgs_event_handler/impl/proc/LateOnReattach()
+	message_admins("Warning: TGS hasn't notified us of it coming back for a full minute! Is there a problem?")
diff --git a/code/modules/tgs/LICENSE b/code/modules/tgs/LICENSE
new file mode 100644
index 0000000000..221f9e1deb
--- /dev/null
+++ b/code/modules/tgs/LICENSE
@@ -0,0 +1,24 @@
+The MIT License
+
+Copyright (c) 2017 Jordan Brown
+
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md
new file mode 100644
index 0000000000..445cee41f5
--- /dev/null
+++ b/code/modules/tgs/README.md
@@ -0,0 +1,13 @@
+# DMAPI Internals
+
+This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified.
+
+- [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest.
+- The [core](./core) folder includes all code not directly part of any API version.
+- 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.
+- [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/core/README.md b/code/modules/tgs/core/README.md
new file mode 100644
index 0000000000..aa3c7a9c9d
--- /dev/null
+++ b/code/modules/tgs/core/README.md
@@ -0,0 +1,8 @@
+# Core DMAPI functions
+
+This folder contains all DMAPI code not directly involved in an API.
+
+- [_definitions.dm](./definitions.dm) contains defines needed across DMAPI internals.
+- [core.dm](./core.dm) contains the implementations of the `/world/proc/TgsXXX()` procs. Many map directly to the `/datum/tgs_api` functions. It also contains the /datum selection and setup code.
+- [datum.dm](./datum.dm) contains the `/datum/tgs_api` declarations that all APIs must implement.
+- [tgs_version.dm](./tgs_version.dm) contains the `/datum/tgs_version` definition
\ No newline at end of file
diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm
index a74c9bbab2..f75e7837af 100644
--- a/code/modules/tgs/core/core.dm
+++ b/code/modules/tgs/core/core.dm
@@ -154,30 +154,3 @@
 	var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs)
 	if(api)
 		api.SecurityLevel()
-
-/*
-The MIT License
-
-Copyright (c) 2017 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm
index ccc75fe344..ef6d3a4fe5 100644
--- a/code/modules/tgs/core/datum.dm
+++ b/code/modules/tgs/core/datum.dm
@@ -55,30 +55,3 @@ TGS_PROTECT_DATUM(/datum/tgs_api)
 
 /datum/tgs_api/proc/SecurityLevel()
 	return TGS_UNIMPLEMENTED
-
-/*
-The MIT License
-
-Copyright (c) 2017 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/includes.dm b/code/modules/tgs/includes.dm
index b3c1728f34..c803cf7ac2 100644
--- a/code/modules/tgs/includes.dm
+++ b/code/modules/tgs/includes.dm
@@ -15,30 +15,3 @@
 #include "v5\api.dm"
 #include "v5\commands.dm"
 #include "v5\undef.dm"
-
-/*
-The MIT License
-
-Copyright (c) 2017 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/v3210/README.md b/code/modules/tgs/v3210/README.md
new file mode 100644
index 0000000000..f96e7cf3b3
--- /dev/null
+++ b/code/modules/tgs/v3210/README.md
@@ -0,0 +1,6 @@
+# DMAPI V3
+
+This DMAPI implements bridge using file output which TGS monitors for.
+
+- [api.dm](./api.dm) contains the bulk of the API code.
+- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s.
diff --git a/code/modules/tgs/v3210/api.dm b/code/modules/tgs/v3210/api.dm
index 0fc0076c8b..e0d00ad15d 100644
--- a/code/modules/tgs/v3210/api.dm
+++ b/code/modules/tgs/v3210/api.dm
@@ -226,30 +226,3 @@
 #undef SERVICE_REQUEST_API_VERSION
 
 #undef SERVICE_RETURN_SUCCESS
-
-/*
-The MIT License
-
-Copyright (c) 2017 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/v3210/commands.dm b/code/modules/tgs/v3210/commands.dm
index 5046631981..a1949da444 100644
--- a/code/modules/tgs/v3210/commands.dm
+++ b/code/modules/tgs/v3210/commands.dm
@@ -19,7 +19,7 @@
 				TGS_ERROR_LOG("Custom command [command_name] can't be used as it is empty or contains illegal characters!")
 				warned_command_names[command_name] = TRUE
 			continue
-		
+
 		if(command_name_types[command_name])
 			if(warnings_only)
 				TGS_ERROR_LOG("Custom commands [command_name_types[command_name]] and [stc] have the same name, only [command_name_types[command_name]] will be available!")
@@ -44,35 +44,3 @@
 	user.friendly_name = sender
 	user.mention = sender
 	return stc.Run(user, params) || TRUE
-
-/*
-
-#undef SERVICE_JSON_PARAM_HELPTEXT
-#undef SERVICE_JSON_PARAM_ADMINONLY
-#undef SERVICE_JSON_PARAM_REQUIREDPARAMETERS
-
-The MIT License
-
-Copyright (c) 2017 Jordan Brown
-
-Permission is hereby granted, free of charge, 
-to any person obtaining a copy of this software and 
-associated documentation files (the "Software"), to 
-deal in the Software without restriction, including 
-without limitation the rights to use, copy, modify, 
-merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom 
-the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice 
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR 
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/v4/README.md b/code/modules/tgs/v4/README.md
new file mode 100644
index 0000000000..78191447b2
--- /dev/null
+++ b/code/modules/tgs/v4/README.md
@@ -0,0 +1,6 @@
+# DMAPI V4
+
+This DMAPI implements bridge requests using file output which TGS monitors for. It has a safe mode restriction.
+
+- [api.dm](./api.dm) contains the bulk of the API code.
+- [commands.dm](./commands.dm) contains functions relating to `/datum/tgs_chat_command`s.
diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm
index ba18aab688..1dc98f811e 100644
--- a/code/modules/tgs/v4/api.dm
+++ b/code/modules/tgs/v4/api.dm
@@ -50,6 +50,10 @@
 	return new /datum/tgs_version("4.0.0.0")
 
 /datum/tgs_api/v4/OnWorldNew(minimum_required_security_level)
+	if(minimum_required_security_level == TGS_SECURITY_ULTRASAFE)
+		TGS_WARNING_LOG("V4 DMAPI requires safe security!")
+		minimum_required_security_level = TGS_SECURITY_SAFE
+
 	json_path = world.params[TGS4_PARAM_INFO_JSON]
 	if(!json_path)
 		TGS_ERROR_LOG("Missing [TGS4_PARAM_INFO_JSON] world parameter!")
@@ -310,30 +314,3 @@
 
 /datum/tgs_api/v4/SecurityLevel()
 	return security_level
-
-/*
-The MIT License
-
-Copyright (c) 2017 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/v4/commands.dm b/code/modules/tgs/v4/commands.dm
index 1d9951bc04..4ca1500167 100644
--- a/code/modules/tgs/v4/commands.dm
+++ b/code/modules/tgs/v4/commands.dm
@@ -39,31 +39,3 @@
 			result = ""
 		return result
 	return "Unknown command: [command]!"
-
-/*
-
-The MIT License
-
-Copyright (c) 2017 Jordan Brown
-
-Permission is hereby granted, free of charge, 
-to any person obtaining a copy of this software and 
-associated documentation files (the "Software"), to 
-deal in the Software without restriction, including 
-without limitation the rights to use, copy, modify, 
-merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom 
-the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice 
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR 
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm
index 2baf3e12d7..8fd84e19fa 100644
--- a/code/modules/tgs/v5/_defines.dm
+++ b/code/modules/tgs/v5/_defines.dm
@@ -12,13 +12,14 @@
 #define DMAPI5_BRIDGE_COMMAND_CHAT_SEND 5
 
 #define DMAPI5_PARAMETER_ACCESS_IDENTIFIER "accessIdentifier"
+#define DMAPI5_PARAMETER_CUSTOM_COMMANDS "customCommands"
+
 #define DMAPI5_RESPONSE_ERROR_MESSAGE "errorMessage"
 
 #define DMAPI5_BRIDGE_PARAMETER_COMMAND_TYPE "commandType"
 #define DMAPI5_BRIDGE_PARAMETER_CURRENT_PORT "currentPort"
 #define DMAPI5_BRIDGE_PARAMETER_VERSION "version"
 #define DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE "chatMessage"
-#define DMAPI5_BRIDGE_PARAMETER_CUSTOM_COMMANDS "customCommands"
 #define DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL "minimumSecurityLevel"
 
 #define DMAPI5_BRIDGE_RESPONSE_NEW_PORT "newPort"
@@ -95,30 +96,3 @@
 #define DMAPI5_CUSTOM_CHAT_COMMAND_NAME "name"
 #define DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT "helpText"
 #define DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY "adminOnly"
-
-/*
-The MIT License
-
-Copyright (c) 2020 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index eedefb2877..8ca85faf05 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -16,7 +16,7 @@
 	var/list/chat_channels
 
 /datum/tgs_api/v5/ApiVersion()
-	return new /datum/tgs_version("5.1.1")
+	return new /datum/tgs_version("5.2.1")
 
 /datum/tgs_api/v5/OnWorldNew(minimum_required_security_level)
 	server_port = world.params[DMAPI5_PARAM_SERVER_PORT]
@@ -24,7 +24,7 @@
 
 	var/datum/tgs_version/api_version = ApiVersion()
 	version = null
-	var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_BRIDGE_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands()))
+	var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands()))
 	if(!istype(bridge_response))
 		TGS_ERROR_LOG("Failed initial bridge request!")
 		return FALSE
@@ -201,17 +201,27 @@
 		if(DMAPI5_TOPIC_COMMAND_HEARTBEAT)
 			return TopicResponse()
 		if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH)
+			var/new_port = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_PORT]
+			var/error_message = null
+			if (new_port != null)
+				if (!isnum(new_port) || !(new_port > 0))
+					error_message = "Invalid [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]"
+				else
+					server_port = new_port
+
 			var/new_version_string = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION]
 			if (!istext(new_version_string))
-				return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION]]")
+				if(error_message != null)
+					error_message += ", "
+				error_message += "Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION]]"
+			else
+				var/datum/tgs_version/new_version = new(new_version_string)
+				if (event_handler)
+					event_handler.HandleEvent(TGS_EVENT_WATCHDOG_REATTACH, new_version)
 
-			var/datum/tgs_version/new_version = new(new_version_string)
-			if (event_handler)
-				event_handler.HandleEvent(TGS_EVENT_WATCHDOG_REATTACH, new_version)
+				version = new_version
 
-			version = new_version
-
-			return TopicResponse()
+			return json_encode(list(DMAPI5_RESPONSE_ERROR_MESSAGE = error_message, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands()))
 
 	return TopicResponse("Unknown command: [command]")
 
@@ -343,30 +353,3 @@
 /datum/tgs_api/v5/SecurityLevel()
 	RequireInitialBridgeResponse()
 	return security_level
-
-/*
-The MIT License
-
-Copyright (c) 2020 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/v5/commands.dm b/code/modules/tgs/v5/commands.dm
index 2775157656..6d31dd3422 100644
--- a/code/modules/tgs/v5/commands.dm
+++ b/code/modules/tgs/v5/commands.dm
@@ -38,31 +38,3 @@
 		topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE] = text_response
 		return json_encode(topic_response)
 	return TopicResponse("Unknown custom chat command: [command]!")
-
-/*
-
-The MIT License
-
-Copyright (c) 2020 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
diff --git a/code/modules/tgs/v5/undef.dm b/code/modules/tgs/v5/undef.dm
index b27e3abe95..34fc481d36 100644
--- a/code/modules/tgs/v5/undef.dm
+++ b/code/modules/tgs/v5/undef.dm
@@ -12,13 +12,14 @@
 #undef DMAPI5_BRIDGE_COMMAND_CHAT_SEND
 
 #undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER
+#undef DMAPI5_PARAMETER_CUSTOM_COMMANDS
+
 #undef DMAPI5_RESPONSE_ERROR_MESSAGE
 
 #undef DMAPI5_BRIDGE_PARAMETER_COMMAND_TYPE
 #undef DMAPI5_BRIDGE_PARAMETER_CURRENT_PORT
 #undef DMAPI5_BRIDGE_PARAMETER_VERSION
 #undef DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE
-#undef DMAPI5_BRIDGE_PARAMETER_CUSTOM_COMMANDS
 #undef DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL
 
 #undef DMAPI5_BRIDGE_RESPONSE_NEW_PORT
@@ -95,30 +96,3 @@
 #undef DMAPI5_CUSTOM_CHAT_COMMAND_NAME
 #undef DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT
 #undef DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY
-
-/*
-The MIT License
-
-Copyright (c) 2020 Jordan Brown
-
-Permission is hereby granted, free of charge,
-to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to
-deal in the Software without restriction, including
-without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom
-the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/