Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090

[MIRROR] Replace hardcoded z-level numbers with a trait system
2018-01-12 17:41:28 +00:00
parent 2b9b826a95 eedf8eb101
commit 0c56db4f9b
24 changed files with 517 additions and 366 deletions
@@ -17,7 +17,7 @@
 /obj/machinery/computer/camera_advanced/Initialize()
 	. = ..()
 	if(station_lock_override)
-		z_lock = GLOB.station_z_levels.Copy()
+		z_lock = SSmapping.levels_by_trait(ZTRAIT_STATION)

 /obj/machinery/computer/camera_advanced/syndie
 	icon_keyboard = "syndie_key"