cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00: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 21:55:08 +00: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

1
code/__defines/species_languages.dm
View File

@@ -48,6 +48,7 @@
#define LANGUAGE_TERMINUS "Terminus" #define LANGUAGE_TERMINUS "Terminus"
#define LANGUAGE_SKRELLIANFAR "High Skrellian" #define LANGUAGE_SKRELLIANFAR "High Skrellian"
#define LANGUAGE_MINBUS "Minbus" #define LANGUAGE_MINBUS "Minbus"
#define LANGUAGE_AKHANI "Akhani"
// Language flags. // Language flags.
#define WHITELISTED 1 // Language is available if the speaker is whitelisted. #define WHITELISTED 1 // Language is available if the speaker is whitelisted.

2
code/game/antagonist/antagonist.dm
View File

@@ -52,7 +52,7 @@
var/flags = 0 // Various runtime options. var/flags = 0 // Various runtime options.
// Used for setting appearance. // Used for setting appearance.
var/list/valid_species = list("Unathi","Tajara","Skrell","Human","Diona","Teshari") var/list/valid_species = list("Unathi","Tajaran","Skrell","Human","Diona","Teshari")
// Runtime vars. // Runtime vars.
var/datum/mind/leader // Current leader, if any. var/datum/mind/leader // Current leader, if any.

2
code/game/antagonist/outsider/ninja.dm
View File

@@ -158,7 +158,7 @@ var/datum/antagonist/ninja/ninjas
if(13) if(13)
directive += "Some disgruntled [using_map.company_name] employees have been supportive of our operations. Be wary of any mistreatment by command staff." directive += "Some disgruntled [using_map.company_name] employees have been supportive of our operations. Be wary of any mistreatment by command staff."
if(14) if(14)
var/xenorace = pick("Unathi","Tajara", "Skrell") var/xenorace = pick("Unathi","Tajaran", "Skrell")
directive += "A group of [xenorace] radicals have been loyal supporters of the Spider Clan. Favor [xenorace] crew whenever possible." directive += "A group of [xenorace] radicals have been loyal supporters of the Spider Clan. Favor [xenorace] crew whenever possible."
if(15) if(15)
directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the Chaplain and prove these accusations false." directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the Chaplain and prove these accusations false."

4
code/game/machinery/suit_storage_unit.dm
View File

@@ -588,7 +588,7 @@
//Departments that the cycler can paint suits to look like. //Departments that the cycler can paint suits to look like.
var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control") var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control")
//Species that the suits can be configured to fit. //Species that the suits can be configured to fit.
var/list/species = list("Human","Skrell","Unathi","Tajara", "Teshari") var/list/species = list("Human","Skrell","Unathi","Tajaran", "Teshari")
var/target_department var/target_department
var/target_species var/target_species
@@ -753,7 +753,7 @@
//Clear the access reqs, disable the safeties, and open up all paintjobs. //Clear the access reqs, disable the safeties, and open up all paintjobs.
user << "<span class='danger'>You run the sequencer across the interface, corrupting the operating protocols.</span>" user << "<span class='danger'>You run the sequencer across the interface, corrupting the operating protocols.</span>"
departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Crowd Control","Emergency Medical Response","^%###^%$", "Charring") departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Crowd Control","Emergency Medical Response","^%###^%$", "Charring")
species = list("Human","Tajara","Skrell","Unathi", "Teshari") species = list("Human","Tajaran","Skrell","Unathi", "Teshari")
emagged = 1 emagged = 1
safeties = 0 safeties = 0

2
code/game/objects/effects/decals/posters/bs12.dm
View File

@@ -217,7 +217,7 @@
/datum/poster/bay_44 /datum/poster/bay_44
icon_state="bsposter44" icon_state="bsposter44"
name = "Time for a drink?" name = "Time for a drink?"
desc = "This poster depicts a friendly-looking Tajara holding a tray of drinks." desc = "This poster depicts a friendly-looking Tajaran holding a tray of drinks."
/datum/poster/bay_45 /datum/poster/bay_45
icon_state="bsposter45" icon_state="bsposter45"

2
code/game/objects/items.dm
View File

@@ -69,7 +69,7 @@
/* Species-specific sprites, concept stolen from Paradise//vg/. /* Species-specific sprites, concept stolen from Paradise//vg/.
ex: ex:
sprite_sheets = list( sprite_sheets = list(
"Tajara" = 'icons/cat/are/bad' "Tajaran" = 'icons/cat/are/bad'
) )
If index term exists and icon_override is not set, this sprite sheet will be used. If index term exists and icon_override is not set, this sprite sheet will be used.
*/ */

2
code/game/objects/items/devices/modkit.dm
View File

@@ -69,4 +69,4 @@
/obj/item/device/modkit/tajaran /obj/item/device/modkit/tajaran
name = "tajaran hardsuit modification kit" name = "tajaran hardsuit modification kit"
desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajaran." desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajaran."
target_species = "Tajara" target_species = "Tajaran"

1
code/game/objects/items/robot/robot_upgrades.dm
View File

@@ -210,6 +210,7 @@
R.add_language(LANGUAGE_TRADEBAND, 1) R.add_language(LANGUAGE_TRADEBAND, 1)
R.add_language(LANGUAGE_UNATHI, 1) R.add_language(LANGUAGE_UNATHI, 1)
R.add_language(LANGUAGE_SIIK, 1) R.add_language(LANGUAGE_SIIK, 1)
R.add_language(LANGUAGE_AKHANI, 1)
R.add_language(LANGUAGE_SKRELLIAN, 1) R.add_language(LANGUAGE_SKRELLIAN, 1)
R.add_language(LANGUAGE_SKRELLIANFAR, 0) R.add_language(LANGUAGE_SKRELLIANFAR, 0)
R.add_language(LANGUAGE_GUTTER, 1) R.add_language(LANGUAGE_GUTTER, 1)

4
code/modules/client/preference_setup/loadout/loadout_xeno.dm
View File

@@ -1,13 +1,13 @@
// Alien clothing. // Alien clothing.
/datum/gear/suit/zhan_furs /datum/gear/suit/zhan_furs
display_name = "Zhan-Khazan furs (Tajara)" display_name = "Zhan-Khazan furs (Tajaran)"
path = /obj/item/clothing/suit/tajaran/furs path = /obj/item/clothing/suit/tajaran/furs
sort_category = "Xenowear" sort_category = "Xenowear"
/datum/gear/head/zhan_scarf /datum/gear/head/zhan_scarf
display_name = "Zhan headscarf" display_name = "Zhan headscarf"
path = /obj/item/clothing/head/tajaran/scarf path = /obj/item/clothing/head/tajaran/scarf
whitelisted = "Tajara" whitelisted = "Tajaran"
/datum/gear/suit/unathi_mantle /datum/gear/suit/unathi_mantle
display_name = "hide mantle (Unathi)" display_name = "hide mantle (Unathi)"

2
code/modules/client/preference_setup/traits/trait_defines.dm
View File

@@ -226,7 +226,7 @@
mutually_exclusive = list(/datum/trait/modifier/mental/xenophobe) mutually_exclusive = list(/datum/trait/modifier/mental/xenophobe)
/datum/trait/modifier/mental/tajaraphobe /datum/trait/modifier/mental/tajaraphobe
name = "Tajara-phobic" name = "Tajaran-phobic"
desc = "Boilerplate racism for cats goes here." desc = "Boilerplate racism for cats goes here."
mutually_exclusive = list(/datum/trait/modifier/mental/xenophobe) mutually_exclusive = list(/datum/trait/modifier/mental/xenophobe)

4
code/modules/clothing/clothing.dm
View File

@@ -245,7 +245,7 @@
desc = "[desc]<br>They have had the fingertips cut off of them." desc = "[desc]<br>They have had the fingertips cut off of them."
if("exclude" in species_restricted) if("exclude" in species_restricted)
species_restricted -= "Unathi" species_restricted -= "Unathi"
species_restricted -= "Tajara" species_restricted -= "Tajaran"
return return
*/ */
@@ -430,7 +430,7 @@
sprite_sheets = list( sprite_sheets = list(
"Teshari" = 'icons/mob/species/seromi/masks.dmi', "Teshari" = 'icons/mob/species/seromi/masks.dmi',
"Vox" = 'icons/mob/species/vox/masks.dmi', "Vox" = 'icons/mob/species/vox/masks.dmi',
"Tajara" = 'icons/mob/species/tajaran/mask.dmi', "Tajaran" = 'icons/mob/species/tajaran/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi' "Unathi" = 'icons/mob/species/unathi/mask.dmi'
) )

2
code/modules/clothing/head/helmet.dm
View File

@@ -153,7 +153,7 @@
icon_state = "swathelm" icon_state = "swathelm"
item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat") item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
sprite_sheets = list( sprite_sheets = list(
"Tajara" = 'icons/mob/species/tajaran/helmet.dmi', "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
) )

4
code/modules/clothing/spacesuits/rig/rig_pieces.dm
View File

@@ -11,7 +11,7 @@
cold_protection = HEAD|FACE|EYES cold_protection = HEAD|FACE|EYES
brightness_on = 4 brightness_on = 4
sprite_sheets = list( sprite_sheets = list(
"Tajara" = 'icons/mob/species/tajaran/helmet.dmi', "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Skrell" = 'icons/mob/species/skrell/helmet.dmi', "Skrell" = 'icons/mob/species/skrell/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Vox" = 'icons/mob/species/vox/head.dmi' "Vox" = 'icons/mob/species/vox/head.dmi'
@@ -50,7 +50,7 @@
resilience = 0.2 resilience = 0.2
can_breach = 1 can_breach = 1
sprite_sheets = list( sprite_sheets = list(
"Tajara" = 'icons/mob/species/tajaran/suit.dmi', "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi', "Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Vox" = 'icons/mob/species/vox/suit.dmi' "Vox" = 'icons/mob/species/vox/suit.dmi'
) )

8
code/modules/clothing/spacesuits/void/void.dm
View File

@@ -14,13 +14,13 @@
species_restricted = list("Human", "Promethean") species_restricted = list("Human", "Promethean")
sprite_sheets_refit = list( sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Tajara" = 'icons/mob/species/tajaran/helmet.dmi', "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
"Skrell" = 'icons/mob/species/skrell/helmet.dmi' "Skrell" = 'icons/mob/species/skrell/helmet.dmi'
//Teshari have a general sprite sheet defined in modules/clothing/clothing.dm //Teshari have a general sprite sheet defined in modules/clothing/clothing.dm
) )
sprite_sheets_obj = list( sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi', "Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi',
"Tajara" = 'icons/obj/clothing/species/tajaran/hats.dmi', "Tajaran" = 'icons/obj/clothing/species/tajaran/hats.dmi',
"Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi', "Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi',
"Teshari" = 'icons/obj/clothing/species/seromi/hats.dmi' "Teshari" = 'icons/obj/clothing/species/seromi/hats.dmi'
) )
@@ -41,13 +41,13 @@
species_restricted = list("Human", "Skrell", "Promethean") species_restricted = list("Human", "Skrell", "Promethean")
sprite_sheets_refit = list( sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/suit.dmi', "Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Tajara" = 'icons/mob/species/tajaran/suit.dmi', "Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
"Skrell" = 'icons/mob/species/skrell/suit.dmi' "Skrell" = 'icons/mob/species/skrell/suit.dmi'
//Teshari have a general sprite sheet defined in modules/clothing/clothing.dm //Teshari have a general sprite sheet defined in modules/clothing/clothing.dm
) )
sprite_sheets_obj = list( sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi', "Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
"Tajara" = 'icons/obj/clothing/species/tajaran/suits.dmi', "Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi',
"Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi', "Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi',
"Teshari" = 'icons/obj/clothing/species/seromi/suits.dmi' "Teshari" = 'icons/obj/clothing/species/seromi/suits.dmi'
) )

2
code/modules/games/cah_black_cards.dm
View File

@@ -30,7 +30,7 @@
"_____ used ____ to create their newest invention, _____!", "_____ used ____ to create their newest invention, _____!",
"Scientists are not allowed to make Gatling _____.", "Scientists are not allowed to make Gatling _____.",
"It's not a party until the ____ arrive.", "It's not a party until the ____ arrive.",
"No matter how many Tajara you have, _____ is never acceptable.", "No matter how many Tajaran you have, _____ is never acceptable.",
"No, the AI's first law is NOT to serve _____.", "No, the AI's first law is NOT to serve _____.",
"The robots are not disposal bins for your _____.", "The robots are not disposal bins for your _____.",
"You can never have too many _____ on shift.", "You can never have too many _____ on shift.",

2
code/modules/games/cah_white_cards.dm
View File

@@ -9,7 +9,7 @@
"Being in a cult", "Being in a cult",
"Racially biased lawsets", "Racially biased lawsets",
"An Unathi who WON'T STOP FIGHTING", "An Unathi who WON'T STOP FIGHTING",
"Tajara fetishists", "Tajaran fetishists",
"Bald thirty-year-olds", "Bald thirty-year-olds",
"A Chief Engineer who can't setup the engine", "A Chief Engineer who can't setup the engine",
"Being sucked out into space", "Being sucked out into space",

4
code/modules/lore_codex/lore_data/species.dm
View File

@@ -48,8 +48,8 @@
/datum/lore/codex/page/tajaran /datum/lore/codex/page/tajaran
name = "Tajaran" name = "Tajaran"
keywords = list("Tajara") keywords = list("Tajaran")
data = "The Tajara are a race of humanoid mammalian aliens from Meralar, the fourth planet of the Rarkajar star system. Thickly furred and protected \ data = "The Tajaran are a race of humanoid mammalian aliens from Meralar, the fourth planet of the Rarkajar star system. Thickly furred and protected \
from cold, they thrive on their subarctic planet, where the only terran temperate areas spread across the equator and tropical belt. \ from cold, they thrive on their subarctic planet, where the only terran temperate areas spread across the equator and tropical belt. \
With their own share of bloody wars and great technological advances, the Tajaran are a proud kind. They fiercely believe they belong \ With their own share of bloody wars and great technological advances, the Tajaran are a proud kind. They fiercely believe they belong \
among the stars and consider themselves a rightful interstellar nation, even if the humans helped them to actually achieve superluminal \ among the stars and consider themselves a rightful interstellar nation, even if the humans helped them to actually achieve superluminal \

14
code/modules/mob/language/station.dm
View File

@@ -63,6 +63,20 @@
"ka","aasi","far","wa","baq","ara","qara","zir","saam","mak","hrar","nja","rir","khan","jun","dar","rik","kah", "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") "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) /datum/language/tajaran/get_random_name(var/gender)
var/new_name = ..(gender,1) var/new_name = ..(gender,1)

2
code/modules/mob/living/autohiss.dm
View File

@@ -53,7 +53,7 @@
autohiss_basic_map = list( autohiss_basic_map = list(
"r" = list("rr", "rrr", "rrrr") "r" = list("rr", "rrr", "rrrr")
) )
autohiss_exempt = list("Siik") autohiss_exempt = list("Siik","Akhani")
/datum/species/proc/handle_autohiss(message, datum/language/lang, mode) /datum/species/proc/handle_autohiss(message, datum/language/lang, mode)

2
code/modules/mob/living/carbon/human/human_species.dm
View File

@@ -16,7 +16,7 @@
/mob/living/carbon/human/tajaran/New(var/new_loc) /mob/living/carbon/human/tajaran/New(var/new_loc)
h_style = "Tajaran Ears" h_style = "Tajaran Ears"
..(new_loc, "Tajara") ..(new_loc, "Tajaran")
/mob/living/carbon/human/unathi/New(var/new_loc) /mob/living/carbon/human/unathi/New(var/new_loc)
h_style = "Unathi Horns" h_style = "Unathi Horns"

2
code/modules/mob/living/carbon/human/species/station/prometheans.dm
View File

@@ -88,7 +88,7 @@ var/datum/species/shapeshifter/promethean/prometheans
/mob/living/carbon/human/proc/regenerate /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. var/heal_rate = 0.5 // Temp. Regen per tick.

4
code/modules/mob/living/carbon/human/species/station/station.dm
View File

@@ -132,7 +132,7 @@
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)
/datum/species/tajaran /datum/species/tajaran
name = "Tajara" name = "Tajaran"
name_plural = "Tajaran" name_plural = "Tajaran"
icobase = 'icons/mob/human_races/r_tajaran.dmi' icobase = 'icons/mob/human_races/r_tajaran.dmi'
deform = 'icons/mob/human_races/r_def_tajaran.dmi' deform = 'icons/mob/human_races/r_def_tajaran.dmi'
@@ -148,7 +148,7 @@
metabolic_rate = 1.1 metabolic_rate = 1.1
gluttonous = 1 gluttonous = 1
num_alternate_languages = 3 num_alternate_languages = 3
secondary_langs = list(LANGUAGE_SIIK) secondary_langs = list(LANGUAGE_SIIK, LANGUAGE_AKHANI)
name_language = LANGUAGE_SIIK name_language = LANGUAGE_SIIK
species_language = LANGUAGE_SIIK species_language = LANGUAGE_SIIK
health_hud_intensity = 2.5 health_hud_intensity = 2.5

2
code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm
View File

@@ -42,7 +42,7 @@
) )
/datum/species/shapeshifter/promethean/avatar/tajaran /datum/species/shapeshifter/promethean/avatar/tajaran
name = "Virtual Reality Tajara" name = "Virtual Reality Tajaran"
icobase = 'icons/mob/human_races/r_tajaran.dmi' icobase = 'icons/mob/human_races/r_tajaran.dmi'
deform = 'icons/mob/human_races/r_def_tajaran.dmi' deform = 'icons/mob/human_races/r_def_tajaran.dmi'
tail = "tajtail" tail = "tajtail"

9
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -150,6 +150,7 @@ var/list/ai_verbs_default = list(
add_language(LANGUAGE_SOL_COMMON, 1) add_language(LANGUAGE_SOL_COMMON, 1)
add_language(LANGUAGE_UNATHI, 1) add_language(LANGUAGE_UNATHI, 1)
add_language(LANGUAGE_SIIK, 1) add_language(LANGUAGE_SIIK, 1)
add_language(LANGUAGE_AKHANI, 1)
add_language(LANGUAGE_SKRELLIAN, 1) add_language(LANGUAGE_SKRELLIAN, 1)
add_language(LANGUAGE_SKRELLIANFAR, 0) add_language(LANGUAGE_SKRELLIANFAR, 0)
add_language(LANGUAGE_TRADEBAND, 1) add_language(LANGUAGE_TRADEBAND, 1)
@@ -578,8 +579,8 @@ var/list/ai_verbs_default = list(
"female human", "female human",
"male unathi", "male unathi",
"female unathi", "female unathi",
"male tajara", "male tajaran",
"female tajara", "female tajaran",
"male tesharii", "male tesharii",
"female tesharii", "female tesharii",
"male skrell", "male skrell",
@@ -621,9 +622,9 @@ var/list/ai_verbs_default = list(
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holounam")) holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holounam"))
if("female unathi") if("female unathi")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holounaf")) holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holounaf"))
if("male tajara") if("male tajaran")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holotajm")) holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holotajm"))
if("female tajara") if("female tajaran")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holotajf")) holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holotajf"))
if("male tesharii") if("male tesharii")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holotesm")) holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holotesm"))

4
code/modules/mob/living/silicon/pai/software_modules.dm
View File

@@ -473,16 +473,18 @@
id = "translator" id = "translator"
toggle(mob/living/silicon/pai/user) 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 user.translator_on = !user.translator_on
if(user.translator_on) if(user.translator_on)
user.add_language(LANGUAGE_UNATHI) user.add_language(LANGUAGE_UNATHI)
user.add_language(LANGUAGE_SIIK) user.add_language(LANGUAGE_SIIK)
user.add_language(LANGUAGE_AKHANI)
user.add_language(LANGUAGE_SKRELLIAN) user.add_language(LANGUAGE_SKRELLIAN)
user.add_language(LANGUAGE_SCHECHI) user.add_language(LANGUAGE_SCHECHI)
else else
user.remove_language(LANGUAGE_UNATHI) user.remove_language(LANGUAGE_UNATHI)
user.remove_language(LANGUAGE_SIIK) user.remove_language(LANGUAGE_SIIK)
user.remove_language(LANGUAGE_AKHANI)
user.remove_language(LANGUAGE_SKRELLIAN) user.remove_language(LANGUAGE_SKRELLIAN)
user.remove_language(LANGUAGE_SCHECHI) user.remove_language(LANGUAGE_SCHECHI)

3
code/modules/mob/living/silicon/robot/robot_modules/station.dm
View File

@@ -23,7 +23,7 @@ var/global/list/robot_modules = list(
var/hide_on_manifest = 0 var/hide_on_manifest = 0
var/channels = list() var/channels = list()
var/networks = 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/sprites = list()
var/can_be_pushed = 1 var/can_be_pushed = 1
var/no_slip = 0 var/no_slip = 0
@@ -573,6 +573,7 @@ var/global/list/robot_modules = list(
LANGUAGE_SOL_COMMON = 1, LANGUAGE_SOL_COMMON = 1,
LANGUAGE_UNATHI = 1, LANGUAGE_UNATHI = 1,
LANGUAGE_SIIK = 1, LANGUAGE_SIIK = 1,
LANGUAGE_AKHANI = 1,
LANGUAGE_SKRELLIAN = 1, LANGUAGE_SKRELLIAN = 1,
LANGUAGE_SKRELLIANFAR = 0, LANGUAGE_SKRELLIANFAR = 0,
LANGUAGE_ROOTLOCAL = 0, LANGUAGE_ROOTLOCAL = 0,

1
code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm
View File

@@ -8,6 +8,7 @@
LANGUAGE_TRADEBAND = 1, LANGUAGE_TRADEBAND = 1,
LANGUAGE_UNATHI = 0, LANGUAGE_UNATHI = 0,
LANGUAGE_SIIK = 0, LANGUAGE_SIIK = 0,
LANGUAGE_AKHANI = 0,
LANGUAGE_SKRELLIAN = 0, LANGUAGE_SKRELLIAN = 0,
LANGUAGE_SKRELLIANFAR = 0, LANGUAGE_SKRELLIANFAR = 0,
LANGUAGE_ROOTLOCAL = 0, LANGUAGE_ROOTLOCAL = 0,

132
code/modules/mob/new_player/sprite_accessories.dm
View File

@@ -665,7 +665,7 @@
name = "Shaved" name = "Shaved"
icon_state = "bald" icon_state = "bald"
gender = NEUTER 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 watson
name = "Watson Mustache" name = "Watson Mustache"
@@ -872,87 +872,87 @@
taj_ears taj_ears
name = "Tajaran Ears" name = "Tajaran Ears"
icon_state = "ears_plain" icon_state = "ears_plain"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_clean taj_ears_clean
name = "Tajara Clean" name = "Tajaran Clean"
icon_state = "hair_clean" icon_state = "hair_clean"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_bangs taj_ears_bangs
name = "Tajara Bangs" name = "Tajaran Bangs"
icon_state = "hair_bangs" icon_state = "hair_bangs"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_braid taj_ears_braid
name = "Tajara Braid" name = "Tajaran Braid"
icon_state = "hair_tbraid" icon_state = "hair_tbraid"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_shaggy taj_ears_shaggy
name = "Tajara Shaggy" name = "Tajaran Shaggy"
icon_state = "hair_shaggy" icon_state = "hair_shaggy"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_mohawk taj_ears_mohawk
name = "Tajaran Mohawk" name = "Tajaran Mohawk"
icon_state = "hair_mohawk" icon_state = "hair_mohawk"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_plait taj_ears_plait
name = "Tajara Plait" name = "Tajaran Plait"
icon_state = "hair_plait" icon_state = "hair_plait"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_straight taj_ears_straight
name = "Tajara Straight" name = "Tajaran Straight"
icon_state = "hair_straight" icon_state = "hair_straight"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_long taj_ears_long
name = "Tajara Long" name = "Tajaran Long"
icon_state = "hair_long" icon_state = "hair_long"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_rattail taj_ears_rattail
name = "Tajara Rat Tail" name = "Tajaran Rat Tail"
icon_state = "hair_rattail" icon_state = "hair_rattail"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_spiky taj_ears_spiky
name = "Tajara Spiky" name = "Tajaran Spiky"
icon_state = "hair_tajspiky" icon_state = "hair_tajspiky"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_messy taj_ears_messy
name = "Tajara Messy" name = "Tajaran Messy"
icon_state = "hair_messy" icon_state = "hair_messy"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_curls taj_ears_curls
name = "Tajara Curly" name = "Tajaran Curly"
icon_state = "hair_curly" icon_state = "hair_curly"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_wife taj_ears_wife
name = "Tajara Housewife" name = "Tajaran Housewife"
icon_state = "hair_wife" icon_state = "hair_wife"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_victory taj_ears_victory
name = "Tajara Victory Curls" name = "Tajaran Victory Curls"
icon_state = "hair_victory" icon_state = "hair_victory"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_bob taj_ears_bob
name = "Tajara Bob" name = "Tajaran Bob"
icon_state = "hair_tbob" icon_state = "hair_tbob"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_ears_fingercurl taj_ears_fingercurl
name = "Tajara Finger Curls" name = "Tajaran Finger Curls"
icon_state = "hair_fingerwave" icon_state = "hair_fingerwave"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
//Teshari things //Teshari things
teshari teshari
@@ -1054,34 +1054,34 @@
/datum/sprite_accessory/facial_hair /datum/sprite_accessory/facial_hair
taj_sideburns taj_sideburns
name = "Tajara Sideburns" name = "Tajaran Sideburns"
icon_state = "facial_sideburns" icon_state = "facial_sideburns"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_mutton taj_mutton
name = "Tajara Mutton" name = "Tajaran Mutton"
icon_state = "facial_mutton" icon_state = "facial_mutton"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_pencilstache taj_pencilstache
name = "Tajara Pencilstache" name = "Tajaran Pencilstache"
icon_state = "facial_pencilstache" icon_state = "facial_pencilstache"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_moustache taj_moustache
name = "Tajara Moustache" name = "Tajaran Moustache"
icon_state = "facial_moustache" icon_state = "facial_moustache"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_goatee taj_goatee
name = "Tajara Goatee" name = "Tajaran Goatee"
icon_state = "facial_goatee" icon_state = "facial_goatee"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_smallstache taj_smallstache
name = "Tajara Smallsatche" name = "Tajaran Smallsatche"
icon_state = "facial_smallstache" icon_state = "facial_smallstache"
species_allowed = list("Tajara") species_allowed = list("Tajaran")
//unathi horn beards and the like //unathi horn beards and the like
@@ -1137,7 +1137,7 @@
do_colouration = 1 //Almost all of them have it, COLOR_ADD 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, //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() species_allowed = list()
var/body_parts = list() //A list of bodyparts this covers, in organ_tag defines var/body_parts = list() //A list of bodyparts this covers, in organ_tag defines
@@ -1176,7 +1176,7 @@
name = "Socks Coloration (Taj)" name = "Socks Coloration (Taj)"
icon_state = "taj_pawsocks" 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) 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 una_paw_socks
name = "Socks Coloration (Una)" name = "Socks Coloration (Una)"
@@ -1188,43 +1188,43 @@
name = "Socks Coloration (Generic)" name = "Socks Coloration (Generic)"
icon_state = "pawsocks" 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) 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 paw_socks_belly
name = "Socks,Belly Coloration (Generic)" name = "Socks,Belly Coloration (Generic)"
icon_state = "pawsocksbelly" 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) 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 belly_hands_feet
name = "Hands,Feet,Belly Color (Minor)" name = "Hands,Feet,Belly Color (Minor)"
icon_state = "bellyhandsfeetsmall" 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) 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 hands_feet_belly_full
name = "Hands,Feet,Belly Color (Major)" name = "Hands,Feet,Belly Color (Major)"
icon_state = "bellyhandsfeet" 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) 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 hands_feet_belly_full_female
name = "Hands,Feet,Belly Color (Major, Female)" name = "Hands,Feet,Belly Color (Major, Female)"
icon_state = "bellyhandsfeet_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) 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 patches
name = "Color Patches" name = "Color Patches"
icon_state = "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) 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 patchesface
name = "Color Patches (Face)" name = "Color Patches (Face)"
icon_state = "patchesface" icon_state = "patchesface"
body_parts = list(BP_HEAD) body_parts = list(BP_HEAD)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
bands bands
name = "Color Bands" name = "Color Bands"
@@ -1240,7 +1240,7 @@
name = "Tiger Stripes" name = "Tiger Stripes"
icon_state = "tiger" 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) 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 tigerhead
name = "Tiger Stripes (Head, Minor)" name = "Tiger Stripes (Head, Minor)"
@@ -1251,7 +1251,7 @@
name = "Tiger Stripes (Head, Major)" name = "Tiger Stripes (Head, Major)"
icon_state = "tigerface" icon_state = "tigerface"
body_parts = list(BP_HEAD) 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 backstripe
name = "Back Stripe" name = "Back Stripe"
@@ -1263,55 +1263,55 @@
name = "Belly Fur (Taj)" name = "Belly Fur (Taj)"
icon_state = "taj_belly" icon_state = "taj_belly"
body_parts = list(BP_TORSO) body_parts = list(BP_TORSO)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_bellyfull taj_bellyfull
name = "Belly Fur Wide (Taj)" name = "Belly Fur Wide (Taj)"
icon_state = "taj_bellyfull" icon_state = "taj_bellyfull"
body_parts = list(BP_TORSO) body_parts = list(BP_TORSO)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_earsout taj_earsout
name = "Outer Ear (Taj)" name = "Outer Ear (Taj)"
icon_state = "taj_earsout" icon_state = "taj_earsout"
body_parts = list(BP_HEAD) body_parts = list(BP_HEAD)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_earsin taj_earsin
name = "Inner Ear (Taj)" name = "Inner Ear (Taj)"
icon_state = "taj_earsin" icon_state = "taj_earsin"
body_parts = list(BP_HEAD) body_parts = list(BP_HEAD)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_nose taj_nose
name = "Nose Color (Taj)" name = "Nose Color (Taj)"
icon_state = "taj_nose" icon_state = "taj_nose"
body_parts = list(BP_HEAD) body_parts = list(BP_HEAD)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_crest taj_crest
name = "Chest Fur Crest (Taj)" name = "Chest Fur Crest (Taj)"
icon_state = "taj_crest" icon_state = "taj_crest"
body_parts = list(BP_TORSO) body_parts = list(BP_TORSO)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_muzzle taj_muzzle
name = "Muzzle Color (Taj)" name = "Muzzle Color (Taj)"
icon_state = "taj_muzzle" icon_state = "taj_muzzle"
body_parts = list(BP_HEAD) body_parts = list(BP_HEAD)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_face taj_face
name = "Cheeks Color (Taj)" name = "Cheeks Color (Taj)"
icon_state = "taj_face" icon_state = "taj_face"
body_parts = list(BP_HEAD) body_parts = list(BP_HEAD)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
taj_all taj_all
name = "All Taj Head (Taj)" name = "All Taj Head (Taj)"
icon_state = "taj_all" icon_state = "taj_all"
body_parts = list(BP_HEAD) body_parts = list(BP_HEAD)
species_allowed = list("Tajara") species_allowed = list("Tajaran")
//Una specific stuff //Una specific stuff
una_face una_face
@@ -1352,7 +1352,7 @@
name = "Default tajaran skin" name = "Default tajaran skin"
icon_state = "default" icon_state = "default"
icon = 'icons/mob/human_races/r_tajaran.dmi' icon = 'icons/mob/human_races/r_tajaran.dmi'
species_allowed = list("Tajara") species_allowed = list("Tajaran")
unathi unathi
name = "Default Unathi skin" name = "Default Unathi skin"

1
code/modules/mob/transform_procs.dm
View File

@@ -83,6 +83,7 @@
add_language(LANGUAGE_SOL_COMMON, 1) add_language(LANGUAGE_SOL_COMMON, 1)
add_language(LANGUAGE_UNATHI, 1) add_language(LANGUAGE_UNATHI, 1)
add_language(LANGUAGE_SIIK, 1) add_language(LANGUAGE_SIIK, 1)
add_language(LANGUAGE_AKHANI, 1)
add_language(LANGUAGE_SKRELLIAN, 1) add_language(LANGUAGE_SKRELLIAN, 1)
add_language(LANGUAGE_TRADEBAND, 1) add_language(LANGUAGE_TRADEBAND, 1)
add_language(LANGUAGE_GUTTER, 1) add_language(LANGUAGE_GUTTER, 1)

2
code/modules/virus2/disease2.dm
View File

@@ -10,7 +10,7 @@
var/list/datum/disease2/effectholder/effects = list() var/list/datum/disease2/effectholder/effects = list()
var/antigen = list() // 16 bits describing the antigens, when one bit is set, a cure with that bit can dock here var/antigen = list() // 16 bits describing the antigens, when one bit is set, a cure with that bit can dock here
var/max_stage = 4 var/max_stage = 4
var/list/affected_species = list("Human","Unathi","Skrell","Tajara") var/list/affected_species = list("Human","Unathi","Skrell","Tajaran")
var/resistance = 10 // % chance a disease will resist cure, up to 100 var/resistance = 10 // % chance a disease will resist cure, up to 100
/datum/disease2/disease/New() /datum/disease2/disease/New()

1
code/stylesheet.dm
View File

@@ -91,6 +91,7 @@ h1.alert, h2.alert {color: #000000;}
.alien {color: #543354;} .alien {color: #543354;}
.tajaran {color: #803B56;} .tajaran {color: #803B56;}
.tajaran_signlang {color: #941C1C;} .tajaran_signlang {color: #941C1C;}
.akhani {color: #AC398C;}
.skrell {color: #00B0B3;} .skrell {color: #00B0B3;}
.skrellfar {color: #70FCFF;} .skrellfar {color: #70FCFF;}
.soghun {color: #228B22;} .soghun {color: #228B22;}

8
html/changelogs/example - Copy.yml Normal file
View File

@@ -0,0 +1,8 @@
author: Cerebulon
delete-after: True
changes:
- rscadd: "Added Akhani language for Tajaran."
- spellcheck: "Fixed incorrect singular form of Tajaran in several places."