diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm index 048a648a66f..0f68cd8aedf 100644 --- a/code/modules/background/accent/human.dm +++ b/code/modules/background/accent/human.dm @@ -257,6 +257,13 @@ tag_icon = "visegrad" text_tag = "VIS" +/datum/accent/sancolette + name = ACCENT_SANCOLETTE + description = "The Colettish dialect belongs to the larger linguistic family of Tradeband but unlike many of its counterparts, it is descended from Earth-based Tradeband dialects rather than Luna-based dialects. \ + It is easily distinguished from its Lunan contemporaries by its differences in pronunciation and tone, and still retains many of its linguistic roots from Earth." + tag_icon = "sancolette" + text_tag = "SAN" + /datum/accent/valkyrie name = ACCENT_VALKYRIE description = "The Valkyrian accent is a difficult accent to replicate, mostly due to the cultural melting pot in which it exists. Influences from across the Orion Spur have impacted the development of the accent, with \ diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index 57c48dda1e3..670dd1916c6 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -103,6 +103,7 @@ #define ACCENT_DAMASCUS "Damascus II" #define ACCENT_ANTILLIA "Port Antillia" #define ACCENT_XANU "Xanu" +#define ACCENT_SANCOLETTE "San Colette" #define ACCENT_REPUBICLANSIIK "Republican Siik'maas" #define ACCENT_NAZIRASIIK "Nazira Siik'maas" @@ -151,5 +152,5 @@ #define ACCENT_LIIDRA "Lii'draic" #define ACCENTS_ALL_IPC_SOL list(ACCENT_SOL, ACCENT_EARTH, ACCENT_SILVERSUN_ORIGINAL, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_MARTIAN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_EUROPA, ACCENT_PHONG, ACCENT_ERIDANI, ACCENT_PLUTO, ACCENT_MICTLAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_TTS) -#define ACCENTS_ALL_IPC list(ACCENT_CETI, ACCENT_TTS, ACCENT_XANU, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ERIDANIREINSTATED, ACCENT_SOL, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_PHONG, ACCENT_MARTIAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_HIMEO, ACCENT_VYSOKA, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_NCF, ACCENT_PLUTO, ACCENT_ASSUNZIONE, ACCENT_VISEGRAD, ACCENT_VALKYRIE, ACCENT_MICTLAN, ACCENT_PERSEPOLIS, ACCENT_MEDINA, ACCENT_NEWSUEZ, ACCENT_AEMAQ, ACCENT_DAMASCUS) +#define ACCENTS_ALL_IPC list(ACCENT_CETI, ACCENT_TTS, ACCENT_XANU, ACCENT_COC, ACCENT_ELYRA, ACCENT_ERIDANI, ACCENT_ERIDANIDREG, ACCENT_ERIDANIREINSTATED, ACCENT_SOL, ACCENT_SILVERSUN_EXPATRIATE, ACCENT_SILVERSUN_ORIGINAL, ACCENT_PHONG, ACCENT_MARTIAN, ACCENT_KONYAN, ACCENT_LUNA, ACCENT_GIBSON_OVAN, ACCENT_GIBSON_UNDIR, ACCENT_HIMEO, ACCENT_VYSOKA, ACCENT_VENUS, ACCENT_VENUSJIN, ACCENT_JUPITER, ACCENT_CALLISTO, ACCENT_EUROPA, ACCENT_EARTH, ACCENT_NCF, ACCENT_PLUTO, ACCENT_ASSUNZIONE, ACCENT_VISEGRAD, ACCENT_SANCOLETTE, ACCENT_VALKYRIE, ACCENT_MICTLAN, ACCENT_PERSEPOLIS, ACCENT_MEDINA, ACCENT_NEWSUEZ, ACCENT_AEMAQ, ACCENT_DAMASCUS) #define RELIGIONS_ALL_IPC list(RELIGION_NONE, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_BUDDHISM, RELIGION_HINDU, RELIGION_TAOISM, RELIGION_JUDAISM, RELIGION_OTHER, RELIGION_TRINARY, RELIGION_SCARAB, RELIGION_LUCEISM, RELIGION_SHINTO) \ No newline at end of file diff --git a/code/modules/background/origins/origins/human/sol.dm b/code/modules/background/origins/origins/human/sol.dm index f08ef6909ea..b11c9489c84 100644 --- a/code/modules/background/origins/origins/human/sol.dm +++ b/code/modules/background/origins/origins/human/sol.dm @@ -20,7 +20,8 @@ /decl/origin_item/origin/konyang, /decl/origin_item/origin/visegrad, /decl/origin_item/origin/mictlan, - /decl/origin_item/origin/antillia + /decl/origin_item/origin/antillia, + /decl/origin_item/origin/sancolette ) /decl/origin_item/origin/sol_system @@ -136,9 +137,22 @@ possible_religions = RELIGIONS_SOLARIAN /decl/origin_item/origin/antillia - name = "Port Antillia" - desc = "A former middle ring Solarian colony annexed into the Corporate Reconstruction Zone following the Solarian Collapse. Port Antillia is an under-developed ocean world with a unique, unstable geological profile and strong tradition of regional governance. Now with the formation of a unified planetary government within the Corporate Reconstruction Zone, Port Antillia looks forward to a hopeful, brighter future." - important_information = "Due to the rather insular and unstable history of Port Antillia as the singular colonisation attempt by the Caribbean Federation, characters born on Port Antillia will have names and appearances consistent with the peoples of the Antilles. Only those native to Port Antillia may take its accent. This is enforceable by server moderators and admins." - possible_accents = list(ACCENT_ANTILLIA) - possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL) - possible_religions = RELIGIONS_SOLARIAN \ No newline at end of file + name = "Port Antillia" + desc = "A former middle ring Solarian colony annexed into the Corporate Reconstruction Zone following the Solarian Collapse. Port Antillia is an under-developed ocean world with a unique, unstable geological profile and strong tradition of regional governance. Now with the formation of a unified planetary government within the Corporate Reconstruction Zone, Port Antillia looks forward to a hopeful, brighter future." + important_information = "Due to the rather insular and unstable history of Port Antillia as the singular colonisation attempt by the Caribbean Federation, characters born on Port Antillia will have names and appearances consistent with the peoples of the Antilles. Only those native to Port Antillia may take its accent. This is enforceable by server moderators and admins." + possible_accents = list(ACCENT_ANTILLIA) + possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL) + possible_religions = RELIGIONS_SOLARIAN + +/decl/origin_item/origin/sancolette + name = "San Colette" + desc = "The system of San Colette is the heartland of the Sovereign Solarian Republic of San Colette, a Solarian member state formerly located on the border between the Middle and Outer Rings and now located almost exactly in the middle of the Northern Wildlands. \ + The Republic has historically been a major hub for warp gate travel between both rings and has become quite wealthy as a result of its trade. Unfortunately this has made it a target for the warlords of the Northern Wildlands: \ + the Coalition-backed League of Independent Corporate-Free Systems and Solarian Navy-supported Solarian Restoration Front. Whether or not San Colette's own defensive alliance - the Middle Ring Shield Pact - will be able to weather the storm approaching its borders remains to be seen. \ + Coletters are, by Outer and Middle Ring standards, a wealthy people with a high standard of living. Culturally they have a strong connection to service in their local military, the Civil Guard of the Sovereign Solarian Republic of San Colette, \ + and are often viewed as martial and dutiful people by the broader Alliance. Most value family highly and hold onto cultural traditions from the colonial origin of Iberia. The vast majority of Coletters are concerned for the future, and many have adopted a fatalistic attitude \ + towards what seems to be a steadily approaching war in the Northern Wildands." + important_information = "Because of the ethnic make-up of San Colette's original settlers and assimilation of immigrants into the native population during and following the Warp Gate Project, human characters born on San Colette will have appearances consistent with the people of the Iberian Peninsula. This is enforceable by server moderators and admins." + possible_accents = list(ACCENT_SANCOLETTE) + possible_citizenships = list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL) + possible_religions = RELIGIONS_SOLARIAN diff --git a/html/changelogs/omicega-fdsfsdfdsfrew894583543.yml b/html/changelogs/omicega-fdsfsdfdsfrew894583543.yml new file mode 100644 index 00000000000..125f6ceeb14 --- /dev/null +++ b/html/changelogs/omicega-fdsfsdfdsfrew894583543.yml @@ -0,0 +1,13 @@ +# Your name. +author: Omicega + +# 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 the San Colettish accent tag for humans and appropriate IPCs." \ No newline at end of file diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index 798a7fa7d1b..4eedf56b520 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ