diff --git a/aurorastation.dme b/aurorastation.dme index 34b637a60c3..1da4e389200 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1248,6 +1248,7 @@ #include "code\modules\background\citizenship\tajara.dm" #include "code\modules\background\citizenship\unathi.dm" #include "code\modules\background\citizenship\vaurca.dm" +#include "code\modules\background\religion\diona.dm" #include "code\modules\background\religion\human.dm" #include "code\modules\background\religion\religion.dm" #include "code\modules\background\religion\skrell.dm" diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index 273b50c691d..e46c06f67e6 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -48,6 +48,8 @@ #define RELIGION_PREIMMINENNCE "Preimminennce" #define RELIGION_PILOTDREAM "Pilot Dream" +#define RELIGION_ETERNAL "The Eternal" + //accent defines #define ACCENT_CETI "Biesellite" diff --git a/code/modules/background/religion/diona.dm b/code/modules/background/religion/diona.dm new file mode 100644 index 00000000000..3c271e06054 --- /dev/null +++ b/code/modules/background/religion/diona.dm @@ -0,0 +1,10 @@ +/datum/religion/eternal + name = RELIGION_ETERNAL + description = "Followers of The Eternal believe that a primordial entity exists in Light, Energy and Essence - which the Dionae are the embodiment of. \ + They believe that the Dionae were made to ensure that all things born from the stars return to stars, eventually. Before they may return the Dionae must devour as much knowledge \ + and biomass as they can, growing exponentially until they reach the mythical Titan form, becoming a star once more. Transcended into a star, the Dionae will emit light and energy \ + until they die, at which point their essence will spread across the void to birth new Dionae. It is in this way that the eternal cycle is achieved. Scholars of the Eternal link \ + this to the very real potential outcome of Titan form Dionae which theoretically could grow to such mass as to collapse into a star, thus giving off light and energy before \ + eventually going supernova and expelling matter or essence across the cosmos." + book_name = "book of the eternal" + book_sprite = "eternal" 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 ff81594f567..c22e6db31a3 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 @@ -37,13 +37,11 @@ remains_type = /obj/effect/decal/cleanable/ash //no bones, so, they just turn into dust gluttonous = GLUT_ITEM_ANYTHING|GLUT_SMALLER stomach_capacity = 10 //Big boys. - blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \ - species hailing from Epsilon Ursae Minoris. Each 'diona' is a cluster of numerous cat-sized organisms called nymphs; \ - there is no effective upper limit to the number that can fuse in gestalt, and reports exist of the Epsilon Ursae \ - Minoris primary being ringed with a cloud of singing space-station-sized entities.

The Dionaea coexist peacefully with \ - all known species, especially the Skrell. Their communal mind makes them slow to react, and they have difficulty understanding \ - even the simplest concepts of other minds. Their alien physiology allows them survive happily off a diet of nothing but light, \ - water and other radiation." + blurb = "A mysterious plant-like race hailing from the depths of space. Dionae (D. Primis) are a rather strange, cryptic species in comparison to the rest found in the \ + Orion Spur. They have various forms comprised of cat-sized caterpillar-like creatures with a curious, childlike disposition - called Dionae Nymphs. \ + Almost every aspect of the species is a mystery; their origins, their behaviour, and functions. What is known is that they are capable of great intellectual and biological \ + feats that are studied across the Spur. Biologically, Dionae are a form of gestalt consciousness, however, it is only evident in forms that amount to two or more Nymphs.\ + Dionae survive primarily on off of the electromagnetic spectrum and biological matter." organ_low_pain_message = "The nymph making up our %PARTNAME% feels injured." organ_med_pain_message = "The nymph making up our %PARTNAME% can barely manage the pain!" @@ -119,7 +117,7 @@ max_hydration_factor = -1 allowed_citizenships = list(CITIZENSHIP_BIESEL, CITIZENSHIP_JARGON, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_NONE) - allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_MOROZ, RELIGION_THAKH, RELIGION_SKAKH, RELIGION_NONE, RELIGION_OTHER) + allowed_religions = list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_MOROZ, RELIGION_THAKH, RELIGION_SKAKH, RELIGION_ETERNAL, RELIGION_NONE, RELIGION_OTHER) allowed_accents = list(ACCENT_ROOTSONG, ACCENT_VOIDSONG) default_accent = ACCENT_ROOTSONG @@ -200,4 +198,4 @@ qdel(D) /datum/species/diona/has_psi_potential() - return FALSE \ No newline at end of file + return FALSE diff --git a/html/changelogs/Yonnimer - treelore.yml b/html/changelogs/Yonnimer - treelore.yml new file mode 100644 index 00000000000..8edbd48badc --- /dev/null +++ b/html/changelogs/Yonnimer - treelore.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 the eternal as a religion choice for Dionae." + - rscadd: "Changes the Dionae blurb to be more up to date." diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 87fad14fcce..a2b55c2c5b1 100644 Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ