Merge remote-tracking branch 'citadel/master' into nightshift_1

2020-01-12 18:27:03 -08:00
parent 8725ffe916 8c50b578b4
commit 8f5d4a0a49
1055 changed files with 194026 additions and 195699 deletions
@@ -1,31 +1,31 @@
-/area/ai_monitored
-	name = "AI Monitored Area"
-	clockwork_warp_allowed = FALSE
-	var/list/obj/machinery/camera/motioncameras = list()
-	var/list/datum/weakref/motionTargets = list()
-
-/area/ai_monitored/Initialize(mapload)
-	. = ..()
-	if(mapload)
-		for (var/obj/machinery/camera/M in src)
-			if(M.isMotion())
-				motioncameras.Add(M)
-				M.area_motion = src
-
-//Only need to use one camera
-
-/area/ai_monitored/Entered(atom/movable/O)
-	..()
-	if (ismob(O) && motioncameras.len)
-		for(var/X in motioncameras)
-			var/obj/machinery/camera/cam = X
-			cam.newTarget(O)
-			return
-
-/area/ai_monitored/Exited(atom/movable/O)
-	..()
-	if (ismob(O) && motioncameras.len)
-		for(var/X in motioncameras)
-			var/obj/machinery/camera/cam = X
-			cam.lostTargetRef(WEAKREF(O))
+/area/ai_monitored
+	name = "AI Monitored Area"
+	clockwork_warp_allowed = FALSE
+	var/list/obj/machinery/camera/motioncameras = list()
+	var/list/datum/weakref/motionTargets = list()
+
+/area/ai_monitored/Initialize(mapload)
+	. = ..()
+	if(mapload)
+		for (var/obj/machinery/camera/M in src)
+			if(M.isMotion())
+				motioncameras.Add(M)
+				M.area_motion = src
+
+//Only need to use one camera
+
+/area/ai_monitored/Entered(atom/movable/O)
+	..()
+	if (ismob(O) && motioncameras.len)
+		for(var/X in motioncameras)
+			var/obj/machinery/camera/cam = X
+			cam.newTarget(O)
+			return
+
+/area/ai_monitored/Exited(atom/movable/O)
+	..()
+	if (ismob(O) && motioncameras.len)
+		for(var/X in motioncameras)
+			var/obj/machinery/camera/cam = X
+			cam.lostTargetRef(WEAKREF(O))
 			return