diff --git a/code/modules/antagonists/clockcult/clock_helpers/leader_helpers.dm b/code/modules/antagonists/clockcult/clock_helpers/leader_helpers.dm
index 768f1970bc..702612c0da 100644
--- a/code/modules/antagonists/clockcult/clock_helpers/leader_helpers.dm
+++ b/code/modules/antagonists/clockcult/clock_helpers/leader_helpers.dm
@@ -1,5 +1,5 @@
/datum/action/innate/eminence_ascend
- name = "Ascend as eminence"
+ name = "Ascend as the Eminence"
button_icon_state = "eminence_action"
background_icon_state = "bg_clock"
buttontooltipstyle = "clockcult"
@@ -7,48 +7,46 @@
var/selection_timer //Timer ID; this is canceled if the vote is canceled
var/kingmaking
-/datum/action/innate/eminence_ascend/activate()
- var/datum/antagonist/clockcult/C = user.mind.has_antag_datum(/datum/antagonist/clockcult)
+/datum/action/innate/eminence_ascend/Activate()
+ var/datum/antagonist/clockcult/C = owner.mind.has_antag_datum(/datum/antagonist/clockcult)
if(!C || !C.clock_team)
return
if(C.clock_team.eminence)
- to_chat(user, "There's already an Eminence!")
+ to_chat(owner, "There's already an Eminence!")
return
if(eminence_nominee) //This could be one large proc, but is split into three for ease of reading
- if(eminence_nominee == user)
- cancelation(user)
+ if(eminence_nominee == owner)
+ cancelation(owner)
else
- objection(user)
+ objection(owner)
else
- nomination(user)
-
-/datum/action/innate/eminence_ascend/attack_drone(mob/living/simple_animal/drone/user)
- if(!is_servant_of_ratvar(user))
- ..()
- else
- to_chat(user, "You feel the omniscient gaze turn into a puzzled frown. Perhaps you should just stick to building.")
+ nomination(owner)
+/*
+/datum/action/innate/eminence_ascend/activate()
+ if(!is_(owner))
+ to_chat(owner, "You feel the omniscient gaze turn into a puzzled frown. Perhaps you should just stick to building.")
return
-
+*/
var/datum/mind/rando = locate() in get_antag_minds(/datum/antagonist/clockcult) //if theres no cultists new team without eminence will be created anyway.
if(rando)
var/datum/antagonist/clockcult/random_cultist = rando.has_antag_datum(/datum/antagonist/clockcult)
if(random_cultist && random_cultist.clock_team && random_cultist.clock_team.eminence)
- to_chat(user, "There's already an Eminence - too late!")
+ to_chat(owner, "There's already an Eminence - too late!")
return
if(!GLOB.servants_active)
- to_chat(user, "The Ark must be active first!")
+ to_chat(owner, "The Ark must be active first!")
return
- if(alert(user, "Become the Eminence using admin?", "Become Eminence", "Yes", "No") != "Yes")
+ if(alert(owner, "Become the Eminence using admin?", "Become Eminence", "Yes", "No") != "Yes")
return
- message_admins("Admin [key_name_admin(user)] directly became the Eminence of the cult!")
- log_admin("Admin [key_name(user)] made themselves the Eminence.")
+ message_admins("Admin [key_name_admin(owner)] directly became the Eminence of the cult!")
+ log_admin("Admin [key_name(owner)] made themselves the Eminence.")
var/mob/camera/eminence/eminence = new(get_turf(src))
- user.transfer_ckey(eminence, FALSE)
+ owner.transfer_ckey(eminence, FALSE)
hierophant_message("Ratvar has directly assigned the Eminence!")
for(var/mob/M in servants_and_ghosts())
M.playsound_local(M, 'sound/machines/clockcult/eminence_selected.ogg', 50, FALSE)
-/datum/action/innate/eminence_ascend/proc/nomination(mob/living/nominee) //A user is nominating themselves or ghosts to become Eminence
+/datum/action/innate/eminence_ascend/proc/nomination(mob/living/nominee) //A owner is nominating themselves or ghosts to become Eminence
var/nomination_choice = alert(nominee, "Who would you like to nominate?", "Eminence Nomination", "Nominate Yourself", "Nominate Ghosts", "Cancel")
if(!is_servant_of_ratvar(nominee) || !nominee.canUseTopic(src) || eminence_nominee)
return
@@ -95,7 +93,7 @@
return
playsound(eminence_nominee, 'sound/machines/clockcult/ark_damage.ogg', 50, FALSE)
eminence_nominee.visible_message("A blast of white-hot light flows into [eminence_nominee], vaporizing [eminence_nominee.p_them()] in an instant!", \
- "allthelightintheuniverseflowing.into.YOU")
+ "allthelightintheuniverseflowing.into.YOU")
for(var/obj/item/I in eminence_nominee)
eminence_nominee.dropItemToGround(I)
var/mob/camera/eminence/eminence = new(get_turf(src))
@@ -113,8 +111,6 @@
hierophant_message("No ghosts accepted the offer! The eminence spire has been reset.")
eminence_nominee = null
return
- visible_message("A blast of white-hot light spirals from [src] in waves!")
- playsound(src, 'sound/machines/clockcult/ark_damage.ogg', 50, FALSE)
var/mob/camera/eminence/eminence = new(get_turf(src))
eminence_nominee = pick(candidates)
eminence_nominee.transfer_ckey(eminence)
diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm
index fcd23aeff1..44b150ce58 100644
--- a/code/modules/antagonists/clockcult/clockcult.dm
+++ b/code/modules/antagonists/clockcult/clockcult.dm
@@ -7,7 +7,7 @@
antag_moodlet = /datum/mood_event/cult
skill_modifiers = list(/datum/skill_modifier/job/level/wiring)
var/datum/action/innate/hierophant/hierophant_network = new
- var/datum/action/innate/hierophant/eminence_ascend = new
+ var/datum/action/innate/eminence_ascend = new
threat = 3
var/datum/team/clockcult/clock_team
var/make_team = TRUE //This should be only false for tutorial scarabs
@@ -16,19 +16,23 @@
var/ignore_holy_water = FALSE
/datum/antagonist/clockcult/silent
+ name = "Silent Clock Cultist"
silent = TRUE
show_in_antagpanel = FALSE //internal
/datum/antagonist/clockcult/neutered
+ name = "Neutered Clock Cultist"
neutered = TRUE
/datum/antagonist/clockcult/neutered/traitor
+ name = "Traitor Clock Cultist"
ignore_eligibility_check = TRUE
ignore_holy_water = TRUE
show_in_roundend = FALSE
make_team = FALSE
/datum/antagonist/clockcult/eminence
+ name = "Eminence"
var/datum/action/innate/eminence/mass_recall = new
var/datum/action/innate/eminence/obelisk_jump = new
var/datum/action/innate/eminence/ark_jump = new