cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Tajaran Akhani language. (#5032)

Browse Source 
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.

* Gives the language a colour distinct from Siik.

* Changelog
This commit is contained in:
Cerebulon
2018-03-11 16:55:08 -05:00
committed by Anewbe
parent edab848f2f
commit b7090d7df2
32 changed files with 133 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/language/station.dm
+14
View File
@@ -63,6 +63,20 @@
"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")
/datum/language/tajaranakhani
name = LANGUAGE_AKHANI
desc = "The language of the sea-faring Njarir'Akhan Tajaran. Borrowing some elements from Siik, the language is distinctly more structured."
speech_verb = "chatters"
ask_verb = "mrowls"
exclaim_verb = "wails"
colour = "akhani"
key = "h"
flags = WHITELISTED
syllables = list("mrr","rr","marr","tar","ahk","ket","hal","kah","dra","nal","kra","vah","dar","hrar", "eh",
"ara","ka","zar","mah","ner","zir","mur","hai","raz","ni","ri","nar","njar","jir","ri","ahn","kha","sir",
"kar","yar","kzar","rha","hrar","err","fer","rir","rar","yarr","arr","ii'r","jar","kur","ran","rii","ii",
"nai","ou","kah","oa","ama","uuk","bel","chi","ayt","kay","kas","akor","tam","yir","enai")
/datum/language/tajaran/get_random_name(var/gender)
var/new_name = ..(gender,1)
code/modules/mob/living/autohiss.dm
+1 -1
View File
@@ -53,7 +53,7 @@
autohiss_basic_map = list(
"r" = list("rr", "rrr", "rrrr")
)
autohiss_exempt = list("Siik")
autohiss_exempt = list("Siik","Akhani")
/datum/species/proc/handle_autohiss(message, datum/language/lang, mode)
code/modules/mob/living/carbon/human/human_species.dm
+1 -1
View File
@@ -16,7 +16,7 @@
/mob/living/carbon/human/tajaran/New(var/new_loc)
h_style = "Tajaran Ears"
..(new_loc, "Tajara")
..(new_loc, "Tajaran")
/mob/living/carbon/human/unathi/New(var/new_loc)
h_style = "Unathi Horns"
code/modules/mob/living/carbon/human/species/station/prometheans.dm
+1 -1
View File
@@ -88,7 +88,7 @@ var/datum/species/shapeshifter/promethean/prometheans
/mob/living/carbon/human/proc/regenerate
)
valid_transform_species = list("Human", "Vatborn", "Unathi", "Tajara", "Skrell", "Diona", "Teshari", "Monkey")
valid_transform_species = list("Human", "Vatborn", "Unathi", "Tajaran", "Skrell", "Diona", "Teshari", "Monkey")
var/heal_rate = 0.5 // Temp. Regen per tick.
code/modules/mob/living/carbon/human/species/station/station.dm
+2 -2
View File
@@ -132,7 +132,7 @@
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)
/datum/species/tajaran
name = "Tajara"
name = "Tajaran"
name_plural = "Tajaran"
icobase = 'icons/mob/human_races/r_tajaran.dmi'
deform = 'icons/mob/human_races/r_def_tajaran.dmi'
@@ -148,7 +148,7 @@
metabolic_rate = 1.1
gluttonous = 1
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_SIIK)
secondary_langs = list(LANGUAGE_SIIK, LANGUAGE_AKHANI)
name_language = LANGUAGE_SIIK
species_language = LANGUAGE_SIIK
health_hud_intensity = 2.5
code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm
+1 -1
View File
@@ -42,7 +42,7 @@
)
/datum/species/shapeshifter/promethean/avatar/tajaran
name = "Virtual Reality Tajara"
name = "Virtual Reality Tajaran"
icobase = 'icons/mob/human_races/r_tajaran.dmi'
deform = 'icons/mob/human_races/r_def_tajaran.dmi'
tail = "tajtail"
code/modules/mob/living/silicon/ai/ai.dm
+5 -4
View File
@@ -150,6 +150,7 @@ var/list/ai_verbs_default = list(
add_language(LANGUAGE_SOL_COMMON, 1)
add_language(LANGUAGE_UNATHI, 1)
add_language(LANGUAGE_SIIK, 1)
add_language(LANGUAGE_AKHANI, 1)
add_language(LANGUAGE_SKRELLIAN, 1)
add_language(LANGUAGE_SKRELLIANFAR, 0)
add_language(LANGUAGE_TRADEBAND, 1)
@@ -578,8 +579,8 @@ var/list/ai_verbs_default = list(
"female human",
"male unathi",
"female unathi",
"male tajara",
"female tajara",
"male tajaran",
"female tajaran",
"male tesharii",
"female tesharii",
"male skrell",
@@ -621,9 +622,9 @@ var/list/ai_verbs_default = list(
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holounam"))
if("female unathi")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holounaf"))
if("male tajara")
if("male tajaran")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holotajm"))
if("female tajara")
if("female tajaran")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holotajf"))
if("male tesharii")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holotesm"))
code/modules/mob/living/silicon/pai/software_modules.dm
+3 -1
View File
@@ -473,16 +473,18 @@
id = "translator"
toggle(mob/living/silicon/pai/user)
// Sol Common, Tradeband and Gutter are added with New() and are therefore the current default, always active languages
// Sol Common, Tradeband, Terminus and Gutter are added with New() and are therefore the current default, always active languages
user.translator_on = !user.translator_on
if(user.translator_on)
user.add_language(LANGUAGE_UNATHI)
user.add_language(LANGUAGE_SIIK)
user.add_language(LANGUAGE_AKHANI)
user.add_language(LANGUAGE_SKRELLIAN)
user.add_language(LANGUAGE_SCHECHI)
else
user.remove_language(LANGUAGE_UNATHI)
user.remove_language(LANGUAGE_SIIK)
user.remove_language(LANGUAGE_AKHANI)
user.remove_language(LANGUAGE_SKRELLIAN)
user.remove_language(LANGUAGE_SCHECHI)
code/modules/mob/living/silicon/robot/robot_modules/station.dm
+2 -1
View File
@@ -23,7 +23,7 @@ var/global/list/robot_modules = list(
var/hide_on_manifest = 0
var/channels = list()
var/networks = list()
var/languages = list(LANGUAGE_SOL_COMMON = 1, LANGUAGE_TRADEBAND = 1, LANGUAGE_UNATHI = 0, LANGUAGE_SIIK = 0, LANGUAGE_SKRELLIAN = 0, LANGUAGE_GUTTER = 0, LANGUAGE_SCHECHI = 0, LANGUAGE_SIGN = 0, LANGUAGE_TERMINUS = 1)
var/languages = list(LANGUAGE_SOL_COMMON = 1, LANGUAGE_TRADEBAND = 1, LANGUAGE_UNATHI = 0, LANGUAGE_SIIK = 0, LANGUAGE_AKHANI = 0, LANGUAGE_SKRELLIAN = 0, LANGUAGE_GUTTER = 0, LANGUAGE_SCHECHI = 0, LANGUAGE_SIGN = 0, LANGUAGE_TERMINUS = 1)
var/sprites = list()
var/can_be_pushed = 1
var/no_slip = 0
@@ -573,6 +573,7 @@ var/global/list/robot_modules = list(
LANGUAGE_SOL_COMMON = 1,
LANGUAGE_UNATHI = 1,
LANGUAGE_SIIK = 1,
LANGUAGE_AKHANI = 1,
LANGUAGE_SKRELLIAN = 1,
LANGUAGE_SKRELLIANFAR = 0,
LANGUAGE_ROOTLOCAL = 0,
code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm
+1
View File
@@ -8,6 +8,7 @@
LANGUAGE_TRADEBAND = 1,
LANGUAGE_UNATHI = 0,
LANGUAGE_SIIK = 0,
LANGUAGE_AKHANI = 0,
LANGUAGE_SKRELLIAN = 0,
LANGUAGE_SKRELLIANFAR = 0,
LANGUAGE_ROOTLOCAL = 0,
code/modules/mob/new_player/sprite_accessories.dm
+66 -66
View File
@@ -665,7 +665,7 @@
name = "Shaved"
icon_state = "bald"
gender = NEUTER
species_allowed = list("Human","Vatborn","Unathi","Tajara","Skrell", "Machine","Teshari", "Vox","Promethean")
species_allowed = list("Human","Vatborn","Unathi","Tajaran","Skrell", "Machine","Teshari", "Vox","Promethean")
watson
name = "Watson Mustache"
@@ -872,87 +872,87 @@
taj_ears
name = "Tajaran Ears"
icon_state = "ears_plain"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_clean
name = "Tajara Clean"
name = "Tajaran Clean"
icon_state = "hair_clean"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_bangs
name = "Tajara Bangs"
name = "Tajaran Bangs"
icon_state = "hair_bangs"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_braid
name = "Tajara Braid"
name = "Tajaran Braid"
icon_state = "hair_tbraid"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_shaggy
name = "Tajara Shaggy"
name = "Tajaran Shaggy"
icon_state = "hair_shaggy"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_mohawk
name = "Tajaran Mohawk"
icon_state = "hair_mohawk"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_plait
name = "Tajara Plait"
name = "Tajaran Plait"
icon_state = "hair_plait"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_straight
name = "Tajara Straight"
name = "Tajaran Straight"
icon_state = "hair_straight"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_long
name = "Tajara Long"
name = "Tajaran Long"
icon_state = "hair_long"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_rattail
name = "Tajara Rat Tail"
name = "Tajaran Rat Tail"
icon_state = "hair_rattail"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_spiky
name = "Tajara Spiky"
name = "Tajaran Spiky"
icon_state = "hair_tajspiky"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_messy
name = "Tajara Messy"
name = "Tajaran Messy"
icon_state = "hair_messy"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_curls
name = "Tajara Curly"
name = "Tajaran Curly"
icon_state = "hair_curly"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_wife
name = "Tajara Housewife"
name = "Tajaran Housewife"
icon_state = "hair_wife"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_victory
name = "Tajara Victory Curls"
name = "Tajaran Victory Curls"
icon_state = "hair_victory"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_bob
name = "Tajara Bob"
name = "Tajaran Bob"
icon_state = "hair_tbob"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_ears_fingercurl
name = "Tajara Finger Curls"
name = "Tajaran Finger Curls"
icon_state = "hair_fingerwave"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
//Teshari things
teshari
@@ -1054,34 +1054,34 @@
/datum/sprite_accessory/facial_hair
taj_sideburns
name = "Tajara Sideburns"
name = "Tajaran Sideburns"
icon_state = "facial_sideburns"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_mutton
name = "Tajara Mutton"
name = "Tajaran Mutton"
icon_state = "facial_mutton"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_pencilstache
name = "Tajara Pencilstache"
name = "Tajaran Pencilstache"
icon_state = "facial_pencilstache"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_moustache
name = "Tajara Moustache"
name = "Tajaran Moustache"
icon_state = "facial_moustache"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_goatee
name = "Tajara Goatee"
name = "Tajaran Goatee"
icon_state = "facial_goatee"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_smallstache
name = "Tajara Smallsatche"
name = "Tajaran Smallsatche"
icon_state = "facial_smallstache"
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
//unathi horn beards and the like
@@ -1137,7 +1137,7 @@
do_colouration = 1 //Almost all of them have it, COLOR_ADD
//Empty list is unrestricted. Should only restrict the ones that make NO SENSE on other species,
//like Tajara inner-ear coloring overlay stuff.
//like Tajaran inner-ear coloring overlay stuff.
species_allowed = list()
var/body_parts = list() //A list of bodyparts this covers, in organ_tag defines
@@ -1176,7 +1176,7 @@
name = "Socks Coloration (Taj)"
icon_state = "taj_pawsocks"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
una_paw_socks
name = "Socks Coloration (Una)"
@@ -1188,43 +1188,43 @@
name = "Socks Coloration (Generic)"
icon_state = "pawsocks"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND)
species_allowed = list("Tajara", "Unathi")
species_allowed = list("Tajaran", "Unathi")
paw_socks_belly
name = "Socks,Belly Coloration (Generic)"
icon_state = "pawsocksbelly"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
species_allowed = list("Tajara", "Unathi")
species_allowed = list("Tajaran", "Unathi")
belly_hands_feet
name = "Hands,Feet,Belly Color (Minor)"
icon_state = "bellyhandsfeetsmall"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
species_allowed = list("Tajara", "Unathi")
species_allowed = list("Tajaran", "Unathi")
hands_feet_belly_full
name = "Hands,Feet,Belly Color (Major)"
icon_state = "bellyhandsfeet"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
species_allowed = list("Tajara", "Unathi")
species_allowed = list("Tajaran", "Unathi")
hands_feet_belly_full_female
name = "Hands,Feet,Belly Color (Major, Female)"
icon_state = "bellyhandsfeet_female"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
patches
name = "Color Patches"
icon_state = "patches"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
patchesface
name = "Color Patches (Face)"
icon_state = "patchesface"
body_parts = list(BP_HEAD)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
bands
name = "Color Bands"
@@ -1240,7 +1240,7 @@
name = "Tiger Stripes"
icon_state = "tiger"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN)
species_allowed = list("Tajara") //There's a tattoo for non-cats
species_allowed = list("Tajaran") //There's a tattoo for non-cats
tigerhead
name = "Tiger Stripes (Head, Minor)"
@@ -1251,7 +1251,7 @@
name = "Tiger Stripes (Head, Major)"
icon_state = "tigerface"
body_parts = list(BP_HEAD)
species_allowed = list("Tajara") //There's a tattoo for non-cats
species_allowed = list("Tajaran") //There's a tattoo for non-cats
backstripe
name = "Back Stripe"
@@ -1263,55 +1263,55 @@
name = "Belly Fur (Taj)"
icon_state = "taj_belly"
body_parts = list(BP_TORSO)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_bellyfull
name = "Belly Fur Wide (Taj)"
icon_state = "taj_bellyfull"
body_parts = list(BP_TORSO)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_earsout
name = "Outer Ear (Taj)"
icon_state = "taj_earsout"
body_parts = list(BP_HEAD)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_earsin
name = "Inner Ear (Taj)"
icon_state = "taj_earsin"
body_parts = list(BP_HEAD)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_nose
name = "Nose Color (Taj)"
icon_state = "taj_nose"
body_parts = list(BP_HEAD)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_crest
name = "Chest Fur Crest (Taj)"
icon_state = "taj_crest"
body_parts = list(BP_TORSO)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_muzzle
name = "Muzzle Color (Taj)"
icon_state = "taj_muzzle"
body_parts = list(BP_HEAD)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_face
name = "Cheeks Color (Taj)"
icon_state = "taj_face"
body_parts = list(BP_HEAD)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
taj_all
name = "All Taj Head (Taj)"
icon_state = "taj_all"
body_parts = list(BP_HEAD)
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
//Una specific stuff
una_face
@@ -1352,7 +1352,7 @@
name = "Default tajaran skin"
icon_state = "default"
icon = 'icons/mob/human_races/r_tajaran.dmi'
species_allowed = list("Tajara")
species_allowed = list("Tajaran")
unathi
name = "Default Unathi skin"
code/modules/mob/transform_procs.dm
+1
View File
@@ -83,6 +83,7 @@
add_language(LANGUAGE_SOL_COMMON, 1)
add_language(LANGUAGE_UNATHI, 1)
add_language(LANGUAGE_SIIK, 1)
add_language(LANGUAGE_AKHANI, 1)
add_language(LANGUAGE_SKRELLIAN, 1)
add_language(LANGUAGE_TRADEBAND, 1)
add_language(LANGUAGE_GUTTER, 1)