Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev

This commit is contained in:
Mloc-Argent
2013-08-05 22:53:25 +01:00
22 changed files with 149 additions and 103 deletions
+3 -2
View File
@@ -507,13 +507,14 @@ client/proc/one_click_antag()
i++
newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah"))
new_vox.languages += new /datum/language/vox
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.set_species(new /datum/species/vox) // Actually makes the vox! How about that.
new_vox.dna.mutantrace = "vox"
new_vox.set_species("Vox") // Actually makes the vox! How about that.
new_vox.add_language("Vox-pidgin")
new_vox.mind_initialize()
new_vox.mind.assigned_role = "MODE"
new_vox.mind.special_role = "Vox Raider"