From c0a896282c2b2fffe93440bc89163ee2f71805f6 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 14 Jan 2015 21:25:28 -0500 Subject: [PATCH 1/2] Adds visible emote shortcut to complement the audible emote shortcut. --- code/modules/mob/living/carbon/human/say.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 3f89f5b230..60d18aee6e 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -25,6 +25,8 @@ if(copytext(message,1,2) == "*") return emote(copytext(message,2)) + else if(copytext(message,1,2) == "^") + return custom_emote(1, copytext(message,2)) if(name != GetVoice()) alt_name = "(as [get_id_name("Unknown")])" From dc23588a81dd39304d76b9e01cd781e3afb4c2c1 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 14 Jan 2015 23:03:21 -0500 Subject: [PATCH 2/2] Less calls to copytext() --- code/modules/mob/living/carbon/human/say.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 60d18aee6e..cf49b82364 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -23,10 +23,9 @@ var/message_mode = parse_message_mode(message, "headset") - if(copytext(message,1,2) == "*") - return emote(copytext(message,2)) - else if(copytext(message,1,2) == "^") - return custom_emote(1, copytext(message,2)) + switch(copytext(message,1,2)) + if("*") return emote(copytext(message,2)) + if("^") return custom_emote(1, copytext(message,2)) if(name != GetVoice()) alt_name = "(as [get_id_name("Unknown")])"