From b0671ed78a3df033b2aa367dda35015601cd1c32 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 24 Dec 2017 02:38:47 -0600 Subject: [PATCH] Update eminence_spire.dm --- .../gamemodes/clock_cult/clock_structures/eminence_spire.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm b/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm index a5bc62f554..0eb8084feb 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm @@ -34,12 +34,8 @@ /obj/structure/destructible/clockwork/eminence_spire/attack_ghost(mob/user) if(!IsAdminGhost(user)) return -<<<<<<< HEAD - if(SSticker.mode.eminence) -======= var/datum/antagonist/clockcult/random_cultist = locate() in GLOB.antagonists //if theres no cultists new team without eminence will be created anyway. if(random_cultist && random_cultist.clock_team && random_cultist.clock_team.eminence) ->>>>>>> 3b37dae... (probably?) Fixes being able to create two Eminences at a time + other Eminence issues (#33634) to_chat(user, "There's already an Eminence - too late!") return if(!GLOB.servants_active)