From 7a6265f37673d483dc7652c0a5c48d481d7463b7 Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Fri, 22 Feb 2019 12:37:32 -0800 Subject: [PATCH] Removes Trad Rus Removes Trad-Rus, as it was redundant Renames Elysian to Elysiun Changes descriptions of both languages to better fit common usage. Changes Russkiya lang key to > --- code/modules/mob/language.dm | 28 +++++++------------ code/modules/mob/living/silicon/ai/ai.dm | 5 ++-- .../living/silicon/pai/software_modules.dm | 6 ++-- .../mob/living/silicon/robot/robot_modules.dm | 3 +- goon/browserassets/css/browserOutput-dark.css | 2 +- goon/browserassets/css/browserOutput.css | 2 +- 6 files changed, 17 insertions(+), 29 deletions(-) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index 5793a595cf6..b853518f589 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -429,12 +429,12 @@ //Out of system languages (non-standard, but still common) /datum/language/com_srus name = "Neo-Russkiya" - desc = "Neo-Russkiya, a bastard mix of Gutter, Sol Common, and old Russian. Maintained primarily by USSP citizens and fringe traders." + desc = "Neo-Russkiya, a bastard mix of Gutter, Sol Common, and old Russian. The official language of the USSP. It has started to see use outside of the fringe in hobby circles and protest groups. The linguistic spirit of Sol-Gov criticisms." speech_verb = "articulates" whisper_verb = "mutters" exclaim_verb = "exaggerates" colour = "com_srus" - key = "<" + key = ">" space_chance = 65 english_names = 1 syllables = list("dyen","bar","bota","vyek","tvo","slov","slav","syen","doup","vah","laz","gloz","yet", @@ -447,28 +447,20 @@ "tizan","chka","tagan","dobry","okt","boda","veta","idi","cyk","blyt","hui","na", "udi","litchki","casa","linka","toly","anatov","vich","vech","vuch","toi","ka","vod") -//Trad space russkiya for event usage, like USSP officials or operatives. Child of com_srus since same syllables. -/datum/language/com_srus/trad_srus - name = "Traditional Russkiya" - desc = "A more formalized form of Russkiya that attempts to (poorly) adhere to old Russian grammar and rules. The official langauge of the USSP." - colour = "trad_srus" - key = ">" - flags = RESTRICTED - -/datum/language/elysian - name = "Elysian" - desc = "A secretive winding language rarely spoken outside the Elysium Republic. It's often considered rude to speak in this tongue due to the Elysium Republic's stance on non-humans." +/datum/language/elysiun + name = "Elysiun" + desc = "A secretive winding language taught in the Elysium Republic. In a fit of counter-culture, the language has been flipped on its original connotation, finding popular use in cutting edge fine art and progessive movements, much to the Republic's outrage." speech_verb = "dulciquents" ask_verb = "interpolates" whisper_verb = "susurates" - colour = "elysian" + colour = "elysiun" key = "?" space_chance = 80 english_names = 1 - syllables = list("sull","omus","mi","hiw","jirik","fush","fushur","omie","mishur","rishur","lizu", - "soussur","ruju","omiemi","ilk","lurju","uru","wu","hulli","ulcesu","phrillium", - "wori","worouc","worus","worom","leom","huzu","wirr","jus","jusous","ramiw","huur", - "suu","shumu","frumk","kuesur","umiur","srull","worum","worom","phrouku","sephouk") + syllables = list("soilano","hosso","fo","noz","ossomo","fef","rin","blino","lino","hobline","newo","olz","zan","zar" + "zin","zop","lab","oaz","boaz","zralo","frin","riveb","sowol","ralabo","noi","alo","e am","hof","zhamo" + "fleob","ofoman","farhol","morhol","zafri","ossizo","vlol","som","vondo","yalaz","el","ed","ert","et" + "flet","het","bet","fet","fot","fhot","fhlet","vhon","dofov","zalay","foy","soilany","soil","schlyt","zet") /datum/language/wryn name = "Wryn Hivemind" diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 5aecc29fdb8..ade321abe85 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -172,9 +172,8 @@ var/list/ai_verbs_default = list( add_language("Galactic Common", 1) add_language("Sol Common", 1) add_language("Tradeband", 1) - add_language("Neo-Russkiya", 1) - add_language("Traditional Russkiya", 0) - add_language("Elysian", 0) + add_language("Neo-Russkiya", 0) + add_language("Elysiun", 0) add_language("Gutter", 0) add_language("Sinta'unathi", 0) add_language("Siik'tajr", 0) diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index d6042fc4a5d..133cc2ce9ba 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -515,9 +515,8 @@ user.add_language("Bubblish") user.add_language("Orluum") user.add_language("Clownish") - user.add_language("Elysian") + user.add_language("Elysiun") user.add_language("Neo-Russkiya") - user.add_language("Traditional Russkiya") else user.remove_language("Sinta'unathi") user.remove_language("Siik'tajr") @@ -529,9 +528,8 @@ user.remove_language("Bubblish") user.remove_language("Orluum") user.remove_language("Clownish") - user.remove_language("Elysian") + user.remove_language("Elysiun") user.remove_language("Neo-Russkiya") - user.remove_language("Traditional Russkiya") /datum/pai_software/translator/is_active(mob/living/silicon/pai/user) return user.translator_on diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 5a7c882a43f..38c2a8974a6 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -78,9 +78,8 @@ R.add_language("Sol Common", 1) R.add_language("Tradeband", 1) R.add_language("Gutter", 0) - R.add_language("Elysian", 0) + R.add_language("Elysiun", 0) R.add_language("Neo-Russkiya", 0) - R.add_language("Traditional Russkiya", 0) R.add_language("Sinta'unathi", 0) R.add_language("Siik'tajr", 0) R.add_language("Canilunzt", 0) diff --git a/goon/browserassets/css/browserOutput-dark.css b/goon/browserassets/css/browserOutput-dark.css index 4200fcd52c8..e773fc96091 100644 --- a/goon/browserassets/css/browserOutput-dark.css +++ b/goon/browserassets/css/browserOutput-dark.css @@ -336,7 +336,7 @@ h1.alert, h2.alert {color: #FFF;} .solcom {color: #8282FB;} .trad_srus {color: #775555;} .com_srus {color: #7c4848;} -.elysian {color: #909964;} +.elysiun {color: #909964;} .soghun {color: #228B22;} .changeling {color: #800080;} .vox {color: #AA00AA;} diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css index f5981bf28e4..4fe3cf26ff1 100644 --- a/goon/browserassets/css/browserOutput.css +++ b/goon/browserassets/css/browserOutput.css @@ -333,7 +333,7 @@ h1.alert, h2.alert {color: #000000;} .solcom {color: #22228B;} .trad_srus {color: #775555;} .com_srus {color: #7c4848;} -.elysian {color: #909964;} +.elysiun {color: #909964;} .soghun {color: #228B22;} .changeling {color: #800080;} .vox {color: #AA00AA;}