Skip to content

Commit

Permalink
acolytefix (#195)
Browse files Browse the repository at this point in the history
* acolytefix

* Update feldsher.dm
  • Loading branch information
Animusin authored Jan 1, 2025
1 parent c06ee39 commit 437ddde
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 11 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/roguetown.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#define ALL_PLAYER_RACES_BY_NAME list("Humen", "Half-Elf", "Dark Elf", "Elf", "Dwarf","Tiefling", "Aasimar")

#define ALL_TEMPLE_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/eora, /datum/patron/divine/pestra, /datum/patron/divine/malum)
#define ALL_TEMPLE_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/eora, /datum/patron/divine/pestra, /datum/patron/divine/malum, /datum/patron/divine/necra, /datum/patron/divine/dendor)
#define ALL_CLERIC_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/eora, /datum/patron/divine/necra, /datum/patron/divine/pestra, /datum/patron/divine/dendor, /datum/patron/divine/malum)
#define ALL_TEMPLAR_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/eora, /datum/patron/divine/necra, /datum/patron/divine/pestra, /datum/patron/divine/malum)

Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/nobility/feldsher.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
allowed_races = list(
"Humen",
"Elf",
"Dark Elf",
"Half-Elf",
"Dwarf",
"Aasimar"
Expand Down
13 changes: 13 additions & 0 deletions code/modules/jobs/job_types/roguetown/temple/acolyte.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,19 @@
pants = /obj/item/clothing/under/roguetown/tights/red
shoes = /obj/item/clothing/shoes/roguetown/boots
armor = /obj/item/clothing/suit/roguetown/shirt/robe/malum
if("Necra")
head = /obj/item/clothing/head/roguetown/padded/deathshroud
neck = /obj/item/clothing/neck/roguetown/psycross/silver/necra
pants = /obj/item/clothing/under/roguetown/trou/leather/mourning
armor = /obj/item/clothing/suit/roguetown/shirt/robe/necra
shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt
shoes = /obj/item/clothing/shoes/roguetown/sandals
if("Dendor")
head = /obj/item/clothing/head/roguetown/antlerhood
neck = /obj/item/clothing/neck/roguetown/coif
cloak = /obj/item/clothing/cloak/raincloak/furcloak
neck = /obj/item/clothing/neck/roguetown/psycross/silver/dendor
beltr = /obj/item/rogueweapon/knife/stone
else // Failsafe
head = /obj/item/clothing/head/roguetown/roguehood/random
neck = /obj/item/clothing/neck/roguetown/psycross/silver
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/dead/new_player/new_player.dm
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,8 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt"))
return JOB_UNAVAILABLE_GENERIC
if(length(job.allowed_races) && !(client.prefs.pref_species.name in job.allowed_races))
return JOB_UNAVAILABLE_RACE
/* if(length(job.allowed_patrons) && !(client.prefs.selected_patron.type in job.allowed_patrons))
return JOB_UNAVAILABLE_PATRON */
if(length(job.allowed_patrons) && !(client.prefs.selected_patron.type in job.allowed_patrons))
return JOB_UNAVAILABLE_PATRON
if(job.plevel_req > client.patreonlevel())
testing("PATREONLEVEL [client.patreonlevel()] req [job.plevel_req]")
return JOB_UNAVAILABLE_GENERIC
Expand Down
10 changes: 5 additions & 5 deletions code/modules/spells/roguetown/acolyte/dendor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
overlay_state = "blesscrop"
releasedrain = 30
charge_max = 30 SECONDS
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver/dendor)
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver)
max_targets = 0
cast_without_targets = TRUE
sound = 'sound/magic/churn.ogg'
Expand Down Expand Up @@ -49,7 +49,7 @@
desc = "Grants the Dendorite a keen sense of smell and excellent vision, to better hunt with."
overlay_state = "bestialsense"
charge_max = 12 MINUTES
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver/dendor)
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver)
invocation = "Beast-Lord, lend me the eyes of the zad, the nose of the volf."
invocation_type = "whisper"
cooldown_min = 10 MINUTES
Expand Down Expand Up @@ -78,7 +78,7 @@
overlay_state = "tamebeast"
releasedrain = 30
charge_max = 6 MINUTES
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver/dendor)
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver)
max_targets = 0
cast_without_targets = TRUE
sound = 'sound/magic/churn.ogg'
Expand Down Expand Up @@ -113,7 +113,7 @@
cast_without_targets = TRUE
sound = 'sound/items/dig_shovel.ogg'
associated_skill = /datum/skill/magic/holy
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver/dendor)
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver)
invocation = "Treefather light the way."
invocation_type = "whisper" //can be none, whisper, emote and shout
miracle = TRUE
Expand Down Expand Up @@ -159,7 +159,7 @@
desc = "Borrow power from the Troll, his favored beast."
overlay_state = "trollshape"
charge_max = 30 MINUTES // cast once every 30 minutes, lasts for 3 minutes
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver/dendor)
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver)
invocation = "DENDOR LEND ME YOUR POWER!!"
invocation_type = "shout"
cooldown_min = 25 MINUTES
Expand Down
4 changes: 2 additions & 2 deletions code/modules/spells/roguetown/acolyte/eora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
range = 7
overlay_state = "love"
sound = list('sound/magic/magnet.ogg')
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver/eora)
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver)
releasedrain = 40
chargetime = 60
warnie = "spellwarning"
Expand Down Expand Up @@ -37,7 +37,7 @@
warnie = "sydwarning"
movement_interrupt = FALSE
chargedloop = null
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver/eora)
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver)
sound = 'sound/magic/whiteflame.ogg'
associated_skill = /datum/skill/magic/holy
antimagic_allowed = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/spells/roguetown/acolyte/necra.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
overlay_state = "speakwithdead"
releasedrain = 30
charge_max = 30 SECONDS
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver/necra)
req_items = list(/obj/item/clothing/neck/roguetown/psycross/silver)
max_targets = 0
cast_without_targets = TRUE
sound = 'sound/magic/churn.ogg'
Expand Down

0 comments on commit 437ddde

Please sign in to comment.