Healer Buff PR (Salubri and Theurges) - #183
Open
TheTrueSilverRat wants to merge 8 commits into
Open
Conversation
…SecondCity" This reverts commit 90a939a, reversing changes made to 854d77f.
chazzyjazzy
requested changes
Aug 27, 2026
Comment on lines
+28
to
+59
| //CRIMSON GRID EDIT START (replaced the whole thing) | ||
| /datum/action/cooldown/power/gift/mothers_touch/Activate(atom/target) | ||
| if(!isliving(target)) | ||
| return FALSE | ||
| if(!(target in range(1, owner))) | ||
| return FALSE | ||
|
|
||
|
|
||
| var/mob/living/living_target = target | ||
|
|
||
| if(living_target == owner) | ||
| return FALSE | ||
| if(get_kindred_splat(living_target)) | ||
| var/datum/st_stat/morality_path/morality/stat_morality = living_target.st_get_stat(STAT_MORALITY) | ||
| if((stat_morality?.morality_path?.alignment != MORALITY_HUMANITY || stat_morality?.get_score() < 7) || HAS_TRAIT(src, TRAIT_HIDDEN_WYRMTAINT)) | ||
| return FALSE | ||
|
|
||
| . = ..() | ||
|
|
||
| var/datum/splat/werewolf/werewolf_splat = get_werewolf_splat(owner) | ||
| var/difficulty = werewolf_splat.uses_rage ? werewolf_splat.rage : 5 | ||
| var/successes = SSroll.storyteller_roll_datum(owner, target, /datum/storyteller_roll/gift/mothers_touch, difficulty = difficulty) | ||
| var/difficulty = 0 | ||
|
|
||
| var/mob/living/living_target = target | ||
| living_target.heal_storyteller_health(successes, TRUE, TRUE, TRUE) | ||
| if(get_shifter_splat(living_target)) | ||
| var/datum/splat/werewolf/werewolf_splat = get_werewolf_splat(owner) | ||
| difficulty = werewolf_splat.uses_rage ? werewolf_splat.rage : 5 | ||
| else //tldr any other splat you use diff 5 cause no rage | ||
| difficulty = 5 | ||
| var/successes = SSroll.storyteller_roll_datum(owner, target, /datum/storyteller_roll/gift/mothers_touch, difficulty = difficulty) | ||
| living_target.heal_storyteller_health(successes * 2 , TRUE, TRUE, TRUE, TRUE) | ||
|
|
||
| SEND_SIGNAL(owner, COMSIG_MASQUERADE_VIOLATION) | ||
| return TRUE | ||
| //CRIMSON GRID EDIT END |
Collaborator
There was a problem hiding this comment.
we need modular comments on lines that are actually changed, there are lines in this block which are unchanged
Comment on lines
+229
to
+239
| //CRIMSON GRID EDIT START, Increases HP healed of Healers | ||
|
|
||
| /datum/discipline_power/obeah/corpore_sano/activate(atom/target) | ||
| . = ..() | ||
| var/mob/living/living_target = target | ||
| if(living_target.get_agg_loss() && (owner.bloodpool >= 1)) | ||
| owner.adjust_blood_pool(-1) | ||
| living_target.heal_storyteller_health(dots_to_heal = 1, heal_aggravated = TRUE, heal_scars = TRUE, heal_blood = TRUE) | ||
| living_target.heal_storyteller_health(dots_to_heal = 4, heal_aggravated = TRUE, heal_scars = TRUE, heal_blood = TRUE, heal_burn = TRUE) | ||
| else | ||
| living_target.heal_storyteller_health(dots_to_heal = 1, heal_aggravated = FALSE, heal_scars = TRUE, heal_blood = TRUE) | ||
| living_target.heal_storyteller_health(dots_to_heal = 4, heal_aggravated = FALSE, heal_scars = TRUE, heal_blood = TRUE, heal_burn = TRUE) | ||
| //CRIMSON GRID EDIT END |
| rage_cost = 1 | ||
| //gnosis_cost = 1 | ||
|
|
||
| //CRIMSON GRID EDIT START (replaced the whole thing) |
Collaborator
There was a problem hiding this comment.
not true - also, follow the formatting for modular comments, which is, roughly
// CRIMSON GRID EDIT START(or END) - (pr title)
or // CRIMSON EDIT START (or END) - (pr title)
for one line changes
// CRIMSON EDIT CHANGE - (pr title) - Original: (original line)
this is so that if we ever de-modularize, or write a script, or search for every instance outside of modular_vcg where something is edited, we can easily find it
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About The Pull Request
PR That increases the Salubri's healing cost from 10 to 40 per BP as well as able to heal dead corpses
Refactored Mother's Touch (Can't heal yourself, can't heal vampires unless humanity 7+, and difficulty is based on target's rage, 5 if no rage used). Also gave it so each success healed 20 not 10 damage. As well as rage stuff
Why It's Good For The Game
Healers are more effective. They're all super masq breachers anyways so that's stll something to take account as a downside, it just made it more useful in general.
Changelog
🆑
code: refactored mother's touch if checkers to account for if you're a vampire and your humanity, if you're your own target and different difficulty logic
balance: made Mother's touch and Salubri Healer heal more
/:cl: