From d04bd9215e6adf3ab6fdfdeeffd22c829c5e835e Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Tue, 8 May 2018 23:59:56 -0400
Subject: [PATCH] ITS WORKING! - cleans everything up. it's ready to run on
 live!

---
 code/___DMAPI/tgs/v3210/api.dm                      | 2 +-
 code/datums/helper_datums/getrev.dm                 | 4 ++--
 modular_citadel/code/modules/admin/chat_commands.dm | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/___DMAPI/tgs/v3210/api.dm b/code/___DMAPI/tgs/v3210/api.dm
index 51ead19e702..23022497632 100644
--- a/code/___DMAPI/tgs/v3210/api.dm
+++ b/code/___DMAPI/tgs/v3210/api.dm
@@ -68,7 +68,7 @@
 	if(logs.len)
 		logs = splittext(logs[logs.len - 1], " ")
 		commit = logs[2]
-	logs = file2list(".git/logs/refs/remotes/origin/tgs3")
+	logs = file2list(".git/logs/refs/remotes/origin/master")
 	if(logs.len)
 		originmastercommit = splittext(logs[logs.len - 1], " ")[2]
 
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
index 4f8cdacebc6..29c5dc560d0 100644
--- a/code/datums/helper_datums/getrev.dm
+++ b/code/datums/helper_datums/getrev.dm
@@ -63,7 +63,7 @@ client/verb/showrevinfo()
 		var/datum/tgs_revision_information/test_merge/tm = line
 		var/cm = tm.pull_request_commit
 		var/details = ": '" + html_encode(tm.title) + "' by " + html_encode(tm.author) + " at commit " + html_encode(copytext(cm, 1, min(length(cm), 11)))
-		//if(details && findtext(details, "\[s\]") && (!usr || !usr.client.holder))
-			//continue
+		if(details && findtext(details, "\[s\]") && (!usr || !usr.client.holder))
+			continue
 		. += "<a href=\"[config.githuburl]/pull/[tm.number]\">#[tm.number][details]</a><br>"
 //END OF CITADEL CHANGES
diff --git a/modular_citadel/code/modules/admin/chat_commands.dm b/modular_citadel/code/modules/admin/chat_commands.dm
index 9dbeb0c343e..757dab859f4 100644
--- a/modular_citadel/code/modules/admin/chat_commands.dm
+++ b/modular_citadel/code/modules/admin/chat_commands.dm
@@ -24,7 +24,7 @@
 		var/client/C = directory[target]
 		if(C)
 			var/reconstructedmessage = all_params.Join(" ")
-			C << "<spam class='message'>Discord Admin PM from [sender.friendly_name]: [reconstructedmessage]</span>"
+			C << "<spam class='danger'>Discord Admin PM from [sender.friendly_name]:</span><span class='warning'> [reconstructedmessage]</span><br><span class='info'>Use the adminhelp verb to reply</span>"
 			C << 'sound/effects/adminhelp.ogg'
 			log_admin("Discord PM: [sender.friendly_name]->[key_name(C)]: [reconstructedmessage]")
 			return "Admin PM sent!"