Merit pack from MOSTLY W20 by FalloutFalcon · Pull Request #709 · DarkPack13/SecondCity

FalloutFalcon · 2026-02-23T23:45:32Z

About The Pull Request

Assorted merits and flaws from W20. (some overlap with V20) Also grabbed pale aura cause it was really easy.

Had to fix some stuff relating to SPLAT_NONE with how quirks are handled but that's not even chaz's fault the code is just obtuse (this is my fault mostly)

Fixes #693

Why It's Good For The Game

merits for wolves (and others)

Changelog

🆑
add: Adds the merits: Time Sense, Fair Glabro, Metamorph, Untamable, Pale aura, Deceptive Aura
add: Adds the flaws: Animal Musk, One Eye, Weakwilled, Pierced Veil
balance: An accurate display of city time for living mobs is now locked behind time sense.
fix: Derangement now appear as a selectable flaw again.
typo: "Your" to "You" in a dominate to_chat
/:cl:

…o some-wolf-traits

github-actions · 2026-03-04T01:50:46Z

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.

…o some-wolf-traits

LucifersCoils · 2026-03-10T05:21:33Z

code/modules/mob/living/carbon/examine.dm

+	// DARKPACK EDIT ADD START
+	if(HAS_TRAIT(user, TRAIT_PALE_AURA))
 		apparent_blood_volume -= (BLOOD_VOLUME_NORMAL * 0.25)
+	/* I need a citation on if this thing is real, i got nothing.


I'm not as code literate as I could be - is this a misnomer for Deceptive Aura?

Page 493, V20 core rulebook?

Clarified some aura things further here: https://discord.com/channels/1393132000583618701/1396599047128617010/1483188208551330035

modular_darkpack/modules/merits_flaws/code/neutral_quirks/illegal_identity.dm

…o some-wolf-traits

FalloutFalcon · 2026-03-23T18:43:09Z

Accidentally made commits from #799 here because it didn't create a new branch and i didn't notice. Gonna make it a dependency cause its prob gonna get merged first and i dont care to revert the commits lol.

…o some-wolf-traits

chazzyjazzy

minor shit

chazzyjazzy · 2026-03-25T19:16:51Z

code/controllers/subsystem/processing/quirks.dm

 	list(/datum/quirk/settler, /datum/quirk/freerunning),
 	list(/datum/quirk/numb, /datum/quirk/selfaware),
 	list(/datum/quirk/empath, /datum/quirk/evil),
+	list(/datum/quirk/darkpack/weak_willed, /datum/quirk/darkpack/untamable), // DARKPACK EDIT ADD - MERITS/FLAWS


is this necessary? none of the other darkpack merits/flaws are in this list

chazzyjazzy · 2026-03-25T19:17:07Z

code/_globalvars/traits/admin_tooling.dm

+		"TRAIT_METAMORPH" = TRAIT_METAMORPH, // DARKPACK EDIT ADD - MERITS/FLAWS
+		"TRAIT_PIERCED_VEIL" = TRAIT_PIERCED_VEIL, // DARKPACK EDIT ADD - MERITS/FLAWS


not alphabetically organized

chazzyjazzy · 2026-03-25T19:17:20Z

code/_globalvars/traits/admin_tooling.dm

 		"TRAIT_CHARMER" = TRAIT_CHARMER, // DARKPACK EDIT ADD
 		"TRAIT_COFFIN_THERAPY" = TRAIT_COFFIN_THERAPY, // DARKPACK EDIT ADD
-		"TRAIT_COLD_AURA" = TRAIT_COLD_AURA, // DARKPACK EDIT ADD
+		"TRAIT_PALE_AURA" = TRAIT_PALE_AURA, // DARKPACK EDIT ADD - MERITS/FLAWS


alphabetical organization?

chazzyjazzy · 2026-03-25T19:17:32Z

code/_globalvars/traits/admin_tooling.dm

 		"TRAIT_VTM_CLANS" = TRAIT_VTM_CLANS, // DARKPACK EDIT ADD
 		"TRAIT_VTM_MORALITY" = TRAIT_VTM_MORALITY, // DARKPACK EDIT ADD
-		"TRAIT_WARM_AURA" = TRAIT_WARM_AURA, // DARKPACK EDIT ADD
+		"TRAIT_DECEPTIVE_AURA" = TRAIT_DECEPTIVE_AURA, // DARKPACK EDIT ADD


chazzyjazzy · 2026-03-25T19:19:17Z

code/_globalvars/traits/_traits.dm

+		"TRAIT_METAMORPH" = TRAIT_METAMORPH, // DARKPACK EDIT ADD - MERITS/FLAWS
+		"TRAIT_PIERCED_VEIL" = TRAIT_PIERCED_VEIL, // DARKPACK EDIT ADD - MERITS/FLAWS


alphabetical sorting in this file/list as well

chazzyjazzy · 2026-03-25T19:20:04Z

modular_darkpack/modules/flavor_text/code/preferences/record_preferences.dm

 	maximum_value_length = MAX_FLAVOR_LEN

-/datum/preference/text/medical/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
+/datum/preference/text/medical/apply_to_human(mob/living/carbon/human/target, value)


i remember seeing this in ur other pr which has been merged. saw ur comment aswell.

chazzyjazzy · 2026-03-25T19:30:32Z

modular_darkpack/modules/powers/code/discipline/auspex/aura_component.dm


 	var/mob/parent_mob = parent
-	if(get_kindred_splat(parent_mob))
+	if(HAS_TRAIT(parent, TRAIT_PALE_AURA) && !HAS_TRAIT(parent, TRAIT_DECEPTIVE_AURA))


i just realized - cant they take both quirks in the menu

chazzyjazzy · 2026-03-25T19:32:29Z

modular_darkpack/modules/powers/code/discipline/dominate/dominate.dm

+	if(HAS_TRAIT(target, TRAIT_WEAK_WILLED))
+		theirpower -= 2


ur description seems to say that dominate is an auto success but then here its the attackers difficulty on their roll minus two. balance change i assume?

chazzyjazzy · 2026-03-25T19:34:12Z

modular_darkpack/modules/powers/code/discipline/temporis/temporis.dm

+/datum/discipline_power/temporis/hourglass_of_the_mind/post_gain()
+	ADD_TRAIT(owner, TRAIT_TIME_SENSE, DISCIPLINE_TRAIT)


might wanna excluded_clans for true brujah if they automatically receive it since people might take this trait and not know

FalloutFalcon added 7 commits February 22, 2026 17:17

moving around files.

ba6e316

ragh

e5cd8b3

quirks

144f559

yea

1311d0c

Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…

b26c726

…o some-wolf-traits

yea

019831a

untamable

75f9931

github-actions bot added Fix Feature Grammar and Formatting Balance labels Feb 23, 2026

FalloutFalcon added 9 commits February 23, 2026 18:58

weakwilled citations mostly

8b7c7a9

ye

4bbfee0

yea

f76e3f6

whoops

9a63b4b

yea

140ef74

metamorphg

fc47665

berserk but then i remebered we dont have frenzy yet lol

450f2c5

yea

14dcbeb

pierced veil

904817e

FalloutFalcon changed the title ~~Merit pack from W20~~ Merit pack from MOSTLY W20 Feb 24, 2026

FalloutFalcon added 3 commits February 24, 2026 00:11

pale aura

1f74a7c

some splat none fixes

ec305c1

auspex layers BELOW mob

42e98e4

github-actions bot added the Quality of Life label Feb 24, 2026

FalloutFalcon added 3 commits February 24, 2026 01:51

yea

3337365

yea

38e71a3

a great folly. no as anything so it skipped all the stats lmao.

ef25e01

github-actions bot added the Stale label Mar 4, 2026

FalloutFalcon added 2 commits March 6, 2026 00:26

Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…

1294751

…o some-wolf-traits

fix

412ab62

FalloutFalcon marked this pull request as ready for review March 6, 2026 06:31

FalloutFalcon requested a review from a team as a code owner March 6, 2026 06:31

github-actions bot removed the Stale label Mar 7, 2026

LucifersCoils reviewed Mar 10, 2026

View reviewed changes

modular_darkpack/modules/merits_flaws/code/neutral_quirks/illegal_identity.dm Show resolved Hide resolved

Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…

50f53f3

…o some-wolf-traits

FalloutFalcon mentioned this pull request Mar 19, 2026

[TM ONLY] Guptime Testmerge 2 ApocryphaXIII/Apocrypha13#21

Open

FalloutFalcon added 4 commits March 19, 2026 11:58

fix

23f885e

Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…

4ad8713

…o some-wolf-traits

deceptive aura

d33eba9

renown stop gap

52a5d21

github-actions bot added the UI label Mar 23, 2026

FalloutFalcon added 2 commits March 23, 2026 13:23

yea

6bcad5a

saner grouping

c704d05

chazzyjazzy added the Merge Conflict label Mar 25, 2026

Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…

e9e2657

…o some-wolf-traits

github-actions bot removed the Merge Conflict label Mar 25, 2026

chazzyjazzy requested changes Mar 25, 2026

View reviewed changes

		"TRAIT_METAMORPH" = TRAIT_METAMORPH, // DARKPACK EDIT ADD - MERITS/FLAWS
		"TRAIT_PIERCED_VEIL" = TRAIT_PIERCED_VEIL, // DARKPACK EDIT ADD - MERITS/FLAWS

		/datum/discipline_power/temporis/hourglass_of_the_mind/post_gain()
		ADD_TRAIT(owner, TRAIT_TIME_SENSE, DISCIPLINE_TRAIT)

Conversation

FalloutFalcon commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About The Pull Request

Why It's Good For The Game

Changelog

Uh oh!

github-actions bot commented Mar 4, 2026

Uh oh!

LucifersCoils Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

FalloutFalcon commented Mar 23, 2026

Uh oh!

chazzyjazzy left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

FalloutFalcon commented Feb 23, 2026 •

edited

Loading

LucifersCoils Mar 10, 2026 •

edited

Loading