Merge pull request #2825 from Tastyfish/coughsplosion

Added voice analyzer & Entertainment monitor supporting audible emotes

code/game/objects/items/devices/megaphone.dm

@@ -25,28 +25,34 @@
 	if(spamcheck)
 		user << "\red \The [src] needs to recharge!"
 		return
-
-	var/message = sanitize(copytext(input(user, "Shout a message?", "Megaphone", null) as text,1,MAX_MESSAGE_LEN))
+	
+	var/message = input(user, "Shout a message:", "Megaphone") as text|null
+	if(!message)
+		return
+	message = sanitize(copytext(message, 1, MAX_MESSAGE_LEN))
 	if(!message)
 		return
 	message = capitalize(message)
 	if ((src.loc == user && usr.stat == 0))
 		if(emagged)
 			if(insults)
-				for(var/mob/O in (viewers(user)))
-					O.show_message("<B>[user]</B> broadcasts, <FONT size=3>\"[pick(insultmsg)]\"</FONT>",2) // 2 stands for hearable message
+				saymsg(user, pick(insultmsg))
 				insults--
 			else
 				user << "\red *BZZZZzzzzzt*"
 		else
-			for(var/mob/O in (viewers(user)))
-				O.show_message("<B>[user]</B> broadcasts, <FONT size=3>\"[message]\"</FONT>",2) // 2 stands for hearable message
+			saymsg(user, message)
 
 		spamcheck = 1
 		spawn(20)
 			spamcheck = 0
 		return
 
+/obj/item/device/megaphone/proc/saymsg(mob/living/user as mob, message)
+	audible_message("<span class='game say'><span class='name'>[user]</span> broadcasts, <FONT size=3>\"[message]\"</FONT></span>", hearing_distance = 14)
+	for(var/obj/O in oview(14, get_turf(src)))
+		O.hear_talk(user, "<FONT size=3>[message]</FONT>")
+
 /obj/item/device/megaphone/emag_act(user as mob)
 	if(!emagged)
 		user << "\red You overload \the [src]'s voice synthesizer."

code/game/objects/items/devices/taperecorder.dm

@@ -93,7 +93,11 @@
 			mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [M.name] exclaims, \"[msg]\""
 			return
 		mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [M.name] says, \"[msg]\""
-
+		
+/obj/item/device/taperecorder/hear_message(mob/living/M as mob, msg)
+	if(mytape && recording)
+		mytape.timestamp += mytape.used_capacity
+		mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [M.name] [msg]"
 
 /obj/item/device/taperecorder/verb/record()
 	set name = "Start Recording"

code/game/objects/items/devices/transfer_valve.dm

@@ -68,6 +68,11 @@
 	for(var/obj/O in contents)
 		O.hear_talk(M, msg)
 
+/obj/item/device/transfer_valve/hear_message(mob/living/M as mob, msg)
+	..()
+	for(var/obj/O in contents)
+		O.hear_message(M, msg)
+
 /obj/item/device/transfer_valve/attack_self(mob/user as mob)
 	ui_interact(user)
 

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -235,6 +235,10 @@
 	if(nadeassembly)
 		nadeassembly.hear_talk(M, msg)
 
+/obj/item/weapon/grenade/chem_grenade/hear_message(mob/living/M, msg)
+	if(nadeassembly)
+		nadeassembly.hear_message(M, msg)
+
 /obj/item/weapon/grenade/chem_grenade/Bump()
 	..()
 	if(nadeassembly)