Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Church Cmusic #114

Merged
merged 1 commit into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/church/confessor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/church/druid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/church/monk.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/church/mortician.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion code/modules/jobs/job_types/roguetown/church/priest.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/church/puritan.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/church/templar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
Binary file added sound/music/combat_church.ogg
Binary file not shown.
Loading