Merge pull request #1159 from Citadel-Station-13/upstream-merge-27600

[MIRROR] Fixes clock cultists not getting their "objective"
This commit is contained in:
LetterJay
2017-05-25 09:38:52 -05:00
committed by GitHub
2 changed files with 2 additions and 11 deletions
@@ -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, "<b>This is Ratvar's will:</b> [CLOCKCULT_OBJECTIVE]")
M.memory += "<b>Ratvar's will:</b> [CLOCKCULT_OBJECTIVE]<br>"
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