Merge branch 'master' into upstream-merge-10448

This commit is contained in:
Nadyr
2021-05-27 22:45:02 -04:00
committed by GitHub
314 changed files with 88249 additions and 28553 deletions

View File

@@ -48,7 +48,6 @@
. = ..()
/obj/machinery/station_map/proc/setup_holomap()
. = ..()
bogus = FALSE
var/turf/T = get_turf(src)
original_zLevel = T.z