Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645

[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog

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

@@ -1,5 +1,11 @@
 #define ARK_GRACE_PERIOD 300 //In seconds, how long the crew has before the Ark truly "begins"
 
+/proc/clockwork_ark_active() //A helper proc so the Ark doesn't have to be typecast every time it's checked; returns null if there is no Ark and its active var otherwise
+	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
+	if(!G)
+		return
+	return G.active
+
 //The gateway to Reebe, from which Ratvar emerges.
 /obj/structure/destructible/clockwork/massive/celestial_gateway
 	name = "\improper Ark of the Clockwork Justicar"
@@ -63,7 +69,7 @@
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/cry_havoc()
 	visible_message("<span class='boldwarning'>[src] shudders and roars to life, its parts beginning to whirr and screech!</span>")
-	hierophant_message("<span class='bold large_brass'>The Ark is activating! Get back to the base!</span>")
+	hierophant_message("<span class='bold large_brass'>The Ark is activating! You will be transported there soon!</span>")
 	for(var/mob/M in GLOB.player_list)
 		if(is_servant_of_ratvar(M) || isobserver(M) || M.z == z)
 			M.playsound_local(M, 'sound/magic/clockwork/ark_activation_sequence.ogg', 30, FALSE, pressure_affected = FALSE)
@@ -86,6 +92,8 @@
 		var/datum/stack_recipe/R = V
 		if(R.title == "wall gear")
 			R.time *= 2 //Building walls becomes slower when the Ark activates
+	mass_recall()
+	recalls_remaining++ //So it doesn't use up a charge
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/open_portal(turf/T)
 	new/obj/effect/clockwork/city_of_cogs_rift(T)
@@ -261,6 +269,12 @@
 			if(!step_away(O, src, 2) || get_dist(O, src) < 2)
 				O.take_damage(50, BURN, "bomb")
 			O.update_icon()
+	for(var/V in GLOB.player_list)
+		var/mob/M = V
+		if(is_servant_of_ratvar(M) && M.z != z)
+			M.forceMove(get_step(src, SOUTH))
+			M.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
+			M.clear_fullscreen("flash", 5)
 	if(grace_period)
 		grace_period--
 		return

code/game/machinery/computer/camera_advanced.dm

@@ -283,6 +283,9 @@
 	if(!is_servant_of_ratvar(user))
 		to_chat(user, "<span class='warning'>[src]'s keys are in a language foreign to you, and you don't understand anything on its screen.</span>")
 		return
+	if(clockwork_ark_active())
+		to_chat(user, "<span class='warning'>The Ark is active, and [src] has shut down.</span>")
+		return
 	. = ..()
 
 /datum/action/innate/servant_warp

strings/clockwork_cult_changelog.txt

@@ -1,7 +1,6 @@
-Added the <b>Eminence</b>, a leader role that servants can become by interacting with the new eminence spire structure in Reebe.
-Scripture has been re-colored in the slab interface to show its niche at a glance.
-Added traps, including the brass skewer and steam vent.
-Added trap triggers, including the pressure sensor, lever, and repeater.
-Traps and trap triggers can be linked by using your clockwork slab on them. Traps chained to each other will cause those traps to activate as well.
-You can instantly remove traps you misplace by using a wrench on them.
-<b><i>Mending Mantra has been removed.</i></b>
+When revived by a vitality matrix, servants will gain a 1-minute debuff that prevents revival again.
+Vitality matrices must now be placed at least one tile apart.
+Servants are now teleported to and locked on Reebe once the Ark starts.
+Cyborgs are now damaged by brass skewers.
+Vitality matrices no longer work on buckled mobs (including skewered ones.)
+Pressure sensors have much less health.