(Ready) Clockwork Cult Rework: Proof-of-concept

code/datums/antagonists/datum_clockcult.dm

@@ -103,23 +103,22 @@
 		S.laws.associate(S)
 		S.update_icons()
 		S.show_laws()
-		hierophant_network.Grant(S)
 		hierophant_network.title = "Silicon"
 		hierophant_network.span_for_name = "nezbere"
 		hierophant_network.span_for_message = "brass"
 	else if(isbrain(current))
-		hierophant_network.Grant(current)
 		hierophant_network.title = "Vessel"
 		hierophant_network.span_for_name = "nezbere"
 		hierophant_network.span_for_message = "alloy"
 	else if(isclockmob(current))
-		hierophant_network.Grant(current)
 		hierophant_network.title = "Construct"
 		hierophant_network.span_for_name = "nezbere"
 		hierophant_network.span_for_message = "brass"
+	hierophant_network.Grant(current)
 	current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump)
-	if(!GLOB.clockwork_gateway_activated)
-		current.throw_alert("scripturereq", /obj/screen/alert/clockwork/scripture_reqs)
+	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
+	if(G.active && ishuman(current))
+		current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER))
 
 /datum/antagonist/clockcult/remove_innate_effects(mob/living/mob_override)
 	var/mob/living/current = owner.current
@@ -129,9 +128,10 @@
 	current.faction -= "ratvar"
 	current.remove_language(/datum/language/ratvar)
 	current.clear_alert("clockinfo")
-	current.clear_alert("scripturereq")
-	for(var/datum/action/innate/function_call/F in owner.current.actions) //Removes any bound Ratvarian spears
-		qdel(F)
+	for(var/datum/action/innate/clockwork_arnaments/C in owner.current.actions) //Removes any bound clockwork armor
+		qdel(C)
+	for(var/datum/action/innate/call_weapon/W in owner.current.actions) //and weapons too
+		qdel(W)
 	if(issilicon(current))
 		var/mob/living/silicon/S = current
 		if(isAI(S))
@@ -149,6 +149,8 @@
 		R.module.rebuild_modules()
 	if(temp_owner)
 		temp_owner.update_action_buttons_icon() //because a few clockcult things are action buttons and we may be wearing/holding them, we need to update buttons
+	temp_owner.cut_overlays()
+	temp_owner.regenerate_icons()
 
 /datum/antagonist/clockcult/on_removal()
 	SSticker.mode.servants_of_ratvar -= owner

code/datums/map_config.dm

@@ -12,6 +12,7 @@
 	var/minetype = "lavaland"
 
 	var/list/transition_config = list(CENTCOM = SELFLOOPING,
+									CITY_OF_COGS = SELFLOOPING,
 									MAIN_STATION = CROSSLINKED,
 									EMPTY_AREA_1 = CROSSLINKED,
 									EMPTY_AREA_2 = CROSSLINKED,
@@ -119,6 +120,8 @@
 			return MAIN_STATION
 		if("CENTCOM")
 			return CENTCOM
+		if("CITY_OF_COGS")
+			return CITY_OF_COGS
 		if("MINING")
 			return MINING
 		if("EMPTY_AREA_1")

code/datums/mind.dm

@@ -674,7 +674,7 @@
 		text = "<i><b>[text]</b></i>: "
 		if(is_servant_of_ratvar(current))
 			text += "not mindshielded | <a href='?src=\ref[src];clockcult=clear'>employee</a> | <b>SERVANT</b>"
-			text += "<br><a href='?src=\ref[src];clockcult=slab'>Give slab</a>"
+			text += "<br><a href='?src=\ref[src];clockcult=slab'>Equip</a>"
 		else if(is_eligible_servant(current))
 			text += "not mindshielded | <b>EMPLOYEE</b> | <a href='?src=\ref[src];clockcult=servant'>servant</a>"
 		else
@@ -1037,9 +1037,9 @@
 					log_admin("[key_name(usr)] has made [current] into a servant of Ratvar.")
 			if("slab")
 				if(!SSticker.mode.equip_servant(current))
-					to_chat(usr, "<span class='warning'>Failed to outfit [current] with a slab!</span>")
+					to_chat(usr, "<span class='warning'>Failed to outfit [current]!</span>")
 				else
-					to_chat(usr, "<span class='notice'>Successfully gave [current] a clockwork slab!</span>")
+					to_chat(usr, "<span class='notice'>Successfully gave [current] servant equipment!</span>")
 
 	else if (href_list["wizard"])
 		switch(href_list["wizard"])

code/datums/status_effects/debuffs.dm

@@ -148,21 +148,6 @@
 	if(owner.m_intent == MOVE_INTENT_WALK)
 		owner.toggle_move_intent()
 
-/datum/status_effect/geis_tracker
-	id = "geis_tracker"
-	duration = -1
-	alert_type = null
-	var/obj/structure/destructible/clockwork/geis_binding/binding
-
-/datum/status_effect/geis_tracker/on_creation(mob/living/new_owner, obj/structure/destructible/clockwork/geis_binding/new_binding)
-	. = ..()
-	if(.)
-		binding = new_binding
-
-/datum/status_effect/geis_tracker/tick()
-	if(QDELETED(binding))
-		qdel(src)
-
 /datum/status_effect/maniamotor
 	id = "maniamotor"
 	duration = -1
@@ -200,7 +185,7 @@
 		return
 	if(!motor.active) //it being off makes it fall off much faster
 		if(!is_servant && !warned_turnoff)
-			if(motor.total_accessable_power() > motor.mania_cost)
+			if(can_access_clockwork_power(motor, motor.mania_cost))
 				to_chat(owner, "<span class='sevtug[span_part]'>\"[text2ratvar(pick(turnoff_messages))]\"</span>")
 			else
 				var/pickedmessage = pick(powerloss_messages)
@@ -461,3 +446,40 @@
 /obj/effect/temp_visual/curse/Initialize()
 	. = ..()
 	deltimer(timerid)
+
+
+//Kindle: Used by servants of Ratvar. 10-second knockdown, reduced by 1 second per 5 damage taken while the effect is active.
+/datum/status_effect/kindle
+	id = "kindle"
+	status_type = STATUS_EFFECT_UNIQUE
+	tick_interval = 5
+	duration = 100
+	alert_type = /obj/screen/alert/status_effect/kindle
+	var/old_health
+
+/datum/status_effect/kindle/tick()
+	owner.Knockdown(15)
+	if(iscarbon(owner))
+		var/mob/living/carbon/C = owner
+		C.silent = max(2, C.silent)
+		C.stuttering = max(5, C.stuttering)
+	if(!old_health)
+		old_health = owner.health
+	var/health_difference = old_health - owner.health
+	if(!health_difference)
+		return
+	owner.visible_message("<span class='warning'>The light in [owner]'s eyes dims as they're harmed!</span>", \
+	"<span class='boldannounce'>The dazzling lights dim as you're harmed!</span>")
+	health_difference *= 2 //so 10 health difference translates to 20 deciseconds of stun reduction
+	duration -= health_difference
+	old_health = owner.health
+
+/datum/status_effect/kindle/on_remove()
+	owner.visible_message("<span class='warning'>The light in [owner]'s eyes fades!</span>", \
+	"<span class='boldannounce'>You snap out of your daze!</span>")
+
+/obj/screen/alert/status_effect/kindle
+	name = "Dazzling Lights"
+	desc = "Blinding light dances in your vision, stunning and silencing you. <i>Any damage taken will shorten the light's effects!</i>"
+	icon_state = "kindle"
+	alerttooltipstyle = "clockcult"