From 184ad84582da625ab3dab9c1909adf5a0bdd88d1 Mon Sep 17 00:00:00 2001
From: L <105110468+kittysmooch@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:08:29 -0700
Subject: [PATCH 1/2] adds yangyu

---
 .../surgery/organs/internal/tongue/_tongue.dm |   1 +
 modular_doppler/languages/language.dmi        | Bin 0 -> 4476 bytes
 modular_doppler/languages/language_datums.dm  |  22 ++++++++++++++++++
 tgstation.dme                                 |   5 ++++
 4 files changed, 28 insertions(+)
 create mode 100644 modular_doppler/languages/language.dmi
 create mode 100644 modular_doppler/languages/language_datums.dm

diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm
index fa034acf22bd7..13c1a8e881ede 100644
--- a/code/modules/surgery/organs/internal/tongue/_tongue.dm
+++ b/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)
diff --git a/modular_doppler/languages/language.dmi b/modular_doppler/languages/language.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..5ece55bc6f3a8eb04d491578829367437e741830
GIT binary patch
literal 4476
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
O0000<MNUMnLSTZ>cx{0I

literal 0
HcmV?d00001

diff --git a/modular_doppler/languages/language_datums.dm b/modular_doppler/languages/language_datums.dm
new file mode 100644
index 0000000000000..5e3212ccfa52a
--- /dev/null
+++ b/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
diff --git a/tgstation.dme b/tgstation.dme
index 2931b5c6e8ace..2bc9b7e86af75 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6361,6 +6361,11 @@
 #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\modular_food_and_drinks\drinks_recipes.dm"
+#include "modular_doppler\vending_machines\code\vendor_containers.dm"
+#include "modular_doppler\vending_machines\code\vendor_food.dm"
+#include "modular_doppler\vending_machines\code\vendor_snacks.dm"
+#include "modular_doppler\vending_machines\code\vendors.dm"
 #include "modular_doppler\wargaming\code\game_kit.dm"
 #include "modular_doppler\wargaming\code\holograms.dm"
 #include "modular_doppler\wargaming\code\projectors.dm"

From 1ad301ddc7b4c96b08af4df2a98020b8d21cae91 Mon Sep 17 00:00:00 2001
From: L <105110468+kittysmooch@users.noreply.github.com>
Date: Mon, 26 Aug 2024 12:20:02 -0700
Subject: [PATCH 2/2] i hate the includeschrist

---
 tgstation.dme | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tgstation.dme b/tgstation.dme
index 2bc9b7e86af75..0917f111b8928 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6361,11 +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\modular_food_and_drinks\drinks_recipes.dm"
-#include "modular_doppler\vending_machines\code\vendor_containers.dm"
-#include "modular_doppler\vending_machines\code\vendor_food.dm"
-#include "modular_doppler\vending_machines\code\vendor_snacks.dm"
-#include "modular_doppler\vending_machines\code\vendors.dm"
+#include "modular_doppler\languages\language_datums.dm"
 #include "modular_doppler\wargaming\code\game_kit.dm"
 #include "modular_doppler\wargaming\code\holograms.dm"
 #include "modular_doppler\wargaming\code\projectors.dm"