From af2d5e4a26ee627eb3146d9203c369c165b974b0 Mon Sep 17 00:00:00 2001
From: MoreRobustThanYou <MoreRobustThanYou@users.noreply.github.com>
Date: Mon, 9 Oct 2017 20:01:45 -0400
Subject: [PATCH] Removes a spawn from traitor code

---
 code/game/gamemodes/traitor/traitor.dm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 9881c49b68..71a4b8a25b 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -60,13 +60,12 @@
 
 /datum/game_mode/traitor/post_setup()
 	for(var/datum/mind/traitor in pre_traitors)
-		spawn(rand(10,100))
-			traitor.add_antag_datum(antag_datum)
+		addtimer(CALLBACK(traitor, /datum/mind.proc/add_antag_datum, antag_datum), rand(10,100))
 	if(!exchange_blue)
 		exchange_blue = -1 //Block latejoiners from getting exchange objectives
 	modePlayer += traitors
 	..()
-	return 1
+	return TRUE
 
 /datum/game_mode/traitor/make_antag_chance(mob/living/carbon/human/character) //Assigns traitor to latejoiners
 	var/tsc = CONFIG_GET(number/traitor_scaling_coeff)
@@ -94,17 +93,17 @@
 	if(traitors.len)
 		var/text = "<br><font size=3><b>The [traitor_name]s were:</b></font>"
 		for(var/datum/mind/traitor in traitors)
-			var/traitorwin = 1
+			var/traitorwin = TRUE
 
 			text += printplayer(traitor)
 
 			var/TC_uses = 0
-			var/uplink_true = 0
+			var/uplink_true = FALSE
 			var/purchases = ""
 			for(var/obj/item/device/uplink/H in GLOB.uplinks)
 				if(H && H.owner && H.owner == traitor.key)
 					TC_uses += H.spent_telecrystals
-					uplink_true = 1
+					uplink_true = TRUE
 					purchases += H.purchase_log
 
 			var/objectives = ""
@@ -119,6 +118,7 @@
 							objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>"
 							SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
 					else
+<<<<<<< HEAD
 						if(objective.check_completion())
 							objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
 							SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
@@ -126,6 +126,11 @@
 							objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
 							SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
 							traitorwin = 0
+=======
+						objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
+						SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
+						traitorwin = FALSE
+>>>>>>> b9e981a... Removes a spawn from traitor code (#31465)
 					count++
 
 			if(uplink_true)
@@ -156,7 +161,7 @@
 		<b>The code responses were:</b> <font color='red'>[GLOB.syndicate_code_response]</font><br>"
 		to_chat(world, text)
 
-	return 1
+	return TRUE
 
 /datum/game_mode/traitor/generate_report()
 	return "Although more specific threats are commonplace, you should always remain vigilant for Syndicate agents aboard your station. Syndicate communications have implied that many \