Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-11-17 12:42:55 +00:00
135 changed files with 193190 additions and 151466 deletions

View File

@@ -69,7 +69,7 @@
colour = "enochian" //So fancy
key = "i"
syllables = list("salve","sum","loqui","operatur","iusta","et","permittit","facere","effercio","pluribus","enim","hoc",
"mihi","wan","six","salve","tartu")
"mihi","wan","six","tartu")
machine_understands = FALSE
/datum/language/tajsign
@@ -81,17 +81,28 @@
flags = SIGNLANG | NO_STUTTER | NONVERBAL // | WHITELISTED (YWEdit)
/datum/language/bug
name = LANGUAGE_VESPINAE
desc = "A jarring and clicky language developed and used by Vasilissans, it is designed for use with mouthparts and as a result has become a common language for various arthropod species."
speech_verb = "clicks"
ask_verb = "chitters"
exclaim_verb = "rasps"
colour = "bug"
key = "x"
syllables = list("vaur","uyek","uyit","avek","sc'theth","k'ztak","teth","wre'ge","lii","dra'","zo'","ra'","kax'","zz","vh","ik","ak",
name = LANGUAGE_VESPINAE
desc = "A jarring and clicky language developed and used by Vasilissans, it is designed for use with mouthparts and as a result has become a common language for various arthropod species."
speech_verb = "clicks"
ask_verb = "chitters"
exclaim_verb = "rasps"
colour = "bug"
key = "x"
syllables = list("vaur","uyek","uyit","avek","sc'theth","k'ztak","teth","wre'ge","lii","dra'","zo'","ra'","kax'","zz","vh","ik","ak",
"uhk","zir","sc'orth","sc'er","thc'yek","th'zirk","th'esk","k'ayek","ka'mil","sc'","ik'yir","yol","kig","k'zit","'","'","zrk","krg","isk'yet","na'k",
"sc'azz","th'sc","nil","n'ahk","sc'yeth","aur'sk","iy'it","azzg","a'","i'","o'","u'","a","i","o","u","zz","kr","ak","nrk","tzzk","bz","xic'","k'lax'","histh")
/datum/language/shadekin
name = LANGUAGE_SHADEKIN
desc = "Shadekin seem to always know what the others are thinking. This is probably why."
speech_verb = "mars"
ask_verb = "mars"
exclaim_verb = "mars"
colour = "changeling"
key = "m"
machine_understands = FALSE
flags = WHITELISTED | HIVEMIND
/datum/language/human/slavic
name = LANGUAGE_SLAVIC
desc = "The official language of the Independent Colonial Confederation of Gilgamesh, originally established in 2122 by the short-lived United Slavic Confederation on Earth."