inquis-jank

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

@@ -428,7 +428,7 @@
 	. = ..()								//Pre-blessed, +3 force, +50 blade int, +50 int, +1 def, make silver
 	AddComponent(\
 		/datum/component/silverbless,\
-		pre_blessed = BLESSING_NONE,\
+		pre_blessed = BLESSING_PSYDONIAN,\
 		silver_type = SILVER_PSYDONIAN,\
 		added_force = 0,\
 		added_blade_int = 50,\

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

@@ -503,7 +503,7 @@
 /obj/item/rogueweapon/mace/goden/psymace/preblessed/ComponentInitialize()
 	AddComponent(\
 		/datum/component/silverbless,\
-		pre_blessed = BLESSING_NONE,\
+		pre_blessed = BLESSING_PSYDONIAN,\
 		silver_type = SILVER_PSYDONIAN,\
 		added_force = 0,\
 		added_blade_int = 0,\

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

@@ -149,6 +149,17 @@
 		added_def = 1,\
 	)
 
+/obj/item/rogueweapon/flail/sflail/psyflail/preblessed/ComponentInitialize()
+	AddComponent(\
+		/datum/component/silverbless,\
+		pre_blessed = BLESSING_PSYDONIAN,\
+		silver_type = SILVER_PSYDONIAN,\
+		added_force = 0,\
+		added_blade_int = 0,\
+		added_int = 50,\
+		added_def = 1,\
+	)
+
 /obj/item/rogueweapon/flail/sflail/psyflail/relic
 	name = "Consecratia"
 	desc = "The weight of His anguish, His pain, His hope and His love for humenkind - all hanging on the ornamental silver-steel head chained to this arm. <br><br>A declaration of love for all that Psydon lives for, and a crushing reminder to the arch-nemesis that they will not triumph as long as He endures."

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

@@ -416,7 +416,7 @@
 /obj/item/rogueweapon/spear/psyspear/preblessed/ComponentInitialize()
 	AddComponent(\
 		/datum/component/silverbless,\
-		pre_blessed = BLESSING_NONE,\
+		pre_blessed = BLESSING_PSYDONIAN,\
 		silver_type = SILVER_PSYDONIAN,\
 		added_force = 0,\
 		added_blade_int = 50,\

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

@@ -346,6 +346,17 @@
 		added_def = 2,\
 	)
 
+/obj/item/rogueweapon/katar/psydon/preblessed/ComponentInitialize()
+	AddComponent(\
+		/datum/component/silverbless,\
+		pre_blessed = BLESSING_PSYDONIAN,\
+		silver_type = SILVER_PSYDONIAN,\
+		added_force = 0,\
+		added_blade_int = 0,\
+		added_int = 50,\
+		added_def = 2,\
+	)
+
 /obj/item/rogueweapon/knuckles/psydon
 	name = "psydonian knuckles"
 	desc = "A simple piece of harm molded in a holy mixture of steel and silver, finished with three stumps - Psydon's crown - to crush the heretics' garments and armor into smithereens."
@@ -366,6 +377,18 @@
 		added_def = 2,\
 	)
 
+/obj/item/rogueweapon/knuckles/psydon/preblessed/ComponentInitialize()
+	AddComponent(\
+		/datum/component/silverbless,\
+		pre_blessed = BLESSING_PSYDONIAN,\
+		silver_type = SILVER_PSYDONIAN,\
+		added_force = 0,\
+		added_blade_int = 0,\
+		added_int = 50,\
+		added_def = 2,\
+	)
+
+
 /obj/item/rogueweapon/knuckles
 	name = "steel knuckles"
 	desc = "A mean looking pair of steel knuckles."

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

@@ -370,7 +370,7 @@
 /obj/item/rogueweapon/sword/short/psy/preblessed/ComponentInitialize()
 	AddComponent(\
 		/datum/component/silverbless,\
-		pre_blessed = BLESSING_NONE,\
+		pre_blessed = BLESSING_PSYDONIAN,\
 		silver_type = SILVER_PSYDONIAN,\
 		added_force = 0,\
 		added_blade_int = 100,\
@@ -937,6 +937,17 @@
 		added_def = 2,\
 	)
 
+/obj/item/rogueweapon/sword/long/psysword/preblessed/ComponentInitialize()
+	AddComponent(\
+		/datum/component/silverbless,\
+		pre_blessed = BLESSING_PSYDONIAN,\
+		silver_type = SILVER_PSYDONIAN,\
+		added_force = 0,\
+		added_blade_int = 100,\
+		added_int = 50,\
+		added_def = 2,\
+	)
+
 /obj/item/rogueweapon/sword/iron
 	name = "iron arming sword"
 	desc = "A long iron blade attached to a hilt, separated by a crossguard. The arming sword has been Psydonia's implement of war by excellence for generations, this one is cheaper than its steel brother."

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

@@ -145,3 +145,15 @@
 		added_int = 50,\
 		added_def = 2,\
 	)
+
+
+/obj/item/rogueweapon/whip/psywhip_lesser/preblessed/ComponentInitialize()
+	AddComponent(\
+		/datum/component/silverbless,\
+		pre_blessed = BLESSING_PSYDONIAN,\
+		silver_type = SILVER_PSYDONIAN,\
+		added_force = 0,\
+		added_blade_int = 0,\
+		added_int = 50,\
+		added_def = 2,\
+	)

code/game/objects/items/rogueweapons/ranged/firearms/arquebus.dm

@@ -38,3 +38,27 @@
 				return list("shrink" = 0.4,"sx" = -10,"sy" = -8,"nx" = 13,"ny" = -8,"wx" = -8,"wy" = -7,"ex" = 7,"ey" = -8,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 30,"sturn" = -30,"wturn" = -30,"eturn" = 30,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
 			if("onbelt")
 				return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
+
+
+
+/obj/item/gun/ballistic/firearm/arquebus_pistol/inquisitor
+	name = "Gastraphetes pistol"
+	desc = "A small smokepowder weapon, balanced for use in a single hand. \
+	Even with great power, men squabbled until the conclave smiths of Naledi relented, producing these in limited batches. \
+	This is an immeasurably rare example of such. A rare relic of few gifted to the Inquisition by the Naledians for their once offered aid. \
+	Decorated with psydonian silver modified for speed loading and a psycross chained around it's barrel the heretics shall not escape their chance at redemption."
+	icon_state = "pistol" //to do...get a custom sprite for this.
+	item_state = "pistol"
+	load_time = 25 //to do..think of something more intresting then just gun but better.
+
+	is_silver = TRUE
+/obj/item/gun/ballistic/firearm/arquebus_pistol/inquisitor/ComponentInitialize() //yes. Pistol whip a skeletion and set them ablaze in holy fire. Why not.
+	AddComponent(\
+		/datum/component/silverbless,\
+		pre_blessed = BLESSING_PSYDONIAN,\
+		silver_type = SILVER_PSYDONIAN,\
+		added_force = 0,\
+		added_blade_int = 0,\
+		added_int = 0,\
+		added_def = 2,\
+	)

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

@@ -52,6 +52,7 @@
 	subclass_stats = list(
 		STATKEY_CON = 7,
 		STATKEY_END = 3,
+		STATKEY_INT = 2,
 		STATKEY_SPD = -2
 	)
 
@@ -60,13 +61,14 @@
 		/datum/skill/misc/climbing = SKILL_LEVEL_EXPERT,
 		/datum/skill/misc/sewing = SKILL_LEVEL_JOURNEYMAN, // A hobbyist.
 		/datum/skill/misc/reading = SKILL_LEVEL_JOURNEYMAN,
-		/datum/skill/combat/unarmed = SKILL_LEVEL_NOVICE, // Parry things.
+		/datum/skill/combat/unarmed = SKILL_LEVEL_APPRENTICE, // Parry things.
+		/datum/skill/combat/wrestling = SKILL_LEVEL_APPRENTICE, //escape things, Best they could get is 13 str roundstart so...hopefully useless otherwise?
 		/datum/skill/misc/medicine = SKILL_LEVEL_JOURNEYMAN,
 		/datum/skill/craft/cooking = SKILL_LEVEL_JOURNEYMAN,
 		/datum/skill/labor/fishing = SKILL_LEVEL_JOURNEYMAN,
 		/datum/skill/misc/swimming = SKILL_LEVEL_JOURNEYMAN,
 		/datum/skill/craft/crafting = SKILL_LEVEL_JOURNEYMAN,
-		/datum/skill/magic/holy = SKILL_LEVEL_EXPERT, // Psydon's Holiest Guy
+		/datum/skill/magic/holy = SKILL_LEVEL_MASTER, // Psydon's Holiest Guy
 	)
 
 // REMEMBER FLAGELLANT? REMEMBER LASZLO? THIS IS HIM NOW. FEEL OLD YET?

code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/confessor.dm

@@ -84,6 +84,6 @@
 			H.equip_to_slot_or_del(new /obj/item/rogueweapon/mace/cudgel/psy/preblessed, SLOT_BELT_L, TRUE)
 			H.adjust_skillrank_up_to(/datum/skill/combat/maces, 4, TRUE)	
 		if("Dagger")
-			H.put_in_hands(new /obj/item/rogueweapon/huntingknife/idagger/silver/psydagger(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/huntingknife/idagger/silver/psydagger/preblessed(H), TRUE)
 			H.adjust_skillrank_up_to(/datum/skill/combat/knives, 4, TRUE)
 			H.equip_to_slot_or_del(new /obj/item/rogueweapon/scabbard/sheath, SLOT_BELT_L, TRUE)

code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/disciple.dm

@@ -74,7 +74,7 @@
 		if("MY BARE HANDS")
 			H.adjust_skillrank_up_to(/datum/skill/combat/unarmed, 5, TRUE)
 		if("Katar")
-			H.put_in_hands(new /obj/item/rogueweapon/katar/psydon(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/katar/psydon/preblessed(H), TRUE)
 		if("Knuckles")
-			H.put_in_hands(new /obj/item/rogueweapon/knuckles/psydon(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/knuckles/psydon.preblessed(H), TRUE)
 

code/modules/jobs/job_types/roguetown/Inquisition/orthoclasses/psydoniantemplar.dm

@@ -85,22 +85,22 @@
 	var/weapon_choice = input(H,"Choose your PSYDONIAN weapon.", "TAKE UP PSYDON'S ARMS") as anything in weapons
 	switch(weapon_choice)
 		if("Sword")
-			H.put_in_hands(new /obj/item/rogueweapon/sword/long/psysword(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/sword/long/psysword/preblessed(H), TRUE)
 			H.adjust_skillrank_up_to(/datum/skill/combat/swords, 4, TRUE)
 			H.put_in_hands(new /obj/item/rogueweapon/scabbard/sword(H), TRUE)
 		if("Axe")
-			H.put_in_hands(new /obj/item/rogueweapon/stoneaxe/battle/psyaxe(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/stoneaxe/battle/psyaxe/preblessed(H), TRUE)
 			H.adjust_skillrank_up_to(/datum/skill/combat/axes, 4, TRUE)
 		if("Whip")
-			H.put_in_hands(new /obj/item/rogueweapon/whip/psywhip_lesser(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/whip/psywhip_lesser/preblessed(H), TRUE)
 			H.adjust_skillrank_up_to(/datum/skill/combat/whipsflails, 4, TRUE)
 		if("Flail")
-			H.put_in_hands(new /obj/item/rogueweapon/flail/sflail/psyflail(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/flail/sflail/psyflail/preblessed(H), TRUE)
 			H.adjust_skillrank_up_to(/datum/skill/combat/whipsflails, 4, TRUE)
 		if("Mace")
-			H.put_in_hands(new /obj/item/rogueweapon/mace/goden/psymace(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/mace/goden/psymace/preblessed(H), TRUE)
 			H.adjust_skillrank_up_to(/datum/skill/combat/maces, 4, TRUE)
 		if("Spear")
-			H.put_in_hands(new /obj/item/rogueweapon/spear/psyspear(H), TRUE)
+			H.put_in_hands(new /obj/item/rogueweapon/spear/psyspear/preblessed(H), TRUE)
 			H.adjust_skillrank_up_to(/datum/skill/combat/polearms, 4, TRUE)
 

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

@@ -3,8 +3,8 @@
 	flag = ORTHODOXIST
 	department_flag = INQUISITION
 	faction = "Station"
-	total_positions = 3 // THREE GOONS!!
-	spawn_positions = 3
+	total_positions = 4 // THREE GOONS!! SCRATCH THAT. FOUR!! Since people keep adding more antags....antags that all gangbeat the goons.
+	spawn_positions = 4
 	allowed_races = RACES_SECOND_CLASS_UP
 	allowed_patrons = list(/datum/patron/old_god) //You MUST have a Psydonite character to start. Just so people don't get japed into Oops Suddenly Psydon!
 	tutorial = "Whether hand-picked by the Sovereignty of Otava or taken along through mere circumstance, you now serve as a loyal adherent to the Inquisitor's retinue. Descend into the darkness and - be it with a clenched fist or an opened palm - bring the inhumen towards the light: gift them salvation or damnation."

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

@@ -58,8 +58,10 @@
 		TRAIT_SILVER_BLESSED,
 		TRAIT_INQUISITION,
 		TRAIT_PERFECT_TRACKER,
+		TRAIT_SLEUTH,
 		TRAIT_PURITAN,
-		TRAIT_OUTLANDER
+		TRAIT_OUTLANDER,
+		TRAIT_FUSILIER,
 		)
 
 	subclass_stats = list(
@@ -80,6 +82,7 @@
 		/datum/skill/misc/climbing = SKILL_LEVEL_EXPERT,
 		/datum/skill/misc/athletics = SKILL_LEVEL_EXPERT,
 		/datum/skill/combat/firearms = SKILL_LEVEL_EXPERT,
+		/datum/skill/combat/crossbows = SKILL_LEVEL_EXPERT,
 		/datum/skill/combat/wrestling = SKILL_LEVEL_JOURNEYMAN,
 		/datum/skill/combat/unarmed = SKILL_LEVEL_JOURNEYMAN,
 		/datum/skill/misc/reading = SKILL_LEVEL_JOURNEYMAN,
@@ -102,7 +105,7 @@
 	shoes = /obj/item/clothing/shoes/roguetown/boots/otavan/inqboots
 	pants = /obj/item/clothing/under/roguetown/heavy_leather_pants/otavan
 	backr =  /obj/item/storage/backpack/rogue/satchel/otavan
-	beltr = /obj/item/gun/ballistic/firearm/arquebus_pistol
+	beltr = /obj/item/gun/ballistic/firearm/arquebus_pistol/inquisitor
 	head = /obj/item/clothing/head/roguetown/inqhat
 	mask = /obj/item/clothing/mask/rogue/spectacles/inq/spawnpair
 	gloves = /obj/item/clothing/gloves/roguetown/otavan/psygloves