From 6212e1f83610cef7ec304fbbff268940a0e0b09f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 26 Apr 2021 12:57:37 +0200 Subject: [PATCH] [MIRROR] Custom Chaplain Bible Names (#5192) * Custom Chaplain Bible Names (#58367) * Custom Chaplain Bible Names Co-authored-by: Y0SH1M4S73R --- code/__DEFINES/jobs.dm | 1 + code/_globalvars/lists/names.dm | 3 +- code/modules/client/preferences.dm | 2 + code/modules/jobs/job_types/chaplain.dm | 60 ++++++++++++++----------- 4 files changed, 39 insertions(+), 27 deletions(-) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 84865fbfa45..0a955e19129 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -7,6 +7,7 @@ #define DEFAULT_RELIGION "Christianity" #define DEFAULT_DEITY "Space Jesus" +#define DEFAULT_BIBLE "Default Bible Name" #define JOB_DISPLAY_ORDER_DEFAULT 0 diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index a49e2988d75..dfed7c9ad98 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -49,5 +49,6 @@ GLOBAL_LIST_INIT(preferences_custom_names, list( "cyborg" = list("pref_name" = "Cyborg", "qdesc" = "cyborg name (Leave empty to use default naming scheme)", "allow_numbers" = TRUE , "group" = "silicons", "allow_null" = TRUE), "ai" = list("pref_name" = "AI", "qdesc" = "ai name", "allow_numbers" = TRUE , "group" = "silicons", "allow_null" = FALSE), "religion" = list("pref_name" = "Chaplain religion", "qdesc" = "religion" , "allow_numbers" = TRUE , "group" = "chaplain", "allow_null" = FALSE), - "deity" = list("pref_name" = "Chaplain deity", "qdesc" = "deity", "allow_numbers" = TRUE , "group" = "chaplain", "allow_null" = FALSE) + "deity" = list("pref_name" = "Chaplain deity", "qdesc" = "deity", "allow_numbers" = TRUE , "group" = "chaplain", "allow_null" = FALSE), + "bible" = list("pref_name" = "Chaplain bible name", "qdesc" = "bible name (Leave empty to use default naming scheme)", "allow_numbers" = TRUE , "group" = "chaplain", "allow_null" = TRUE) )) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 226879a3e97..47ba0a2eaf1 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2024,6 +2024,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) return DEFAULT_RELIGION if("deity") return DEFAULT_DEITY + if("bible") + return DEFAULT_BIBLE return random_unique_name() /datum/preferences/proc/ask_for_custom_name(mob/user,name_id) diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 97ccf3e81fd..f17f3094591 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -62,69 +62,77 @@ B.deity_name = new_deity + var/new_bible = DEFAULT_BIBLE + if(M.client && M.client.prefs.custom_names["bible"]) + new_bible = M.client.prefs.custom_names["bible"] + switch(lowertext(new_religion)) if("christianity") // DEFAULT_RELIGION - B.name = pick("The Holy Bible","The Dead Sea Scrolls") + new_bible = pick("The Holy Bible","The Dead Sea Scrolls") if("buddhism") - B.name = "The Sutras" + new_bible = "The Sutras" if("clownism","honkmother","honk","honkism","comedy") - B.name = pick("The Holy Joke Book", "Just a Prank", "Hymns to the Honkmother") + new_bible = pick("The Holy Joke Book", "Just a Prank", "Hymns to the Honkmother") if("chaos") - B.name = "The Book of Lorgar" + new_bible = "The Book of Lorgar" if("cthulhu") - B.name = "The Necronomicon" + new_bible = "The Necronomicon" if("hinduism") - B.name = "The Vedas" + new_bible = "The Vedas" if("homosexuality") - B.name = pick("Guys Gone Wild","Coming Out of The Closet") + new_bible = pick("Guys Gone Wild","Coming Out of The Closet") if("imperium") - B.name = "Uplifting Primer" + new_bible = "Uplifting Primer" if("islam") - B.name = "Quran" + new_bible = "Quran" if("judaism") - B.name = "The Torah" + new_bible = "The Torah" if("lampism") - B.name = "Fluorescent Incandescence" + new_bible = "Fluorescent Incandescence" if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks", "meme", "memes") - B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition","F.A.T.A.L. Rulebook") + new_bible = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition","F.A.T.A.L. Rulebook") H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100) // starts off brain damaged as fuck if("monkeyism","apism","gorillism","primatism") - B.name = pick("Going Bananas", "Bananas Out For Harambe") + new_bible = pick("Going Bananas", "Bananas Out For Harambe") if("mormonism") - B.name = "The Book of Mormon" + new_bible = "The Book of Mormon" if("pastafarianism") - B.name = "The Gospel of the Flying Spaghetti Monster" + new_bible = "The Gospel of the Flying Spaghetti Monster" if("rastafarianism","rasta") - B.name = "The Holy Piby" + new_bible = "The Holy Piby" if("satanism") - B.name = "The Unholy Bible" + new_bible = "The Unholy Bible" if("sikhism") - B.name = "Guru Granth Sahib" + new_bible = "Guru Granth Sahib" if("science") - B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") + new_bible = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") if("scientology") - B.name = pick("The Biography of L. Ron Hubbard","Dianetics") + new_bible = pick("The Biography of L. Ron Hubbard","Dianetics") if("servicianism", "partying") - B.name = "The Tenets of Servicia" + new_bible = "The Tenets of Servicia" B.deity_name = pick("Servicia", "Space Bacchus", "Space Dionysus") B.desc = "Happy, Full, Clean. Live it and give it." if("subgenius") - B.name = "Book of the SubGenius" + new_bible = "Book of the SubGenius" if("toolboxia","greytide") - B.name = pick("Toolbox Manifesto","iGlove Assistants") + new_bible = pick("Toolbox Manifesto","iGlove Assistants") if("weeaboo","kawaii") - B.name = pick("Fanfiction Compendium","Japanese for Dummies","The Manganomicon","Establishing Your O.T.P") + new_bible = pick("Fanfiction Compendium","Japanese for Dummies","The Manganomicon","Establishing Your O.T.P") else - B.name = "The Holy Book of [new_religion]" + if(new_bible == DEFAULT_BIBLE) + new_bible = "The Holy Book of [new_religion]" + + B.name = new_bible GLOB.religion = new_religion - GLOB.bible_name = B.name + GLOB.bible_name = new_bible GLOB.deity = B.deity_name H.equip_to_slot_or_del(B, ITEM_SLOT_BACKPACK) SSblackbox.record_feedback("text", "religion_name", 1, "[new_religion]", 1) SSblackbox.record_feedback("text", "religion_deity", 1, "[new_deity]", 1) + SSblackbox.record_feedback("text", "religion_bible", 1, "[new_bible]", 1) /datum/outfit/job/chaplain name = "Chaplain"