Merge pull request #6931 from PsiOmegaDelta/MoreZ

More Z-level compatibility

code/modules/admin/topic.dm

@@ -1283,11 +1283,11 @@
 						foo += text("<B>Is an AI</B> | ")
 					else
 						foo += text("<A HREF='?src=\ref[];makeai=\ref[]'>Make AI</A> | ", src, M)
-					if(M.z != 2)
+					if(isNotAdminLevel(M.z))
 						foo += text("<A HREF='?src=\ref[];sendtoprison=\ref[]'>Prison</A> | ", src, M)
 						foo += text("<A HREF='?src=\ref[];sendtomaze=\ref[]'>Maze</A> | ", src, M)
 					else
-						foo += text("<B>On Z = 2</B> | ")
+						foo += text("<B>On Z = [M.z]</B> | ")
 				else
 					foo += text("<B>Hasn't Entered Game</B> | ")
 				foo += text("<A HREF='?src=\ref[];revive=\ref[]'>Heal/Revive</A> | ", src, M)

code/modules/events/brand_intelligence.dm

@@ -14,7 +14,7 @@
 
 /datum/event/brand_intelligence/start()
 	for(var/obj/machinery/vending/V in machines)
-		if(V.z != 1)	continue
+		if(isNotStationLevel(V.z))	continue
 		vendingMachines.Add(V)
 
 	if(!vendingMachines.len)

code/modules/events/disease_outbreak.dm

@@ -17,7 +17,7 @@
 		var/turf/T = get_turf(H)
 		if(!T)
 			continue
-		if(T.z != 1)
+		if(isNotStationLevel(T.z))
 			continue
 		for(var/datum/disease/D in H.viruses)
 			foundAlready = 1

code/modules/events/radiation_storm.dm

@@ -22,7 +22,7 @@
 				var/turf/T = get_turf(H)
 				if(!T)
 					continue
-				if(T.z != 1)
+				if(isNotStationLevel(T.z))
 					continue
 				if(istype(T.loc, /area/maintenance) || istype(T.loc, /area/crew_quarters))
 					continue
@@ -43,7 +43,7 @@
 				var/turf/T = get_turf(M)
 				if(!T)
 					continue
-				if(T.z != 1)
+				if(isNotStationLevel(T.z))
 					continue
 				M.apply_effect((rand(5,25)),IRRADIATE,0)
 			sleep(100)

code/modules/events/rogue_drones.dm

@@ -41,7 +41,7 @@
 		var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
 		sparks.set_up(3, 0, D.loc)
 		sparks.start()
-		D.z = 2
+		D.z = config.admin_levels[1]
 		D.has_loot = 0
 
 		del(D)

code/modules/power/apc.dm

@@ -968,7 +968,7 @@
 	/*if(!malf.can_shunt)
 		malf << "<span class='warning'>You cannot shunt.</span>"
 		return*/
-	if(src.z != 1)
+	if(isNotStationLevel(src.z))
 		return
 	src.occupier = new /mob/living/silicon/ai(src,malf.laws,null,1)
 	src.occupier.adjustOxyLoss(malf.getOxyLoss())