diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index bde03756f3b..ec9bf075758 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -55,6 +55,8 @@ #define RELIGION_PILOTDREAM "Pilot Dream" #define RELIGION_ETERNAL "The Eternal" +#define RELIGION_KSSHR "Ksshr" +#define RELIGION_SHRKH "Shrkh" //accent defines diff --git a/code/modules/background/religion/diona.dm b/code/modules/background/religion/diona.dm index 3c271e06054..652f6ce3153 100644 --- a/code/modules/background/religion/diona.dm +++ b/code/modules/background/religion/diona.dm @@ -8,3 +8,26 @@ eventually going supernova and expelling matter or essence across the cosmos." book_name = "book of the eternal" book_sprite = "eternal" + +/datum/religion/ksshr + name = RELIGION_KSSHR + description = "The Ksshr, also known as the Enlightened, is a religious sect on Xrim known for their complete rejection of The First Consciousness, instead of being an agnostic \ + sect that centers around working together to create a better future, as well as the advancement of technology and understanding how the universe works. The Ksshr faith is the \ + primary religion of Xrim, with most of its inhabitants considering themselves a part of the religion. The Jargon Federation does encourage practicing the faith amongst the \ + population so long as they continue to reject The First Consciousness, as well as stay away from the teachings of the Shrkh." + book_name = "ksshr codex" + book_sprite = "holybook" + +/datum/religion/shrkh + name = RELIGION_SHRKH + description = "The Shrkh, or 'Scorned' as they call themselves, continue to follow the age-old tradition of worshipping Glorsh-Omega. They believe that Glorsh-Omega planted them \ + on the planet intentionally, granting them a blissful haven via the use of technology. Once the prominent and only religion on the planet, Shrkh-ism was quickly displaced when \ + Skrell explorers crashlanded and their memories, thoughts, emotions, everything was consumed, and doubt was first seeded in the minds of all Dionae on Xrim. The premise \ + behind the religion itself is simple; revere, help sustain and maintain synthetic life. As synthetic life brought dionae into this haven, so too shall it be preserved. In the \ + minds of the Shrkh worshippers, the Skrell that brought Ksshr to the planet were misguided. To the Shrkh, the genophage was something that never happened, a myth made up by \ + the Federation to indoctrinate its population into its anti-synthetic and authoritarian beliefs. \ + \ + Note that due to their beliefs, those that are openly members of the faith are barred from command, machinist, and chaplain positions. They are also completely barred from \ + working for Zeng-Hu due to the megacorporations ties with the Federation." + book_name = "shrkh codex" + book_sprite = "holybook" diff --git a/code/modules/mob/living/carbon/alien/diona/progression.dm b/code/modules/mob/living/carbon/alien/diona/progression.dm index 20f830ab581..04b95fcd13d 100644 --- a/code/modules/mob/living/carbon/alien/diona/progression.dm +++ b/code/modules/mob/living/carbon/alien/diona/progression.dm @@ -1,5 +1,5 @@ /mob/living/carbon/alien/diona/confirm_evolution() - var/response = alert(src, "A worker gestalt is a large, slow, and durable humanoid form. You will lose the ability to ventcrawl and devour animals, but you will gain hand-like tendrils and the ability to wear things. You have enough biomass, are you certain you're ready to form a new gestalt?", "Confirm Gestalt", "Growth!", "Patience...") + var/response = alert(src, "Are you sure you wish to grow into a gestalt? Instead of being an individual nymph you'll become a group of them, for formed together to work as a more humanoid entity. As a gestalt you'll have hands and the ability to do most actions humans can such as opening doors and using tools, but you'll be unable to ventcrawl. If you've not already done so it's highly suggested you read over some of the dionae wiki to get a better understanding of the species before advancing further.", "Confirm Gestalt", "Growth!", "Patience...") if(response != "Growth!") return @@ -89,4 +89,4 @@ to_chat(src, SPAN_WARNING("You didn't have enough biomass to grow your [O.name]!")) O.droplimb(1, DROPLIMB_EDGE) qdel(O) - limbs_to_remove -= 1 \ No newline at end of file + limbs_to_remove -= 1 diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index 3d130c82d5f..3d00104fa5b 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -111,7 +111,7 @@ max_hydration_factor = -1 allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_EUM, CITIZENSHIP_NONE) - allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_MOROZ, RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_NONE, RELIGION_OTHER) + allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_MOROZ, RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_KSSHR, RELIGION_SHRKH, RELIGION_NONE, RELIGION_OTHER) allowed_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) default_accent = ACCENT_ROOTSONG diff --git a/html/changelogs/Yonnimer-dionaejesus.yml b/html/changelogs/Yonnimer-dionaejesus.yml new file mode 100644 index 00000000000..70c5c0df581 --- /dev/null +++ b/html/changelogs/Yonnimer-dionaejesus.yml @@ -0,0 +1,42 @@ +################################ +# 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: Yonnimer + +# 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: "Adds two new dionae religions as options in the setup, Ksshr and Shrkh" + - tweak: "Updates the old message nymphs got one growing up into a full gestalt"