cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8493 from ShadowLarkens/weh

Browse Source 
Fix engineering camera consoles seeing all cameras
This commit is contained in:
Novacat
2020-07-26 23:14:36 -04:00
committed by GitHub
parent 2ecf2aad2d 121a711265
commit 2a8d652cc0
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/machinery/computer/camera.dm
View File

@@ -17,9 +17,12 @@
/obj/machinery/computer/security/Initialize() /obj/machinery/computer/security/Initialize()
. = ..() . = ..()
if(!LAZYLEN(network)) if(!LAZYLEN(network))
network = using_map.station_networks.Copy() network = get_default_networks()
camera = new(src, network) camera = new(src, network)
/obj/machinery/computer/security/proc/get_default_networks()
. = using_map.station_networks.Copy()
/obj/machinery/computer/security/Destroy() /obj/machinery/computer/security/Destroy()
QDEL_NULL(camera) QDEL_NULL(camera)
return ..() return ..()
@@ -34,7 +37,7 @@
tgui_interact(user) tgui_interact(user)
/obj/machinery/computer/security/attack_ai(mob/user) /obj/machinery/computer/security/attack_ai(mob/user)
to_chat(user, "<span class='notice'>You realise its kind of stupid to access a camera console when you have the entire camera network at your metaphorical fingertips</span>") to_chat(user, "<span class='notice'>You realise its kind of stupid to access a camera console when you have the entire camera network at your metaphorical fingertips.</span>")
return return
/obj/machinery/computer/security/proc/set_network(list/new_network) /obj/machinery/computer/security/proc/set_network(list/new_network)
@@ -111,10 +114,8 @@
circuit = /obj/item/weapon/circuitboard/security/engineering circuit = /obj/item/weapon/circuitboard/security/engineering
light_color = "#FAC54B" light_color = "#FAC54B"
/obj/machinery/computer/security/engineering/New() /obj/machinery/computer/security/engineering/get_default_networks()
if(!network) . = engineering_networks.Copy()
network = engineering_networks.Copy()
..()
/obj/machinery/computer/security/nuclear /obj/machinery/computer/security/nuclear
name = "head mounted camera monitor" name = "head mounted camera monitor"
@@ -122,7 +123,4 @@
icon_state = "syndicam" icon_state = "syndicam"
network = list(NETWORK_MERCENARY) network = list(NETWORK_MERCENARY)
circuit = null circuit = null
/obj/machinery/computer/security/nuclear/New()
..()
req_access = list(150) req_access = list(150)