diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 9cecc29a9bf..897db600a7a 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -16,10 +16,9 @@
/obj/machinery/computer/security/Initialize()
. = ..()
- // if(!LAZYLEN(network))
- // network = using_map.station_networks.Copy()
- // camera = new(src, network)
- camera = new(src)
+ if(!LAZYLEN(network))
+ network = using_map.station_networks.Copy()
+ camera = new(src, network)
/obj/machinery/computer/security/Destroy()
QDEL_NULL(camera)
@@ -38,6 +37,11 @@
to_chat(user, "You realise its kind of stupid to access a camera console when you have the entire camera network at your metaphorical fingertips")
return
+/obj/machinery/computer/security/proc/set_network(list/new_network)
+ network = new_network
+ camera.network = network
+ camera.access_based = FALSE
+
//Camera control: arrow keys.
/obj/machinery/computer/security/telescreen
name = "Telescreen"
diff --git a/code/game/machinery/computer/camera_circuit.dm b/code/game/machinery/computer/camera_circuit.dm
deleted file mode 100644
index 2bbe82ee1b8..00000000000
--- a/code/game/machinery/computer/camera_circuit.dm
+++ /dev/null
@@ -1,116 +0,0 @@
-
-//the researchable camera circuit that can connect to any camera network
-
-/obj/item/weapon/circuitboard/camera
- //name = "Circuit board (Camera)"
- var/secured = 1
- var/authorised = 0
- var/possibleNets[0]
- var/network = ""
- build_path = null
-
-//when adding a new camera network, you should only need to update these two procs
- New()
- possibleNets["Engineering"] = access_ce
- possibleNets["SS13"] = access_hos
- possibleNets["Mining"] = access_mining
- possibleNets["Cargo"] = access_qm
- possibleNets["Research"] = access_rd
- possibleNets["Medbay"] = access_cmo
- ..()
-
- proc/updateBuildPath()
- build_path = null
- if(authorised && secured)
- switch(network)
- if("SS13")
- build_path = /obj/machinery/computer/security
- if("Engineering")
- build_path = /obj/machinery/computer/security/engineering
- if("Mining")
- build_path = /obj/machinery/computer/security/mining
- if("Research")
- build_path = /obj/machinery/computer/security/research
- if("Medbay")
- build_path = /obj/machinery/computer/security/medbay
- if("Cargo")
- build_path = /obj/machinery/computer/security/cargo
-
- attackby(var/obj/item/I, var/mob/user)//if(health > 50)
- ..()
- else if(I.is_screwdriver())
- secured = !secured
- user.visible_message("The [src] can [secured ? "no longer" : "now"] be modified.")
- playsound(src, I.usesound, 50, 1)
- updateBuildPath()
- return
-
- attack_self(var/mob/user)
- if(!secured && ishuman(user))
- user.machine = src
- interact(user, 0)
-
- proc/interact(var/mob/user, var/ai=0)
- if(secured)
- return
- if (!ishuman(user))
- return ..(user)
- var/t = "Circuitboard Console - Camera Monitoring Computer
"
- t += "Close
"
- t += "