Merge with upstream/master

This commit is contained in:
DZD
2015-02-12 16:43:01 -05:00
98 changed files with 3191 additions and 2422 deletions
+1 -1
View File
@@ -492,7 +492,7 @@
/obj/item/weapon/camera_bug/attack_self(mob/usr as mob)
var/list/cameras = new/list()
for (var/obj/machinery/camera/C in cameranet.viewpoints)
for (var/obj/machinery/camera/C in cameranet.cameras)
if (C.bugged && C.status)
cameras.Add(C)
if (length(cameras) == 0)