Merge pull request #5835 from Cerebulon/ReligionUpdate

Updates Religion Lists + Adds Religious Paraphernalia

code/game/jobs/job/civilian_chaplain.dm

@@ -37,31 +37,33 @@
 			if("unitarianism")
 				B.name = "The Talmudic Quran"
 			if("christianity")
-				B.name = pick("The Holy Bible","The Dead Sea Scrolls")
+				B.name = "The Holy Bible"
-			if("Judaism")
+			if("judaism")
 				B.name = "The Torah"
-			if("satanism")
-				B.name = "The Satanic Bible"
-			if("cthulhu")
-				B.name = "The Necronomicon"
 			if("islam")
 				B.name = "Quran"
-			if("scientology")
+			if("buddhism")
-				B.name = pick("The Biography of L. Ron Hubbard","Dianetics")
+				B.name = "Tripitakas"
-			if("chaos")
+			if("hinduism")
-				B.name = "The Book of Lorgar"
+				B.name = pick("The Srimad Bhagvatam", "The Four Vedas", "The Shiv Mahapuran", "Devi Mahatmya")
-			if("imperium")
+			if("neopaganism")
-				B.name = "Uplifting Primer"
+				B.name = "Neopagan Hymnbook"
-			if("toolboxia")
+			if("phact shintoism")
-				B.name = "Toolbox Manifesto"
+				B.name = "The Kojiki"
-			if("homosexuality")
+			if("kishari national faith")
-				B.name = "Guys Gone Wild"
+				B.name = "The Scriptures of Kishar"
-			if("science")
+			if("pleromanism")
-				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")
+				B.name = "The Revised Talmudic Quran"
-			if("capitalism")
+			if("spectralism")
-				B.name = "Wealth of Nations"
+				B.name = "The Book of the Spark"
-			if("communism")
+			if("hauler")
-				B.name = "The Communist Manifesto"
+				B.name = "Histories of Captaincy"
+			if("nock")
+				B.name = "The Book of the First"
+			if("singulitarian worship")
+				B.name = "The Book of the Precursors"
+			if("starlit path of angessa martei")
+				B.name = "Quotations of Exalted Martei"
 			else
 				B.name = "The Holy Book of [new_religion]"
 		feedback_set_details("religion_name","[new_religion]")

code/game/objects/items/godfigures.dm

@@ -0,0 +1,131 @@
+/obj/item/godfig
+	name = "religious icon"
+	desc = "A painted holy figure of a plain looking human man in a robe."
+	description_info = "Right click to select a new sprite to fit your needs."
+	icon = 'icons/obj/chaplain.dmi'
+	icon_state = "mrobe"
+	force = 10
+	throw_speed = 1
+	throw_range = 4
+	throwforce = 10
+	w_class = ITEMSIZE_SMALL
+
+
+/obj/item/godfig/verb/resprite_figure()
+	set name = "Customize Figure"
+	set category = "Object"
+	set desc = "Click to choose an appearance for your icon."
+
+	var/mob/M = usr
+	var/list/options = list()
+	options["Painted - Robed Human Female"] = "frobe"
+	options["Painted - Robed Human Male (Pale)"] = "mrobe"
+	options["Painted - Robed Human Male (Dark)"] = "mrobedark"
+	options["Painted - Bearded Human"] = "mpose"
+	options["Painted - Human Male Warrior"] = "mwarrior"
+	options["Painted - Human Female Warrior"] = "fwarrior"
+	options["Painted - Human Male Hammer"] = "hammer"
+	options["Painted - Horned God"] = "horned"
+	options["Obsidian - Human Male"] = "onyxking"
+	options["Obsidian - Human Female"] = "onyxqueen"
+	options["Obsidian - Animal Headed Male"] = "onyxanimalm"
+	options["Obsidian - Animal Headed Female"] = "onyxanimalf"
+	options["Obsidian - Bird Headed Figure"] = "onyxbird"
+	options["Stone - Seated Figure"] = "stoneseat"
+	options["Stone - Head"] = "stonehead"
+	options["Stone - Dwarf"] = "stonedwarf"
+	options["Stone - Animal"] = "stoneanimal"
+	options["Stone - Fertility"] = "stonevenus"
+	options["Stone - Snake"] = "stonesnake"
+	options["Bronze - Elephantine"] = "elephant"
+	options["Bronze - Many-armed"] = "bronzearms"
+	options["Robot"] = "robot"
+	options["Singularity"] = "singularity"
+	options["Gemstone Eye"] = "gemeye"
+	options["Golden Skull"] = "skull"
+	options["Goatman"] = "devil"
+	options["Sun Gem"] = "sun"
+	options["Moon Gem"] = "moon"
+	options["Tajaran Figure"] = "catrobe"
+
+	var/choice = input(M,"Choose your icon!","Customize Figure") in options
+	if(src && choice && !M.stat && in_range(M,src))
+		icon_state = options[choice]
+		if(options[choice] == "frobe")
+			desc = "A painted holy figure of a plain looking human woman in a robe."
+		else if(options[choice] == "mrobe")
+			desc = "A painted holy figure of a plain looking human man in a robe."
+		else if(options[choice] == "mrobedark")
+			desc = "A painted holy figure of a plain looking human man in a robe.."
+		else if(options[choice] == "mpose")
+			desc = "A painted holy figure of a rather grandiose bearded human."
+		else if(options[choice] == "mwarrior")
+			desc = "A painted holy figure of a powerful human male warrior."
+		else if(options[choice] == "fwarrior")
+			desc = "A painted holy figure of a powerful human female warrior."
+		else if(options[choice] == "hammer")
+			desc = "A painted holy figure of a human holding a hammer aloft."
+		else if(options[choice] == "horned")
+			desc = "A painted holy figure of a human man crowned with antlers."
+		else if(options[choice] == "onyxking")
+			desc = "An obsidian holy figure of a human man wearing a grand hat."
+		else if(options[choice] == "onyxqueen")
+			desc = "An obsidian holy figure of a human woman wearing a grand hat."
+		else if(options[choice] == "onyxanimalm")
+			desc = "An obsidian holy figure of a human man with the head of an animal."
+		else if(options[choice] == "onyxanimalf")
+			desc = "An obsidian holy figure of a human woman with the head of an animal."
+		else if(options[choice] == "onyxbird")
+			desc = "An obsidian holy figure of a human with the head of a bird."
+		else if(options[choice] == "stoneseat")
+			desc = "A stone holy figure of a cross-legged human."
+		else if(options[choice] == "stonehead")
+			desc = "A stone holy figure of an imposing crowned head."
+		else if(options[choice] == "stonedwarf")
+			desc = "A stone holy figure of a somewhat ugly dwarf."
+		else if(options[choice] == "stoneanimal")
+			desc = "A stone holy figure of a four-legged animal of some sort."
+		else if(options[choice] == "stonevenus")
+			desc = "A stone holy figure of a lovingly rendered pregnant woman."
+		else if(options[choice] == "stonesnake")
+			desc = "A stone holy figure of a coiled snake ready to strike."
+		else if(options[choice] == "elephant")
+			desc = "A bronze holy figure of a dancing human with the head of an elephant."
+		else if(options[choice] == "bronzearms")
+			desc = "A bronze holy figure of a human.with four arms."
+		else if(options[choice] == "robot")
+			desc = "A titanium holy figure of a synthetic humanoid."
+		else if(options[choice] == "singularity")
+			desc = "A holy figure of some kind of energy formation."
+		else if(options[choice] == "gemeye")
+			desc = "A gemstone holy figure of a sparkling eye."
+		else if(options[choice] == "skull")
+			desc = "A golden holy figure of a humanoid skull."
+		else if(options[choice] == "devil")
+			desc = "A painted holy figure of a seated humanoid goat with wings."
+		else if(options[choice] == "sun")
+			desc = "A holy figure of a star."
+		else if(options[choice] == "moon")
+			desc = "A holy figure of a small planetoid."
+		else if(options[choice] == "catrobe")
+			desc = "A painted holy figure of a plain looking Tajaran in a robe."
+
+		M << "The religious icon is now a [choice]. All hail!"
+		return 1
+
+
+
+/obj/item/godfig/verb/rename_fig()
+	set name = "Name Figure"
+	set category = "Object"
+	set desc = "Rename your icon."
+
+	var/mob/M = usr
+	if(!M.mind)	return 0
+
+	var/input = sanitizeSafe(input("What do you want to name the icon?", ,""), MAX_NAME_LEN)
+
+	if(src && input && !M.stat && in_range(M,src))
+		name = "icon of " + input
+		M << "You name the figure. Glory to [input]!."
+		return 1

code/game/objects/items/weapons/candle.dm

@@ -1,11 +1,12 @@
 /obj/item/weapon/flame/candle
 	name = "red candle"
-	desc = "a small pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments."
+	desc = "a red pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments."
 	icon = 'icons/obj/candle.dmi'
 	icon_state = "candle1"
 	w_class = ITEMSIZE_TINY
 	light_color = "#E09D37"
 	var/wax = 2000
+	var/icon_type = "candle"
 
 /obj/item/weapon/flame/candle/New()
 	wax -= rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average.
@@ -18,7 +19,7 @@
 	else if(wax > 800)
 		i = 2
 	else i = 3
-	icon_state = "candle[i][lit ? "_lit" : ""]"
+	icon_state = "[icon_type][i][lit ? "_lit" : ""]"
 
 
 /obj/item/weapon/flame/candle/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -68,6 +69,27 @@
 		update_icon()
 		set_light(0)
 
+/obj/item/weapon/flame/candle/small
+	name = "small red candle"
+	desc = "a small red candle, for more intimate candle occasions."
+	icon = 'icons/obj/candle.dmi'
+	icon_state = "smallcandle"
+	w_class = ITEMSIZE_SMALL
+
+/obj/item/weapon/flame/candle/white
+	name = "white candle"
+	desc = "a white pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments."
+	icon = 'icons/obj/candle.dmi'
+	icon_state = "whitecandle"
+	w_class = ITEMSIZE_SMALL
+
+/obj/item/weapon/flame/candle/black
+	name = "black candle"
+	desc = "a black pillar candle. Ominous."
+	icon = 'icons/obj/candle.dmi'
+	icon_state = "blackcandle"
+	w_class = ITEMSIZE_SMALL
+
 /obj/item/weapon/flame/candle/candelabra
 	name = "candelabra"
 	desc = "a small gold candelabra. The cups that hold the candles save some of the wax from dripping off, allowing the candles to burn longer."

code/game/objects/items/weapons/storage/fancy.dm

@@ -55,11 +55,11 @@
 	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/egg = 12)
 
 /*
- * Candle Box
+ * Candle Boxes
  */
 
 /obj/item/weapon/storage/fancy/candle_box
-	name = "candle pack"
+	name = "red candle pack"
 	desc = "A pack of red candles."
 	icon = 'icons/obj/candle.dmi'
 	icon_state = "candlebox5"
@@ -69,6 +69,29 @@
 	slot_flags = SLOT_BELT
 	starts_with = list(/obj/item/weapon/flame/candle = 5)
 
+/obj/item/weapon/storage/fancy/whitecandle_box
+	name = "white candle pack"
+	desc = "A pack of white candles."
+	icon = 'icons/obj/candle.dmi'
+	icon_state = "whitecandlebox5"
+	icon_type = "whitecandle"
+	item_state = "whitecandlebox5"
+	throwforce = 2
+	slot_flags = SLOT_BELT
+	starts_with = list(/obj/item/weapon/flame/candle/white = 5)
+
+/obj/item/weapon/storage/fancy/blackcandle_box
+	name = "black candle pack"
+	desc = "A pack of black candles."
+	icon = 'icons/obj/candle.dmi'
+	icon_state = "blackcandlebox5"
+	icon_type = "blackcandle"
+	item_state = "blackcandlebox5"
+	throwforce = 2
+	slot_flags = SLOT_BELT
+	starts_with = list(/obj/item/weapon/flame/candle/black = 5)
+
+
 /*
  * Crayon Box
  */

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -101,6 +101,9 @@
 		/obj/item/clothing/under/wedding/bride_white,
 		/obj/item/weapon/storage/backpack/cultpack,
 		/obj/item/weapon/storage/fancy/candle_box = 2,
+		/obj/item/weapon/storage/fancy/whitecandle_box,
+		/obj/item/weapon/storage/fancy/blackcandle_box,
+		/obj/item/godfig = 2,
 		/obj/item/weapon/deck/tarot)
 
 
@@ -188,7 +191,7 @@
 	name = "white wardrobe"
 	icon_state = "white"
 	icon_closed = "white"
-	
+
 	starts_with = list(
 		/obj/item/clothing/under/color/white = 3,
 		/obj/item/clothing/shoes/white = 3,
@@ -254,7 +257,7 @@
 		starts_with += /obj/item/weapon/storage/backpack/dufflebag/sci
 	else
 		starts_with += /obj/item/weapon/storage/backpack/satchel/tox
-	
+
 	return ..()
 
 
@@ -340,12 +343,12 @@
 	name = "grey wardrobe"
 	icon_state = "grey"
 	icon_closed = "grey"
-	
+
 	starts_with = list(
 		/obj/item/clothing/under/color/grey = 3,
 		/obj/item/clothing/shoes/black = 3,
 		/obj/item/clothing/head/soft/grey = 3)
-		
+
 
 /obj/structure/closet/wardrobe/mixed
 	name = "mixed wardrobe"

code/modules/client/preferences_factions.dm

@@ -59,10 +59,21 @@ var/global/list/antag_visiblity_choices = list(
 
 var/global/list/religion_choices = list(
 	"Unitarianism",
-	"Hinduism",
+	"Neopaganism",
-	"Buddhist",
 	"Islam",
 	"Christianity",
+	"Judaism",
+	"Hinduism",
+	"Buddhism",
+	"Pleromanism",
+	"Spectralism",
+	"Phact Shintoism",
+	"Kishari Faith",
+	"Hauler Faith",
+	"Nock",
+	"Singulitarian Worship",
+	"Xilar Qall",
+	"Tajr-kii Rarkajar",
 	"Agnosticism",
 	"Deism"
 	)

html/changelogs/Cerebulon - ReligionUpdate.yml

@@ -0,0 +1,15 @@
+
+author: Cerebulon
+
+# 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 customizable religious icons to the chaplain's office."
+  - rscadd: "Added black and white candles."
+  - tweak: "Updated religion lists in character setup to be lore friendly."

vorestation.dme

@@ -933,6 +933,7 @@
 #include "code\game\objects\items\contraband_vr.dm"
 #include "code\game\objects\items\crayons.dm"
 #include "code\game\objects\items\glassjar.dm"
+#include "code\game\objects\items\godfigures.dm"
 #include "code\game\objects\items\gunbox.dm"
 #include "code\game\objects\items\gunbox_vr.dm"
 #include "code\game\objects\items\latexballoon.dm"