diff --git a/code/__DEFINES/background.dm b/code/__DEFINES/background.dm index abd99f887cd..056aa9c3e23 100644 --- a/code/__DEFINES/background.dm +++ b/code/__DEFINES/background.dm @@ -98,6 +98,7 @@ #define ACCENT_DOMINIA_LYODII "Lyodii" #define ACCENT_DOMINIA_SUNREACH "Sun Reach" #define ACCENT_DOMINIA_ZHURONG "Zhurong" +#define ACCENT_DOMINIA_CARIA "Carian" #define ACCENT_JUPITER "Jovian" #define ACCENT_CALLISTO "Callistean" #define ACCENT_EUROPA "Europan" diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm index bb3ab3e1255..1c095194daf 100644 --- a/code/game/objects/structures/flags_banners.dm +++ b/code/game/objects/structures/flags_banners.dm @@ -4328,3 +4328,48 @@ /obj/structure/sign/flag/outer_eyes/large/west/Initialize(mapload) . = ..(mapload, WEST) + +// Caria + +/obj/structure/sign/flag/caria + name = "\improper Caria banner" + desc = "The flag of the Imperial Viceroyalty of Caria, a trade-focused Dominian colonial world." + desc_extended = "The twin moons of the Carian flag represent Lixus, the reflective moon which makes life on the planet possible at all. The twin fires represent a sacred tradition where members of the Adirim — its voting body — pass between two sacred flames to purify their souls before voting." + icon_state = "caria" + flag_item = /obj/item/flag/caria + +/obj/item/flag/caria + name = "\improper Caria banner" + desc = "The flag of the Imperial Viceroyalty of Caria, a trade-focused Dominian colonial world." + desc_extended = "The twin moons of the Carian flag represent Lixus, the reflective moon which makes life on the planet possible at all. The twin fires represent a sacred tradition where members of the Adirim — its voting body — pass between two sacred flames to purify their souls before voting." + flag_path = "caria" + flag_structure = /obj/structure/sign/flag/caria + +/obj/item/flag/caria/l + name = "\improper Caria flag" + desc = "The flag of the Imperial Viceroyalty of Caria, a trade-focused Dominian colonial world." + desc_extended = "The twin moons of the Carian flag represent Lixus, the reflective moon which makes life on the planet possible at all. The twin fires represent a sacred tradition where members of the Adirim — its voting body — pass between two sacred flames to purify their souls before voting." + flag_path = "caria" + flag_size = TRUE + flag_structure = /obj/structure/sign/flag/caria/large + +/obj/structure/sign/flag/caria/large + name = "\improper Caria flag" + desc = "The flag of the Imperial Viceroyalty of Caria, a trade-focused Dominian colonial world." + desc_extended = "The twin moons of the Carian flag represent Lixus, the reflective moon which makes life on the planet possible at all. The twin fires represent a sacred tradition where members of the Adirim — its voting body — pass between two sacred flames to purify their souls before voting." + icon_state = "caria_l" + flag_path = "caria" + flag_size = TRUE + flag_item = /obj/item/flag/caria/l + +/obj/structure/sign/flag/caria/large/north/Initialize(mapload) + . = ..(mapload, NORTH) + +/obj/structure/sign/flag/caria/large/south/Initialize(mapload) + . = ..(mapload, SOUTH) + +/obj/structure/sign/flag/caria/large/east/Initialize(mapload) + . = ..(mapload, EAST) + +/obj/structure/sign/flag/caria/large/west/Initialize(mapload) + . = ..(mapload, WEST) diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm index 7a2eb111df5..d922c03047b 100644 --- a/code/modules/background/accent/human.dm +++ b/code/modules/background/accent/human.dm @@ -456,3 +456,9 @@ description = "Zhurongese is a dialect of Vulgar Morozi found on the Core World of Zhurong, where it is spoken by the Secondaries who make up most of the skilled workers and supervisors on the planet. While it mostly sticks to traditional Vulgar Morozi structures, its origin on one of the oldest colonies in the Empire and Zhurong itself being a more restricted world has led to this dialect being less influenced by the broader Spur. Scholars believe this dialect may be closer to pre-Imperial Vulgar Morozi than any other in the Empire." tag_icon = "zhurong" text_tag = "ZHU" + +/datum/accent/caria + name = ACCENT_DOMINIA_CARIA + description = "Carian Standard is an unusual dialect from an atypical world. The only non-Morozi dialect of Tradeband found in the Empires borders, it is similar to High Morozi in its pronunciation and grammatical structures. Speakers of this dialect are viewed with suspicion in the Empire, believed to be sorcerers, witches, and often touched by some form of darkness — but they are equally called for their worlds association with augury and the divine, with Carian seers prized by many noble households in the Empire." + tag_icon = "caria" + text_tag = "CAR" diff --git a/code/modules/background/origins/origins/human/dominia.dm b/code/modules/background/origins/origins/human/dominia.dm index dd7e3d2fbd0..4fd08e8a2f3 100644 --- a/code/modules/background/origins/origins/human/dominia.dm +++ b/code/modules/background/origins/origins/human/dominia.dm @@ -8,6 +8,7 @@ /singleton/origin_item/origin/core_worlds, /singleton/origin_item/origin/novi_jadran, /singleton/origin_item/origin/sun_reach, + /singleton/origin_item/origin/caria, /singleton/origin_item/origin/imperial_frontier, /singleton/origin_item/origin/dominian_exile ) @@ -69,6 +70,20 @@ origin_traits = list(TRAIT_ORIGIN_HOT_RESISTANCE) origin_traits_descriptions = list("are more acclimatised to the heat.") +/singleton/origin_item/origin/caria + name = "Caria" + desc = "Gateway to the Empire’s further frontier, the Imperial Viceroyalty of Caria is a strange — to some, accursed — planet with a tidally-locked orbit. Its inhabitants, Carians, are known for their proficiency in trade and their reputation as alleged sorcerers, and Carian culture heavily relies upon divination." + important_information = "Carians are expected to follow the appearance described on the wiki. This is enforceable by server moderators!" + possible_accents = list(ACCENT_DOMINIA_CARIA) + possible_citizenships = CITIZENSHIPS_DOMINIA + possible_religions = list(RELIGION_MOROZ) + origin_traits_descriptions = list("are able to see slightly better in the dark.", "are more sensitive to bright lights") + +/singleton/origin_item/origin/caria/on_apply(mob/living/carbon/human/H) + . = ..() + H.default_lighting_alpha = LIGHTING_PLANE_ALPHA_ALMOST_VISIBLE + H.AddElement(/datum/element/light_sensitivity) + /singleton/origin_item/origin/imperial_frontier name = "Imperial Frontier" desc = "The Imperial Frontier consists of worlds conquered by the Empire of Dominia and mostly populated by Ma'zals. Military governments are common here, as are the often-hated viceroyalties that the Empire has become infamous for abroad. The planets of the Imperial Frontier stand at varying levels of development, but most of their resources are sent back to the region that truly matters to the Empire: the Imperial Core." @@ -80,7 +95,7 @@ name = "Dominian Exile" desc = "Made up of the worst of Imperial society, these Edict Breakers and assorted ne'er-do-wells have been banished or fled from the Empire for a variety of reasons. Some are criminals and deserters, others have more noble reasons, such as fleeing due to religious persecution or political oppression. One thing is common among them: they cannot go home again without facing the judgment of the Empire's courts." important_information = "This origin is for the purposes of playing Edict Breakers that have fled the Empire of Dominia's justice. It is NOT an excuse to play a character with a Dominian accent that is totally divorced from the Empire." - possible_accents = list(ACCENT_DOMINIA_VULGAR, ACCENT_DOMINIA_NOVIJADRAN, ACCENT_DOMINIA_FRONTIER, ACCENT_DOMINIA_LYODII, ACCENT_DOMINIA_SUNREACH, ACCENT_DOMINIA_ZHURONG) + possible_accents = list(ACCENT_DOMINIA_VULGAR, ACCENT_DOMINIA_NOVIJADRAN, ACCENT_DOMINIA_LYODII, ACCENT_DOMINIA_SUNREACH, ACCENT_DOMINIA_ZHURONG, ACCENT_DOMINIA_CARIA, ACCENT_DOMINIA_FRONTIER) possible_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_COALITION) possible_religions = list(RELIGION_MOROZ, RELIGION_NONE, RELIGION_CHRISTIANITY, RELIGION_ISLAM, RELIGION_BUDDHISM, RELIGION_HINDU, RELIGION_TAOISM, RELIGION_JUDAISM, RELIGION_SHINTO, RELIGION_SIKHISM, RELIGION_OTHER) origin_traits = list(TRAIT_ORIGIN_COLD_RESISTANCE) //they're all Morozi anyway diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 23ec01f60fe..a95ed1a707d 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -294,6 +294,7 @@ banners["banner, Burzsia"] = /obj/item/flag/burzsia banners["banner, HPS Narrows"] = /obj/item/flag/narrows banners["banner, Zhurong"] = /obj/item/flag/zhurong + banners["banner, Caria"] = /obj/item/flag/caria gear_tweaks += new /datum/gear_tweak/path(banners) /datum/gear/standard @@ -400,6 +401,7 @@ flags["flag, Burzsia"] = /obj/item/flag/burzsia/l flags["flag, HPS Narrows"] = /obj/item/flag/narrows/l flags["flag, Zhurong"] = /obj/item/flag/zhurong/l + flags["flag, Caria"] = /obj/item/flag/caria/l gear_tweaks += new /datum/gear_tweak/path(flags) /datum/gear/towel diff --git a/code/modules/client/preference_setup/loadout/items/religion.dm b/code/modules/client/preference_setup/loadout/items/religion.dm index 6f08ffa90b1..11e002d6216 100644 --- a/code/modules/client/preference_setup/loadout/items/religion.dm +++ b/code/modules/client/preference_setup/loadout/items/religion.dm @@ -157,6 +157,11 @@ ABSTRACT_TYPE(/datum/gear/religion/dominia) path = /obj/item/clothing/accessory/dominia/lyodii culture_restriction = list(/singleton/origin_item/culture/dominia) +/datum/gear/religion/dominia/accessory/caria + display_name = "carian tribunal necklace" + path = /obj/item/clothing/accessory/dominia/caria + culture_restriction = list(/singleton/origin_item/culture/dominia) + /datum/gear/religion/dominia/accessory/tic display_name = "retired tribunal investigator card selection" description = "A selection of cards identifying the user as a retired tribunal investigator." diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index d5ecf77a559..15418460330 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -685,6 +685,15 @@ icon_state = "lyodii_amulet" item_state = "lyodii_amulet" +/obj/item/clothing/accessory/dominia/caria + name = "carian tribunal necklace" + desc = "An silver amulet depicting a cresent moon framing a circle, a common icon in Carian Tribunalism." + desc_extended = "This amulet depicting the unusual syncretic beliefs of Carian Tribunalism. The crescent moon symbolizes Lixus and the Aderlai (or Great Mother) as an aspect of the Goddess, represented by \ + the Eye. These were first created by Morozian missionaries in an effort to better integrate Caria into the Empire and remain popular today" + icon = 'icons/obj/item/clothing/accessory/caria_amulet.dmi' + icon_state = "caria_amulet" + item_state = "caria_amulet" + /obj/item/clothing/accessory/dominia/tic name = "tribunal investigator card" desc = "A gold-gilded card given to those who are active investigators within the Tribunal Investigations Constabulary, otherwise known as TIC. \ diff --git a/html/changelogs/fyni-caria.yml b/html/changelogs/fyni-caria.yml new file mode 100644 index 00000000000..601dd144dd0 --- /dev/null +++ b/html/changelogs/fyni-caria.yml @@ -0,0 +1,7 @@ +author: fyni +delete-after: True +changes: + - rscadd: "Adds the Caria origin, by request of human lore. Carians are vulnrable to light, but have low light vision." + - rscadd: "Adds the Caria accent." + - rscadd: "Adds Carian flags, available in the loadout." + - rscadd: "Adds the Carian tribunal necklace, available in the loadout." \ No newline at end of file diff --git a/icons/accent_tags.dmi b/icons/accent_tags.dmi index ea4df62a17d..525051b6afc 100644 Binary files a/icons/accent_tags.dmi and b/icons/accent_tags.dmi differ diff --git a/icons/obj/item/clothing/accessory/caria_amulet.dmi b/icons/obj/item/clothing/accessory/caria_amulet.dmi new file mode 100644 index 00000000000..3eafe45d75c Binary files /dev/null and b/icons/obj/item/clothing/accessory/caria_amulet.dmi differ diff --git a/icons/obj/structure/flags.dmi b/icons/obj/structure/flags.dmi index 37eee23e04e..9dfbc86f7fe 100644 Binary files a/icons/obj/structure/flags.dmi and b/icons/obj/structure/flags.dmi differ