MAPPING:

- slight change to arrival hallway

ADMIN COMMANDS:
- Added 3 commands to 'secrets': Move mining shuttle, move administration shuttle and move ferry. Each of these moves their respective shuttle. This is only intended for admin events. The mining shuttle still takes the 15-ish seconds to arrive, the other two are instantanious. All generate admin logs and admin-log-spam to prevent abuse.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1124 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/mining.dm

@@ -439,9 +439,49 @@ proc/check_craftlathe_recipe(var/list/param_recipe)
 	new /obj/item/weapon/pickaxe(src)
 
 
+/**********************Administration Shuttle**************************/
+
+var/admin_shuttle_location = 0 // 0 = centcom 13, 1 = station
+
+proc/move_admin_shuttle()
+	var/area/fromArea
+	var/area/toArea
+	if (admin_shuttle_location == 1)
+		fromArea = locate(/area/shuttle/administration/station)
+		toArea = locate(/area/shuttle/administration/centcom)
+	else
+		fromArea = locate(/area/shuttle/administration/centcom)
+		toArea = locate(/area/shuttle/administration/station)
+	fromArea.move_contents_to(toArea)
+	if (admin_shuttle_location)
+		admin_shuttle_location = 0
+	else
+		admin_shuttle_location = 1
+	return
+
+/**********************Centcom Ferry**************************/
+
+var/ferry_location = 0 // 0 = centcom , 1 = station
+
+proc/move_ferry()
+	var/area/fromArea
+	var/area/toArea
+	if (ferry_location == 1)
+		fromArea = locate(/area/shuttle/transport1/station)
+		toArea = locate(/area/shuttle/transport1/centcom)
+	else
+		fromArea = locate(/area/shuttle/transport1/centcom)
+		toArea = locate(/area/shuttle/transport1/station)
+	fromArea.move_contents_to(toArea)
+	if (ferry_location)
+		ferry_location = 0
+	else
+		ferry_location = 1
+	return
+
 /**********************Shuttle Computer**************************/
 
-var/mining_shuttle_tickstomove = 15
+var/mining_shuttle_tickstomove = 10
 var/mining_shuttle_moving = 0
 var/mining_shuttle_location = 0 // 0 = station 13, 1 = mining station
 

code/defines/area/Space Station 13 areas.dm

@@ -129,6 +129,11 @@ proc/process_ghost_teleport_locs()
 
 /area/shuttle/transport1/centcom
 	icon_state = "shuttle"
+	name = "Transport Shuttle Centcom"
+
+/area/shuttle/transport1/station
+	icon_state = "shuttle"
+	name = "Transport Shuttle"
 
 /area/shuttle/transport2/centcom
 	icon_state = "shuttle"
@@ -150,6 +155,14 @@ proc/process_ghost_teleport_locs()
 	name = "Special Ops Shuttle"
 	icon_state = "shuttlered2"
 
+/area/shuttle/administration/centcom
+	name = "Administration Shuttle Centcom"
+	icon_state = "shuttlered"
+
+/area/shuttle/administration/station
+	name = "Administration Shuttle"
+	icon_state = "shuttlered2"
+
 /area/shuttle/thunderdome
 	name = "honk"
 

code/modules/admin/admin.dm

@@ -1039,6 +1039,29 @@ var/showadminmessages = 1
 						log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]")
 					else
 						alert("You're not of a high enough rank to do this")
+				if("moveminingshuttle")
+					if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host"  )))
+						if(mining_shuttle_moving)
+							return
+						move_mining_shuttle()
+						message_admins("\blue [key_name_admin(usr)] moved mining shuttle", 1)
+						log_admin("[key_name(usr)] moved the mining shuttle")
+					else
+						alert("You're not of a high enough rank to do this")
+				if("moveadminshuttle")
+					if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host"  )))
+						move_admin_shuttle()
+						message_admins("\blue [key_name_admin(usr)] moved the centcom administration shuttle", 1)
+						log_admin("[key_name(usr)] moved the centcom administration shuttle")
+					else
+						alert("You're not of a high enough rank to do this")
+				if("moveferry")
+					if ((src.rank in list( "Administrator", "Primary Administrator", "Shit Guy", "Coder", "Host"  )))
+						move_ferry()
+						message_admins("\blue [key_name_admin(usr)] moved the centcom ferry", 1)
+						log_admin("[key_name(usr)] moved the centcom ferry")
+					else
+						alert("You're not of a high enough rank to do this")
 				if("flicklights")
 					while(!usr.stat)
 	//knock yourself out to stop the ghosts
@@ -1662,7 +1685,9 @@ var/showadminmessages = 1
 <A href='?src=\ref[src];secretsfun=retardify'>Make all players retarded</A><BR>
 <A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR>
 <A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR>
-<A href='?src=\ref[src];secretsfun=dorf'>Dorf Mode</A><BR><BR>"}
+<A href='?src=\ref[src];secretsfun=moveadminshuttle'>Move Administration Shuttle</A><BR>
+<A href='?src=\ref[src];secretsfun=moveferry'>Move Ferry</A><BR>
+<A href='?src=\ref[src];secretsfun=moveminingshuttle'>Move Mining Shuttle</A><BR><BR>"}
 //<A href='?src=\ref[src];secretsfun=shockwave'>Station Shockwave</A><BR>
 
 	if(lvl >= 5)