cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ofChemistryAndStuff

Browse Source 
Conflicts:
	maps/exodus-1.dmm
This commit is contained in:
Kelenius
2015-03-30 10:35:37 +03:00
parent 24ef7752cd 3bc2b03982
commit c3312be968
11 changed files with 2315 additions and 2294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/wires/camera.dm
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