diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index 6af1ab0bdf4..e8072d9e1d7 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -23,18 +23,19 @@ var/list/data = list() var/list/pods = list() for(var/obj/item/spacepod_equipment/misc/tracker/TR in GLOB.pod_trackers) - var/obj/spacepod/my_pod = TR.my_atom - var/podname = capitalize(sanitize(my_pod.name)) - var/pilot = "None" - var/passengers = list() - if(my_pod.pilot) - pilot = my_pod.pilot - if(my_pod.passengers) - for(var/mob/M in my_pod.passengers) - passengers += M.name - var/passengers_text = english_list(passengers, "None") + if(TR.my_atom) + var/obj/spacepod/my_pod = TR.my_atom + var/podname = capitalize(sanitize(my_pod.name)) + var/pilot = "None" + var/passengers = list() + if(my_pod.pilot) + pilot = my_pod.pilot + if(my_pod.passengers) + for(var/mob/M in my_pod.passengers) + passengers += M.name + var/passengers_text = english_list(passengers, "None") - pods.Add(list(list("name" = podname, "podx" = my_pod.x, "pody" = my_pod.y, "podz" = my_pod.z, "pilot" = pilot, "passengers" = passengers_text))) + pods.Add(list(list("name" = podname, "podx" = my_pod.x, "pody" = my_pod.y, "podz" = my_pod.z, "pilot" = pilot, "passengers" = passengers_text))) data["pods"] = pods return data