From e1bdd57bf29e92e89a77b5eb0460a19b0c4394b9 Mon Sep 17 00:00:00 2001
From: "giacomand@gmail.com"
 <giacomand@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 10 Sep 2012 09:45:07 +0000
Subject: [PATCH] -Fixed holopads not letting you holo_talk when you weren't on
 the holopad. -AIs can now double click on living mobs (/mob/living) to
 instantly start tracking them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4673 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/machinery/camera/tracking.dm             |  4 ++--
 code/game/machinery/hologram.dm                    |  5 ++---
 code/modules/mob/living/silicon/ai/freelook/eye.dm | 13 +++++++++++++
 code/modules/mob/living/silicon/say.dm             |  4 ++--
 html/changelog.html                                |  8 ++++++++
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 6334592ff3f..fb3a6f575c7 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -105,8 +105,8 @@
 				return
 
 			if (!near_camera(target))
-				U << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
-				sleep(50) //because we're sleeping another second after this (a few lines down)
+				U << "Target is not near any active cameras."
+				sleep(100)
 				continue
 
 			if(U.eyeobj)
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index beac3d050a5..9446ddade32 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -26,7 +26,7 @@ var/const/HOLOPAD_MODE = 0
 			last_request = world.time
 			user << "<span class='notice'>You request an AI's presence.</span>"
 			var/area/area = get_area(src)
-			for(var/mob/living/silicon/ai/AI in player_list)
+			for(var/mob/living/silicon/ai/AI in living_mob_list)
 				if(!AI.client)	continue
 				AI << "<span class='info'>Your presence is requested at <a href='?src=\ref[AI];jumptoholopad=\ref[src]'>\the [area]</a>.</span>"
 		else
@@ -50,8 +50,7 @@ var/const/HOLOPAD_MODE = 0
 	if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it.
 		if(!hologram)//If there is not already a hologram.
 			create_holo(user)//Create one.
-			for(var/mob/M in viewers())
-				M.show_message("A holographic image of [user] flicks to life right before your eyes!",1)
+			src.visible_message("A holographic image of [user] flicks to life right before your eyes!")
 		else
 			user << "\red ERROR: \black Image feed in progress."
 	else
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index fdd23f054c3..59a6773d348 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -76,8 +76,21 @@
 	if(istype(usr, /mob/living/silicon/ai))
 		var/mob/living/silicon/ai/AI = usr
 		if(AI.eyeobj && AI.client.eye == AI.eyeobj)
+			AI.cameraFollow = null
 			AI.eyeobj.setLoc(src)
 
+/mob/living/Click()
+	if(isAI(usr))
+		return
+	..()
+
+/mob/living/DblClick()
+	if(isAI(usr) && usr != src)
+		var/mob/living/silicon/ai/A = usr
+		A.ai_actual_track(src)
+		return
+	..()
+
 // 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.
 
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index 872e86f23b7..9369d0f48e8 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -48,8 +48,8 @@
 	if (!message)
 		return
 
-	var/obj/machinery/hologram/holopad/T = locate(/obj/machinery/hologram/holopad) in src.eyeobj.loc
-	if(istype(T) && T.hologram && T.master==src)//If there is a hologram and its master is the user.
+	var/obj/machinery/hologram/holopad/T = src.current
+	if(istype(T) && T.hologram && T.master == src)//If there is a hologram and its master is the user.
 		var/message_a = say_quote(message)
 
 		//Human-like, sorta, heard by those who understand humans.
diff --git a/html/changelog.html b/html/changelog.html
index 4b3a1746db1..c89a2fca760 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -48,6 +48,14 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">10 September 2012</h2>
+	<h3 class="author">Giacom updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">AIs can double click on mobs to instantly start tracking them.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">Important note for server hosts!</h2>
 	<h3 class="author">Important note for server hosts!:</h3>