diff --git a/code/modules/DMAPI/yawnDMAPI.dm b/code/modules/DMAPI/yawnDMAPI.dm
index 8a0195c369..304d9765dd 100644
--- a/code/modules/DMAPI/yawnDMAPI.dm
+++ b/code/modules/DMAPI/yawnDMAPI.dm
@@ -18,4 +18,110 @@
 	var/list/all_params = splittext(params, " ")
 	var/faxid = all_params[1]
 	var/faxmsg = return_file_text("[config.fax_export_dir]/fax_[faxid].html")
-	return "FAX: ```[strip_html_properly(faxmsg)]```"
\ No newline at end of file
+	return "FAX: ```[strip_html_properly(faxmsg)]```"
+
+// - Staffwho
+/datum/tgs_chat_command/staffwho
+	name = "staffwho"
+	help_text = "Shows the current online staff count"
+	admin_only = TRUE
+
+/datum/tgs_chat_command/staffwho/Run(datum/tgs_chat_user/sender, params)
+	var/message = "Current online staff:\n"
+
+	var/list/admin_keys = list()
+	var/list/mod_keys = list()
+	var/list/dev_keys = list()
+	var/list/other_keys = list()
+
+	var/count = 0
+
+	for(var/client/C in GLOB.admins)
+		count++
+		var/keymsg = "[C.key]"
+		if(C.is_afk())
+			keymsg += " (AFK)"
+		else if(C.holder.fakekey)
+			keymsg += " (Stealth)"
+		else if(isobserver(C.mob))
+			keymsg += " (Ghost)"
+		else if(isnewplayer(C.mob))
+			keymsg += " (Lobby)"
+		else
+			keymsg += " (Ingame)"
+
+		if(R_ADMIN & C.holder.rights && R_BAN & C.holder.rights) // R_ADMIN and R_BAN apparently an admin makes
+			admin_keys += keymsg
+
+		else if(R_ADMIN & C.holder.rights && !(R_SERVER & C.holder.rights)) // R_ADMIN but not R_SERVER makes a moderator
+			mod_keys += keymsg
+
+		else if(R_DEBUG & C.holder.rights) // R_SERVER makes a dev
+			dev_keys += keymsg
+
+		else // No R_ADMIN&&R_BAN, R_ADMIN!R_BAN, R_SERVER, must be a GM or something
+			other_keys += keymsg
+
+	var/admin_msg = english_list(admin_keys, "-None-")
+	var/mod_msg = english_list(mod_keys, "-None-")
+	var/dev_msg = english_list(dev_keys, "-None-")
+	var/other_msg = english_list(other_keys, "-None-")
+
+	message += "**Admins:** [admin_msg]\n**Mods/GMs:** [mod_msg]\n**Devs:** [dev_msg]\n**Other:** [other_msg]\n**Total:** [count] online"
+	return message
+
+// - Discord register
+GLOBAL_LIST_EMPTY(pending_discord_registrations)
+/datum/tgs_chat_command/register
+	name = "register"
+	help_text = "Registers your chat username with your Byond username"
+	admin_only = FALSE
+
+/datum/tgs_chat_command/register/Run(datum/tgs_chat_user/sender, params)
+	// Try to find if that ID is registered to someone already
+	var/sql_discord = sql_sanitize_text(sender.id)
+	var/DBQuery/query = dbcon.NewQuery("SELECT discord_id FROM erro_player WHERE discord_id = '[sql_discord]'")
+	query.Execute()
+	if(query.NextRow())
+		return "[sender.friendly_name], your Discord ID is already registered to a Byond username. Please contact an administrator if you changed your Byond username or Discord ID."
+	
+	var/key_to_find = "[ckey(params)]"
+
+	// They didn't provide anything worth looking up.
+	if(!length(key_to_find))
+		return "[sender.friendly_name], you need to provide your Byond username at the end of the command. It can be in 'key' format (with spaces and characters) or 'ckey' format (without spaces or special characters)."
+	
+	// Try to find their client.
+	var/client/user
+	for(var/client/C in GLOB.clients)
+		if(C.ckey == key_to_find)
+			user = C
+			break
+
+	// Couldn't find them logged in.
+	if(!user)
+		return "[sender.friendly_name], I couldn't find a logged-in user with the username of '[key_to_find]', which is what you provided after conversion to Byond's ckey format. Please connect to the game server and try again."
+	
+	var/sql_ckey = sql_sanitize_text(key_to_find)
+	query = dbcon.NewQuery("SELECT discord_id FROM erro_player WHERE ckey = '[sql_ckey]'")
+	query.Execute()
+
+	// We somehow found their client, BUT they don't exist in the database
+	if(!query.NextRow())
+		return "[sender.friendly_name], the server's database is either not responding or there's no evidence you've ever logged in. Please contact an administrator."
+	
+	// We found them in the database, AND they already have a discord ID assigned
+	if(query.item[1])
+		return "[sender.friendly_name], it appears you've already registered your chat and game IDs. If you've changed game or chat usernames, please contact an administrator for help."
+		
+	// Okay. We found them, they're in the DB, and they have no discord ID set.
+	var/message = "<span class='notice'>A request has been sent from Discord to validate your Byond username, by '[sender.friendly_name]' in '[sender.channel.friendly_name]'</span>\
+	<br><span class='warning'>If you did not send this request, do not click the link below, and do notify an administrator in-game or on Discord ASAP.</span>\
+	<br><a href='byond://?src=\ref[user];discord_reg=[html_encode(sender.id)]'>Click Here</a> if you authorized this registration attempt. This link is valid for 10 minutes."
+	to_chat(user, message)
+
+	// To stifle href hacking
+	GLOB.pending_discord_registrations.len++
+	GLOB.pending_discord_registrations[GLOB.pending_discord_registrations.len] = list("ckey" = key_to_find, "id" = sender.id, "time" = world.realtime)
+	
+	return "[sender.friendly_name], I've sent you a message in-game. Please verify your username there to complete your registration within 10 minutes."
\ No newline at end of file
diff --git a/code/modules/tgs/v5/chat_commands.dm b/code/modules/tgs/v5/chat_commands.dm
index acae136587..ba6f4d04ff 100644
--- a/code/modules/tgs/v5/chat_commands.dm
+++ b/code/modules/tgs/v5/chat_commands.dm
@@ -63,7 +63,7 @@
 	message += "**Admins:** [admin_msg]\n**Mods/GMs:** [mod_msg]\n**Devs:** [dev_msg]\n**Other:** [other_msg]\n**Total:** [count] online"
 	return message
 
-GLOBAL_LIST_EMPTY(pending_discord_registrations)
+//YW EDIT: GLOBAL_LIST_EMPTY(pending_discord_registrations)
 /datum/tgs_chat_command/register
 	name = "register"
 	help_text = "Registers your chat username with your Byond username"