Merge remote-tracking branch 'upstream/master'

2019-06-19 21:02:30 +01:00
parent 38ed75dc68 601db5ff51
commit 713d849c03
35 changed files with 1047 additions and 2220 deletions
@@ -76,7 +76,9 @@ GLOBAL_LIST_EMPTY(teleportlocs)
 			continue
 		if(GLOB.teleportlocs[AR.name])
 			continue
-		var/turf/picked = safepick(get_area_turfs(AR.type))
+		if (!AR.contents.len)
+			continue
+		var/turf/picked = AR.contents[1]
 		if (picked && is_station_level(picked.z))
 			GLOB.teleportlocs[AR.name] = AR