From aba12bdd542ec632d63d00abc4a8289dbafefb76 Mon Sep 17 00:00:00 2001 From: LachlanSyn Date: Mon, 30 Sep 2024 14:07:19 +0930 Subject: [PATCH 1/2] Adds Scandinavian language --- code/__DEFINES/language.dm | 7 ++++--- code/modules/character_traits/languages.dm | 5 +++++ code/modules/gear_presets/synths.dm | 2 +- code/modules/gear_presets/whiteout.dm | 2 +- code/modules/mob/language/languages.dm | 11 +++++++++++ 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm index e4c4041a3dda..94783891e351 100644 --- a/code/__DEFINES/language.dm +++ b/code/__DEFINES/language.dm @@ -3,6 +3,7 @@ #define LANGUAGE_CHINESE "Chinese" #define LANGUAGE_RUSSIAN "Russian" #define LANGUAGE_GERMAN "German" +#define LANGUAGE_SCANDINAVIAN "Scandinavian" #define LANGUAGE_SPANISH "Spanish" #define LANGUAGE_TSL "Tactical Sign Language" #define LANGUAGE_YAUTJA "Sainja" @@ -16,11 +17,11 @@ #define LANGUAGE_TELEPATH "Telepath Implant" -#define ALL_HUMAN_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH) +#define ALL_HUMAN_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH) -#define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH) +#define ALL_SYNTH_LANGUAGES list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH) -#define ALL_SYNTH_LANGUAGES_UPP list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH) +#define ALL_SYNTH_LANGUAGES_UPP list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH) //Chinese language sound bitflags diff --git a/code/modules/character_traits/languages.dm b/code/modules/character_traits/languages.dm index 8380afaa31ba..e5b70c45c8b5 100644 --- a/code/modules/character_traits/languages.dm +++ b/code/modules/character_traits/languages.dm @@ -40,6 +40,11 @@ applyable = TRUE cost = 1 +/datum/character_trait/language/scandinavian + language_name = LANGUAGE_SCANDINAVIAN + applyable = TRUE + cost = 1 + /datum/character_trait/language/spanish language_name = LANGUAGE_SPANISH applyable = TRUE diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 6b6d7eb2b89d..e28ef2e81f49 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -574,7 +574,7 @@ assignment = JOB_WORKING_JOE rank = JOB_WORKING_JOE skills = /datum/skills/working_joe - languages = list(LANGUAGE_ENGLISH, LANGUAGE_APOLLO, LANGUAGE_RUSSIAN, LANGUAGE_JAPANESE, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_CHINESE) + languages = list(LANGUAGE_ENGLISH, LANGUAGE_APOLLO, LANGUAGE_RUSSIAN, LANGUAGE_JAPANESE, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_CHINESE) /// Used to set species when loading race var/joe_type = SYNTH_WORKING_JOE diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 0a77ab7dcb41..3d9ef47a0e17 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -6,7 +6,7 @@ assignment = "Whiteout Team Operative" role_comm_title = "WO" rank = FACTION_WY_DEATHSQUAD - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH, LANGUAGE_TSL) //Synths after all. + languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH, LANGUAGE_TSL) //Synths after all. skills = /datum/skills/everything //They are Synths, programmed for Everything. idtype = /obj/item/card/id/pmc/ds paygrades = list(PAY_SHORT_CDNM = JOB_PLAYTIME_TIER_0) diff --git a/code/modules/mob/language/languages.dm b/code/modules/mob/language/languages.dm index cfa023c7d9cd..beaa7715439e 100644 --- a/code/modules/mob/language/languages.dm +++ b/code/modules/mob/language/languages.dm @@ -57,6 +57,17 @@ syllables = list("die", "das", "wein", "mir", "und", "wir", "ein", "nein", "gen", "en", "sauen", "bin", "nein", "rhein", "deut", "der", "lieb", "en", "stein", "nein", "ja", "wolle", "sil", "bei", "der", "sie", "sch", "kein", "nur", "ach", "kann", "volk", "vau", "gelb", "grun", "macht", "zwei", "vier", "nacht", "tag") +/datum/language/scandinavian + name = LANGUAGE_SCANDINAVIAN + desc = "While not technically one language, Scandinavian languages have grown similar and are nearly indistinguishable from one another unless you actually know the languages." + speech_verb = "blubbers" + ask_verb = "queries" + exclaim_verb = "yelps" + color = "blue" + key = "0" + + syllables = list("de", "vin", "meg", "og", "vi", "en", "nei", "ingen", "genet", "purke", "er", "nei", "hjort", "tysk", "de", "kjaere", "en", "stein", "ingen", "ja", "ull", "silke", "pa", "hun", "kj", "erg", "bare", "ol", "kyll", "menn", "esk", "gul", "gronn", "natt", "makt", "to", "fire", "dag", "god", "jul", "ild", "fem", "jeg", "deg") + /datum/language/spanish name = LANGUAGE_SPANISH desc = "The second most common language spoken in the UA, brought from marines from the Latin American territories and in the former southern USA." From dce30a51e43c75bf2293e1f9283953a1c141ef82 Mon Sep 17 00:00:00 2001 From: LachlanSyn Date: Mon, 30 Sep 2024 18:18:17 +0930 Subject: [PATCH 2/2] Updated styling to add Scandinavian, also redid syllables to make better mumbo --- code/modules/mob/language/languages.dm | 4 ++-- tgui/packages/tgui-panel/styles/goon/chat-dark.scss | 4 ++++ tgui/packages/tgui-panel/styles/goon/chat-light.scss | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/language/languages.dm b/code/modules/mob/language/languages.dm index beaa7715439e..9af698daa511 100644 --- a/code/modules/mob/language/languages.dm +++ b/code/modules/mob/language/languages.dm @@ -63,10 +63,10 @@ speech_verb = "blubbers" ask_verb = "queries" exclaim_verb = "yelps" - color = "blue" + color = "scandinavian" key = "0" - syllables = list("de", "vin", "meg", "og", "vi", "en", "nei", "ingen", "genet", "purke", "er", "nei", "hjort", "tysk", "de", "kjaere", "en", "stein", "ingen", "ja", "ull", "silke", "pa", "hun", "kj", "erg", "bare", "ol", "kyll", "menn", "esk", "gul", "gronn", "natt", "makt", "to", "fire", "dag", "god", "jul", "ild", "fem", "jeg", "deg") + syllables = list("de", "vin", "meg", "og", "vi", "en", "nei", "ing", "gen", "et", "pur", "ke", "er", "nei", "hjort", "tysk", "de", "kjae", "en", "stein", "ja", "ull", "sil", "pa", "hun", "kjo", "erg", "ba", "re", "ol", "kyll", "menn", "esk", "gul", "gronn", "natt", "makt", "to", "fi", "re", "dag", "god", "jul", "ild", "fem", "jeg", "deg", "bjor", "en", "russ", "land", "sve", "rig", "nor", "ge", "dan", "is") /datum/language/spanish name = LANGUAGE_SPANISH diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index a430d06b7a00..1f1cb498fe33 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -1391,6 +1391,10 @@ em { font-family: 'Times New Roman', Times, serif; } +.scandinavian { + color: #1e8f8c; +} + .spanish { color: #cf982b; } diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index 23ea05b1c9c1..2d7d8f860e76 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -1417,6 +1417,10 @@ h2.alert { font-family: 'Times New Roman', Times, serif; } +.scandinavian { + color: #1e8f8c; +} + .spanish { color: #cf982b; }