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

Fixes eminence login

Browse Source
This commit is contained in:
AnturK
2017-12-23 08:14:44 -06:00
committed by CitadelStationBot
parent 94e02ddeed
commit 34b749d2ca
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm
+10
View File
@@ -30,6 +30,7 @@
/mob/camera/eminence/Login() /mob/camera/eminence/Login()
..() ..()
var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
<<<<<<< HEAD
if(!C) if(!C)
add_servant_of_ratvar(src, TRUE) add_servant_of_ratvar(src, TRUE)
C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE) C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
@@ -39,6 +40,15 @@
qdel(src) qdel(src)
else else
C.clock_team.eminence = src 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='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'>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>") 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>")