diff --git a/code/modules/background/accent/tajara.dm b/code/modules/background/accent/tajara.dm index 0d4bc23483b..cead5392bf5 100644 --- a/code/modules/background/accent/tajara.dm +++ b/code/modules/background/accent/tajara.dm @@ -77,4 +77,16 @@ name = ACCENT_DINAKK description = "Found in the isolated valleys of the Din'akk Mountains, little has changed in this accent since the first contact. It still clings to words and grammatical \ structures that have long since fallen out of use by other Siik'maas speakers. It is described as strong and abrupt by other Tajara." - tag_icon = "tajara_dinaak" \ No newline at end of file + tag_icon = "tajara_dinaak" + +/datum/accent/harrnrri + name = ACCENT_HARRNRRI + description = "The dialect of the people of the Harr'nrr peninsula. This accent shares some similarity with Republican Siik'mas thanks to a shared origin and the later PRA rule of Harr'nrr, \ + but differs with a deeper tone when spoken." + tag_icon = "tajara_harrnrri" + +/datum/accent/zarrjiri + name = ACCENT_ZARRJIRI + description = "Zarr'jiri Siik'mas: Located only in the Zarr'jirah mountain range, this accent is rarity outside of the New Kingdom. Speakers of it are often noted for a soft, almost sing-song \ + voice and hand gestures which carry over from Nal'rasan." + tag_icon = "tajara_zarrjiri" \ No newline at end of file diff --git a/code/modules/background/citizenship/tajara.dm b/code/modules/background/citizenship/tajara.dm index 660dbc14d3a..394fb76953c 100644 --- a/code/modules/background/citizenship/tajara.dm +++ b/code/modules/background/citizenship/tajara.dm @@ -111,7 +111,7 @@ /datum/citizenship/nka name = CITIZENSHIP_NKA description = "The last major faction is the rebellious New Kingdom of Adhomai, which seceded and declared itself a nation in 2450. The New Kingdom is ruled by a Njarir'Akhran noble \ - line that survived the previous Revolution by remaining in hiding, owing to the efforts of their supporters. Ruled by King Vahzirthaamro Azunja specifically, he denounces both other \ + line that survived the previous Revolution by remaining in hiding, owing to the efforts of their supporters. Founded by King Vahzirthaamro Azunja specifically, he denounces both other \ factions in the civil war as illegitimate and himself as the only legitimate ruler of Adhomai. Supporters of the New Kingdom tend to be rare outside lands it controls. However, \ they believe strongly that the current republic on Adhomai was founded on genocide and unspeakable slaughters. The New Kingdom puts forth the ideology that Republicanism is \ bloodshed. The only way to return Adhomai to peace and prosperity is to learn from the mistakes of the ancient nobles and Republicans, and create a new noble dynasty. They believe \ diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index fe40c2307e8..cb7900f3b52 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -102,6 +102,8 @@ #define ACCENT_OLDYASSA "Old Ya'ssa" #define ACCENT_NORTHRASNRR "Northern Ras'nrr Siik'maas" #define ACCENT_DINAKK "Din'akk Mountains Siik'maas" +#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" diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm index d37e793cb41..ae8b0cdd2d1 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm @@ -95,7 +95,7 @@ allowed_religions = list(RELIGION_TWINSUNS, RELIGION_MATAKE, RELIGION_RASKARA, RELIGION_NONE, RELIGION_OTHER) default_accent = ACCENT_REPUBICLANSIIK - allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_DINAKK, ACCENT_OLDYASSA) + allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_DINAKK, ACCENT_HARRNRRI, ACCENT_OLDYASSA) inherent_verbs = list( /mob/living/carbon/human/proc/tie_hair) diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm index 96b5415f281..af86efacbb8 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm @@ -28,7 +28,7 @@ heat_level_2 = 360 //RaceDefault 380 Default 400 heat_level_3 = 700 //RaceDefault 800 Default 1000 - allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_RURALDELVAHHI, ACCENT_NOMADDELVAHHI, ACCENT_DINAKK) + allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_RURALDELVAHHI, ACCENT_NOMADDELVAHHI, ACCENT_DINAKK, ACCENT_HARRNRRI) stomach_capacity = 7 @@ -66,7 +66,7 @@ default_h_style = "M'sai Ears" secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_SIGN_TAJARA) - allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_DINAKK) + allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_DINAKK, ACCENT_HARRNRRI, ACCENT_ZARRJIRI) max_nutrition_factor = 1.2 max_hydration_factor = 1.2 diff --git a/html/changelogs/alberyk-accents.yml b/html/changelogs/alberyk-accents.yml new file mode 100644 index 00000000000..f2ba8a80266 --- /dev/null +++ b/html/changelogs/alberyk-accents.yml @@ -0,0 +1,6 @@ +author: Alberyk, Canon35 + +delete-after: True + +changes: + - rscadd: "Added two new Tajaran accents: Harr'nrri and Zarr'jiri Siik'maas." diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index 332de133e2e..6022be737de 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ