Adds some new EUM-centric things (#16076)

* Adds more EUM Origins * Adds a new Dionae accent * adds a new dionae accent2 * dionae religions p1 * dionae religions p2 * adds a missing " * Adds a skrell EUM origin (credit to Brotendo) * Adds the Skrell EUM accent (Credit to Brotendo) * Adds the Skrell EUM accent (Credit to Brotendo) * Adds some skrell religions to the nraldaaq origin * Adds EUM Consulars(?) i have no idea if this is gonna work lol * sprites * New accent sprites * accents for real hopefully * changelog * removes a duped EUM consular thingy * fixes * \ not / * error fixes * fixes a space * more error fixes * Adds diona citizenship * e * o * even more error fixes * i had one job and i put a d not e * Adds the EUM flag sprite * Adds some new dionae clothing sprites * Adds the floral tunic item * Adds the eumponcho item (replace the placeholders) * (Hopefully) does the eum poncho correctly * Adds the eum flag * Adds stuff to the loadout * Adds an actual description for the poncho * removes an extra space * Adds an actual description to the poncho * Fixes the dionae poncho not having a suit sprite * Adds the blood eternal robes to the loadout * Forgetti to add skrell_eum to possible origins * , * accents merge fix * letter fix Co-authored-by: Alberyk <Alberyk@users.noreply.github.com> * letter fix2 Co-authored-by: Alberyk <Alberyk@users.noreply.github.com> * letter fix3 Co-authored-by: Alberyk <Alberyk@users.noreply.github.com> * letter fix4, revenge of copypasteing Co-authored-by: Alberyk <Alberyk@users.noreply.github.com> * hopefully last letter fix Co-authored-by: Alberyk <Alberyk@users.noreply.github.com> --------- Co-authored-by: Alberyk <Alberyk@users.noreply.github.com>
2026-07-22 05:17:38 +01:00 · 2023-04-09 06:40:01 -04:00
parent 153a4ba0b5
commit 44f980f45c
17 changed files with 258 additions and 17 deletions
@@ -9,3 +9,9 @@
 	description = "An innate accent spoken by Dionae that were born within the vacuum of space, or near extreme amounts of ionising radiation. The accent is said to be incredibly deep, and some have said that the Dionae that have the accent sound extremely similar to baritone, varying between basslike and tenorlike."
 	tag_icon = "dionae_voidsong"
 	text_tag = "VDS"
+
+/datum/accent/ancientsong
+	name = ACCENT_ANCIENTSONG
+	description = "An accent unique to the Dionae hailing for EUM. It sounds similar to Rootsong, although with a higher pitch."
+	tag_icon = "dionae_ancientsong"
+	text_tag = "ATS"
@@ -85,3 +85,10 @@
 	a certain stigma attached to it, and is noted as being 'rural' or 'unrefined' by Skrell from the inner systems."
 	tag_icon = "skrell_tattuqig"
 	text_tag = "TAT"
+
+/datum/accent/skrell/EUM
+	name = ACCENT_SKRELLEUM
+	description = "The Nral'Daaq accent draws from the accents of migrating Skrell from the Federation as well as elements of rootsong from the local Dionae population, creating a sing-song accent with \
+    melodic highs and lows. The accent has been compared to the Aweijiin accent, but it does not have the same reputation as it is not used by idols."
+	tag_icon = "skrell_nraldaaq"
+	text_tag = "NDQ"
@@ -0,0 +1,29 @@
+/datum/citizenship/eum
+	name = CITIZENSHIP_EUM
+	description =  "Initially discovered by Skrell probes in 2342, Epsilon Ursea Minoris, or generally referred \
+  	to as EUM, is a habitable world home to multiple Dionae civilizations and clusters. While not the homeworld \
+  	of the species, EUM is the largest-known world to have been colonized exclusively by Dionae without contact \
+  	or help from outside species, being home to the Dionae for thousands of years prior to discovery." 
+  
+	job_species_blacklist = list(
+		"Consular Officer" = list(
+			SPECIES_HUMAN,
+			SPECIES_HUMAN_OFFWORLD,
+      		SPECIES_SKRELL,
+			SPECIES_IPC,
+			SPECIES_IPC_BISHOP,
+			SPECIES_IPC_G1,
+			SPECIES_IPC_G2,
+			SPECIES_IPC_SHELL,
+			SPECIES_IPC_UNBRANDED,
+			SPECIES_IPC_XION,
+			SPECIES_IPC_ZENGHU,
+			SPECIES_TAJARA,
+			SPECIES_TAJARA_MSAI,
+			SPECIES_TAJARA_ZHAN,
+			SPECIES_UNATHI,
+			SPECIES_VAURCA_WORKER,
+			SPECIES_VAURCA_WARRIOR,
+			SPECIES_VAURCA_BULWARK
+		)
+	)
@@ -67,15 +67,3 @@
 		else
 			addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
 	return TRUE
-
-/datum/citizenship/epsilon
-	name = CITIZENSHIP_EUM
-	description =  "An independent nation on the edge of Skrell space, the Co-Operative Territories of Epsilon Ursae Minoris, \
-	also known as the CT-EUM, is a nation primarily comprised of Dionae with a minority of skrell mostly situated \
-	in the city of Nral'Daaq. The CT-EUM is compromised of a myriad of smaller nations and city-states that make up \
-	the whole of the nation. While the nation is independent it does have heavy ties to the Nralakk Federation, \
-	being instrumental in the nations' founding and contact with the rest of the galaxy. "
-
-	job_species_blacklist = list(
-		"Consular Officer" = ALL_SPECIES
-	)
@@ -59,6 +59,8 @@
 #define RELIGION_ETERNAL "The Eternal"
 #define RELIGION_KSSHR "Ksshr"
 #define RELIGION_SHRKH "Shrkh"
+#define RELIGION_MADA "Maraka"
+#define RELIGION_GLEANERS "Lights Accord"

 //accent defines

@@ -141,11 +143,13 @@
 #define ACCENT_SKRELLSOL "Solarian Skrell Standard"
 #define ACCENT_SKRELLCOC "Coalition Skrell Standard"
 #define ACCENT_SKRELLCETI "Biesellite Skrell Standard"
+#define ACCENT_SKRELLEUM "Nral'Daaq"
 #define ACCENT_SROM "Inner Voice"
 #define ACCENT_TATTUQIG "Tattuqig"

 #define ACCENT_ROOTSONG "Rootsong"
 #define ACCENT_VOIDSONG "Voidsong"
+#define ACCENT_ANCIENTSONG "Ancientsong"

 #define ACCENT_TTS "Text-to-Speech"

@@ -9,6 +9,57 @@
 	name = "Epsilon Ursae Minoris"
 	desc = "Epsilon Ursea Minoris, generally referred to as EUM, is a habitable world home to multiple Dionae civilizations and clusters. While not the homeworld of the species, EUM is the largest-known world to have been colonized exclusively by Dionae without contact or help from outside species, being home to the Dionae for thousands of years prior to discovery. Since first contact was made with the Nralakk Federation in 2390 the planet has become semi-unified under the Co-operative Territories of Epsilon Ursae Minoris, or the CT-EUM. Despite this the nations that make up the CT-EUM are still largely distinct from one another, hosting their own distinct cultures and societies. Notably, the planet also plays host to a sizeable Skrellian population, although Dionae still make up the vast majority of the planet's population."
 	important_information = "CT-EUM culture and society is far from being unified, with most member nations of the CT-EUM having their own, distinct cultural identity. Most inhabitants of EUM consider themselves citizens of the nation they hail from first and a citizen of the CT-EUM second."
-	possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG)
+	possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG)
+	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
+	possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_GLEANERS, RELIGION_OTHER, RELIGION_NONE)
+	
+/singleton/origin_item/origin/united
+	name = "United"
+	desc = "Widely considered the capital of the CT-EUM, the city-state of United is the newest independent nation, formed alongside the formation of the CT-EUM, to act as a neutral meeting place for the Council of Delegates, and to represent the central governing body, as well as acting as a mediator between the two other city-states should a conflict arise. United is the second most-visited city on EUM after Nral'Daaq, and has influence from both off-world and the other city-states in its structure, and operation."
+	possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG)
+	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
+	possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_GLEANERS, RELIGION_OTHER, RELIGION_NONE)
+	
+/singleton/origin_item/origin/gleaners
+	name = "Gleaners Of Bliss"
+	desc = "The Gleaners of Bliss is a large, religious city-state that is known for its imperialistic attitude. The Gleaners emphasize harmony and equality, but are not above making sure that it aligns to their specific ideals, however. The Gleaners are among the oldest of the city-states and were one of the first to put forth the idea of the CT-EUM on first contact. Before, and during, its inception, the Gleaners have expanded their influence on numerous other city-states, both in and out of the CT-EUM. Now, the Gleaners are the most outspoken proponents of expanding the CT-EUM offworld. Their emphasis on equality and harmony however, are criticized because of this, and the Gleaners are often seen as a very hypocritical city-state."
+	possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG)
+	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
+	possible_religions = list(RELIGION_ETERNAL, RELIGION_GLEANERS, RELIGION_OTHER, RELIGION_NONE)
+	
+/singleton/origin_item/origin/nraldaaq
+	name = "Nral'Daaq"
+	desc = "Playing host to the vast majority of the planet's non-dionae population, Nral'Daaq is a city-state under the CT-EUM that is known for being the planet's hub of off-world trading, as well as for its quite diverse majority-skrell population, with both Pro-Federation and Anti-Federation Skrell calling the city home. Due to the city's border with the sea, Nral'Daaq is also a quite popular trading spot for the Ekane, with the vast majority of their goods ending up in the city to be later resold off-world. "
+	possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG)
+	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
+	possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_GLEANERS, RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE)
+	
+/singleton/origin_item/origin/mada
+	name = "Mada"
+	desc = "Primarily located in the great forests of the Mede Region on EUM, The Mada are a semi-independent nation under the CT-EUM known for their isolationist beliefs and their religious worship of nature, with a focus on plant life in particular. Rather than all be situated in one singular city, the Mada are fairly spread out in the region, inhabiting a myriad of small settlements. The Capital, Elder Mada, is the largest settlement under the Mada, but not by a large margin."
+	possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG)
+	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
+	possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_OTHER, RELIGION_NONE)
+
+/singleton/origin_item/origin/ekane
+	name = "Ekane Of Bottomless Waves"
+	desc = "The Ekane is a large city-state situated primarily on the seas, and scattered islands or coastlines. However the Ekane are most distinct for their migratory nature, with very sparse permanent settlements, most of which are found underwater, or near the shore. Instead, the Ekane are known to travel across the seas in large structures, called Ekane Arks, which house a majority of the Dionae, as well as where their leaders reside."
+	possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG)
 	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
 	possible_religions = list(RELIGION_ETERNAL, RELIGION_OTHER, RELIGION_NONE)
+	
+/singleton/origin_item/origin/eumstation
+	name = "Celestial Station"
+	desc = "The first and largest space-bound outpost established by the CT-EUM government, Celestial Station is notable as a major trading hub for EUM's nations, often being used as a large marketplace for potential sellers and buyers from both EUM and elsewhere to do business, as well as a hub for mining operations undertaken on nearby asteroids. While nominally under the direct control of the CT-EUM federal government, Celestial Station has as of late begun to make efforts to gain independence away from the Federal government's direct control as a colony, instead attempting to become a semi-independent city-state under the CT-EUM government much like the other city-states under it. "
+	important_information = "As a result of the station's recent founding and taking on of residents from all across the planet, Celestial Station Dionae tend to share some characteristics with the other city-states."
+	possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG)
+	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
+	possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_GLEANERS, RELIGION_OTHER, RELIGION_NONE)
+	
+/singleton/origin_item/origin/eumminor
+	name = "Minor City State"
+	desc = "From a minor city-state under the CT-EUM. "
+	important_information = "This is for player-created citystates in the CT-EUM, just keep it reasponable."
+	possible_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG, ACCENT_ANCIENTSONG)
+	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION)
+	possible_religions = list(RELIGION_ETERNAL, RELIGION_MADA, RELIGION_GLEANERS, RELIGION_OTHER, RELIGION_NONE)
@@ -4,7 +4,8 @@
 	possible_origins = list(
 		/singleton/origin_item/origin/skrell_alliance,
 		/singleton/origin_item/origin/skrell_biesel,
-		/singleton/origin_item/origin/skrell_coalition
+		/singleton/origin_item/origin/skrell_coalition,
+		/singleton/origin_item/origin/skrell_eum
 	)

 /singleton/origin_item/origin/skrell_alliance
@@ -29,4 +30,12 @@
 	important_information = "The Nralakk Federation still monitors non-citizen Skrell living abroad, and is known to request deportation or otherwise detain reputable threats to its national security. The response to these requests depends on the planet in question due to the Coalition's decentralised nature."
 	possible_accents = list(ACCENT_SKRELLCOC)
 	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM)
-	possible_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE)
+	possible_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE)
+	
+/singleton/origin_item/origin/skrell_eum
+	name = "Co-operative Territories of Epsilon Ursea Minoris"
+	desc = "The Federation and CT-EUM have had close ties since the two nations first came into contact. Most Skrell living within CT-EUM are immigrants, living in the city-state of Nral'Daaq, but there is a growing group of Skrell who were born and raised on Epsilon Ursea Minoris."
+	important_information = "The Nralakk Federation has close ties to CT-EUM, and Skrell living here run the risk of being deported for anti-Federation actions. Skrell who were born within CT-EUM must be born on or after 2390."
+	possible_accents = list(ACCENT_SKRELLEUM, ACCENT_SKRELL, ACCENT_HOMEWORLD, ACCENT_QERRMALIC, ACCENT_ALIOSE, ACCENT_AWEIJI, ACCENT_TRAVERSE, ACCENT_TATTUQIG)
+	possible_citizenships = list(CITIZENSHIP_NRALAKK, CITIZENSHIP_ERIDANI, CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION, CITIZENSHIP_EUM)
+	possible_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE)
@@ -31,3 +31,19 @@
  working for Zeng-Hu due to the megacorporations ties with the Federation."
  book_name = "shrkh codex"
  book_sprite = "holybook"
+
+/datum/religion/mada
+  name = RELIGION_MADA
+  description = "The Mada religion, translated as Maraka, is practiced by the majority of Mada citizens and has two core tenants central to its practitioners; Spirits are \
+  created through the continued absorption of sunlight, the more sunlight absorbed the stronger these spirits become, chlorophyll and anything capable of producing it are \
+  considered blessed, as they have an increased potency when it comes to creating powerful spirits, doubly so if nurtured and protected. This means that most forms of plant \
+  life are considered holy to the Maraka religion, harming or killing a developing or still-living plant is considered taboo, but once naturally dead there's no issue with \
+  consuming it or utilizing it for any other purpose."
+  book_name = "maraka writ"
+  book_sprite = "holybook"
+  
+/datum/religion/gleaners
+  name = RELIGION_GLEANERS
+  description = "A faith focusing on the worship of the sun and stars originating from EUM."
+  book_name = "lights accord writ"
+  book_sprite = "holybook"
@@ -25,6 +25,15 @@
 	whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
 	sort_category = "Xenowear - Diona"
 	flags = GEAR_NO_SELECTION
+	
+/datum/gear/suit/diona/eternal/blood
+	display_name = "red mesh weave robes"
+	description = "A set of red mesh weave robes worn almost exclusively by priests of the Blood Eternal faith."
+	path = /obj/item/clothing/suit/diona/eternal/blood
+	cost = 1
+	whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
+	sort_category = "Xenowear - Diona"
+	flags = GEAR_NO_SELECTION

 /datum/gear/uniform/diona/narrows
 	display_name = "antiquated hephaestus prison uniform"
@@ -33,7 +42,24 @@
 	cost = 1
 	whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
 	sort_category = "Xenowear - Diona"
-	culture_restriction = list(/singleton/origin_item/culture/narrows)
+	culture_restriction = list(/singleton/origin_item/culture/eum)
+	
+/datum/gear/uniform/diona/dionatunic
+	display_name = "floral tunic"
+	description = "A tunic made up of several colorful fabrics and adorned with seemingly still-living vines and flowers, typically worn by those hailing from the Mada on EUM."
+	path = /obj/item/clothing/under/diona/dionatunic
+	cost = 1
+	whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
+	sort_category = "Xenowear - Diona"
+	
+/datum/gear/suit/eumponcho
+	display_name = "dionae poncho"
+	description = "A poncho made of some sort of mesh weave material adorned by a piece of colored fabric wrapped around it, sometimes worn by citizens of the CT-EUM, with the fabric around the poncho indicating which nation they belong to."
+	path = /obj/item/clothing/accessory/poncho/eumponcho
+	cost = 1
+	whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
+	sort_category = "Xenowear - Diona"
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ADDITIONAL_COLOR_SELECTION

 /datum/gear/suit/diona/carp
 	display_name = "carp hide poncho"
@@ -15,3 +15,46 @@

 	drop_sound = 'sound/items/drop/card.ogg'
 	pickup_sound = 'sound/items/pickup/card.ogg'
+	
+/obj/item/clothing/accessory/poncho/eumponcho
+	name = "adorned poncho"
+	desc = "A poncho made of some sort of mesh weave material adorned by a piece of colored fabric wrapped around it."
+	icon = 'icons/obj/diona_items.dmi'
+	icon_state = "eumponcho"
+	item_state = "eumponcho"
+	icon_override = null
+	contained_sprite = TRUE
+	var/additional_color = COLOR_GRAY
+
+/obj/item/clothing/accessory/poncho/eumponcho/update_icon()
+	cut_overlays()
+	var/image/gem = image(icon, null, "eumponcho_gem")
+	gem.appearance_flags = RESET_COLOR
+	gem.color = additional_color
+	add_overlay(gem)
+	var/image/chain = image(icon, null, "eumponcho_chain")
+	chain.appearance_flags = RESET_COLOR
+	add_overlay(chain)
+
+/obj/item/clothing/accessory/poncho/eumponcho/get_mob_overlay(var/mob/living/carbon/human/H, var/mob_icon, var/mob_state, var/slot)
+	var/image/I = ..()
+	if(slot == slot_wear_suit_str)
+		var/image/gem = image(mob_icon, null, "eumponcho_un_gem")
+		gem.appearance_flags = RESET_COLOR
+		gem.color = additional_color
+		I.add_overlay(gem)
+		var/image/chain = image(mob_icon, null, "eumponcho_un_chain")
+		chain.appearance_flags = RESET_COLOR
+		I.add_overlay(chain)
+	return I
+
+/obj/item/clothing/accessory/poncho/eumponcho/get_accessory_mob_overlay(mob/living/carbon/human/H, force)
+	var/image/base = ..()
+	var/image/gem = image(icon, null, "eumponcho_un_gem")
+	gem.appearance_flags = RESET_COLOR
+	gem.color = additional_color
+	base.add_overlay(gem)
+	var/image/chain = image(icon, null, "eumponcho_un_chain")
+	chain.appearance_flags = RESET_COLOR
+	base.add_overlay(chain)
+	return base
@@ -7,4 +7,10 @@
 	name = "antiquated hephaestus prison uniform"
 	desc = "An old prison uniform, tattered with age. A Hephaestus logo has been haphazardly stitched to the shoulder, and a band of green circles around the middle."
 	icon_state = "narrows"
-	item_state = "narrows"
+	item_state = "narrows"
+	
+/obj/item/clothing/under/diona/dionatunic
+	name = "floral tunic"
+	desc = "A tunic made up of several colorful fabrics and adorned with seemingly still-living vines and flowers"
+	icon_state = "dionatunic"
+	item_state = "dionatunic"