Merge pull request #2954 from Citadel-Station-13/upstream-merge-31044

[MIRROR] Clockwork cult rework: Post-merge micro-patch
This commit is contained in:
LetterJay
2017-09-30 15:16:55 -04:00
committed by GitHub
3 changed files with 7 additions and 7 deletions
@@ -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)
@@ -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("<span class='bold large_brass'>The Ark has fallen!</span>")
sound_to_playing_players(null, channel = CHANNEL_JUSTICAR_ARK)
SSshuttle.clearHostileEnvironment(src)
SSticker.force_ending = TRUE //rip
if(glow)
qdel(glow)
@@ -586,7 +586,6 @@
H.adjustFireLoss(-4)
H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
/datum/species/golem/clockwork
name = "Clockwork Golem"
id = "clockwork golem"
@@ -632,11 +631,12 @@
/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
/datum/species/golem/cloth
name = "Cloth Golem"
id = "cloth golem"