Merge branch 'master' into init_update_and_stuff

This commit is contained in:
alberyk
2022-03-05 17:05:46 -03:00
46 changed files with 347 additions and 405 deletions

View File

@@ -62,7 +62,8 @@
var/area/A = get_area(M)
loc_display = A.name
if(T.malfunction)
loc_display = pick(teleportlocs)
var/area/location = pick(the_station_areas)
loc_display = location.name
var/list/tracker_info = list(
"id" = T.id,
"loc_display" = loc_display,