From d14ae05f197c3634d21dd5a183ff06273f6758bb Mon Sep 17 00:00:00 2001
From: "baloh.matevz@gmail.com"
 <baloh.matevz@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sun, 20 May 2012 21:10:52 +0000
Subject: [PATCH] - PDA messaging reworked a bit. If you receive a message with
 your PDA somewhere on your person (so not in a backpack), the message will be
 displayed to you in the text box along with the name and rank of the sender.
 A reply button will be next to this to make replying easier. The PDA beep
 will still appear and the PDA must not be in silent mode for this to work.

Screenshot:
http://www.kamletos.si/PDA%20communication%203.PNG

Added this to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3628 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/devices/PDA/PDA.dm | 7 +++++--
 html/changelog.html                  | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index 1828041986c..76eac4e2aab 100644
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -528,7 +528,7 @@
 							return
 
 						tnote += "<i><b>&rarr; To [P.owner]:</b></i><br>[t]<br>"
-						P.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[P];choice=Message;target=\ref[src]'>[owner]</a>:</b></i><br>[t]<br>"
+						P.tnote += "<i><b>&larr; From <a href='byond://?src=\ref[P];choice=Message;target=\ref[src]'>[owner]</a> ([ownjob]):</b></i><br>[t]<br>"
 
 						if (prob(15)) //Give the AI a chance of intercepting the message
 							var/who = src.owner
@@ -541,6 +541,9 @@
 							playsound(P.loc, 'twobeep.ogg', 50, 1)
 							for (var/mob/O in hearers(3, P.loc))
 								O.show_message(text("\icon[P] *[P.ttone]*"))
+							if( P.loc && ishuman(P.loc) )
+								var/mob/living/carbon/human/H = P.loc
+								H << "\icon[P] <b>Message from [src.owner] ([ownjob]), </b>\"[t]\" (<a href='byond://?src=\ref[P];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)"
 
 						P.overlays = null
 						P.overlays += image('pda.dmi', "pda-r")
@@ -688,7 +691,7 @@
 		honkamt--
 		playsound(loc, 'bikehorn.ogg', 30, 1)
 
-	if(U.machine == src)//Final safety.
+	if(U.machine == src && href_list["skiprefresh"]!="1")//Final safety.
 		attack_self(U)//It auto-closes the menu prior if the user is not in range and so on.
 	else
 		U.machine = null
diff --git a/html/changelog.html b/html/changelog.html
index 91f5941833e..9326c043fa8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -47,6 +47,14 @@ 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">Sunday, May 20 2012</h2>
+	<h3 class="author">Errorage updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">When you receive a PDA message, the content is displayed to you if the PDA is located somewhere on your person (so not in your backpack). You will also get a reply button there. This will hopefully make PDA communication easier.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">Saturday, May 19 2012</h2>
 	<h3 class="author">Doohl updated:</h3>