The big kahuna - Map Standardisation

code/modules/shuttle/emergency.dm

@@ -84,7 +84,6 @@
 	height = 11
 	dir = 4
 	travelDir = 0
-	roundstart_move = "emergency_away"
 	var/sound_played = 0 //If the launch sound has been sent to all players on the shuttle itself
 
 	var/datum/announcement/priority/emergency_shuttle_docked = new(0, new_sound = sound('sound/AI/shuttledock.ogg'))
@@ -364,8 +363,6 @@
 	height = 8
 	dir = 4
 
-	roundstart_move = "backup_away"
-
 /obj/docking_port/mobile/emergency/backup/register()
 	var/current_emergency = SSshuttle.emergency
 	..()

code/modules/shuttle/ert.dm

@@ -25,6 +25,4 @@
 	y_offset = 0
 	resistance_flags = INDESTRUCTIBLE
 	flags = NODECONSTRUCT
-	access_tcomms = FALSE
-	access_construction = FALSE
 	access_mining = FALSE

code/modules/shuttle/navigation_computer.dm

@@ -11,10 +11,7 @@
 	var/shuttlePortName = "custom location"
 	var/list/jumpto_ports = list() //list of ports to jump to
 	var/access_station = TRUE //can we park near X?
-	var/access_tcomms = TRUE
-	var/access_construction = TRUE
 	var/access_mining = TRUE
-	var/access_derelict = FALSE
 	var/obj/docking_port/stationary/my_port //the custom docking port placed by this console
 	var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle
 	var/view_range = 7
@@ -29,17 +26,13 @@
 	. = ..()
 	GLOB.navigation_computers += src
 	if(access_station)
-		jumpto_ports += list("nav_z1" = 1)
-	if(access_tcomms)
-		jumpto_ports += list("nav_z3" = 1)
+		jumpto_ports += list("nav_z2" = level_name_to_num(MAIN_STATION))
 	if(access_mining)
-		jumpto_ports += list("nav_z5" = 1)
-	if(access_derelict)
-		jumpto_ports += list("nav_z6" = 1)
+		jumpto_ports += list("nav_z3" = level_name_to_num(MINING))
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/Destroy()
-	. = ..()
 	GLOB.navigation_computers -= src
+	return ..()
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/attack_hand(mob/user)
 	if(!shuttle_port && !SSshuttle.getShuttle(shuttleId))

code/modules/shuttle/shuttle.dm

@@ -912,8 +912,6 @@
 	x_offset = 0
 	y_offset = 0
 	resistance_flags = INDESTRUCTIBLE
-	access_tcomms = TRUE
-	access_construction = TRUE
 	access_mining = TRUE
 
 /obj/machinery/computer/shuttle/trade

code/modules/shuttle/supply.dm

@@ -14,7 +14,6 @@
 	width = 12
 	dwidth = 5
 	height = 7
-	roundstart_move = "supply_away"
 
 /obj/docking_port/mobile/supply/register()
 	if(!..())

code/modules/shuttle/vox.dm

@@ -18,4 +18,3 @@
 	y_offset = -10
 	resistance_flags = INDESTRUCTIBLE
 	flags = NODECONSTRUCT
-	access_derelict = TRUE