Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733

[MIRROR] [s] Cameranet fixes

code/game/machinery/camera/camera.dm

@@ -17,7 +17,7 @@
 	armor = list("melee" = 50, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 50)
 	max_integrity = 100
 	integrity_failure = 50
-	var/list/network = list("SS13")
+	var/list/network = list("ss13")
 	var/c_tag = null
 	var/c_tag_order = 999
 	var/status = TRUE
@@ -44,6 +44,9 @@
 
 /obj/machinery/camera/Initialize(mapload, obj/structure/camera_assembly/CA)
 	. = ..()
+	for(var/i in network)
+		network -= i
+		network += lowertext(i)
 	if(CA)
 		assembly = CA
 	else

code/game/machinery/camera/camera_assembly.dm

@@ -99,6 +99,9 @@
 	if(tempnetwork.len < 1)
 		to_chat(user, "<span class='warning'>No network found, please hang up and try your call again!</span>")
 		return
+	for(var/i in tempnetwork)
+		tempnetwork -= i
+		tempnetwork += lowertext(i)
 	state = 4
 	var/obj/machinery/camera/C = new(loc, src)
 	forceMove(C)

code/game/machinery/computer/camera.dm

@@ -5,12 +5,18 @@
 	icon_keyboard = "security_key"
 	circuit = /obj/item/circuitboard/computer/security
 	var/last_pic = 1
-	var/list/network = list("SS13")
+	var/list/network = list("ss13")
 	var/mapping = 0//For the overview file, interesting bit of code.
 	var/list/watchers = list() //who's using the console, associated with the camera they're on.
 
 	light_color = LIGHT_COLOR_RED
 
+/obj/machinery/computer/security/Initialize()
+	. = ..()
+	for(var/i in network)
+		network -= i
+		network += lowertext(i)
+
 /obj/machinery/computer/security/check_eye(mob/user)
 	if( (stat & (NOPOWER|BROKEN)) || user.incapacitated() || user.eye_blind )
 		user.unset_machine()
@@ -185,5 +191,5 @@
 	desc = "Used to access the various cameras on the outpost."
 	icon_screen = "mining"
 	icon_keyboard = "mining_key"
-	network = list("MINE")
+	network = list("mine")
 	circuit = /obj/item/circuitboard/computer/mining

code/game/machinery/computer/camera_advanced.dm

@@ -7,7 +7,7 @@
 	var/lock_override = NONE
 	var/mob/camera/aiEye/remote/eyeobj
 	var/mob/living/current_user = null
-	var/list/networks = list("SS13")
+	var/list/networks = list("ss13")
 	var/datum/action/innate/camera_off/off_action = new
 	var/datum/action/innate/camera_jump/jump_action = new
 	var/list/actions = list()
@@ -16,6 +16,9 @@
 
 /obj/machinery/computer/camera_advanced/Initialize()
 	. = ..()
+	for(var/i in networks)
+		networks -= i
+		networks += lowertext(i)
 	if(lock_override)
 		if(lock_override & CAMERA_LOCK_STATION)
 			z_lock |= SSmapping.levels_by_trait(ZTRAIT_STATION)
@@ -261,7 +264,7 @@
 	name = "ratvarian camera observer"
 	desc = "A console used to snoop on the station's goings-on. A jet of steam occasionally whooshes out from slats on its sides."
 	use_power = FALSE
-	networks = list("SS13", "MiniSat") //:eye:
+	networks = list("ss13", "minisat") //:eye:
 	var/datum/action/innate/servant_warp/warp_action = new
 
 /obj/machinery/computer/camera_advanced/ratvar/Initialize()

code/game/objects/items/devices/camera_bug.dm

@@ -76,7 +76,7 @@
 		for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras)
 			if(camera.stat || !camera.can_use())
 				continue
-			if(length(list("SS13","MINE")&camera.network))
+			if(length(list("ss13","mine")&camera.network))
 				bugged_cameras[camera.c_tag] = camera
 	sortList(bugged_cameras)
 	return bugged_cameras

code/modules/antagonists/abductor/machinery/camera.dm

@@ -1,7 +1,7 @@
 /obj/machinery/computer/camera_advanced/abductor
 	name = "Human Observation Console"
 	var/team_number = 0
-	networks = list("SS13","Abductor")
+	networks = list("ss13", "abductor")
 	var/datum/action/innate/teleport_in/tele_in_action = new
 	var/datum/action/innate/teleport_out/tele_out_action = new
 	var/datum/action/innate/teleport_self/tele_self_action = new

code/modules/events/camerafailure.dm

@@ -15,7 +15,7 @@
 		var/obj/machinery/camera/C = pick_n_take(cameras)
 		if (!C)
 			break
-		if (!("SS13" in C.network))
+		if (!("ss13" in C.network))
 			continue
 		if(C.status)
 			C.toggle_cam(null, 0)

code/modules/integrated_electronics/subtypes/output.dm

@@ -256,7 +256,7 @@
 /obj/item/integrated_circuit/output/video_camera/New()
 	..()
 	camera = new(src)
-	camera.network = list("RD")
+	camera.network = list("rd")
 	on_data_written()
 
 /obj/item/integrated_circuit/output/video_camera/Destroy()

code/modules/mining/aux_base_camera.dm

@@ -29,7 +29,7 @@
 /obj/machinery/computer/camera_advanced/base_construction
 	name = "base construction console"
 	desc = "An industrial computer integrated with a camera-assisted rapid construction drone."
-	networks = list("SS13")
+	networks = list("ss13")
 	var/obj/item/construction/rcd/internal/RCD //Internal RCD. The computer passes user commands to this in order to avoid massive copypaste.
 	circuit = /obj/item/circuitboard/computer/base_construction
 	off_action = new/datum/action/innate/camera_off/base_construction

code/modules/mob/living/silicon/ai/ai.dm

@@ -27,7 +27,7 @@
 	sec_hud = DATA_HUD_SECURITY_BASIC
 	d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED
 	mob_size = MOB_SIZE_LARGE
-	var/list/network = list("SS13")
+	var/list/network = list("ss13")
 	var/obj/machinery/camera/current = null
 	var/list/connected_robots = list()
 	var/aiRestorePowerRoutine = 0
@@ -149,7 +149,7 @@
 	GLOB.shuttle_caller_list += src
 
 	builtInCamera = new (src)
-	builtInCamera.network = list("SS13")
+	builtInCamera.network = list("ss13")
 
 
 /mob/living/silicon/ai/Destroy()
@@ -567,11 +567,13 @@
 	var/mob/living/silicon/ai/U = usr
 
 	for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
+		var/list/tempnetwork = C.network
+		if(!(is_station_level(C.z) || is_mining_level(C.z) || ("ss13" in tempnetwork)))
+			continue
 		if(!C.can_use())
 			continue
 
-		var/list/tempnetwork = C.network
-		tempnetwork.Remove("CREED", "thunder", "RD", "toxins", "Prison")
+		tempnetwork.Remove("rd", "toxins", "prison")
 		if(tempnetwork.len)
 			for(var/i in C.network)
 				cameralist[i] = i
@@ -591,7 +593,7 @@
 			if(network in C.network)
 				U.eyeobj.setLoc(get_turf(C))
 				break
-	to_chat(src, "<span class='notice'>Switched to [network] camera network.</span>")
+	to_chat(src, "<span class='notice'>Switched to the \"[uppertext(network)]\" camera network.</span>")
 //End of code by Mord_Sith
 
 

code/modules/mob/living/silicon/pai/pai.dm

@@ -13,7 +13,7 @@
 	layer = BELOW_MOB_LAYER
 	can_be_held = TRUE
 
-	var/network = "SS13"
+	var/network = "ss13"
 	var/obj/machinery/camera/current = null
 
 	var/ram = 100	// Used as currency to purchase different abilities

code/modules/mob/living/silicon/robot/robot.dm

@@ -125,7 +125,7 @@
 	if(!scrambledcodes && !builtInCamera)
 		builtInCamera = new (src)
 		builtInCamera.c_tag = real_name
-		builtInCamera.network = list("SS13")
+		builtInCamera.network = list("ss13")
 		builtInCamera.internal_light = FALSE
 		if(wires.is_cut(WIRE_CAMERA))
 			builtInCamera.status = 0

code/modules/research/xenobiology/xenobio_camera.dm

@@ -20,7 +20,7 @@
 /obj/machinery/computer/camera_advanced/xenobio
 	name = "Slime management console"
 	desc = "A computer used for remotely handling slimes."
-	networks = list("SS13")
+	networks = list("ss13")
 	circuit = /obj/item/circuitboard/computer/xenobiology
 	var/datum/action/innate/slime_place/slime_place_action = new
 	var/datum/action/innate/slime_pick_up/slime_up_action = new