From c44f11b0e50169764955fc1f4e758b04dcb36735 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Sat, 17 May 2014 14:38:11 -0400
Subject: [PATCH] Fixes language_keys not initialized correctly

Also prevents speech ending verb from overriding language verb for
humans.
---
 code/__HELPERS/global_lists.dm              |  5 +++--
 code/modules/mob/living/carbon/human/say.dm | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index e40bafcce0..9db6e92075 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -102,8 +102,9 @@ var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Al
 		var/datum/language/L = new T
 		all_languages[L.name] = L
 	
-	for (var/datum/language/L in all_languages)
-		language_keys[L.key] = L
+	for (var/language_name in all_languages)
+		var/datum/language/L = all_languages[language_name]
+		language_keys[":[lowertext(L.key)]"] = L
 
 	var/rkey = 0
 	paths = typesof(/datum/species)-/datum/species
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 28015d0ea2..bc3b871eb7 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -48,11 +48,12 @@
 	if(!message || stat)
 		return
 
-	var/ending = copytext(message, length(message))
-	if(ending=="!")
-		verb=pick("exclaims","shouts","yells")
-	if(ending=="?")
-		verb="asks"
+	if (!speaking)
+		var/ending = copytext(message, length(message))
+		if(ending=="!")
+			verb=pick("exclaims","shouts","yells")
+		if(ending=="?")
+			verb="asks"
 
 	var/list/obj/item/used_radios = new