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

Update camera.dm

Browse Source
This commit is contained in:
Novacat
2019-05-13 22:57:06 -04:00
committed by GitHub
parent d95b7fda42
commit ad5fa6c7e3
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,11 +72,7 @@
if(!network_access) if(!network_access)
return 1 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) 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) /datum/nano_module/camera_monitor/Topic(href, href_list)
if(..()) if(..())