diff --git a/code/__DEFINES/background.dm b/code/__DEFINES/background.dm index 9d0eea085a8..06998967fe4 100644 --- a/code/__DEFINES/background.dm +++ b/code/__DEFINES/background.dm @@ -189,6 +189,7 @@ #define ACCENT_IRONSONG "Ironsong" #define ACCENT_SANDSONG "Sandsong" #define ACCENT_WASTESONG "Wastesong" +#define ACCENT_GARDENSONG "Gardensong" #define ACCENT_WAVESONG "Wavesong" #define ACCENT_SUNKENSONG "Sunkensong" #define ACCENT_STARSONG "Starsong" diff --git a/code/modules/background/accent/diona.dm b/code/modules/background/accent/diona.dm index 21aee160767..3fd92eb73f2 100644 --- a/code/modules/background/accent/diona.dm +++ b/code/modules/background/accent/diona.dm @@ -53,7 +53,7 @@ //Unathi Influenced Accents /datum/accent/sandsong name = ACCENT_SANDSONG - description = "Found exclusively in Dionae hailing from the Unathi-Dominated world of Moghes, Sandsong is a distinct variation of Rootsong notable for having its tempo much more drawn out, with tones of higher pitches especially having a much more exaggerated sound. Dionae speaking with the Sandsong accent will typically hold certain speech patterns held by Unathi such as hissing out their S’s and difficulties pronouncing the letter X. " + description = "Found exclusively in Dionae hailing from the Unathi-Dominated world of Moghes, Sandsong is a distinct variation of Rootsong notable for having its tempo much more drawn out, with tones of higher pitches especially having a much more exaggerated sound. Dionae speaking with the Sandsong accent will typically hold certain speech patterns held by Unathi such as hissing out their S’s and difficulties pronouncing the letter X." tag_icon = "dionae_sandsong" text_tag = "SDS" @@ -63,6 +63,12 @@ tag_icon = "dionae_wastesong" text_tag = "WES" +/datum/accent/gardensong + name = ACCENT_GARDENSONG + description = "Originating from the gardens of Lazhi, Gardensong is an accent spoken by the gestalts grown to serve as rulers of the Viridis - the Lords Verdant and their offspring. This accent is similar to Sandsong, though with a greater deal of influence from the accents of Unathi Heartland nobility. Its tempo is faster than that of Sandsong, with a flowing and airy tone lending it a pleasant musicality to non-Dionae ears - which some speculate was deliberately engineered by the Governor of the Viridis to better ingratiate her project to the Hegemony at large." + tag_icon = "dionae_gardensong" + text_tag = "GDS" + //Skrell influenced Accents /datum/accent/wavesong name = ACCENT_WAVESONG diff --git a/code/modules/background/citizenship/unathi.dm b/code/modules/background/citizenship/unathi.dm index 12320cbd71c..1fb72f11543 100644 --- a/code/modules/background/citizenship/unathi.dm +++ b/code/modules/background/citizenship/unathi.dm @@ -19,8 +19,6 @@ SPECIES_IPC_UNBRANDED, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, - SPECIES_DIONA, - SPECIES_DIONA_COEUS, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, @@ -42,8 +40,6 @@ SPECIES_IPC_UNBRANDED, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, - SPECIES_DIONA, - SPECIES_DIONA_COEUS, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, @@ -102,6 +98,8 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/klax(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back) H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt) // Hegemony Ta Consulars get a Thermic Blaster. + else if(H.is_diona()) + H.equip_or_collect(new /obj/item/device/uv_light(src), slot_in_backpack) else H.equip_to_slot_or_del(new /obj/item/clothing/accessory/poncho/unathimantle(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/gun/energy/pistol/hegemony(H), slot_belt) diff --git a/code/modules/background/origins/origins/diona/moghes.dm b/code/modules/background/origins/origins/diona/moghes.dm index 0f599a24b64..ae1a71fc518 100644 --- a/code/modules/background/origins/origins/diona/moghes.dm +++ b/code/modules/background/origins/origins/diona/moghes.dm @@ -1,10 +1,27 @@ /singleton/origin_item/culture/dionae_moghes - name = "Moghes" + 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. However, things outside the Hegemony are not so good." possible_origins = list( + /singleton/origin_item/origin/viridis_noble, + /singleton/origin_item/origin/viridis_common, /singleton/origin_item/origin/dionae_wasteland ) +/singleton/origin_item/origin/viridis_noble + name = "Viridis Noble" + desc = "The elevation of Dionae to nobility in 2466 was a controversial decision, but one deemed necessary for the continued operation of Project Viridis. Since their creation, the noble gestalts known as the Lords Verdant have created many offshoots, which are deemed to hold the station of lesser nobility in Izweski society. Many of these gestalts have been sent to other regions of the Hegemony and even beyond, in the hopes of building connections and securing the still-fragile political position of their progenitors." + important_information = "The noble gestalts of the Viridis are carefully cultivated to serve in their roles, and only specific mindtypes are permitted to exist among them. A list of these can be found on the wiki." + possible_accents = list(ACCENT_GARDENSONG) + possible_citizenships = list(CITIZENSHIP_IZWESKI) + possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_ETERNAL_ICHOR, RELIGION_ETERNAL_IRON, RELIGION_OTHER) + +/singleton/origin_item/origin/viridis_common + name = "Viridis Commoner" + desc = "The Hegemony's grand bioterraforming project has led to the growth and recruitment of countless Dionae gestalts in the lands of the Viridis. While most of these Dionae remain in the region of their growth, the Lords Verdant have transferred a sizeable number outside the Viridis as workers, in order to grow their own influence." + possible_accents = list(ACCENT_SANDSONG,ACCENT_WASTESONG) + possible_citizenships = list(CITIZENSHIP_IZWESKI) + possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_ETERNAL_ICHOR, RELIGION_ETERNAL_IRON, RELIGION_OTHER) + /singleton/origin_item/origin/dionae_wasteland name = "Wasteland" desc = "Dionae who were grown in and largely influenced by the wasteland of Moghes. A sort of symbolic bond has formed between these Dionae and the local Unathi, with the Dionae helping clear and absorb Radiation to allow for safer crop growth, and the Unathi providing protection and blood. Dionae will occasionally leave the wastes and Moghes entirely in search of purpose elsewhere in the spur, although influence from Unathi society can certainly still be felt by them." diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index f8aace7b615..e6eb94f7a9e 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -18,7 +18,7 @@ preview_icon = 'icons/mob/human_races/diona/diona_preview.dmi' bandages_icon = 'icons/mob/bandage.dmi' language = LANGUAGE_ROOTSONG - secondary_langs = list(LANGUAGE_SKRELLIAN, LANGUAGE_AZAZIBA) + secondary_langs = list(LANGUAGE_SKRELLIAN, LANGUAGE_AZAZIBA, LANGUAGE_UNATHI) unarmed_types = list( /datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, diff --git a/html/changelogs/RustingWithYou - letgreenthingsgrow.yml b/html/changelogs/RustingWithYou - letgreenthingsgrow.yml new file mode 100644 index 00000000000..3253893cac3 --- /dev/null +++ b/html/changelogs/RustingWithYou - letgreenthingsgrow.yml @@ -0,0 +1,59 @@ +################################ +# 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: 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, 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: "Adds origins and an accent for the Viridis." + - rscadd: "Allows Dionae to be Hegemony consulars." \ No newline at end of file diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index 12076fcc2ee..bda28437ec9 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ