adding the spirit entity code, fixing the cameraNet so that it compiles properly

Conflicts:
	code/datums/visibility_networks/dictionary.dm
	code/game/machinery/doors/door.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
This commit is contained in:
jack-fractal
2013-12-08 13:27:29 -05:00
committed by ZomgPonies
parent 3df35fe03c
commit 2754b56e0c
13 changed files with 693 additions and 23 deletions
@@ -142,7 +142,7 @@
return null
var/list/L = list()
for(var/obj/machinery/camera/C in cameranet.cameras)
for(var/obj/machinery/camera/C in cameranet.viewpoints)
var/list/temp = C.network & key.networks
if(temp.len)
L.Add(C)