lol one ctrl f change

code/__DEFINES/antagonists.dm

@@ -199,6 +199,9 @@
 /// Checks if the given mob is infected.
 #define IS_INFECTED(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/zombie))
 
+/// Checks if the given mob is infected.
+#define IS_CLOCK_CULTIST(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/clockcult))
+
 // Antag resource defines
 #define ANTAG_RESOURCE_DARKSPAWN "psi"
 #define ANTAG_RESOURCE_VAMPIRE "blood"

code/__HELPERS/unsorted.dm

@@ -1066,7 +1066,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 /proc/servants_and_ghosts()
 	. = list()
 	for(var/V in GLOB.player_list)
-		if(is_servant_of_ratvar(V) || isobserver(V))
+		if(IS_CLOCK_CULTIST(V) || isobserver(V))
 			. += V
 
 #define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##var_value)

code/_onclick/hud/alert.dm

@@ -474,7 +474,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 		var/servants = 0
 		var/list/textlist = list()
 		for(var/mob/living/L in GLOB.alive_mob_list)
-			if(is_servant_of_ratvar(L))
+			if(IS_CLOCK_CULTIST(L))
 				servants++
 		var/datum/antagonist/clockcult/C = mob_viewer.mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
 		if(C && C.clock_team)

code/datums/actions/items/clockcult.dm

@@ -4,7 +4,7 @@
 	buttontooltipstyle = "clockcult"
 
 /datum/action/item_action/clock/IsAvailable(feedback = FALSE)
-	if(!is_servant_of_ratvar(owner))
+	if(!IS_CLOCK_CULTIST(owner))
 		return FALSE
 	return ..()
 

code/datums/mind.dm

@@ -437,7 +437,7 @@
 		var/datum/antagonist/rev/converter = creator.mind.has_antag_datum(/datum/antagonist/rev,TRUE)
 		converter.add_revolutionary(src,FALSE)
 
-	else if(is_servant_of_ratvar(creator))
+	else if(IS_CLOCK_CULTIST(creator))
 		add_servant_of_ratvar(current)
 
 	else if(IS_NUKE_OP(creator))

code/datums/status_effects/debuffs/debuffs.dm

@@ -376,7 +376,7 @@
 
 /datum/status_effect/belligerent/proc/do_movement_toggle(force_damage)
 	var/number_legs = owner.get_num_legs(FALSE)
-	if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.can_block_magic(charge_cost = 0) && number_legs)
+	if(iscarbon(owner) && !IS_CLOCK_CULTIST(owner) && !owner.can_block_magic(charge_cost = 0) && number_legs)
 		if(force_damage || owner.m_intent != MOVE_INTENT_WALK)
 			if(GLOB.ratvar_awakens)
 				owner.Paralyze(20)
@@ -427,7 +427,7 @@
 	return ..()
 
 /datum/status_effect/maniamotor/tick()
-	var/is_servant = is_servant_of_ratvar(owner)
+	var/is_servant = IS_CLOCK_CULTIST(owner)
 	var/span_part = severity > 50 ? "" : "_small" //let's save like one check
 	if(QDELETED(motor))
 		if(!is_servant)

code/game/gamemodes/clock_cult/clock_cult.dm

@@ -43,12 +43,6 @@ Credit where due:
 ///////////
 // PROCS //
 ///////////
-
-/proc/is_servant_of_ratvar(mob/M)
-	if(!istype(M))
-		return FALSE
-	return M?.mind?.has_antag_datum(/datum/antagonist/clockcult)
-
 /proc/is_eligible_servant(mob/M)
 	if(!istype(M))
 		return FALSE
@@ -352,7 +346,7 @@ Credit where due:
 
 /obj/item/paper/servant_primer/examine(mob/user)
 	. = ..()
-	if(!is_servant_of_ratvar(user) && !isobserver(user))
+	if(!IS_CLOCK_CULTIST(user) && !isobserver(user))
 		. += span_danger("You can't understand any of the words on [src].")
 
 /obj/item/paper/servant_primer/infirmarypaper

code/game/gamemodes/cult/cult.dm

@@ -22,7 +22,7 @@
 			return FALSE
 	else
 		return FALSE
-	if(HAS_TRAIT(M, TRAIT_MINDSHIELD) || issilicon(M) || isbot(M) || isdrone(M) || ismouse(M) || is_servant_of_ratvar(M) || !M.client)
+	if(HAS_TRAIT(M, TRAIT_MINDSHIELD) || issilicon(M) || isbot(M) || isdrone(M) || ismouse(M) || IS_CLOCK_CULTIST(M) || !M.client)
 		return FALSE //can't convert machines, shielded, braindead, mice, or ratvar's dogs
 	return TRUE
 

code/game/machinery/computer/camera_advanced.dm

@@ -362,7 +362,7 @@
 	eyeobj.icon_state = "generic_camera"
 
 /obj/machinery/computer/camera_advanced/ratvar/can_use(mob/living/user)
-	if(!is_servant_of_ratvar(user))
+	if(!IS_CLOCK_CULTIST(user))
 		to_chat(user, span_warning("[src]'s keys are in a language foreign to you, and you don't understand anything on its screen."))
 		return
 	if(clockwork_ark_active())

code/game/machinery/doors/airlock_types.dm

@@ -590,7 +590,7 @@
 		open()
 
 /obj/machinery/door/airlock/clockwork/canAIControl(mob/user)
-	return (is_servant_of_ratvar(user) && !isAllPowerCut())
+	return (IS_CLOCK_CULTIST(user) && !isAllPowerCut())
 
 /obj/machinery/door/airlock/clockwork/ratvar_act()
 	return 0
@@ -608,7 +608,7 @@
 		return ..()
 
 /obj/machinery/door/airlock/clockwork/allowed(mob/M)
-	if(is_servant_of_ratvar(M))
+	if(IS_CLOCK_CULTIST(M))
 		return 1
 	return 0
 

code/game/machinery/doors/windowdoor.dm

@@ -441,7 +441,7 @@
 		addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
 
 /obj/machinery/door/window/clockwork/allowed(mob/M)
-	if(is_servant_of_ratvar(M))
+	if(IS_CLOCK_CULTIST(M))
 		return 1
 	return 0
 

code/game/mecha/mecha_defense.dm

@@ -453,7 +453,7 @@
 
 /obj/mecha/ratvar_act()
 	if((GLOB.ratvar_awakens || GLOB.clockwork_gateway_activated) && occupant)
-		if(is_servant_of_ratvar(occupant)) //reward the minion that got a mech by repairing it
+		if(IS_CLOCK_CULTIST(occupant)) //reward the minion that got a mech by repairing it
 			full_repair(TRUE)
 		else
 			var/mob/living/L = occupant

code/game/objects/items/cards_ids.dm

@@ -269,7 +269,7 @@
 		charges--
 
 		// Copy and paste of emag checks.
-		if(is_servant_of_ratvar(cyborg))
+		if(IS_CLOCK_CULTIST(cyborg))
 			to_chat(cyborg, "[span_nezbere("\"[text2ratvar("You will serve Engine above all else")]!\"")]\n\
 			[span_danger("ALERT: Subversion attempt denied.")]")
 			log_game("[key_name(user)] attempted to cmag cyborg [key_name(cyborg)], but they serve only Ratvar.")

code/game/objects/items/devices/radio/intercom.dm

@@ -24,7 +24,7 @@
 
 /obj/item/radio/intercom/ratvar/attackby(obj/item/I, mob/living/user, params)
 	if(I.tool_behaviour == TOOL_SCREWDRIVER)
-		to_chat(user, span_danger("[src] is fastened to the wall with [is_servant_of_ratvar(user) ? "replicant alloy" : "some material you've never seen"], and can't be removed."))
+		to_chat(user, span_danger("[src] is fastened to the wall with [IS_CLOCK_CULTIST(user) ? "replicant alloy" : "some material you've never seen"], and can't be removed."))
 		return //no unfastening!
 	. = ..()
 

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -704,7 +704,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
 	qdel(src)
 
 /obj/item/stack/tile/brass/attack_self(mob/living/user)
-	if(!is_servant_of_ratvar(user))
+	if(!IS_CLOCK_CULTIST(user))
 		to_chat(user, span_danger("[src] seems far too fragile and rigid to build with.")) //haha that's because it's actually replicant alloy you DUMMY
 		return
 	..()
@@ -753,7 +753,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
 	tableVariant = /obj/structure/table/bronze
 
 /obj/item/stack/tile/bronze/attack_self(mob/living/user)
-	if(is_servant_of_ratvar(user)) //still lets them build with it, just gives a message
+	if(IS_CLOCK_CULTIST(user)) //still lets them build with it, just gives a message
 		to_chat(user, span_danger("Wha... what is this cheap imitation crap? This isn't brass at all!"))
 	..()
 

code/game/turfs/open/_open.dm

@@ -517,7 +517,7 @@
 /turf/open/indestructible/clock_spawn_room/proc/port_servants()
 	. = FALSE
 	for(var/mob/living/L in src)
-		if(is_servant_of_ratvar(L) && L.stat != DEAD)
+		if(IS_CLOCK_CULTIST(L) && L.stat != DEAD)
 			. = TRUE
 			L.forceMove(get_turf(pick(GLOB.servant_spawns)))
 			visible_message(span_warning("[L] vanishes in a flash of red!"))

code/game/turfs/open/floor/misc_floor.dm

@@ -208,7 +208,7 @@
 		if(L.stat == DEAD)
 			continue
 		. = 1
-		if(!is_servant_of_ratvar(L) || !L.toxloss)
+		if(!IS_CLOCK_CULTIST(L) || !L.toxloss)
 			continue
 
 		var/image/I = new('icons/effects/effects.dmi', src, "heal", ABOVE_MOB_LAYER) //fake a healing glow for servants
@@ -218,7 +218,7 @@
 		I.pixel_y = rand(-9, 0)
 		var/list/viewing = list()
 		for(var/mob/M in viewers(src))
-			if(M.client && (is_servant_of_ratvar(M) || isobserver(M) || M.stat == DEAD))
+			if(M.client && (IS_CLOCK_CULTIST(M) || isobserver(M) || M.stat == DEAD))
 				viewing += M.client
 		flick_overlay_global(I, viewing, 8)
 		L.adjustToxLoss(-3, TRUE, TRUE)

code/modules/antagonists/bloodsuckers/bloodsucker_objectives.dm

@@ -20,7 +20,7 @@
 			continue
 		if(!brain.current || brain.current.stat == DEAD)
 			continue
-		if(IS_HERETIC(brain.current) || IS_BLOODSUCKER(brain.current) || iscultist(brain.current) || is_servant_of_ratvar(brain.current) || IS_WIZARD(brain.current))
+		if(IS_HERETIC(brain.current) || IS_BLOODSUCKER(brain.current) || iscultist(brain.current) || IS_CLOCK_CULTIST(brain.current) || IS_WIZARD(brain.current))
 			monsters += brain
 		if(brain.has_antag_datum(/datum/antagonist/changeling))
 			monsters += brain

code/modules/antagonists/clockcult/clock_effect.dm

@@ -19,7 +19,7 @@
 	return ..()
 
 /obj/effect/clockwork/examine(mob/user)
-	if((is_servant_of_ratvar(user) || isobserver(user)) && clockwork_desc)
+	if((IS_CLOCK_CULTIST(user) || isobserver(user)) && clockwork_desc)
 		desc = clockwork_desc
 	. = ..()
 	desc = initial(desc)

code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm

@@ -54,18 +54,18 @@
 
 /obj/effect/clockwork/city_of_cogs_rift/proc/beckon(atom/movable/AM)
 	var/turf/T = get_turf(pick(GLOB.city_of_cogs_spawns))
-	if(ismob(AM) && is_servant_of_ratvar(AM))
+	if(ismob(AM) && IS_CLOCK_CULTIST(AM))
 		T = GLOB.ark_of_the_clockwork_justiciar ? get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) : get_turf(pick(GLOB.servant_spawns))
 	else // Handle mechas and such
 		var/list/target_contents = AM.get_all_contents() + AM
 		for(var/mob/living/L in target_contents)
-			if(is_servant_of_ratvar(L) && L.stat != DEAD) // Having a living cultist in your inventory sends you to the cultist spawn
+			if(IS_CLOCK_CULTIST(L) && L.stat != DEAD) // Having a living cultist in your inventory sends you to the cultist spawn
 				T = GLOB.ark_of_the_clockwork_justiciar ? get_step(GLOB.ark_of_the_clockwork_justiciar, SOUTH) : get_turf(pick(GLOB.servant_spawns))
 				break
 	AM.visible_message(span_danger("[AM] passes through [src]!"), null, null, null, AM)
 	AM.forceMove(T)
 	AM.visible_message(span_danger("[AM] materializes from the air!"), \
-	span_boldannounce("You pass through [src] and appear [is_servant_of_ratvar(AM) ? "back at the City of Cogs" : "somewhere unfamiliar. Looks like it was a one-way trip.."]."))
+	span_boldannounce("You pass through [src] and appear [IS_CLOCK_CULTIST(AM) ? "back at the City of Cogs" : "somewhere unfamiliar. Looks like it was a one-way trip.."]."))
 	do_sparks(5, TRUE, src)
 	do_sparks(5, TRUE, AM)
 	if(isliving(AM))

code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm

@@ -23,7 +23,7 @@
 
 /obj/effect/clockwork/sigil/attackby(obj/item/I, mob/living/user, params)
 	if(I.force)
-		if(is_servant_of_ratvar(user) && !user.combat_mode)
+		if(IS_CLOCK_CULTIST(user) && !user.combat_mode)
 			return ..()
 		user.visible_message(span_warning("[user] scatters [src] with [I]!"), span_danger("You scatter [src] with [I]!"))
 		qdel(src)
@@ -36,7 +36,7 @@
 //ATTACK HAND IGNORING PARENT RETURN VALUE
 /obj/effect/clockwork/sigil/attack_hand(mob/user)
 	if(iscarbon(user) && !user.stat)
-		if(is_servant_of_ratvar(user) && !user.combat_mode)
+		if(IS_CLOCK_CULTIST(user) && !user.combat_mode)
 			return ..()
 		user.visible_message(span_warning("[user] stamps out [src]!"), span_danger("You stomp on [src], scattering it into thousands of particles."))
 		qdel(src)
@@ -51,7 +51,7 @@
 	if(isliving(AM))
 		var/mob/living/L = AM
 		if(L.stat <= stat_affected)
-			if((!is_servant_of_ratvar(L) || (affects_servants && is_servant_of_ratvar(L))) && (L.mind || L.has_status_effect(STATUS_EFFECT_SIGILMARK)) && !isdrone(L))
+			if((!IS_CLOCK_CULTIST(L) || (affects_servants && IS_CLOCK_CULTIST(L))) && (L.mind || L.has_status_effect(STATUS_EFFECT_SIGILMARK)) && !isdrone(L))
 				var/atom/I = L.can_block_magic((check_antimagic ? MAGIC_RESISTANCE : NONE))
 				if(I)
 					if(isitem(I))
@@ -81,7 +81,7 @@
 /obj/effect/clockwork/sigil/transgression/sigil_effects(mob/living/L)
 	var/target_flashed = L.flash_act()
 	for(var/mob/living/M in viewers(5, src))
-		if(!is_servant_of_ratvar(M) && M != L)
+		if(!IS_CLOCK_CULTIST(M) && M != L)
 			M.flash_act()
 	if(iscultist(L))
 		to_chat(L, "[span_heavy_brass("\"Watch your step, wretch.\"")]")
@@ -121,7 +121,7 @@
 	if(locate(/obj/effect/clockwork/sigil/transgression) in T)
 		has_sigil = TRUE
 	for(var/mob/living/M in range(3, src))
-		if(is_servant_of_ratvar(M) && !M.stat)
+		if(IS_CLOCK_CULTIST(M) && !M.stat)
 			has_servant = TRUE
 	if(!has_sigil && !has_servant)
 		visible_message(span_danger("[src] strains into a gentle violet color, but quietly fades..."))
@@ -162,12 +162,12 @@
 	if(iscarbon(L))
 		var/mob/living/carbon/C = L
 		C.silent += 5
-	var/message = "[sigil_name] in [get_area(src)] [span_sevtug("[is_servant_of_ratvar(L) ? "successfully converted" : "failed to convert"]")]"
+	var/message = "[sigil_name] in [get_area(src)] [span_sevtug("[IS_CLOCK_CULTIST(L) ? "successfully converted" : "failed to convert"]")]"
 	for(var/M in GLOB.mob_list)
 		if(isobserver(M))
 			var/link = FOLLOW_LINK(M, L)
 			to_chat(M,  "[link] [span_heavy_brass("[message] [L.real_name]!")]")
-		else if(is_servant_of_ratvar(M))
+		else if(IS_CLOCK_CULTIST(M))
 			if(M == L)
 				to_chat(M, "[span_heavy_brass("[message] you!")]")
 			else
@@ -203,7 +203,7 @@
 
 /obj/effect/clockwork/sigil/transmission/examine(mob/user)
 	. = ..()
-	if(is_servant_of_ratvar(user) || isobserver(user))
+	if(IS_CLOCK_CULTIST(user) || isobserver(user))
 		var/structure_number = 0
 		for(var/obj/structure/destructible/clockwork/powered/P in range(SIGIL_ACCESS_RANGE, src))
 			structure_number++
@@ -213,7 +213,7 @@
 			. += span_brass("You can recharge from the [sigil_name] by crossing it.")
 
 /obj/effect/clockwork/sigil/transmission/sigil_effects(mob/living/L)
-	if(is_servant_of_ratvar(L))
+	if(IS_CLOCK_CULTIST(L))
 		if(iscyborg(L))
 			charge_cyborg(L)
 	else if(get_clockwork_power())
@@ -287,27 +287,27 @@
 
 /obj/effect/clockwork/sigil/vitality/examine(mob/user)
 	. = ..()
-	if(is_servant_of_ratvar(user) || isobserver(user))
+	if(IS_CLOCK_CULTIST(user) || isobserver(user))
 		. += "<span class='[GLOB.clockwork_vitality ? "inathneq_small":"alloy"]'>It has access to <b>[GLOB.ratvar_awakens ? "INFINITE":GLOB.clockwork_vitality]</b> units of vitality.</span>"
 		if(GLOB.ratvar_awakens)
 			. += "[span_inathneq_small("It can revive Servants at no cost!")]"
 		else
 			. += span_inathneq_small("It can revive Servants at a cost of <b>[revive_cost]</b> vitality.")
 
 /obj/effect/clockwork/sigil/vitality/sigil_effects(mob/living/L)
-	if((is_servant_of_ratvar(L) && L.suiciding) || sigil_active)
+	if((IS_CLOCK_CULTIST(L) && L.suiciding) || sigil_active)
 		return
 	animate(src, alpha = 255, time = 1 SECONDS, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
 	sleep(1 SECONDS)
 //as long as they're still on the sigil and are either not a servant or they're a servant AND it has remaining vitality
 	var/consumed_vitality
-	while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src) && !L.buckled)
+	while(L && (!IS_CLOCK_CULTIST(L) || (IS_CLOCK_CULTIST(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src) && !L.buckled)
 		sigil_active = TRUE
 		if(animation_number >= 4)
 			new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
 			animation_number = 0
 		animation_number++
-		if(!is_servant_of_ratvar(L))
+		if(!IS_CLOCK_CULTIST(L))
 			var/vitality_drained = 0
 			if(L.stat == DEAD && !consumed_vitality)
 				consumed_vitality = TRUE //Prevent the target from being consumed multiple times

code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm

@@ -21,12 +21,12 @@
 	. = ..()
 	var/list/target_contents = M.get_all_contents() + M
 	for(var/mob/living/L in target_contents)
-		if(is_servant_of_ratvar(L) && get_dir(M, src) != dir && L.stat != DEAD) //Unless we're on the side the arrow is pointing directly away from, no-go
+		if(IS_CLOCK_CULTIST(L) && get_dir(M, src) != dir && L.stat != DEAD) //Unless we're on the side the arrow is pointing directly away from, no-go
 			to_chat(L, span_danger("The space beyond here can't be accessed by you or other servants."))
 			return FALSE
 	if(isitem(M))
 		var/obj/item/I = M
-		if(is_servant_of_ratvar(I.thrownby)) //nice try!
+		if(IS_CLOCK_CULTIST(I.thrownby)) //nice try!
 			return FALSE
 	return TRUE