Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cc81ff3
Disfigured
Icarus-The-Sun Apr 23, 2026
bd6bbb7
Smell Of The Grave
Icarus-The-Sun Apr 23, 2026
e016b9e
Lame
Icarus-The-Sun Apr 23, 2026
cfd4c35
Slow Healing
Icarus-The-Sun Apr 23, 2026
8ef1c46
Infectious bite
Icarus-The-Sun Apr 24, 2026
5ed88f1
Glowing Eyes
Icarus-The-Sun Apr 24, 2026
da8f01e
Fixes and Permanent Wound
Icarus-The-Sun Apr 24, 2026
724d376
Fixes and Permanent Wound
Icarus-The-Sun Apr 24, 2026
483354d
Merge branch 'physical-merits-and-flaws' of https://github.com/Icarus…
Icarus-The-Sun Apr 24, 2026
69eb744
Merge branch 'master' into physical-merits-and-flaws
Icarus-The-Sun Apr 24, 2026
a87160f
linters
Icarus-The-Sun Apr 24, 2026
75b0d44
Acute Sense
Icarus-The-Sun Apr 26, 2026
dabda2d
Bruiser
Icarus-The-Sun Apr 27, 2026
8e8c45b
Enchanting Voice
Icarus-The-Sun Apr 27, 2026
ba4324d
Friendly Face
Icarus-The-Sun Apr 27, 2026
3d99a4b
god damn it (I try and fail to make this work and fix my oversight wi…
Icarus-The-Sun Apr 27, 2026
44aa9ef
Merge branch 'master' into physical-merits-and-flaws
Icarus-The-Sun Apr 28, 2026
6f9a84d
short and huge size
Icarus-The-Sun Apr 28, 2026
44f5508
Merge branch 'physical-merits-and-flaws' of https://github.com/Icarus…
Icarus-The-Sun Apr 28, 2026
cb70fa0
Tic and catlike balance
Icarus-The-Sun Apr 29, 2026
799b123
I'm going to blow up (Open wound)
Icarus-The-Sun Apr 30, 2026
317b790
Eyes of shadow
Icarus-The-Sun Apr 30, 2026
a0921b1
Merge branch 'master' into physical-merits-and-flaws
Icarus-The-Sun Apr 30, 2026
4f1489c
hemophilia and seizures
Icarus-The-Sun Apr 30, 2026
a466ce9
Merge branch 'master' into physical-merits-and-flaws
Icarus-The-Sun May 4, 2026
fd17db2
I explode (fixes) pt 1
Icarus-The-Sun May 4, 2026
c8ae635
Merge branch 'physical-merits-and-flaws' of https://github.com/Icarus…
Icarus-The-Sun May 4, 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
15 changes: 14 additions & 1 deletion code/__DEFINES/~darkpack/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,19 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_MERIT_UNTAMABLE "merit_untamable"
#define TRAIT_FAIR_GLABRO "fair_glabro"
#define TRAIT_EAT_FOOD "eat_food"

#define TRAIT_DISFIGURED_APPEARANCE "disfigured_appearance"
#define TRAIT_GRAVE_SMELL "grave_smell"
#define TRAIT_LAME "lame"
#define TRAIT_SLOW_HEALING "slow_healing"
#define TRAIT_INFECTIOUS_BITE "infectious_bite"
#define TRAIT_OPEN_WOUND "open_wound"
#define TRAIT_GLOWING_EYES "glowing_eyes"
#define TRAIT_ACUTE_SIGHT "acute_sight"
#define TRAIT_ACUTE_HEARING "acute_hearing"
#define TRAIT_BRUISER "bruiser"
#define TRAIT_FRIENDLY_FACE "friendly_face"
#define TRAIT_ENCHANTING_VOICE "enchanting_voice"
#define TRAIT_HUGE_SIZE "huge_size"
#define TRAIT_EYES_OF_SHADOW "eyes_of_shadow"

// END TRAIT DEFINES
19 changes: 17 additions & 2 deletions code/_globalvars/traits/_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -670,12 +670,15 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_SPACE_ANT_IMMUNITY" = TRAIT_SPACE_ANT_IMMUNITY,
"TRAIT_BRAIN_TRAUMA_IMMUNITY" = TRAIT_BRAIN_TRAUMA_IMMUNITY,
"TRAIT_NECROPOLIS_WORSHIP" = TRAIT_NECROPOLIS_WORSHIP,
"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit (Acute Sense)
"TRAIT_ACUTE_SIGHT" = TRAIT_ACUTE_SIGHT, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit (Acute Sense)
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_BETRAYERS_MARK" = TRAIT_BETRAYERS_MARK, // DARKPACK EDIT ADD - MERITS_FLAWS - (Tremere)
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
"TRAIT_BLUSH_OF_HEALTH" = TRAIT_BLUSH_OF_HEALTH, // DARKPACK EDIT ADD
"TRAIT_BOND_WITHIN_THE_MOUNTAIN" = TRAIT_BOND_WITHIN_THE_MOUNTAIN, // DARKPACK EDIT ADD - POWERS - (Visceratika)
"TRAIT_BRUISER" = TRAIT_BRUISER, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_CANNOT_RESIST_MIND_CONTROL" = TRAIT_CANNOT_RESIST_MIND_CONTROL, // DARKPACK EDIT ADD
"TRAIT_CAN_ENTER_TORPOR" = TRAIT_CAN_ENTER_TORPOR, // DARKPACK EDIT ADD
"TRAIT_CHARMER" = TRAIT_CHARMER, // DARKPACK EDIT ADD
Expand All @@ -687,27 +690,37 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_DIFFICULT_FRENZY" = TRAIT_DIFFICULT_FRENZY, // DARKPACK EDIT ADD - FRENZY
"TRAIT_DIFFICULT_RAGE" = TRAIT_DIFFICULT_RAGE, // DARKPACK EDIT ADD - FRENZY
"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
"TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS/FLAWS
"TRAIT_EAT_FOOD" = TRAIT_EAT_FOOD, // DARKPACK EDIT ADD - MERITS/FLAWS
"TRAIT_DISFIGURED_APPEARANCE" = TRAIT_DISFIGURED_APPEARANCE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_EAT_FOOD" = TRAIT_EAT_FOOD, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_EFFICIENT_DIGESTION" = TRAIT_EFFICIENT_DIGESTION, //DARKPACK EDIT ADD
"TRAIT_ENCHANTING_VOICE" = TRAIT_ENCHANTING_VOICE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
"TRAIT_EYES_OF_SHADOW" = TRAIT_EYES_OF_SHADOW, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_FAIR_GLABRO" = TRAIT_FAIR_GLABRO, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_FEEDING_RESTRICTION" = TRAIT_FEEDING_RESTRICTION, // DARKPACK EDIT ADD
"TRAIT_FERA_FUR" = TRAIT_FERA_FUR, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_FERA_RENOWN" = TRAIT_FERA_RENOWN, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_FORCED_EMOTION" = TRAIT_FORCED_EMOTION, // DARKPACK EDIT ADD - Melpominee
"TRAIT_FRENETIC_AURA" = TRAIT_FRENETIC_AURA, // DARKPACK EDIT ADD
"TRAIT_FRIENDLY_FACE" = TRAIT_FRIENDLY_FACE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_GHOST_VISION" = TRAIT_GHOST_VISION, // DARKPACK EDIT ADD - POWERS - (Necromancy)
"TRAIT_GLOWING_EYES" = TRAIT_GLOWING_EYES, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
"TRAIT_GRAVE_SMELL" = TRAIT_GRAVE_SMELL, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_GRIP_OF_THE_DAMNED" = TRAIT_GRIP_OF_THE_DAMNED, // DARKPACK EDIT ADD
"TRAIT_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
"TRAIT_HOMOSEXUAL" = TRAIT_HOMOSEXUAL, // DARKPACK EDIT ADD
"TRAIT_HORRIFIC_APPEARANCE" = TRAIT_HORRIFIC_APPEARANCE, // DARKPACK EDIT ADD - Cappadocian Quirk
"TRAIT_HUGE_SIZE" = TRAIT_HUGE_SIZE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_HUNGRY" = TRAIT_HUNGRY, // DARKPACK EDIT ADD
"TRAIT_HUNTED" = TRAIT_HUNTED, // DARKPACK EDIT ADD
"TRAIT_ILLEGAL_IDENTITY" = TRAIT_ILLEGAL_IDENTITY, // DARKPACK EDIT ADD - GOVERMENT
"TRAIT_INFECTIOUS_BITE" = TRAIT_INFECTIOUS_BITE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_INVISIBLE_TO_CAMERA" = TRAIT_INVISIBLE_TO_CAMERA, // DARKPACK EDIT ADD
"TRAIT_IN_FRENZY" = TRAIT_IN_FRENZY, // DARKPACK EDIT ADD
"TRAIT_IRRESISTIBLE_VITAE" = TRAIT_IRRESISTIBLE_VITAE, // DARKPACK EDIT ADD
"TRAIT_LAME" = TRAIT_LAME, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_LAZY" = TRAIT_LAZY, // DARKPACK EDIT ADD
"TRAIT_LIGHT_WEAKNESS" = TRAIT_LIGHT_WEAKNESS, // DARKPACK EDIT ADD - Setite Flaw
"TRAIT_LOCAL_SIXTHSENSE" = TRAIT_LOCAL_SIXTHSENSE, // DARKPACK EDIT ADD
Expand All @@ -723,6 +736,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_NO_EYE_CONTACT" = TRAIT_NO_EYE_CONTACT, // DARKPACK EDIT ADD
"TRAIT_NO_LYING_ANGLE" = TRAIT_NO_LYING_ANGLE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_OBFUSCATED" = TRAIT_OBFUSCATED, // DARKPACK EDIT ADD
"TRAIT_OPEN_WOUND" = TRAIT_OPEN_WOUND, // DARKPACK EDIT ADD - MERITS/FLAWS - Physical Flaw
"TRAIT_ORGANOVORE" = TRAIT_ORGANOVORE, // DARKPACK EDIT ADD - Nagaraja
"TRAIT_PAINFUL_VAMPIRE_KISS" = TRAIT_PAINFUL_VAMPIRE_KISS, // DARKPACK EDIT ADD
"TRAIT_PALE_AURA" = TRAIT_PALE_AURA, // DARKPACK EDIT ADD - MERITS_FLAWS
Expand All @@ -738,6 +752,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"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)
"TRAIT_SLOW_HEALING" = TRAIT_SLOW_HEALING, // DARKPACK EDIT ADD - MERITS/FLAWS - Physical Flaw
"TRAIT_SMALL_HANDS" = TRAIT_SMALL_HANDS, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_STAKED" = TRAIT_STAKED, // DARKPACK EDIT ADD
"TRAIT_STAKE_IMMUNE" = TRAIT_STAKE_IMMUNE, // DARKPACK EDIT ADD
Expand Down
16 changes: 15 additions & 1 deletion code/_globalvars/traits/admin_tooling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,13 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_LEFT_EYE_SCAR" = TRAIT_LEFT_EYE_SCAR,
"TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR,
"TRAIT_CARPOTOXIN_IMMUNE" = TRAIT_CARPOTOXIN_IMMUNE,
"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - Physical Merit (Acute Sense)
"TRAIT_ACUTE_SIGHT" = TRAIT_ACUTE_SIGHT, // DARKPACK EDIT ADD - Physical Merit (Acute Sense)
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
"TRAIT_BLUSH_OF_HEALTH" = TRAIT_BLUSH_OF_HEALTH, // DARKPACK EDIT ADD
"TRAIT_BRUISER" = TRAIT_BRUISER, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_CANNOT_RESIST_MIND_CONTROL" = TRAIT_CANNOT_RESIST_MIND_CONTROL, // DARKPACK EDIT ADD
"TRAIT_CAN_ENTER_TORPOR" = TRAIT_CAN_ENTER_TORPOR, // DARKPACK EDIT ADD
"TRAIT_CHARMER" = TRAIT_CHARMER, // DARKPACK EDIT ADD
Expand All @@ -377,24 +380,33 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_DIFFICULT_FRENZY" = TRAIT_DIFFICULT_FRENZY, // DARKPACK EDIT ADD - FRENZY
"TRAIT_DIFFICULT_RAGE" = TRAIT_DIFFICULT_RAGE, // DARKPACK EDIT ADD - FRENZY
"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
"TRAIT_DISFIGURED_APPEARANCE" = TRAIT_DISFIGURED_APPEARANCE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_EFFICIENT_DIGESTION" = TRAIT_EFFICIENT_DIGESTION, // DARKPACK EDIT ADD
"TRAIT_EFFICIENT_DIGESTION" = TRAIT_EFFICIENT_DIGESTION, //DARKPACK EDIT ADD
"TRAIT_ENCHANTING_VOICE" = TRAIT_ENCHANTING_VOICE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
"TRAIT_EYES_OF_SHADOW" = TRAIT_EYES_OF_SHADOW, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_FAIR_GLABRO" = TRAIT_FAIR_GLABRO, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_FEEDING_RESTRICTION" = TRAIT_FEEDING_RESTRICTION, // DARKPACK EDIT ADD
"TRAIT_FERA_FUR" = TRAIT_FERA_FUR, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_FERA_RENOWN" = TRAIT_FERA_RENOWN, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_FRENETIC_AURA" = TRAIT_FRENETIC_AURA, // DARKPACK EDIT ADD
"TRAIT_FRIENDLY_FACE" = TRAIT_FRIENDLY_FACE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_GHOST_VISION" = TRAIT_GHOST_VISION, // DARKPACK EDIT ADD - POWERS - (Necromancy)
"TRAIT_GLOWING_EYES" = TRAIT_GLOWING_EYES, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
"TRAIT_GRIP_OF_THE_DAMNED" = TRAIT_GRIP_OF_THE_DAMNED, // DARKPACK EDIT ADD
"TRAIT_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
"TRAIT_HOMOSEXUAL" = TRAIT_HOMOSEXUAL, // DARKPACK EDIT ADD
"TRAIT_HUGE_SIZE" = TRAIT_HUGE_SIZE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Merit
"TRAIT_HUNGRY" = TRAIT_HUNGRY, // DARKPACK EDIT ADD
"TRAIT_HUNTED" = TRAIT_HUNTED, // DARKPACK EDIT ADD
"TRAIT_ILLEGAL_IDENTITY" = TRAIT_ILLEGAL_IDENTITY, // DARKPACK EDIT ADD - GOVERMENT
"TRAIT_INFECTIOUS_BITE" = TRAIT_INFECTIOUS_BITE, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_INVISIBLE_TO_CAMERA" = TRAIT_INVISIBLE_TO_CAMERA, // DARKPACK EDIT ADD
"TRAIT_IN_FRENZY" = TRAIT_IN_FRENZY, // DARKPACK EDIT ADD
"TRAIT_IRRESISTIBLE_VITAE" = TRAIT_IRRESISTIBLE_VITAE, // DARKPACK EDIT ADD
"TRAIT_LAME" = TRAIT_LAME, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_LAZY" = TRAIT_LAZY, // DARKPACK EDIT ADD
"TRAIT_LIGHT_WEAKNESS" = TRAIT_LIGHT_WEAKNESS, // DARKPACK EDIT ADD - Setite Flaw
"TRAIT_LOCAL_SIXTHSENSE" = TRAIT_LOCAL_SIXTHSENSE, // DARKPACK EDIT ADD
Expand All @@ -409,6 +421,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_NO_EYE_CONTACT" = TRAIT_NO_EYE_CONTACT, // DARKPACK EDIT ADD
"TRAIT_NO_LYING_ANGLE" = TRAIT_NO_LYING_ANGLE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_OBFUSCATED" = TRAIT_OBFUSCATED, // DARKPACK EDIT ADD
"TRAIT_OPEN_WOUND" = TRAIT_OPEN_WOUND, // DARKPACK EDIT ADD - MERITS/FLAWS - Physical Flaw
"TRAIT_PAINFUL_VAMPIRE_KISS" = TRAIT_PAINFUL_VAMPIRE_KISS, // DARKPACK EDIT ADD
"TRAIT_PALE_AURA" = TRAIT_PALE_AURA, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_PASS_THROUGH_WALLS" = TRAIT_PASS_THROUGH_WALLS, // DARKPACK EDIT ADD
Expand All @@ -421,6 +434,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"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)
"TRAIT_SLOW_HEALING" = TRAIT_SLOW_HEALING, // DARKPACK EDIT ADD - MERITS_FLAWS - Physical Flaw
"TRAIT_SMALL_HANDS" = TRAIT_SMALL_HANDS, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_STAKED" = TRAIT_STAKED, // DARKPACK EDIT ADD
"TRAIT_STAKE_IMMUNE" = TRAIT_STAKE_IMMUNE, // DARKPACK EDIT ADD
Expand Down
6 changes: 6 additions & 0 deletions code/controllers/subsystem/processing/quirks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
list(/datum/quirk/empath, /datum/quirk/evil),
list(/datum/quirk/keen_nose, /datum/quirk/item_quirk/anosmia),
list(/datum/quirk/darkpack/weak_willed, /datum/quirk/darkpack/untamable), // DARKPACK EDIT ADD - MERITS_FLAWS
list(/datum/quirk/darkpack/disfigured, /datum/quirk/darkpack/monstrous, /datum/quirk/darkpack/friendly_face), // DARKPACK EDIT ADD - MERITS_FLAWS
list(/datum/quirk/darkpack/permafangs, /datum/quirk/darkpack/dulled_bite), // DARKPACK EDIT ADD - MERITS_FLAWS
list(/datum/quirk/mute, /datum/quirk/darkpack/enchanting_voice), // DARKPACK EDIT ADD - MERITS_FLAWS
list(/datum/quirk/darkpack/dulled_bite, /datum/quirk/darkpack/infectious_bite), // DARKPACK EDIT ADD - MERITS_FLAWS
list(/datum/quirk/darkpack/short, /datum/quirk/darkpack/huge_size), // DARKPACK EDIT ADD - MERITS_FLAWS
list(/datum/quirk/darkpack/eyes_of_shadow, /datum/quirk/darkpack/glowing_eyes), // DARKPACK EDIT ADD - MERITS_FLAWS
list(/datum/quirk/darkpack/bruiser, /datum/quirk/darkpack/friendly_face), // DARKPACK EDIT ADD - MERITS_FLAWS
))

GLOBAL_LIST_INIT(quirk_string_blacklist, generate_quirk_string_blacklist())
Expand Down
5 changes: 5 additions & 0 deletions code/modules/mob/living/living_say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,11 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
else
deaf_type = MSG_AUDIBLE

// DARKPACK EDIT ADD START
if (HAS_TRAIT(src, TRAIT_ACUTE_HEARING) && !HAS_TRAIT(speaker, TRAIT_SIGN_LANG))// we can't HEAR sign, so we don't care for it
message_range += 3 // Increase how far we can hear
// DARKPACK EDIT ADD END

var/atom/movable/virtualspeaker/holopad_speaker = speaker
var/avoid_highlight = src == (istype(holopad_speaker) ? holopad_speaker.source : speaker)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,24 @@
if(iszomboid(src) && !(obscured_slots & HIDEFACE)) // for necromancy player-controlled zombies
. += span_danger("<b>[p_They()] [p_are()] a decayed corpse!</b><br>")

if(HAS_TRAIT(src, TRAIT_SERPENTIS_SKIN) && !(HIDEJUMPSUIT)) // 'hidden by modest clothing'
. += span_danger("[p_They()] [p_are()] covered in... scales!?<br>")
if(!(obscured_slots & HIDEJUMPSUIT))
if(HAS_TRAIT(src, TRAIT_SERPENTIS_SKIN)) // 'hidden by modest clothing'
. += span_danger("[p_They()] [p_are()] covered in... scales!?<br>")

if(HAS_TRAIT(src, TRAIT_ANIMAL_MUSK))
. += span_warning("[p_they(TRUE)] smell[p_s()] weirdly animal like...<br>")
. += span_warning("[p_They(TRUE)] smell[p_s()] weirdly animal like...<br>")

if(HAS_TRAIT(src, TRAIT_GRAVE_SMELL))
. += span_warning("[p_They()] smell[p_s()] like moist soil.<br>")

if(HAS_TRAIT(src, TRAIT_OPEN_WOUND) && (!(src.w_uniform))) // Easier to hide than scales-just wear a jumpsuit.
. += span_warning("They appear to have an open wound, blood slowly seeping from it.<br>")

if(!is_eyes_covered())
if(HAS_TRAIT(src, TRAIT_GLOWING_EYES))
. += span_warning("[p_Their()] eyes glow unnaturally bright!<br>")
if(HAS_TRAIT(src, TRAIT_EYES_OF_SHADOW))
. += span_warning("[p_Their()] eyes are oddly dark. Something about them feels outright uncanny.<br>")

if(!(obscured_slots & HIDEFACE))
switch(st_get_stat(STAT_APPEARANCE))
Expand All @@ -73,6 +86,8 @@
. += span_rose(span_bold("[pick(five)]<br>"))
if(HAS_TRAIT(src, TRAIT_PERMAFANGS) && !HAS_TRAIT(src, TRAIT_DULLFANGS))
. += span_warning("[p_They()] [p_have()] visible fangs in [p_their()] mouth.<br>")
if(HAS_TRAIT(src, TRAIT_DISFIGURED_APPEARANCE))
. += span_warning("[p_They()] [p_are()] visibly disfigured.<br>")
if(!src.head)
if(HAS_TRAIT(src, TRAIT_THIRD_EYE))
. += span_bolddanger("[p_They()] [p_have()] a third eye on [p_their()] forehead!<br>")
Expand Down
6 changes: 6 additions & 0 deletions modular_darkpack/modules/billiards/code/billiard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@
var/datum/storyteller_roll/pool_aiming/accuracy_roll = new()
var/accuracy_result = accuracy_roll.st_roll(user, src)
var/datum/storyteller_roll/pool_hits/amount_to_hit_roll = new()

if(HAS_TRAIT(user, TRAIT_GLOWING_EYES))
amount_to_hit_roll.difficulty += 1
if(HAS_TRAIT(user, TRAIT_ACUTE_SIGHT))
amount_to_hit_roll.difficulty -= 2

var/amount_to_hit_result = amount_to_hit_roll.st_roll(user, src)
var/list/balls_sunk = list()
for(var/i in 1 to amount_to_hit_result)
Expand Down
5 changes: 5 additions & 0 deletions modular_darkpack/modules/blood_drinking/code/vamp_bite.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,8 @@
playsound(src, 'modular_darkpack/modules/blood_drinking/sounds/kiss.ogg', 50, TRUE)
bit_living.visible_message(span_italics(span_bold("[src] kisses [bit_living]!")), span_userlove(span_bold("[src] kisses you!")))
drinksomeblood(bit_living, TRUE)
if(HAS_TRAIT(src, TRAIT_INFECTIOUS_BITE) && (!get_kindred_splat(bit_living)))// Don't look at vampires for this.
if(prob(20))// The one in five chance to make a mortal seriously ill.
bit_living.reagents.add_reagent(/datum/reagent/toxin, 10) // Consider other chemicals if they seem more fitting.
bit_living.reagents.add_reagent(/datum/reagent/toxin/histamine, 10)
bit_living.adjust_brute_loss(5, TRUE)// Neglible, but it should fit for the 'can't automatically close bite wounds' bit of this quirk.
2 changes: 2 additions & 0 deletions modular_darkpack/modules/doors/code/vampdoor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@
if(!bash_roll)
bash_roll = new()
bash_roll.difficulty = bash_difficulty
if(HAS_TRAIT(user, TRAIT_HUGE_SIZE)) // There's no numbers for this listed in the book, so we're making shit up.
bash_roll.difficulty -= 2 // A 6 diff bash becomes a 4 diff one here.
bash_roll.successes_needed = bash_successes_needed
var/roll = bash_roll.st_roll(user, src)
switch(roll)
Expand Down
4 changes: 4 additions & 0 deletions modular_darkpack/modules/government/code/drivers_license.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
/obj/item/card/drivers_license/examine(mob/user)
. = ..()
if(!examine_roll)
if(HAS_TRAIT(user, TRAIT_GLOWING_EYES))
examine_roll.difficulty += 1
if(HAS_TRAIT(user, TRAIT_ACUTE_SIGHT))
examine_roll.difficulty -= 2
examine_roll = new()
examine_roll.reroll_cooldown = 1 SCENES
var/roll_result = examine_roll.st_roll(user, src)
Expand Down
4 changes: 4 additions & 0 deletions modular_darkpack/modules/government/code/passport.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@
/obj/item/passport/examine(mob/user)
. = ..()
if(!examine_roll)
if(HAS_TRAIT(user, TRAIT_GLOWING_EYES))
examine_roll.difficulty += 1
if(HAS_TRAIT(user, TRAIT_ACUTE_SIGHT))
examine_roll.difficulty -= 2
examine_roll = new()
examine_roll.reroll_cooldown = 1 SCENES
var/roll_result = examine_roll.st_roll(user, src)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// VTM pg. 481
/datum/quirk/darkpack/disfigured
name = "Disfigured"
desc = {"A hideous disfigurement makes your appearance disturbing and memorable.
The difficulties of all die rolls relating to social interaction are increased by two.
You may not have an Appearance rating greater than 2."}
icon = FA_ICON_FACE_GRIMACE
value = -2
gain_text = span_notice("Your face is disfigured!")
lose_text = span_notice("You feel like you look a lot better.")
failure_message = span_notice("You don't look too bad.")
mob_trait = TRAIT_DISFIGURED_APPEARANCE
excluded_clans = list(VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_HARBINGER)
var/appearance_to_subtract

/datum/quirk/darkpack/disfigured/add(client/client_source)
. = ..()
var/mob/living/carbon/human/human_holder = astype(quirk_holder)
if(!human_holder)
return
appearance_to_subtract = human_holder.st_get_stat(STAT_APPEARANCE)-2
if(human_holder.st_get_stat(STAT_APPEARANCE) > 2)
human_holder.st_add_stat_mod(STAT_APPEARANCE, -appearance_to_subtract, "Disfigured")

/datum/quirk/darkpack/disfigured/remove()
. = ..()
var/mob/living/carbon/human/human_holder = astype(quirk_holder)
if(!human_holder)
return
human_holder.st_remove_stat_mod(STAT_APPEARANCE, "Disfigured")
Loading
Loading