diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index cd7a7053b3..a175009a03 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -11,13 +11,6 @@
 		verb = language.speech_verb
 		style = language.colour
 		
-	if(verb == "says")
-		var/ending = copytext(message, length(message))
-		if(ending=="!")
-			verb="exclaims"
-		if(ending=="?")
-			verb="asks"
-
 	var/speaker_name = speaker.name
 	if(istype(speaker, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = speaker
@@ -58,13 +51,6 @@
 	if(hard_to_hear)
 		message = stars(message)
 
-	if(verb == "says")
-		var/ending = copytext(message,length(message))
-		if(ending=="!")
-			verb="exclaims"
-		if(ending=="?")
-			verb="asks"
-
 	var/speaker_name = speaker.name
 	if(istype(speaker, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = speaker
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index f426d494ce..3f3aa32c79 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -55,6 +55,12 @@
 	if(!message || stat)
 		return
 
+	var/ending = copytext(message, length(message))
+	if(ending=="!")
+		verb=pick("exclaims","shouts","yells")
+	if(ending=="?")
+		verb="asks"
+
 	var/list/obj/item/used_radios = new
 
 	switch (message_mode)
@@ -180,7 +186,7 @@
 
 	if((HULK in mutations) && health >= 25 && length(message))
 		message = "[uppertext(message)]!!!"
-		verb = pick("yells","roars","hollars")
+		verb = pick("yells","roars","hollers")
 		handled = 1
 	if(slurring)
 		message = slur(message)