diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm index 440874ffd2e..626da0e6e89 100644 --- a/code/__defines/species_languages.dm +++ b/code/__defines/species_languages.dm @@ -39,6 +39,7 @@ // Species languages #define LANGUAGE_SOL_COMMON "Sol Common" +#define LANGUAGE_ELYRAN_STANDARD "Elyran Standard" #define LANGUAGE_UNATHI "Sinta'unathi" #define LANGUAGE_SIIK_MAAS "Siik'maas" #define LANGUAGE_SIIK_TAJR "Siik'tajr" diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm index a1fa9b5565e..662c8540873 100644 --- a/code/modules/admin/verbs/bluespacetech.dm +++ b/code/modules/admin/verbs/bluespacetech.dm @@ -106,6 +106,7 @@ // Other station species' languages bst.add_language(LANGUAGE_SKRELLIAN) bst.add_language(LANGUAGE_SOL_COMMON) + bst.add_language(LANGUAGE_ELYRAN_STANDARD) bst.add_language(LANGUAGE_ROOTSONG) bst.add_language(LANGUAGE_VAURCA) // Synthetics diff --git a/code/modules/ghostroles/spawner/human/responseteams/human/elyra.dm b/code/modules/ghostroles/spawner/human/responseteams/human/elyra.dm index 84df23b041d..688d0e7d937 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/human/elyra.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/human/elyra.dm @@ -8,7 +8,7 @@ outfit = /datum/outfit/admin/ert/elyran_trooper possible_species = list(SPECIES_HUMAN) - extra_languages = list(LANGUAGE_SOL_COMMON) + extra_languages = list(LANGUAGE_ELYRAN_STANDARD) /datum/ghostspawner/human/ert/elyra/leader short_name = "elyra_leadertrooper" diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index 79fd9543a48..e43096c05cb 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -358,6 +358,7 @@ h1.alert, h2.alert {color: #a4bad6;} .vaurca {color: #b9b943;} .soghun {color: #2cad2c;} .solcom {color: #5f5fd4;} +.elyran {color: #e2bb4e;} .soghun_alt {color: #1d9b1d;} .changeling {color: #ad14ad;} .rough {font-family: "Trebuchet MS", cursive, sans-serif;} diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css index 80340a6d81a..5b6f1f6775f 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput_white.css +++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css @@ -355,6 +355,7 @@ h1.alert, h2.alert {color: #000080;} .vaurca {color: #9e9e39;} .soghun {color: #228B22;} .solcom {color: #22228B;} +.elyran {color: #c79322;} .soghun_alt {color: #024402;} .changeling {color: #800080;} .rough {font-family: "Trebuchet MS", cursive, sans-serif;} diff --git a/code/modules/goonchat/browserassets/css/styles_template.css b/code/modules/goonchat/browserassets/css/styles_template.css index 2a13df5ddbe..3ab0a06ebca 100644 --- a/code/modules/goonchat/browserassets/css/styles_template.css +++ b/code/modules/goonchat/browserassets/css/styles_template.css @@ -325,6 +325,7 @@ h1.alert, h2.alert {color: #000080;} .vaurca {color: #9e9e39;} .soghun {color: #228B22;} .solcom {color: #22228B;} +.elyran {color: #c79322;} .soghun_alt {color: #024402;} .changeling {color: #800080;} .rough {font-family: "Trebuchet MS", cursive, sans-serif;} diff --git a/code/modules/mob/language/generic.dm b/code/modules/mob/language/generic.dm index 7be04cc94c5..1ffaa0e37eb 100644 --- a/code/modules/mob/language/generic.dm +++ b/code/modules/mob/language/generic.dm @@ -80,7 +80,7 @@ signlang_verb = list("signs", "gestures") sing_verb = null colour = "i" - key = "4" + key = "s" flags = NO_STUTTER|SIGNLANG // Helper diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index 7f29cdaf67d..ccfe8622661 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -298,6 +298,20 @@ else return ..() +//Placeholder stuff for now, a lot of it +/datum/language/elyran + name = LANGUAGE_ELYRAN_STANDARD + short = "ELY" + desc = "Elyran Standard is the official tongue of the Republic of Elyra. Constructed using elements of Farsi, Arabic, and Turkish, influence from all three of these languages can be seen throughout its grammar and vocabulary." + colour = "elyran" + written_style = "elyranstandard" + key = "4" + flags = WHITELISTED | TCOMSSIM + syllables = list("af", "if", "ba", "ta", "tha", "id", "jem", "ha", "kha", "dal", "dhl", "ra", "zay", "sen", "um", "shn", "sid", "ad", "ta", "za", "ayn", "gha", "zir", "yn", "fa", "qaf", "iam", "mim", "al", "ja", "non", "ha", "waw", "ya", + "hem", "zah", "hml", "ks", "ini", "da", "ks", "iga", "ih", "la", "ulf", "xe", "ayw", "sit", "ah", "aarah", "jalaa", "sirt", "kurt", "turhk", "ust", "irk", "kir", "mir", "ach", "oglu", "bolu", "shek", "she", "ghoz", "miya", "ejdan", + "haaz", "quq", "taab", "shanha", "an", "saa", "seh", "an'", "e'", "a'", "em'") + allow_accents = TRUE + /datum/language/machine name = LANGUAGE_EAL short = "EAL" diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index cb4bb5e4765..32f4b6cfdfb 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -244,6 +244,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin) /mob/living/carbon/human/terminator/Initialize(mapload) . = ..(mapload, SPECIES_IPC_TERMINATOR) add_language(LANGUAGE_SOL_COMMON, 1) + add_language(LANGUAGE_ELYRAN_STANDARD, 1) add_language(LANGUAGE_UNATHI, 1) add_language(LANGUAGE_SIIK_MAAS, 1) add_language(LANGUAGE_SKRELLIAN, 1) diff --git a/code/modules/mob/living/carbon/human/species/station/human/human.dm b/code/modules/mob/living/carbon/human/species/station/human/human.dm index 77777140304..b79883b2974 100644 --- a/code/modules/mob/living/carbon/human/species/station/human/human.dm +++ b/code/modules/mob/living/carbon/human/species/station/human/human.dm @@ -24,7 +24,7 @@ megacorporations have sparked secretive factions to fight their influence, while there is always the risk of someone digging too \ deep into the secrets of the galaxy..." num_alternate_languages = 2 - secondary_langs = list(LANGUAGE_SOL_COMMON) + secondary_langs = list(LANGUAGE_SOL_COMMON, LANGUAGE_ELYRAN_STANDARD) name_language = null // Use the first-name last-name generator rather than a language scrambler mob_size = 9 spawn_flags = CAN_JOIN diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 042b541d337..12b3bdb1972 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -158,6 +158,7 @@ var/list/ai_verbs_default = list( add_language(LANGUAGE_ROBOT, TRUE) add_language(LANGUAGE_TCB, TRUE) add_language(LANGUAGE_SOL_COMMON, FALSE) + add_language(LANGUAGE_ELYRAN_STANDARD, FALSE) add_language(LANGUAGE_UNATHI, FALSE) add_language(LANGUAGE_SIIK_MAAS, FALSE) add_language(LANGUAGE_SKRELLIAN, FALSE) diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm index 65124885cad..d4c0eeda6b0 100644 --- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm +++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm @@ -4,6 +4,7 @@ networks = list(NETWORK_COMMAND) languages = list( LANGUAGE_SOL_COMMON = TRUE, + LANGUAGE_ELYRAN_STANDARD = TRUE, LANGUAGE_TRADEBAND = TRUE, LANGUAGE_UNATHI = TRUE, LANGUAGE_SIIK_MAAS = TRUE, diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 1480e4a95f0..366b9e520a4 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -174,6 +174,7 @@ //Default languages without universal translator software add_language(LANGUAGE_SOL_COMMON, 1) + add_language(LANGUAGE_ELYRAN_STANDARD, 1) add_language(LANGUAGE_TRADEBAND, 1) add_language(LANGUAGE_GUTTER, 1) add_language(LANGUAGE_EAL, 1) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 82bbd772f88..eaacf5d79d0 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -22,6 +22,7 @@ var/global/list/robot_modules = list( var/networks = list() var/languages = list( //Any listed language will be understandable. Any set to TRUE will be speakable LANGUAGE_SOL_COMMON = TRUE, + LANGUAGE_ELYRAN_STANDARD = TRUE, LANGUAGE_TRADEBAND = TRUE, LANGUAGE_UNATHI = FALSE, LANGUAGE_SIIK_MAAS = FALSE, @@ -608,6 +609,7 @@ var/global/list/robot_modules = list( networks = list(NETWORK_SERVICE) languages = list( LANGUAGE_SOL_COMMON = TRUE, + LANGUAGE_ELYRAN_STANDARD = TRUE, LANGUAGE_TRADEBAND = TRUE, LANGUAGE_UNATHI = TRUE, LANGUAGE_SIIK_MAAS = TRUE, @@ -839,6 +841,7 @@ var/global/list/robot_modules = list( name = "syndicate robot module" languages = list( LANGUAGE_SOL_COMMON = TRUE, + LANGUAGE_ELYRAN_STANDARD = TRUE, LANGUAGE_TRADEBAND = TRUE, LANGUAGE_UNATHI = TRUE, LANGUAGE_SIIK_MAAS = TRUE, @@ -1084,6 +1087,7 @@ var/global/list/robot_modules = list( name = "bluespace robot module" languages = list( LANGUAGE_TCB = TRUE, + LANGUAGE_ELYRAN_STANDARD = TRUE, LANGUAGE_GUTTER = TRUE, LANGUAGE_SIGN = TRUE, LANGUAGE_TRADEBAND = TRUE, diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index 1bd09ceba4b..012ad27db45 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -63,7 +63,8 @@ //Language macros interpreter.SetVar("L_BASIC", LANGUAGE_TCB) - interpreter.SetVar("L_SOL", LANGUAGE_SOL_COMMON) + interpreter.SetVar("L_SOL", LANGUAGE_SOL_COMMON) + interpreter.SetVar("L_ELYRAN", LANGUAGE_ELYRAN_STANDARD) interpreter.SetVar("L_TRADE", LANGUAGE_TRADEBAND) interpreter.SetVar("L_GUTTER", LANGUAGE_GUTTER) interpreter.SetVar("L_MAAS", LANGUAGE_SIIK_MAAS) diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 82ed522058e..9b17771c5a7 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -98,6 +98,7 @@ h1.alert, h2.alert {color: #000000;} .vaurca {color: #9e9e39;} .soghun {color: #228B22;} .solcom {color: #22228B;} +.elyran {color: #c79322;} .soghun_alt {color: #024402;} .changeling {color: #800080;} .rough {font-family: "Trebuchet MS", cursive, sans-serif;} diff --git a/html/browser/paper_languages.css b/html/browser/paper_languages.css index c0dd598c3f5..1c7c426e332 100644 --- a/html/browser/paper_languages.css +++ b/html/browser/paper_languages.css @@ -33,6 +33,9 @@ .solcommon.understood { font-family: mo5v56; } .solcommon.scramble { font-family: ducados; } +.elyranstandard.understood {font-family: gelasio; } +.elyranstandard.scramble {font-family: mo5v56; } + .tradeband.understood { font-family: gelasio; } .tradeband.scramble { font-family: gelasio; } diff --git a/html/changelogs/omicega-fgokdsfgodsfgodsfgods.yml b/html/changelogs/omicega-fgokdsfgodsfgodsfgods.yml new file mode 100644 index 00000000000..b76c32b7d11 --- /dev/null +++ b/html/changelogs/omicega-fgokdsfgodsfgodsfgods.yml @@ -0,0 +1,16 @@ + + +# Your name. +author: Omicega + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added the new language Elyran Standard, selectable by humans and IPCs. Its language key is ,4." + - tweak: "Moves the Sign Language language key to ,s from ,4." \ No newline at end of file