Merge pull request #3802 from Tastyfish/chronx100

Donator Fluff Items: Chaplain Edition

code/game/gamemodes/cult/ritual.dm

@@ -95,7 +95,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 		qdel(src)
 		return
 	else if(istype(I, /obj/item/weapon/nullrod))
-		user << "\blue You disrupt the vile magic with the deadening field of the null rod!"
+		user << "\blue You disrupt the vile magic with the deadening field of \the [I]!"
 		qdel(src)
 		return
 	return

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -272,7 +272,7 @@
 /mob/living/simple_animal/revenant/attackby(obj/item/W, mob/living/user, params)
 	if(istype(W, /obj/item/weapon/nullrod))
 		visible_message("<span class='warning'>[src] violently flinches!</span>", \
-						"<span class='revendanger'>As the null rod passes through you, you feel your essence draining away!</span>")
+						"<span class='revendanger'>As \the [W] passes through you, you feel your essence draining away!</span>")
 		adjustBruteLoss(25) //hella effective
 		inhibited = 1
 		spawn(30)

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

@@ -27,6 +27,8 @@
 	throwforce = 10
 	w_class = 1
 	var/transformed = 0
+	var/transform_into = /obj/item/weapon/nullrod/sword
+	var/transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar)
 
 	suicide_act(mob/user)
 		viewers(user) << "<span class='suicide'>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>"
@@ -61,13 +63,15 @@
 /obj/item/weapon/nullrod/afterattack(var/obj/item/I as obj, mob/user as mob, proximity)
 	if(!proximity)
 		return
-	if(istype(I, /obj/item/clothing/suit/armor/riot/knight/templar)) //Only the Chaplain's holy armor is capable fo performing this feat.
-		if(!transformed) // can't turn a sword into a sword.
-			user << "<span class='notice'>You sheath the [src] into the [I]'s scabbard, transforming it into a holy sword.</span>"
-			user.unEquip(src)
-			qdel(src)
-			var/obj/item/weapon/nullrod/sword/S = new /obj/item/weapon/nullrod/sword
-			user.put_in_hands(S)
+	for(var/T in transform_via)
+		if(istype(I, T)) //Only the Chaplain's holy armor is capable fo performing this feat.
+			if(!transformed) // can't turn a sword into a sword.
+				var/obj/item/S = new transform_into()
+				user << "<span class='notice'>You sheath the [src] into the [I]'s scabbard, transforming it into \a [S].</span>"
+				user.unEquip(src)
+				qdel(src)
+				user.put_in_hands(S)
+				break
 
 /obj/item/weapon/nullrod/sword
 	name = "holy sword"

code/modules/clothing/clothing.dm

@@ -487,8 +487,10 @@ BLIND     // can't see anything
 	set name = "Open/Close Jacket"
 	set category = "Object"
 	set src in usr
-	if(!istype(usr, /mob/living)) return
-	if(usr.stat) return
+	if(!isliving(usr))
+		return
+	if(usr.stat)
+		return
 	adjustsuit(user)
 
 /obj/item/clothing/suit/ui_action_click() //This is what happens when you click the HUD action button to adjust your suit.

code/modules/customitems/item_defines.dm

@@ -283,22 +283,78 @@
 	flags = BLOCKHAIR
 	flags_inv = HIDEFACE
 
-/obj/item/clothing/under/fluff/tactical_suit //chronx100: Hughe O'Splash
-	name = "Hughe O'Splash's tactical suit"
-	desc = "A very comfortable suit that covers your entire body; it makes you feel very stealthy."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "chronx_suit"
-	item_state = "chronx_suit"
-	item_color = "chronxsuit"
+/obj/item/weapon/nullrod/fluff/chronx //chronx100: Hughe O'Splash
+	transform_into = /obj/item/weapon/nullrod/sword/fluff/chronx
+	transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar, /obj/item/clothing/suit/chaplain_hoodie/fluff/chronx)
 
-/obj/item/clothing/mask/fluff/tactical_balaclava //chronx100: Hughe O'Splash
-	name = "Hughe O'Splash's tactical balaclava"
-	desc = "Keeps your face warm and tactical during those cold space winter months, sadly it's not so effective against the cold void of space itself."
+/obj/item/weapon/nullrod/sword/fluff/chronx
+	name = "Soul Collector"
+	desc = "An ancient scythe used by the worshipers of Cthulhu. Tales say it is used to prepare souls for Cthulhu's great devouring. Someone carved their name into the handle: Hughe O'Splash"
 	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "chronx_balaclava"
-	item_state = "chronx_balaclava"
-	flags = BLOCKHAIR
-	w_class = 2
+	icon_state = "chronx_scythe"
+	item_state = "chronx_scythe"
+
+/obj/item/clothing/head/fluff/chronx //chronx100: Hughe O'Splash
+	name = "Cthulhu's Hood"
+	desc = "Hood worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash"
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "chronx_hood"
+	item_state = "chronx_hood"
+	flags = HEADCOVERSEYES | BLOCKHAIR
+	action_button_name = "Transform Hood"
+	var/adjusted = 0
+
+/obj/item/clothing/head/fluff/chronx/ui_action_click()
+	adjust()
+
+/obj/item/clothing/head/fluff/chronx/verb/adjust()
+	set name = "Transform Hood"
+	set category = "Object"
+	set src in usr
+	if(!isliving(src))
+		return
+	if(!usr.incapacitated())
+		if(adjusted)
+			icon_state = initial(icon_state)
+			item_state = initial(item_state)
+			usr << "You untransform \the [src]."
+			adjusted = 0
+		else
+			icon_state += "_open"
+			item_state += "_open"
+			usr << "You transform \the [src]."
+			adjusted = 1
+		usr.update_inv_head()
+
+/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx //chronx100: Hughe O'Splash
+	name = "Cthulhu's Robes"
+	desc = "Robes worn by  the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash"
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "chronx_robe"
+	item_state = "chronx_robe"
+	flags = ONESIZEFITSALL
+	action_button_name = "Transform Robes"
+	adjust_flavour = "untransform"
+	ignore_suitadjust = 0
+
+/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx/New()
+	..()
+	verbs -= /obj/item/clothing/suit/verb/openjacket
+
+/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx/verb/adjust()
+	set name = "Transform Robes"
+	set category = "Object"
+	set src in usr
+	if(!istype(usr, /mob/living))
+		return
+	adjustsuit(usr)
+
+/obj/item/clothing/shoes/black/fluff/chronx //chronx100: Hughe O'Splash
+	name = "Cthulhu's Boots"
+	desc = "Boots worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash"
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "chronx_shoes"
+	item_state = "chronx_shoes"
 
 /obj/item/clothing/suit/armor/vest/fluff/tactical //m3hillus: Medusa Schlofield
 	name = "tactical armor vest"