From 5f74de6bdf3084fbafaedb7bde77aa8638e6d107 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 5 Jun 2017 23:12:15 -0500 Subject: [PATCH] cleanup --- code/datums/emotes.dm | 2 ++ code/datums/emotes.dm.rej | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 code/datums/emotes.dm.rej diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 47f3ccbe4f..d82e691622 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -38,6 +38,8 @@ if(findtext(msg, "%s")) msg = replacetext(msg, "%s", user.p_s()) + msg = replace_pronoun(user, msg) + var/mob/living/L = user for(var/obj/item/weapon/implant/I in L.implants) I.trigger(key, L) diff --git a/code/datums/emotes.dm.rej b/code/datums/emotes.dm.rej deleted file mode 100644 index b0f0f50adc..0000000000 --- a/code/datums/emotes.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/datums/emotes.dm b/code/datums/emotes.dm (rejected hunks) -@@ -35,6 +35,8 @@ - if(params && message_param) - msg = select_param(user, params) - -+ msg = replace_pronoun(user, msg) -+ - var/mob/living/L = user - for(var/obj/item/weapon/implant/I in L.implants) - I.trigger(key, L)