From 2c7bb6c48ddab94b87941c01239141372315f802 Mon Sep 17 00:00:00 2001
From: DJSnapshot <trevornaze@gmail.com>
Date: Thu, 24 Jul 2014 17:01:52 -0700
Subject: [PATCH] Remerged Siik'maas and siik'tajr together as per the tajara
 maintainer's request.

---
 code/modules/client/preferences.dm        |  9 +--------
 code/modules/mob/language.dm              | 14 +-------------
 code/modules/mob/living/carbon/species.dm |  3 +--
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index c05a0d9839..7bd69137d7 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -962,14 +962,7 @@ datum/preferences
 								var/datum/language/lang = all_languages[L]
 								if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED ))||(S && (L in S.secondary_langs))))
 									new_languages += lang
-									
-									//Apparently there's some PHP script that needs to be updated in order to give people whitelist languages.
-									//This workaround should be removed once that has been properly updated
-									if (lang.name == "Siik'maas")
-										new_languages |= all_languages["Siik'tajr"]
-									if (lang.name == "Siik'tajr")
-										new_languages |= all_languages["Siik'maas"]
-									
+
 									languages_available = 1
 
 							if(!(languages_available))
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 4bd6627122..d54e1a90e7 100755
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -21,25 +21,13 @@
 	flags = WHITELISTED
 
 /datum/language/tajaran
-	name = "Siik'maas"
+	name = "Siik'tajr"
 	desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran."
 	speech_verb = "mrowls"
 	colour = "tajaran"
 	key = "j"
 	flags = WHITELISTED
 
-/datum/language/tajaran_sign
-	name = "Siik'tajr"
-	desc = "An expressive language that combines yowls and chirps with posture, tail and ears. Spoken by many Tajaran."
-	speech_verb = "mrowls"
-	colour = "tajaran_signlang"
-	key = "y"		//only "dfpqxyz" left.
-
-	//need to find a way to resolve possesive macros
-	signlang_verb = list("flicks their left ear", "flicks their right ear", "swivels their ears", "twitches their tail", "curls the end of their tail", "arches their tail", "wiggles the end of their tail", "waves their tail about", "holds up a claw", "gestures with their left hand", "gestures with their right hand", "gestures with their tail", "gestures with their ears")
-
-	flags = WHITELISTED | NONVERBAL
-
 /datum/language/skrell
 	name = "Skrellian"
 	desc = "A melodic and complex language spoken by the Skrell of Qerrbalak. Some of the notes are inaudible to humans."
diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm
index b67f78c2e9..4413390538 100644
--- a/code/modules/mob/living/carbon/species.dm
+++ b/code/modules/mob/living/carbon/species.dm
@@ -146,8 +146,7 @@
 	name = "Tajaran"
 	icobase = 'icons/mob/human_races/r_tajaran.dmi'
 	deform = 'icons/mob/human_races/r_def_tajaran.dmi'
-	language = "Siik'maas"
-	secondary_langs = list("Siik'tajr")
+	language = "Siik'tajr"
 	tail = "tajtail"
 	unarmed_type = /datum/unarmed_attack/claws
 	darksight = 8