Merge pull request #3297 from Citadel-Station-13/upstream-merge-31327

[MIRROR] The shuttle can no longer leave during clockcult rounds

code/game/gamemodes/clock_cult/clock_cult.dm

@@ -95,8 +95,8 @@ Credit where due:
 	antag_flag = ROLE_SERVANT_OF_RATVAR
 	false_report_weight = 10
 	required_players = 24
-	required_enemies = 3
-	recommended_enemies = 3
+	required_enemies = 4
+	recommended_enemies = 4
 	enemy_minimum_age = 14
 	protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //Silicons can eventually be converted
 	restricted_jobs = list("Chaplain", "Captain")
@@ -146,6 +146,7 @@ Credit where due:
 	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar //that's a mouthful
 	G.initial_activation_delay = ark_time * 60
 	G.seconds_until_activation = ark_time * 60 //60 seconds in a minute * number of minutes
+	SSshuttle.registerHostileEnvironment(GLOB.ark_of_the_clockwork_justiciar)
 	..()
 	return 1
 
@@ -190,7 +191,7 @@ Credit where due:
 	. = ..()
 
 /datum/game_mode/clockwork_cult/proc/check_clockwork_victory()
-	if(GLOB.clockwork_gateway_activated || SSshuttle.emergency.mode == SHUTTLE_ESCAPE)
+	if(GLOB.clockwork_gateway_activated)
 		SSticker.news_report = CLOCK_SUMMON
 		return TRUE
 	else
@@ -213,7 +214,7 @@ Credit where due:
 	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='large_brass'><b>Ratvar's servants defended the Ark until its activation!</b></span>"
+			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>"

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

@@ -104,6 +104,5 @@
 		if(is_servant_of_ratvar(H))
 			to_chat(H, "<span class='bold alloy'>The beacon's power warps your body into a clockwork form! You are now immune to many hazards, and your body is more robust against damage!</span>")
 			H.set_species(/datum/species/golem/clockwork/no_scrap)
-	SSshuttle.registerHostileEnvironment(GLOB.ark_of_the_clockwork_justiciar) //no leaving when we need to purge you, heretics
 	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
 	G.grace_period = FALSE //no grace period if we've declared war