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

Restricts camera access on MC

Browse Source
This commit is contained in:
Neerti
2019-05-13 22:55:18 -04:00
committed by VirgoBot
parent 84d3652869
commit 31174cee2d
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/modular_computers/file_system/programs/generic/camera.dm
View File

@@ -9,6 +9,7 @@
switch(network)
if(NETWORK_THUNDER)
return 0
<<<<<<< HEAD
if(NETWORK_ENGINE,NETWORK_ALARM_ATMOS,NETWORK_ALARM_FIRE,NETWORK_ALARM_POWER) //VOREStation Edit
return access_engine
/*
@@ -21,6 +22,10 @@
if(NETWORK_COMMAND,NETWORK_TELECOM)
return access_heads
*/ //VOREStation Removal
=======
if(NETWORK_ENGINE,NETWORK_ALARM_ATMOS,NETWORK_ALARM_FIRE,NETWORK_ALARM_POWER)
return access_engine
>>>>>>> 1232e68... Merge pull request #6153 from Heroman3003/camera-access-changes
if(NETWORK_ERT)
return access_cent_specops
@@ -33,7 +38,7 @@
program_icon_state = "cameras"
program_key_state = "generic_key"
program_menu_icon = "search"
extended_desc = "This program allows remote access to the camera system. Some camera networks may have additional access requirements."
extended_desc = "This program allows remote access to the camera system. Most camera networks may have additional access requirements."
size = 12
available_on_ntnet = 1
requires_ntnet = 1
@@ -82,7 +87,11 @@
if(!network_access)
return 1
<<<<<<< HEAD
return check_access(user, access_security) || check_access(user, access_heads) || check_access(user, network_access) //VOREStation Edit
=======
return check_access(user, access_security) || check_access(user, access_heads) || check_access(user, network_access)
>>>>>>> 1232e68... Merge pull request #6153 from Heroman3003/camera-access-changes
/datum/nano_module/camera_monitor/Topic(href, href_list)
if(..())