Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/modules/mob/dead/observer/say.dm

@@ -1,5 +1,5 @@
 /mob/dead/observer/say(var/message)
-	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+	message = trim(copytext(message, 1, MAX_MESSAGE_LEN))
 
 	if (!message)
 		return
@@ -18,7 +18,7 @@
 
 
 /mob/dead/observer/emote(var/act, var/type, var/message)
-	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+	message = trim(copytext(message, 1, MAX_MESSAGE_LEN))
 
 	if(!message)
 		return
@@ -62,4 +62,4 @@
 					M.show_message("<span class='game'><i>You hear muffled speech... you can almost make out some words...</i></span>", 2)
 //				M.show_message("<span class='game'><i>[stutter(message)]</i></span>", 2)
 					playsound(src.loc, pick('sound/effects/ghost.ogg','sound/effects/ghost2.ogg'), 10, 1)
-*/
+*/

code/modules/mob/emote.dm

@@ -36,11 +36,15 @@
 				M.show_message(message)
 
 
+		// Type 1 (Visual) emotes are sent to anyone in view of the item
 		if (m_type & 1)
 			for (var/mob/O in viewers(src, null))
 				O.show_message(message, m_type)
+
+		// Type 2 (Audible) emotes are sent to anyone in hear range
+		// of the *LOCATION* -- this is important for pAIs to be heard
 		else if (m_type & 2)
-			for (var/mob/O in hearers(src.loc, null))
+			for (var/mob/O in hearers(get_turf(src), null))
 				O.show_message(message, m_type)
 
 /mob/proc/emote_dead(var/message)

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

@@ -4,6 +4,7 @@
 	icon_state = "shadow"
 
 	robot_talk_understand = 0
+	emote_type = 2		// pAIs emotes are heard, not seen, so they can be seen through a container (eg. person)
 
 	var/network = "SS13"
 	var/obj/machinery/camera/current = null
@@ -268,4 +269,4 @@
 	pai.key = src.key
 	card.setPersonality(pai)
 
-*/
+*/

code/modules/mob/mob_defines.dm

@@ -89,6 +89,7 @@
 	var/list/languages = list()         // For speaking/listening.
 	var/list/abilities = list()         // For species-derived or admin-given powers.
 	var/list/speak_emote = list("says") // Verbs used when speaking. Defaults to 'say' if speak_emote is null.
+	var/emote_type = 1		// Define emote default type, 1 for seen emotes, 2 for heard emotes
 
 	var/name_archive //For admin things like possession
 

code/modules/mob/say.dm

@@ -25,7 +25,7 @@
 	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 
 	if(use_me)
-		usr.emote("me",1,message)
+		usr.emote("me",usr.emote_type,message)
 	else
 		usr.emote(message)