Merge branch 'master' into pockets-please

Signed-off-by: kittysmooch <[email protected]>

code/modules/surgery/organs/internal/tongue/_tongue.dm

@@ -89,6 +89,7 @@
 		/datum/language/shadowtongue,
 		/datum/language/terrum,
 		/datum/language/nekomimetic,
+		/datum/language/yangyu, //DOPPLER ADDITION
 	)
 
 /obj/item/organ/internal/tongue/proc/handle_speech(datum/source, list/speech_args)

html/changelogs/AutoChangeLog-pr-9.yml

@@ -0,0 +1,4 @@
+author: "kittysmooch"
+delete-after: True
+changes:
+  - rscadd: "you can now speak yangyu :3c\n:cl:"

modular_doppler/languages/language_datums.dm

@@ -0,0 +1,22 @@
+/datum/language/yangyu
+	name = "Yangyu"
+	desc = "Also popularly known as \"Konjin\", this language group formally regarded as Orbital Sino-Tibetan is a result of a genetic relationship between Chinese, Tibetan, Burmese, and other Human languages of similar characteristics that was first proposed in the early 19th century and is extremely popular even in the space age. Originating from Asia, this group of tongues is the second most spoken by Human and Human-derived populations since the birth of Sol Common - and was a primary contender to be the Sol Federation's official language. Many loanwords, idioms, and cultural relics of Japanese, Ryukyuan, Korean, and other societies have managed to persist within it, especially in the daily lives of speakers coming from Martian cities."
+	key = "Y"
+	flags = TONGUELESS_SPEECH
+	space_chance = 70
+	// Entirely Chinese save for the isolated 2 "nya" style syllables. I don't want to bloat the syllable list with other mixes, but they generally sound somewhat alike.
+	syllables = list (
+		"ai", "ang", "bai", "beng", "bian", "biao", "bie", "bing", "cai", "can", "cao", "cei", "ceng", "chai", "chan", "chang",
+		"chen", "chi", "chong", "chou", "chu", "chuai", "chuang", "chui", "chun", "dai", "dao", "dang", "deng", "diao", "dong", "duan",
+		"fain", "fang", "feng", "fou", "gai", "gang", "gao", "gong", "guai", "guang", "hai", "han", "hang", "hao", "heng", "huai", "ji", "jiang",
+		"jiao", "jin", "jun", "kai", "kang", "kong", "kuang", "lang", "lao", "liang", "ling", "long", "luan", "mao", "meng", "mian", "miao",
+		"ming", "miu", "nyai", "nang", "nao", "neng", "nyang", "nuan", "qi", "qiang", "qiao", "quan", "qing", "sen", "shang", "shao", "shuan", "song", "tai",
+		"tang", "tian", "tiao", "tong", "tuan", "wai", "wang", "wei", "weng", "xi", "xiang", "xiao", "xie", "xin", "xing", "xiong", "xiu", "xuan", "xue", "yan", "yang",
+		"yao", "yin", "ying", "yong", "yuan", "zang", "zao", "zeng", "zhai", "zhang",
+		"zhen", "zhi", "zhuai", "zhui", "zou", "zun", "zuo"
+	)
+	icon_state = "hanzi"
+	icon = 'modular_doppler/languages/language.dmi'
+	default_priority = 94
+	default_name_syllable_min = 1
+	default_name_syllable_max = 2

tgstation.dme

@@ -6361,6 +6361,7 @@
 #include "modular_doppler\emotes\code\added_emotes\human_things.dm"
 #include "modular_doppler\emotes\code\added_emotes\robot_sounds.dm"
 #include "modular_doppler\face_mouse_preferences\code\face_mouse_pref.dm"
+#include "modular_doppler\languages\language_datums.dm"
 #include "modular_doppler\modular_cosmetics\code\jacket_pockets.dm"
 #include "modular_doppler\modular_cosmetics\code\suits\jacket.dm"
 #include "modular_doppler\wargaming\code\game_kit.dm"