diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm
index 1ec0ac2a93a..3f67cb4c4ef 100644
--- a/maps/tether/tether_defines.dm
+++ b/maps/tether/tether_defines.dm
@@ -70,6 +70,7 @@
 	station_name  = "NSB Adephagia"
 	station_short = "Tether"
 	dock_name     = "Virgo-3B Colony"
+	dock_type     = "surface"
 	boss_name     = "Central Command"
 	boss_short    = "CentCom"
 	company_name  = "NanoTrasen"
@@ -80,6 +81,7 @@
 	shuttle_leaving_dock = "The Orange Line tram has left the station. Estimate %ETA% until the tram arrives at %dock_name%."
 	shuttle_called_message = "A scheduled crew transfer to the %dock_name% is occuring. The tram will be arriving shortly. Those departing should proceed to the Orange Line tram station within %ETA%."
 	shuttle_recall_message = "The scheduled crew transfer has been cancelled."
+	shuttle_name = "Automated Tram"
 	emergency_shuttle_docked_message = "The evacuation tram has arrived at the tram station. You have approximately %ETD% to board the tram."
 	emergency_shuttle_leaving_dock = "The emergency tram has left the station. Estimate %ETA% until the shuttle arrives at %dock_name%."
 	emergency_shuttle_called_message = "An emergency evacuation has begun, and an off-schedule tram has been called. It will arrive at the tram station in approximately %ETA%."
diff --git a/maps/virgo_minitest/virgo_minitest_defines.dm b/maps/virgo_minitest/virgo_minitest_defines.dm
index 492ead4578d..441bf45accd 100644
--- a/maps/virgo_minitest/virgo_minitest_defines.dm
+++ b/maps/virgo_minitest/virgo_minitest_defines.dm
@@ -22,6 +22,7 @@
 	station_name  = "NSS Ade-testing"
 	station_short = "VORE-testing"
 	dock_name     = "Virgo-test CC"
+	dock_type     = "surface"
 	boss_name     = "Central Command-testing"
 	boss_short    = "CentCom-testing"
 	company_name  = "NanoTrasen-testing"
@@ -32,6 +33,7 @@
 	shuttle_leaving_dock = "Test Shuttle Leaving"
 	shuttle_called_message = "Test Shuttle Coming"
 	shuttle_recall_message = "Test Shuttle Cancelled"
+	shuttle_name = "NAS |Hawking|"
 	emergency_shuttle_docked_message = "Test E-Shuttle Docked"
 	emergency_shuttle_leaving_dock = "Test E-Shuttle Left"
 	emergency_shuttle_called_message = "Test E-Shuttle Coming"
diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm
index ed13fb9fa7e..34ae7c6c5af 100644
--- a/maps/~map_system/maps.dm
+++ b/maps/~map_system/maps.dm
@@ -66,6 +66,7 @@ var/list/all_maps = list()
 	var/station_name  = "BAD Station"
 	var/station_short = "Baddy"
 	var/dock_name     = "THE PirateBay"
+	var/dock_type     = "station"	//VOREStation Edit - for a list of valid types see the switch block in air_traffic.dm at line 148
 	var/boss_name     = "Captain Roger"
 	var/boss_short    = "Cap'"
 	var/company_name  = "BadMan"
@@ -76,6 +77,7 @@ var/list/all_maps = list()
 	var/shuttle_leaving_dock
 	var/shuttle_called_message
 	var/shuttle_recall_message
+	var/shuttle_name  = "NAS |Hawking|"	//VS ADD
 	var/emergency_shuttle_docked_message
 	var/emergency_shuttle_leaving_dock
 	var/emergency_shuttle_called_message