cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7864 from Citinited/video-killed-the-radio-star

Browse Source 
No more cheesing the gateway with video cameras
This commit is contained in:
tigercat2000
2017-08-14 10:54:23 -07:00
committed by GitHub
parent 6bb232ffd5 89b494b90d
commit 4cd00729f5
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/camera.dm
+10 -1
View File
@@ -46,6 +46,12 @@
M.unset_machine() //to properly reset the view of the users if the console is deleted.
return ..()
/obj/machinery/computer/security/proc/isCameraFarAway(obj/machinery/camera/C)
var/turf/consoleturf = get_turf(src)
var/turf/cameraturf = get_turf(C)
if((is_away_level(cameraturf.z) || is_away_level(consoleturf.z)) && !atoms_share_level(cameraturf, consoleturf)) //can only recieve away mission cameras on away missions
return TRUE
/obj/machinery/computer/security/check_eye(mob/user)
if(!(user in watchers))
user.unset_machine()
@@ -54,6 +60,9 @@
user.unset_machine()
return
var/obj/machinery/camera/C = watchers[user]
if(isCameraFarAway(C))
user.unset_machine()
return
if(!can_access_camera(C, user))
user.unset_machine()
return
@@ -113,7 +122,7 @@
var/list/cameras = list()
for(var/obj/machinery/camera/C in cameranet.cameras)
if((is_away_level(z) || is_away_level(C.z)) && !atoms_share_level(C, src)) //can only recieve away mission cameras on away missions
if(isCameraFarAway(C))
continue
if(!can_access_camera(C, user))
continue