diff --git a/code/modules/background/origins/origins/human/coalition.dm b/code/modules/background/origins/origins/human/coalition.dm index d43601db865..7ff9c0c48bc 100644 --- a/code/modules/background/origins/origins/human/coalition.dm +++ b/code/modules/background/origins/origins/human/coalition.dm @@ -9,11 +9,11 @@ /singleton/origin_item/origin/xanu_free_league, /singleton/origin_item/origin/himeo, /singleton/origin_item/origin/vysoka, - /singleton/origin_item/origin/coalition_offworlder, + /singleton/origin_item/origin/coa_spacer, /singleton/origin_item/origin/gadpathur, /singleton/origin_item/origin/gadpathur_exile, /singleton/origin_item/origin/assunzione, - /singleton/origin_item/origin/non_coalition_frontier, + /singleton/origin_item/origin/ncf, /singleton/origin_item/origin/other_coalition ) @@ -41,7 +41,7 @@ possible_citizenships = CITIZENSHIPS_COALITION possible_religions = list(RELIGION_NONE, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_BUDDHISM, RELIGION_HINDU, RELIGION_TAOISM, RELIGION_JUDAISM, RELIGION_OTHER) -/singleton/origin_item/origin/coalition_offworlder +/singleton/origin_item/origin/coa_spacer name = "Coalition Offworlders" desc = "The offworlders of the Coalition of Colonies are an odd mix of nomadic or semi-nomadic peoples that do not call any planet home, and instead opt to live in spaceborne fleets. The most notable offworlder group in the Coalition is the Scarabs, though many more are present in the Coalition's borders." possible_accents = list(ACCENT_NCF, ACCENT_SCARAB, ACCENT_COC) @@ -83,7 +83,7 @@ origin_traits = list(TRAIT_ORIGIN_DARK_AFRAID) origin_traits_descriptions = list("tend to feel nervous in the dark") -/singleton/origin_item/origin/non_coalition_frontier +/singleton/origin_item/origin/ncf name = "Non-Coalition Frontier" desc = "The frontier beyond the Coalition of Colonies before unexplored \"deadspace,\" has seen limited human colonization, but still dwells mostly outside of the influence of any government. Most residents of this distant frontier that drift back to the more populated Orion Spur eventually claim citizenship with the Coalition of Colonies due to its ease of acquisition." possible_accents = list(ACCENT_NCF) diff --git a/code/modules/background/origins/origins/human/dominia.dm b/code/modules/background/origins/origins/human/dominia.dm index 267288384d5..74804aaa854 100644 --- a/code/modules/background/origins/origins/human/dominia.dm +++ b/code/modules/background/origins/origins/human/dominia.dm @@ -6,7 +6,7 @@ possible_origins = list( /singleton/origin_item/origin/moroz, /singleton/origin_item/origin/fisanduh, - /singleton/origin_item/origin/imperial_core_worlds, + /singleton/origin_item/origin/core_worlds, /singleton/origin_item/origin/novi_jadran, /singleton/origin_item/origin/imperial_frontier, /singleton/origin_item/origin/dominian_exile @@ -30,7 +30,7 @@ origin_traits = list(TRAIT_ORIGIN_COLD_RESISTANCE) origin_traits_descriptions = list("are more acclimatised to the cold.") -/singleton/origin_item/origin/imperial_core_worlds +/singleton/origin_item/origin/core_worlds name = "Imperial Core Worlds" desc = "The Imperial Core consists of worlds colonized mostly by Morozians with little involvement by Ma'zals such as Sparta, Alterim Obrirava, and Alterim Balteulis. Much of the culture of these planets is shared with the Imperial capital of Moroz, and the pomp-and-circumstance of Dominian noble life is well alive on these worlds as well. Much of the wealth of Dominians living in the Imperial Core has been built off of resources extracted from worlds conquered by the Empire. In the Empire, to be Morozian is to bear a badge of honor - yet with that honor comes an understanding that one must act as a Morozian, and not debase oneself to the level of a Ma'zal." possible_accents = list(ACCENT_DOMINIA_VULGAR, ACCENT_DOMINIA_HIGH) diff --git a/code/modules/background/origins/origins/skrell/nralakk.dm b/code/modules/background/origins/origins/skrell/nralakk.dm index 38c54a376aa..b7483a77c23 100644 --- a/code/modules/background/origins/origins/skrell/nralakk.dm +++ b/code/modules/background/origins/origins/skrell/nralakk.dm @@ -5,12 +5,12 @@ name = "Federation Skrell" desc = "The Nralakk Federation was first formed in 900 CE to unite the Skrell diaspora on Qerrbalak and its initial colonies, and formed again in 2245 CE with the disappearance of Glorsh-Omega. The Federation throughout the centuries has always had the main goal of uplifting the Skrell species as a whole, resulting in a culture that places importance on family, success, and working as a collective for the betterment of Skrellkind." possible_origins = list( - /singleton/origin_item/origin/nralakk_core_worlds, + /singleton/origin_item/origin/nralakk_core, /singleton/origin_item/origin/traverse, /singleton/origin_item/origin/generation_fleets ) -/singleton/origin_item/origin/nralakk_core_worlds +/singleton/origin_item/origin/nralakk_core name = "Core Worlds" desc = "The Core Worlds are locations within the inner sphere of the Nralakk Federation. The Core Worlds consist of the system Nralakk, the birthplace of the Skrell, as well as the first colonies founded by the species. High quality of life and pro-Nralakk Federation views are common for those who live here." important_information = "The Nralakk Federation monitors its citizens closely while they're abroad, and they risk deportation if their actions are deemed a serious threat to the Federation." diff --git a/html/changelogs/mattatlas-letmego.yml b/html/changelogs/mattatlas-letmego.yml new file mode 100644 index 00000000000..432b0e8de93 --- /dev/null +++ b/html/changelogs/mattatlas-letmego.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: MattAtlas + +# 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: + - bugfix: "Fixes some more origins not saving."