From cd0428f4bba54ef6498e1d79b2188abb3410ec0f Mon Sep 17 00:00:00 2001
From: "VivianFoxfoot@gmail.com"
 <VivianFoxfoot@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 15 Mar 2012 22:31:23 +0000
Subject: [PATCH] Fixes a bug where the tensioner spawning players would fail
 in less than ideal conditions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3303 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/datums/helper_datums/tension.dm | 22 +++++++++++++++++++---
 code/datums/mind.dm                  |  7 ++++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/code/datums/helper_datums/tension.dm b/code/datums/helper_datums/tension.dm
index 8cbb625c43e..3d8312b50cc 100644
--- a/code/datums/helper_datums/tension.dm
+++ b/code/datums/helper_datums/tension.dm
@@ -356,8 +356,13 @@ var/global/datum/tension/tension_master
 
 		spawn(300)
 			if(candidates.len)
-				theghost = pick(candidates)
+				while(!theghost && candidates.len)
+					theghost = pick(candidates)
+					candidates.Remove(theghost)
+				if(!theghost)
+					return 0
 				var/mob/living/carbon/human/new_character=makeBody(theghost)
+				del(theghost)
 				new_character.mind.make_Wizard()
 
 
@@ -420,8 +425,13 @@ var/global/datum/tension/tension_master
 				syndicate_begin()
 
 				for(var/i = 0, i<numagents,i++)
-					theghost = pick(candidates)
+					while(!theghost && candidates.len)
+						theghost = pick(candidates)
+						candidates.Remove(theghost)
+					if(!theghost)
+						break
 					var/mob/living/carbon/human/new_character=makeBody(theghost)
+					del(theghost)
 					new_character.mind.make_Nuke()
 
 
@@ -524,8 +534,14 @@ var/global/datum/tension/tension_master
 
 						var/mob/living/carbon/human/new_syndicate_commando = create_syndicate_death_commando(L, syndicate_leader_selected)
 
-						if(candidates.len)
+						while(!theghost && candidates.len)
 							theghost = pick(candidates)
+							candidates.Remove(theghost)
+
+						if(!theghost)
+							del(new_syndicate_commando)
+							break
+
 							new_syndicate_commando.mind.key = theghost.key//For mind stuff.
 							new_syndicate_commando.key = theghost.key
 							new_syndicate_commando.internal = new_syndicate_commando.s_store
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 9d93261917e..d2513719ecd 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -954,7 +954,12 @@ datum/mind
 			special_role = "Wizard"
 			assigned_role = "MODE"
 			//ticker.mode.learn_basic_spells(current)
-			current.loc = pick(wizardstart)
+			if(!wizardstart.len)
+				current.loc = pick(latejoin)
+				current << "HOT INSERTION, GO GO GO"
+			else
+				current.loc = pick(wizardstart)
+
 			ticker.mode.equip_wizard(current)
 			for(var/obj/item/weapon/spellbook/S in current.contents)
 				S.op = 0