diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 42e1b0b63e..7484d016b6 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -29,9 +29,6 @@ var/global/list/playable_species = list("Human") // A list of ALL playable sp // Posters var/global/list/poster_designs = list() -// Cameras -var/list/obj/machinery/camera/world_cameras = list() - // Uplinks var/list/obj/item/device/uplink/world_uplinks = list() diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 839b1aa461..5670ef2060 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -37,7 +37,6 @@ wires = new(src) assembly = new(src) assembly.state = 4 - world_cameras += src /* // Use this to look for cameras that have the same c_tag. for(var/obj/machinery/camera/C in cameranet.cameras) @@ -55,7 +54,6 @@ ..() /obj/machinery/camera/Destroy() - world_cameras -= src deactivate(null, 0) //kick anyone viewing out if(assembly) qdel(assembly) diff --git a/code/modules/events/camera_damage.dm b/code/modules/events/camera_damage.dm index 2cbeab9790..b6cb3dea53 100644 --- a/code/modules/events/camera_damage.dm +++ b/code/modules/events/camera_damage.dm @@ -19,12 +19,12 @@ cam.wires.UpdateCut(CAMERA_WIRE_ALARM, 0) /datum/event/camera_damage/proc/acquire_random_camera(var/remaining_attempts = 5) - if(!world_cameras.len) + if(!cameranet.cameras.len) return if(!remaining_attempts) return - var/obj/machinery/camera/C = pick(world_cameras) + var/obj/machinery/camera/C = pick(cameranet.cameras) if(is_valid_camera(C)) return C return acquire_random_camera(remaining_attempts--)