cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds Siik'tajr

Browse Source
This commit is contained in:
mwerezak
2014-05-16 23:15:05 -04:00
parent 7d1c5e7824
commit d8ca221c44
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/language.dm
View File

@@ -20,13 +20,21 @@
flags = WHITELISTED flags = WHITELISTED
/datum/language/tajaran /datum/language/tajaran
name = "Siik'Mas" //should be Siik'Mas as per lore. name = "Siik'maas"
desc = "An expressive language that combines yowls and chirps with posture, tail and ears. Native to the Tajaran." desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran."
speech_verb = "mrowls" speech_verb = "mrowls"
colour = "tajaran" colour = "tajaran"
key = "j" key = "j"
flags = WHITELISTED flags = WHITELISTED
/datum/language/tajaran_sign
name = "Siik'tajr"
desc = "An expressive language that combines yowls and chirps with posture, tail and ears. Spoken by many Tajaran."
speech_verb = "mrowls"
colour = "tajaran"
key = "y" //only "dfpqyz" left.
flags = WHITELISTED | NONVERBAL
/datum/language/skrell /datum/language/skrell
name = "Skrellian" name = "Skrellian"
desc = "A melodic and complex language spoken by the Skrell of Qerrbalak. Some of the notes are inaudible to humans." desc = "A melodic and complex language spoken by the Skrell of Qerrbalak. Some of the notes are inaudible to humans."

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

@@ -154,7 +154,7 @@
name = "Tajaran" name = "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'
language = "Siik'tajr" language = "Siik'maas"
tail = "tajtail" tail = "tajtail"
attack_verb = "scratch" attack_verb = "scratch"
punch_damage = 5 punch_damage = 5

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

@@ -97,7 +97,8 @@ var/list/ai_list = list()
//Languages //Languages
add_language("Sol Common", 0) add_language("Sol Common", 0)
add_language("Sinta'unathi", 0) add_language("Sinta'unathi", 0)
add_language("Siik'Mas", 0) add_language("Siik'maas", 0)
add_language("Siik'tajr", 0)
add_language("Skrellian", 0) add_language("Skrellian", 0)
add_language("Rootspeak", 0) add_language("Rootspeak", 0)
add_language("Tradeband", 1) add_language("Tradeband", 1)

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

@@ -231,7 +231,8 @@
//full set of languages //full set of languages
R.add_language("Sol Common", 1) R.add_language("Sol Common", 1)
R.add_language("Sinta'unathi", 1) R.add_language("Sinta'unathi", 1)
R.add_language("Siik'Mas", 1) R.add_language("Siik'maas", 1)
R.add_language("Siik'tajr", 0)
R.add_language("Skrellian", 1) R.add_language("Skrellian", 1)
R.add_language("Rootspeak", 1) R.add_language("Rootspeak", 1)
R.add_language("Tradeband", 1) R.add_language("Tradeband", 1)

2
code/modules/mob/say.dm
View File

@@ -90,7 +90,7 @@
//Language check. //Language check.
for(var/datum/language/L in src.languages) for(var/datum/language/L in src.languages)
if(speaking.name == L.name) if(speaking.name == L.name)
if (L.flags & NONVERBAL && (!(other in view(src))) if ((L.flags & NONVERBAL) && !(other in view(src)))
return 0 return 0
return 1 return 1