From 862ed0b4fdd8715bf4734930767b5735ad7bdc91 Mon Sep 17 00:00:00 2001
From: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date: Thu, 3 Oct 2019 12:50:37 -0500
Subject: [PATCH] Actually fixes cultists getting multiple summon objectives
 (#12485)

---
 code/game/gamemodes/cult/cult.dm            | 4 ++--
 code/game/gamemodes/cult/cult_objectives.dm | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 9442c319dcb..1cc55d99f0c 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -126,8 +126,8 @@ var/global/list/all_cults = list()
 	..()
 
 
-/datum/game_mode/cult/proc/memorize_cult_objectives(var/datum/mind/cult_mind)
-	for(var/obj_count = 1,obj_count <= objectives.len,obj_count++)
+/datum/game_mode/cult/proc/memorize_cult_objectives(datum/mind/cult_mind)
+	for(var/obj_count in 1 to objectives.len)
 		var/explanation
 		switch(objectives[obj_count])
 			if("survive")
diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm
index c2f18da1289..83ae3c2f1b7 100644
--- a/code/game/gamemodes/cult/cult_objectives.dm
+++ b/code/game/gamemodes/cult/cult_objectives.dm
@@ -42,6 +42,8 @@
 	additional_phase()
 
 /datum/game_mode/cult/proc/additional_phase()
+	if(objectives.Find("eldergod") || objectives.Find("slaughter"))
+		return
 	current_objective++
 
 	message_admins("Picking a new Cult objective.")
@@ -62,6 +64,7 @@
 		message_admins("There are less than 4 cultists! [SSticker.cultdat.entity_name] objective unlocked.")
 		log_admin("There are less than 4 cultists! [SSticker.cultdat.entity_name] objective unlocked.")
 		gtfo_phase()
+		return
 
 	if(!sacrificed.len && (new_objective != "sacrifice"))
 		sacrifice_target = null