From 9037a9745ac5a81c79d7024583910fff4a5fd9ca Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 17 May 2018 11:26:36 -0400 Subject: [PATCH 1/4] Fixes decon message pronouns --- code/modules/antagonists/clockcult/clockcult.dm | 4 ++++ code/modules/antagonists/cult/cult.dm | 4 ++++ code/modules/antagonists/revolution/revolution.dm | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index f921b6b527..ebd3b426fb 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -159,7 +159,11 @@ SSticker.mode.servants_of_ratvar -= owner SSticker.mode.update_servant_icons_removed(owner) if(!silent) +<<<<<<< HEAD owner.current.visible_message("[owner] seems to have remembered their true allegiance!", null, null, null, owner.current) +======= + owner.current.visible_message("[owner.current] seems to have remembered [owner.current.p_their()] true allegiance!", null, null, null, owner.current) +>>>>>>> bf2e6bd... Fixes decon message pronouns (#37870) to_chat(owner, "A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.") owner.current.log_message("Has renounced the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) owner.special_role = null diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index b7f0b002ec..972d44d35d 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -128,7 +128,11 @@ SSticker.mode.cult -= owner SSticker.mode.update_cult_icons_removed(owner) if(!silent) +<<<<<<< HEAD owner.current.visible_message("[owner.current] looks like [owner.current.p_they()] just reverted to their old faith!", null, null, null, owner.current) +======= + owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current) +>>>>>>> bf2e6bd... Fixes decon message pronouns (#37870) to_chat(owner.current, "An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.") owner.current.log_message("Has renounced the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 1f77866d76..d6a8987509 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -201,7 +201,11 @@ /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) From cceb5492438d0cf7fc2d0fa3f05794248bacfac4 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:50:08 -0500 Subject: [PATCH 2/4] Update clockcult.dm --- code/modules/antagonists/clockcult/clockcult.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index ebd3b426fb..f2c0518cc2 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -159,11 +159,7 @@ SSticker.mode.servants_of_ratvar -= owner SSticker.mode.update_servant_icons_removed(owner) if(!silent) -<<<<<<< HEAD - owner.current.visible_message("[owner] seems to have remembered their true allegiance!", null, null, null, owner.current) -======= owner.current.visible_message("[owner.current] seems to have remembered [owner.current.p_their()] true allegiance!", null, null, null, owner.current) ->>>>>>> bf2e6bd... Fixes decon message pronouns (#37870) to_chat(owner, "A cold, cold darkness flows through your mind, extinguishing the Justiciar's light and all of your memories as his servant.") owner.current.log_message("Has renounced the cult of Ratvar!", INDIVIDUAL_ATTACK_LOG) owner.special_role = null From 329aabf301b14fab70c11afc8bc34b91d3bcb7b3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:50:17 -0500 Subject: [PATCH 3/4] Update cult.dm --- code/modules/antagonists/cult/cult.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 972d44d35d..bd879f8ad7 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -128,11 +128,7 @@ SSticker.mode.cult -= owner SSticker.mode.update_cult_icons_removed(owner) if(!silent) -<<<<<<< HEAD - owner.current.visible_message("[owner.current] looks like [owner.current.p_they()] just reverted to their old faith!", null, null, null, owner.current) -======= owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current) ->>>>>>> bf2e6bd... Fixes decon message pronouns (#37870) to_chat(owner.current, "An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.") owner.current.log_message("Has renounced the cult of Nar'Sie!", INDIVIDUAL_ATTACK_LOG) if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) From 5ea6164bbcfb38e3bd442804a40671cea87a457e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:50:25 -0500 Subject: [PATCH 4/4] 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)