From 47758a0453a145a302c15c8f632e94106ce50aae Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Mon, 29 Jan 2018 14:47:08 -0500
Subject: [PATCH] POLARIS: Allow admins to see say/emote near their own body
 while they are aghosted. (#4663)

---
 code/modules/mob/hear_say.dm |   6 +++++-
 code/modules/mob/mob.dm      |   8 +++++---
 icons/chattags.dmi           | Bin 1372 -> 1545 bytes
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 9c91ca6350..4d01759ce9 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -1,7 +1,7 @@
 // At minimum every mob has a hear_say proc.
 
 /mob/proc/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "",var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol)
-	if(!client)
+	if(!client && !teleop)
 		return
 
 	if(speaker && !speaker.client && istype(src,/mob/observer/dead) && is_preference_enabled(/datum/client_preference/ghost_ears) && !(speaker in view(src)))
@@ -80,10 +80,14 @@
 
 /mob/proc/on_hear_say(var/message)
 	to_chat(src, message)
+	if(teleop)
+		to_chat(teleop, create_text_tag("body", "BODY:", teleop) + "[message]")
 
 /mob/living/silicon/on_hear_say(var/message)
 	var/time = say_timestamp()
 	to_chat(src, "[time] [message]")
+	if(teleop)
+		to_chat(teleop, create_text_tag("body", "BODY:", teleop) + "[time] [message]")
 
 // Checks if the mob's own name is included inside message.  Handles both first and last names.
 /mob/proc/check_mentioned(var/message)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index dcca51ad31..7b938a3a0a 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -50,7 +50,7 @@
 
 /mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
 
-	if(!client)	return
+	if(!client && !teleop)	return
 
 	if (type)
 		if((type & 1) && (is_blind() || paralysis) )//Vision related
@@ -69,9 +69,11 @@
 					return
 	// Added voice muffling for Issue 41.
 	if(stat == UNCONSCIOUS || sleeping > 0)
-		src << "<I>... You can almost hear someone talking ...</I>"
+		to_chat(src,"<I>... You can almost hear someone talking ...</I>")
 	else
-		src << msg
+		to_chat(src,msg)
+		if(teleop)
+			to_chat(teleop, create_text_tag("body", "BODY:", teleop) + "[msg]")
 	return
 
 // Show a message to all mobs and objects in sight of this one
diff --git a/icons/chattags.dmi b/icons/chattags.dmi
index d9e1c62a30c060878c5a87f30cdd8f0991555b02..699f1b53a169667f2f2de06d19821a3ebc513cfb 100644
GIT binary patch
delta 1540
zcmV+f2K)Kk3W*Gm7k@?w1^@s6d@z#300022dQ@0+L}hbha%pgMX>V=-0C=2@(6J7J
zFcgL1x%VkfU^k$yT?~XUz$=hyueJ%Lq*RP=?_lC)+U*SAaPpV9v|T@<8G70|Y}PN3
zI3Fq!FRP=0#OX-Fuzi>aiMpaKs>qNiyuTGBv<(|1Y7+OL9DjfJ&&)YUX=j(Da$YBm
zW|c-)uir_ux+&w+>L&k;nQT&X9*u@W5*nV@blIHzyz}z+Sc!IQ&<s6&0FoM-h;fg&
zjsO4!7)eAyRCt{2TS03ZM-={6h#q2)Qp-P}mq6k`F6&F<Lkxw0Wyqll7KEH-0@Wpj
zHPN*}DS_saQh!rjdhTK+SRe%oh0!5BNzg+KY4jJ=(Bubndyqz%oqe-2E3I~1%O9BC
zd3rnFyf^R7ydB97V+@r?<9z^+0bD_LsJ5SM_yExS_|Xb~qfqdj(wE2k0DjGoI5Y_N
z(Pyy9pU1@Wu^9hR3AHzFwvA;P#B%?3=MHXnI-$0R+kc&ou}sCEhhf-pV?-n4WQIr_
z^4u8F$T*pfKbLd>=M5JQuss0V$O9O`AQ$BY&O~Og9*m|}B|pz=D$ivdl`LjG7_Iy^
zn41<OReYL_%*fkMHvC4RV2!^~DEN5*`0nl1jJY|+0Dv#Pzi)@W*@5%Z=Wnd0z@OJ{
z!X|&D5`TQ~{(4B`X#F%KJ6b;_^;Ei4e*&~sC;<HY`a?u^uw9JEW!b@YQP=h39EcV8
zX#G?k=uAdAL)2Bt<o>3(Lh)1J#>hq;Y!{U>%5gIPMIAs1sqj9pAR{0qWX~OpD?uI=
zI>&Im2k)<&I8j>(>Okc=ml-UAqm|zVbDJ;6)_*Fo&6i{UUbAD3|6a2*sRV!j_pgk(
zC)h*@0Py$eFK9n)W_ccniq`-DIF(}CY6<{A`)Sh(f5mH5ol3F&4vIzS_@A$5_jfP9
zAZ22klJVyh7{$$eP#etdoz_-F#^thJP#etj`7>f$g!W8OG@RedMyZ@5KSw|t_M+kZ
zo_}(NtS4VpAPXTKxS^WaO$G9do5I9+U`_|fhRbP?CRCxH7E*Z^xO@3UCeg4AXe&V~
z+)YxzFio^oD4%(GQ8Upq!OCxgx%x@TS|wILDf#u2l3(!})r`4O@fy|oNoi6E9)E})
zZ)br%7-swjW-n#wp@KdboB*(%0yg=b0Dn+cf(U|e+i{{YE}swaufrMeI{`rSC=7si
z&hJ%M-ShKc5q?AN<(>(uW^CC=;COu{nA8ADf00O-m!C=>0(u7|9k{H&Xd2AJpMW!m
zW$yp_fsB^IZ=QOimEQ)z7()Q;2f({v;<v2+_8DW=`SSqKE0?Xfe{Fg#|Io9-e}4$T
z>6Xh@Q{cz1zJX2t*xw13yWLQ`x3?FOarvB3a`ztYhR5>kRYb<+3xNK1I5d#Gy@-Ll
z9cMV@C<3wH4ws+3iWtb-afXYIqMRo3FQpPJce{&3#X{&k+zmNL6*(N*Ldb9?Bl=YO
zB!y=7l={?jvST>34oEt1zD}eO0e?yJo6olVoXU7$NtK{#u_TasB`Ak{obdogE58lq
z);!PJnc$k|`G@W$Yy5}qrOBCKxo4*m>w6vmVE0=)l_=O5I1_w6xt`%OLF!0~gL?Ni
zJcyWLG<86Pzb^IjT<C}T%v2`x8~?{h2)e@t(P{CB<>mvH4N-j-CsXlX{C`eRtD!pM
z1L9AEQ-D14^&rsAXkwV33Cg)|^2~yeLpp8afds!33_*?nT|}rc_wNL$bwMYi7QvO@
z26KJJtW{!t#{3%=`EM}hJB%^h+PM_~Eezf4*xg|beb#q&c6PEOCEx@If}z{8LhcT0
zaMD^a=R_U|8}ANkq4sdA1$}o=!*HuL`<%-tJ+UqK$7P>j$MGWaRM<xcN`umq9VI(3
zr0W70CK_+*SounjbbvdkMM8WLy|WCm5?mw&{%^>;LqxVedEpWlIML|%1x^pwa{dDs
q+aPj%)_2@tE%Vvng;2JvQTzw{OD1}ZFiLp<0000<MNUMnLSTZ?e(x{<

delta 1366
zcmV-c1*!Up4BQHk7k@km1^@s6)``4i0001{dQ@0+L}hbha%pgMX>V=-0C=2@(6I`G
zFc<{jIsa1}x)*J`W+{p|=qpHQ{x$()LQL)JcPMl#$#%mBcU+BIKa4ZFX{3YWZv6&{
z>!~5}wmKO|T+Sp6+ows8XdBv-N(_n0`+G$~+qgrbCGm*L@qah}%vyq!c6Q4u=XKU-
zR(TZMQcxG%;$NwdEov>J$#Bd<!)wT&R`M(#y!{<kqn|r;(?}l{qmVq5*r*Qx00ePK
zL_t(&f$dw*OB+EH{&tZb6k@CX0lf&Vg<jT6>s>HH4_Ycn&k+x~C`9VDVtdg;3zg<S
zFlb8yrcfyC9)Ie|g&r!j<X;G4{R6r^B%`ylZ+`5W>;&U?$<Eu^{pP)S^XAJ$9pCq{
z_^R~+z!rc><cFohHxo4g*uJ>1!oOK4)SU4r2QL8Z=SUnIg!k$WZ1NAG9eE{M$BVJ{
z#M47#n+8hmZ_l1#wqB35dCb=9#x@!M5De3fIm0`tvVR#Ob;>hmcqdgh9lx7)05=V{
z0kAy)+ZY1Sguz-A3!I6~pdK_kpHhCduBmk{_L12X^`JTM+o0PKBTKlNjoio&-%Qjt
z3k7TZn}tGc2moIHevmUaLkj?K|LsdV^xJhfAMX9Kx&(ecd<vWV2_?9C_9)h4Z|pQ?
z+Z#J2`+v#$Qt#uSRiOaz@yFkUZDnROVHa&HGo!j!Z@C~U@ZQ*|IM7QQ6%4+w%qG6C
zgGq{?0&_-mYGr0rYNG-t^55zJ%1EX6O$C_&ij=)^Fjj&rD|CTj{Z`K&nFLX*1a+X+
zIkOoQ!REkkgYMMlmNg|d^|@7B-mY8YU*4{_m4D#(e}8i3Zet4L0DzCj7gqQK0M6p*
zq17dD@OKe5`ITpa2j>fy*U#^MB5iz|va#nRP%FVGinkpnX=C<m(4PtNj<ajgDOqsD
z=LqPlKXZ<EoCQJ_5C+yqj%-Ts;Cvx5^L+_jfFMzVI*2pc(_m;EFzT<!giHYtK`nu<
zA%E@q7W-?KfmR7Jr}$Z?Y$neUxV92hLSF-#1HTQr<uBvblvw%8crEaKYy5%lx0PUL
z7IH@b9{|uO7On7)0B|C}>JsQU-=9h_4<)9$Sv)$5wHx#E2^+I#<tNVsV{n|LgRHG`
z+-(2Wo(VSQ=MxUHw#soTP!xY}&II+_Pk&EQJUTMY3cV1@s>G<}lL3Y^ndna~9}4;a
zWKm*W%z(7(o7D-^=Unt+|26m$(m}Hq{IX(6@elkq=-O6dBbACZ{*g+htptlZjhwmL
z*ywx~8+Q1EN(Ii`PQ&gJSnpFM*jSs3wTru76E<eQ2J~lw{E?VgT&W!=-S(?if`7%`
zuL%cPTje+(C@N?ijDH=Dfl{Yw?sNQISAvbTxma*ynbR*&3Zb+EXZ@+?#K0IscE$(D
zXE}v>RR$pKfZ1$|&t-NVkROYiJY#^aD?u^kHO^;Kf>9I?h}bqqbKti@cf%XDro=Y9
z;r=)ioLjeZCI{c|Ttxdo6`_|OwSO0u_JN@0ytDjesElYo^r}|Ky|4tS5-bZv<vmwf
zse7h20b4-adGDkYYlqWScqb)<)78uS%trO&+v59}?Fv;We;sB679Ek@Q`sb#q|!b)
zP#RP}F;HRvV|~5b{})gPpd3Z9*`zX|7w}F>i4?z1KNXZpP)un}I(H4%Sx*9KVf=T3
zBB*T8*@yr(y)an^#KOfFINoV>fz!hafq~x!-NzP{*kj+X1%BXoVF_NCFS!?%5cq-f
YAN;ml(|OxL2><{907*qoM6N<$g4D&03jhEB