Mechanical Bawn

code/__DEFINES/~darkpack/traits/declarations.dm

@@ -146,6 +146,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NO_LYING_ANGLE "no_lying_angle"
 // Expensive but allows us to ensure there resting gets updated.
 #define TRAIT_TRANSFORM_UPDATES_ICON "transform_updates_icon"
+#define TRAIT_OPENS_MOONGATES "opens_moongates"
+/// Friends and allowed to interact with the main gaian caern
+#define TRAIT_GAIA_CAERN_FRIEND "gaia_caern_friend"
 // Fera both grants a flight ability, and has the sprites to support such a thing. (Presently only designed to supprot feral form.)
 #define TRAIT_FERA_FLIGHT "fera_flight"
 #define TRAIT_SILVER_WEAKNESS "silver_weakness"

code/__DEFINES/~darkpack/traits/sources.dm

@@ -1,7 +1,7 @@
 #define NPC_ITEM_TRAIT "npc_item"
 
-/// Trait given by a vampire's Clan
-#define CLAN_TRAIT "clan"
+/// Trait given by a splat's subsplat
+#define SUBSPLAT_TRAIT "subsplat"
 
 #define GIFT_TRAIT "gift"
 

code/_globalvars/traits/_traits.dm

@@ -702,6 +702,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"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_BRASSKNUCKLES" = TRAIT_BRASSKNUCKLES, // DARKPACK EDIT ADD - CLOTHES
 		"TRAIT_CALM_HEART" = TRAIT_CALM_HEART, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_CANNOT_RESIST_MIND_CONTROL" = TRAIT_CANNOT_RESIST_MIND_CONTROL, // DARKPACK EDIT ADD
 		"TRAIT_CAN_ENTER_TORPOR" = TRAIT_CAN_ENTER_TORPOR, // DARKPACK EDIT ADD
@@ -723,11 +724,11 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_FEEDING_RESTRICTION" = TRAIT_FEEDING_RESTRICTION, // DARKPACK EDIT ADD
 		"TRAIT_FERA_FLIGHT" = TRAIT_FERA_FLIGHT, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_FERA_FORMS" = TRAIT_FERA_FORMS, // DARKPACK EDIT ADD - WEREWOLF
-		"TRAIT_POSSIBLE_WYRM" = TRAIT_POSSIBLE_WYRM, // DARKPACK EDIT ADD - WEREWOLF
 		"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_GAIA_CAERN_FRIEND" = TRAIT_GAIA_CAERN_FRIEND, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_GHOST_VISION" = TRAIT_GHOST_VISION, // DARKPACK EDIT ADD - POWERS - (Necromancy)
 		"TRAIT_GLOWING_EYES" = TRAIT_GLOWING_EYES, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
 		"TRAIT_GOLD_WEAKNESS" = TRAIT_GOLD_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF - (corax)
@@ -762,12 +763,14 @@ 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_OPENS_MOONGATES" = TRAIT_OPENS_MOONGATES, // DARKPACK EDIT ADD - WEREWOLF
 		"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
 		"TRAIT_PASS_THROUGH_WALLS" = TRAIT_PASS_THROUGH_WALLS, // DARKPACK EDIT ADD
 		"TRAIT_PERMAFANGS" = TRAIT_PERMAFANGS, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_PIERCED_VEIL" = TRAIT_PIERCED_VEIL, // DARKPACK EDIT ADD - MERITS_FLAWS
+		"TRAIT_POSSIBLE_WYRM" = TRAIT_POSSIBLE_WYRM, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_PREY_EXCLUSION" = TRAIT_PREY_EXCLUSION, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_PROMETHEAN_CLAY" = TRAIT_PROMETHEAN_CLAY, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_RAZOR_CLAWS" = TRAIT_RAZOR_CLAWS, // DARKPACK EDIT ADD - WEREWOLF
@@ -810,7 +813,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_WEAK_WILLED" = TRAIT_WEAK_WILLED, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_WYRMTAINTED" = TRAIT_WYRMTAINTED, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_WYRMTAINTED_SPRITE" = TRAIT_WYRMTAINTED_SPRITE, // DARKPACK EDIT ADD - WEREWOLF
-		"TRAIT_BRASSKNUCKLES" = TRAIT_BRASSKNUCKLES, // DARKPACK EDIT ADD - CLOTHES
 	),
 	/mob/living/carbon = list(
 		"TRAIT_BRAINLESS_CARBON" = TRAIT_BRAINLESS_CARBON,

code/_globalvars/traits/admin_tooling.dm

@@ -396,6 +396,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"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_GAIA_CAERN_FRIEND" = TRAIT_GAIA_CAERN_FRIEND, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_GHOST_VISION" = TRAIT_GHOST_VISION, // DARKPACK EDIT ADD - POWERS - (Necromancy)
 		"TRAIT_GLOWING_EYES" = TRAIT_GLOWING_EYES, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
 		"TRAIT_GOLD_WEAKNESS" = TRAIT_GOLD_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF - (corax)
@@ -427,6 +428,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_OPENS_MOONGATES" = TRAIT_OPENS_MOONGATES, // DARKPACK EDIT ADD - WEREWOLF
 		"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

code/modules/power/lighting/light_mapping_helpers.dm

@@ -119,9 +119,12 @@
 
 /obj/machinery/light/prince/ghost/Initialize(mapload)
 	. = ..()
-	RegisterSignal(src, COMSIG_ATOM_ENTERED, PROC_REF(jumpscare))
+	var/static/list/loc_connections = list(
+		COMSIG_ATOM_ENTERED = PROC_REF(jumpscare),
+	)
+	AddElement(/datum/element/connect_loc, loc_connections)
 
-/obj/machinery/light/prince/ghost/proc/jumpscare(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+/obj/machinery/light/prince/ghost/proc/jumpscare(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
 	SIGNAL_HANDLER
 
 	if(ishuman(arrived))

modular_darkpack/modules/areas/code/interiors/garou.dm

@@ -6,6 +6,13 @@
 	zone_type = ZONE_ELYSIUM
 	gauntlet_rating = 5
 
+/area/vtm/interior/cog/caern/bawn
+	name = "Children of Gaia Bawn"
+
+/area/vtm/interior/cog/caern/bawn/LateInitialize()
+	. = ..()
+	AddComponent(/datum/component/bawn_area, /obj/structure/werewolf_totem/children_of_gaia)
+
 /area/vtm/interior/cog/pantry
 	name = "Earth's Bounty Food Pantry"
 	icon_state = "cog_pantry"

modular_darkpack/modules/merits_flaws/code/positive_quirks/giovanni_sanguine_incongruity.dm

@@ -20,7 +20,7 @@
 	var/datum/splat/vampire/kindred/kindred = get_kindred_splat(human_holder)
 	if(kindred)
 		if(istype(kindred.clan, /datum/subsplat/vampire_clan/giovanni))
-			REMOVE_TRAIT(human_holder, TRAIT_PAINFUL_VAMPIRE_KISS, CLAN_TRAIT)
+			REMOVE_TRAIT(human_holder, TRAIT_PAINFUL_VAMPIRE_KISS, SUBSPLAT_TRAIT)
 
 			if(human_holder.chronological_age >= 300)
 				human_holder.rot_body(2)

modular_darkpack/modules/merits_flaws/code/positive_quirks/stillness_of_death.dm

@@ -43,7 +43,7 @@
 	active = TRUE
 	ADD_TRAIT(owner, TRAIT_IMMOBILIZED, "statue_form")
 	ADD_TRAIT(owner, TRAIT_MUTE, "statue_form")
-	REMOVE_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, CLAN_TRAIT)
+	REMOVE_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, SUBSPLAT_TRAIT)
 	owner.name = "Statue of a Gargoyle"
 	var/newcolor = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
 	owner.add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
@@ -58,7 +58,7 @@
 
 	REMOVE_TRAIT(owner, TRAIT_IMMOBILIZED, "statue_form")
 	REMOVE_TRAIT(owner, TRAIT_MUTE, "statue_form")
-	ADD_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, CLAN_TRAIT)
+	ADD_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, SUBSPLAT_TRAIT)
 
 	owner.remove_atom_colour(FIXED_COLOUR_PRIORITY)
 	owner.name = original_name

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

@@ -276,10 +276,10 @@
 	if(target_splat?.clan?.alt_sprite)
 		owner.set_body_sprite(target_splat.clan.alt_sprite, target_splat.clan.alt_sprite_greyscale, TRUE)
 	else
-		if(owner_splat.clan && (TRAIT_MASQUERADE_VIOLATING_FACE in owner_splat.clan.clan_traits))
-			REMOVE_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, CLAN_TRAIT)
-		if(owner_splat.clan && (TRAIT_MASQUERADE_VIOLATING_EYES in owner_splat.clan.clan_traits))
-			REMOVE_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_EYES, CLAN_TRAIT)
+		if(owner_splat.clan && (TRAIT_MASQUERADE_VIOLATING_FACE in owner_splat.clan.subsplat_traits))
+			REMOVE_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, SUBSPLAT_TRAIT)
+		if(owner_splat.clan && (TRAIT_MASQUERADE_VIOLATING_EYES in owner_splat.clan.subsplat_traits))
+			REMOVE_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_EYES, SUBSPLAT_TRAIT)
 		if(original_sprite == "rotten4" || original_sprite == "rotten3")
 			REMOVE_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, MAGIC_TRAIT)
 		owner.set_body_sprite(SPECIES_HUMAN, TRUE, TRUE)
@@ -296,10 +296,10 @@
 	original_dna.copy_dna(owner.dna, 0)
 	owner.name = original_name
 
-	if(owner_splat.clan && (TRAIT_MASQUERADE_VIOLATING_FACE in owner_splat.clan.clan_traits))
-		ADD_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, CLAN_TRAIT)
-	if(owner_splat.clan && (TRAIT_MASQUERADE_VIOLATING_EYES in owner_splat.clan.clan_traits))
-		ADD_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_EYES, CLAN_TRAIT)
+	if(owner_splat.clan && (TRAIT_MASQUERADE_VIOLATING_FACE in owner_splat.clan.subsplat_traits))
+		ADD_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, SUBSPLAT_TRAIT)
+	if(owner_splat.clan && (TRAIT_MASQUERADE_VIOLATING_EYES in owner_splat.clan.subsplat_traits))
+		ADD_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_EYES, SUBSPLAT_TRAIT)
 	if(original_sprite == "rotten4" || original_sprite == "rotten3")
 		ADD_TRAIT(owner, TRAIT_MASQUERADE_VIOLATING_FACE, MAGIC_TRAIT)
 

modular_darkpack/modules/splats/code/subsplat/_subsplat.dm

@@ -21,6 +21,9 @@
 	/// ID for trait sources and whatnot
 	var/id
 
+	/// List of traits that are applied to members of this subsplat
+	var/list/subsplat_traits = list()
+
 	/// Typepath of keys for this subsplats's exclusive hideout
 	var/obj/item/vamp/keys/subsplat_keys
 	/// If we check the list of ids of city doors before granting the subsplat key
@@ -34,6 +37,10 @@
 		RegisterSignal(gaining_mob, COMSIG_MOB_LOGIN, PROC_REF(on_join_round))
 		RegisterSignal(gaining_mob, COMSIG_HUMAN_CHARACTER_SETUP_FINISHED, PROC_REF(apply_after_setup))
 
+	// Add unique subsplat features as traits
+	for (var/trait in subsplat_traits)
+		ADD_TRAIT(gaining_mob, trait, SUBSPLAT_TRAIT)
+
 /**
  * Undoes the effects of on_gain more or less
  * remove the effects of gaining the subsplat.
@@ -44,6 +51,11 @@
 /datum/subsplat/proc/on_lose(mob/living/carbon/human/losing_mob)
 	SHOULD_CALL_PARENT(TRUE)
 	UnregisterSignal(losing_mob, list(COMSIG_MOB_LOGIN, COMSIG_HUMAN_CHARACTER_SETUP_FINISHED))
+
+	// Remove unique subsplat feature traits
+	for (var/trait in subsplat_traits)
+		REMOVE_TRAIT(losing_mob, trait, SUBSPLAT_TRAIT)
+
 	return
 
 

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/__vampire_clan.dm

@@ -9,8 +9,6 @@
 	var/list/clan_disciplines = list()
 	/// List of Disciplines that are rejected by this Clan
 	var/list/restricted_disciplines = list()
-	/// List of traits that are applied to members of this Clan
-	var/list/clan_traits = list()
 
 	/// The Clan's unique body sprite
 	var/alt_sprite
@@ -69,20 +67,12 @@
 	if (no_facial)
 		gaining_mob.set_facial_hairstyle("Shaved", update = FALSE)
 
-	// Add unique Clan features as traits
-	for (var/trait in clan_traits)
-		ADD_TRAIT(gaining_mob, trait, CLAN_TRAIT)
-
 	// Mostly for summons to not kill you.
 	gaining_mob.add_faction(id)
 
 /datum/subsplat/vampire_clan/on_lose(mob/living/carbon/human/losing_mob)
 	. = ..()
 
-	// Remove unique Clan feature traits
-	for (var/trait in clan_traits)
-		REMOVE_TRAIT(losing_mob, trait, CLAN_TRAIT)
-
 	// Sets the losing_mob back to their default body sprite
 	if (alt_sprite)
 		losing_mob.set_body_sprite(ignore_clan = TRUE)

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/baali/baali.dm

@@ -11,7 +11,7 @@
 		/datum/discipline/daimoinon
 	)
 
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_REPELLED_BY_HOLINESS
 	)
 	male_clothes = /obj/item/clothing/under/vampire/baali

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/banu_haqim.dm

@@ -11,7 +11,7 @@
 		/datum/discipline/obfuscate,
 		/datum/discipline/quietus
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_VITAE_ADDICTION
 	)
 	male_clothes = /obj/item/clothing/under/vampire/bandit
@@ -34,4 +34,4 @@
 		/datum/discipline/auspex,
 		/datum/discipline/quietus
 	)
-	clan_traits =  list()
+	subsplat_traits =  list()

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/brujah.dm

@@ -11,7 +11,7 @@
 		/datum/discipline/potence,
 		/datum/discipline/presence
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_DIFFICULT_FRENZY
 	)
 	male_clothes = /obj/item/clothing/under/vampire/brujah

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/gargoyle.dm

@@ -10,7 +10,7 @@
 		/datum/discipline/potence,
 		/datum/discipline/visceratika
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_CANNOT_RESIST_MIND_CONTROL,
 		TRAIT_MASQUERADE_VIOLATING_FACE,
 		TRAIT_WEAK_TO_DOMINATE,

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/giovanni.dm

@@ -10,7 +10,7 @@
 		/datum/discipline/dominate,
 		/datum/discipline/necromancy
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_PAINFUL_VAMPIRE_KISS
 	)
 	male_clothes = /obj/item/clothing/under/vampire/suit

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/healer_salubri.dm

@@ -10,7 +10,7 @@
 		/datum/discipline/fortitude,
 		/datum/discipline/obeah
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_CONSENSUAL_FEEDING_ONLY,
 		TRAIT_IRRESISTIBLE_VITAE
 	)

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/kiasyd/kiasyd.dm

@@ -10,7 +10,7 @@
 		/datum/discipline/obtenebration,
 		/datum/discipline/mytherceria
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_MASQUERADE_VIOLATING_EYES
 	)
 	alt_sprite = "kiasyd"

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/lasombra.dm

@@ -10,7 +10,7 @@
 		/datum/discipline/dominate,
 		/datum/discipline/obtenebration
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_REJECTED_BY_TECHNOLOGY,
 		TRAIT_NO_MIRROR_REFLECTION,
 		TRAIT_INVISIBLE_TO_CAMERA

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/nagaraja.dm

@@ -10,7 +10,7 @@
 		/datum/discipline/dominate,
 		/datum/discipline/necromancy
 	)
-	clan_traits = list(TRAIT_ORGANOVORE)
+	subsplat_traits = list(TRAIT_ORGANOVORE)
 	male_clothes = /obj/item/clothing/under/vampire/emo
 	female_clothes = /obj/item/clothing/under/vampire/emo
 	whitelisted = FALSE

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/nosferatu.dm

@@ -12,7 +12,7 @@
 		/datum/discipline/potence,
 		/datum/discipline/obfuscate
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_MASQUERADE_VIOLATING_FACE,
 		TRAIT_VENTCRAWLER_ALWAYS
 	)

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/samedi.dm

@@ -10,7 +10,7 @@
 		/datum/discipline/thanatosis
 	)
 	alt_sprite = "rotten4"
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_MASQUERADE_VIOLATING_FACE
 	)
 	whitelisted = TRUE

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/setite.dm

@@ -11,7 +11,7 @@
 		/datum/discipline/presence,
 		/datum/discipline/serpentis
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_LIGHT_WEAKNESS
 	)
 	male_clothes = /obj/item/clothing/under/vampire/slickback

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/toreador.dm

@@ -11,7 +11,7 @@
 		/datum/discipline/celerity,
 		/datum/discipline/presence
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_SENSITIVE_HUMANITY
 	)
 	male_clothes = /obj/item/clothing/under/vampire/toreador

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/ventrue.dm

@@ -11,7 +11,7 @@
 		/datum/discipline/fortitude,
 		/datum/discipline/presence
 	)
-	clan_traits = list(
+	subsplat_traits = list(
 		TRAIT_FEEDING_RESTRICTION
 	)
 	male_clothes = /obj/item/clothing/under/vampire/ventrue

modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/warrior_salubri.dm

@@ -9,7 +9,7 @@
 		/datum/discipline/fortitude,
 		/datum/discipline/valeren
 	)
-	clan_traits = list()
+	subsplat_traits = list()
 	male_clothes = /obj/item/clothing/under/vampire/salubri
 	female_clothes = /obj/item/clothing/under/vampire/salubri/female
 	enlightenment = FALSE