Merge pull request #4554 from Ikarrus/deathsquadnames

Deathsquad names will pull from the deathsquad name list
This commit is contained in:
Alex
2014-08-24 13:08:45 +01:00
+2 -11
View File
@@ -355,20 +355,11 @@ client/proc/one_click_antag()
var/mob/living/carbon/human/Commando = new(spawnloc)
chosen_candidate.client.prefs.copy_to(Commando)
ready_dna(Commando)
switch(numagents)
if(1)
Commando.real_name = "Officer Alpha"
if(2)
Commando.real_name = "Trooper Beta"
if(3)
Commando.real_name = "Trooper Charlie"
if(4)
Commando.real_name = "Trooper Delta"
if(5)
Commando.real_name = "Trooper Echo"
if(numagents == 1) //If Squad Leader
Commando.real_name = "Officer [pick(commando_names)]"
equip_deathsquad(Commando, 1)
else
Commando.real_name = "Trooper [pick(commando_names)]"
equip_deathsquad(Commando)
Commando.key = chosen_candidate.key
Commando.mind.assigned_role = "Death Commando"