shuttles

code/datums/components/stationloving.dm

@@ -66,7 +66,7 @@
 	return COMPONENT_BLOCK_MARK_RETRIEVAL
 
 /datum/component/stationloving/proc/in_bounds(is_retrying = FALSE)
-	var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/pod_1, /area/shuttle/pod_2, /area/shuttle/pod_3, /area/shuttle/pod_4))
+	var/static/list/allowed_shuttles = typecacheof(list(/area/shuttle/syndicate, /area/shuttle/escape, /area/shuttle/escape_pod/pod_1, /area/shuttle/escape_pod/pod_2, /area/shuttle/escape_pod/pod_3, /area/shuttle/escape_pod/pod_4))
 	var/static/list/disallowed_centcom_areas = typecacheof(list(/area/abductor_ship, /area/awaymission/errorroom))
 	var/turf/T = get_turf(parent)
 	if(!T)

code/game/area/areas/shuttles.dm

@@ -149,21 +149,21 @@
 	name = "Arrival Shuttle"
 	area_flags = UNIQUE_AREA// SSjob refers to this area for latejoiners
 
-/area/shuttle/pod_1
-	name = "Escape Pod One"
+/area/shuttle/escape_pod
+	name = "Escape Pod"
 	area_flags = BLOBS_ALLOWED
 
-/area/shuttle/pod_2
+/area/shuttle/escape_pod/pod_1
+	name = "Escape Pod One"
+
+/area/shuttle/escape_pod/pod_2
 	name = "Escape Pod Two"
-	area_flags = BLOBS_ALLOWED
 
-/area/shuttle/pod_3
+/area/shuttle/escape_pod/pod_3
 	name = "Escape Pod Three"
-	area_flags = BLOBS_ALLOWED
 
-/area/shuttle/pod_4
+/area/shuttle/escape_pod/pod_4
 	name = "Escape Pod Four"
-	area_flags = BLOBS_ALLOWED
 
 /area/shuttle/mining
 	name = "Mining Shuttle"

code/game/objects/items/devices/radio/headset.dm

@@ -186,6 +186,25 @@ GLOBAL_LIST_EMPTY(secsets)
 	else if(istype(current_area, /area/crew_quarters))
 		sanitized_area_string = "Crew Quarters"
 
+	//Secondmost clear tracking. Shuttles. Our shuttles can track in hyperspace, Im pretty sure the headset can figure out where its at.
+	else if(istype(current_area, /area/shuttle/arrival))
+		sanitized_area_string = "Shuttle (Arrivals)"
+	else if(istype(current_area, /area/shuttle/mining))
+		sanitized_area_string = "Shuttle (Mining)"
+	else if(istype(current_area, /area/shuttle/science))
+		sanitized_area_string = "Shuttle (Science)"
+	else if(istype(current_area, /area/shuttle/exploration))
+		sanitized_area_string = "Shuttle (Exploration)"
+	else if(istype(current_area, /area/shuttle/labor))
+		sanitized_area_string = "Shuttle (Labor)"
+	else if(istype(current_area, /area/shuttle/supply))
+		sanitized_area_string = "Shuttle (Supply)"
+	else if(istype(current_area, /area/shuttle/escape))
+		sanitized_area_string = "Shuttle (Escape)"
+	else if(istype(current_area, /area/shuttle))
+		sanitized_area_string = "Shuttle (Unidentifiable)"
+
+
 	else if(istype(current_area, /area/security/checkpoint))
 		sanitized_area_string = "Security Checkpoint"