From 59e7559876caa28a292e77c1b88ab7fa5fdb910c Mon Sep 17 00:00:00 2001 From: Ashe Higgs Date: Tue, 26 Sep 2017 20:58:45 -0400 Subject: [PATCH] Clockwork cult rework: Post-merge micro-patch (#31044) * Now that we're merged, we can do polish stuff * each day before bed I honor ratvar --- .../game/gamemodes/clock_cult/clock_items/clockwork_slab.dm | 6 +++--- .../clock_structures/ark_of_the_clockwork_justicar.dm | 2 +- .../modules/mob/living/carbon/human/species_types/golems.dm | 2 ++ 3 files changed, 6 insertions(+), 4 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 0ec876dc925..a9c241b2c3f 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm @@ -433,7 +433,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."), \ @@ -443,8 +443,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 783ed0a5aeb..2d66739b4ed 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 @@ -75,10 +75,10 @@ /obj/structure/destructible/clockwork/massive/celestial_gateway/Destroy() STOP_PROCESSING(SSprocessing, src) + SSshuttle.clearHostileEnvironment(src) if(!purpose_fulfilled && istype(SSticker.mode, /datum/game_mode/clockwork_cult)) hierophant_message("The Ark has fallen!") sound_to_playing_players(null, channel = CHANNEL_JUSTICAR_ARK) - SSshuttle.clearHostileEnvironment(src) SSticker.force_ending = TRUE //rip if(glow) qdel(glow) 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 6629e1e4b2f..dc2ca8d5b44 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -632,6 +632,8 @@ /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