diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm index 1f8106e5188..048a648a66f 100644 --- a/code/modules/background/accent/human.dm +++ b/code/modules/background/accent/human.dm @@ -7,10 +7,10 @@ /datum/accent/coc name = ACCENT_COC description = "The frontier is home to an unknowably vast amount of humans and settlements, covering everything from small outposts of only a few hundred to major planets such as \ - Xanu Prime. The Frontiersfolk are as diverse as their accents are, but the most common \"frontier accent\" is generally regarded as that of Xanu Prime - the arguable capital of \ - the massive Coalition of Colonies." + Xanu Prime. It is difficult to define a standard \"Coalition accent,\" or dialect due to the diversity and regionalism of the Coalition, along with its lack of a strong central government. \ + Solarian linguists generally define the Coalition dialect as an umbrella encompassing all Freespeak native speakers not from a major settlement of the Coalition." tag_icon = "coalition" - text_tag = "COC" + text_tag = "COA" /datum/accent/elyra name = ACCENT_ELYRA @@ -203,6 +203,14 @@ tag_icon = "earth" text_tag = "EAR" +/datum/accent/xanu + name = ACCENT_XANU + description = "The Xanu Standard dialect is arguably the most notable Freespeak dialect. Xanu Standard first emerged as an informal creole designed to make communication between the various nationalities \ + who settled the planet more easily and possessed loan words from upwards of a half-dozen languages during this early period. Over time this creole would morph into the Xanu Standard dialect of Freespeak \ + and is arguably the oldest and most widespread of the 25th century's common Freespeak dialects. Freespeak taught abroad, such as in the Serene Republic of Elyra and Republic of Biesel, is most often based upon the Xanu Standard dialect." + tag_icon = "xanu" + text_tag = "XAN" + /datum/accent/ncf name = ACCENT_NCF description = "The non-Coalition frontier 'accent' is not a true accent in of itself, but is instead used as a catch-all term for human accents originating outside of the frontier controlled by the Coalition of Colonies. \ diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index 67de22211c1..57c48dda1e3 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -102,6 +102,7 @@ #define ACCENT_NEWSUEZ "New Suez" #define ACCENT_DAMASCUS "Damascus II" #define ACCENT_ANTILLIA "Port Antillia" +#define ACCENT_XANU "Xanu" #define ACCENT_REPUBICLANSIIK "Republican Siik'maas" #define ACCENT_NAZIRASIIK "Nazira Siik'maas" @@ -150,5 +151,5 @@ #define ACCENT_LIIDRA "Lii'draic" #define ACCENTS_ALL_IPC_SOL list(ACCENT_SOL, ACCENT_EARTH, ACCENT_SILVERSUN_ORIGINAL, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_MARTIAN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_EUROPA, ACCENT_PHONG, ACCENT_ERIDANI, ACCENT_PLUTO, ACCENT_MICTLAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_TTS) -#define ACCENTS_ALL_IPC list(ACCENT_CETI, ACCENT_TTS, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ERIDANIREINSTATED, ACCENT_SOL, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_PHONG, ACCENT_MARTIAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_HIMEO, ACCENT_VYSOKA, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_NCF, ACCENT_PLUTO, ACCENT_ASSUNZIONE, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN, ACCENT_PERSEPOLIS, ACCENT_MEDINA, ACCENT_NEWSUEZ, ACCENT_AEMAQ, ACCENT_DAMASCUS) +#define ACCENTS_ALL_IPC list(ACCENT_CETI, ACCENT_TTS, ACCENT_XANU, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ERIDANIREINSTATED, ACCENT_SOL, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_PHONG, ACCENT_MARTIAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_HIMEO, ACCENT_VYSOKA, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_NCF, ACCENT_PLUTO, ACCENT_ASSUNZIONE, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN, ACCENT_PERSEPOLIS, ACCENT_MEDINA, ACCENT_NEWSUEZ, ACCENT_AEMAQ, ACCENT_DAMASCUS) #define RELIGIONS_ALL_IPC list(RELIGION_NONE, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_BUDDHISM, RELIGION_HINDU, RELIGION_TAOISM, RELIGION_JUDAISM, RELIGION_OTHER, RELIGION_TRINARY, RELIGION_SCARAB, RELIGION_LUCEISM, RELIGION_SHINTO) \ No newline at end of file diff --git a/code/modules/background/origins/origins/human/coalition.dm b/code/modules/background/origins/origins/human/coalition.dm index 48ce26fd768..f7efdf7dcdc 100644 --- a/code/modules/background/origins/origins/human/coalition.dm +++ b/code/modules/background/origins/origins/human/coalition.dm @@ -20,7 +20,7 @@ /decl/origin_item/origin/xanu_free_league name = "Xanu Free League" desc = "The Xanu Free League, and its capital of Xanu Prime, have long been considered some of the most important figures in the Coalition of Colonies. Xanusanii are a diverse body of people that value their freedom highly, and are known throughout the broader Spur as traders. Much of Xanu's surface remains uninhabitable due to damage inflicted upon the planet by the Solarian Alliance during the Interstellar War." - possible_accents = list(ACCENT_COC) + possible_accents = list(ACCENT_XANU, ACCENT_COC) possible_citizenships = CITIZENSHIPS_COALITION possible_religions = RELIGIONS_COALITION diff --git a/code/modules/background/origins/origins/ipc/coalition.dm b/code/modules/background/origins/origins/ipc/coalition.dm index aefb3808b16..07a9915fd4e 100644 --- a/code/modules/background/origins/origins/ipc/coalition.dm +++ b/code/modules/background/origins/origins/ipc/coalition.dm @@ -11,7 +11,7 @@ /decl/origin_item/origin/ipc_xanu name = "Xanu Prime" desc = "Considered the most advanced planet in the Coalition in terms of technology and infrastructure, Xanu Prime is the natural choice for many IPC living or escaping into the Frontier. The planet hosts a population of both free and owned synthetics, offering opportunities for work and citizenship as well as danger for refugees." - possible_accents = list(ACCENT_COC, ACCENT_TTS) + possible_accents = list(ACCENT_XANU, ACCENT_COC, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL, CITIZENSHIP_NONE) possible_religions = RELIGIONS_ALL_IPC diff --git a/code/modules/background/origins/origins/ipc/megacorporate.dm b/code/modules/background/origins/origins/ipc/megacorporate.dm index 58f746c209d..844dc062faf 100644 --- a/code/modules/background/origins/origins/ipc/megacorporate.dm +++ b/code/modules/background/origins/origins/ipc/megacorporate.dm @@ -20,7 +20,7 @@ /decl/origin_item/origin/hephaestus name = "Hephaestus Industries" desc = "Hephaestus Industries is known as the primary fabricator of IPCs in the Spur. Its own lines however focus mainly on strength and mining, the company fielding untold numbers of industrial frames for all sorts of excavation, cargo, and engineering operations, gaining them a sturdy reputation of durability and efficiency. The company is known to treat its IPCs fairly, albeit holding them to a higher standard than organics, and even offers synthetics who manage to purchase their freedom respectable positions within the company." - possible_accents = list(ACCENT_SOL, ACCENT_EARTH, ACCENT_MARTIAN, ACCENT_CETI, ACCENT_COC, ACCENT_NCF, ACCENT_PHONG, ACCENT_ERIDANI, ACCENT_VALKYRIE, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_TTS) + possible_accents = list(ACCENT_SOL, ACCENT_EARTH, ACCENT_MARTIAN, ACCENT_CETI, ACCENT_XANU, ACCENT_COC, ACCENT_NCF, ACCENT_PHONG, ACCENT_ERIDANI, ACCENT_VALKYRIE, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_TTS) possible_citizenships = list(CITIZENSHIP_NONE) possible_religions = list(RELIGION_NONE) @@ -43,6 +43,6 @@ /decl/origin_item/origin/nanotrasen name = "Nanotrasen" desc = "Nanotrasen, in keeping close ties with the Biesellite government, quietly and eagerly accepted IPCs into its workforce while carefully manipulating the books to ensure that very few would ever attain freedom. IPCs are a common but not ubiquitous sight on NanoTrasen installations and can be found working any number of roles. Although the company's treatment of IPCs is styled after Biesel's own attitude towards synthetics, it can vary wildly depending on where a positronic works and who exactly it works under." - possible_accents = list(ACCENT_CETI, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ERIDANIREINSTATED, ACCENT_SOL, ACCENT_SCARAB, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_PHONG, ACCENT_MARTIAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_HIMEO, ACCENT_VYSOKA, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_NCF, ACCENT_FISANDUH, ACCENT_PLUTO, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN) + possible_accents = list(ACCENT_CETI, ACCENT_XANU, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ERIDANIREINSTATED, ACCENT_SOL, ACCENT_SCARAB, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_PHONG, ACCENT_MARTIAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_HIMEO, ACCENT_VYSOKA, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_NCF, ACCENT_FISANDUH, ACCENT_PLUTO, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN) possible_citizenships = list(CITIZENSHIP_NONE) possible_religions = list(RELIGION_NONE) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 61179dc1f33..143678c2b80 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -56,7 +56,7 @@ var/list/possible_accents = list(ACCENT_TTS, ACCENT_CETI, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_SOL, ACCENT_LUNA, ACCENT_MARTIAN, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_KONYAN, ACCENT_EARTH, ACCENT_PERSEPOLIS, ACCENT_MEDINA, ACCENT_AEMAQ, ACCENT_NEWSUEZ, ACCENT_DAMASCUS, ACCENT_ERIDANI, ACCENT_PHONG, - ACCENT_VISEGRAD, ACCENT_HIMEO, ACCENT_PLUTO) + ACCENT_VISEGRAD, ACCENT_HIMEO, ACCENT_PLUTO, ACCENT_XANU) // Misc uv_intensity = 175 //Lights cast by robots have reduced effect on diona diff --git a/html/changelogs/omicega-fdsfsdfiomsdfiosfaaa.yml b/html/changelogs/omicega-fdsfsdfiomsdfiosfaaa.yml new file mode 100644 index 00000000000..3953bcae6d3 --- /dev/null +++ b/html/changelogs/omicega-fdsfsdfiomsdfiosfaaa.yml @@ -0,0 +1,13 @@ +# 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: "Adds a new accent specifically for Xanu Prime, in addition to the existing Frontiersfolk accent." diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index 019d30640db..798a7fa7d1b 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ