diff --git a/aurorastation.dme b/aurorastation.dme index 23bc20053f6..cefb2ecb1f0 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1678,12 +1678,12 @@ #include "code\modules\background\origins\origins\diona\biesel.dm" #include "code\modules\background\origins\origins\diona\coalition.dm" #include "code\modules\background\origins\origins\diona\deep_space.dm" -#include "code\modules\background\origins\origins\diona\eridani.dm" #include "code\modules\background\origins\origins\diona\hieroaetheria.dm" #include "code\modules\background\origins\origins\diona\moghes.dm" #include "code\modules\background\origins\origins\diona\narrows.dm" #include "code\modules\background\origins\origins\diona\nralakk.dm" #include "code\modules\background\origins\origins\diona\sol.dm" +#include "code\modules\background\origins\origins\diona\underhive.dm" #include "code\modules\background\origins\origins\diona\voidtamer.dm" #include "code\modules\background\origins\origins\diona\xrim.dm" #include "code\modules\background\origins\origins\human\biesel.dm" diff --git a/code/__DEFINES/background.dm b/code/__DEFINES/background.dm index 60f40a641a8..fc24bf10179 100644 --- a/code/__DEFINES/background.dm +++ b/code/__DEFINES/background.dm @@ -196,6 +196,7 @@ #define ACCENT_HIVESONG "Hivesong" #define ACCENT_MEADOWSONG "Meadowsong" #define ACCENT_LABOURSONG "Laboursong" +#define ACCENT_UNDERSONG "Undersong" #define ACCENT_TTS "Text-to-Speech" #define ACCENT_MERCHANT "Golden Deep Merchant" diff --git a/code/modules/background/accent/diona.dm b/code/modules/background/accent/diona.dm index 9073be04b16..7a656c8674f 100644 --- a/code/modules/background/accent/diona.dm +++ b/code/modules/background/accent/diona.dm @@ -36,6 +36,12 @@ tag_icon = "dionae_meadow" text_tag = "MWS" +/datum/accent/undersong + name = ACCENT_UNDERSONG + description = "Utilized by the Underhive Collective of the Eridani Corporate Federation, Undersong often fails to resonate as strongly as other accents due to the sparse lighting conditions in Dreg settlements where the Underhive resides, leading to poor development." + tag_icon = "dionae_under" + text_tag = "UNS" + //Vaurca Influenced Accents /datum/accent/hivesong diff --git a/code/modules/background/origins/origins/diona/eridani.dm b/code/modules/background/origins/origins/diona/eridani.dm deleted file mode 100644 index 7bdba670810..00000000000 --- a/code/modules/background/origins/origins/diona/eridani.dm +++ /dev/null @@ -1,23 +0,0 @@ -/singleton/origin_item/culture/diona_eridani - name = "Eridani Corporate Federation" - desc = "The Eridani Corporate Federation is an autonomous member of the Solarian Alliance that is infamous abroad for its starkly divided society and extreme levels of corporate involvement in daily life. Corporations touch every aspect of Eridani, and its society is divided between corporate \"Suits\" that work for its companies and non-citizen \"Dregs\" that live off the scraps of society. Between the two, \"Reinstated Dregs\" chart an awkward balance: too corporate to be Dregs, but not corporate enough to be Suits." - possible_origins = list( - /singleton/origin_item/origin/slum_grown, - /singleton/origin_item/origin/sunlight_grown - ) - -/singleton/origin_item/origin/slum_grown - name = "Slum Grown" - desc = "Dionae who were originally grown in and influenced by the slums of Eridani, most often in the underbelly of Oran." - important_information = "These Dionae tend to be significantly influenced by Eridanian Dregs, generally taking on some of their mannerisms and vocabulary." - possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG) - possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_CONSORTIUM, CITIZENSHIP_EKANE, CITIZENSHIP_COALITION) - possible_religions = list(RELIGION_ETERNAL, RELIGION_ETERNAL_ICHOR, RELIGION_ETERNAL_IRON, RELIGION_OTHER, RELIGION_NONE) - -/singleton/origin_item/origin/sunlight_grown - name = "Sunlight Grown" - desc = "Dionae who were originally grown in and influenced by the Eridani Federation in a more positive environment, most often on Akhet." - important_information = "These Dionae tend to be significantly influenced by Eridanian Suits, generally taking on some of their mannerisms and vocabulary." - possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_IRONSONG) - possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_CONSORTIUM, CITIZENSHIP_EKANE, CITIZENSHIP_COALITION) - possible_religions = list(RELIGION_ETERNAL, RELIGION_ETERNAL_ICHOR, RELIGION_ETERNAL_IRON, RELIGION_OTHER, RELIGION_NONE) diff --git a/code/modules/background/origins/origins/diona/underhive.dm b/code/modules/background/origins/origins/diona/underhive.dm new file mode 100644 index 00000000000..5665433df5f --- /dev/null +++ b/code/modules/background/origins/origins/diona/underhive.dm @@ -0,0 +1,30 @@ +/singleton/origin_item/culture/diona_eridani + name = "Underhive Collective" + desc = "The Underhive Collective is an elusive community of Dionae gestalts endemic to the Eridani Federation. Initially smuggled in to fuel a burgeoning drug trade, the ones that escaped it managed to organize into a business-oriented secretive society of syndicated interests." + possible_origins = list( + /singleton/origin_item/origin/mycelumias, + /singleton/origin_item/origin/glowcaps, + /singleton/origin_item/origin/sporeveils + ) + +/singleton/origin_item/origin/mycelumias + name = "Mycelumias" + desc = "The Mycelumias, or just Lumias, are a renowned Aphrodite syndicate within the underbelly of the Eridani Federation in Den. Some have claimed that it has operated since the creation of the trade." + possible_accents = list(ACCENT_UNDERSONG) + possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_CONSORTIUM, CITIZENSHIP_EKANE, CITIZENSHIP_COALITION) + possible_religions = list(RELIGION_ETERNAL_IRON) + +/singleton/origin_item/origin/glowcaps + name = "Glowcaps" + desc = "Residing in New Kivu, the Glowcaps are significantly smaller than the Lumias. They were originally part of the Lumias, seceding later due to differences in business practices and values." + possible_accents = list(ACCENT_UNDERSONG) + possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_CONSORTIUM, CITIZENSHIP_EKANE, CITIZENSHIP_COALITION) + possible_religions = list(RELIGION_ETERNAL) + +/singleton/origin_item/origin/sporeveils + name = "Sporeveils" + desc = "The Sporeveils are the smallest syndicate, but also the most vicious, with numerous attacks against Suits and Dregs alike under their belt. Like the Lumias, they reside in Den." + important_information = "Characters are allowed to be from the Sporeveils, but only in secret. They are an antagonistic entity within the lore, and no megacorporation would hire a Diona openly displaying such an allegiance." + possible_accents = list(ACCENT_UNDERSONG) + possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_NRALAKK, CITIZENSHIP_CONSORTIUM, CITIZENSHIP_EKANE, CITIZENSHIP_COALITION) + possible_religions = list(RELIGION_ETERNAL_ICHOR) diff --git a/html/changelogs/SimpleMaroon-underhivecollective.yml b/html/changelogs/SimpleMaroon-underhivecollective.yml new file mode 100644 index 00000000000..57a51948b5e --- /dev/null +++ b/html/changelogs/SimpleMaroon-underhivecollective.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a culture and origins for the Underhive Collective, an Eridani-based Diona faction." diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index f37df2e7e49..12076fcc2ee 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ