Merge pull request #10568 from VOREStation/upstream-merge-8111

[MIRROR] Add Secret ZLevels

code/game/objects/effects/landmarks.dm

@@ -108,6 +108,16 @@
 
 	return 1
 
+/obj/effect/landmark/forbidden_level
+	delete_me = 1
+/obj/effect/landmark/forbidden_level/Initialize()
+	. = ..()
+	if(using_map)
+		using_map.secret_levels |= z
+	else
+		log_error("[type] mapped in but no using_map")
+
+
 /obj/effect/landmark/virtual_reality
 	name = "virtual_reality"
 	icon = 'icons/mob/screen1.dmi'
@@ -120,15 +130,6 @@
 	invisibility = 101
 	return 1
 
-/obj/effect/landmark/forbidden_level
-	delete_me = 1
-/obj/effect/landmark/forbidden_level/Initialize()
-	. = ..()
-	if(using_map)
-		using_map.secret_levels |= z
-	else
-		log_error("[type] mapped in but no using_map")
-
 
 //Costume spawner landmarks
 /obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears

maps/~map_system/maps.dm

@@ -34,9 +34,9 @@ var/list/all_maps = list()
 	var/static/list/sealed_levels = list()  // Z-levels that don't allow random transit at edge
 	var/static/list/xenoarch_exempt_levels = list()	//Z-levels exempt from xenoarch finds and digsites spawning.
 	var/static/list/persist_levels = list() // Z-levels where SSpersistence should persist between rounds. Defaults to station_levels if unset.
+	var/static/list/secret_levels = list() // Z-levels that (non-admin) ghosts can't get to
 	var/static/list/empty_levels = list()   // Empty Z-levels that may be used for various things
 	var/static/list/mappable_levels = list()// List of levels where mapping or other similar devices might work fully
-	var/static/list/secret_levels = list() // Z-levels that (non-admin) ghosts can't get to
 	// End Static Lists
 
 	// Z-levels available to various consoles, such as the crew monitor. Defaults to station_levels if unset.