From 3f8c04686dfba421799b3c9f4e4de3c7bc5697aa Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Tue, 6 Jan 2015 23:36:26 +0100
Subject: [PATCH] Vox trader changes

---
 code/__HELPERS/game.dm                 | 13 +++++++++++++
 code/game/gamemodes/vox/trade/trade.dm |  6 +++---
 code/game/gamemodes/vox/vox.dm         |  4 ++--
 code/modules/client/preferences.dm     |  4 ++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 9133b2cab7e..fb8cf64f84a 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -351,6 +351,19 @@ proc/isInSight(var/atom/A, var/atom/B)
 						candidates += G.key
 		i++
 	return candidates	
+	
+/proc/get_vox_candidates()
+
+	var/list/candidates = list() //List of candidate KEYS to assume control of the new blob core ~Carn
+	var/i = 0
+	while(candidates.len <= 0 && i < 5)
+		for(var/mob/G in respawnable_list)
+			if( G.client && G.client.prefs.be_special & BE_VOX)
+				if(((G.client.inactivity/10)/60) <= ALIEN_SELECT_AFK_BUFFER + i) // the most active players are more likely to become an alien
+					if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
+						candidates += G.key
+		i++
+	return candidates	
 
 /proc/get_slime_candidates()
 
diff --git a/code/game/gamemodes/vox/trade/trade.dm b/code/game/gamemodes/vox/trade/trade.dm
index c25e9ebb854..38c42dc6fa3 100644
--- a/code/game/gamemodes/vox/trade/trade.dm
+++ b/code/game/gamemodes/vox/trade/trade.dm
@@ -9,9 +9,9 @@ VOX TRADE ROUNDTYPE
 /datum/game_mode/vox/trade
 	name = "trade"
 	config_tag = "trade"
-	required_players = 10
-	required_players_secret = 10
-	required_enemies = 1
+	required_players = 15
+	required_players_secret = 15
+	required_enemies = 3
 	recommended_enemies = 3
 
 	var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
diff --git a/code/game/gamemodes/vox/vox.dm b/code/game/gamemodes/vox/vox.dm
index 243b7b73ab7..16d5a66fddf 100644
--- a/code/game/gamemodes/vox/vox.dm
+++ b/code/game/gamemodes/vox/vox.dm
@@ -94,7 +94,7 @@ datum/objective/vox/heist/loot
 			if(2)
 				target = /obj/machinery/the_singularitygen
 				target_amount = 1
-				loot = "a gravitational generator"
+				loot = "a gravitational singularity generator"
 			if(3)
 				target = /obj/machinery/power/emitter
 				target_amount = 4
@@ -216,7 +216,7 @@ datum/objective/vox/trade/trade
 			if(2)
 				target = /obj/machinery/the_singularitygen
 				target_amount = 1
-				loot = "a gravitational generator"
+				loot = "a gravitational singularity generator"
 			if(3)
 				target = /obj/machinery/power/emitter
 				target_amount = 4
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index fa4cab7aa03..ae5a99d01cb 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -15,11 +15,11 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"cultist" = IS_MODE_COMPILED("cult"),                // 8
 	"plant" = 1,										 // 9
 	"ninja" = "true",									 // 10
-	"vox raider" = IS_MODE_COMPILED("heist"),			 // 11
+	"vox" = IS_MODE_COMPILED("vox/heist") + IS_MODE_COMPILED("vox/trade"), // 11
 	"slime" = 1,                                         // 12
 	"vampire" = IS_MODE_COMPILED("vampire"),			 // 13
 	"mutineer" = IS_MODE_COMPILED("mutiny"),             // 14
-	"blob" = IS_MODE_COMPILED("blob")          		     // 15	
+	"blob" = IS_MODE_COMPILED("blob")         		     // 15	
 )
 
 var/const/MAX_SAVE_SLOTS = 10