Merge branch 'master' into upstream-merge-33917

code/game/machinery/computer/buildandrepair.dm

@@ -121,7 +121,7 @@
 				to_chat(user, "<span class='notice'>You remove the glass panel.</span>")
 				state = 3
 				icon_state = "3"
-				var/obj/item/stack/sheet/glass/G = new (drop_location(), 2)
+				var/obj/item/stack/sheet/glass/G = new(drop_location(), 2)
 				G.add_fingerprint(user)
 				return
 			if(istype(P, /obj/item/screwdriver))

code/game/machinery/computer/camera.dm

@@ -124,7 +124,7 @@
 /obj/machinery/computer/security/proc/get_available_cameras()
 	var/list/L = list()
 	for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
-		if((z > ZLEVEL_SPACEMAX || C.z > ZLEVEL_SPACEMAX) && (C.z != z))//if on away mission, can only recieve feed from same z_level cameras
+		if((is_away_level(z) || is_away_level(C.z)) && (C.z != z))//if on away mission, can only recieve feed from same z_level cameras
 			continue
 		L.Add(C)
 

code/game/machinery/computer/camera_advanced.dm

@@ -303,7 +303,7 @@
 	var/mob/camera/aiEye/remote/remote_eye = user.remote_control
 	var/obj/machinery/computer/camera_advanced/ratvar/R  = target
 	var/turf/T = get_turf(remote_eye)
-	if(user.z != ZLEVEL_CITYOFCOGS || !(T.z in GLOB.station_z_levels))
+	if(!is_reebe(user.z) || !is_station_level(T.z))
 		return
 	if(isclosedturf(T))
 		to_chat(user, "<span class='sevtug_small'>You can't teleport into a wall.</span>")

code/game/machinery/computer/communications.dm

@@ -9,7 +9,7 @@
 	var/authenticated = 0
 	var/auth_id = "Unknown" //Who is currently logged in?
 	var/list/datum/comm_message/messages = list()
-	var/datum/comm_message/currmsg 
+	var/datum/comm_message/currmsg
 	var/datum/comm_message/aicurrmsg
 	var/state = STATE_DEFAULT
 	var/aistate = STATE_DEFAULT
@@ -53,7 +53,7 @@
 /obj/machinery/computer/communications/Topic(href, href_list)
 	if(..())
 		return
-	if(!(z in GLOB.station_z_levels) && z != ZLEVEL_CENTCOM) //Can only use on centcom and SS13
+	if(!is_station_level(z) && !is_centcom_level(z)) //Can only use on centcom and SS13
 		to_chat(usr, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
 		return
 	usr.set_machine(src)
@@ -136,7 +136,9 @@
 					to_chat(usr, "<span class='warning'>Arrays recycling.  Please stand by.</span>")
 					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
 					return
-				var/input = stripped_multiline_input(usr, "Please choose a message to transmit to an allied station.  Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "")
+
+
+				var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations.  Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "")
 				if(!input || !(usr in view(1,src)))
 					return
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
@@ -739,4 +741,4 @@
 	if(content)
 		content = new_content
 	if(new_possible_answers)
-		possible_answers = new_possible_answers
+		possible_answers = new_possible_answers

code/game/machinery/computer/prisoner.dm

@@ -56,7 +56,7 @@
 
 			var/loc_display = "Unknown"
 			var/mob/living/M = T.imp_in
-			if((Tr.z in GLOB.station_z_levels) && !isspaceturf(M.loc))
+			if(is_station_level(Tr.z) && !isspaceturf(M.loc))
 				var/turf/mob_loc = get_turf(M)
 				loc_display = mob_loc.loc
 

code/game/machinery/computer/teleporter.dm

@@ -204,3 +204,14 @@
 			if(trg.teleporter_console)
 				trg.teleporter_console.stat &= ~NOPOWER
 				trg.teleporter_console.update_icon()
+
+/obj/machinery/computer/teleporter/proc/is_eligible(atom/movable/AM)
+	var/turf/T = get_turf(AM)
+	if(!T)
+		return FALSE
+	if(is_centcom_level(T.z) || is_away_level(T.z))
+		return FALSE
+	var/area/A = get_area(T)
+	if(!A || A.noteleport)
+		return FALSE
+	return TRUE