[WIP] Job Patron/Race Restriction Fixes

code/__DEFINES/species/_species.dm

@@ -174,6 +174,7 @@
 	SPEC_ID_HALF_ELF,\
 	SPEC_ID_DROW,\
 	SPEC_ID_HALF_DROW,\
+	SPEC_ID_TIEFLING,\
 )
 
 /// Elves and Half-Elves
@@ -251,10 +252,13 @@
 	SPEC_ID_HUMEN,\
 	SPEC_ID_ELF,\
 	SPEC_ID_HALF_ELF,\
+	SPEC_ID_DROW,\
+	SPEC_ID_HALF_DROW,\
 	SPEC_ID_DWARF,\
 	SPEC_ID_AASIMAR,\
 	SPEC_ID_TRITON,\
 	SPEC_ID_HOLLOWKIN,\
+	SPEC_ID_HALF_ORC,\
 )
 
 /// Foreigner Nobility Species - No Tiefling (you know why) or hollow-kin or medicators (too young to have nobles mayhaps)
@@ -282,7 +286,8 @@
 /// Species who are heretical to the church.
 #define RACES_PLAYER_HERETICAL_RACE list(\
 	SPEC_ID_TIEFLING,\
-	SPEC_ID_HALF_ORC,\
+	SPEC_ID_ORC,\
+	SPEC_ID_ZIZOMBIE,\
 )
 
 /// Species that use the base human body, adjusted or otherwise

code/datums/faith/_devotion.dm

@@ -163,9 +163,9 @@
 
 /datum/devotion/proc/make_gmtemplar()
 	devotion = 150
-	max_devotion = 350
-	progression = CLERIC_REQ_3
-	max_progression = CLERIC_REQ_3
+	max_devotion = 350 //Angros is dead/dying, so your connection to the divine is tenuous
+	progression = CLERIC_REQ_1
+	max_progression = CLERIC_REQ_2
 	devotion_class = DEVOTION_CLASS_GRANDMASTER
 
 /datum/devotion/proc/make_templar()

code/datums/faith/devotion_subtypes.dm

@@ -56,10 +56,10 @@
 
 /datum/devotion/divine/mjallidhorn
 	miracles = list(
-		CLERIC_T0 = list(/datum/action/cooldown/spell/healing, /datum/action/cooldown/spell/undirected/conjure_item/summon_leech),
-		CLERIC_T1 = /datum/action/cooldown/spell/projectile/swordfish,
-		CLERIC_T2 = /datum/action/cooldown/spell/undirected/conjure_item/summon_trident/miracle,
-		CLERIC_T3 = /datum/action/cooldown/spell/ocean_embrace,
+		CLERIC_T0 = /datum/action/cooldown/spell/healing,
+		CLERIC_T1 = /datum/action/cooldown/spell/undirected/call_to_arms,
+		CLERIC_T2 = /datum/action/cooldown/spell/undirected/divine_strike,
+		CLERIC_T3 = /datum/action/cooldown/spell/persistence,
 	)
 	viable_tasks = list(
 		/datum/devotion_task/mjallidhorn_sail,
@@ -83,9 +83,9 @@
 /datum/devotion/divine/mordsol
 	miracles = list(
 		CLERIC_T0 = /datum/action/cooldown/spell/healing,
-		CLERIC_T1 = /datum/action/cooldown/spell/undirected/call_to_arms,
-		CLERIC_T2 = /datum/action/cooldown/spell/undirected/divine_strike,
-		CLERIC_T3 = /datum/action/cooldown/spell/persistence,
+		CLERIC_T1 = /datum/action/cooldown/spell/projectile/swordfish,
+		CLERIC_T2 = /datum/action/cooldown/spell/undirected/conjure_item/summon_trident/miracle,
+		CLERIC_T3 = /datum/action/cooldown/spell/ocean_embrace,
 	)
 	traits = list(TRAIT_DIVINE_SERVANT)
 
@@ -148,11 +148,12 @@
 
 /datum/devotion/divine/angros
 	miracles = list(
-		CLERIC_T0 = /datum/action/cooldown/spell/healing,
-		CLERIC_T1 = /datum/action/cooldown/spell/sacred_flame,
-		CLERIC_T2 = /datum/action/cooldown/spell/healing/greater,
-		CLERIC_T3 = /datum/action/cooldown/spell/revive,
+		CLERIC_T0 = list(/datum/action/cooldown/spell/sacred_flame, /datum/action/cooldown/spell/undirected/angrosrespite),
+		CLERIC_T1 = /datum/action/cooldown/spell/angrosendure,
+		CLERIC_T2 = /datum/action/cooldown/spell/angroslux_tamper,
+		CLERIC_T3 = /datum/action/cooldown/spell/angrosabsolve,
 	)
+	traits = list(TRAIT_DIVINE_SERVANT)
 
 // Inhumen
 /datum/devotion/inhumen/make_cleric()

code/modules/jobs/job_types/church/gmtemplar.dm

@@ -19,7 +19,7 @@
 
 /datum/job/gmtemplar
 	title = JOB_GRANDMASTER_TEMPLAR
-	tutorial = "The most veteran of the Templars within the church employ. A survivor of some unknowable old conflict, given seniority and great respect among their peers."
+	tutorial = "Sent from the Worldflame Island, a faithful of Angros, an ashen Templar; you are a Martyr. You do not lead the Templars, that task falls to the Bishop. Nae; your task is to safeguard the Church and its people therein, sacrificing your very life for them if need be. Embody your dying god, and burn yourself up for the sake of others 'til naught but ash remains."
 	department_flag = CHURCHMEN
 	job_flags = (JOB_ANNOUNCE_ARRIVAL | JOB_SHOW_IN_CREDITS | JOB_EQUIP_RANK | JOB_NEW_PLAYER_JOINABLE)
 	display_order = JDO_GMTEMPLAR
@@ -29,8 +29,8 @@
 	bypass_lastclass = TRUE
 	cmode_music = 'sound/music/cmode/church/CombatRavox.ogg'
 
-	allowed_races = RACES_PLAYER_NONDISCRIMINATED
-	allowed_patrons = list(/datum/patron/divine/mordsol)
+	allowed_races = RACES_TEMPLAR
+	allowed_patrons = list(/datum/patron/angros)
 
 	outfit = /datum/outfit/gmtemplar
 	give_bank_account = 0
@@ -43,7 +43,7 @@
 		EXP_TYPE_CHURCH = 900,
 		EXP_TYPE_COMBAT = 900
 	)
-	honorary = "Grandmaster"
+	honorary = "Martyr"
 
 	attribute_sheet = /datum/attribute_holder/sheet/job/gmtemplar
 
@@ -75,22 +75,22 @@
 		"Mace" = /obj/item/weapon/mace/goden/steel/grandmaster,
 	)
 
-	spawned.select_equippable(player_client, selectableweapon, message = "Choose thy blade", title = "GRANDMASTER")
+	spawned.select_equippable(player_client, selectableweapon, message = "Choose thy blade", title = "MARTYR")
 
 	var/static/list/selectablehelm = list(
 		"Armet" = /obj/item/clothing/head/helmet/visored/silver/armet,
 		"Bascinet" = /obj/item/clothing/head/helmet/visored/silver,
 	)
 
-	spawned.select_equippable(player_client, selectablehelm, message = "Choose thy helm", title = "GRANDMASTER")
+	spawned.select_equippable(player_client, selectablehelm, message = "Choose thy helm", title = "MARTYR")
 
 	var/static/list/selectablecloak = list(
 		"Cloak" = /obj/item/clothing/cloak/pantheon,
 		"Tabard" = /obj/item/clothing/cloak/templar/undivided,
 		"Jupon" = /obj/item/clothing/cloak/silktabard
 	)
 
-	spawned.select_equippable(player_client, selectablecloak, message = "Choose thy overcoat", title = "GRANDMASTER")
+	spawned.select_equippable(player_client, selectablecloak, message = "Choose thy overcoat", title = "MARTYR")
 
 /datum/outfit/gmtemplar
 	name = JOB_GRANDMASTER_TEMPLAR
@@ -104,7 +104,7 @@
 	belt = /obj/item/storage/belt/leather/black
 	ring = /obj/item/clothing/ring/silver/rontz
 	gloves = /obj/item/clothing/gloves/plate/silver
-	wrists = /obj/item/clothing/neck/psycross/silver/divine/mordsol
+	wrists = /obj/item/clothing/neck/psycross/gold
 
 
 

code/modules/jobs/job_types/inquistion/absolver.dm

@@ -24,9 +24,8 @@
 	total_positions = 1 // THE ONE.
 	spawn_positions = 1
 	allowed_races = list(SPEC_ID_HUMEN)
-	//You MUST have a Angrosian character to start. Just so people don't get japed into Oops Suddenly Angros!
-	allowed_patrons = list(/datum/patron/angros)
-	tutorial = "The Oratorium claims you are naught more than a 'cleric', but you know the truth; you are a sacrificial lamb. Your hands, unmarred through prayer and pacifism, have been gifted with the power to manipulate blood - to siphon away the wounds of others, so that you may endure in their stead. Let your censer's light shepherd the Inquisitor's retinue forth, lest they're led astray by wrath and temptation."
+	allowed_patrons = list(/datum/patron/divine/centrist)
+	tutorial = "The Inquisitor's right hand, you serve as the orthidoxy's cleric, providing miracles to bolster "
 	selection_color = JCOLOR_INQUISITION
 	outfit = /datum/outfit/absolver
 	bypass_lastclass = TRUE
@@ -42,14 +41,11 @@
 	)
 	traits = list(
 		TRAIT_NOPAINSTUN,
-		TRAIT_PACIFISM,
 		TRAIT_EMPATH,
 		TRAIT_CRITICAL_RESISTANCE,
 		TRAIT_STEELHEARTED,
 		TRAIT_INQUISITION,
 		TRAIT_SILVER_BLESSED,
-		TRAIT_ANGROSIAN_GRIT,
-		TRAIT_ANGROSIAN,
 		TRAIT_FOREIGNER,
 	)
 
@@ -81,7 +77,7 @@
 	spawned.hud_used?.shutdown_bloodpool()
 	spawned.hud_used?.initialize_bloodpool()
 	spawned.hud_used?.bloodpool.set_fill_color("#dcdddb")
-	spawned.hud_used?.bloodpool?.name = "Angros's Grace: [spawned.bloodpool]"
+	spawned.hud_used?.bloodpool?.name = "Aspects' Grace: [spawned.bloodpool]"
 	spawned.hud_used?.bloodpool?.desc = "Devotion: [spawned.bloodpool]/[spawned.maxbloodpool]"
 	spawned.maxbloodpool = 1000
 

code/modules/jobs/job_types/inquistion/adept.dm

@@ -2,18 +2,18 @@
 	title = JOB_ADEPT
 	tutorial = "You were a convicted criminal, the lowest scum of Domotan. \
 	Your master, the Inquisitor, saved you from the gallows \
-	and has given you true purpose in service to Angros. \
-	You will not let him down."
+	and has given you true purpose in service to the Elemental Aspects. \
+	You will not let them down."
 	department_flag = INQUISITION
 	job_flags = (JOB_ANNOUNCE_ARRIVAL | JOB_SHOW_IN_CREDITS | JOB_EQUIP_RANK | JOB_NEW_PLAYER_JOINABLE)
 	display_order = JDO_SHEPHERD
 	selection_color = JCOLOR_INQUISITION
 	faction = FACTION_TOWN
-	total_positions = 1
-	spawn_positions = 1
+	total_positions = 99
+	spawn_positions = 99
 	bypass_lastclass = TRUE
 
-	allowed_patrons = list(/datum/patron/angros, /datum/patron/angros/extremist)
+	allowed_patrons = /datum/patron/divine/centrist
 	allowed_races = RACES_PLAYER_ALL
 
 	outfit = /datum/outfit/adept

code/modules/jobs/job_types/inquistion/inquisitor.dm

@@ -1,21 +1,18 @@
 /datum/job/inquisitor
 	title = JOB_PRAFEKT
-	f_title = "Frau Prefect"
+	f_title = "Inquisitrix"
 	department_flag = INQUISITION
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
 	job_flags = (JOB_ANNOUNCE_ARRIVAL | JOB_SHOW_IN_CREDITS | JOB_EQUIP_RANK | JOB_NEW_PLAYER_JOINABLE)
 	allowed_sexes = list(MALE, FEMALE)
-	allowed_races = list(\
-		SPEC_ID_HUMEN,\
-		SPEC_ID_DWARF,\
-	)
-	honorary = "Prefect"
-	honorary_f = "Frau Prefect"
-	//You MUST have a Angrosian character to start. Just so people don't get japed into Oops Suddenly Angros!
-	allowed_patrons = list(/datum/patron/angros) // you have to keep the official church stance, no way an extremist angrosian could become inquisitor
-	tutorial = "This is the week. All your lessons have led to this moment. Your students follow you with eager steps and breathless anticipation. You’re to observe their hunt, and see if they can banish the evils haunting Gaia, and rise up to become true inquisitors. A guide to them, a monster to others. You are the thing that goes bump in the night."
+	allowed_races = RACES_TEMPLAR
+	honorary = "Inquisitor"
+	honorary_f = "Inquisitrix"
+	//You MUST have a Elementalist character to start. Just so people don't get japed into Oops Suddenly Elementalist!
+	allowed_patrons = list(/datum/patron/divine/centrist) // you have to keep the univeralist church stance, so you don't favour one patron more
+	tutorial = "You have been sent by the High Bishop of the Katholikos, leader of a radical denomination of the One Church that only believes in the endurance of the All-Aspect, and the security of the Elemental Pantheon. Officially, you are here on diplomatic business. Unofficially, you work to cast out the sinners from God's house. Heresy of all kinds must be corrected; from heretics that stray too far from doctrine, to poisoned fools that worship devils. The locals fear but respect you due to your ability to fight the demonic, and Etgard's royalty tolerates you due to your aligned goals against the demonic... but it is probably best to not let them peer too closely. Remember, you work alongside the Church, and do not order their number around. Though your work is sometimes separate to the main Church, you are subservient to the Bishop of Domotan."
 	cmode_music = 'sound/music/cmode/church/CombatInquisitor.ogg'
 	selection_color = JCOLOR_INQUISITION
 	allowed_ages = list(AGE_MIDDLEAGED, AGE_OLD)
@@ -57,7 +54,7 @@
 	spawned.hud_used?.shutdown_bloodpool()
 	spawned.hud_used?.initialize_bloodpool()
 	spawned.hud_used?.bloodpool.set_fill_color("#dcdddb")
-	spawned.hud_used?.bloodpool?.name = "Angros's Grace: [spawned.bloodpool]"
+	spawned.hud_used?.bloodpool?.name = "Aspects' Grace: [spawned.bloodpool]"
 	spawned.hud_used?.bloodpool?.desc = "Devotion: [spawned.bloodpool]/[spawned.maxbloodpool]"
 	spawned.maxbloodpool = 1000
 
@@ -304,12 +301,12 @@
 			var/datum/patron/interrogator_patron = interrogator.patron
 			var/datum/patron/victim_patron = patron
 			switch(interrogator_patron.associated_faith.type)
-				if(/datum/faith/angros)
-					if(ispath(victim_patron.type, /datum/patron/divine) && victim_patron.type != /datum/patron/divine/valdala)
+				if(/datum/faith/divine_pantheon)
+					if(ispath(victim_patron.type, /datum/patron/divine))
 						interrogator.add_stress(/datum/stress_event/torture_small_penalty)
 					else if(victim_patron.type == /datum/patron/godless/naivety)
 						interrogator.add_stress(/datum/stress_event/torture_small_penalty)
-					else if(istype(victim_patron, /datum/patron/angros))
+					else if(istype(victim_patron, /datum/patron/divine/centrist))
 						interrogator.add_stress(/datum/stress_event/torture_large_penalty)
 
 		if(length(confessions))
@@ -342,7 +339,7 @@
 						held_confession.bad_type = "AN OUTLAW OF THE THIEF-LORD"
 						held_confession.antag = initial(antag_type:name)
 					if(/datum/patron/inhumen/deceivers)
-						held_confession.bad_type = "A FOLLOWER OF THE THIEF-LORD"
+						held_confession.bad_type = "A FOLLOWER OF THE DECEIVERS"
 						held_confession.antag = "worshiper of " + initial(antag_type:name)
 					if(/datum/antagonist/maniac)
 						held_confession.bad_type = "A MANIAC DELUDED BY MADNESS"
@@ -363,16 +360,16 @@
 						var/datum/antagonist/werewolf/werewolf_antag = mind.has_antag_datum(/datum/antagonist/werewolf, TRUE)
 						if(werewolf_antag.transformed)
 							return
-						held_confession.bad_type = "A BEARER OF GANI'S CURSE"
+						held_confession.bad_type = "A BEARER OF ERDL'S CURSE"
 						held_confession.antag = initial(antag_type:name)
 					if(/datum/antagonist/werewolf/lesser)
 						var/datum/antagonist/werewolf/werewolf_antag = mind.has_antag_datum(/datum/antagonist/werewolf, TRUE)
 						if(werewolf_antag.transformed)
 							return
-						held_confession.bad_type = "A BEARER OF GANI'S CURSE"
+						held_confession.bad_type = "A BEARER OF ERDL'S CURSE"
 						held_confession.antag = initial(antag_type:name)
 					if(/datum/antagonist/vampire)
-						held_confession.bad_type = "A SCION OF KAINE"
+						held_confession.bad_type = "A SERVANT TO THE THIRST"
 						held_confession.antag = initial(antag_type:name)
 					if(/datum/antagonist/vampire/lord)
 						held_confession.bad_type = "THE BLOOD-LORD OF THE WILD PLACES"
@@ -384,7 +381,7 @@
 						held_confession.bad_type = "AN UNDERLING OF THE BLOOD-LORD"
 						held_confession.antag = initial(antag_type:name)
 					if(/datum/patron/inhumen/archdevils)
-						held_confession.bad_type = "A FOLLOWER OF THE DARK SUN"
+						held_confession.bad_type = "A WORSHIPPER OF THE DAEMONIC"
 						held_confession.antag = "worshiper of " + initial(antag_type:name)
 					if(/datum/patron/godless/godless)
 						held_confession.bad_type = "A DAMNED ANTI-THEIST"

code/modules/jobs/job_types/inquistion/orthodoxist.dm

@@ -2,16 +2,16 @@
 	title = JOB_SACRESTANTS
 	department_flag = INQUISITION
 	faction = "Station"
-	total_positions = 2 // TWO GOONS!!
-	spawn_positions = 2
+	total_positions = 99
+	spawn_positions = 99
 	allowed_races = list(SPEC_ID_HUMEN, SPEC_ID_DWARF)
 	bypass_lastclass = TRUE
 	cmode_music = 'sound/music/cmode/church/CombatInquisitor2.ogg'
 	allowed_patrons = list(
-		/datum/patron/angros
-	) // no extremist angros because you've been brought up right
+		/datum/patron/divine/centrist
+	)
 
-	tutorial = "A student of the Oratorium in training to become a full Inquisitor. You’ve come here under the stern gaze of the Herr Präfekt to prove your wits and skill. This is your week. You’re going to take your place among the blades of Angros."
+	tutorial = "A fervent believer in the cause of the Inquisition. Recruited by the Inquisitor to further the Katholikos' goal in the locale."
 	selection_color = JCOLOR_INQUISITION
 
 	outfit = null
@@ -47,7 +47,7 @@
 	spawned.hud_used?.shutdown_bloodpool()
 	spawned.hud_used?.initialize_bloodpool()
 	spawned.hud_used?.bloodpool.set_fill_color("#dcdddb")
-	spawned.hud_used?.bloodpool?.name = "Angros' Grace: [spawned.bloodpool]"
+	spawned.hud_used?.bloodpool?.name = "Aspects' Grace: [spawned.bloodpool]"
 	spawned.hud_used?.bloodpool?.desc = "Devotion: [spawned.bloodpool]/[spawned.maxbloodpool]"
 	spawned.maxbloodpool = 1000