Merge pull request #12594 from Citadel-Station-13/silicons-patch-3

what if you could override the entire say verb/emphasis system to audibly emote with ! like in baycode servers
2020-07-11 16:00:39 -05:00
parent a75dd1d8f3 26d384e65b
commit e87653f781
2 changed files with 11 additions and 3 deletions
@@ -50,12 +50,16 @@
 	usr.emote("me",1,message,TRUE)

 /mob/say_mod(input, message_mode)
+	if(message_mode == MODE_WHISPER_CRIT)
+		return ..()
+	if((input[1] == "!") && (length_char(input) > 1))
+		message_mode = MODE_CUSTOM_SAY
+		return copytext_char(input, 2)
 	var/customsayverb = findtext(input, "*")
-	if(customsayverb && message_mode != MODE_WHISPER_CRIT)
+	if(customsayverb)
 		message_mode = MODE_CUSTOM_SAY
 		return lowertext(copytext_char(input, 1, customsayverb))
-	else
-		return ..()
+	return ..()

 /proc/uncostumize_say(input, message_mode)
 	. = input