Merge pull request #3865 from tigercat2000/tgcam

Port -tg-station cameranets

code/modules/alarm/alarm_handler.dm

@@ -65,7 +65,6 @@
 	for(var/obj/machinery/camera/C in alarm.cameras())
 		if(was_raised)
 			C.network.Add(category)
-			invalidateCameraCache()
 		else
 			C.network.Remove(category)
 	notify_listeners(alarm, was_raised)

code/modules/computer3/computers/camera.dm

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

code/modules/mob/camera/camera.dm

@@ -8,7 +8,7 @@
 	mouse_opacity = 0
 	see_in_dark = 7
 	invisibility = 101 // No one can see us
-
+	sight = SEE_SELF
 	move_on_shuttle = 0
 
 /mob/camera/experience_pressure_difference()
@@ -17,7 +17,7 @@
 /mob/camera/Destroy()
 	..()
 	return QDEL_HINT_HARDDEL_NOW
-	
+
 /mob/camera/Login()
 	..()
 	update_interface()

code/modules/mob/living/carbon/human/human.dm

@@ -694,10 +694,10 @@
 	return
 
 //repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a seperate proc as it'll be useful elsewhere
-/mob/living/carbon/human/proc/get_visible_name()
-	if( wear_mask && (wear_mask.flags_inv&HIDEFACE) )	//Wearing a mask which hides our face, use id-name if possible
+/mob/living/carbon/human/get_visible_name()
+	if(wear_mask && (wear_mask.flags_inv & HIDEFACE))	//Wearing a mask which hides our face, use id-name if possible
 		return get_id_name("Unknown")
-	if( head && (head.flags_inv&HIDEFACE) )
+	if(head && (head.flags_inv & HIDEFACE))
 		return get_id_name("Unknown")		//Likewise for hats
 	var/face_name = get_face_name()
 	var/id_name = get_id_name("")
@@ -1913,5 +1913,17 @@
 		src << "<span class='notice'>You swallow a gulp of [toDrink].</span>"
 	return 1
 
+/mob/living/carbon/human/can_track(mob/living/user)
+	if(wear_id)
+		var/obj/item/weapon/card/id/id = wear_id
+		if(istype(id) && id.is_untrackable())
+			return 0
+	if(istype(head, /obj/item/clothing/head))
+		var/obj/item/clothing/head/hat = head
+		if(hat.blockTracking)
+			return 0
+
+	return ..()
+
 /mob/living/carbon/human/proc/get_age_pitch()
 	return 1.0 + 0.5*(30 - age)/80

code/modules/mob/living/living.dm

@@ -10,6 +10,28 @@
 		if(rig)
 			SetupStat(rig)
 
+/mob/living/proc/can_track(mob/living/user)
+	//basic fast checks go first. When overriding this proc, I recommend calling ..() at the end.
+	var/turf/T = get_turf(src)
+	if(!T)
+		return 0
+	if(T.z == ZLEVEL_CENTCOMM) //dont detect mobs on centcomm
+		return 0
+	if(T.z >= MAX_Z)
+		return 0
+	if(user != null && src == user)
+		return 0
+	if(invisibility || alpha == 0)//cloaked
+		return 0
+	if(digitalcamo)
+		return 0
+
+	// Now, are they viewable by a camera? (This is last because it's the most intensive check)
+	if(!near_camera(src))
+		return 0
+
+	return 1
+
 //mob verbs are a lot faster than object verbs
 //for more info on why this is not atom/pull, see examinate() in mob.dm
 /mob/living/verb/pulled(atom/movable/AM as mob|obj in oview(1))
@@ -760,6 +782,9 @@
 	src << "<span class='notice'>You're too exhausted to keep going...</span>"
 	Weaken(5)
 
+/mob/living/proc/get_visible_name()
+	return name
+
 /mob/living/update_gravity(has_gravity)
 	if(!ticker)
 		return

code/modules/mob/living/silicon/ai/ai.dm

@@ -46,7 +46,7 @@ var/list/ai_verbs_default = list(
 	var/list/connected_robots = list()
 	var/aiRestorePowerRoutine = 0
 	//var/list/laws = list()
-	var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list())
+	var/alarms = list("Motion" = list(), "Fire" = list(), "Atmosphere" = list(), "Power" = list(), "Camera" = list())
 	var/viewalerts = 0
 	var/icon/holo_icon//Default is assigned when AI is created.
 	var/obj/mecha/controlled_mech //For controlled_mech a mech, to determine whether to relaymove or use the AI eye.
@@ -69,10 +69,13 @@ var/list/ai_verbs_default = list(
 	var/obj/machinery/power/apc/malfhack = null
 	var/explosive = 0 //does the AI explode when it dies?
 
-	var/mob/living/silicon/ai/parent = null
 
-	var/camera_light_on = 0	//Defines if the AI toggled the light on the camera it's looking through.
-	var/datum/trackable/track = null
+	var/mob/living/silicon/ai/parent = null
+	var/camera_light_on = 0
+	var/list/obj/machinery/camera/lit_cameras = list()
+
+	var/datum/trackable/track = new()
+
 	var/last_paper_seen = null
 	var/can_shunt = 1
 	var/last_announcement = ""
@@ -81,6 +84,15 @@ var/list/ai_verbs_default = list(
 	var/turf/waypoint //Holds the turf of the currently selected waypoint.
 	var/waypoint_mode = 0 //Waypoint mode is for selecting a turf via clicking.
 
+	var/obj/machinery/hologram/holopad/holo = null
+	var/mob/camera/aiEye/eyeobj = new()
+	var/sprint = 10
+	var/cooldown = 0
+	var/acceleration = 1
+	var/tracking = 0 //this is 1 if the AI is currently tracking somebody, but the track has not yet been completed.
+
+	var/obj/machinery/camera/portable/builtInCamera
+
 	//var/obj/item/borg/sight/hud/sec/sechud = null
 	//var/obj/item/borg/sight/hud/med/healthhud = null
 
@@ -175,6 +187,13 @@ var/list/ai_verbs_default = list(
 	spawn(5)
 		new /obj/machinery/ai_powersupply(src)
 
+	eyeobj.ai = src
+	eyeobj.name = "[src.name] (AI Eye)" // Give it a name
+	eyeobj.loc = src.loc
+
+	builtInCamera = new /obj/machinery/camera/portable(src)
+	builtInCamera.c_tag = name
+	builtInCamera.network = list("SS13")
 
 	ai_list += src
 	shuttle_caller_list += src
@@ -486,8 +505,8 @@ var/list/ai_verbs_default = list(
 		return
 
 	if (href_list["track"])
-		var/mob/target = locate(href_list["track"]) in mob_list
-		if(target && trackable(target))
+		var/mob/living/target = locate(href_list["track"]) in mob_list
+		if(target && target.can_track())
 			ai_actual_track(target)
 		else
 			src << "<span class='warning'>Target is not on or near any active cameras on the station.</span>"
@@ -495,7 +514,7 @@ var/list/ai_verbs_default = list(
 
 	if (href_list["trackbot"])
 		var/obj/machinery/bot/target = locate(href_list["trackbot"]) in aibots
-		if(target && trackable(target))
+		if(target)
 			ai_actual_track(target)
 		else
 			src << "<span class='warning'>Target is not on or near any active cameras on the station.</span>"
@@ -633,7 +652,6 @@ var/list/ai_verbs_default = list(
 			d += "<td width='30%'>[bot_area.name]</td>"
 			d += "<td width='10%'><A HREF=?src=\ref[src];interface=\ref[Bot]>Interface</A></td>"
 			d += "<td width='10%'><A HREF=?src=\ref[src];callbot=\ref[Bot]>Call</A></td>"
-			d += "<td width='10%'><a href='byond://?src=\ref[src];track2=\ref[src];trackbot=\ref[Bot]'>Track</A></td>"
 			d += "</tr>"
 			d = format_text(d)
 
@@ -664,7 +682,10 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/proc/switchCamera(var/obj/machinery/camera/C)
 
-	if (!C || stat == 2) //C.can_use())
+	if(!tracking)
+		cameraFollow = null
+
+	if (!C || stat == DEAD) //C.can_use())
 		return 0
 
 	if(!src.eyeobj)
@@ -825,17 +846,20 @@ var/list/ai_verbs_default = list(
 	if(stat != CONSCIOUS)
 		return
 
-	if(check_unable())
+	camera_light_on = !camera_light_on
+
+	if (!camera_light_on)
+		src << "Camera lights deactivated."
+
+		for (var/obj/machinery/camera/C in lit_cameras)
+			C.set_light(0)
+			lit_cameras = list()
+
 		return
 
-	camera_light_on = !camera_light_on
-	src << "Camera lights [camera_light_on ? "activated" : "deactivated"]."
-	if(!camera_light_on)
-		if(current)
-			current.set_light(0)
-			current = null
-	else
-		lightNearbyCamera()
+	light_cameras()
+
+	src << "Camera lights activated."
 
 /mob/living/silicon/ai/proc/sensor_mode()
 	set name = "Set Sensor Augmentation"
@@ -856,26 +880,25 @@ var/list/ai_verbs_default = list(
 // Handled camera lighting, when toggled.
 // It will get the nearest camera from the eyeobj, lighting it.
 
-/mob/living/silicon/ai/proc/lightNearbyCamera()
-	if(camera_light_on && camera_light_on < world.timeofday)
-		if(src.current)
-			var/obj/machinery/camera/camera = near_range_camera(src.eyeobj)
-			if(camera && src.current != camera)
-				src.current.set_light(0)
-				if(!camera.light_disabled)
-					src.current = camera
-					src.current.set_light(AI_CAMERA_LUMINOSITY)
-				else
-					src.current = null
-			else if(isnull(camera))
-				src.current.set_light(0)
-				src.current = null
-		else
-			var/obj/machinery/camera/camera = near_range_camera(src.eyeobj)
-			if(camera && !camera.light_disabled)
-				src.current = camera
-				src.current.set_light(AI_CAMERA_LUMINOSITY)
-		camera_light_on = world.timeofday + 1 * 20 // Update the light every 2 seconds.
+/mob/living/silicon/ai/proc/light_cameras()
+	var/list/obj/machinery/camera/add = list()
+	var/list/obj/machinery/camera/remove = list()
+	var/list/obj/machinery/camera/visible = list()
+	for (var/datum/camerachunk/CC in eyeobj.visibleCameraChunks)
+		for (var/obj/machinery/camera/C in CC.cameras)
+			if (!C.can_use() || get_dist(C, eyeobj) > 7)
+				continue
+			visible |= C
+
+	add = visible - lit_cameras
+	remove = lit_cameras - visible
+
+	for (var/obj/machinery/camera/C in remove)
+		lit_cameras -= C //Removed from list before turning off the light so that it doesn't check the AI looking away.
+		C.Togglelight(0)
+	for (var/obj/machinery/camera/C in add)
+		C.Togglelight(1)
+		lit_cameras |= C
 
 
 /mob/living/silicon/ai/attackby(obj/item/weapon/W as obj, mob/user as mob, params)

code/modules/mob/living/silicon/ai/freelook/cameranet.dm

@@ -2,33 +2,34 @@
 //
 // The datum containing all the chunks.
 
+var/const/CHUNK_SIZE = 16 // Only chunk sizes that are to the power of 2. E.g: 2, 4, 8, 16, etc..
+
 var/datum/cameranet/cameranet = new()
 
 /datum/cameranet
+	var/name = "Camera Net" // Name to show for VV and stat()
+
 	// The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm by New() and Destroy().
 	var/list/cameras = list()
-	var/cameras_unsorted = 1
 	// The chunks of the map, mapping the areas that the cameras can see.
 	var/list/chunks = list()
 	var/ready = 0
 
-/datum/cameranet/proc/process_sort()
-	if(cameras_unsorted)
-		cameras = dd_sortedObjectList(cameras)
-		cameras_unsorted = 0
+	// The object used for the clickable stat() button.
+	var/obj/effect/statclick/statclick
 
 // Checks if a chunk has been Generated in x, y, z.
 /datum/cameranet/proc/chunkGenerated(x, y, z)
-	x &= ~0xf
-	y &= ~0xf
+	x &= ~(CHUNK_SIZE - 1)
+	y &= ~(CHUNK_SIZE - 1)
 	var/key = "[x],[y],[z]"
 	return (chunks[key])
 
 // Returns the chunk in the x, y, z.
 // If there is no chunk, it creates a new chunk and returns that.
 /datum/cameranet/proc/getCameraChunk(x, y, z)
-	x &= ~0xf
-	y &= ~0xf
+	x &= ~(CHUNK_SIZE - 1)
+	y &= ~(CHUNK_SIZE - 1)
 	var/key = "[x],[y],[z]"
 	if(!chunks[key])
 		chunks[key] = new /datum/camerachunk(null, x, y, z)
@@ -37,12 +38,12 @@ var/datum/cameranet/cameranet = new()
 
 // Updates what the aiEye can see. It is recommended you use this when the aiEye moves or it's location is set.
 
-/datum/cameranet/proc/visibility(mob/aiEye/ai)
+/datum/cameranet/proc/visibility(mob/camera/aiEye/ai)
 	// 0xf = 15
-	var/x1 = max(0, ai.x - 16) & ~0xf
-	var/y1 = max(0, ai.y - 16) & ~0xf
-	var/x2 = min(world.maxx, ai.x + 16) & ~0xf
-	var/y2 = min(world.maxy, ai.y + 16) & ~0xf
+	var/x1 = max(0, ai.x - 16) & ~(CHUNK_SIZE - 1)
+	var/y1 = max(0, ai.y - 16) & ~(CHUNK_SIZE - 1)
+	var/x2 = min(world.maxx, ai.x + 16) & ~(CHUNK_SIZE - 1)
+	var/y2 = min(world.maxy, ai.y + 16) & ~(CHUNK_SIZE - 1)
 
 	var/list/visibleChunks = list()
 
@@ -63,7 +64,7 @@ var/datum/cameranet/cameranet = new()
 
 // Updates the chunks that the turf is located in. Use this when obstacles are destroyed or	when doors open.
 
-/datum/cameranet/proc/updateVisibility(atom/A, var/opacity_check = 1)
+/datum/cameranet/proc/updateVisibility(atom/A, opacity_check = 1)
 
 	if(!ticker || (opacity_check && !A.opacity))
 		return
@@ -109,15 +110,15 @@ var/datum/cameranet/cameranet = new()
 
 	var/turf/T = get_turf(c)
 	if(T)
-		var/x1 = max(0, T.x - 8) & ~0xf
-		var/y1 = max(0, T.y - 8) & ~0xf
-		var/x2 = min(world.maxx, T.x + 8) & ~0xf
-		var/y2 = min(world.maxy, T.y + 8) & ~0xf
+		var/x1 = max(0, T.x - (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
+		var/y1 = max(0, T.y - (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
+		var/x2 = min(world.maxx, T.x + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
+		var/y2 = min(world.maxy, T.y + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
 
 		//world << "X1: [x1] - Y1: [y1] - X2: [x2] - Y2: [y2]"
 
-		for(var/x = x1; x <= x2; x += 16)
-			for(var/y = y1; y <= y2; y += 16)
+		for(var/x = x1; x <= x2; x += CHUNK_SIZE)
+			for(var/y = y1; y <= y2; y += CHUNK_SIZE)
 				if(chunkGenerated(x, y, T.z))
 					var/datum/camerachunk/chunk = getCameraChunk(x, y, T.z)
 					if(choice == 0)
@@ -145,6 +146,14 @@ var/datum/cameranet/cameranet = new()
 			return 1
 	return 0
 
+/*
+/datum/cameranet/proc/stat_entry()
+	if(!statclick)
+		statclick = new/obj/effect/statclick/debug("Initializing...", src)
+
+	stat(name, statclick.update("Cameras: [cameranet.cameras.len] | Chunks: [cameranet.chunks.len]"))
+*/
+
 // Debug verb for VVing the chunk that the turf is in.
 /*
 /turf/verb/view_chunk()

code/modules/mob/living/silicon/ai/freelook/chunk.dm

@@ -21,26 +21,24 @@
 
 // Add an AI eye to the chunk, then update if changed.
 
-/datum/camerachunk/proc/add(mob/aiEye/ai)
-	if(!ai.ai)
-		return
-	ai.visibleCameraChunks += src
-	if(ai.ai.client)
-		ai.ai.client.images += obscured
+/datum/camerachunk/proc/add(mob/camera/aiEye/eye)
+	var/client/client = eye.GetViewerClient()
+	if(client)
+		client.images += obscured
+	eye.visibleCameraChunks += src
 	visible++
-	seenby += ai
+	seenby += eye
 	if(changed && !updating)
 		update()
 
 // Remove an AI eye from the chunk, then update if changed.
 
-/datum/camerachunk/proc/remove(mob/aiEye/ai)
-	if(!ai.ai)
-		return
-	ai.visibleCameraChunks -= src
-	if(ai.ai.client)
-		ai.ai.client.images -= obscured
-	seenby -= ai
+/datum/camerachunk/proc/remove(mob/camera/aiEye/eye)
+	var/client/client = eye.GetViewerClient()
+	if(client)
+		client.images -= obscured
+	eye.visibleCameraChunks -= src
+	seenby -= eye
 	if(visible > 0)
 		visible--
 
@@ -54,7 +52,7 @@
 // Updates the chunk, makes sure that it doesn't update too much. If the chunk isn't being watched it will
 // instead be flagged to update the next time an AI Eye moves near it.
 
-/datum/camerachunk/proc/hasChanged(var/update_now = 0)
+/datum/camerachunk/proc/hasChanged(update_now = 0)
 	if(visible || update_now)
 		if(!updating)
 			updating = 1
@@ -68,7 +66,7 @@
 
 /datum/camerachunk/proc/update()
 
-	set background = 1
+	set background = BACKGROUND_ENABLED
 
 	var/list/newVisibleTurfs = list()
 
@@ -81,11 +79,14 @@
 		if(!c.can_use())
 			continue
 
-		var/turf/point = locate(src.x + 8, src.y + 8, src.z)
-		if(get_dist(point, c) > 24)
+		var/turf/point = locate(src.x + (CHUNK_SIZE / 2), src.y + (CHUNK_SIZE / 2), src.z)
+		if(get_dist(point, c) > CHUNK_SIZE + (CHUNK_SIZE / 2))
 			continue
 
 		for(var/turf/t in c.can_see())
+			// Possible optimization: if(turfs[t]) here, rather than &= turfs afterwards.
+			// List associations use a tree or hashmap of some sort (alongside the list itself)
+			//  so are surprisingly fast. (significantly faster than var/thingy/x in list, in testing)
 			newVisibleTurfs[t] = t
 
 	// Removes turf that isn't in turfs.
@@ -102,11 +103,12 @@
 		if(t.obscured)
 			obscured -= t.obscured
 			for(var/eye in seenby)
-				var/mob/aiEye/m = eye
-				if(!m || !m.ai)
+				var/mob/camera/aiEye/m = eye
+				if(!m)
 					continue
-				if(m.ai.client)
-					m.ai.client.images -= t.obscured
+				var/client/client = m.GetViewerClient()
+				if(client)
+					client.images -= t.obscured
 
 	for(var/turf in visRemoved)
 		var/turf/t = turf
@@ -116,32 +118,32 @@
 
 			obscured += t.obscured
 			for(var/eye in seenby)
-				var/mob/aiEye/m = eye
-				if(!m || !m.ai)
+				var/mob/camera/aiEye/m = eye
+				if(!m)
 					seenby -= m
 					continue
-				if(m.ai.client)
-					m.ai.client.images += t.obscured
+				var/client/client = m.GetViewerClient()
+				if(client)
+					client.images += t.obscured
 
 // Create a new camera chunk, since the chunks are made as they are needed.
 
 /datum/camerachunk/New(loc, x, y, z)
 
 	// 0xf = 15
-	x &= ~0xf
-	y &= ~0xf
+	x &= ~(CHUNK_SIZE - 1)
+	y &= ~(CHUNK_SIZE - 1)
 
 	src.x = x
 	src.y = y
 	src.z = z
 
-	for(var/obj/machinery/camera/c in range(16, locate(x + 8, y + 8, z)))
+	for(var/obj/machinery/camera/c in urange(CHUNK_SIZE, locate(x + (CHUNK_SIZE / 2), y + (CHUNK_SIZE / 2), z)))
 		if(c.can_use())
 			cameras += c
 
-	for(var/turf/t in range(10, locate(x + 8, y + 8, z)))
-		if(t.x >= x && t.y >= y && t.x < x + 16 && t.y < y + 16)
-			turfs[t] = t
+	for(var/turf/t in block(locate(x, y, z), locate(min(x + CHUNK_SIZE - 1, world.maxx), min(y + CHUNK_SIZE - 1, world.maxy), z)))
+		turfs[t] = t
 
 	for(var/camera in cameras)
 		var/obj/machinery/camera/c = camera
@@ -152,6 +154,9 @@
 			continue
 
 		for(var/turf/t in c.can_see())
+			// Possible optimization: if(turfs[t]) here, rather than &= turfs afterwards.
+			// List associations use a tree or hashmap of some sort (alongside the list itself)
+			//  so are surprisingly fast. (significantly faster than var/thingy/x in list, in testing)
 			visibleTurfs[t] = t
 
 	// Removes turf that isn't in turfs.

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -3,57 +3,27 @@
 // An invisible (no icon) mob that the AI controls to look around the station with.
 // It streams chunks as it moves around, which will show it what the AI can and cannot see.
 
-/mob/aiEye
+/mob/camera/aiEye
 	name = "Inactive AI Eye"
-	icon = 'icons/mob/AI.dmi'
+
+	icon = 'icons/mob/AI.dmi' //Allows ghosts to see what the AI is looking at.
 	icon_state = "eye"
 	alpha = 127
+	invisibility = SEE_INVISIBLE_OBSERVER
+
 	var/list/visibleCameraChunks = list()
 	var/mob/living/silicon/ai/ai = null
-	density = 0
-	status_flags = GODMODE  // You can't damage it.
-	mouse_opacity = 0
-	see_in_dark = 7
-	invisibility = SEE_INVISIBLE_OBSERVER
-	var/ghostimage = null
-
-/mob/aiEye/New()
-	ghostimage = image(src.icon,src,src.icon_state)
-	ghost_darkness_images |= ghostimage //so ghosts can see the blob cursor when they disable darkness
-	updateallghostimages()
-	..()
-
-/mob/aiEye/Destroy()
-	if (ghostimage)
-		ghost_darkness_images -= ghostimage
-		qdel(ghostimage)
-		ghostimage = null;
-		updateallghostimages()
-	ai = null
-	return ..()
-
-// Movement code. Returns 0 to stop air movement from moving it.
-/mob/aiEye/Move()
-	return 0
-
-// Hide popout menu verbs
-/mob/aiEye/examinate(atom/A as mob|obj|turf in view())
-	set popup_menu = 0
-	set src = usr.contents
-	return 0
+	var/relay_speech = FALSE
 
 
 // Use this when setting the aiEye's location.
 // It will also stream the chunk that the new loc is in.
-/mob/aiEye/setLoc(var/T, var/cancel_tracking = 1)
+
+/mob/camera/aiEye/setLoc(T)
 
 	if(ai)
 		if(!isturf(ai.loc))
 			return
-
-		if(cancel_tracking)
-			ai.ai_cancel_tracking()
-
 		T = get_turf(T)
 		loc = T
 		cameranet.visibility(src)
@@ -63,40 +33,27 @@
 		if(ai.holo)
 			ai.holo.move_hologram()
 
-/mob/aiEye/proc/getLoc()
-
-	if(ai)
-		if(!isturf(ai.loc) || !ai.client)
-			return
-		return ai.eyeobj.loc
-
-/mob/aiEye/experience_pressure_difference()
+/mob/camera/aiEye/Move()
 	return 0
 
-// AI MOVEMENT
+/mob/camera/aiEye/proc/GetViewerClient()
+	if(ai)
+		return ai.client
+	return null
 
-// The AI's "eye". Described on the top of the page.
-
-/mob/living/silicon/ai
-	var/mob/aiEye/eyeobj = new()
-	var/sprint = 10
-	var/cooldown = 0
-	var/acceleration = 1
-	var/obj/machinery/hologram/holopad/holo = null
-
-// Intiliaze the eye by assigning it's "ai" variable to us. Then set it's loc to us.
-/mob/living/silicon/ai/New()
-	..()
-	eyeobj.ai = src
-	eyeobj.name = "[src.name] (AI Eye)" // Give it a name
-	spawn(5)
-		eyeobj.loc = src.loc
+/mob/camera/aiEye/Destroy()
+	ai = null
+	return ..()
 
 /atom/proc/move_camera_by_click()
 	if(istype(usr, /mob/living/silicon/ai))
 		var/mob/living/silicon/ai/AI = usr
 		if(AI.eyeobj && AI.client.eye == AI.eyeobj)
-			AI.eyeobj.setLoc(src)
+			AI.cameraFollow = null
+			if (isturf(src.loc) || isturf(src))
+				AI.eyeobj.setLoc(src)
+
+// AI MOVEMENT
 
 // This will move the AIEye. It will also cause lights near the eye to light up, if toggled.
 // This is handled in the proc below this one.
@@ -120,38 +77,42 @@
 	else
 		user.sprint = initial
 
+	if(!user.tracking)
+		user.cameraFollow = null
+
 	//user.unset_machine() //Uncomment this if it causes problems.
 	//user.lightNearbyCamera()
-
+	if (user.camera_light_on)
+		user.light_cameras()
 
 // Return to the Core.
-
 /mob/living/silicon/ai/proc/core()
 	set category = "AI Commands"
 	set name = "AI Core"
 
 	view_core()
 
-
 /mob/living/silicon/ai/proc/view_core()
+
 	current = null
+	cameraFollow = null
 	unset_machine()
 
-	if(!src.eyeobj)
+	if(src.eyeobj && src.loc)
+		src.eyeobj.loc = src.loc
+	else
 		src << "ERROR: Eyeobj not found. Creating new eye..."
-		src.eyeobj = new(loc)
+		src.eyeobj = new(src.loc)
 		src.eyeobj.ai = src
-		src.rename_character(null, real_name)
+		src.eyeobj.name = "[src.name] (AI Eye)" // Give it a name
 
-	if(client && client.eye)
-		client.eye = src
-	for(var/datum/camerachunk/c in eyeobj.visibleCameraChunks)
-		c.remove(eyeobj)
-	src.eyeobj.setLoc(src)
+	eyeobj.setLoc(loc)
 
 /mob/living/silicon/ai/proc/toggle_acceleration()
 	set category = "AI Commands"
 	set name = "Toggle Camera Acceleration"
 
+	if(usr.stat == 2)
+		return //won't work if dead
 	acceleration = !acceleration
 	usr << "Camera acceleration has been toggled [acceleration ? "on" : "off"]."

code/modules/mob/mob_helpers.dm

@@ -108,7 +108,7 @@ proc/isembryo(A)
 	return 1
 
 /proc/isAIEye(A)
-	if(istype(A, /mob/aiEye))
+	if(istype(A, /mob/camera/aiEye))
 		return 1
 	return 0
 
@@ -379,7 +379,7 @@ proc/Gibberish(t, p)//t is the inputted message, and any value higher than 70 fo
 
 		var/atom/oldeye=M.client.eye
 		var/aiEyeFlag = 0
-		if(istype(oldeye, /mob/aiEye))
+		if(istype(oldeye, /mob/camera/aiEye))
 			aiEyeFlag = 1
 
 		var/x

code/modules/paperwork/silicon_photography.dm

@@ -122,7 +122,7 @@
 	set desc = "Delete image"
 	set src in usr
 
-	deletepicture()
+	deletepicture(src)
 
 /obj/item/device/camera/siliconcam/robot_camera/verb/take_image()
 	set category ="Robot Commands"