cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 05:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6705

Browse Source
This commit is contained in:
Zuhayr
2014-10-16 14:57:20 +10:30
parent 00871b5207
commit ce06ee46f9
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/camera/camera.dm
+9 -1
View File
@@ -283,4 +283,12 @@
return 0
return 1
busy = 0
return 0
return 0
/obj/machinery/camera/proc/is_functional()
if(istype(loc,/mob/living/silicon/robot))
var/mob/living/silicon/robot/R = loc
if(!R.stat && R.is_component_functioning("camera"))
return 1
return 0
return status
code/game/machinery/computer/camera.dm
+2 -2
View File
@@ -69,7 +69,7 @@
proc/can_access_camera(var/obj/machinery/camera/C)
var/list/shared_networks = src.network & C.network
if(shared_networks.len)
if(shared_networks.len && C.is_functional())
return 1
return 0
@@ -80,7 +80,7 @@
A.eyeobj.setLoc(get_turf(C))
A.client.eye = A.eyeobj
return 1
if (!C.can_use() || user.stat || (get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) && !istype(user, /mob/living/silicon)))
return 0
src.current = C