diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index a0ffe79d509..10f634fa394 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1520,4 +1520,3 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) stack_trace("WARNING! podspawn vareditting \"[variable_name]\" to \"[variable_value]\" was rejected by the pod!") new /obj/effect/pod_landingzone(landing_location, pod) return pod - diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 862f3c74c8b..6015eb222ee 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -12,6 +12,7 @@ GLOBAL_LIST_INIT(lizard_names_male, world.file2list("strings/names/lizard_male.t GLOBAL_LIST_INIT(lizard_names_female, world.file2list("strings/names/lizard_female.txt")) GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt")) GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt")) +GLOBAL_LIST_INIT(religion_names, world.file2list("strings/names/religion.txt")) GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt")) GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt")) GLOBAL_LIST_INIT(moth_first, world.file2list("strings/names/moth_first.txt")) @@ -44,12 +45,12 @@ List of configurable names in preferences and their metadata ), */ GLOBAL_LIST_INIT(preferences_custom_names, list( - "human" = list("pref_name" = "Backup Human", "qdesc" = "backup human name, used in the event you are assigned a command role as another species", "allow_numbers" = FALSE , "group" = "backup_human", "allow_null" = FALSE), - "clown" = list("pref_name" = "Clown" , "qdesc" = "clown name", "allow_numbers" = FALSE , "group" = "fun", "allow_null" = FALSE), - "mime" = list("pref_name" = "Mime", "qdesc" = "mime name" , "allow_numbers" = FALSE , "group" = "fun", "allow_null" = FALSE), - "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), - "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) + "human" = list("pref_name" = "Backup Human", "qdesc" = "backup human name, used in the event you are assigned a command role as another species (leave empty to pick random name)", "allow_numbers" = FALSE , "group" = "backup_human", "allow_null" = TRUE), + "clown" = list("pref_name" = "Clown" , "qdesc" = "clown name (leave empty to pick random name)", "allow_numbers" = FALSE , "group" = "fun", "allow_null" = TRUE), + "mime" = list("pref_name" = "Mime", "qdesc" = "mime name (leave empty to pick random name)" , "allow_numbers" = FALSE , "group" = "fun", "allow_null" = TRUE), + "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 (leave empty to pick random name)", "allow_numbers" = TRUE , "group" = "silicons", "allow_null" = TRUE), + "religion" = list("pref_name" = "Chaplain religion", "qdesc" = "religion (leave empty to pick random religion)" , "allow_numbers" = TRUE , "group" = "chaplain", "allow_null" = TRUE), + "deity" = list("pref_name" = "Chaplain deity", "qdesc" = "deity (leave empty to pick default name)", "allow_numbers" = TRUE , "group" = "chaplain", "allow_null" = TRUE), + "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 4deba750aa2..aa03393f130 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1975,7 +1975,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("mime") return pick(GLOB.mime_names) if("religion") - return DEFAULT_RELIGION + return pick(GLOB.religion_names) if("deity") return DEFAULT_DEITY if("bible") @@ -2000,3 +2000,75 @@ GLOBAL_LIST_EMPTY(preferences_datums) return else custom_names[name_id] = sanitized_name + + if(name_id == "religion") + update_bible_and_deity_name(custom_names[name_id]) + +/datum/preferences/proc/update_bible_and_deity_name(religion) + switch(lowertext(religion)) + if("christianity") // DEFAULT_RELIGION + custom_names["bible"] = pick("The Holy Bible","The Dead Sea Scrolls") + custom_names["deity"] = "Space Jesus" + if("buddhism") + custom_names["bible"] = "The Sutras" + custom_names["deity"] = "Buddha" + if("clownism","honkmother","honk","honkism","comedy") + custom_names["bible"] = pick("The Holy Joke Book", "Just a Prank", "Hymns to the Honkmother") + custom_names["deity"] = "The Honkmother" + if("chaos") + custom_names["bible"] = "The Book of Lorgar" + custom_names["deity"] = pick("Chaos Gods", "Dark Gods", "Ruinous Powers") + if("cthulhu") + custom_names["bible"] = "The Necronomicon" + custom_names["deity"] = pick("Great Old Ones", "Old Ones") + if("hinduism") + custom_names["bible"] = "The Vedas" + custom_names["deity"] = pick("Brahma", "Vishnu", "Shiva") + if("imperium") + custom_names["bible"] = "Uplifting Primer" + custom_names["deity"] = "Astra Militarum" + if("islam") + custom_names["bible"] = "Quran" + custom_names["deity"] = "Allah" + if("judaism") + custom_names["bible"] = "The Torah" + custom_names["deity"] = "Yahweh" + if("lampism") + custom_names["bible"] = "Fluorescent Incandescence" + custom_names["deity"] = "Lamp" + if("monkeyism","apism","gorillism","primatism") + custom_names["bible"] = pick("Going Bananas", "Bananas Out For Harambe") + custom_names["deity"] = pick("Harambe", "monky") + if("mormonism") + custom_names["bible"] = "The Book of Mormon" + custom_names["deity"] = pick("God", "Elohim", "Godhead") + if("pastafarianism") + custom_names["bible"] = "The Gospel of the Flying Spaghetti Monster" + custom_names["deity"] = "Flying Spaghetti Monster" + if("rastafarianism","rasta") + custom_names["bible"] = "The Holy Piby" + custom_names["deity"] = "Haile Selassie I" + if("satanism") + custom_names["bible"] = "The Unholy Bible" + custom_names["deity"] = "Satan" + if("sikhism") + custom_names["bible"] = "Guru Granth Sahib" + custom_names["deity"] = "Waheguru" + if("science") + custom_names["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") + custom_names["deity"] = pick("Albert Einstein", "Stephen Hawking", "Neil deGrasse Tyson", "Carl Sagan", "Richard Dawkins") + if("scientology") + custom_names["bible"] = pick("The Biography of L. Ron Hubbard","Dianetics") + custom_names["deity"] = pick("Money", "Power", "Xenu", "Tom Cruise", "L. Ron Hubbard", "David Miscavige", "John Travolta") + if("servicianism", "partying") + custom_names["bible"] = "The Tenets of Servicia" + custom_names["deity"] = pick("Servicia", "Space Bacchus", "Space Dionysus") + if("subgenius") + custom_names["bible"] = "Book of the SubGenius" + custom_names["deity"] = pick("Jehovah 1", "J. R. \"Bob\" Dobbs") + if("toolboxia","greytide") + custom_names["bible"] = pick("Toolbox Manifesto","iGlove Assistants") + custom_names["deity"] = "Maintenance" + else + if(custom_names["bible"] == DEFAULT_BIBLE) + custom_names["bible"] = "The Holy Book of [religion]" diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index f17f3094591..befef24b9c1 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -67,57 +67,29 @@ new_bible = M.client.prefs.custom_names["bible"] switch(lowertext(new_religion)) - if("christianity") // DEFAULT_RELIGION - new_bible = pick("The Holy Bible","The Dead Sea Scrolls") - if("buddhism") - new_bible = "The Sutras" - if("clownism","honkmother","honk","honkism","comedy") - new_bible = pick("The Holy Joke Book", "Just a Prank", "Hymns to the Honkmother") - if("chaos") - new_bible = "The Book of Lorgar" - if("cthulhu") - new_bible = "The Necronomicon" - if("hinduism") - new_bible = "The Vedas" - if("homosexuality") - new_bible = pick("Guys Gone Wild","Coming Out of The Closet") - if("imperium") - new_bible = "Uplifting Primer" - if("islam") - new_bible = "Quran" - if("judaism") - new_bible = "The Torah" - if("lampism") - new_bible = "Fluorescent Incandescence" - if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks", "meme", "memes") - 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") + if("homosexuality", "gay", "penis", "ass", "cock", "cocks") + new_bible = pick("Guys Gone Wild","Coming Out of The Closet","War of Cocks") + switch(new_bible) + if("War of Cocks") + B.deity_name = pick("Dick Powers", "King Cock") + else + B.deity_name = pick("Gay Space Jesus", "Gandalf", "Dumbledore") H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100) // starts off brain damaged as fuck - if("monkeyism","apism","gorillism","primatism") - new_bible = pick("Going Bananas", "Bananas Out For Harambe") - if("mormonism") - new_bible = "The Book of Mormon" - if("pastafarianism") - new_bible = "The Gospel of the Flying Spaghetti Monster" - if("rastafarianism","rasta") - new_bible = "The Holy Piby" - if("satanism") - new_bible = "The Unholy Bible" - if("sikhism") - new_bible = "Guru Granth Sahib" - if("science") - 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") - new_bible = pick("The Biography of L. Ron Hubbard","Dianetics") + if("lol", "wtf", "poo", "badmin", "shitmin", "deadmin", "meme", "memes") + new_bible = pick("Woody's Got Wood: The Aftermath", "Sweet Bro and Hella Jeff: Expanded Edition","F.A.T.A.L. Rulebook") + switch(new_bible) + if("Woody's Got Wood: The Aftermath") + B.deity_name = pick("Woody", "Andy", "Cherry Flavored Lube") + if("Sweet Bro and Hella Jeff: Expanded Edition") + B.deity_name = pick("Sweet Bro", "Hella Jeff", "Stairs", "AH") + if("F.A.T.A.L. Rulebook") + B.deity_name = "Twenty Ten-Sided Dice" + H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100) // also starts off brain damaged as fuck if("servicianism", "partying") - 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") - new_bible = "Book of the SubGenius" - if("toolboxia","greytide") - new_bible = pick("Toolbox Manifesto","iGlove Assistants") if("weeaboo","kawaii") new_bible = pick("Fanfiction Compendium","Japanese for Dummies","The Manganomicon","Establishing Your O.T.P") + B.deity_name = "Anime" else if(new_bible == DEFAULT_BIBLE) new_bible = "The Holy Book of [new_religion]" diff --git a/strings/names/religion.txt b/strings/names/religion.txt new file mode 100644 index 00000000000..c1db3b071ab --- /dev/null +++ b/strings/names/religion.txt @@ -0,0 +1,31 @@ +Christianity +Buddhism +Clownism +Honkmother +Honk +Honkism +Comedy +Chaos +Cthulhu +Hinduism +Imperium +Islam +Judaism +Lampism +Monkeyism +Apism +Gorillism +Primatism +Mormonism +Pastafarianism +Rastafarianism +Rasta +Satanism +Sikhism +Science +Scientology +Servicianism +Partying +SubGenius +Toolboxia +Greytide \ No newline at end of file