Clockwork cult rework: Post-merge micro-patch

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

@@ -647,7 +647,7 @@
 			data["scripture"] += list(temp_info)
 	data["recollection"] = recollecting
 	if(recollecting)
-		data["recollection_categories"] = list(\
+		data["recollection_categories"] = GLOB.ratvar_awakens ? list() : list(\
 		list("name" = "Getting Started", "desc" = "First-time servant? Read this first."), \
 		list("name" = "Basics", "desc" = "A primer on how to play as a servant."), \
 		list("name" = "Terminology", "desc" = "Common acronyms, words, and terms."), \
@@ -657,8 +657,8 @@
 		list("name" = "Conversion", "desc" = "Converting the crew, cyborgs, and very walls to your cause."), \
 		)
 		data["rec_text"] = recollection()
-		data["rec_section"] = get_recollection_text(recollection_category)
-		data["rec_binds"] = get_recollection_quickbinds()
+		data["rec_section"] = GLOB.ratvar_awakens ? "" : get_recollection_text(recollection_category)
+		data["rec_binds"] = GLOB.ratvar_awakens ? "" : get_recollection_quickbinds()
 	return data
 
 /obj/item/clockwork/slab/ui_act(action, params)

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

@@ -65,6 +65,7 @@
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/Destroy()
 	STOP_PROCESSING(SSprocessing, src)
+<<<<<<< HEAD
 	if(!purpose_fulfilled)
 		var/area/gate_area = get_area(src)
 		hierophant_message("<span class='large_brass'><b>An Ark of the Clockwork Justicar has fallen at [gate_area.map_name]!</b></span>")
@@ -73,6 +74,13 @@
 	SSshuttle.clearHostileEnvironment(src)
 	if(!was_stranded && !purpose_fulfilled)
 		priority_announce("Massive energy anomaly no longer on short-range scanners.","Anomaly Alert")
+=======
+	SSshuttle.clearHostileEnvironment(src)
+	if(!purpose_fulfilled && istype(SSticker.mode, /datum/game_mode/clockwork_cult))
+		hierophant_message("<span class='bold large_brass'>The Ark has fallen!</span>")
+		sound_to_playing_players(null, channel = CHANNEL_JUSTICAR_ARK)
+		SSticker.force_ending = TRUE //rip
+>>>>>>> 59e7559... Clockwork cult rework: Post-merge micro-patch (#31044)
 	if(glow)
 		qdel(glow)
 		glow = null