From 80a82cd4ecb8cb8400c538dfe66a8d2fdbbbb1ce Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 15 Jul 2018 11:25:04 -0300 Subject: [PATCH] Adds siik'tau and a bit more (#4947) This pr adds siik'tau, as proposed here: https://forums.aurorastation.org/viewtopic.php?f=78&t=11259 A language that humans, skrell and tajara can select. Also, tweaks how skrell handles language at the request of the skrell lore person and cleans up a tiny bit of the species language related vars. --- code/__defines/species_languages.dm | 1 + code/modules/mob/language/generic.dm | 3 ++- code/modules/mob/language/station.dm | 16 ++++++++++++++-- .../living/carbon/human/species/outsider/vox.dm | 3 +-- .../carbon/human/species/station/station.dm | 16 ++++++++-------- .../human/species/station/tajaran_subspecies.dm | 4 ++-- html/changelogs/alberyk-hellokitten.yml | 6 ++++++ 7 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 html/changelogs/alberyk-hellokitten.yml diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm index a93974d13e4..162fb920743 100644 --- a/code/__defines/species_languages.dm +++ b/code/__defines/species_languages.dm @@ -41,6 +41,7 @@ #define LANGUAGE_SIGN_TAJARA "Nal'rasan" #define LANGUAGE_YA_SSA "Ya'ssa" #define LANGUAGE_DELVAHII "Delvahhi" +#define LANGUAGE_SIIK_TAU "Siik'Tau" #define LANGUAGE_SKRELLIAN "Nral'Malic" #define LANGUAGE_RESOMI "Resomi" #define LANGUAGE_ROOTSONG "Rootsong" diff --git a/code/modules/mob/language/generic.dm b/code/modules/mob/language/generic.dm index e5a09290110..05d190bbde0 100644 --- a/code/modules/mob/language/generic.dm +++ b/code/modules/mob/language/generic.dm @@ -27,6 +27,7 @@ key = "0" flags = RESTRICTED syllables = list("blah","blah","blah","bleh","meh","neh","nah","wah") + partial_understanding = list(LANGUAGE_SIIK_TAU = 60) //TODO flag certain languages to use the mob-type specific say_quote and then get rid of these. /datum/language/common/get_spoken_verb(var/msg_end) @@ -66,7 +67,7 @@ // Sign language /datum/language/sign name = LANGUAGE_SIGN - desc = "A signed version of Standard, though its intent is primarily to help out people who are deaf and mute, " + desc = "A signed version of Ceti Basic, though its intent is primarily to help out people who are deaf and mute, " speech_verb = "signs" signlang_verb = list("signs", "gestures") colour = "i" diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index d328bb80f1e..ca4d979375a 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -55,7 +55,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","sam","mak","hrar","nja","rir","khan","jun","dar","rik","kah", "hal","ket","jurl","mah","tul","cresh","azu","ragh","mro","mra","mrro","mrra") - partial_understanding = list(LANGUAGE_SIIK_TAJR = 50, LANGUAGE_YA_SSA = 25, LANGUAGE_DELVAHII = 50) + partial_understanding = list(LANGUAGE_SIIK_TAJR = 50, LANGUAGE_YA_SSA = 25, LANGUAGE_DELVAHII = 50, LANGUAGE_SIIK_TAU = 40) /datum/language/tajaran/get_random_name(var/gender) @@ -92,7 +92,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","sam","mak","hrar","nja","rir","khan","jun","dar","rik","kah", "hal","ket","jurl","mah","tul","cresh","azu","ragh","mro","mra","mrro","mrra") - partial_understanding = list(LANGUAGE_SIIK_MAAS = 50, LANGUAGE_SIGN_TAJARA = 25) + partial_understanding = list(LANGUAGE_SIIK_MAAS = 50, LANGUAGE_SIGN_TAJARA = 25, LANGUAGE_SIIK_TAU= 20) /datum/language/yassa name = LANGUAGE_YA_SSA @@ -124,6 +124,18 @@ "hal","kete","juril","mah","tul","cresh","azu","ragh","miro","mara","mrero","mrara") partial_understanding = list(LANGUAGE_SIIK_MAAS = 50) +/datum/language/siik_tau + name = LANGUAGE_SIIK_TAU + desc = "A macaronic form of Tau Ceti Basic and Siik'maas, developed in Mendell City soon after Tajara entered the galactic field." + speech_verb = "slurs" + ask_verb = "mrowmbles" + exclaim_verb = "exclaims" + key = "t" + flags = WHITELISTED + syllables = list("m'Rr","rr","tahjr","kir","rrahj","kii","mirr","krah","ahhk","nahl","vahh","khahz","jri","rahn","dahrr", + "mi","j'Rri","dy'Nh","mah'nq","rhe","zahr","r'Rhahz","kahl") + partial_understanding = list(LANGUAGE_SIIK_MAAS = 40, LANGUAGE_SIIK_TAJR = 20, LANGUAGE_TCB = 60) + /datum/language/skrell name = LANGUAGE_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/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index ae5e492a7f4..d65e9677a2c 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -4,8 +4,7 @@ name_plural = "Vox" icobase = 'icons/mob/human_races/r_vox.dmi' deform = 'icons/mob/human_races/r_def_vox.dmi' - default_language = LANGUAGE_VOX - language = "Ceti Basic" + language = LANGUAGE_VOX num_alternate_languages = 1 unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/strong, /datum/unarmed_attack/bite/strong) rarity_value = 4 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 dda42070bc9..f5db1e8887d 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -21,7 +21,7 @@ megacorporations have sparked secretive factions to fight their influence, while there is always the risk of someone digging too \ deep into the secrets of the galaxy..." num_alternate_languages = 2 - secondary_langs = list("Sol Common") + secondary_langs = list(LANGUAGE_SOL_COMMON, LANGUAGE_SIIK_TAU) name_language = null // Use the first-name last-name generator rather than a language scrambler mob_size = 9 spawn_flags = CAN_JOIN @@ -140,7 +140,7 @@ brute_mod = 1.2 fall_mod = 0.5 num_alternate_languages = 2 - secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_YA_SSA) + secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_YA_SSA, LANGUAGE_SIIK_TAU) name_language = LANGUAGE_SIIK_MAAS ethanol_resistance = 0.8//Gets drunk a little faster rarity_value = 2 @@ -208,9 +208,10 @@ forever scarred the species and left them with a deep rooted suspicion of artificial intelligence. As \ such an ancient and venerable species, they often hold patronizing attitudes towards the younger races." - num_alternate_languages = 2 - secondary_langs = list(LANGUAGE_SKRELLIAN) - name_language = null + num_alternate_languages = 3 + language = LANGUAGE_SKRELLIAN + secondary_langs = list(LANGUAGE_SIIK_TAU) + name_language = LANGUAGE_SKRELLIAN rarity_value = 3 spawn_flags = CAN_JOIN | IS_WHITELISTED @@ -250,8 +251,7 @@ economic_modifier = 3 icobase = 'icons/mob/human_races/r_diona.dmi' deform = 'icons/mob/human_races/r_def_plant.dmi' - language = "Ceti Basic" - default_language = LANGUAGE_ROOTSONG + language = LANGUAGE_ROOTSONG unarmed_types = list( /datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, @@ -265,7 +265,7 @@ eyes = "blank_eyes" show_ssd = "completely quiescent" num_alternate_languages = 1 - name_language = "Rootsong" + name_language = LANGUAGE_ROOTSONG ethanol_resistance = -1 //Can't get drunk taste_sensitivity = TASTE_DULL mob_size = 12 //Worker gestalts are 150kg 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 f59d189a5e2..3f8fa2df798 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 @@ -9,7 +9,7 @@ from their fellow Tajara who cite their lackluster test scores, even among Tajara, and their higher \ crime rates." - secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_DELVAHII) + secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_DELVAHII, LANGUAGE_SIIK_TAU) slowdown = -0.8 //As opposed to -1 for Base tajara sprint_speed_factor = 0.55 // As opposed to 0.65 @@ -54,4 +54,4 @@ primitive_form = "M'sai Farwa" - secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_SIGN_TAJARA) + secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_SIGN_TAJARA, LANGUAGE_SIIK_TAU) diff --git a/html/changelogs/alberyk-hellokitten.yml b/html/changelogs/alberyk-hellokitten.yml new file mode 100644 index 00000000000..0be605cb8ab --- /dev/null +++ b/html/changelogs/alberyk-hellokitten.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added siik'tau as an alternative language."