Skip to content

Re-Adds Obeah (And Valeren because Nimi)#686

Closed
XeonMations wants to merge 50 commits intoDarkPack13:masterfrom
XeonMations:obeah
Closed

Re-Adds Obeah (And Valeren because Nimi)#686
XeonMations wants to merge 50 commits intoDarkPack13:masterfrom
XeonMations:obeah

Conversation

@XeonMations
Copy link
Copy Markdown
Collaborator

@XeonMations XeonMations commented Feb 19, 2026

About The Pull Request

Saluri healer discipline.

Armor of Caine's Fury
https://buffybox.thefinalnights.com/game/armorofcaine.mp4

Uses signals to modify incoming damage, rather than the fortitude armor datums (which I could not verify even work)

Why It's Good For The Game

Changelog

🆑
add: Adds Obeah
add: @buffyuwu Adds Valeren
/:cl:

Comment thread code/__DEFINES/~darkpack/traits/macros.dm
Comment thread modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 4, 2026

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~7 days. Please address any outstanding review items and ensure your PR is finished - if both are true, and you have auto-staled anyway, you need to actively ask maintainers (by pinging them in the /tg/station Discord) to (re)review or merge your PR. If no maintainer responds to your request, you may wish to close this PR yourself while you seek maintainer comment, as you will later be able to reopen the PR yourself.

@github-actions github-actions Bot added the Stale label Mar 4, 2026
@github-actions github-actions Bot closed this Mar 12, 2026
@XeonMations XeonMations reopened this Mar 14, 2026
@XeonMations
Copy link
Copy Markdown
Collaborator Author

`°°° CORPORE SANO

Laying on Hands to heal someone, on/close to the wound (-> passive grab on bodypart/ if that is too hard with the Body part, just passive grab)
Third eye opens
Works on Living AND Undead
Each Health Level to be healed -> 1BP, 2BP for agg Damage (How much Damage = 1 Health Level?) 

°°°° SHEPERD'S WATCH

INVISIBLE barrier 
Salubri must stand between those they protect
Ranged weapons can still attack, enemies just can't Approach
2WP to errect 
3 metre radius
those inside it at its creation "may leave and return" 
 barrier moves with the Salubri
To cross barrier: extended, resisted Willpower roll
	-> (difficulty equals the opponent’s current Willpower for the Salubri, and the Salubri’s current Willpower for the opponent)
	-> The opponent can cross as soon as they accumulate three more net successes than the Salubri

°°°°° MENS SANA (in current Version it's not mens sana, but 'unburdening the bestial Soul, which is sixth dot)

Heals 'madness'/Derangements 
2BP and  Intelligence + Empathy (dif 8)
10 minutes of uninterrupted conversation (-> 10 ic Minutes timer)
cures the subject of one derangement of the Salubri player’s choice (-> Cure brain Trauma Derangements Maybe?) 
can't cure a Malkavian of their core derangement, CAN alleviate it for the rest of the Scene (-> round??? could take the Malk hallucinations away for the rest of the 	round)
Botch -> Salubri gets the Derangement
Can't be used by salubri on themselves

`

@github-actions github-actions Bot removed the Stale label Mar 15, 2026
Comment thread modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm
Comment thread modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm Outdated
@github-actions github-actions Bot added the UI label Mar 21, 2026
@XeonMations XeonMations changed the title Re-Adds Obeah Re-Adds Obeah (And Valeren because Nimi) Mar 21, 2026
@XeonMations XeonMations moved this from In Progress to Ready in Rebase Mar 25, 2026
@XeonMations XeonMations mentioned this pull request Mar 25, 2026
4 tasks
Copy link
Copy Markdown
Contributor

@chazzyjazzy chazzyjazzy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mostly just datumizing rolls tbh.

Comment thread modular_darkpack/modules/powers/code/discipline/valeren.dm Outdated
Comment thread modular_darkpack/modules/powers/code/discipline/valeren.dm Outdated
Comment thread modular_darkpack/modules/powers/code/discipline/valeren.dm
Comment thread modular_darkpack/modules/powers/code/discipline/valeren.dm
Comment thread modular_darkpack/modules/powers/code/discipline/valeren.dm Outdated
Comment thread modular_darkpack/modules/powers/code/discipline/valeren.dm Outdated
Comment thread modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm
Comment thread modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm
if(!chosen_derangement)
to_chat(owner, span_notice("You fail to find any traumas."))
return
var/datum/storyteller_roll/unburden_the_bestial_soul/discipline_roll = new()
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var/datum/storyteller_roll/unburden_the_bestial_soul/discipline_roll = new()
if(!discipline_roll)
discipline_roll = new()

youre casting and storing in the constructor so only new if its doesnt exist.

Comment thread modular_darkpack/modules/powers/code/discipline/obeah/shepherds_watch.dm Outdated
Comment thread modular_darkpack/modules/powers/code/discipline/valeren.dm Outdated
Comment thread modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm
Comment thread modular_darkpack/modules/powers/code/discipline/valeren.dm
Comment thread modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm Outdated
Comment thread modular_darkpack/modules/powers/code/discipline/obeah/obeah.dm
Copy link
Copy Markdown
Contributor

@chazzyjazzy chazzyjazzy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not gonna go thru all the reverted changes. theres alot.

Comment thread code/__DEFINES/~darkpack/traits/declarations.dm
Comment thread code/_globalvars/traits/_traits.dm
Comment thread code/_globalvars/traits/admin_tooling.dm
Comment thread code/game/objects/structures/crates_lockers/crates/large.dm
@chazzyjazzy
Copy link
Copy Markdown
Contributor

the reverting of other prs came from commit
[4786e11]

@buffyuwu
Copy link
Copy Markdown
Contributor

buffyuwu commented Mar 29, 2026

oh god damnit. it didnt come from that commit, it came from 345cb8d

@github-project-automation github-project-automation Bot moved this from Ready to Done in Rebase Mar 30, 2026
buffyuwu pushed a commit that referenced this pull request Mar 31, 2026
## About The Pull Request
Originally #686 , attempt
2!

## Why It's Good For The Game
## Changelog
:cl:
add: Added Salubri Healers
add: Added Salubri Warriors
/:cl:

---------

Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
@XeonMations XeonMations deleted the obeah branch March 31, 2026 01:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants