cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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(..())

37
html/changelogs/Heroman3003 - cameraccess.yml Normal file
View File

@@ -0,0 +1,37 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Heroman3003
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Removed access to departmental networks on camera modular computer program for average people."
- rscadd: "Added access to full network on camera modular computer program for heads."