Removed outdated var, fixed failure to show garbled monkey speech.

code/game/machinery/telecomms/broadcaster.dm

@@ -473,7 +473,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					R.show_message(rendered, 2)
 
 		/* --- Process all the mobs that heard the voice normally (did not understand) --- */
-			// Does not display message; displayes the mob's voice_message (ie "chimpers")
 
 		if (length(heard_voice))
 			var/rendered = "[part_a][vname][part_b][vmessage][part_c]"

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

@@ -324,7 +324,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 				"name" = displayname,	// the mob's display name
 				"job" = jobname,		// the mob's job
 				"key" = mobkey,			// the mob's key
-				"vmessage" = M.voice_message, // the message to display if the voice wasn't understood
+				"vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood
 				"vname" = M.voice_name, // the name to display if the voice wasn't understood
 				"vmask" = voicemask,	// 1 if the mob is using a voice gas mask
 
@@ -381,7 +381,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 			"name" = displayname,	// the mob's display name
 			"job" = jobname,		// the mob's job
 			"key" = mobkey,			// the mob's key
-			"vmessage" = M.voice_message, // the message to display if the voice wasn't understood
+			"vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood
 			"vname" = M.voice_name, // the name to display if the voice wasn't understood
 			"vmask" = voicemask,	// 1 if the mob is using a voice gas mas
 
@@ -414,7 +414,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 		//THIS IS TEMPORARY.
 		if(!connection)	return	//~Carn
 
-		Broadcast_Message(connection, M, voicemask, M.voice_message,
+		Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
 						  src, message, displayname, jobname, real_name, M.voice_name,
 		                  filter_type, signal.data["compression"], list(position.z), connection.frequency)
 
@@ -477,10 +477,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 				else
 					heard_normal += R
 			else
-				if (M.voice_message)
-					heard_voice += R
-				else
-					heard_garbled += R
+				heard_voice += R
 
 		if (length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled))
 			var/part_a = "<span class='radio'><span class='name'>"
@@ -574,11 +571,11 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 						R.show_message(rendered, 2)
 
 			if (length(heard_voice))
-				var/rendered = "[part_a][M.voice_name][part_b][M.voice_message][part_c]"
+				var/rendered = "[part_a][M.voice_name][part_b][pick(M.speak_emote)][part_c]"
 
 				for (var/mob/R in heard_voice)
 					if(istype(R, /mob/living/silicon/ai))
-						R.show_message("[part_a]<a href='byond://?src=\ref[src];track2=\ref[R];track=\ref[M]'>[M.voice_name] ([eqjobname]) </a>[part_b][M.voice_message][part_c]", 2)
+						R.show_message("[part_a]<a href='byond://?src=\ref[src];track2=\ref[R];track=\ref[M]'>[M.voice_name] ([eqjobname]) </a>[part_b][pick(M.speak_emote)][part_c]", 2)
 					else
 						R.show_message(rendered, 2)
 

code/modules/mob/living/carbon/alien/alien.dm

@@ -5,7 +5,6 @@
 /mob/living/carbon/alien
 	name = "alien"
 	voice_name = "alien"
-	voice_message = "hisses"
 	speak_emote = list("hisses")
 	icon = 'icons/mob/alien.dmi'
 	gender = NEUTER

code/modules/mob/living/carbon/human/whisper.dm

@@ -110,10 +110,7 @@
 	if (length(heard_b))
 		var/message_b
 
-		if (src.voice_message)
-			message_b = src.voice_message
-		else
-			message_b = stars(message)
+		message_b = stars(message)
 
 		if (italics)
 			message_b = "<i>[message_b]</i>"

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -3,7 +3,6 @@
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "grey baby slime"
 	pass_flags = PASSTABLE
-	voice_message = "skree!"
 	speak_emote = list("hums")
 
 	layer = 5

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -1,7 +1,6 @@
 /mob/living/carbon/monkey
 	name = "monkey"
 	voice_name = "monkey"
-	voice_message = "chimpers"
 	speak_emote = list("chimpers")
 	icon_state = "monkey1"
 	icon = 'icons/mob/monkey.dmi'
@@ -17,7 +16,6 @@
 /mob/living/carbon/monkey/tajara
 	name = "farwa"
 	voice_name = "farwa"
-	voice_message = "mews"
 	speak_emote = list("mews")
 	ico = "tajkey"
 	uni_append = "0A0E00"
@@ -25,7 +23,6 @@
 /mob/living/carbon/monkey/skrell
 	name = "neaera"
 	voice_name = "neaera"
-	voice_message = "squicks"
 	speak_emote = list("squicks")
 	ico = "skrellkey"
 	uni_append = "01CC92"
@@ -33,7 +30,6 @@
 /mob/living/carbon/monkey/unathi
 	name = "stok"
 	voice_name = "stok"
-	voice_message = "hisses"
 	speak_emote = list("hisses")
 	ico = "stokkey"
 	uni_append = "044C5D"
@@ -41,7 +37,6 @@
 /mob/living/carbon/monkey/diona
 	name = "diona nymph"
 	voice_name = "diona nymph"
-	voice_message = "chirrups"
 	speak_emote = list("chirrups")
 	ico = "nymph"
 

code/modules/mob/living/carbon/monkey/say.dm

@@ -1,5 +0,0 @@
-/mob/living/carbon/monkey/say(var/message)
-	if (silent)
-		return
-	else
-		return ..()

code/modules/mob/living/say.dm

@@ -374,13 +374,10 @@ var/list/department_radio_keys = list(
 				M << speech_bubble
 
 	if (length(heard_b))
-		var/message_b
 
-		if (voice_message)
-			message_b = voice_message
-		else
-			message_b = stars(message)
-			message_b = say_quote(message_b,speaking)
+		var/message_b
+		message_b = stars(message)
+		message_b = say_quote(message_b,speaking)
 
 		if (italics)
 			message_b = "<i>[message_b]</i>"

code/modules/mob/mob_defines.dm

@@ -86,10 +86,10 @@
 	var/lastpuke = 0
 	var/unacidable = 0
 	var/small = 0
-	var/list/pinned = list()    //List of things pinning this creature to walls (see living_defense.dm)
-	var/list/embedded = list()  //Embedded items, since simple mobs don't have organs.
-	var/list/languages = list() // For speaking/listening.
-	var/list/speak_emote = null //Verbs used when speaking. Defaults to 'say' if speak_emote is null.
+	var/list/pinned = list()            //List of things pinning this creature to walls (see living_defense.dm)
+	var/list/embedded = list()          //Embedded items, since simple mobs don't have organs.
+	var/list/languages = list()         // For speaking/listening.
+	var/list/speak_emote = list("says") //Verbs used when speaking. Defaults to 'say' if speak_emote is null.
 
 	var/name_archive //For admin things like possession
 
@@ -157,7 +157,6 @@
 	//see: setup.dm for list of mutations
 
 	var/voice_name = "unidentifiable voice"
-	var/voice_message = null // When you are not understood by others (replaced with just screeches, hisses, chimpers etc.)
 
 	var/faction = "neutral" //Used for checking whether hostile simple animals will attack you, possibly more stuff later