From 4271b6a8594e1f186c52d2d55870d97bd0da970d Mon Sep 17 00:00:00 2001
From: ikarrus <ericgfwong@hotmail.com>
Date: Mon, 18 Aug 2014 22:29:32 -0600
Subject: [PATCH] Removing duplicate href code

---
 code/modules/admin/topic.dm     | 8 --------
 code/modules/shuttle/shuttle.dm | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 635ad5ad25a..55a5c5a14e5 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1386,14 +1386,6 @@
 		message_admins("[src.owner] replied to [key_name(H)]'s Syndicate message with: \"[input]\"")
 		H << "You hear something crackle in your ears for a moment before a voice speaks.  \"Please stand by for a message from your benefactor.  Message as follows, agent. [input].  Message ends.\""
 
-	else if(href_list["movecentcomferry"])
-		if(!check_rights(R_FUN))	return
-
-		var/datum/shuttle_manager/s = shuttles["ferry"]
-		if(istype(s)) s.move_shuttle(0)
-		message_admins("[key_name_admin(usr)] moved the centcom ferry", 1)
-		log_admin("[key_name(usr)] moved the centcom ferry")
-
 	else if(href_list["jumpto"])
 		if(!isobserver(usr) && !check_rights(R_ADMIN))	return
 
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index a76e0702e1b..7ab751c1b46 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -114,6 +114,6 @@ datum/shuttle_manager/proc/move_shuttle(var/override_delay)
 		cooldown = 1
 		usr << "<span class='notice'>Docking locks are engaged. Sending request to leave..."
 		var/datum/shuttle_manager/s = shuttles["ferry"]
-		admins << "<b>FERRY: <font color='blue'>[key_name(usr)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) (<A HREF='?_src_=holder;movecentcomferry=1'>Move</a>)</b> is requesting to move the transport ferry to [s.location == /area/shuttle/transport1/centcom ? "the station" : "Centcom"].</font>"
+		admins << "<b>FERRY: <font color='blue'>[key_name(usr)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) (<A HREF='?_src_=holder;secretsadmin=moveferry'>Move</a>)</b> is requesting to move the transport ferry to [s.location == /area/shuttle/transport1/centcom ? "the station" : "Centcom"].</font>"
 		spawn(100)
 			cooldown = 0
\ No newline at end of file