diff --git a/code/__defines/background.dm b/code/__defines/background.dm index 99a4d36297f..657f8b1f058 100644 --- a/code/__defines/background.dm +++ b/code/__defines/background.dm @@ -181,6 +181,7 @@ #define ACCENT_WAVESONG "Wavesong" #define ACCENT_SUNKENSONG "Sunkensong" #define ACCENT_STARSONG "Starsong" +#define ACCENT_XRIMSONG "Xrimsong" #define ACCENT_TTS "Text-to-Speech" diff --git a/code/modules/background/accent/diona.dm b/code/modules/background/accent/diona.dm index 91a2ac06d87..150f8247149 100644 --- a/code/modules/background/accent/diona.dm +++ b/code/modules/background/accent/diona.dm @@ -59,3 +59,9 @@ description = "Spoken exclusively by Dionae hailing from the Conglomerated Choir of Nralakk, Starsong is a constructed variation of Sunkensong developed by Federation linguists soon after first contact was made. The accent was purposefully curated to further culturally align the cluster with Skrell and to create closer ties between the two species. Through curated communications and manipulation of blood samples, Starsong is considered a desirable accent by many Dionae in the Federation, furthering the Choir's idol-like status amongst gestalts." tag_icon = "dionae_starsong" text_tag = "SRS" + +/datum/accent/xrimsong + name = ACCENT_XRIMSONG + description = "A unique combination of elements from both Nral'malic and Rootsong, Xrim's accent can generally be picked up due to its slow, dulcet sound. It has wide range, and can reach as high as a Soprano and as low as an Alto. Its fluctuations are generally an easy way to detect the accent, being one of the more novel accents within the Federation, and abroad." + tag_icon = "dionae_xrim" + text_tag = "XMS" diff --git a/code/modules/background/origins/origins/diona/xrim.dm b/code/modules/background/origins/origins/diona/xrim.dm index de7050b6d6f..3a356eb85fb 100644 --- a/code/modules/background/origins/origins/diona/xrim.dm +++ b/code/modules/background/origins/origins/diona/xrim.dm @@ -10,7 +10,7 @@ name = "Kshrr" desc = "Making up the majority of the population on Xrim, The Kshrr are those who chose to reject their old god once its true nature was made known to them as the genocidal AI known as Glorsh that terrorized the Skrell for decades." important_information = "Not every member of Kshrr society has to be a member of the Kshrr religion, however, it's indisputable that the religion has played a large part in shaping Kshrr culture and society." - possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG, ACCENT_WAVESONG, ACCENT_SUNKENSONG, ACCENT_STARSONG) + possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG, ACCENT_XRIMSONG, ACCENT_WAVESONG, ACCENT_SUNKENSONG, ACCENT_STARSONG) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_KSSHR, RELIGION_SHRKH, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) @@ -18,6 +18,6 @@ name = "Shrkh" desc = "The Shrkh are those who continued to worship \"First Consciousness\" even after its true nature and crimes were made known to Xrim's inhabitants as the genocidal AI that terrorized the Skrell for decades. These Dionae were largely exiled and went on to form their own communities away from the view of the Kshrr and later the Nralakk Federation once Xrim joined them. In more modern times the Nralakk Federation and the Kshrr are making attempts to deconvert the Shrkh away from their worship of Glorsh through both passive and more forceful means, however, many secretive communities do still exist underneath the planet's surface such as the city of Entombed Hope." important_information = "Dionae can originate from Shrkh society but do not have to still follow the Shrkh religion, these Dionae are not beholden to the same restrictions that active Shrkh worshippers are so long as they have rejected their old god." - possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG, ACCENT_WAVESONG, ACCENT_SUNKENSONG, ACCENT_STARSONG) + possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG, ACCENT_XRIMSONG, ACCENT_WAVESONG, ACCENT_SUNKENSONG, ACCENT_STARSONG) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_KSSHR, RELIGION_SHRKH, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE) diff --git a/html/changelogs/yonnimer-xrimsong.yml b/html/changelogs/yonnimer-xrimsong.yml new file mode 100644 index 00000000000..7670c619b4d --- /dev/null +++ b/html/changelogs/yonnimer-xrimsong.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Yonnimer + +# 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 the new Dionae accent Xrimsong" diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index 149048dffc0..9bd982bf54e 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ