diff --git a/code/__DEFINES/languages/legacy.dm b/code/__DEFINES/languages/legacy.dm index b2818c187e5..958cebf5e8a 100644 --- a/code/__DEFINES/languages/legacy.dm +++ b/code/__DEFINES/languages/legacy.dm @@ -2,7 +2,6 @@ #define LANGUAGE_ADHERENT "Vibrant" #define LANGUAGE_AKHANI "Akhani" #define LANGUAGE_AKULA "Olelo Mano" -#define LANGUAGE_ALAI "Alai" #define LANGUAGE_BIRDSONG "Birdsong" #define LANGUAGE_BONES "Echorus" #define LANGUAGE_CANILUNZT "Canilunzt" @@ -28,7 +27,8 @@ #define LANGUAGE_SCHECHI "Schechi" #define LANGUAGE_SHADEKIN "Shadekin Empathy" #define LANGUAGE_SIGN "Sign Language" -#define LANGUAGE_SIIK "Siik" +#define LANGUAGE_SIIK "Siik'maas" +#define LANGUAGE_SIIK_TAJR "Siik'tajr" #define LANGUAGE_SKRELLIAN "Common Skrellian" #define LANGUAGE_SKRELLIANFAR "High Skrellian" #define LANGUAGE_SLAVIC "Pan-Slavic" diff --git a/code/modules/language/languages/species/tajaran.dm b/code/modules/language/languages/species/tajaran.dm index 64b70f7496d..ea3dcc4e196 100644 --- a/code/modules/language/languages/species/tajaran.dm +++ b/code/modules/language/languages/species/tajaran.dm @@ -2,7 +2,7 @@ id = LANGUAGE_ID_TAJARAN name = LANGUAGE_SIIK translation_class = TRANSLATION_CLASS_DEFAULT_CORE_RACE - desc = "The most prevalant language of Meralar, composed of expressive yowls and chirps. Native to the Tajaran." + desc = "The traditionally employed tongue of Adhomai, comprised of expressive yowls and chirps. Native to the Tajara." speech_verb = "mrowls" ask_verb = "mrowls" exclaim_verb = "yowls" @@ -12,7 +12,7 @@ "mi","jri","dynh","manq","rhe","zar","rrhaz","kal","chur","eech","thaa","dra","jurl","mah","sanu","dra","ii'r", "ka","aasi","far","wa","baq","ara","qara","zir","saam","mak","hrar","nja","rir","khan","jun","dar","rik","kah", "hal","ket","jurl","mah","tul","cresh","azu","ragh","mro","mra","mrro","mrra") - shorthand = "TAJ" + shorthand = "MAAS" /datum/language/tajaran/get_random_name(var/gender) var/new_name = ..(gender,1) @@ -26,7 +26,7 @@ id = LANGUAGE_ID_TAJARAN_ALT name = LANGUAGE_AKHANI translation_class = TRANSLATION_CLASS_DEFAULT_CORE_RACE - desc = "The language of the sea-faring Njarir'Akhan Tajaran. Borrowing some elements from Siik, the language is distinctly more structured." + desc = "The language of the noble Njarir'Akhan Tajaran. Borrowing some elements from Siik, the language is distinctly more structured." speech_verb = "chatters" ask_verb = "mrowls" exclaim_verb = "wails" @@ -41,15 +41,14 @@ /datum/language/tajsign id = LANGUAGE_ID_TAJARAN_SIGN - name = LANGUAGE_ALAI + name = LANGUAGE_SIIK_TAJR translation_class = TRANSLATION_CLASS_DEFAULT_CORE_RACE - desc = "A standardized Tajaran sign language that was developed in Zarraya and gradually adopted by other nations, incorporating \ - hand gestures and movements of the ears and tail." + desc = "A standardized Tajaran sign language, incorporating hand gestures and movements of the ears and tail." signlang_verb = list("gestures with their hands", "gestures with their ears and tail", "gestures with their ears, tail and hands") colour = "tajaran" key = "l" language_flags = LANGUAGE_WHITELISTED | LANGUAGE_SIGNLANG | LANGUAGE_NO_STUTTER | LANGUAGE_NONVERBAL - shorthand = "TAJSIGN" + shorthand = "TAJR" /datum/language/tajsign/can_speak_special(var/mob/speaker) // TODO: If ever we make external organs assist languages, convert this over to the new format var/list/allowed_species = list(SPECIES_TAJ, SPECIES_TESHARI) // Need a tail and ears and such to use this. diff --git a/code/modules/species/station/standard/tajaran.dm b/code/modules/species/station/standard/tajaran.dm index ac96b11e3fc..da2949b6ef7 100644 --- a/code/modules/species/station/standard/tajaran.dm +++ b/code/modules/species/station/standard/tajaran.dm @@ -31,7 +31,6 @@ burn_mod = 1.15 flash_mod = 1.1 - //Cattos be hungy metabolic_rate = 1.1 gluttonous = 0 hunger_factor = 0.1 @@ -43,14 +42,15 @@ blurb = {" - The Tajaran are a mammalian species resembling roughly felines, hailing from Meralar in the Rarkajar system. + The Tajara are a race of humanoids that possess markedly felinoid traits that include + a semi-prehensile tail, a body covered in fur of varying shades, and padded, digitigrade feet. + They are a naturally superstitious species, with the new generations growing up with tales of the struggles of surviving a great ice age. + This spirit has led them forward to the reconstruction and advancement of their society to what they are today. + Their pride for the struggles they went through is heavily tied to their spiritual beliefs. - While reaching to the stars independently from outside influences, the humans engaged them in peaceful trade contact - and have accelerated the fledgling culture into the interstellar age. Their history is full of war and highly fractious - governments, something that permeates even to today's times. They prefer colder, tundra-like climates, much like their - home worlds and speak a variety of languages, especially Siik and Akhani. - "} - wikilink = "https://citadel-station.net/wikiRP/index.php?title=Race:_Tajarans" + Recent discoveries have jump started the progression of highly advanced cybernetic technology, causing a culture shock within Tajaran society. + "} + wikilink = "https://citadel-station.net/wikiRP/index.php?title=Race:_Tajara" catalogue_data = list(/datum/category_item/catalogue/fauna/tajaran) body_temperature = 320.15 //Even more cold resistant, even more flammable