diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm index f3b057d9f..2c218fabb 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm @@ -7,6 +7,7 @@ vampcompat = FALSE outfit = /datum/outfit/job/roguetown/adventurer/cleric category_tags = list(CTAG_ADVENTURER) + cmode_music = 'sound/music/combat_church.ogg' /datum/outfit/job/roguetown/adventurer/cleric allowed_patrons = ALL_PATRONS diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm index 9beff3122..fa873d77a 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm @@ -8,6 +8,7 @@ outfit = /datum/outfit/job/roguetown/adventurer/paladin traits_applied = list(TRAIT_HEAVYARMOR) category_tags = list(CTAG_ADVENTURER) + cmode_music = 'sound/music/combat_church.ogg' /datum/outfit/job/roguetown/adventurer/paladin allowed_patrons = ALL_PALADIN_PATRONS diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm index 7c8f0c155..282c08667 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm @@ -4,7 +4,7 @@ allowed_races = RACES_ALL_KINDS outfit = /datum/outfit/job/roguetown/adventurer/crusader traits_applied = list(TRAIT_HEAVYARMOR, TRAIT_MEDIUMARMOR) - + cmode_music = 'sound/music/combat_church.ogg' maximum_possible_slots = 1 // Disabled Role tutorial = "The crusaders... Knights who have pledged \ diff --git a/code/modules/jobs/job_types/roguetown/church/confessor.dm b/code/modules/jobs/job_types/roguetown/church/confessor.dm index 5cf2b74e4..f303cc03d 100644 --- a/code/modules/jobs/job_types/roguetown/church/confessor.dm +++ b/code/modules/jobs/job_types/roguetown/church/confessor.dm @@ -17,6 +17,7 @@ give_bank_account = 3 min_pq = 0 max_pq = null + cmode_music = 'sound/music/combat_church.ogg' /datum/outfit/job/roguetown/shepherd name = "Confessor" diff --git a/code/modules/jobs/job_types/roguetown/church/druid.dm b/code/modules/jobs/job_types/roguetown/church/druid.dm index 66aa78763..61446ec99 100644 --- a/code/modules/jobs/job_types/roguetown/church/druid.dm +++ b/code/modules/jobs/job_types/roguetown/church/druid.dm @@ -18,6 +18,7 @@ min_pq = 0 max_pq = null round_contrib_points = 2 + cmode_music = 'sound/music/combat_church.ogg' /datum/outfit/job/roguetown/druid name = "Druid" diff --git a/code/modules/jobs/job_types/roguetown/church/monk.dm b/code/modules/jobs/job_types/roguetown/church/monk.dm index 765f756b5..d2d2066be 100644 --- a/code/modules/jobs/job_types/roguetown/church/monk.dm +++ b/code/modules/jobs/job_types/roguetown/church/monk.dm @@ -17,6 +17,7 @@ min_pq = 1 //A step above Churchling, should funnel new players to the churchling role to learn miracles at a more sedate pace max_pq = null round_contrib_points = 2 + cmode_music = 'sound/music/combat_church.ogg' /datum/outfit/job/roguetown/monk name = "Acolyte" diff --git a/code/modules/jobs/job_types/roguetown/church/mortician.dm b/code/modules/jobs/job_types/roguetown/church/mortician.dm index bc4247145..767f883bc 100644 --- a/code/modules/jobs/job_types/roguetown/church/mortician.dm +++ b/code/modules/jobs/job_types/roguetown/church/mortician.dm @@ -16,6 +16,7 @@ give_bank_account = TRUE min_pq = 0 max_pq = null + cmode_music = 'sound/music/combat_church.ogg' /datum/outfit/job/roguetown/undertaker allowed_patrons = list(/datum/patron/divine/necra) diff --git a/code/modules/jobs/job_types/roguetown/church/priest.dm b/code/modules/jobs/job_types/roguetown/church/priest.dm index 44b843684..f06f747d0 100644 --- a/code/modules/jobs/job_types/roguetown/church/priest.dm +++ b/code/modules/jobs/job_types/roguetown/church/priest.dm @@ -13,7 +13,8 @@ allowed_sexes = list(MALE, FEMALE) tutorial = "The Divine is all that matters in a world of the immoral. The Weeping God left his children to rule over us mortals--and you will preach their wisdom to any who still heed their will. The faithless are growing in number. It is up to you to shepard them toward a Gods-fearing future; for you are a priest of Astrata." whitelist_req = FALSE - + cmode_music = 'sound/music/combat_church.ogg' + spells = list(/obj/effect/proc_holder/spell/invoked/cure_rot, /obj/effect/proc_holder/spell/self/convertrole/templar, /obj/effect/proc_holder/spell/self/convertrole/monk) outfit = /datum/outfit/job/roguetown/priest diff --git a/code/modules/jobs/job_types/roguetown/church/puritan.dm b/code/modules/jobs/job_types/roguetown/church/puritan.dm index 6e3cc8e29..891b94d49 100644 --- a/code/modules/jobs/job_types/roguetown/church/puritan.dm +++ b/code/modules/jobs/job_types/roguetown/church/puritan.dm @@ -20,6 +20,7 @@ min_pq = 6 //Only for those bold of spirit, sure of mind, hard of pintle...and should probably know Psydon from Zizo. Not a crucial role, and rather prone to people instigating excessive conflict max_pq = null round_contrib_points = 2 + cmode_music = 'sound/music/combat_church.ogg' /datum/job/roguetown/puritan/after_spawn(mob/living/L, mob/M, latejoin = TRUE) ..() diff --git a/code/modules/jobs/job_types/roguetown/church/templar.dm b/code/modules/jobs/job_types/roguetown/church/templar.dm index 82700588e..c4a3295f6 100644 --- a/code/modules/jobs/job_types/roguetown/church/templar.dm +++ b/code/modules/jobs/job_types/roguetown/church/templar.dm @@ -16,7 +16,7 @@ spawn_positions = 3 advclass_cat_rolls = list(CTAG_TEMPLAR = 20) display_order = JDO_TEMPLAR - + cmode_music = 'sound/music/combat_church.ogg' give_bank_account = TRUE /datum/outfit/job/roguetown/templar diff --git a/code/modules/jobs/job_types/roguetown/youngfolk/churchling.dm b/code/modules/jobs/job_types/roguetown/youngfolk/churchling.dm index 45c7a33ec..ff43afe99 100644 --- a/code/modules/jobs/job_types/roguetown/youngfolk/churchling.dm +++ b/code/modules/jobs/job_types/roguetown/youngfolk/churchling.dm @@ -18,6 +18,7 @@ min_pq = -10 max_pq = null round_contrib_points = 2 + cmode_music = 'sound/music/combat_church.ogg' /datum/outfit/job/roguetown/churchling/pre_equip(mob/living/carbon/human/H) ..() diff --git a/sound/music/combat_church.ogg b/sound/music/combat_church.ogg new file mode 100644 index 000000000..8bb98a844 Binary files /dev/null and b/sound/music/combat_church.ogg differ