shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update revolution.dm

Browse Source
This commit is contained in:
LetterJay
2018-05-17 23:50:25 -05:00
committed by GitHub
parent 329aabf301
commit 5ea6164bbc
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/antagonists/revolution/revolution.dm
View File

@@ -201,11 +201,7 @@
/datum/antagonist/rev/farewell()
if(ishuman(owner.current))
<<<<<<< HEAD
owner.current.visible_message("<span class='deconversion_message'>[owner.current] looks like they just remembered their real allegiance!</span>", null, null, null, owner.current)
=======
owner.current.visible_message("<span class='deconversion_message'>[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!</span>", null, null, null, owner.current)
>>>>>>> bf2e6bd... Fixes decon message pronouns (#37870)
to_chat(owner, "<span class='userdanger'>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...</span>")
else if(issilicon(owner.current))
owner.current.visible_message("<span class='deconversion_message'>The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.</span>", null, null, null, owner.current)