From 5ea6164bbcfb38e3bd442804a40671cea87a457e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:50:25 -0500 Subject: [PATCH] Update revolution.dm --- code/modules/antagonists/revolution/revolution.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index d6a8987509..ec097049b0 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -201,11 +201,7 @@ /datum/antagonist/rev/farewell() if(ishuman(owner.current)) -<<<<<<< HEAD - owner.current.visible_message("[owner.current] looks like they just remembered their real allegiance!", null, null, null, owner.current) -======= owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!", null, null, null, owner.current) ->>>>>>> bf2e6bd... Fixes decon message pronouns (#37870) to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you...") else if(issilicon(owner.current)) owner.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", null, null, null, owner.current)