From b42e5c8721ea4f1a8451ce3b90ea1e92158f6b74 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 24 May 2017 16:15:47 -0500 Subject: [PATCH] Fixes clock cultists not getting their "objective" --- code/datums/antagonists/datum_clockcult.dm | 5 ++--- code/game/gamemodes/clock_cult/clock_cult.dm | 8 -------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm index b8dfa00f23..6c8b83daa4 100644 --- a/code/datums/antagonists/datum_clockcult.dm +++ b/code/datums/antagonists/datum_clockcult.dm @@ -55,9 +55,8 @@ else if(isbrain(current) || isclockmob(current)) to_chat(current, "You can communicate with other servants by using the Hierophant Network action button in the upper left.") ..() - if(istype(SSticker.mode, /datum/game_mode/clockwork_cult)) - var/datum/game_mode/clockwork_cult/C = SSticker.mode - C.present_tasks(owner) //Memorize the objectives + to_chat(current, "This is Ratvar's will: [CLOCKCULT_OBJECTIVE]") + owner.memory += "Ratvar's will: [CLOCKCULT_OBJECTIVE]
" //Memorize the objectives /datum/antagonist/clockcult/apply_innate_effects(mob/living/mob_override) . = ..() diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 531cc873f0..132c834f10 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -171,14 +171,6 @@ Credit where due: return TRUE return FALSE -/datum/game_mode/clockwork_cult/proc/present_tasks(mob/living/L) //Memorizes and displays the clockwork cult's objective - if(!L || !istype(L) || !L.mind) - return 0 - var/datum/mind/M = L.mind - to_chat(M.current, "This is Ratvar's will: [CLOCKCULT_OBJECTIVE]") - M.memory += "Ratvar's will: [CLOCKCULT_OBJECTIVE]
" - return 1 - /datum/game_mode/clockwork_cult/proc/check_clockwork_victory() if(GLOB.clockwork_gateway_activated) SSticker.news_report = CLOCK_PROSELYTIZATION //failure, technically, but we have the station