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

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/spells/mind_transfer.dm
This commit is contained in:
PsiOmega
2015-03-29 16:23:06 +02:00
parent 6ec0c2e504 84e4f6315f
commit 710abd0921
8 changed files with 168 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wires/camera.dm
+1 -1
View File
@@ -58,7 +58,7 @@ var/const/CAMERA_WIRE_NOTHING2 = 32
C.setViewRange(new_range)
if(CAMERA_WIRE_POWER)
C.deactivate(null) // Deactivate the camera
C.kick_viewers() // Kicks anyone watching the camera
if(CAMERA_WIRE_LIGHT)
C.light_disabled = !C.light_disabled