Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm

code/modules/admin/verbs/debug.dm

@@ -373,8 +373,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 	for(var/I in singularities)
 		var/obj/singularity/S = I
-		// TODO: Tie into space manager
-		if(S.z == ZLEVEL_CENTCOMM  || S.z >= MAX_Z)
+		if(!is_level_reachable(S.z))
 			continue
 		qdel(S)
 	log_admin("[key_name(src)] has deleted all Singularities and Tesla orbs.")

code/modules/admin/verbs/playsound.dm

@@ -81,8 +81,7 @@ var/list/sounds_cache = list()
 
 	for(var/O in global_intercoms)
 		var/obj/item/device/radio/intercom/I = O
-		// TODO: Tie into space manager
-		if(I.z != ZLEVEL_STATION && !ignore_z)
+		if(!is_station_level(I.z) && !ignore_z)
 			continue
 		if(!I.on && !ignore_power)
 			continue