From 0ca2ed06e06ac29f48fd5da0612a25a64f0c4640 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Sat, 22 Jul 2023 07:32:20 +1200 Subject: [PATCH] Izweski Heartlands Origin, Accent and Loadout Tweaks (#16759) * heartlands accent + final origin stuff * forgot origin descriptions, whoops * okay, fixes this better now --- code/__defines/background.dm | 4 +- code/modules/background/accent/unathi.dm | 16 +++---- .../origins/origins/unathi/autakh.dm | 2 +- .../origins/origins/unathi/izweski.dm | 22 +++++----- .../origins/origins/unathi/spaceborn.dm | 4 +- .../loadout/loadout_xeno/unathi.dm | 16 +++---- .../changelogs/RustingWithYou - heartland.yml | 42 +++++++++++++++++++ 7 files changed, 75 insertions(+), 31 deletions(-) create mode 100644 html/changelogs/RustingWithYou - heartland.yml diff --git a/code/__defines/background.dm b/code/__defines/background.dm index e3ca6ef04cb..3c22c805fec 100644 --- a/code/__defines/background.dm +++ b/code/__defines/background.dm @@ -130,8 +130,8 @@ #define ACCENT_HARRNRRI "Harr'nrri Siik'mas" #define ACCENT_ZARRJIRI "Zarr'jiri Siik'mas" -#define ACCENT_HEGEMON_NOBLE "Noble Hegemonic" -#define ACCENT_HEGEMON_PEASANT "Peasant Hegemonic" +#define ACCENT_HEARTLAND_NOBLE "Izweski Heartland Noble" +#define ACCENT_HEARTLAND_PEASANT "Izweski Heartland Peasant" #define ACCENT_TRAD_NOBLE "Noble Traditional" #define ACCENT_TRAD_PEASANT "Peasant Traditional" #define ACCENT_WASTELAND "Deep Wastelander" diff --git a/code/modules/background/accent/unathi.dm b/code/modules/background/accent/unathi.dm index 911c8014570..379d9175a8c 100644 --- a/code/modules/background/accent/unathi.dm +++ b/code/modules/background/accent/unathi.dm @@ -1,16 +1,16 @@ -/datum/accent/hegemon_noble - name = ACCENT_HEGEMON_NOBLE - description = "The Noble Hegemonic accent is eloquent and flowing, staying near the front of the mouth. Airy and filled with hissing, this accent requires birth-right or years of \ +/datum/accent/heartland_noble + name = ACCENT_HEARTLAND_NOBLE + description = "The Noble Heartlands accent is eloquent and flowing, staying near the front of the mouth. Airy and filled with hissing, this accent requires birth-right or years of \ practice to properly convey. The families of Lords, Sk'akh Priests, noble warriors, and some merchants will often share this accent, and will mostly find the Sinta'Azaziba language \ - and Traditionalist accent more savage. The Noble Hegemonic accent is primarily found in the Untouched Lands, and originates from the Sinta'Unathi language." + and associated accents more savage. The Noble Heartlands accent originates from the Sinta'Unathi language." tag_icon = "hegemon_noble" text_tag = "HGN" -/datum/accent/hegemon_peasant - name = ACCENT_HEGEMON_PEASANT +/datum/accent/heartland_peasant + name = ACCENT_HEARTLAND_PEASANT description = "Lowborn guilds-workers, first-generation merchants, simple warrior levymen, and hundreds of other tasks for the common Clans - this is the most common accent for \ - Unathi, stereotypically. It still holds a slight air of royalty to it compared to the Traditional accents. It is most commonly found in the crowded Untouched Lands and in colonies. \ - It originates from the Sinta'Unathi language. " + Unathi of the Izweski Heartland. It still holds a slight air of royalty to it compared to accents from the rest of Moghes. It can be heard across Moghes and in colonies, but is most common by far in its birthplace, the crowded Izweski Heartland. \ + It originates from the Sinta'Unathi language." tag_icon = "hegemon_peasant" text_tag = "HGP" diff --git a/code/modules/background/origins/origins/unathi/autakh.dm b/code/modules/background/origins/origins/unathi/autakh.dm index 7ad6d9e41ae..15624ff996c 100644 --- a/code/modules/background/origins/origins/unathi/autakh.dm +++ b/code/modules/background/origins/origins/unathi/autakh.dm @@ -12,7 +12,7 @@ /singleton/origin_item/origin/autakh name = "Aut'akh Valley" desc = "A large commune on Ouerea surrounded by mountains, the Aut'akh Valley is birthplace of the Aut'akh religion - a place for specifically augmented unathi to find sanctuary from the violence often found against their kind in cities and towns. It is largely disconnected from any government and is heavily guarded by the Aut'akh defending the clans there with their lives. Life here is simple, and more than half of the population is elderly or disabled with augments. The area is foggy and filled with natural lakes, and the area gets cold enough to snow in the cold season." - possible_accents = list(ACCENT_HEGEMON_NOBLE, ACCENT_HEGEMON_PEASANT, ACCENT_TRAD_NOBLE, ACCENT_TRAD_PEASANT, ACCENT_WASTELAND, ACCENT_AUTAKH) + possible_accents = list(ACCENT_HEARTLAND_NOBLE, ACCENT_HEARTLAND_PEASANT, ACCENT_TRAD_NOBLE, ACCENT_TRAD_PEASANT, ACCENT_WASTELAND, ACCENT_AUTAKH, ACCENT_TZA_PEASANT, ACCENT_TZA_NOBLE, ACCENT_SOUTHLANDS_PEASANT, ACCENT_SOUTHLANDS_NOBLE, ACCENT_TORN, ACCENT_ZAZ_LOW, ACCENT_ZAZ_HIGH, ACCENT_BROKEN_PEASANT, ACCENT_BROKEN_NOBLE, ACCENT_UNATHI_SPACER) possible_citizenships = list(CITIZENSHIP_IZWESKI) possible_religions = list(RELIGION_AUTAKH) diff --git a/code/modules/background/origins/origins/unathi/izweski.dm b/code/modules/background/origins/origins/unathi/izweski.dm index ebd977a3529..4e1f75a6041 100644 --- a/code/modules/background/origins/origins/unathi/izweski.dm +++ b/code/modules/background/origins/origins/unathi/izweski.dm @@ -2,8 +2,8 @@ name = "Izweski Hegemony" desc = "The Izweski Hegemony is home to a majority of Unathi and remains the most powerful centralized force for the species in the modern day. Under the rulership of the Izweski and the religious guidance of the Church of Sk'akh, the Hegemony plays an important role for Sinta interests abroad. It has a strict loyalty to the caste system it is under, prioritizes the importance of the clan first and foremost, and remains the most open to xenocentric interests and customs out of all the current cultures found among Unathi. They embody ideals of diplomatic and cultural adaptability." possible_origins = list( - /singleton/origin_item/origin/izweski_lower, - /singleton/origin_item/origin/izweski_upper, + /singleton/origin_item/origin/heartland_lower, + /singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/tza_lower, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_lower, @@ -12,19 +12,21 @@ /singleton/origin_item/origin/zazalai_upper ) -/singleton/origin_item/origin/izweski_lower - name = "Hegemony Lower Castes" - desc = "Peasants comprise the largest part of the population in the Hegemony. Around them are the Guwan, who are the \"untouchables\" at the bottom of the caste system, and small-time merchants working for their lords. The Contact War saw some Traditionalists ally with and migrate to the Hegemony that were too stubborn to fully integrate into society there. With permission from the owner of the land they work, the noble clan, one can leave their plot and traverse the stars— provided proper tithes are sent back home on behalf of their own clan. It is not uncommon for people to leave and seek education or better circumstances abroad, where they have a higher chance of moving up in the world." +/singleton/origin_item/origin/heartland_lower + name = "Izweski Heartland Lower Castes" + desc = "The peasantry of the Izweski Heartland are some of the more prosperous peasants throughout the Izweski Hegemony. They have access to the full conveniences of modern life, and as a consequence of this tend to be highly supportive \ + and patriotic towards their nation and Hegemon. In recent years, the arrival of thousands of refugees from the Wasteland has placed the region under great strain, and many of the local peasantry resent the refugees for the impact on the local economy." important_information = "Should one run away and stop paying tithes back home, especially if they have renounced their Izweski citizenship, they are at risk of having a bounty put on them or being found out and deported." - possible_accents = list(ACCENT_HEGEMON_PEASANT, ACCENT_TRAD_PEASANT) + possible_accents = list(ACCENT_HEARTLAND_PEASANT) possible_citizenships = list(CITIZENSHIP_IZWESKI, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_AUTAKH, RELIGION_SIAKH, RELIGION_NONE) -/singleton/origin_item/origin/izweski_upper - name = "Hegemony Upper Castes" - desc = "Being born into the nobility is a privilege, it is said. Priests, warriors, merchants, doctors, rulers: all of these positions are typically linear through a clan and carried on by each successive generation. Although their nation is poorer than most human countries, the Hegemony nobility still enjoy many comforts and luxuries compared to most of their kin. Though it is hard and rare, there are some success stories of peasants becoming nobles. Feeling out of place on Moghes with their peasant tongue, many find their place abroad. Similarly, nobles that are at risk of dishonoring the clan but have no reason to be made Guwan are sent off-world." +/singleton/origin_item/origin/heartland_upper + name = "Izweski Heartland Upper Castes" + desc = "Wealth, glamor, and the seductive taste of power lie at the heart of nobility - but nowhere more than in the Izweski Heartland. The nobles of this land are the elte of the elite, known for their wealth, refinement and intrigue. Others may deride them as \ + treacherous or dishonorable, but the nobles of the Heartland do not care. They stand near the top of the Hegemony, and each of them is constantly seeking advantage over their rivals." important_information = "Work and visitation visas should be mentioned in records as they are possible in any country where a peasant can get citizenship; almost all nobles shy away from getting citizenship abroad as it would be seen as betraying the Hegemon." - possible_accents = list(ACCENT_HEGEMON_NOBLE, ACCENT_TRAD_NOBLE) + possible_accents = list(ACCENT_HEARTLAND_NOBLE) possible_citizenships = list(CITIZENSHIP_IZWESKI) possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_SIAKH) diff --git a/code/modules/background/origins/origins/unathi/spaceborn.dm b/code/modules/background/origins/origins/unathi/spaceborn.dm index b5ba8279989..91be0d95f90 100644 --- a/code/modules/background/origins/origins/unathi/spaceborn.dm +++ b/code/modules/background/origins/origins/unathi/spaceborn.dm @@ -11,14 +11,14 @@ name = "Pirates of the Spur" desc = "Pirates have no common group holding them all together to work as one. They tend towards ambition and passion, acting impulsively towards what they desire. With Not'zar Izweski's call to pirates to forsake their lifestyles and join his space navy, any pirate that has served four or more years under the Hegemony has their crimes pardoned by him (but not necessarily other states). With this, a good handful of pirates that knew no normalcy are now finding it abroad. Unathi pirates don't have citizenship in their respective countries, typically having a work or visitation visa instead." important_information = "Outside of the Hegemony, records should say they have some kind of visa instead of citizenship." - possible_accents = list(ACCENT_TRAD_PEASANT, ACCENT_HEGEMON_PEASANT, ACCENT_TRAD_NOBLE, ACCENT_WASTELAND, ACCENT_UNATHI_SPACER, ACCENT_HAZANA) + possible_accents = list(ACCENT_TRAD_PEASANT, ACCENT_HEARTLAND_PEASANT, ACCENT_TRAD_NOBLE, 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, ACCENT_WASTELAND, ACCENT_UNATHI_SPACER, ACCENT_HAZANA) 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." - possible_accents = list(ACCENT_TRAD_PEASANT, ACCENT_TRAD_NOBLE, ACCENT_HEGEMON_PEASANT, ACCENT_HEGEMON_NOBLE, ACCENT_WASTELAND, ACCENT_DOMINIA_VULGAR, ACCENT_DOMINIA_HIGH, ACCENT_UNATHI_SPACER) + 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 d5477bb879a..4a915138e10 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm @@ -21,7 +21,7 @@ path = /obj/item/clothing/accessory/poncho/unathimantle/forest cost = 1 whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles) + 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) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_COLOR_SELECTION @@ -354,7 +354,7 @@ display_name = "shaman staff" path = /obj/item/cane/shaman sort_category = "Xenowear - Unathi" - origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles) + 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) 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/izweski_upper, /singleton/origin_item/origin/trad_nobles) + 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) 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/izweski_upper, /singleton/origin_item/origin/trad_nobles) + 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) 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/izweski_upper, /singleton/origin_item/origin/trad_nobles) + 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) allowed_roles = list("Chaplain") sort_category = "Xenowear - Unathi" flags = GEAR_HAS_DESC_SELECTION @@ -390,7 +390,7 @@ path = /obj/item/clothing/accessory/poncho/rockstone cost = 1 whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles) + 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) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ADDITIONAL_COLOR_SELECTION @@ -398,7 +398,7 @@ display_name = "jeweled bracers" path = /obj/item/clothing/wrists/unathi/jeweled whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles) + 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) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -415,6 +415,6 @@ path = /obj/item/clothing/suit/unathi/jokfar cost = 1 whitelisted = list(SPECIES_UNATHI) - origin_restriction = list(/singleton/origin_item/origin/izweski_upper, /singleton/origin_item/origin/trad_nobles) + 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) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION diff --git a/html/changelogs/RustingWithYou - heartland.yml b/html/changelogs/RustingWithYou - heartland.yml new file mode 100644 index 00000000000..c927b3e1565 --- /dev/null +++ b/html/changelogs/RustingWithYou - heartland.yml @@ -0,0 +1,42 @@ +################################ +# 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 accents for the Izweski Heartland, replacing the previous generic Hegemony accents." + - tweak: "All Unathi loadout items restricted by origin are now available to the various new origins."