From 39f170b4b3534c5d17bc9988ed41f31f01bf3db0 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Tue, 31 Jan 2012 02:30:54 -0700
Subject: [PATCH] Final updates: Fingerprints done. A mob's be_syndicate is a
 direct copy of their preferences.

---
 code/WorkInProgress/detective_work.dm           | 2 +-
 code/game/gamemodes/autotraitor/autotraitor.dm  | 3 ---
 code/game/gamemodes/revolution/rp-revolution.dm | 2 +-
 code/modules/mob/new_player/new_player.dm       | 1 -
 code/modules/mob/new_player/preferences.dm      | 1 +
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/code/WorkInProgress/detective_work.dm b/code/WorkInProgress/detective_work.dm
index a8c0b8dbea6..da6d6e92881 100644
--- a/code/WorkInProgress/detective_work.dm
+++ b/code/WorkInProgress/detective_work.dm
@@ -176,7 +176,7 @@ obj/machinery/computer/forensic_scanning
 						misc[i] = sum_list	//Store it!
 						break	//We found it, we're done here.
 			if(!merged)	//Nope!  Guess we have to add it!
-				var/list/templist[4]
+				var/list/templist[3]
 				templist[1] = A
 				templist[2] = A.suit_fibers
 				templist[3] = A.blood_DNA
diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm
index e4d4dc2bf29..f0ecb88ddca 100644
--- a/code/game/gamemodes/autotraitor/autotraitor.dm
+++ b/code/game/gamemodes/autotraitor/autotraitor.dm
@@ -59,9 +59,6 @@
 
 /datum/game_mode/traitor/autotraitor/post_setup()
 	..()
-	for(var/mob/T in world)
-		if(T.mind in possible_traitors)
-			T.be_syndicate = 1
 	abandon_allowed = 1
 	traitorcheckloop()
 
diff --git a/code/game/gamemodes/revolution/rp-revolution.dm b/code/game/gamemodes/revolution/rp-revolution.dm
index ce0ade235c9..c63637a9c8d 100644
--- a/code/game/gamemodes/revolution/rp-revolution.dm
+++ b/code/game/gamemodes/revolution/rp-revolution.dm
@@ -183,7 +183,7 @@
 
 	for(var/mob/living/carbon/human/player in world)
 		if(player.client)
-			if(player.be_syndicate)
+			if(player.be_syndicate & BE_REV)
 				candidates += player.mind
 
 	if(candidates.len < 1)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 87c6f98191a..1c1eee6d2a2 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -354,7 +354,6 @@
 	proc/create_character()
 		spawning = 1
 		var/mob/living/carbon/human/new_character = new(loc)
-		new_character.be_syndicate = src.preferences.be_special
 
 		close_spawn_windows()
 
diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index a3e5b100142..4f51f45141f 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -670,6 +670,7 @@ datum/preferences
 
 		character.age = age
 		character.dna.b_type = b_type
+		character.be_syndicate = be_special
 
 		character.r_eyes = r_eyes
 		character.g_eyes = g_eyes