From e7cb13f2c0a908b159af23349fcf965f49269c3d Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Thu, 26 Feb 2026 18:54:02 -0600 Subject: [PATCH 1/5] one type def --- .../storyteller_stats/code/st_stats/base_type/_morality.dm | 4 ++-- .../storyteller_stats/code/st_stats/base_type/_path.dm | 5 ----- tgstation.dme | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_path.dm diff --git a/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_morality.dm b/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_morality.dm index 197de599f9f0..de0e87601191 100644 --- a/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_morality.dm +++ b/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_morality.dm @@ -1,8 +1,8 @@ /datum/st_stat/morality_path abstract_type = /datum/st_stat/morality_path category = "Morality Path" - starting_score = 2 + starting_score = 7 min_score = 0 max_score = 10 points = 0 - //freebie_point_cost = FREEBIE_COST_HUMANITY + freebie_point_cost = FREEBIE_COST_HUMANITY diff --git a/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_path.dm b/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_path.dm deleted file mode 100644 index 25a8bfab8af7..000000000000 --- a/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_path.dm +++ /dev/null @@ -1,5 +0,0 @@ -/datum/st_stat/morality_path - abstract_type = /datum/st_stat/morality_path - category = "Morality Path" - starting_score = 7 - freebie_point_cost = FREEBIE_COST_HUMANITY diff --git a/tgstation.dme b/tgstation.dme index 16f285eae546..df6cda542d22 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7568,7 +7568,6 @@ #include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_attribute.dm" #include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_freebie.dm" #include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_morality.dm" -#include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_path.dm" #include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_pooled.dm" #include "modular_darkpack\modules\storyteller_stats\code\st_stats\base_type\_virtue.dm" #include "modular_darkpack\modules\strings\global_strings.dm" From 271e57302cd5c42d633462a79f1311b6c95818fb Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Thu, 26 Feb 2026 19:12:20 -0600 Subject: [PATCH 2/5] yea --- .../modules/blood_drinking/code/bite_helper_procs.dm | 2 +- .../modules/blood_drinking/code/vamp_bite.dm | 3 +-- .../modules/city_time/code/status_effects.dm | 2 +- modular_darkpack/modules/economy/code/selling/lombard.dm | 3 +-- modular_darkpack/modules/economy/code/selling/selling.dm | 3 +-- .../modules/powers/code/discipline/dementation.dm | 3 +-- .../vampire_the_masquerade/code/kindred/humanity.dm | 2 +- .../code/preferences/morality/morality.dm | 9 ++++++--- .../code/splats/kindred_splat/kindred_splat.dm | 5 +---- .../code/splats/kindred_splat/make_kindred.dm | 6 +++--- 10 files changed, 17 insertions(+), 21 deletions(-) diff --git a/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm b/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm index 342545a73f1f..d8ddcd18fea1 100644 --- a/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm +++ b/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm @@ -5,7 +5,7 @@ var/datum/splat/vampire/kindred/kindred_splat = iskindred(src) if(kindred_splat) - var/hunger_threshold = 7 - (kindred_splat.enlightenment ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL)) + var/hunger_threshold = 7 - (src.get_enlightenment() ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL)) var/previous_hunger = HAS_TRAIT(src, TRAIT_NEEDS_BLOOD) var/will_be_hungry = (clamp(bloodpool + amount, 0, maxbloodpool) < hunger_threshold) diff --git a/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm b/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm index 5317381c1521..b52a84c2c653 100644 --- a/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm +++ b/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm @@ -40,8 +40,7 @@ var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) if(!skipface) if(iskindred(src) && HAS_TRAIT(src, TRAIT_NEEDS_BLOOD)) - var/datum/splat/vampire/kindred/kindred_species = iskindred(src) - var/stat_to_roll = kindred_species.enlightenment ? STAT_INSTINCT : STAT_SELF_CONTROL + var/stat_to_roll = src.get_enlightenment() ? STAT_INSTINCT : STAT_SELF_CONTROL var/datum/storyteller_roll/frezy_roll = new() frezy_roll.applicable_stats = list(stat_to_roll) var/frenzy_result = frezy_roll.st_roll(src, bit_living) diff --git a/modular_darkpack/modules/city_time/code/status_effects.dm b/modular_darkpack/modules/city_time/code/status_effects.dm index df63a9eac878..122b14d704d6 100644 --- a/modular_darkpack/modules/city_time/code/status_effects.dm +++ b/modular_darkpack/modules/city_time/code/status_effects.dm @@ -30,7 +30,7 @@ if(!kindred_owner) return FALSE // Humanity 10 vamps are immume to the light. atleast for the amount of time our day lasts. - if(CONFIG_GET(flag/humanity_sunlight_resistance) && !kindred_owner.enlightenment && (owner.st_get_stat(STAT_MORALITY) >= 10)) + if(CONFIG_GET(flag/humanity_sunlight_resistance) && !owner.get_enlightenment() && (owner.st_get_stat(STAT_MORALITY) >= 10)) return FALSE to_chat(owner, span_danger("THE SUN SEARS YOUR FLESH")) diff --git a/modular_darkpack/modules/economy/code/selling/lombard.dm b/modular_darkpack/modules/economy/code/selling/lombard.dm index 93415d2f9b71..e400f9bebb16 100644 --- a/modular_darkpack/modules/economy/code/selling/lombard.dm +++ b/modular_darkpack/modules/economy/code/selling/lombard.dm @@ -173,8 +173,7 @@ // Morality loss warning for bulk sales if(selling_comp.humanity_loss && ishuman(user)) var/mob/living/carbon/human/H = user - var/datum/splat/vampire/kindred/vampirism = iskindred(H) - if(!iskindred(H) || !vampirism.enlightenment) + if(!iskindred(H) || !H.get_enlightenment()) var/humanity_loss_modifier = HAS_TRAIT(H, TRAIT_SENSITIVE_HUMANITY) ? 2 : 1 var/total_humanity_risk = length(items_to_sell) * humanity_loss_modifier * selling_comp.humanity_loss diff --git a/modular_darkpack/modules/economy/code/selling/selling.dm b/modular_darkpack/modules/economy/code/selling/selling.dm index 5b7140e4dd46..5d2b144b5334 100644 --- a/modular_darkpack/modules/economy/code/selling/selling.dm +++ b/modular_darkpack/modules/economy/code/selling/selling.dm @@ -56,8 +56,7 @@ // If we found a seller and they're on Enlightenment path, no warning if(seller && iskindred(seller)) - var/datum/splat/vampire/kindred/vampirism = iskindred(seller) - if(vampirism.enlightenment) + if(seller.get_enlightenment()) return span_notice("You've sold [parent]!") // Default warning for Humanity path or non-vampires diff --git a/modular_darkpack/modules/powers/code/discipline/dementation.dm b/modular_darkpack/modules/powers/code/discipline/dementation.dm index 017a2a0b8638..3fe1d594752f 100644 --- a/modular_darkpack/modules/powers/code/discipline/dementation.dm +++ b/modular_darkpack/modules/powers/code/discipline/dementation.dm @@ -135,8 +135,7 @@ pools for a turn or two after the manifestation. /datum/discipline_power/dementation/the_haunting/pre_activation_checks(mob/living/carbon/human/target) var/resistence_stat = target.st_get_stat(STAT_SELF_CONTROL) if(iskindred(target)) - var/datum/splat/vampire/kindred/target_species = iskindred(target) - resistence_stat = target.st_get_stat(target_species.enlightenment ? STAT_CONVICTION : STAT_SELF_CONTROL) + resistence_stat = target.st_get_stat(owner.get_enlightenment() ? STAT_CONVICTION : STAT_SELF_CONTROL) var/theirpower = target.st_get_stat(STAT_PERCEPTION) + resistence_stat mypower = SSroll.storyteller_roll(owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_SUBTERFUGE), theirpower, owner, numerical = TRUE) if(mypower <= 0) diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm b/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm index 2adee483e833..f3596073f5e4 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm @@ -2,7 +2,7 @@ SIGNAL_HANDLER // "Enlightenment" is essentially the Path of Pure Evil. Inverts Humanity changes and limits. - var/is_enlightenment = enlightenment + var/is_enlightenment = owner.get_enlightenment() var/path = is_enlightenment ? "Enlightenment" : "Humanity" if (is_enlightenment && !forced) value = -value diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/preferences/morality/morality.dm b/modular_darkpack/modules/vampire_the_masquerade/code/preferences/morality/morality.dm index 92bbc3c16aba..80f2703b2923 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/preferences/morality/morality.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/preferences/morality/morality.dm @@ -40,7 +40,10 @@ stat_morality.morality_path = new value(target) +/mob/living/proc/get_enlightenment() + var/datum/st_stat/morality_path/morality/stat_morality = storyteller_stats["[STAT_MORALITY]"] + if(!stat_morality?.morality_path) + return + if(stat_morality.morality_path.alignment == MORALITY_ENLIGHTENMENT) - var/datum/splat/vampire/kindred/kindred_splat = iskindred(target) - if(istype(kindred_splat)) - kindred_splat.enlightenment = TRUE + return TRUE diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/kindred_splat.dm b/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/kindred_splat.dm index 175de38ea834..89907471b680 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/kindred_splat.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/kindred_splat.dm @@ -33,18 +33,15 @@ var/vitae_spending_rate /// Which vampiric bloodline or Clan they fall into. Determines natural Disciplines. Singleton reference, never modify var/datum/subsplat/vampire_clan/clan - /// Which morality they follow, Humanity if false and Enlightenment if true - var/enlightenment /// The Kindred who created this Kindred, null unless Embraced in-round var/mob/living/sire /// Timer tracking how long before the Kindred can wake up from torpor COOLDOWN_DECLARE(torpor_timer) -/datum/splat/vampire/kindred/New(generation, clan, enlightenment = FALSE, mob/living/sire) +/datum/splat/vampire/kindred/New(generation, clan, mob/living/sire) src.generation = generation src.clan = clan - src.enlightenment = enlightenment src.sire = sire /datum/splat/vampire/kindred/on_gain() diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/make_kindred.dm b/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/make_kindred.dm index 637fbe7fdab2..8fcb18618522 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/make_kindred.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/make_kindred.dm @@ -1,10 +1,10 @@ /** * Makes the mob a Kindred with the given Generation, Clan, morality, and sire. */ -/mob/living/proc/make_kindred(generation = DEFAULT_GENERATION, datum/subsplat/vampire_clan/clan, enlightenment, mob/living/sire) +/mob/living/proc/make_kindred(generation = DEFAULT_GENERATION, datum/subsplat/vampire_clan/clan, mob/living/sire) RETURN_TYPE(/datum/splat/vampire/kindred) - return add_splat(/datum/splat/vampire/kindred, generation, clan, enlightenment, sire) + return add_splat(/datum/splat/vampire/kindred, generation, clan, sire) /** * Makes the mob a Kindred as if Embraced by another Kindred. @@ -26,4 +26,4 @@ if (!always_same_clan && prob(5)) childe_clan = GLOB.vampire_clans[/datum/subsplat/vampire_clan/caitiff] - return make_kindred(sire_splat.generation + 1, childe_clan, FALSE, sire) + return make_kindred(sire_splat.generation + 1, childe_clan, sire) From c5c11189cc90452e16db639378de06aee0580df4 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Thu, 26 Feb 2026 19:13:30 -0600 Subject: [PATCH 3/5] yea --- .../modules/blood_drinking/code/bite_helper_procs.dm | 2 +- modular_darkpack/modules/blood_drinking/code/vamp_bite.dm | 2 +- modular_darkpack/modules/city_time/code/status_effects.dm | 2 +- modular_darkpack/modules/economy/code/selling/lombard.dm | 2 +- modular_darkpack/modules/economy/code/selling/selling.dm | 2 +- .../modules/powers/code/discipline/dementation.dm | 2 +- .../modules/vampire_the_masquerade/code/kindred/humanity.dm | 2 +- .../code/preferences/morality/morality.dm | 5 +++-- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm b/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm index d8ddcd18fea1..84631cb5b1c3 100644 --- a/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm +++ b/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm @@ -5,7 +5,7 @@ var/datum/splat/vampire/kindred/kindred_splat = iskindred(src) if(kindred_splat) - var/hunger_threshold = 7 - (src.get_enlightenment() ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL)) + var/hunger_threshold = 7 - (src.is_enlightenment() ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL)) var/previous_hunger = HAS_TRAIT(src, TRAIT_NEEDS_BLOOD) var/will_be_hungry = (clamp(bloodpool + amount, 0, maxbloodpool) < hunger_threshold) diff --git a/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm b/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm index b52a84c2c653..6afc3e73b75f 100644 --- a/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm +++ b/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm @@ -40,7 +40,7 @@ var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) if(!skipface) if(iskindred(src) && HAS_TRAIT(src, TRAIT_NEEDS_BLOOD)) - var/stat_to_roll = src.get_enlightenment() ? STAT_INSTINCT : STAT_SELF_CONTROL + var/stat_to_roll = src.is_enlightenment() ? STAT_INSTINCT : STAT_SELF_CONTROL var/datum/storyteller_roll/frezy_roll = new() frezy_roll.applicable_stats = list(stat_to_roll) var/frenzy_result = frezy_roll.st_roll(src, bit_living) diff --git a/modular_darkpack/modules/city_time/code/status_effects.dm b/modular_darkpack/modules/city_time/code/status_effects.dm index 122b14d704d6..8172bfc8fa13 100644 --- a/modular_darkpack/modules/city_time/code/status_effects.dm +++ b/modular_darkpack/modules/city_time/code/status_effects.dm @@ -30,7 +30,7 @@ if(!kindred_owner) return FALSE // Humanity 10 vamps are immume to the light. atleast for the amount of time our day lasts. - if(CONFIG_GET(flag/humanity_sunlight_resistance) && !owner.get_enlightenment() && (owner.st_get_stat(STAT_MORALITY) >= 10)) + if(CONFIG_GET(flag/humanity_sunlight_resistance) && !owner.is_enlightenment() && (owner.st_get_stat(STAT_MORALITY) >= 10)) return FALSE to_chat(owner, span_danger("THE SUN SEARS YOUR FLESH")) diff --git a/modular_darkpack/modules/economy/code/selling/lombard.dm b/modular_darkpack/modules/economy/code/selling/lombard.dm index e400f9bebb16..66b1cddf15cb 100644 --- a/modular_darkpack/modules/economy/code/selling/lombard.dm +++ b/modular_darkpack/modules/economy/code/selling/lombard.dm @@ -173,7 +173,7 @@ // Morality loss warning for bulk sales if(selling_comp.humanity_loss && ishuman(user)) var/mob/living/carbon/human/H = user - if(!iskindred(H) || !H.get_enlightenment()) + if(!iskindred(H) || !H.is_enlightenment()) var/humanity_loss_modifier = HAS_TRAIT(H, TRAIT_SENSITIVE_HUMANITY) ? 2 : 1 var/total_humanity_risk = length(items_to_sell) * humanity_loss_modifier * selling_comp.humanity_loss diff --git a/modular_darkpack/modules/economy/code/selling/selling.dm b/modular_darkpack/modules/economy/code/selling/selling.dm index 5d2b144b5334..90b329c27a51 100644 --- a/modular_darkpack/modules/economy/code/selling/selling.dm +++ b/modular_darkpack/modules/economy/code/selling/selling.dm @@ -56,7 +56,7 @@ // If we found a seller and they're on Enlightenment path, no warning if(seller && iskindred(seller)) - if(seller.get_enlightenment()) + if(seller.is_enlightenment()) return span_notice("You've sold [parent]!") // Default warning for Humanity path or non-vampires diff --git a/modular_darkpack/modules/powers/code/discipline/dementation.dm b/modular_darkpack/modules/powers/code/discipline/dementation.dm index 3fe1d594752f..c3946a948767 100644 --- a/modular_darkpack/modules/powers/code/discipline/dementation.dm +++ b/modular_darkpack/modules/powers/code/discipline/dementation.dm @@ -135,7 +135,7 @@ pools for a turn or two after the manifestation. /datum/discipline_power/dementation/the_haunting/pre_activation_checks(mob/living/carbon/human/target) var/resistence_stat = target.st_get_stat(STAT_SELF_CONTROL) if(iskindred(target)) - resistence_stat = target.st_get_stat(owner.get_enlightenment() ? STAT_CONVICTION : STAT_SELF_CONTROL) + resistence_stat = target.st_get_stat(owner.is_enlightenment() ? STAT_CONVICTION : STAT_SELF_CONTROL) var/theirpower = target.st_get_stat(STAT_PERCEPTION) + resistence_stat mypower = SSroll.storyteller_roll(owner.st_get_stat(STAT_MANIPULATION) + owner.st_get_stat(STAT_SUBTERFUGE), theirpower, owner, numerical = TRUE) if(mypower <= 0) diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm b/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm index f3596073f5e4..0e3fe36dae81 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm @@ -2,7 +2,7 @@ SIGNAL_HANDLER // "Enlightenment" is essentially the Path of Pure Evil. Inverts Humanity changes and limits. - var/is_enlightenment = owner.get_enlightenment() + var/is_enlightenment = owner.is_enlightenment() var/path = is_enlightenment ? "Enlightenment" : "Humanity" if (is_enlightenment && !forced) value = -value diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/preferences/morality/morality.dm b/modular_darkpack/modules/vampire_the_masquerade/code/preferences/morality/morality.dm index 80f2703b2923..c412ae633478 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/preferences/morality/morality.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/preferences/morality/morality.dm @@ -40,10 +40,11 @@ stat_morality.morality_path = new value(target) -/mob/living/proc/get_enlightenment() +/mob/living/proc/is_enlightenment() var/datum/st_stat/morality_path/morality/stat_morality = storyteller_stats["[STAT_MORALITY]"] if(!stat_morality?.morality_path) - return + return FALSE if(stat_morality.morality_path.alignment == MORALITY_ENLIGHTENMENT) return TRUE + return FALSE From 020ced4afdd2823d456cd4a6eb7c8a4dd5167706 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Thu, 26 Feb 2026 19:22:42 -0600 Subject: [PATCH 4/5] yea --- .../modules/blood_drinking/code/bite_helper_procs.dm | 2 +- modular_darkpack/modules/blood_drinking/code/vamp_bite.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm b/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm index 84631cb5b1c3..06a48111086c 100644 --- a/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm +++ b/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm @@ -5,7 +5,7 @@ var/datum/splat/vampire/kindred/kindred_splat = iskindred(src) if(kindred_splat) - var/hunger_threshold = 7 - (src.is_enlightenment() ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL)) + var/hunger_threshold = 7 - (is_enlightenment() ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL)) var/previous_hunger = HAS_TRAIT(src, TRAIT_NEEDS_BLOOD) var/will_be_hungry = (clamp(bloodpool + amount, 0, maxbloodpool) < hunger_threshold) diff --git a/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm b/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm index 6afc3e73b75f..135260bcc1ee 100644 --- a/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm +++ b/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm @@ -40,7 +40,7 @@ var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) if(!skipface) if(iskindred(src) && HAS_TRAIT(src, TRAIT_NEEDS_BLOOD)) - var/stat_to_roll = src.is_enlightenment() ? STAT_INSTINCT : STAT_SELF_CONTROL + var/stat_to_roll = is_enlightenment() ? STAT_INSTINCT : STAT_SELF_CONTROL var/datum/storyteller_roll/frezy_roll = new() frezy_roll.applicable_stats = list(stat_to_roll) var/frenzy_result = frezy_roll.st_roll(src, bit_living) From 6a3345adb9af2f69004e88fa8d32c8a4db773739 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Fri, 6 Mar 2026 02:02:46 -0600 Subject: [PATCH 5/5] review --- .../storyteller_stats/code/st_stats/base_type/_morality.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_morality.dm b/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_morality.dm index de0e87601191..01dd6b3bb6ba 100644 --- a/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_morality.dm +++ b/modular_darkpack/modules/storyteller_stats/code/st_stats/base_type/_morality.dm @@ -1,8 +1,8 @@ /datum/st_stat/morality_path abstract_type = /datum/st_stat/morality_path category = "Morality Path" - starting_score = 7 + starting_score = 2 min_score = 0 max_score = 10 points = 0 - freebie_point_cost = FREEBIE_COST_HUMANITY + // freebie_point_cost = FREEBIE_COST_HUMANITY