From 40188c6e510b90bd2cea6584bf0f630d1bf48628 Mon Sep 17 00:00:00 2001 From: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:55:08 +0000 Subject: [PATCH] Adds Univalvism as a religion option for Skrell (#18269) * univalvism placeholder * univalvism --- code/__DEFINES/background.dm | 3 +- code/controllers/subsystems/records.dm | 2 +- code/modules/background/religion/skrell.dm | 10 ++++++ html/changelogs/lly-univalvism.yml | 42 ++++++++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/lly-univalvism.yml diff --git a/code/__DEFINES/background.dm b/code/__DEFINES/background.dm index 36aed2d1e50..71527707edf 100644 --- a/code/__DEFINES/background.dm +++ b/code/__DEFINES/background.dm @@ -50,6 +50,7 @@ #define RELIGION_WEISHII "Weishii" #define RELIGION_SUURKA "Suur'ka" #define RELIGION_KIRGUL "Kir'gul" +#define RELIGION_UNIVALVISM "Univalvism" #define RELIGION_TWINSUNS "S'rendarr and Messa" #define RELIGION_MATAKE "Ma'ta'ke" @@ -213,7 +214,7 @@ #define CITIZENSHIPS_SOLARIAN list(CITIZENSHIP_SOL, CITIZENSHIP_BIESEL, CITIZENSHIP_ERIDANI, CITIZENSHIP_COALITION) #define CITIZENSHIPS_NRALAKK list(CITIZENSHIP_NRALAKK, CITIZENSHIP_EUM) -#define RELIGIONS_NRALAKK list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_OTHER, RELIGION_NONE) +#define RELIGIONS_NRALAKK list(RELIGION_QEBLAK, RELIGION_WEISHII, RELIGION_SUURKA, RELIGION_KIRGUL, RELIGION_UNIVALVISM, RELIGION_OTHER, RELIGION_NONE) #define RELIGIONS_ADHOMAI list(RELIGION_TWINSUNS, RELIGION_MATAKE, RELIGION_RASKARA, RELIGION_NONE, RELIGION_OTHER) #define CITIZENSHIPS_ADHOMAI list(CITIZENSHIP_PRA, CITIZENSHIP_DPRA, CITIZENSHIP_NKA) diff --git a/code/controllers/subsystems/records.dm b/code/controllers/subsystems/records.dm index 88a0d3f2b35..3a646e60559 100644 --- a/code/controllers/subsystems/records.dm +++ b/code/controllers/subsystems/records.dm @@ -338,7 +338,7 @@ SUBSYSTEM_DEF(records) religions[religion.name] = religion if (!religions.len) - crash_with("No citizenships located in SSrecords.") + crash_with("No religions located in SSrecords.") /datum/controller/subsystem/records/proc/InitializeAccents() for (var/type in subtypesof(/datum/accent)) diff --git a/code/modules/background/religion/skrell.dm b/code/modules/background/religion/skrell.dm index 908e69985ca..3797297a102 100644 --- a/code/modules/background/religion/skrell.dm +++ b/code/modules/background/religion/skrell.dm @@ -35,3 +35,13 @@ entity, whether that be artificial or biological. This belief system enforces the Ya'Qu, or 'the right to live', a saying that is similar to the human 'live in the moment'. As \ such, the Skrell following the Kir'gul belief system often are explorers, artists, or other such creators, and reject authority in favor of individuality." book_name = "book of Ya'Qu" + +/datum/religion/skrell/univalvism + name = RELIGION_UNIVALVISM + description = "An obscure belief held by the fleetmembers of the Prescient Republic of the Qar. The core tenets of the faith can be found in a short series of written principles \ + called the Communes of Trust. The Communes are claimed to have originated from a series of dialogues between the Univalvist figurehead and a Great Slug. Adherence to Univalvism \ + is not made out to be a duty of the faithful, but a responsibility entrusted to them; there is no spiritual punishment for failing to abide. Univalvists hold a firm belief in \ + reincarnation and a cyclical universe, holding staunchly to the belief that in a past life or universe, everybody was once a Skrellian Univalvist, and that their current beliefs \ + come from improperly interpreted memories of their past lives. Salt is seen as a symbol of immorality in Univalvist, and salting a corpse is seen as a way of halting reincarnation \ + and causing a complete cessation of consciouss. 'Wishing salt upon you' is considered the gravest insult among followers of the faith." + book_name = "communes of trust" diff --git a/html/changelogs/lly-univalvism.yml b/html/changelogs/lly-univalvism.yml new file mode 100644 index 00000000000..5eda1a7c1b4 --- /dev/null +++ b/html/changelogs/lly-univalvism.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: Llywelwyn + +# 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 Univalvism as a religion option for the Federation Skrell origin." + - backend: "Fixed the SSRecords crash message for religions failing to load."