diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 1704d81d764..eb3a092a03c 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -12,7 +12,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E var/changelingID = "Changeling" var/geneticdamage = 0 var/isabsorbing = 0 - var/geneticpoints = 25 + var/geneticpoints = 5 var/purchasedpowers = list() var/mimicing = "" diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index 61051efb48e..673e70240bd 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -54,16 +54,6 @@ "ka","aasi","far","wa","baq","ara","qara","zir","sam","mak","hrar","nja","rir","khan","jun","dar","rik","kah", "hal","ket","jurl","mah","tul","cresh","azu","ragh","mro","mra","mrro","mrra") -// Sign language -/datum/language/tajaran_sign - name = LANGUAGE_SIGN_TAJARA - desc = "A sign language developed by Adhomai hunters" - speech_verb = "signs" - signlang_verb = list("signs", "gestures") - colour = "i" - key = "i" - flags = NO_STUTTER|SIGNLANG - /datum/language/tajaran/get_random_name(var/gender) var/new_name = ..(gender,1) @@ -72,6 +62,31 @@ else new_name += " [..(gender,1)]" return new_name + +// tajaran sign language +/datum/language/tajaran_sign + name = LANGUAGE_SIGN_TAJARA + desc = "A sign language developed by Adhomai hunters" + speech_verb = "signs" + signlang_verb = list("signs", "flicks their ears", "gestures") + colour = "i" + key = "i" + flags = NO_STUTTER | SIGNLANG + +/datum/language/siik_tajr + name = LANGUAGE_SIIK_TAJR + desc = "A language native to the tajaran, it employes both verbal and non-verbal elements." + speech_verb = "mrowls" + ask_verb = "mrowls" + exclaim_verb = "yowls" + signlang_verb = list("signs", "flicks their ears", "gestures") + colour = "tajaran_signlang" + key = "w" + flags = WHITELISTED | NONVERBAL + syllables = list("mrr","rr","tajr","kir","raj","kii","mir","kra","ahk","nal","vah","khaz","jri","ran","darr", + "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","sam","mak","hrar","nja","rir","khan","jun","dar","rik","kah", + "hal","ket","jurl","mah","tul","cresh","azu","ragh","mro","mra","mrro","mrra") /datum/language/skrell name = LANGUAGE_SKRELLIAN diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index c685e860c73..65703a5a9c5 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -107,9 +107,8 @@ darksight = 8 slowdown = -1 brute_mod = 1.2 - gluttonous = GLUT_TINY num_alternate_languages = 2 - secondary_langs = list(LANGUAGE_SIIK_MAAS) + secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR) name_language = LANGUAGE_SIIK_MAAS ethanol_resistance = 0.8//Gets drunk a little faster rarity_value = 2 @@ -119,7 +118,6 @@ sprint_speed_factor = 0.65 sprint_cost_factor = 0.75 - blurb = "The Tajaran race is a species of feline-like bipeds hailing from the planet of Ahdomai in the \ S'randarr system. They have been brought up into the space age by the Humans and Skrell, and have been \ influenced heavily by their long history of Slavemaster rule. They have a structured, clan-influenced way \ @@ -154,6 +152,9 @@ ..() H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes) +/datum/species/tajaran/get_bodytype() + return "Tajara" + /datum/species/skrell name = "Skrell" short_name = "skr" diff --git a/code/modules/mob/living/carbon/human/species/station/tajaran_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/tajaran_subspecies.dm index 62419c24dd1..35aaeda4697 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajaran_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajaran_subspecies.dm @@ -1,6 +1,6 @@ /datum/species/tajaran/zhan_khazan - name = "Zhan-Khaza" - name_plural = "Zhan-Khazan" + name = "Zhan-Khazan Tajara" + name_plural = "Zhan-Khazan Tajaran" blurb = "Zhan-Khazan are the second most populous of Tajaran ethnicities, and are considered to be \ the backbone of the Tajaran workforce. Their history as an ethnicity is one not well documented; \ very little historical texts describing them were preserved in the wake of the Great War, and archaeological \ @@ -25,8 +25,8 @@ num_alternate_languages = 1 // Only one Extra Language /datum/species/tajaran/m_sai - name = "M'sai" - name_plural = "M'sai" + name = "M'sai Tajara" + name_plural = "M'sai Tajaran" blurb = "As the third (though only by a small margin) populous Tajaran ethnic group, the M'sai were at one point \ the hunters for ancient Tajara and evolved to have lithe, slender forms, and light fur that hid them in the blizzards on Adhomai. \ As Tajaran society advanced, M'sai could be found in many roles related to combat, including law enforcement and military service. \ @@ -47,4 +47,4 @@ heat_level_2 = 390 //RaceDefault 380 Default 400 heat_level_3 = 900 //RaceDefault 800 Default 1000 - secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIGN_TAJARA) + secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_SIGN_TAJARA) diff --git a/html/changelogs/alberky-PR-1323.yml b/html/changelogs/alberky-PR-1323.yml new file mode 100644 index 00000000000..7cf57bb1b63 --- /dev/null +++ b/html/changelogs/alberky-PR-1323.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added Siik'Tajr as an alternative language for tajaran."