Skip to content

Scars wont save persistantly for vampires #1169

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

Open
FalloutFalcon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Scars wont save persistantly for vampires #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
514ee3a
yea
FalloutFalcon Jun 19, 2026
b9ec728
Merge branch 'master' into scar-resistant-vampies
FalloutFalcon Jun 22, 2026
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/__DEFINES/~darkpack/traits/declarations.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// This file contains all of the "static" define strings that tie to a trait.
// WARNING: The sections here actually matter in this file as it's tested by CI. Please do not toy with the sections."

Expand Down Expand Up @@ -102,7 +102,7 @@
#define TRAIT_BOND_WITHIN_THE_MOUNTAIN "bond_within_the_mountain"
// Is the mob unable to be cuffed? (For Tzimisce zulo form and others)
#define TRAIT_NO_CUFF "no_cuff" //Used for uncuffable forms such as Tenebrous and Blood form.

#define TRAIT_SCARRING_RESISTANT "scarring_resistant"// Temporal scars wont save

// Allows the user to pass through doors
#define TRAIT_IN_FRENZY "in_frenzy"
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits/_traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_REPELLED_BY_HOLINESS" = TRAIT_REPELLED_BY_HOLINESS, // DARKPACK EDIT ADD
"TRAIT_RUBICON" = TRAIT_RUBICON, // DARKPACK EDIT ADD
"TRAIT_SANGUINE_INCONGRUITY" = TRAIT_SANGUINE_INCONGRUITY, // DARKPACK EDIT ADD - Giovanni Quirk
"TRAIT_SCARRING_RESISTANT", TRAIT_SCARRING_RESISTANT, // DARKPACK EDIT ADD
"TRAIT_SENSITIVE_HUMANITY" = TRAIT_SENSITIVE_HUMANITY, // DARKPACK EDIT ADD
"TRAIT_SERPENTIS_SKIN" = TRAIT_SERPENTIS_SKIN, // DARKPACK EDIT ADD - POWERS - (Serpentis)
"TRAIT_SILENCED" = TRAIT_SILENCED, // DARKPACK EDIT ADD - POWERS - (Quietus)
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits/admin_tooling.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_REJECTED_BY_TECHNOLOGY" = TRAIT_REJECTED_BY_TECHNOLOGY, // DARKPACK EDIT ADD
"TRAIT_REPELLED_BY_HOLINESS" = TRAIT_REPELLED_BY_HOLINESS, // DARKPACK EDIT ADD
"TRAIT_RUBICON" = TRAIT_RUBICON, // DARKPACK EDIT ADD
"TRAIT_SCARRING_RESISTANT", TRAIT_SCARRING_RESISTANT, // DARKPACK EDIT ADD
"TRAIT_SENSITIVE_HUMANITY" = TRAIT_SENSITIVE_HUMANITY, // DARKPACK EDIT ADD
"TRAIT_SERPENTIS_SKIN" = TRAIT_SERPENTIS_SKIN, // DARKPACK EDIT ADD - POWERS - (Serpentis)
"TRAIT_SILENCED" = TRAIT_SILENCED, // DARKPACK EDIT ADD - POWERS - (Quietus)
Expand Down
5 changes: 5 additions & 0 deletions code/controllers/subsystem/persistence/scars.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
if(!original_human)
continue

// DARKPACK EDIT ADD START
if(HAS_TRAIT(original_human, TRAIT_SCARRING_RESISTANT))
continue
// DARKPACK EDIT ADD END

if(original_human.stat == DEAD || !original_human.all_scars || original_human != ending_human)
original_human.save_persistent_scars(TRUE)
else
Expand Down
1 change: 1 addition & 0 deletions modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/kindred_splat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
TRAIT_UNAGING,
TRAIT_DRINKS_BLOOD,
TRAIT_PALE_AURA,
TRAIT_SCARRING_RESISTANT,
)
splat_actions = list(
/datum/action/cooldown/mob_cooldown/give_vitae,
Expand Down
Loading