diff --git a/aurorastation.dme b/aurorastation.dme index 72aba9a3012..bbce97c52c3 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1823,6 +1823,7 @@ #include "code\modules\clothing\ears\xeno\bulwark.dm" #include "code\modules\clothing\ears\xeno\skrell.dm" #include "code\modules\clothing\ears\xeno\tajara.dm" +#include "code\modules\clothing\factions\assunzione.dm" #include "code\modules\clothing\factions\dominia.dm" #include "code\modules\clothing\factions\einstein.dm" #include "code\modules\clothing\factions\elyra.dm" diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 5f2712744ad..45170b64d16 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -271,7 +271,7 @@ selection_color = "#90524b" access = list(ACCESS_CHAPEL_OFFICE, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_CHAPEL_OFFICE) - alt_titles = list("Presbyter", "Rabbi", "Imam", "Priest", "Shaman", "Counselor") + alt_titles = list("Presbyter", "Rabbi", "Imam", "Priest", "Shaman", "Counselor", "Keeper") outfit = /obj/outfit/job/chaplain blacklisted_species = list(SPECIES_VAURCA_BREEDER) @@ -302,25 +302,31 @@ if(visualsOnly) return - var/obj/item/storage/bible/B = new /obj/item/storage/bible(get_turf(H)) //BS12 EDIT - var/obj/item/storage/S = locate() in H.contents - if(S && istype(S)) - B.forceMove(S) - var/datum/religion/religion = SSrecords.religions[H.religion] if (religion) + if(religion.unique_book_path) + var/obj/item/device/versebook/U = new religion.unique_book_path(get_turf(H)) + var/obj/item/storage/S = locate() in H.contents + if(S && istype(S)) + U.forceMove(S) + return 1 + else + var/obj/item/storage/bible/B = new /obj/item/storage/bible(get_turf(H)) //BS12 EDIT + var/obj/item/storage/S = locate() in H.contents + if(S && istype(S)) + B.forceMove(S) - if(religion.name == "None" || religion.name == "Other") - B.verbs += /obj/item/storage/bible/verb/Set_Religion + if(religion.name == "None" || religion.name == "Other") + B.verbs += /obj/item/storage/bible/verb/Set_Religion + return 1 + + B.icon_state = religion.book_sprite + B.name = religion.book_name + SSticker.Bible_icon_state = religion.book_sprite + SSticker.Bible_item_state = religion.book_sprite + SSticker.Bible_name = religion.book_name return 1 - B.icon_state = religion.book_sprite - B.name = religion.book_name - SSticker.Bible_icon_state = religion.book_sprite - SSticker.Bible_item_state = religion.book_sprite - SSticker.Bible_name = religion.book_name - return 1 - //Operations /datum/job/operations_manager diff --git a/code/game/objects/items/devices/versebook.dm b/code/game/objects/items/devices/versebook.dm index 73fe4f5d652..4461bb1853c 100644 --- a/code/game/objects/items/devices/versebook.dm +++ b/code/game/objects/items/devices/versebook.dm @@ -141,3 +141,22 @@ . = ..() randomquip = file2list("ingame_manuals/thakh.txt") +/obj/item/device/versebook/assunzione + name = "\improper Luceian Book of Scripture" + desc = "A collection of historically-backed texts mixed with fables and stories detailing the reasonings, history, and beliefs of the Luceism religion of Assunzione. Translated into Basic by the Luceian Monastery on Biesel." + desc_extended = "Luceism's founding was unusually well-documented for a religion, and as a result this book features several photographs of cataclysmic events that happened during Assunzione's crisis \ + that birthed this religion, as well as pictures of the religion's first ministers and the cataclysm that founded the religion to begin with." + icon_state = "luce" + item_state = "luce" + +/obj/item/device/versebook/assunzione/Initialize() + . = ..() + randomquip = file2list("ingame_manuals/assunzione.txt") + +/obj/item/device/versebook/assunzione/pocket + name = "pocket Luceian Book of Scripture" + desc = "A miniaturized edition of the Luceian Book of Scripture, a collection of historically-backed texts mixed with fables and stories detailing the reasonings, history, and \ + beliefs of the Luceism religion of Assunzione. Translated into Basic by the Luceian Monastery on Biesel. This one fits nicely in a pocket or in a bag." + icon_state = "luce_pocket" + w_class = ITEMSIZE_TINY + diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm index f9faa1a8259..6fcadba8629 100644 --- a/code/game/objects/items/weapons/chaplain_items.dm +++ b/code/game/objects/items/weapons/chaplain_items.dm @@ -203,6 +203,22 @@ loc = null qdel(src) +/obj/item/nullrod/luceiansceptre + name = "\improper Luminous Sceptre" + desc = "The Luminous Sceptre is a ceremonial staff optionally carried by the ministerial clergy of Luceism. It is fashioned from cedar and 18-karat gold, wrapped in sacred luce vine, \ + and topped with a miniature, specialized warding sphere. Such sceptres are traditionally employed in Luceian exorcisms or rituals to rid a corrupted soul of the darkness in their body - often, curiously, to great effect." + icon = 'icons/obj/luceian_sceptre.dmi' + icon_state = "luceian_sceptre" + item_state = "luceian_sceptre" + contained_sprite = TRUE + + force = 25 + w_class = ITEMSIZE_LARGE + slot_flags = SLOT_BACK + light_range = 4 + light_power = 2 + light_color = LIGHT_COLOR_BLUE + /obj/item/nullrod/verb/change(mob/living/user) set name = "Reassemble Null Item" set category = "Object" @@ -327,6 +343,15 @@ if(rune_found) visible_message(SPAN_NOTICE("A holy glow permeates the air!")) return + if(user.mind && (user.mind.assigned_role == "Chaplain")) + if(A.reagents && A.reagents.has_reagent(/singleton/reagent/water)) //blesses all the water in the holder + if(REAGENT_VOLUME(A.reagents, /singleton/reagent/water) > 60) + to_chat(user, SPAN_NOTICE("There's too much water for you to bless at once!")) + else + to_chat(user, SPAN_NOTICE("You bless the water in [A], turning it into holy water.")) + var/water2holy = REAGENT_VOLUME(A.reagents, /singleton/reagent/water) + A.reagents.del_reagent(/singleton/reagent/water) + A.reagents.add_reagent(/singleton/reagent/water/holywater, water2holy) /obj/item/reagent_containers/spray/aspergillum name = "aspergillum" @@ -377,7 +402,7 @@ name = "warding sphere" desc = "A religious artefact commonly associated with Luceism, this transparent globe gives off a faint ghostly white light at all times." desc_extended = "Luceian warding spheres are made on the planet of Assunzione in the great domed city of Guelma, and are carried by followers of the faith heading abroad. \ - Constructed out of glass and a luce vine bulb these spheres can burn for years upon years, and it is said that the lights in the truly faithful's warding sphere will always \ + Constructed out of glass and a luce vine bulb, these spheres can burn for years upon years, and it is said that the lights in the truly faithful's warding sphere will always \ point towards Assunzione. It is considered extremely bad luck to have one's warding sphere break, to extinguish its flame, or to relinquish it (permanently) to an unbeliever." icon = 'icons/obj/weapons.dmi' icon_state = "assunzioneorb" @@ -425,6 +450,15 @@ else icon_state = "assunzionesheath_empty" +/obj/item/storage/assunzionesheath/filled + starts_with = list( + /obj/item/assunzioneorb = 1 + ) + +/obj/item/storage/assunzionesheath/Initialize() + . = ..() + update_icon() + /obj/item/storage/altar name = "altar" desc = "A small portable altar." diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 5a8cec08409..60bca7ff4c7 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -115,9 +115,6 @@ if("Necronomicon") icon_state = "necronomicon" item_state = "necronomicon" - if("Luceism") - icon_state = "luce2" - item_state = "luce2" if("Skrell") icon_state = "skrellbible" item_state = "skrellbible" diff --git a/code/modules/background/origins/origins/diona/coalition.dm b/code/modules/background/origins/origins/diona/coalition.dm index 1702c7ac34a..907eac5d057 100644 --- a/code/modules/background/origins/origins/diona/coalition.dm +++ b/code/modules/background/origins/origins/diona/coalition.dm @@ -2,7 +2,8 @@ name = "Coalition of Colonies" desc = "The Coalition of Colonies was born out of the fires of the Interstellar War, the bloodiest war humanity has seen since its dawn as a species. The majority of its citizens prize their freedom above all else, which has led to problems with governance for the Coalition: to this day, it remains a very decentralized and fragmented entity that can only be brought together as a unified front in moments of extreme crisis. But with the recent growth of the Republic of Biesel, retreat of the Solarian Alliance, and an increasingly militaristic Empire of Dominia, perhaps this matter shall change in the years to come." possible_origins = list( - /singleton/origin_item/origin/coc_wildborn + /singleton/origin_item/origin/coc_grown, + /singleton/origin_item/origin/coc_wildborn, ) /singleton/origin_item/origin/coc_grown diff --git a/code/modules/background/religion/human.dm b/code/modules/background/religion/human.dm index 4c3a49a310c..c83b6a2670e 100644 --- a/code/modules/background/religion/human.dm +++ b/code/modules/background/religion/human.dm @@ -48,15 +48,14 @@ Three of One due to her three minor aspects: the Soldier, the Scholar, the Artisan. These three spirits are personifications of the most important aspects of Dominia society. \ Tribunal priests agree that all three are equally important, and that malign spirits can be attracted by an imbalance in the Great Three. Priests often stress the importance \ of balance, both in matters of spirit, in society, and in personal life." - book_name = "tribunal codex" + unique_book_path = /obj/item/device/versebook/tribunal nulloptions = list("Tribunal Rod" = /obj/item/nullrod/dominia) /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." - book_name = "the order" - book_sprite = "trinary" + unique_book_path = /obj/item/device/versebook/trinary /datum/religion/scarab name = RELIGION_SCARAB @@ -75,13 +74,12 @@ /datum/religion/luceism name = RELIGION_LUCEISM description = "An unusual syncretic religion originating upon the planet of Assunzione, Luceism is a quasi-Abrahamic religion descended from a variety of faiths \ - held by the original colonists that first emerged following the unexpected extinguishing of Assunzione's star in 2274. While arguably a branch of \ - modern Abrahamic religions, Luceism is a hard-to-define religion dedicated to the worship of an abstract representation of light referred to as \ - the Ennoia. Though it is, unsurprisingly, strongest on Assunzione, followers of the faith can be found throughout the Orion Spur alongside their \ - houses of worship." - book_name = "Luceian Book of Scripture and Prayers" - book_sprite = "luce2" - + held by the original colonists that first emerged following the unexpected extinguishing of Assunzione's star in 2274. While arguably a branch of \ + modern Abrahamic religions, Luceism is a hard-to-define religion dedicated to the worship of an abstract representation of light referred to as \ + the Ennoia. Though it is, unsurprisingly, strongest on Assunzione, followers of the faith can be found throughout the Orion Spur alongside their \ + houses of worship." + unique_book_path = /obj/item/device/versebook/assunzione + nulloptions = list("Luceian Sceptre" = /obj/item/nullrod/luceiansceptre) /datum/religion/sikhism name = RELIGION_SIKHISM description = "Originating in the northern Indian subcontinent, Sikhism is a religion and philosophy that developed from the teachings of Guru Nanak, and the nine Gurus who succeeded him. \ diff --git a/code/modules/background/religion/religion.dm b/code/modules/background/religion/religion.dm index d2ca4d9967d..07715fefcc8 100644 --- a/code/modules/background/religion/religion.dm +++ b/code/modules/background/religion/religion.dm @@ -1,6 +1,7 @@ /datum/religion var/name var/description + var/unique_book_path = null //if religion has a special book/codex, i.e. versebook var/book_name = "bible" var/book_sprite = "holybook" var/list/nulloptions //religion-specific nullrod options diff --git a/code/modules/background/religion/unathi.dm b/code/modules/background/religion/unathi.dm index 6966f420862..8ed1c511b91 100644 --- a/code/modules/background/religion/unathi.dm +++ b/code/modules/background/religion/unathi.dm @@ -3,7 +3,7 @@ description = "The most pervasive and common religion amongst Unathi. The basic concept of Th'akh is that all the spirits of past Unathi now reside in the spirit world that exists \ in tandem with the material world. These spirits exist in objects and nature - bringing either good luck or sorrow. The supernatural and afterlife are taken at face value by Th'akh. \ It is a very decentralized religion, with the Akhandi Order of monks being the closet thing it has to a church." - book_name = "assorted Th'akh fables" + unique_book_path = /obj/item/device/versebook/thakh nulloptions = list( "Shaman Staff" = /obj/item/nullrod/shaman ) @@ -16,7 +16,7 @@ because the spirits combine into three minor aspects that are all part of Ska'kh: the Warrior, the Healer, the Fisherman. These three spirits are personifications of the most \ important aspects of Unathi society. It is said that all three are equally important, and that disasters are caused by an imbalance in the Great Three. Priests often stress the \ importance of balance, both in matters of spirit as well as in society and personal life. " - book_name = "Sk'akh legends" + unique_book_path = /obj/item/device/versebook/skakh nulloptions = list( "Shaman Staff" = /obj/item/nullrod/shaman, "Warrior's Sword" = /obj/item/nullrod/skakh_warrior, @@ -32,7 +32,7 @@ Moghes unless the species and Moghes are rapidly purified. The movement has nearly a hundred thousand followers and it has come into immediate conflict with the orthodox Sk'akh \ church due to Si'akh claiming it to be completely illegitimate. Its followers are ruthlessly hunted down by the Maraziite Order and many of its followers are fleeing into human \ space as they try to find personal salvation. It is treated as a Sk'akh heresy or a fanatical doomsday cult by orthodox Unathi. " - book_name = "transcripts from Si'akh" + unique_book_path = /obj/item/device/versebook/siakh nulloptions = list( "Shaman Staff" = /obj/item/nullrod/shaman ) @@ -46,7 +46,7 @@ weakness hampers the soul, thus evil spirits can manipulate people's minds and souls to commit evil acts. These malicious spirits are given power within a being when the person succumbs to greed, \ anger, or other emotional vices. Aut'akh preach that the Contact War was the result of sinta being so misled by evil spirits that they brought the world to ruin, and all power, whether a government, \ religion, or corporation, is inherently corrupt due to the influence of evil spirits." - book_name = "Rituals and Regiments of the Ancient Mador" + unique_book_path = /obj/item/device/versebook/autakh nulloptions = list( "Shaman Staff" = /obj/item/nullrod/shaman ) diff --git a/code/modules/client/preference_setup/loadout/items/religion.dm b/code/modules/client/preference_setup/loadout/items/religion.dm index a872def2872..03cbc172ebb 100644 --- a/code/modules/client/preference_setup/loadout/items/religion.dm +++ b/code/modules/client/preference_setup/loadout/items/religion.dm @@ -223,31 +223,52 @@ abstract_type = /datum/gear/religion/assunzione religion = RELIGION_LUCEISM -/datum/gear/religion/assunzione/robe - display_name = "assunzione robe selection" - description = "A selection of robes worn by adherents to Luceism." +/datum/gear/religion/assunzione/scripture + display_name = "luceian scripture" + description = "A collection of texts belonging to Luceism, the dominant religion of Assunzione." + path = /obj/item/device/versebook/assunzione + +/datum/gear/religion/assunzione/cloak + display_name = "assunzione cloak selection" + description = "A violet cloak adorned with gold inlays worn by devout adherents of Luceism, the dominant faith of Assunzione." path = /obj/item/clothing/accessory/poncho/assunzione slot = slot_wear_suit +/datum/gear/religion/assunzione/cassock + display_name = "assunzione clerical cassock" + description = "A simple black-and-purple linen cassock worn by clergyfolk of Luceism, the dominant faith of Assunzione." + path = /obj/item/clothing/under/assunzione/priest + slot = slot_w_uniform + +/datum/gear/religion/assunzione/robe + display_name = "assunzione clerical robe" + description = "A violet cloak adorned with gold inlays worn by devout adherents of Luceism, the dominant faith of Assunzione." + slot = slot_wear_suit + /datum/gear/religion/assunzione/robe/New() ..() - var/list/assunzionerobe = list() - assunzionerobe["assunzione robe"] = /obj/item/clothing/accessory/poncho/assunzione - assunzionerobe["assunzione vine-inlaid robe"] = /obj/item/clothing/accessory/poncho/assunzione/vine - assunzionerobe["assunzione gold-inlaid robe"] = /obj/item/clothing/accessory/poncho/assunzione/gold - gear_tweaks += new /datum/gear_tweak/path(assunzionerobe) + var/list/robe = list() + robe["Pyramidical keeper robe"] = /obj/item/clothing/suit/storage/hooded/wintercoat/assunzione_robe + robe["Astructural keeper robe"] = /obj/item/clothing/suit/storage/hooded/wintercoat/assunzione_robe/alt + gear_tweaks += new /datum/gear_tweak/path(robe) /datum/gear/religion/assunzione/accessory display_name = "luceian amulet" path = /obj/item/clothing/accessory/assunzione slot = slot_tie +/datum/gear/religion/assunzione/scripture + display_name = "luceian scripture" + path = /obj/item/device/versebook/assunzione + +/datum/gear/religion/assunzione/scripture/New() + ..() + var/list/book = list() + book["luceian book of scripture"] = /obj/item/device/versebook/assunzione + book["pocket luceian book of scripture"] = /obj/item/device/versebook/assunzione/pocket + gear_tweaks += new /datum/gear_tweak/path(book) + /datum/gear/religion/assunzione/orb display_name = "assunzione warding sphere" - description = "A religious artefact commonly associated with Luceism." - path = /obj/item/assunzioneorb - -/datum/gear/religion/assunzione/sheath - display_name = "assunzione warding sphere sheath" - description = "A small metal shell designed to hold a warding sphere." - path = /obj/item/storage/assunzionesheath + description = "A holy religious artifact and a core aspect of worship in Luceism. Comes in a protective case." + path = /obj/item/storage/assunzionesheath/filled diff --git a/code/modules/clothing/factions/assunzione.dm b/code/modules/clothing/factions/assunzione.dm new file mode 100644 index 00000000000..6ffc5db78a9 --- /dev/null +++ b/code/modules/clothing/factions/assunzione.dm @@ -0,0 +1,42 @@ +/obj/item/clothing/under/assunzione/priest + name = "luceian cassock" + desc = "A linen cassock worn by clergyfolk of the Luceian faith of Assunzione. Despite being of simple make, the violet dye used for the shoulders has an almost iridescent sparkle to them." + icon = 'icons/clothing/under/uniforms/assunzione.dmi' + icon_state = "assunzione_cassock" + item_state = "assunzione_cassock" + contained_sprite = TRUE + slot_flags = SLOT_ICLOTHING + +/obj/item/clothing/suit/storage/hooded/wintercoat/assunzione_robe + name = "\improper luceian pyramidical keeper robe" + desc = "A robe in usage by Keepers of the Luceian faith of Assunzione, commonly in use by the Pyramidical Church. Ornate, stylish, and made of decadent velvet and silk, no expense was spared in making these robes - though they are a bit heavy." + desc_extended = "The manufacture of the highly-ornate clergy garb, much like most other religious items of Luceism, is done by highly-skilled, highly-paid artisan tailors who master their craft over years. Tailor shops and businesses must \ + pass an examination and be granted a license to be able to make these robes, and once they do, the Church sends luxurious materials like silk and velvet, as well as inlays made of real gold. The result is a robe unlike any other, described by \ + the Keepers who wear them as like being wrapped in a thick, padded blanket." + icon = 'icons/clothing/suits/assunzione_robes.dmi' + var/initial_icon_state = "keeper" + icon_state = "keeper" + hoodtype = /obj/item/clothing/head/winterhood/assunzione_robe + allowed = list(/obj/item/nullrod/luceiansceptre, /obj/item/storage/assunzionesheath, /obj/item/assunzioneorb) + +/obj/item/clothing/suit/storage/hooded/wintercoat/assunzione_robe/alt + name = "\improper luceian astructural keeper robe" + desc = "A simple linen robe used by ministers of the Astructural chapter of Assunzione. While still decorated with the Eye of Ennoia, it is of far simpler make than its Pyramidical counterpart, owing to the chapter's relative \ + asceticism and non-desire to decorating its clergy." + desc_extended = "Though simple in design, this robe is far from cheap in construction. Astructural robes are designed by tailors with impeccable eyes to detail. The end result is comfortable and flexible while remaining \ + light and breezy. This lets Astructural Keepers wear their robes in everyday occasions rather than just for ceremony." + initial_icon_state = "keeperalt" + icon_state = "keeperalt" + +/obj/item/clothing/suit/storage/hooded/wintercoat/assunzione_robe/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/robe_backing = image(mob_icon, null, "[initial_icon_state]_backing", H ? H.layer - 0.01 : MOB_LAYER - 0.01) + I.add_overlay(robe_backing) + return I + +/obj/item/clothing/head/winterhood/assunzione_robe + name = "luceian clerical robe hood" + desc = "A hood for an Assunzioni clerical robe." + icon = 'icons/clothing/suits/assunzione_robes.dmi' + diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 0698fd2d21d..b3a3487a183 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -748,9 +748,9 @@ overlay_state = "trinary_shouldercape" /obj/item/clothing/accessory/poncho/assunzione - name = "assunzione robe" - desc = "A simple purple robe commonly worn by adherents to Luceism, the predominant religion on Assunzione." - icon = 'icons/clothing/suits/capes/assunzione_robe.dmi' + name = "\improper Luceian cloak" + desc = "A violet cloak adorned with gold inlays worn by devout adherents of Luceism, the dominant faith of Assunzione." + icon = 'icons/clothing/suits/capes/assunzione_cloak.dmi' icon_override = null icon_state = "assunzione_robe" item_state = "assunzione_robe" @@ -770,20 +770,6 @@ base.add_overlay(robe_backing) return base -/obj/item/clothing/accessory/poncho/assunzione/vine - desc = "A simple purple robe commonly worn by adherents to Luceism, the predominant religion on Assunzione. This one features a lux vine \ - inlay that allows the symbol of the Luceian Square to be faintly seen, even in darkness." - icon_state = "assunzione_robe_vine" - item_state = "assunzione_robe_vine" - overlay_state = "assunzione_robe_vine" - -/obj/item/clothing/accessory/poncho/assunzione/gold - desc = "A simple purple robe commonly worn by adherents to Luceism, the predominant religion on Assunzione. The Luceian Square, Luceism's \ - holy symbol is present on the back in gold fabric." - icon_state = "assunzione_robe_gold" - item_state = "assunzione_robe_gold" - overlay_state = "assunzione_robe_gold" - //tau ceti legion ribbons /obj/item/clothing/accessory/legion name = "seniority ribbons" diff --git a/code/modules/clothing/under/accessories/religious.dm b/code/modules/clothing/under/accessories/religious.dm index 868e054b7dd..e4bdd5b0524 100644 --- a/code/modules/clothing/under/accessories/religious.dm +++ b/code/modules/clothing/under/accessories/religious.dm @@ -54,18 +54,6 @@ icon_state = "scapular" item_state = "scapular" -/obj/item/clothing/accessory/assunzione - name = "luceian amulet" - desc = "A common symbol of the Luceian faith abroad, this amulet featuring the religion's all-seeing eye and eight-pointed crest \ - seems to be made of real gold and gemstones. While not as critical to faithful abroad as a warding sphere, it is considered good form \ - to ensure one's amulet is well-maintained." - icon = 'icons/obj/clothing/accessory/religious.dmi' - item_state = "assunzione_amulet" - icon_state = "assunzione_amulet" - contained_sprite = TRUE - drop_sound = 'sound/items/drop/accessory.ogg' - pickup_sound = 'sound/items/pickup/accessory.ogg' - /obj/item/clothing/accessory/tallit name = "tallit" desc = "A tallit is a fringed garment worn as a prayer shawl by religious Jews. \ @@ -74,3 +62,18 @@ item_state = "tallit" icon_state = "tallit" contained_sprite = TRUE + +/obj/item/clothing/accessory/assunzione + name = "luceian amulet" + desc = "A common symbol of the Luceian faith abroad, this amulet featuring the religion's all-seeing eye and eight-pointed crest \ + seems to be made of real gold and gemstones. While not as critical to faithful abroad as a warding sphere, it is considered good form \ + to ensure one's amulet is well-maintained." + desc_extended = "Plated in 18-karat gold and decorated with rubies, this amulet, as jewelry, is both ornate and extremely well-made. In addition to being a passive display of one's faith - not quite holding much religious value - \ + its wear is often promoted by Assunzione's government as a testament of the planet's superlative craftsmanship talent and material wealth. While it fetches for an extremely high price in the market, voluntarily selling this amulet is considered \ + sacrilegious, and a display of weak resolve." + icon = 'icons/obj/clothing/accessory/religious.dmi' + item_state = "assunzione_amulet" + icon_state = "assunzione_amulet" + contained_sprite = TRUE + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' diff --git a/html/changelogs/nauticall-luceism_stuff.yml b/html/changelogs/nauticall-luceism_stuff.yml new file mode 100644 index 00000000000..e8d9f3494c0 --- /dev/null +++ b/html/changelogs/nauticall-luceism_stuff.yml @@ -0,0 +1,47 @@ +################################ +# 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: nauticall + +# 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: "Added several items relating to Luceism, the religion of Assunzione." + - rscadd: "Added chaplain items for Luceism: robes, a cassock, and a new null rod, the Luminous Sceptre." + - rscadd: "Added a new versebook, the Luceian Book of Scripture, available to Assunzionii characters. It's a versebook with various texts from Luceism." + - imageadd: "Resprited the Luceian amulet, Luceian Book of Scripture, and the Assunzione cloak." + - qol: "Compressed the loadout warding sphere and warding sphere case into just one loadout item that already comes with a case." + - qol: "Religions with unique religious books (versebooks) now have their chaplains spawn with the versebook in question, rather than a generic black tome." + - qol: "To compensate for the above, null rods are now able to create holy water the same way a bible can." diff --git a/icons/clothing/suits/assunzione_robes.dmi b/icons/clothing/suits/assunzione_robes.dmi new file mode 100644 index 00000000000..f51962c17aa Binary files /dev/null and b/icons/clothing/suits/assunzione_robes.dmi differ diff --git a/icons/clothing/suits/capes/assunzione_cloak.dmi b/icons/clothing/suits/capes/assunzione_cloak.dmi new file mode 100644 index 00000000000..71293959e9c Binary files /dev/null and b/icons/clothing/suits/capes/assunzione_cloak.dmi differ diff --git a/icons/clothing/suits/capes/assunzione_robe.dmi b/icons/clothing/suits/capes/assunzione_robe.dmi deleted file mode 100644 index 90fb01e4762..00000000000 Binary files a/icons/clothing/suits/capes/assunzione_robe.dmi and /dev/null differ diff --git a/icons/clothing/under/uniforms/assunzione.dmi b/icons/clothing/under/uniforms/assunzione.dmi new file mode 100644 index 00000000000..2ecc412dd38 Binary files /dev/null and b/icons/clothing/under/uniforms/assunzione.dmi differ diff --git a/icons/mob/items/lefthand_books.dmi b/icons/mob/items/lefthand_books.dmi index debbcef2642..b68e9ca38a8 100644 Binary files a/icons/mob/items/lefthand_books.dmi and b/icons/mob/items/lefthand_books.dmi differ diff --git a/icons/mob/items/righthand_books.dmi b/icons/mob/items/righthand_books.dmi index c39ee9fb35e..89954524a4e 100644 Binary files a/icons/mob/items/righthand_books.dmi and b/icons/mob/items/righthand_books.dmi differ diff --git a/icons/obj/clothing/accessory/religious.dmi b/icons/obj/clothing/accessory/religious.dmi index c690e8aac6b..47d7ce21414 100644 Binary files a/icons/obj/clothing/accessory/religious.dmi and b/icons/obj/clothing/accessory/religious.dmi differ diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 590fd57007d..111372bb78c 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ diff --git a/icons/obj/luceian_sceptre.dmi b/icons/obj/luceian_sceptre.dmi new file mode 100644 index 00000000000..7a0188e6ce3 Binary files /dev/null and b/icons/obj/luceian_sceptre.dmi differ diff --git a/ingame_manuals/assunzione.txt b/ingame_manuals/assunzione.txt new file mode 100644 index 00000000000..bbd884f78b6 --- /dev/null +++ b/ingame_manuals/assunzione.txt @@ -0,0 +1,43 @@ +The Stars of the sky are eternal beacons, forever burning, and we look to them for guidance, both in body and in spirit. The Stars guide everyone in this universe, to life, and to death. +Light is sacred, for in the vastness of space it is so scarce. Light gives sight, wisdom; and it also gives life, and warmth. +To be in the dark is to be blind, not only in sight but in character, unable to go where you want to go; unable to do what you want to do. To wander the darkness is to become lost, misguided. +Light is hope, and salvation. It shines at the ends of tunnels, at the start of a new day, at the flare that marks coming rescue. It brings rejuvenation, new beginnings, and new dreams. +Within each Soul burns four Flames, those of Self, Community, Faith, and Light. A flame that burns too dim condemns the Soul to a dark demise; a flame that burns too bright will consume the Soul in wicked sin. +A Soul must truly understand themselves if they are to prosper. If a Flame does not master its own dance, it will burn out in the wind, and be gone forever. +In the hearth of the Community, a Flame that seeks only its own warmth will soon find itself alone in the cold. It is in the shared warmth of charity that all Flames find their enduring glow. +To have Faith is to trust the Truth; to be paranoid and mistrustful is to be lost in one's own mind. A flame that bends too readily to the winds of surrender will find itself extinguished forever. It is the steadfast Light of Truth that endures, unwavering, even in the storm. +Light and shadow, in their eternal dance, must not consume one another. For a flame that blinds itself to either, risks losing the very essence of its being, fading into the void. +Death only awaits the evil and those with dark hearts; to die is to be cast into darkness, never to see again. For the Faithful, reincarnation and enlightenment await. +O Ennoia, source of Light, Guide us in the eternal night. Keeper of balance, pure and bright, Illuminate our path with your sight. In moments of darkness, in times of plight, Lead us with your wisdom, O radiant Light. O Ennoia, beacon in our flight, Grant us sunrise from this endless night. +The Guardian of Assunzione lays in wait in its Prison, at the heart of Assunzione's Star. We live with the promise that one day it will emerge from its prison, and bring day to Assunzione's eternal night. +Blessed was the world of Assunzione of old, bathed in Light, abundant in greenery and gold. Oft was it called Paradise, for it was truly heavenly. +And it came to pass that Assunzione, abundant in life and greenery, was also beset by trials: for solar flares and storms did damage its works and sicken its people with unseen ailments. +When the Star dimmed, the people found themselves unprepared. The crops failed, the animals perished, and darkness fell upon the solar farms. +In those days, there was scant hope for a world without Light, without sustenance; a world on the brink of end. Many succumbed to the shadow of death by the week, and the cities were filled with decay. But when Light returned, it was through fire, purging the cities, burning many souls. +Remember the sacrifices of our ancestors, who endured hunger and cold to restore Light to Assunzione. Their great deeds, born of selfless duty, saved our world from ending. It is upon us to honor their memory and walk in their ways. +Facing extinction, our ancestors gave their lives so that their friends, their family may live to see another day. Thus is the hallmark of true, selfless sacrifice. +Remember the millions that died in darkness, for it is their story that serves as a tale of caution; darkness only brings death, and imbalance brings hatred. +And thus light was brought to the world of darkness through blood, sweat, and tears, against all odds and against all probabilities did our society survive. This is the Miracle, and is the cornerstone of our faith. +Without the Miracle, our society would have inevitably perished, and our world lost in the darkness, swallowed in the void. It is only because of Ennoia's guidance and our people's will that our society came back from the brink of extinction. +It is every follower's duty to acknowledge their strengths as well as their faults, to truly embrace the truth in themselves and destroy the veil of lies and deception. +Someday, a Soul's flames will one day burn out, and their body will die. In this Rest, a realm between life and death, lay judgment to those who attempt to pass on. Those who are evil are condemned to the Void; those who are truly self-mastered will be reborn as Guardians; and the rest shall be reborn as mortals, in the Light-filled Universe. +A Soul that is reincarnated will have innate talents and gifts given to them by the past lives they had lived. A talented Soul is not one of simple ability, but of lifetimes of experience. +Those who embrace the darkness will themselves become condemned to it. To be cast away, never to see again, for eternity. +Thus punctuates history that a society that behaves in selfish greed will succumb to darkness, and wither away. But people that put their brethren before themselves, even at the cost of their own life, can make sure that their people may yet prevail, against all odds. +Every Flame that burns within a Soul adds fuel to the Star, in the hopes that one day it will be enough to reignite it, and give Ennoia back to the Universe. +Behold the Guardians, immortal protectors of Stars, and enlightened Souls who have mastered themselves through countless cycles of life. Only in star systems protected by Guardians can complex life ever hope to prosper. +One day every Soul that does not succumb irreversibly to temptation and darkness will too become a Guardian of a Star, destined to watch over life and have it thrive. +Trials and tribulations in life are but tests to determine your Soul's worthiness. There is no such thing as failure, except in succumbing to acts of evil and darkness. To hold your ground vicariously is key to overcoming your trials. +One day the Star will return, the domes will lift, and Ennoia's grace will bathe the planet in life once more. It is only then that we can rebuild what is left of the natural world, to give back to the Universe what it gave to us. +Kind acts and good deeds may not change the world immediately, but they will bring Light to someone's day, brightening the world ever so slightly. +Blessed is the Light that gives life, for without it none thrive; without it night falls. +Blessed is the one who recognizes their faults, for it is only when one knows themselves can they truly begin to improve. +Even imprisoned, Ennoia lives on, for the Universe shall remain bathed in Light until its last breath. +Science should not be the enemy of religion; science should explain what religion cannot, and religion should explain what science cannot. They are two sides of the same coin. +To the progenitors did Ennoia speak, not in words, but through visions of a world ending, unless preparations were made. Thus, after much counsel, the people built great Domes over their cities to protect them from the impending doom. +To the first Foresayers spoke Ennoia, not of words but of pictures: pictures of a prospering world, bathed in day, cities as bright as noon even though beyond the glass there was nothing but darkness. So, Ennoia showed, that there was hope for us yet. +To the crowds had the Foresayers spoken, "Remember those who came before you and who will come after. They are your brethren, and to the past you shall honor, and to the future you shall build a foundation." +To the crowds had the Foresayers spoken, "The Soul is eternal, the body is not. With the end of every life comes the start of a new one, a chance at redemption." +To the crowds had the Foresayers spoken, "Bring Light to this world shrouded in darkness; as what our Star cannot provide, we shall make ourselves, and bring Light to this rock which we call our home." +To the first ministers had the Foresayers spoken, "You will be the Keepers of Light, bringers of salvation, beacons of the people. Guide them through the tribulations of this world, and ensure that this is not our end, but our beginning." +To the first ministers had the Foresayers spoken, "Within the dark you will build the Churches and bring Light and illuminate those in the shadows. You shall make the blind see, the ignorant know, and the evildoers repent."