From 3ace8c09ed3fc606efb255b7af392065fdeb052e Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Sun, 19 Jun 2016 18:48:43 +0100 Subject: [PATCH] Sorts out ending punctuation --- code/datums/Emote_system/emote.dm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/datums/Emote_system/emote.dm b/code/datums/Emote_system/emote.dm index d1d6592998f..07089785740 100644 --- a/code/datums/Emote_system/emote.dm +++ b/code/datums/Emote_system/emote.dm @@ -212,9 +212,16 @@ VampyrBytes return if(startText) message = "[startText] [message]" + message = addPunc(message) message = "[message]" return message +/datum/emote/proc/addPunc(var/message = "") + var/regex/endingPunc = new("\[\\.!\\?\"]$") + if(!endingPunc.Find(message)) + message += "." + return message + /datum/emote/proc/standardMessage(var/mob/user, var/list/params) var/message = "\The [user] [text]" if("target" in params) @@ -287,7 +294,6 @@ VampyrBytes /datum/emote/proc/processMessage(var/mob/user, var/list/params, var/message = "") var/visualOrAudible = audible + 1 - testing("message = [message]") if(doMime(user)) visualOrAudible = 1 @@ -389,12 +395,16 @@ VampyrBytes //non-audible emotes and the standard message for audible ones /datum/emote/proc/createBlindMessage(var/mob/user, var/list/params, var/message) if(audible && selfText) - return "You hear someone [selfText]" + message = "You hear someone [selfText]" + message = addExtras(message) + return message // set up different messages for deaf people here. Empty will mean no message for // audible emotes and standard for non-audible ones /datum/emote/proc/createDeafMessage(var/mob/user, var/list/params, var/message) - return mimeMessage(user, params) + message = mimeMessage(user, params) + message = addExtras(message) + return message /datum/emote/proc/sendToDead(var/message = "") for(var/mob/M in dead_mob_list)