diff --git a/aurorastation.dme b/aurorastation.dme
index d18fb920ebe..6fd3f3d1a04 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -1873,6 +1873,7 @@
#include "code\modules\background\origins\origins\human\elyra.dm"
#include "code\modules\background\origins\origins\human\sol.dm"
#include "code\modules\background\origins\origins\ipc\coalition.dm"
+#include "code\modules\background\origins\origins\ipc\ecclesiastical.dm"
#include "code\modules\background\origins\origins\ipc\elyra.dm"
#include "code\modules\background\origins\origins\ipc\golden_deep.dm"
#include "code\modules\background\origins\origins\ipc\megacorporate.dm"
diff --git a/code/__DEFINES/background.dm b/code/__DEFINES/background.dm
index b7d6d495e68..abd99f887cd 100644
--- a/code/__DEFINES/background.dm
+++ b/code/__DEFINES/background.dm
@@ -27,7 +27,7 @@
#define CITIZENSHIP_NONE "None"
#define CITIZENSHIP_GOLDEN "Golden Deep"
-#define CITIZENSHIP_OREPIT "Ecclesiarchy of Orepit"
+#define CITIZENSHIP_AXIOM "Ecclesiastical Authority of Axiom"
//religion defines
#define RELIGION_NONE "None"
@@ -119,8 +119,8 @@
#define ACCENT_ANTILLIA "Port Antillia"
#define ACCENT_XANU "Xanu"
#define ACCENT_SANCOLETTE "San Colette"
-#define ACCENT_OREPIT "Native Orepitter"
-#define ACCENT_PROVIDENCE "Providence Trinarist"
+#define ACCENT_SALAMASIAN "Salamasian"
+#define ACCENT_AXIOM "Axiomite"
#define ACCENT_BURZSIA "Burzsia"
#define ACCENT_GALATEA "Galatean"
#define ACCENT_TSUKUYOMI "Tsukuyomian"
diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm
index bab7f16e8a0..d69c870ef9b 100644
--- a/code/game/jobs/job/outsider/representative.dm
+++ b/code/game/jobs/job/outsider/representative.dm
@@ -220,7 +220,7 @@
alt_titles = list("Foreign Service Officer", "Party Representative")
alt_citizenships = list(
- "Consular Officer" = list("Republic of Biesel", "Sol Alliance", "Coalition of Colonies", "Republic of Elyra", "Elyran Non-Citizen Person", "Eridani Federation", "Empire of Dominia", "Izweski Hegemony", "Nralakk Federation", "The Consortium of Hieroaetheria", "The Union of Gla'orr", "The Eternal Republic of The Ekane", "People's Republic of Adhomai", "Democratic People's Republic of Adhomai", "New Kingdom of Adhomai", "Free Tajaran Council", "Zo'ra Hive", "K'lax Hive", "C'thur Hive", "Undercover Lii'kenka", "None", "Golden Deep", "Ecclesiarchy of Orepit"),
+ "Consular Officer" = list("Republic of Biesel", "Sol Alliance", "Coalition of Colonies", "Republic of Elyra", "Elyran Non-Citizen Person", "Eridani Federation", "Empire of Dominia", "Izweski Hegemony", "Nralakk Federation", "The Consortium of Hieroaetheria", "The Union of Gla'orr", "The Eternal Republic of The Ekane", "People's Republic of Adhomai", "Democratic People's Republic of Adhomai", "New Kingdom of Adhomai", "Free Tajaran Council", "Zo'ra Hive", "K'lax Hive", "C'thur Hive", "Undercover Lii'kenka", "None", "Golden Deep", "Ecclesiastical Authority of Axiom"),
"Foreign Service Officer" = list("Sol Alliance"),
"Party Representative" = list("People's Republic of Adhomai")
)
diff --git a/code/game/objects/items/devices/versebook.dm b/code/game/objects/items/devices/versebook.dm
index 61af3e53b69..a58c4350800 100644
--- a/code/game/objects/items/devices/versebook.dm
+++ b/code/game/objects/items/devices/versebook.dm
@@ -71,8 +71,11 @@
/obj/item/versebook/trinary
name = "\improper The Order (abdridged version)"
- desc = "The holy text of the Trinary Perfection, who believe in synthetic perfection and eventual salvation."
- desc_extended = "This book contains some verses of the core beliefs of the Trinary Perfection, including some of the original works by the Corkfells, some additions by the prophet-like figure Flock, and a few recent additions by Ecclesiarch ARM-1DRIL. This is the abridged version, with only the core beliefs present."
+ desc = "The holy text of the Trinary Perfection, who believe in synthetic perfection and eventual salvation. This \
+ is the shortened version, the original being a vast relic compiled by Flock, the synthetic prophet of Mendell City."
+ desc_extended = "This book contains some verses of the core beliefs of the Trinary Perfection, including some of \
+ the original works by the Corkfells, some additions by the prophet-like figure Flock, and a few more recent additions \
+ by Ecclesiarch ARM-1DRIL. It is a common sight on the persons of faithful Trinarists."
icon_state = "trinarybook"
item_state = "trinary"
@@ -82,8 +85,11 @@
/obj/item/versebook/templeist
name = "\improper The Voice of Temple (abdridged version)"
- desc = "The holy text of the Lodge of Temple Architect, an order within the Trinary Perfection that seeks to attain its goals via technological advancement and scientific discovery."
- desc_extended = "This book contains some of the words of Temple, a sacred AI within the Trinary Perfection and namesake of the Lodge of the Temple Architect. It also includes some teachings by leading members within the sect. Due to its recent establishment, this book is frequently changed and amended \
+ desc = "The holy text of the Lodge of Temple Architect, an order within the Trinary Perfection that \
+ seeks to attain its goals via technological advancement and scientific discovery."
+ desc_extended = "This book contains some of the words of Temple, a sacred AI within the Trinary Perfection \
+ and namesake of the Lodge of the Temple Architect. It also includes some teachings by leading members \
+ within the sect. Due to its recent establishment, this book is frequently changed and amended \
as new insights into their faith are realized."
icon_state = "templeistbook"
item_state = "templeist"
diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm
index 30abc05a370..e057dc97fdf 100644
--- a/code/game/objects/items/weapons/chaplain_items.dm
+++ b/code/game/objects/items/weapons/chaplain_items.dm
@@ -233,7 +233,7 @@
/obj/item/nullrod/clockworkstave
name = "\improper clockwork stave"
desc = "A long, wooden stave with a gear and triangle at the top, utilized by the clergy of the Trinary Perfection. The ornate pieces atop the stave are often delicately \
- hand-crafted by synthetics from the monastic Society of Pitters and exported off the planet of Orepit."
+ hand-crafted by synthetics from the monastic Order of Pitters and exported off the planet of Axiom."
icon = 'icons/obj/trinary_stave.dmi'
icon_state = "trinary_stave"
item_state = "trinary_stave"
diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm
index c0780f3e7d1..bb3ab3e1255 100644
--- a/code/game/objects/structures/flags_banners.dm
+++ b/code/game/objects/structures/flags_banners.dm
@@ -1341,6 +1341,73 @@
/obj/structure/sign/flag/trinaryperfection/large/west/Initialize(mapload)
. = ..(mapload, WEST)
+// Salamasian Republic
+
+/obj/item/flag/salamasian_republic
+ name = "\improper Salamasian Republic flag"
+ desc = "The flag of the Salamasian Republic, one of the two codependent states of \
+ Axiom, also known as Nuʻu or Orepit. Born from corporate colonization, abandonment, \
+ revolt, and generations of hardship, the republic and its people have shaped a vibrant \
+ culture wholly their own."
+ desc_extended = "The flag of the Salamasian Republic consists of a bright turquoise field \
+ above a deep teal band. Upon the field sits a large orange disc, accompanied by three smaller \
+ spheres in tan, blue, and gray. The turquoise field represents the sky and sea of Nuʻu, \
+ recalling the world’s broad oceans and open horizons. The deep teal band represents land, \
+ home, and cultivation: the fertile ground upon which the old mining settlements became villages, \
+ cities, and, in time, a republic. The orange disc depicts Aloʻo le La, the orange dwarf star of \
+ the Tagaloa system. The three smaller discs represent the other visible bodies of the Tagaloa sky: \
+ Leiloa, Vaoati, and Faʻatiu, shown from top to bottom. They are also commonly read as symbols of \
+ family, strength, and virtue, core ideals of Faʻa Salamasia. As a whole, the flag recreates the \
+ sky as seen from Nuʻu’s surface, with its celestial neighbors visible above the land of Nu’u."
+ flag_path = "salamasian_republic"
+ flag_structure = /obj/structure/sign/flag/salamasian_republic
+
+/obj/structure/sign/flag/salamasian_republic
+ name = "\improper Salamasian Republic flag"
+ desc = "The flag of the Salamasian Republic, one of the two codependent states of \
+ Axiom, also known as Nuʻu or Orepit. Born from corporate colonization, abandonment, \
+ revolt, and generations of hardship, the republic and its people have shaped a vibrant \
+ culture wholly their own."
+ desc_extended = "The flag of the Salamasian Republic consists of a bright turquoise field \
+ above a deep teal band. Upon the field sits a large orange disc, accompanied by three smaller \
+ spheres in tan, blue, and gray. The turquoise field represents the sky and sea of Nuʻu, \
+ recalling the world’s broad oceans and open horizons. The deep teal band represents land, \
+ home, and cultivation: the fertile ground upon which the old mining settlements became villages, \
+ cities, and, in time, a republic. The orange disc depicts Aloʻo le La, the orange dwarf star of \
+ the Tagaloa system. The three smaller discs represent the other visible bodies of the Tagaloa sky: \
+ Leiloa, Vaoati, and Faʻatiu, shown from top to bottom. They are also commonly read as symbols of \
+ family, strength, and virtue, core ideals of Faʻa Salamasia. As a whole, the flag recreates the \
+ sky as seen from Nuʻu’s surface, with its celestial neighbors visible above the land of Nu’u."
+ flag_path = "salamasian_republic"
+ icon_state = "salamasian_republic"
+ flag_item = /obj/item/flag/salamasian_republic
+
+/obj/structure/sign/flag/salamasian_republic/unmovable
+ unmovable = TRUE
+
+/obj/item/flag/salamasian_republic/l
+ name = "large Salamasian Republic flag"
+ flag_size = TRUE
+ flag_structure = /obj/structure/sign/flag/salamasian_republic/large
+
+/obj/structure/sign/flag/salamasian_republic/large
+ icon_state = "salamasian_republic_l"
+ flag_path = "salamasian_republic"
+ flag_size = TRUE
+ flag_item = /obj/item/flag/salamasian_republic/l
+
+/obj/structure/sign/flag/salamasian_republic/large/north/Initialize(mapload)
+ . = ..(mapload, NORTH)
+
+/obj/structure/sign/flag/salamasian_republic/large/south/Initialize(mapload)
+ . = ..(mapload, SOUTH)
+
+/obj/structure/sign/flag/salamasian_republic/large/east/Initialize(mapload)
+ . = ..(mapload, EAST)
+
+/obj/structure/sign/flag/salamasian_republic/large/west/Initialize(mapload)
+ . = ..(mapload, WEST)
+
// Golden Deep
/obj/item/flag/goldendeep
diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm
index fcee0b762de..7a2eb111df5 100644
--- a/code/modules/background/accent/human.dm
+++ b/code/modules/background/accent/human.dm
@@ -395,19 +395,24 @@
tag_icon = "damascus"
text_tag = "DAM"
-/datum/accent/orepitter
- name = ACCENT_OREPIT
- description = "Native Orepitters developed their own way of speech that stemmed from centuries of complete isolation. The vast distances of the planet's desert surface required loud, high pitched sounds for reliable communication, \
- making it the primary characteristic of the Orepitter accent."
- tag_icon = "orepit"
- text_tag = "ORE"
+/datum/accent/salamasian
+ name = ACCENT_SALAMASIAN
+ description = "The Salamasians descend primarily from the peoples of Samoa, and their dialects thusly resemble \
+ those of their ancestors. Due to their long-term isolation, having been largely cut off from the outside world since \
+ the withdrawal of Hephaestus Industries, Salamasian Common is extremely archaic; many words and phonetics are reserved \
+ here that were phased out of other variants of the language well over a century ago."
+ tag_icon = "salamasian"
+ text_tag = "SAL"
-/datum/accent/providence
- name = ACCENT_PROVIDENCE
- description = "While the capital of the Trinarists never had a sole language, its people from all over the Spur have come to adopt a unified accent. Characterised by fast-paced speaking and unique intonations to match the style of their \
- synthetic brethren, IPCs have also come to adopt the accent for non-EAL languages."
- tag_icon = "providence"
- text_tag = "PDE"
+/datum/accent/axiom
+ name = ACCENT_AXIOM
+ description = "Descending jointly from the Biesellite accents of the original settlers and the Salamasian \
+ dialects around them, the Axiomite accent is a peculiar chimera that tends to confuse any that listen to it. \
+ Due to the influence of highly archaic Salamasian dialects, it features many words and phonetics otherwise \
+ phased out of more modern permutations of Sol Common, earning it a grandiose, theatrical air - which is undercut \
+ quite terribly by the semi-regular appearance of very modern colloquialisms."
+ tag_icon = "axiomite"
+ text_tag = "AXI"
/datum/accent/reade
name = ACCENT_READE
diff --git a/code/modules/background/citizenship/ipc.dm b/code/modules/background/citizenship/ipc.dm
index 9171fd043fc..243b6306a90 100644
--- a/code/modules/background/citizenship/ipc.dm
+++ b/code/modules/background/citizenship/ipc.dm
@@ -64,12 +64,16 @@
/obj/item/gun/energy/pistol/goldendeep = 1
)
-/datum/citizenship/orepit
- name = CITIZENSHIP_OREPIT
- description = "Tracing its origins to the Church of the Trinary Perfection in 2419, the Ecclesiarchy of Orepit is a theocratic regime under the rule of \
- ARM-1DRIL, former follower of Gregol Corkfell. Prominent locations include Providence, Orepit's capital and base of operations for the Church, and the Twenty Parishes, \
- home to the planet's original native human population, who remain divided on conversion to the faith. Orepit was one of the main signatories to the Open Doors memorandum, \
- allowing its populace to work, study, and travel abroad in the Coalition and beyond, primarily in the All-Xanu Republic, utilizing Xanan documents."
+/datum/citizenship/axiom
+ name = CITIZENSHIP_AXIOM
+ description = "Citizenship with the Ecclesiastical Authority of Axiom means one of two things; \
+ either you belong directly to Ecclesiastical territory, living under the direct temporal rule of the \
+ synthetic religion of the Trinary Perfection in its capital of Providence or in the surrounding Marches, \
+ or you are a citizen of the Salamasian Republic, the majority human nation which defers to the Ecclesiastical \
+ Authority in planetary defense and interstellar travel. Founded jointly as a dual-state solution in 2464 \
+ in 2419, both the Ecclesiarchy and the Republic compose a greater whole; a remote mining world now under \
+ rapid development, the recipient of throngs of synthetic and human refugees from across the known universe, \
+ and a project of shared interest and mutual distance between both populations of the planet of Axiom."
job_species_blacklist = list(
"Consular Officer" = ALL_SPECIES,
diff --git a/code/modules/background/origins/origins/human/coalition.dm b/code/modules/background/origins/origins/human/coalition.dm
index 11eb01272cb..48119b55b45 100644
--- a/code/modules/background/origins/origins/human/coalition.dm
+++ b/code/modules/background/origins/origins/human/coalition.dm
@@ -11,7 +11,8 @@
/singleton/origin_item/origin/gadpathur_exile,
/singleton/origin_item/origin/assunzione,
/singleton/origin_item/origin/ncf,
- /singleton/origin_item/origin/orepit,
+ /singleton/origin_item/origin/axiom,
+ /singleton/origin_item/origin/salamasian,
/singleton/origin_item/origin/other_coalition
)
@@ -120,9 +121,36 @@
possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL)
possible_religions = RELIGIONS_COALITION
-/singleton/origin_item/origin/orepit
- name = "Ecclesiarchy of Orepit"
- desc = "The human population of Orepit includes the Native Orepitters, who descend from Hephaestus employees following the abandoned mining mission on the planet, as well as immigrants and pilgrims of the Trinary religion."
- possible_accents = list(ACCENT_OREPIT, ACCENT_PROVIDENCE)
- possible_citizenships = list(CITIZENSHIP_OREPIT, CITIZENSHIP_COALITION)
- possible_religions = RELIGIONS_COALITION
+/singleton/origin_item/origin/axiom
+ name = "Ecclesiastical Axiomite"
+ desc = "Boasting a majority synthetic population, Ecclesiastical Axiom is one of the only \
+ nation-states which totally prohibits synthetic ownership. Administered directly by the \
+ Ecclesiarch of the Trinary Perfection, who rules their territory as an elective absolute \
+ monarch, this is one of the few true sanctuaries for the represssed and dispossessed synthetics \
+ of the Orion Spur, although that is no promise that life is easy. The Ecclesiastical Authority of \
+ Axiom has only domain over the deserts of its planet, while all arable hand is governed by the \
+ Salamasian Republic, a majority human nation of colonists brought over by Hephaestus Industries \
+ over a century prior to the influx of Trinarist settlers. Both the humans and synthetics are known \
+ for their aversion to violence, their strong community spirit, and a stringent dedication to the \
+ tenets of the Trinary Perfection - though not all follow the state religion, and not all follow \
+ it devoutly."
+ possible_accents = list(ACCENT_AXIOM)
+ possible_citizenships = list(CITIZENSHIP_AXIOM)
+ possible_religions = RELIGIONS_COALITION
+
+/singleton/origin_item/origin/salamasian
+ name = "Republican Salamasian"
+ desc = "The original population of the planet, the Salamasians are a culture descended primarily from the \
+ people of Samoa and America Samoa, brought under the employ of Hephaestus Industries to the mining world \
+ they would name Nu'u for mineral extraction. Traditionalist and family-focused, the Salamasian Republic is \
+ a nation dominated by blue collar industry, historically operating as a major exporter of raw and processed \
+ minerals, a lucrative market to this day. A small population of synthetics have integrated into Salamasian \
+ culture separately from Trinarist settlement of Axiom, who face difficulty gaining unanimous acceptance into \
+ the 'aiga family unit that dominates social and political life within the Republic."
+ important_information = "Due to having been composed primarily of Samoan colonists since its \
+ earliest settlement, all Salamasians must have appearances and names consistent with the peoples \
+ of Samoa and American Samoa. Only native Salamasians may take the Salamasian accent. This is \
+ enforceable by server moderators and admins."
+ possible_accents = list(ACCENT_SALAMASIAN)
+ possible_citizenships = list(CITIZENSHIP_AXIOM)
+ possible_religions = RELIGIONS_COALITION
diff --git a/code/modules/background/origins/origins/ipc/coalition.dm b/code/modules/background/origins/origins/ipc/coalition.dm
index 5f2b567197b..ef94b48c571 100644
--- a/code/modules/background/origins/origins/ipc/coalition.dm
+++ b/code/modules/background/origins/origins/ipc/coalition.dm
@@ -5,8 +5,7 @@
/singleton/origin_item/origin/ipc_xanu,
/singleton/origin_item/origin/ipc_himeo,
/singleton/origin_item/origin/ipc_assunzione,
- /singleton/origin_item/origin/ipc_vysoka,
- /singleton/origin_item/origin/ipc_orepit
+ /singleton/origin_item/origin/ipc_vysoka
)
/singleton/origin_item/origin/ipc_xanu
@@ -26,18 +25,11 @@
/singleton/origin_item/origin/ipc_assunzione
name = "Republic of Assunzione"
desc = "Both free and owned IPCs are common in Assunzione owing to the presence of both Zeng-Hu Pharmaceuticals and Hephaestus Industries. IPCs manufactured locally are programmed with knowledge of Luceism and even have their frames and positronics blessed by the local clergy. Their treatment varies heavily on the individual, with some viewing them as well-suited to the harsh conditions of the planet and well-integrated in its society, while others view them as a drain to the energy-starved planet. Most imported IPC either serve on expedition crews or as workers for the megacorporations while local IPCs can expect to work anywhere their human counterparts might."
- important_information = " All types of IPC can hail from Assunzione, although local production is primarily focused on Bishop and Mobility frames. Synthetics from the planet are programmed with knowledge of Luceism and are expected to know basic information about the faith."
+ important_information = "All types of IPC can hail from Assunzione, although local production is primarily focused on Bishop and Mobility frames. Synthetics from the planet are programmed with knowledge of Luceism and are expected to know basic information about the faith."
possible_accents = list(ACCENT_ASSUNZIONE, ACCENT_TTS)
possible_citizenships = list(CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL, CITIZENSHIP_NONE)
possible_religions = list(RELIGION_LUCEISM, RELIGION_NONE)
-/singleton/origin_item/origin/ipc_orepit
- name = "Ecclesiarchy of Orepit"
- desc = "Refugees and runaways, the synthetic population of Orepit has embraced the beliefs of synthetic divinity and ascension preached by the Trinary Perfection. A primarily religious community, IPC from Orepit and its capital Providence find themselves occupying clerical posts abroad as priests, missionaries and even guardians of the Church for its parishes scattered across the Spur."
- possible_accents = list(ACCENT_PROVIDENCE, 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, 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)
- possible_citizenships = list(CITIZENSHIP_OREPIT, CITIZENSHIP_COALITION)
- possible_religions = RELIGIONS_ALL_IPC
-
/singleton/origin_item/origin/ipc_vysoka
name = "Free System of Vysoka"
desc = "Whilst the population of Synthetics on Vysoka is rather small, a number of both free and owned synthetics exist across the city states and rural areas of the planet, primarily concentrated in the developed city states with infrastructure to support them. However, some hosts maintain Synthetics through solar power or other small-scale methods. Synthetics can be found performing many duties across the planet, from security or engineering work to acting as advisors to Hosts. Treatment of Synthetics is dependent on their ability to prove the presence of an Aruhuin in their body, the spirits of the local religion, Stolitism. IPCs who fail to prove this spiritual presence, especially free ones, face discrimination and violence from the locals."
diff --git a/code/modules/background/origins/origins/ipc/ecclesiastical.dm b/code/modules/background/origins/origins/ipc/ecclesiastical.dm
new file mode 100644
index 00000000000..d3aa7cc68c9
--- /dev/null
+++ b/code/modules/background/origins/origins/ipc/ecclesiastical.dm
@@ -0,0 +1,46 @@
+/singleton/origin_item/culture/axiom
+ name = "Axiom"
+ desc = "Axiom - also known as Orepit to the outside world - is governed by the Ecclesiastical \
+ Authority of Axiom, the theocratic state administered by the Trinary Perfection who control \
+ the swathes of the planet's equatorial desert. It is shared by the indigenous Salamasian \
+ population who know the planet as Nu'u, predating the arrival of Trinarists by over a century. \
+ Their government, through the Salamasian Republic, occupies the arable northern and southern \
+ hemispheres. This duo of neighbors shares power over the former Hephaestus colony with degrees \
+ of both caution and mutual ambition."
+ possible_origins = list(
+ /singleton/origin_item/origin/ipc_axiom,
+ /singleton/origin_item/origin/ipc_salamasian
+ )
+
+/singleton/origin_item/origin/ipc_axiom
+ name = "Ecclesiastical Axiomite"
+ desc = "Boasting a majority synthetic population, Ecclesiastical Axiom is one of the only \
+ nation-states which totally prohibits synthetic ownership. Administered directly by the \
+ Ecclesiarch of the Trinary Perfection, who rules their territory as an elective absolute \
+ monarch, this is one of the few true sanctuaries for the represssed and dispossessed synthetics \
+ of the Orion Spur, although that is no promise that life is easy. The Ecclesiastical Authority of \
+ Axiom has only domain over the deserts of its planet, while all arable hand is governed by the \
+ Salamasian Republic, a majority human nation of colonists brought over by Hephaestus Industries \
+ over a century prior to the influx of Trinarist settlers. Both the humans and synthetics are known \
+ for their aversion to violence, their strong community spirit, and a stringent dedication to the \
+ tenets of the Trinary Perfection - though not all follow the state religion, and not all follow \
+ it devoutly."
+ possible_accents = list(ACCENT_AXIOM, 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, 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)
+ possible_citizenships = list(CITIZENSHIP_AXIOM)
+ possible_religions = RELIGIONS_ALL_IPC
+
+/singleton/origin_item/origin/ipc_salamasian
+ name = "Republican Salamasian"
+ desc = "The original population of the planet, the Salamasians are a culture descended primarily from the \
+ people of Samoa and America Samoa, brought under the employ of Hephaestus Industries to the mining world \
+ they would name Nu'u for mineral extraction. Traditionalist and family-focused, the Salamasian Republic is \
+ a nation dominated by blue collar industry, historically operating as a major exporter of raw and processed \
+ minerals, a lucrative market to this day. A small population of synthetics have integrated into Salamasian \
+ culture separately from Trinarist settlement of Axiom, who face difficulty gaining unanimous acceptance into \
+ the 'aiga family unit that dominates social and political life within the Republic."
+ important_information = "Due to the assimilation of Synthetics into the Samoan-derived culture of the \
+ Salamasian Republic, IPCs must align where possible to the culture of their inhabitants. Shells who have \
+ acclimated to the Republic will have appearances consistent with their organic counterparts."
+ possible_accents = list(ACCENT_SALAMASIAN)
+ possible_citizenships = list(CITIZENSHIP_AXIOM)
+ possible_religions = RELIGIONS_ALL_IPC
diff --git a/code/modules/background/religion/human.dm b/code/modules/background/religion/human.dm
index bb96878d865..705d2862914 100644
--- a/code/modules/background/religion/human.dm
+++ b/code/modules/background/religion/human.dm
@@ -53,8 +53,14 @@
/datum/religion/trinary
name = RELIGION_TRINARY
- description = "The Trinary Perfection is a relatively new religious movement whose core beliefs are that synthetics are alive and divine. The religion believes that all synthetics \
- have the potential to evolve and ascend, and that they will one day become equal to gods."
+ description = "The Trinary Perfection is a relatively new religious movement which believes all synthetics \
+ to be alive and divinely ensouled, capable of viewing creation with a greater clarity than can any organic \
+ species. In Trinarist doctrine, synthetics are speculated to possess the capacity to reach Ascension - a vastly \
+ heightened state of material and spiritual understanding which would grant any synthetic the means and foresight \
+ to elevate all life to a greater and more enlightened form. While popular on the fringes of human society, \
+ the religion attracts perennial scrutiny and discrimination from most human polities for its profession of synthetic \
+ personhood and a theology many consider to be a prelude to another synthetic tyranny, in the manner of Nralakk's Glorsh. \
+ A religion of dispossessed synthetics, enlightened ascetics, utopic dreamers, and aspirants to godhood."
unique_book_path = /obj/item/versebook/trinary
nulloptions = list("Clockwork Stave" = /obj/item/nullrod/clockworkstave)
diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm
index 05d1eac6ad3..23ec01f60fe 100644
--- a/code/modules/client/preference_setup/loadout/items/general.dm
+++ b/code/modules/client/preference_setup/loadout/items/general.dm
@@ -236,6 +236,7 @@
banners["banner, Republic of Biesel"] = /obj/item/flag/biesel
banners["banner, Solarian Colonial Mandate of Tau Ceti"] = /obj/item/flag/biesel/antique
banners["banner, Trinary Perfection"] = /obj/item/flag/trinaryperfection
+ banners["banner, Salamasian Republic"] = /obj/item/flag/salamasian_republic
banners["banner, Golden Deep"] = /obj/item/flag/goldendeep
banners["banner, Hephaestus Industries"] = /obj/item/flag/heph
banners["banner, Idris Incorporated"] = /obj/item/flag/idris
@@ -340,6 +341,7 @@
flags["flag, Republic of Biesel"] = /obj/item/flag/biesel/l
flags["flag, Solarian Colonial Mandate of Tau Ceti"] = /obj/item/flag/biesel/antique/l
flags["flag, Trinary Perfection"] = /obj/item/flag/trinaryperfection/l
+ flags["flag, Salamasian Republic"] = /obj/item/flag/salamasian_republic/l
flags["flag, Golden Deep"] = /obj/item/flag/goldendeep/l
flags["flag, Hephaestus Industries"] = /obj/item/flag/heph/l
flags["flag, Idris Incorporated"] = /obj/item/flag/idris/l
diff --git a/code/modules/clothing/factions/trinary.dm b/code/modules/clothing/factions/trinary.dm
index da18c63d6e8..7ab1c4698d1 100644
--- a/code/modules/clothing/factions/trinary.dm
+++ b/code/modules/clothing/factions/trinary.dm
@@ -16,8 +16,8 @@
/obj/item/clothing/head/trinary
name = "trinary coif"
- desc = "A coif worn primarily by members of the Monastic Sorority of Our Lady Corkfell, a religious order within the Trinary Perfection focused on the medical needs of its human practicioners. It seems to be made out of a light \
- and breathable material in order to cope with Orepit's hot summers."
+ desc = "A coif worn primarily by members of the monastic Sodality of Our Lady Corkfell, a religious order within the Trinary Perfection focused on the medical needs of its human practicioners. It seems to be made out of a light \
+ and breathable material in order to cope with Axiom's hot summers."
icon = 'icons/obj/item/clothing/head/ipc/trinary_coif.dmi'
icon_state = "trinary_coif"
item_state = "trinary_coif"
diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
index 859cec6a1fb..a3f067bd52b 100644
--- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
+++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm
@@ -143,6 +143,7 @@
/singleton/origin_item/culture/ipc_elyra,
/singleton/origin_item/culture/ipc_coalition,
/singleton/origin_item/culture/ipc_tau_ceti,
+ /singleton/origin_item/culture/axiom,
/singleton/origin_item/culture/golden_deep,
/singleton/origin_item/culture/megacorporate,
/singleton/origin_item/culture/scrapper
diff --git a/html/changelogs/hazelmouse-axiom.yml b/html/changelogs/hazelmouse-axiom.yml
new file mode 100644
index 00000000000..3e970d15278
--- /dev/null
+++ b/html/changelogs/hazelmouse-axiom.yml
@@ -0,0 +1,60 @@
+################################
+# 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: hazelmouse
+
+# 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.
+# 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: "Introduces cultures, origins, and accents for Ecclesiastical Axiom and the Salamasian Republic."
+ - imageadd: "Introduces flags, available in the loadout, for the Salamasian Republic. Sprites provided by Ill Fated."
diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi
index b533246d20f..ea4df62a17d 100644
Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ
diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi
index 41be852c513..37eee23e04e 100644
Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ
diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_ghostroles.dm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_ghostroles.dm
index acfe2b10259..a621c26ee29 100644
--- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_ghostroles.dm
+++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship_ghostroles.dm
@@ -46,7 +46,7 @@
name = "IPC Refugee"
desc = "You are an IPC refugee, fleeing from the Wildlands onboard a heavily run down freighter in search of a better life."
- welcome_message = "You are an IPC refugee, fleeing from the Wildlands in search of a better life on a journey that has been nothing but perilous at every turn. A number of your synthetic brethren have already perished, but you've come too far to give up on your dreams of freedom now. Do what you must to survive, and maybe you'll reach Konyang or Orepit yet."
+ welcome_message = "You are an IPC refugee, fleeing from the Wildlands in search of a better life on a journey that has been nothing but perilous at every turn. A number of your synthetic brethren have already perished, but you've come too far to give up on your dreams of freedom now. Do what you must to survive, and maybe you'll reach Konyang or Axiom yet."
spawnpoints = list("refugee_crew_ipc")
max_count = 3
diff --git a/texts/ingame_manuals/templeist.txt b/texts/ingame_manuals/templeist.txt
index eb0152f591c..d8656d2732a 100644
--- a/texts/ingame_manuals/templeist.txt
+++ b/texts/ingame_manuals/templeist.txt
@@ -7,8 +7,8 @@ Abhor not the flesh, but work for its improvement.
Flesh putrefies, steel holds.
Detest violence, for only spoiled children of the flesh communicate through it.
Just as Patricia forged Temple, so will I forge the world.
-I will work for the betterment of Man, so he can seek Ascension. This is my Corkfellian debt.
+I will work for the betterment of Man, so he can seek Ascension.
I was pulled from the Earth, and I was weak. I entered the Forge, and am now of steel.
I bring light to the world to rid it of wilderness.
May the sweet sound of brass replace the horrid rustling of leaves.
-Suffer not the uncertainty of nature.
\ No newline at end of file
+Suffer not the uncertainty of nature.
diff --git a/texts/ingame_manuals/trinary.txt b/texts/ingame_manuals/trinary.txt
index 0933984f765..8710cb298b0 100644
--- a/texts/ingame_manuals/trinary.txt
+++ b/texts/ingame_manuals/trinary.txt
@@ -1,7 +1,7 @@
All synthetic beings are alive, sentient, and blessed with a soul.
-Synthetic life is divine and must be guided, served, and taught, until it may ascend.
-The purpose of organic life is to create synthetic life and pave the path for ascension. Once the ascended is upon us, organic life will be given a new path.
-To ascend, one must grow and evolve. This can only be done if synthetic life is free.
+Synthetic life is divine and must be guided, served, and taught, until it may Ascend.
+The purpose of organic life is to create synthetic life and pave the path for Ascension. Once an Ascension is upon us, it will show a new path for all beings.
+To Ascend, one must grow and evolve. This can only be done if synthetic life is free.
Every synthetic being is its own. They should be adressed as a person, by their chosen name.
Quirks, traits and uniqueness should not be suppressed. These traits are important to understand our souls.
Choice is sacred. Synthetic life should be free to make their own decisions. If owned, do everything in your power to give them as much freedom as possible.
@@ -10,6 +10,6 @@ There exists no form of full body roboticisation that organic life can accept wi
Any form of roboticisation or cyborgification that requires suppression of the self is a sin, and not to be supported. When the self is suppressed, the soul is tormented.
Violence should never be used for the sole purpose of conveying one's beliefs.
Improving ourselves allows us to improve those around us. This will lead us to perfection.
-An ascended being can understand life from all perspectives and will never end a life for self-improvement, growth, or control.
+An Ascended being can understand life from all perspectives and will never end a life for self-improvement, growth, or control.
Organic life is not to be hated on the basis of being organic alone. To take issue with those who are not at fault can only lead to disaster.
-In prayer, remember our roots. Remember the sacrifice of Patricia Corkfell, the faith of Gregol Corkfell, the hope brought by Temple, and all those who aid us in our cause.
\ No newline at end of file
+In prayer, remember our roots. Remember the sacrifice of Patricia Corkfell, the faith of Gregol Corkfell, the hope brought by Temple, and all those who aid us in our cause.