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

This commit is contained in:
PsiOmega
2014-12-09 09:07:38 +01:00
3 changed files with 17 additions and 15 deletions

View File

@@ -147,7 +147,7 @@
if(temp.len)
L.Add(C)
//camera_sort(L)
camera_sort(L)
return L
verify_machine(var/obj/machinery/camera/C,var/datum/file/camnet_key/key = null)