From 34b749d2ca96061303e42e309a652fb2b9162ed3 Mon Sep 17 00:00:00 2001
From: AnturK <AnturK@users.noreply.github.com>
Date: Sat, 23 Dec 2017 15:13:05 +0100
Subject: [PATCH 1/2] Fixes eminence login

---
 code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
index 8416e4651d..825ad90057 100644
--- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
+++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
@@ -30,6 +30,7 @@
 /mob/camera/eminence/Login()
 	..()
 	var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
+<<<<<<< HEAD
 	if(!C)
 		add_servant_of_ratvar(src, TRUE)
 		C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
@@ -39,6 +40,15 @@
 				qdel(src)
 			else
 				C.clock_team.eminence = src
+=======
+	if(C && C.clock_team)
+		if(C.clock_team.eminence && C.clock_team.eminence != src)
+			remove_servant_of_ratvar(src,TRUE)
+			qdel(src)
+			return
+		else
+			C.clock_team.eminence = src
+>>>>>>> 619a83f... Fixes eminence login (#33752)
 	to_chat(src, "<span class='bold large_brass'>You have been selected as the Eminence!</span>")
 	to_chat(src, "<span class='brass'>As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.</span>")
 	to_chat(src, "<span class='brass'>Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.</span>")

From e7f926c153ed59a6516d15b6d2f0df7f0c31a620 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 24 Dec 2017 16:54:01 -0600
Subject: [PATCH 2/2] Update _eminence.dm

---
 .../gamemodes/clock_cult/clock_mobs/_eminence.dm     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
index 825ad90057..71b3401e13 100644
--- a/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
+++ b/code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
@@ -30,17 +30,6 @@
 /mob/camera/eminence/Login()
 	..()
 	var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
-<<<<<<< HEAD
-	if(!C)
-		add_servant_of_ratvar(src, TRUE)
-		C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
-		if(C && C.clock_team)
-			if(C.clock_team.eminence)
-				remove_servant_of_ratvar(src,TRUE)
-				qdel(src)
-			else
-				C.clock_team.eminence = src
-=======
 	if(C && C.clock_team)
 		if(C.clock_team.eminence && C.clock_team.eminence != src)
 			remove_servant_of_ratvar(src,TRUE)
@@ -48,7 +37,6 @@
 			return
 		else
 			C.clock_team.eminence = src
->>>>>>> 619a83f... Fixes eminence login (#33752)
 	to_chat(src, "<span class='bold large_brass'>You have been selected as the Eminence!</span>")
 	to_chat(src, "<span class='brass'>As the Eminence, you lead the servants. Anything you say will be heard by the entire cult.</span>")
 	to_chat(src, "<span class='brass'>Though you can move through walls, you're also incorporeal, and largely can't interact with the world except for a few ways.</span>")