From a43f9ec7be659659689c335f08055d81fdb0c101 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 10 Mar 2020 19:57:30 -0700
Subject: [PATCH] refactor time fuck you

---
 code/modules/antagonists/clockcult/clockcult.dm | 4 +++-
 code/modules/antagonists/cult/cult.dm           | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm
index 8ef8d2e11c..a6840f3d85 100644
--- a/code/modules/antagonists/clockcult/clockcult.dm
+++ b/code/modules/antagonists/clockcult/clockcult.dm
@@ -5,7 +5,7 @@
 	antagpanel_category = "Clockcult"
 	job_rank = ROLE_SERVANT_OF_RATVAR
 	antag_moodlet = /datum/mood_event/cult
-	var/datum/action/innate/hierophant/hierophant_network = new()
+	var/datum/action/innate/hierophant/hierophant_network = new
 	var/datum/team/clockcult/clock_team
 	var/make_team = TRUE //This should be only false for tutorial scarabs
 	var/neutered = FALSE			//can not use round ending, gibbing, converting, or similar things with unmatched round impact
@@ -22,6 +22,8 @@
 /datum/antagonist/clockcult/neutered/traitor
 	ignore_eligibility_check = TRUE
 	ignore_holy_water = TRUE
+	show_in_roundend = FALSE
+	make_team = FALSE
 
 /datum/antagonist/clockcult/Destroy()
 	qdel(hierophant_network)
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
index 5ae1ea0711..2eb89a66e9 100644
--- a/code/modules/antagonists/cult/cult.dm
+++ b/code/modules/antagonists/cult/cult.dm
@@ -10,8 +10,9 @@
 	var/datum/action/innate/cult/blood_magic/magic = new
 	job_rank = ROLE_CULTIST
 	var/ignore_implant = FALSE
+	var/make_team = TRUE
 	var/give_equipment = FALSE
-	var/datum/team/cult/cult_team
+	var/datum/team/cult/_cult_team
 	var/neutered = FALSE			//can not use round ending, gibbing, converting, or similar things with unmatched round impact
 	var/ignore_eligibility_checks = FALSE
 	var/ignore_holy_water = FALSE
@@ -22,12 +23,14 @@
 /datum/antagonist/cult/neutered/traitor
 	ignore_eligibility_checks = TRUE
 	ignore_holy_water = TRUE
+	show_in_roundend = FALSE
+	make_team = FALSE
 
 /datum/antagonist/cult/get_team()
 	return cult_team
 
 /datum/antagonist/cult/create_team(datum/team/cult/new_team)
-	if(!new_team)
+	if(!new_team && make_team)
 		//todo remove this and allow admin buttons to create more than one cult
 		for(var/datum/antagonist/cult/H in GLOB.antagonists)
 			if(!H.owner)
@@ -38,7 +41,7 @@
 		cult_team = new /datum/team/cult
 		cult_team.setup_objectives()
 		return
-	if(!istype(new_team))
+	if(make_team && !istype(new_team))
 		stack_trace("Wrong team type passed to [type] initialization.")
 	cult_team = new_team