From 6d0911b3b58ad6b17b96909d6173c90ddd8be332 Mon Sep 17 00:00:00 2001
From: Isaac Erwin <isaacerwin2000@gmail.com>
Date: Thu, 11 Aug 2016 17:31:24 -0400
Subject: [PATCH 1/2] Fixes centcom ferry requests being displayed to all
 admins and mentors

Now ferry requests will only be displayed to admins who have at least
one of the permissions needed to actually move the ferry.
Also fixes the buttons (Such as  the follow button) being displayed
twice for ferry request messages.
---
 code/modules/shuttle/shuttle.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 5d35eff842e..c8a62065f57 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -737,7 +737,9 @@
 			return
 		cooldown = 1
 		to_chat(usr, "<span class='notice'>Your request has been recieved by Centcom.</span>")
-		to_chat(admins, "<b>FERRY: <font color='blue'>[key_name_admin(usr)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) (<A HREF='?_src_=holder;secretsfun=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")
+		for(var/client/A in admins)
+			if(check_rights(R_SERVER|R_EVENT, 0, A.mob))
+				to_chat(A, "<b>FERRY: <font color='blue'>[key_name_admin(usr)] (<A HREF='?_src_=holder;secretsfun=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")
 		spawn(600) //One minute cooldown
 			cooldown = 0
 

From 0428c0d68aa1b220d80cab4c9715df76bfbd08b2 Mon Sep 17 00:00:00 2001
From: Isaac Erwin <isaacerwin2000@gmail.com>
Date: Thu, 11 Aug 2016 17:56:48 -0400
Subject: [PATCH 2/2] Oh man I am not good with code pls to halp

---
 code/modules/shuttle/shuttle.dm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index c8a62065f57..9122c9983eb 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -737,9 +737,8 @@
 			return
 		cooldown = 1
 		to_chat(usr, "<span class='notice'>Your request has been recieved by Centcom.</span>")
-		for(var/client/A in admins)
-			if(check_rights(R_SERVER|R_EVENT, 0, A.mob))
-				to_chat(A, "<b>FERRY: <font color='blue'>[key_name_admin(usr)] (<A HREF='?_src_=holder;secretsfun=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")
+		log_admin("[key_name(usr)] requested to move the transport ferry to Centcom.")
+		message_admins("<b>FERRY: <font color='blue'>[key_name_admin(usr)] (<A HREF='?_src_=holder;secretsfun=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")
 		spawn(600) //One minute cooldown
 			cooldown = 0