From 193d929e4b7fdd8ebf558ade39ad63b8a8fac303 Mon Sep 17 00:00:00 2001
From: Ashe Higgs <ashe.f.higgs@gmail.com>
Date: Tue, 26 Sep 2017 20:58:45 -0400
Subject: [PATCH] Clockwork cult rework: Post-merge micro-patch

---
 .../clock_cult/clock_items/clockwork_slab.dm  |  6 +-
 .../ark_of_the_clockwork_justicar.dm          |  8 +++
 .../carbon/human/species_types/golems.dm      | 56 +++++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
index eecfec7780..62410c4831 100644
--- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
+++ b/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)
diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
index b684b854c1..f3ceae7020 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
+++ b/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
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 5df45e2755..b0d22845b1 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -586,6 +586,62 @@
 		H.adjustFireLoss(-4)
 		H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
 
+<<<<<<< HEAD
+=======
+
+/datum/species/golem/clockwork
+	name = "Clockwork Golem"
+	id = "clockwork golem"
+	say_mod = "clicks"
+	limbs_id = "clockgolem"
+	info_text = "<span class='bold alloy'>As a </span><span class='bold brass'>clockwork golem</span><span class='bold alloy'>, you are faster than \
+	other types of golem (being a machine), and are immune to electric shocks.</span>"
+	species_traits = list(NO_UNDERWEAR, NOTRANSSTING, NOBREATH, NOZOMBIE, VIRUSIMMUNE, RADIMMUNE, NOBLOOD, RESISTCOLD, RESISTPRESSURE)
+	armor = 40 //Reinforced, but also slim to allow for fast movement
+	attack_verb = "smash"
+	attack_sound = 'sound/magic/clockwork/anima_fragment_attack.ogg'
+	sexes = FALSE
+	speedmod = 0
+	siemens_coeff = 0
+	damage_overlay_type = "synth"
+	prefix = "Clockwork"
+	var/has_corpse
+
+/datum/species/golem/clockwork/on_species_gain(mob/living/carbon/human/H)
+	. = ..()
+	H.faction |= "ratvar"
+
+/datum/species/golem/clockwork/on_species_loss(mob/living/carbon/human/H)
+	if(!is_servant_of_ratvar(H))
+		H.faction -= "ratvar"
+	. = ..()
+
+/datum/species/golem/clockwork/get_spans()
+	return SPAN_ROBOT //beep
+
+/datum/species/golem/clockwork/spec_death(gibbed, mob/living/carbon/human/H)
+	gibbed = !has_corpse ? FALSE : gibbed
+	. = ..()
+	if(!has_corpse)
+		var/turf/T = get_turf(H)
+		H.visible_message("<span class='warning'>[H]'s exoskeleton shatters, collapsing into a heap of scrap!</span>")
+		playsound(H, 'sound/magic/clockwork/anima_fragment_death.ogg', 50, TRUE)
+		for(var/i in 1 to rand(3, 5))
+			new/obj/item/clockwork/alloy_shards/small(T)
+		new/obj/item/clockwork/alloy_shards/clockgolem_remains(T)
+		qdel(H)
+
+/datum/species/golem/clockwork/no_scrap //These golems are created through the herald's beacon and leave normal corpses on death.
+	id = "clockwork golem servant"
+	armor = 15 //Balance reasons make this armor weak
+	no_equip = list()
+	nojumpsuit = FALSE
+	has_corpse = TRUE
+	blacklisted = TRUE
+	dangerous_existence = TRUE
+
+
+>>>>>>> 59e7559... Clockwork cult rework: Post-merge micro-patch (#31044)
 /datum/species/golem/cloth
 	name = "Cloth Golem"
 	id = "cloth golem"