Merge pull request #5835 from Cerebulon/ReligionUpdate

Updates Religion Lists + Adds Religious Paraphernalia

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
  */