diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index e37ac58fd96..cc7e6a41017 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -441,10 +441,10 @@ client/proc/one_click_antag() var/leader_chosen = 0 //when the leader is chosen. The last person spawned. - //Generates a list of candidates from active ghosts. The admin picks which players to respawn as the vox. + //Generates a list of candidates from active ghosts. for(var/mob/dead/observer/G in player_list) spawn(0) - if(is_alien_whitelisted(src, "Vox") || !config.usealienwhitelist) + if(is_alien_whitelisted(G, "Vox") || !config.usealienwhitelist) switch(alert(G,"Do you wish to be considered for a vox raiding party arriving on the station?","Please answer in 30 seconds!","Yes","No")) if("Yes") if((world.time-time_passed)>300)//If more than 30 game seconds passed. @@ -462,7 +462,7 @@ client/proc/one_click_antag() candidates.Remove(G) if(candidates.len) - var/max_raiders = 6 + var/max_raiders = 4 var/raiders = max_raiders //Spawns vox raiders and equips them. for (var/obj/effect/landmark/L in world) @@ -507,6 +507,7 @@ client/proc/one_click_antag() i++ newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah")) + new_vox.vox_talk_understand = 1 new_vox.real_name = capitalize(newname) new_vox.name = new_vox.real_name new_vox.age = rand(12,20)