From fed27ea0855f0c735b97541e6e53dde2c540c9f5 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Wed, 31 Jul 2013 08:22:18 -0700
Subject: [PATCH] Widespread language tweaks.

---
 code/game/gamemodes/heist/heist.dm            | 2 +-
 code/modules/admin/verbs/one_click_antag.dm   | 2 +-
 code/modules/admin/verbs/vox_raiders.dm       | 3 ---
 code/modules/mob/living/carbon/human/human.dm | 8 ++++----
 code/modules/mob/living/simple_animal/vox.dm  | 1 -
 code/modules/mob/mob_defines.dm               | 4 ----
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm
index 6daacd3ffe4..02e1a558ace 100644
--- a/code/game/gamemodes/heist/heist.dm
+++ b/code/game/gamemodes/heist/heist.dm
@@ -95,7 +95,7 @@ var/global/vox_kills = 0 //Used to check the Inviolate.
 
 		var/mob/living/carbon/human/vox = raider.current
 
-		vox.vox_talk_understand = 1
+		vox.languages += new /datum/language/vox
 		vox.real_name = capitalize(newname)
 		vox.name = vox.real_name
 		vox.age = rand(12,20)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 72e22b1c824..cfeb8fe4dcd 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -507,7 +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.languages += new /datum/language/vox
 	new_vox.real_name = capitalize(newname)
 	new_vox.name = new_vox.real_name
 	new_vox.age = rand(12,20)
diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm
index d226500fa8d..65a0f65ad2c 100644
--- a/code/modules/admin/verbs/vox_raiders.dm
+++ b/code/modules/admin/verbs/vox_raiders.dm
@@ -35,9 +35,6 @@ var/global/vox_tick = 1
 			equip_to_slot_or_del(new /obj/item/weapon/storage/box/emps(src), slot_l_store)
 			equip_to_slot_or_del(new /obj/item/device/multitool(src), slot_l_hand)
 
-			var/obj/item/weapon/storage/pneumatic/W = new(src)
-			W.tank = new /obj/item/weapon/tank/nitrogen(W)
-			equip_to_slot_or_del(W, slot_r_hand)
 
 		if(3) // Vox saboteur!
 			equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/carapace(src), slot_wear_suit)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index c18accb00a7..4bd21ddc406 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -850,13 +850,13 @@
 /mob/living/carbon/proc/update_mutantrace_languages()
 	if(src.dna)
 		if(src.dna.mutantrace == "lizard")
-			src.soghun_talk_understand = 1
+			src.languages += new /datum/language/unathi
 		else if(src.dna.mutantrace == "skrell")
-			src.skrell_talk_understand = 1
+			src.languages += new /datum/language/skrell
 		else if(src.dna.mutantrace == "tajaran")
-			src.tajaran_talk_understand = 1
+			src.languages += new /datum/language/tajaran
 		else if(src.dna.mutantrace == "vox")
-			src.vox_talk_understand = 1
+			src.languages += new /datum/language/vox
 
 /mob/living/carbon/human/proc/play_xylophone()
 	if(!src.xylophone)
diff --git a/code/modules/mob/living/simple_animal/vox.dm b/code/modules/mob/living/simple_animal/vox.dm
index 66d580c0d93..30f3ff19a63 100644
--- a/code/modules/mob/living/simple_animal/vox.dm
+++ b/code/modules/mob/living/simple_animal/vox.dm
@@ -18,7 +18,6 @@
 	attack_sound = 'sound/weapons/bladeslice.ogg'
 	status_flags = 0
 	universal_speak = 1
-	vox_talk_understand = 1
 
 	var/armour = null
 	var/amp = null
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 8e68bb0c8f1..6cbd091c0c1 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -211,10 +211,6 @@
 	var/universal_speak = 0 // Set to 1 to enable the mob to speak to everyone -- TLE
 	var/robot_talk_understand = 0
 	var/alien_talk_understand = 0
-	var/tajaran_talk_understand = 0
-	var/soghun_talk_understand = 0
-	var/skrell_talk_understand = 0
-	var/vox_talk_understand = 0
 
 	var/has_limbs = 1 //Whether this mob have any limbs he can move with
 	var/can_stand = 1 //Whether this mob have ability to stand