Merge pull request #1238 from Onutsio/reliquary

Reliquary Box, DAYBREAK silver whip. Inquisition DLC part 2

_maps/map_files/dun_manor/dun_manor.dmm

@@ -1567,7 +1567,6 @@
 	icon_state = "longtable"
 	},
 /obj/item/natural/feather,
-/obj/item/psydonmusicbox,
 /turf/open/floor/rogue/herringbone,
 /area/rogue/under/town/basement)
 "bjq" = (
@@ -6245,7 +6244,6 @@
 "fsW" = (
 /obj/structure/closet/crate/roguecloset,
 /obj/item/scomstone,
-/obj/item/rogueweapon/whip/antique,
 /turf/open/floor/rogue/herringbone,
 /area/rogue/under/town/basement)
 "ftb" = (
@@ -12880,6 +12878,7 @@
 /obj/item/reagent_containers/glass/bottle/rogue/manapot,
 /obj/item/book/rogue/bibble,
 /obj/machinery/light/rogue/wallfire/candle/r,
+/obj/item/roguekey/psydonkey,
 /turf/open/floor/rogue/herringbone,
 /area/rogue/under/town/basement)
 "llw" = (
@@ -18647,6 +18646,10 @@
 	},
 /turf/open/floor/rogue/ruinedwood/spiral,
 /area/rogue/outdoors/beach)
+"qlc" = (
+/obj/structure/reliquarybox,
+/turf/open/floor/rogue/herringbone,
+/area/rogue/under/town/basement)
 "qli" = (
 /obj/effect/decal/cleanable/blood/gibs,
 /turf/open/floor/rogue/naturalstone,
@@ -37456,7 +37459,7 @@ gdw
 epW
 gnM
 gnM
-gnM
+qlc
 haQ
 fsW
 gdw

code/game/objects/items/rogueitems/inquisitionrelics.dm

@@ -1,3 +1,40 @@
+// Reliquary Box and key - The Box Which contains these
+/obj/structure/reliquarybox
+	name = "Otavan Reliquary"
+	desc = "A foreboding red chest with a intricate lock design. It seems to only fit a very specific key. Choose wisely."
+	icon = 'icons/roguetown/misc/structure.dmi'
+	icon_state = "chestweird1"
+	anchored = TRUE
+	density = TRUE
+	var/opened = FALSE
+
+/obj/item/roguekey/psydonkey
+	icon_state = "birdkey"
+	name = "Reliquary Key"
+	desc = "The single use key with which to unleash woe. Choose wisely."
+
+/obj/structure/reliquarybox/attackby(obj/item/W, mob/user, params)
+	if(ishuman(user))
+		if(istype(W, /obj/item/roguekey/psydonkey))
+			if(opened)
+				to_chat(user, span_info("The reliquary box has already been opened..."))
+				return
+			qdel(W)
+			to_chat(user, span_info("The reliquary lock takes my key as it opens, I take a moment to ponder what power was delivered to us..."))
+			playsound(loc, 'sound/foley/doors/lock.ogg', 60)
+			to_chat(user,)
+			var/relics = list("Melancholic Crankbox - Antimagic", "Daybreak - Silver Whip")
+			var/relicchoice = input(user, "Choose your tool", "RELICS") as anything in relics
+			switch(relicchoice)
+				if("Melancholic Crankbox - Antimagic")
+					user.put_in_hands(new /obj/item/psydonmusicbox(user), TRUE)
+				if("Daybreak - Silver Whip")
+					user.put_in_hands(new /obj/item/rogueweapon/whip/antique/psywhip(user), TRUE)
+			to_chat(user, span_info("I retrieve the relic, may HE guide my hand."))
+			opened = TRUE
+			icon_state = "chestweird1open"
+
+
 // Soul Churner - Music box which applies magic resistance to Inquisition members, greatly mood debuffs everyone not a Psydon worshipper.
 /obj/item/psydonmusicbox
 	name = "melancholic crankbox"
@@ -15,7 +52,6 @@
 	twohands_required = TRUE
 	var/datum/looping_sound/psydonmusicboxsound/soundloop
 
-
 /obj/item/psydonmusicbox/examine(mob/user)
 	. = ..()
 	if(HAS_TRAIT(usr, TRAIT_INQUISITION))

code/game/objects/items/rogueweapons/melee/flail.dm

@@ -165,6 +165,11 @@
 	minstr = 11
 	icon_state = "gwhip"
 
+/obj/item/rogueweapon/whip/antique/psywhip
+	name = "Daybreak"
+	desc = "I am wrath. I am silver. I am the mercy of HIM."
+	icon_state = "psywhip"
+	is_silver = TRUE
 
 /obj/item/rogueweapon/flail/peasantwarflail
 	force = 10

code/modules/jobs/job_types/roguetown/Inquisition/puritan.dm

@@ -66,25 +66,22 @@
 		H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE)
-		H.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) //Keeping it up with Confessor
-		H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) //Keeping it up with Confessor
-		H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) //Keeping it up with Confessor
+		H.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE)
-		H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) //Keeping it up with Confessor
-		H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 5, TRUE) ///Ortho Confessor gets master in every stealth skill. Insane. 
-		H.mind.adjust_skillrank(/datum/skill/misc/tracking, 5, TRUE) //To track down heretics to their evil lairs... 
-		H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE) //Always thought it was crazy they got listening devices but NO means to effectively sneak them into places.
-		if(H.age == AGE_MIDDLEAGED)
-			H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 5, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/tracking, 5, TRUE)
+		H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE)
 		if(H.age == AGE_OLD)
 			H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
 			H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
-			H.change_stat("strength", 2) //to offset the age
-		H.change_stat("strength", 1) ///They deserve the whips too actually
-		H.change_stat("endurance", 2) ///Who the fuck gave Confessor 3 Endurance lmao
+		H.change_stat("strength", 1)
+		H.change_stat("endurance", 2)
 		H.change_stat("perception", 3)
-		H.change_stat("speed", 2) //NVM I don't want to get lynched by devs for this 
+		H.change_stat("speed", 2)
 		H.change_stat("intelligence", 3)
 	H.verbs |= /mob/living/carbon/human/proc/faith_test
 	H.verbs |= /mob/living/carbon/human/proc/torture_victim
@@ -133,16 +130,12 @@
 		H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE)
-		if(H.age == AGE_MIDDLEAGED)
-			H.mind.adjust_skillrank(/datum/skill/combat/maces, 1, TRUE)
-			H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE)
 		if(H.age == AGE_OLD)
 			H.mind.adjust_skillrank(/datum/skill/combat/maces, 1, TRUE)
 			H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
-			H.change_stat("strength", 2) //to offset the age
-		H.change_stat("strength", 2)	///Templar stats but with perception and intelligence.
+		H.change_stat("strength", 2)
 		H.change_stat("endurance", 2) 
-		H.change_stat("constitution", 2) ///Theo said stats too good
+		H.change_stat("constitution", 2)
 		H.change_stat("speed", -1)
 
 	H.verbs |= /mob/living/carbon/human/proc/faith_test
@@ -166,7 +159,6 @@
 		color = CLOTHING_GREY
 
 
-///So people don't get angry I removed the old Inquisitor
 
 /datum/advclass/puritan/gangster
 	name = "The SOUL of Psydon"