diff --git a/code/__defines/background.dm b/code/__defines/background.dm index 445c190f6a7..8d0ca7d1e13 100644 --- a/code/__defines/background.dm +++ b/code/__defines/background.dm @@ -149,6 +149,7 @@ #define ACCENT_TORN "Torn Cities" #define ACCENT_ZAZ_LOW "Zazalai Mountains Peasant" #define ACCENT_ZAZ_HIGH "Zazalai Mountains Noble" +#define ACCENT_OUEREA "Ouerea" #define ACCENT_SKRELL "Standard Nral'Malic" #define ACCENT_HOMEWORLD "Qerrbalak" diff --git a/code/modules/background/accent/unathi.dm b/code/modules/background/accent/unathi.dm index 379d9175a8c..2bc9acdadb5 100644 --- a/code/modules/background/accent/unathi.dm +++ b/code/modules/background/accent/unathi.dm @@ -130,3 +130,11 @@ carefully crafted to give an air of civilised refinement in the harsh mountains of Zazalai." tag_icon = "unathi_zaz_noble" text_tag = "ZAZ" + +/datum/accent/ouerea + name = ACCENT_OUEREA + description = "The Ouerean accent is a curious thing - influenced in equal parts by human, Skrell and Unathi tongues. This leads many to find it confusing to the ear, and a common stereotype of Ouereans \ + among other Unathi is their propensity for talking quickly and their frequent use of loan words from alien languages. Among Ouereans, whether Skrell, human or Unathi, however, their accent is a mark of pride, \ + representing the fierce and independent spirit that the colony values highly." + tag_icon = "ouerea" + text_tag = "OUE" diff --git a/code/modules/background/origins/origins/human/sol.dm b/code/modules/background/origins/origins/human/sol.dm index bde119ba471..501e513f4c0 100644 --- a/code/modules/background/origins/origins/human/sol.dm +++ b/code/modules/background/origins/origins/human/sol.dm @@ -20,7 +20,8 @@ /singleton/origin_item/origin/visegrad, /singleton/origin_item/origin/mictlan, /singleton/origin_item/origin/antillia, - /singleton/origin_item/origin/sancolette + /singleton/origin_item/origin/sancolette, + /singleton/origin_item/origin/ouerea_human ) /singleton/origin_item/origin/sol_system @@ -186,3 +187,16 @@ possible_accents = list(ACCENT_SANCOLETTE) possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL) possible_religions = RELIGIONS_SOLARIAN + +/singleton/origin_item/origin/ouerea_human + name = "Ouerea" + desc = "The planet of Ouerea, in the Uueoa-Esa system, is unique among the human-populated worlds of the Spur. Human colonists originally came to Ouerea shortly after first contact was made with the Unathi race, who had recently established their own colony on the planet. \ + As megacorporations began to set up operations on Ouerea, colonists came from across Alliance space to work and live there. Following the Alliance's withdrawal from the planet and the ceding of control to the Hegemony, many of the human colonists remained, having made Ouerea their home \ + for decades. Through strife and revolution, the humans of Ouerea have persisted alongside their Skrell and Unathi neighbours, building a world that occupies a unique place among all three species. Many of the humans of Ouerea fought in the revolution of 2460 to abolish the Unathi feudal system on their world, \ + and following their success human ideas of governance have played an important role in the establishment of the new and fragile Ouerean democracy. Humans born on Ouerea must be born on or after 2403." + important_information = "Despite being categorised as culturally Solarian, those humans who chose to remain on Ouerea have not been ruled by the Alliance directly in decades, and would be considered as Izweski Hegemony citizens if they have not emigrated elsewhere." + possible_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_accents = list(ACCENT_OUEREA) + possible_religions = RELIGIONS_SOLARIAN + origin_traits = list(TRAIT_ORIGIN_HOT_RESISTANCE) + origin_traits_descriptions = list("are more acclimatised to the heat") diff --git a/code/modules/background/origins/origins/skrell/non_federation.dm b/code/modules/background/origins/origins/skrell/non_federation.dm index 28a9e6ad260..00284ee3c3c 100644 --- a/code/modules/background/origins/origins/skrell/non_federation.dm +++ b/code/modules/background/origins/origins/skrell/non_federation.dm @@ -5,7 +5,8 @@ /singleton/origin_item/origin/skrell_alliance, /singleton/origin_item/origin/skrell_biesel, /singleton/origin_item/origin/skrell_coalition, - /singleton/origin_item/origin/skrell_eum + /singleton/origin_item/origin/skrell_eum, + /singleton/origin_item/origin/skrell_ouerea ) /singleton/origin_item/origin/skrell_alliance @@ -31,7 +32,7 @@ possible_accents = list(ACCENT_SKRELLCOC) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM) possible_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) - + /singleton/origin_item/origin/skrell_eum name = "Co-operative Territories of Epsilon Ursea Minoris" desc = "The Federation and CT-EUM have had close ties since the two nations first came into contact. Most Skrell living within CT-EUM are immigrants, living in the city-state of Nral'Daaq, but there is a growing group of Skrell who were born and raised on Epsilon Ursea Minoris." @@ -39,3 +40,16 @@ possible_accents = list(ACCENT_SKRELLEUM, ACCENT_SKRELL, ACCENT_HOMEWORLD, ACCENT_QERRMALIC, ACCENT_ALIOSE, ACCENT_AWEIJI, ACCENT_TRAVERSE, ACCENT_TATTUQIG) possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM) possible_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) + +/singleton/origin_item/origin/skrell_ouerea + name = "Ouerea" + desc = "When the Nralakk Federation first made contact with the Unathi, they quickly established their own presence in the Uueoa-Esa system, setting up research bases on the planet Ouerea and offering their 'guidance' to the Unathi colonists already there. Many Skrell from across the Federation \ + came to Ouerea, and began to establish communities side by side with the humans and Unathi of the planet. When the Federation ceded control of Ouerea in 2458, any Skrell who wished to leave were permitted to evacuate - but many stayed, largely Tertiary Numericals or followers of unsanctioned religions who saw a chance \ + to be free of Federation control - a rarity in the Orion Spur. Since then, the Skrell of Ouerea have been instrumental in the colony's growth and prosperity, with many fighting side by side with humans and Unathi during the Ouerean Revolution. Due to its status as a Skrell-inhabited world outside of Federation control, \ + Ouerea has become a popular destination for Skrell seeking to flee the Federation - though not as popular as the Republic of Biesel or the Coalition of Colonies." + important_information = "The Nralakk Federation still monitors non-citizen Skrell living abroad, but has no formal agreement with the Izweski Hegemony regarding deportation of anti-Federation Skrell. Skrell who were born on Ouerea must be born on or after 2403." + possible_accents = list(ACCENT_OUEREA, ACCENT_SKRELL, ACCENT_HOMEWORLD, ACCENT_QERRMALIC, ACCENT_ALIOSE, ACCENT_AWEIJI, ACCENT_TRAVERSE) + possible_citizenships = list(CITIZENSHIP_IZWESKI) + possible_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) + origin_traits = list(TRAIT_ORIGIN_HOT_RESISTANCE) + origin_traits_descriptions = list("are more acclimatised to the heat") diff --git a/code/modules/background/origins/origins/unathi/spaceborn.dm b/code/modules/background/origins/origins/unathi/spaceborn.dm index 91be0d95f90..42e860ac8bf 100644 --- a/code/modules/background/origins/origins/unathi/spaceborn.dm +++ b/code/modules/background/origins/origins/unathi/spaceborn.dm @@ -2,6 +2,7 @@ name = "Spaceborn" desc = "Whether colonists in the far reaches of space, pirates that have forsaken their lives to find a new culture, or those that are merely living on ships and roaming or serving the Hegemon, the Spaceborn Unathi are a vast collective of emerging or niche cultures found across the Orion Spur." possible_origins = list( + /singleton/origin_item/origin/ouerea, /singleton/origin_item/origin/unathi_pirate, /singleton/origin_item/origin/colonist, /singleton/origin_item/origin/mictlan_unathi @@ -15,9 +16,18 @@ possible_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_AUTAKH, RELIGION_OTHER, RELIGION_NONE) +/singleton/origin_item/origin/ouerea + name = "Ouerea" + desc = "Established in 2390, Ouerea was the first colony of the Izweski Hegemony, which quickly became home to large numbers of human and Skrell immigrants following first contact. During the Contact War, the Hegemony was incapable of governing it, and the planet was administrated by the Sol Alliance and Nralakk Federation. \ + This period led to the establishment of a fledgeling democracy, until Hegemon Sk'resti Izweski restored Hegemony control of the planet, reestablishing the feudal system. Following the Ouerean Revolution of 2460, Ouerea's democracy was restored, though still as a vassal of the Hegemon. Today, it is a society defined by contrasts, \ + with human, Skrell and Unathi culture blending into something strange, new and altogether unique within the Orion Spur." + possible_accents = list(ACCENT_OUEREA) + possible_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) + possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_AUTAKH, RELIGION_OTHER, RELIGION_NONE) + /singleton/origin_item/origin/colonist name = "Colonist" - desc = "Regardless of what country you serve and the religion you hold, you became a colonist, living on a gritty world with little infrastructure to carve out a new life for yourself. It could be a Dominian Primary helping guide a colony, relegated with this tiny responsibility as a means to keep you out of the way; it could be living on Ouerea and Gakal'zaal and being one of the first Unathi to settle down and find your way among xenos; it could be living on a nomadic vessel, trading and salvaging, to earn your keep and see the cosmos. By whatever means you acquired, you found your way to the Horizon to move up in the world." + desc = "Regardless of what country you serve and the religion you hold, you became a colonist, living on a gritty world with little infrastructure to carve out a new life for yourself. It could be a Dominian Primary helping guide a colony, relegated with this tiny responsibility as a means to keep you out of the way; it could be living on an outlying colony and being one of the first Unathi to settle down and find your way among xenos; it could be living on a nomadic vessel, trading and salvaging, to earn your keep and see the cosmos. By whatever means you acquired, you found your way to the Horizon to move up in the world." possible_accents = list(ACCENT_TRAD_PEASANT, ACCENT_TRAD_NOBLE, ACCENT_HEARTLAND_PEASANT, ACCENT_HEARTLAND_NOBLE, ACCENT_WASTELAND, ACCENT_DOMINIA_VULGAR, ACCENT_DOMINIA_HIGH, ACCENT_UNATHI_SPACER, ACCENT_TZA_PEASANT, ACCENT_TZA_NOBLE, ACCENT_SOUTHLANDS_NOBLE, ACCENT_SOUTHLANDS_PEASANT, ACCENT_TORN, ACCENT_ZAZ_LOW, ACCENT_ZAZ_HIGH, ACCENT_BROKEN_PEASANT, ACCENT_BROKEN_NOBLE) possible_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_ERIDANI) possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_SIAKH, RELIGION_AUTAKH, RELIGION_OTHER, RELIGION_MOROZ, RELIGION_NONE) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm index e83bc6ae5a8..bd47bc105b1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm @@ -354,7 +354,7 @@ display_name = "shaman staff" path = /obj/item/cane/shaman sort_category = "Xenowear - Unathi" - origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities) + origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities, /singleton/origin_item/origin/ouerea) whitelisted = list(SPECIES_UNATHI) /datum/gear/suit/maxtlatl @@ -363,7 +363,7 @@ cost = 1 whitelisted = list(SPECIES_UNATHI) allowed_roles = list("Chaplain") - origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities) + origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities, /singleton/origin_item/origin/ouerea) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_DESC_SELECTION @@ -371,7 +371,7 @@ display_name = "Thakhist wristguards" path = /obj/item/clothing/wrists/unathi/maxtlatl whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities) + origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities, /singleton/origin_item/origin/ouerea) allowed_roles = list("Chaplain") sort_category = "Xenowear - Unathi" flags = GEAR_HAS_DESC_SELECTION @@ -380,7 +380,7 @@ display_name = "Thakhist headgear" path = /obj/item/clothing/head/unathi/maxtlatl whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities) + origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities, /singleton/origin_item/origin/ouerea) allowed_roles = list("Chaplain") sort_category = "Xenowear - Unathi" flags = GEAR_HAS_DESC_SELECTION diff --git a/html/changelogs/RustingWithYou - oreo.yml b/html/changelogs/RustingWithYou - oreo.yml new file mode 100644 index 00000000000..9202be617c1 --- /dev/null +++ b/html/changelogs/RustingWithYou - oreo.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: RustingWithYou + +# 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 origins and an accent for Ouerea." diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index 35789b6a0b6..aec7b0608cc 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ