diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index b770693a69..e3c1eb15a0 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1039,10 +1039,9 @@ proc/get_mob_with_client_list() //gets the turf the atom is located in (or itself, if it is a turf). //returns null if the atom is not in a turf. -/proc/get_turf(atom/A) - if(!istype(A)) return - for(A, A && !isturf(A), A=A.loc); - return A +/proc/get_turf(atom/movable/A) + if(isturf(A)) return A + if(A.locs.len) return A.locs[1] /proc/get(atom/loc, type) while(loc)