Tweaking hologram colours.

code/_helpers/icons.dm

@@ -876,10 +876,9 @@ world
 			if(4)	I.pixel_y++
 		overlays += I//And finally add the overlay.
 
-/proc/getHologramIcon(icon/A, safety=1, no_color = FALSE)//If safety is on, a new icon is not created.
+/proc/getHologramIcon(icon/A, safety=1)//If safety is on, a new icon is not created.
 	var/icon/flat_icon = safety ? A : new(A)//Has to be a new icon to not constantly change the same icon.
-	if(!no_color)
-		flat_icon.ColorTone(rgb(125,180,225))//Let's make it bluish.
+	flat_icon.GrayScale() // Remove colour since we're going to be shading this as an image.
 	flat_icon.ChangeOpacity(0.5)//Make it half transparent.
 	var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanline")//Scanline effect.
 	flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect.

code/game/machinery/camera/tracking.dm

@@ -102,7 +102,7 @@
 	var/list/cameras = list()
 
 /mob/living/silicon/ai/proc/trackable_mobs()
-	if(usr.stat == 2)
+	if(usr.stat == DEAD)
 		return list()
 
 	var/datum/trackable/TB = new()

code/game/objects/structures/holoplant.dm

@@ -84,7 +84,7 @@
 	if(!state)
 		state = pick(possible_plants)
 	var/plant_icon = icon(icon, state)
-	return getHologramIcon(plant_icon, 0)
+	return getHologramIcon(plant_icon, FALSE)
 
 /obj/machinery/holoplant/emag_act()
 	if(emagged)
@@ -103,4 +103,4 @@
 /obj/machinery/holoplant/shipped
 	anchored = FALSE
 /obj/machinery/holoplant/shipped/Initialize()
-	. = ..()
+	. = ..()

code/modules/integrated_electronics/subtypes/output.dm

@@ -483,8 +483,7 @@
 	if(istype(AM) && assembly)
 		if(AM in view(get_turf(src))) // It must be able to 'see' the object it will copy.
 			hologram = new(src)
-			var/icon/holo_icon = getHologramIcon(getFlatIcon(AM), no_color = TRUE)
-		//	holo_icon.GrayScale() // So it looks better colored.
+			var/icon/holo_icon = getHologramIcon(getFlatIcon(AM))
 			if(holo_color) // The color pin should ensure that it is a valid hex.
 				holo_icon.ColorTone(holo_color)
 			hologram.icon = holo_icon

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

@@ -54,7 +54,7 @@ var/global/list/ai_verbs_default = list(
 	var/aiRestorePowerRoutine = 0
 	var/viewalerts = 0
 	var/icon/holo_icon//Default is assigned when AI is created.
-	var/holo_color = null
+	var/holo_color = "#7db4e1"
 	var/list/connected_robots = list()
 	var/obj/item/pda/ai/aiPDA = null
 	var/obj/item/communicator/aiCommunicator = null
@@ -627,11 +627,13 @@ var/global/list/ai_verbs_default = list(
 				if("Crew Member") //A seeable crew member (or a dog)
 					var/list/targets = trackable_mobs()
 					if(targets.len)
-						var/mob/living/Target
-						Target = input("Select a crew member:") as null|anything in targets //The definition of "crew member" is a little loose...
-						//This is torture, I know. If someone knows a better way...
-						if(QDELETED(Target) || !Target) return
-						var/new_holo = getHologramIcon(getCompoundIcon(targets[Target]))
+						var/mob/living/Target = input("Select a crew member:") as null|anything in targets //The definition of "crew member" is a little loose...
+						if(!Target)
+							return
+						Target = targets[Target]
+						if(!istype(Target) || QDELETED(Target))
+							return
+						var/new_holo = getHologramIcon(getCompoundIcon(Target))
 						qdel(holo_icon)
 						holo_icon = new_holo