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.

Sign up for GitHub

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

Templar Fix 2 #89

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Templar Fix 2 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/controllers/subsystem/rogue/devotion.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@

var/list/spelllist = list(/obj/effect/proc_holder/spell/targeted/touch/orison, patron.t0)
if(istype(patron,/datum/patron/divine))
spelllist += /obj/effect/proc_holder/spell/targeted/abrogation
spelllist += /obj/effect/proc_holder/spell/targeted/churn
for(var/spell_type in spelllist)
if(!spell_type || H.mind.has_spell(spell_type))
continue
Expand Down
10 changes: 5 additions & 5 deletions code/datums/gods/patrons/divine_pantheon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@
desc = "Goddess that blessed many a saint with healing hands, Pestra taught man the arts of medicine and its benefits."
worshippers = "The Sick, Phyicians, Apothecaries"
mob_traits = list(TRAIT_EMPATH, TRAIT_ROT_EATER)
t0 = list(/obj/effect/proc_holder/spell/invoked/diagnose)
t1 = list(/obj/effect/proc_holder/spell/invoked/lesser_heal)
t2 = list(/obj/effect/proc_holder/spell/invoked/heal)
t3 = list(/obj/effect/proc_holder/spell/invoked/attach_bodypart)
t4 = list(/obj/effect/proc_holder/spell/invoked/cure_rot)
t0 = /obj/effect/proc_holder/spell/invoked/diagnose
t1 = /obj/effect/proc_holder/spell/invoked/lesser_heal
t2 = /obj/effect/proc_holder/spell/invoked/heal
t3 = /obj/effect/proc_holder/spell/invoked/attach_bodypart
t4 = /obj/effect/proc_holder/spell/invoked/cure_rot
confess_lines = list(
"PESTRA SOOTHES ALL ILLS!",
"DECAY IS A CONTINUATION OF LIFE!",
Expand Down
6 changes: 3 additions & 3 deletions code/modules/jobs/job_types/roguetown/church/templar.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,13 @@
var/weapon_choice = input(H,"Choose your weapon.", "TAKE UP ARMS") as anything in weapons
switch(weapon_choice)
if("Bastard Sword")
H.put_in_hands(new /obj/item/rogueweapon/sword/long, TRUE)
r_hand = /obj/item/rogueweapon/sword/long
H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE)
if("Flail")
H.put_in_hands(new /obj/item/rogueweapon/flail, TRUE)
r_hand = /obj/item/rogueweapon/flail
H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE)
if("Mace")
H.put_in_hands(new /obj/item/rogueweapon/mace, TRUE)
r_hand = /obj/item/rogueweapon/mace
H.mind.adjust_skillrank(/datum/skill/combat/maces, 1, TRUE)


Expand Down