Merge branch 'master' into upstream-merge-33055

code/game/gamemodes/clock_cult/clock_cult.dm

@@ -65,13 +65,16 @@ Credit where due:
 		return TRUE
 	return FALSE
 
-/proc/add_servant_of_ratvar(mob/L, silent = FALSE)
+/proc/add_servant_of_ratvar(mob/L, silent = FALSE, create_team = TRUE)
 	if(!L || !L.mind)
 		return
 	var/update_type = ANTAG_DATUM_CLOCKCULT
 	if(silent)
 		update_type = ANTAG_DATUM_CLOCKCULT_SILENT
-	. = L.mind.add_antag_datum(update_type)
+	var/datum/antagonist/clockcult/C = new update_type(L.mind)
+	C.make_team = create_team
+	C.show_in_roundend = create_team //tutorial scarabs begone
+	. = L.mind.add_antag_datum(C)
 
 /proc/remove_servant_of_ratvar(mob/L, silent = FALSE)
 	if(!L || !L.mind)
@@ -88,7 +91,6 @@ Credit where due:
 ///////////////
 
 /datum/game_mode
-	var/datum/mind/eminence //The clockwork Eminence
 	var/list/servants_of_ratvar = list() //The Enlightened servants of Ratvar
 	var/clockwork_explanation = "Defend the Ark of the Clockwork Justiciar and free Ratvar." //The description of the current objective
 
@@ -111,6 +113,8 @@ Credit where due:
 	var/roundstart_player_count
 	var/ark_time //In minutes, how long the Ark waits before activation; this is equal to 30 + (number of players / 5) (max 40 mins.)
 
+	var/datum/team/clockcult/main_clockcult
+
 /datum/game_mode/clockwork_cult/pre_setup()
 	if(CONFIG_GET(flag/protect_roles_from_antagonist))
 		restricted_jobs += protected_jobs
@@ -185,22 +189,21 @@ Credit where due:
 	return FALSE
 
 /datum/game_mode/clockwork_cult/check_finished()
-	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
-	if(G && !GLOB.ratvar_awakens) // Doesn't end until the Ark is destroyed or completed
+	if(GLOB.ark_of_the_clockwork_justiciar && !GLOB.ratvar_awakens) // Doesn't end until the Ark is destroyed or completed
 		return FALSE
-	. = ..()
+	return ..()
 
 /datum/game_mode/clockwork_cult/proc/check_clockwork_victory()
+	return main_clockcult.check_clockwork_victory()
+
+/datum/game_mode/clock_cult/set_round_result()
+	..()
 	if(GLOB.clockwork_gateway_activated)
 		SSticker.news_report = CLOCK_SUMMON
-		return TRUE
+		SSticker.mode_result = "win - servants completed their objective (summon ratvar)"
 	else
 		SSticker.news_report = CULT_FAILURE
-	return FALSE
-
-/datum/game_mode/clockwork_cult/declare_completion()
-	..()
-	return //Doesn't end until the round does
+		SSticker.mode_result = "loss - servants failed their objective (summon ratvar)"
 
 /datum/game_mode/clockwork_cult/generate_report()
 	return "Bluespace monitors near your sector have detected a continuous stream of patterned fluctuations since the station was completed. It is most probable that a powerful entity \
@@ -210,30 +213,6 @@ Credit where due:
 	working for this entity and utilizing highly-advanced technology to cross the great distance at will. If they should turn out to be a credible threat, the task falls on you and \
 	your crew to dispatch it in a timely manner."
 
-/datum/game_mode/proc/auto_declare_completion_clockwork_cult()
-	var/text = ""
-	if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) //Possibly hacky?
-		var/datum/game_mode/clockwork_cult/C = SSticker.mode
-		if(C.check_clockwork_victory())
-			text += "<span class='bold large_brass'>Ratvar's servants defended the Ark until its activation!</span>"
-			SSticker.mode_result = "win - servants completed their objective (summon ratvar)"
-		else
-			text += "<span class='userdanger'>The Ark was destroyed! Ratvar will rust away for all eternity!</span>"
-			SSticker.mode_result = "loss - servants failed their objective (summon ratvar)"
-		text += "<br><b>The servants' objective was:</b> [CLOCKCULT_OBJECTIVE]."
-		text += "<br>Ratvar's servants had <b>[GLOB.clockwork_caches]</b> Tinkerer's Caches."
-		text += "<br><b>Construction Value(CV)</b> was: <b>[GLOB.clockwork_construction_value]</b>"
-		for(var/i in SSticker.scripture_states)
-			if(i != SCRIPTURE_DRIVER)
-				text += "<br><b>[i] scripture</b> was: <b>[SSticker.scripture_states[i] ? "UN":""]LOCKED</b>"
-	if(SSticker.mode.eminence)
-		text += "<br><b>The Eminence was:</b> [printplayer(SSticker.mode.eminence)]"
-	if(servants_of_ratvar.len)
-		text += "<br><b>Ratvar's servants were:</b>"
-		for(var/datum/mind/M in servants_of_ratvar - SSticker.mode.eminence)
-			text += printplayer(M)
-	to_chat(world, text)
-
 /datum/game_mode/proc/update_servant_icons_added(datum/mind/M)
 	var/datum/atom_hud/antag/A = GLOB.huds[ANTAG_HUD_CLOCKWORK]
 	A.join_hud(M.current)

code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm

@@ -207,7 +207,7 @@
 	to_chat(cyborg, "<span class='brass'>You start to charge from the [sigil_name]...</span>")
 	if(!do_after(cyborg, 50, target = src, extra_checks = CALLBACK(src, .proc/cyborg_checks, cyborg, TRUE)))
 		return
-	var/giving_power = min(Floor(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), get_clockwork_power()) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER
+	var/giving_power = min(FLOOR(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), get_clockwork_power()) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER
 	if(adjust_clockwork_power(-giving_power))
 		cyborg.visible_message("<span class='warning'>[cyborg] glows a brilliant orange!</span>")
 		var/previous_color = cyborg.color
@@ -275,7 +275,6 @@
 /obj/effect/clockwork/sigil/vitality/sigil_effects(mob/living/L)
 	if((is_servant_of_ratvar(L) && L.suiciding) || sigil_active)
 		return
-	visible_message("<span class='warning'>[src] begins to glow bright blue!</span>")
 	animate(src, alpha = 255, time = 10, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
 	sleep(10)
 //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
@@ -355,5 +354,4 @@
 	if(sigil_active)
 		animation_number = initial(animation_number)
 		sigil_active = FALSE
-		visible_message("<span class='warning'>[src] slowly stops glowing!</span>")
 	animate(src, alpha = initial(alpha), time = 10, flags = ANIMATION_END_NOW)

code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm

@@ -90,7 +90,7 @@
 	if(amount_temp < 2)
 		to_chat(user, "<span class='warning'>You need at least <b>2</b> floor tiles to convert into power.</span>")
 		return TRUE
-	if(IsOdd(amount_temp))
+	if(ISODD(amount_temp))
 		amount_temp--
 		no_delete = TRUE
 		use(amount_temp)
@@ -239,7 +239,7 @@
 		if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \
 			extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricator_repair_checks, repair_values, src, user, TRUE)))
 			break
-		obj_integrity = Clamp(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity)
+		obj_integrity = CLAMP(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity)
 		adjust_clockwork_power(-repair_values["power_required"])
 		playsound(src, 'sound/machines/click.ogg', 50, 1)
 

code/game/gamemodes/clock_cult/clock_helpers/power_helpers.dm

@@ -10,12 +10,15 @@
 	for(var/obj/effect/clockwork/sigil/transmission/T in GLOB.all_clockwork_objects)
 		T.update_icon()
 	var/power_overwhelming = GLOB.clockwork_power
+	var/unlock_message
 	if(power_overwhelming >= SCRIPT_UNLOCK_THRESHOLD && !GLOB.script_scripture_unlocked)
 		GLOB.script_scripture_unlocked = TRUE
-		hierophant_message("<span class='large_brass bold'>The Ark swells as a key power threshold is reached. Script scriptures are now available.</span>")
+		unlock_message = "<span class='large_brass bold'>The Ark swells as a key power threshold is reached. Script scriptures are now available.</span>"
 	if(power_overwhelming >= APPLICATION_UNLOCK_THRESHOLD && !GLOB.application_scripture_unlocked)
 		GLOB.application_scripture_unlocked = TRUE
-		hierophant_message("<span class='large_brass bold'>The Ark surges as a key power threshold is reached. Application scriptures are now available.</span>")
+		unlock_message = "<span class='large_brass bold'>The Ark surges as a key power threshold is reached. Application scriptures are now available.</span>"
+	if(GLOB.servants_active)
+		hierophant_message(unlock_message)
 	return TRUE
 
 /proc/can_access_clockwork_power(atom/movable/access_point, amount) //Returns true if the access point has access to clockwork power (and optionally, a number of watts for it)

code/game/gamemodes/clock_cult/clock_helpers/scripture_checks.dm

@@ -11,6 +11,8 @@
 
 //reports to servants when scripture is locked or unlocked
 /proc/scripture_unlock_alert(list/previous_states)
+	if(!GLOB.servants_active)
+		return
 	. = scripture_unlock_check()
 	for(var/i in .)
 		if(.[i] != previous_states[i])

code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm

@@ -91,7 +91,8 @@
 
 /obj/item/clockwork/construct_chassis/cogscarab/pre_spawn()
 	if(infinite_resources)
-		construct_type = /mob/living/simple_animal/drone/cogscarab/ratvar //During rounds where they can't interact with the station, let them experiment with builds
+		//During rounds where they can't interact with the station, let them experiment with builds
+		construct_type = /mob/living/simple_animal/drone/cogscarab/ratvar
 
 /obj/item/clockwork/construct_chassis/cogscarab/post_spawn(mob/living/construct)
 	if(infinite_resources) //Allow them to build stuff and recite scripture

code/game/gamemodes/clock_cult/clock_mobs/_eminence.dm

@@ -14,16 +14,6 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	var/static/superheated_walls = 0
 
-/mob/camera/eminence/Initialize()
-	if(SSticker.mode.eminence)
-		return INITIALIZE_HINT_QDEL
-	. = ..()
-
-/mob/camera/eminence/Destroy(force)
-	if(!force && mind && SSticker.mode.eminence == mind)
-		return QDEL_HINT_LETMELIVE
-	return ..()
-
 /mob/camera/eminence/CanPass(atom/movable/mover, turf/target)
 	return TRUE
 
@@ -39,12 +29,20 @@
 
 /mob/camera/eminence/Login()
 	..()
-	add_servant_of_ratvar(src, TRUE)
+	var/datum/antagonist/clockcult/C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
+	if(!C)
+		add_servant_of_ratvar(src, TRUE)
+		C = mind.has_antag_datum(/datum/antagonist/clockcult,TRUE)
+		if(C && C.clock_team)
+			if(C.clock_team.eminence)
+				remove_servant_of_ratvar(src,TRUE)
+				qdel(src)
+			else
+				C.clock_team.eminence = src
 	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'>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'>Additionally, unless the herald's beacon is activated, you can't understand any speech while away from Reebe.</span>")
-	SSticker.mode.eminence = mind
 	eminence_help()
 	for(var/V in actions)
 		var/datum/action/A = V

code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm

@@ -1,13 +1,13 @@
 #define MARAUDER_SLOWDOWN_PERCENTAGE 0.40 //Below this percentage of health, marauders will become slower
-#define MARAUDER_SHIELD_REGEN_TIME 100 //In deciseconds, how long it takes for shields to regenerate after breaking
+#define MARAUDER_SHIELD_REGEN_TIME 200 //In deciseconds, how long it takes for shields to regenerate after breaking
 
 //Clockwork marauder: A well-rounded frontline construct. Only one can exist for every two human servants.
 /mob/living/simple_animal/hostile/clockwork/marauder
 	name = "clockwork marauder"
 	desc = "The stalwart apparition of a soldier, blazing with crimson flames. It's armed with a gladius and shield."
 	icon_state = "clockwork_marauder"
-	health = 150
-	maxHealth = 150
+	health = 120
+	maxHealth = 120
 	force_threshold = 8
 	speed = 0
 	obj_damage = 40
@@ -39,10 +39,11 @@
 		speed = initial(speed) + 1 //Yes, this slows them down
 	else
 		speed = initial(speed)
-	if(shield_health != max_shield_health && world.time >= shield_health_regen)
-		to_chat(src, "<span class='neovgre'>Your shield has recovered. <b>[max_shield_health]</b> blocks remaining!</span>")
+	if(shield_health < max_shield_health && world.time >= shield_health_regen)
+		shield_health_regen = world.time + MARAUDER_SHIELD_REGEN_TIME
+		to_chat(src, "<span class='neovgre'>Your shield has recovered, <b>[shield_health]</b> blocks remaining!</span>")
 		playsound_local(src, "shatter", 75, TRUE, frequency = -1)
-		shield_health = max_shield_health
+		shield_health++
 
 /mob/living/simple_animal/hostile/clockwork/marauder/update_values()
 	if(GLOB.ratvar_awakens) //Massive attack damage bonuses and health increase, because Ratvar

code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm

@@ -97,7 +97,7 @@
 		if(ishuman(M.current))
 			human_servants++
 	construct_limit = human_servants / 4 //1 per 4 human servants, and a maximum of 3 marauders
-	construct_limit = Clamp(construct_limit, 1, 3)
+	construct_limit = CLAMP(construct_limit, 1, 3)
 
 /datum/clockwork_scripture/create_object/construct/clockwork_marauder/pre_recital()
 	channel_time = initial(channel_time)

code/game/gamemodes/clock_cult/clock_structures/eminence_spire.dm

@@ -17,7 +17,11 @@
 		return
 	if(kingmaking)
 		return
-	if(SSticker.mode.eminence)
+
+	var/datum/antagonist/clockcult/C = user.mind.has_antag_datum(/datum/antagonist/clockcult)
+	if(!C || !C.clock_team)
+		return
+	if(C.clock_team.eminence)
 		to_chat(user, "<span class='warning'>There's already an Eminence!</span>")
 		return
 	if(!GLOB.servants_active)
@@ -34,7 +38,9 @@
 /obj/structure/destructible/clockwork/eminence_spire/attack_ghost(mob/user)
 	if(!IsAdminGhost(user))
 		return
-	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)
 		to_chat(user, "<span class='warning'>There's already an Eminence - too late!</span>")
 		return
 	if(!GLOB.servants_active)

code/game/gamemodes/clock_cult/clock_structures/mania_motor.dm

@@ -60,4 +60,4 @@
 				break
 		if(!M)
 			M = H.apply_status_effect(STATUS_EFFECT_MANIAMOTOR, src)
-		M.severity = Clamp(M.severity + ((11 - get_dist(src, H)) * efficiency * efficiency), 0, MAX_MANIA_SEVERITY)
+		M.severity = CLAMP(M.severity + ((11 - get_dist(src, H)) * efficiency * efficiency), 0, MAX_MANIA_SEVERITY)

code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm

@@ -57,5 +57,5 @@
 			L.confused = min(L.confused + 15, 50)
 			L.dizziness = min(L.dizziness + 15, 50)
 			if(L.confused >= 25)
-				L.Knockdown(Floor(L.confused * 0.8))
+				L.Knockdown(FLOOR(L.confused * 0.8, 1))
 		take_damage(max_integrity)