Vox Heist port from Bay

code/modules/admin/verbs/one_click_antag.dm

@@ -496,21 +496,38 @@ client/proc/one_click_antag()
 
 	var/mob/living/carbon/human/new_vox = new(spawn_location.loc, "Vox")
 
-	new_vox.gender = pick(MALE, FEMALE)
-	new_vox.h_style = "Short Vox Quills"
-	new_vox.regenerate_icons()
+	var/sounds = rand(2,8)
+	var/i = 0
+	var/newname = ""
 
+	while(i<=sounds)
+		i++
+		newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah"))	
+	
+	new_vox.real_name = capitalize(newname)
+	new_vox.name = new_vox.real_name
 	new_vox.age = rand(12,20)
-
-	new_vox.dna.ready_dna(new_vox) // Creates DNA.
 	new_vox.dna.mutantrace = "vox"
-	new_vox.set_species("Vox") // Actually makes the vox! How about that.
-	new_vox.generate_name()
+	new_vox.set_species("Vox")
+	new_vox.languages = list() // Removing language from chargen.
+	new_vox.flavor_text = ""
 	new_vox.add_language("Vox-pidgin")
-	new_vox.mind_initialize()
-	new_vox.mind.assigned_role = "MODE"
-	new_vox.mind.special_role = "Vox Raider"
-	new_vox.mutations |= M_NOCLONE //Stops the station crew from messing around with their DNA.
+	new_vox.add_language("Galactic Common")
+	new_vox.add_language("Tradeband")
+	new_vox.h_style = "Short Vox Quills"
+	new_vox.f_style = "Shaved"
+
+	for(var/datum/organ/external/limb in new_vox.organs)
+		limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
+
+	//Now apply cortical stack.
+	var/datum/organ/external/E = new_vox.get_organ("head")	
+	var/obj/item/weapon/implant/cortical/I = new(new_vox)
+	I.imp_in = new_vox
+	I.implanted = 1
+	I.part = E
+	E.implants += I
+	cortical_stacks += I
 
 	ticker.mode.traitors += new_vox.mind
 	new_vox.equip_vox_raider()

code/modules/client/preferences.dm

@@ -15,7 +15,7 @@ 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" = IS_MODE_COMPILED("vox/heist") + IS_MODE_COMPILED("vox/trader"),			 // 11
+	"raider" = IS_MODE_COMPILED("heist"),				 // 11
 	"slime" = 1,                                         // 12
 	"vampire" = IS_MODE_COMPILED("vampire"),			 // 13
 	"mutineer" = IS_MODE_COMPILED("mutiny"),             // 14

code/modules/mob/living/carbon/human/death.dm

@@ -112,14 +112,10 @@
 
 	callHook("death", list(src, gibbed))
 
-	//Check for heist mode kill count.
-	if(ticker.mode && ( istype( ticker.mode,/datum/game_mode/vox/heist) || istype( ticker.mode,/datum/game_mode/vox/trade) ) )
-		//Check for last assailant's mutantrace.
-		/*if( LAssailant && ( istype( LAssailant,/mob/living/carbon/human ) ) )
-			var/mob/living/carbon/human/V = LAssailant
-			if (V.dna && (V.dna.mutantrace == "vox"))*/ //Not currently feasible due to terrible LAssailant tracking.
-		//world << "Vox kills: [vox_kills]"
-		vox_kills++ //Bad vox. Shouldn't be killing humans.
+	if(ticker && ticker.mode)
+		if(istype(ticker.mode,/datum/game_mode/heist))
+			vox_kills++ //Bad vox. Shouldn't be killing humans.
+		
 	if(ishuman(LAssailant))
 		var/mob/living/carbon/human/H=LAssailant
 		if(H.mind)

code/modules/mob/living/carbon/species.dm

@@ -443,10 +443,9 @@
 	affected.implants += I
 	I.part = affected
 
-	if(ticker.mode && ( istype( ticker.mode,/datum/game_mode/vox/heist ) ) )
-		var/datum/game_mode/vox/heist/M = ticker.mode
+	if(ticker.mode && ( istype( ticker.mode,/datum/game_mode/heist ) ) )
+		var/datum/game_mode/heist/M = ticker.mode
 		M.cortical_stacks += I
-		M.raiders[H.mind] = I
 
 
 

code/modules/shuttles/antagonist.dm

@@ -1,6 +1,6 @@
 /obj/machinery/computer/shuttle_control/multi/vox
 	name = "skipjack control console"
-	req_access = list(access_syndicate)
+	req_access = list(access_vox)
 	shuttle_tag = "Vox Skipjack"
 	
 /obj/machinery/computer/shuttle_control/multi/vox/attack_ai(user as mob)

code/modules/shuttles/shuttles_multi.dm

@@ -3,6 +3,7 @@
 
 	var/cloaked = 1
 	var/at_origin = 1
+	var/returned_home = 0
 	var/move_time = 240
 	var/cooldown = 20
 	var/last_move = 0	//the time at which we last moved
@@ -21,9 +22,11 @@
 	..()
 	if(origin) last_departed = origin
 
-/datum/shuttle/multi_shuttle/move()
+/datum/shuttle/multi_shuttle/move(var/area/origin, var/area/destination)
 	..()
 	last_move = world.time
+	if (destination == src.origin)
+		returned_home = 1
 
 /datum/shuttle/multi_shuttle/proc/announce_departure()