[TM ONLY] Guptime Testmerge

code/__DEFINES/~darkpack/auras.dm

@@ -15,7 +15,7 @@
 #define AURA_HAPPY COLOR_VIVID_RED // Vermillion
 #define AURA_HATEFUL COLOR_BLACK // Black
 #define AURA_IDEALISTIC COLOR_YELLOW // Yellow
-#define AURA_INNOCENT COLOR_WHITE // White
+#define AURA_INNOCENT COLOR_OFF_WHITE // White
 #define AURA_LOVESTRUCK COLOR_BLUE // Blue
 #define AURA_OBSESSED COLOR_GREEN // Green
 #define AURA_SAD COLOR_SILVER // Silver

code/__DEFINES/~darkpack/dcs/signals_mob/signals_mob_living.dm

@@ -7,3 +7,5 @@
 //from base of living/CanAllowThrough(): (atom/movable/mover, border_dir)
 #define COMSIG_LIVING_CAN_ALLOW_THROUGH "living_can_allow_through"
 	#define COMPONENT_LIVING_PASSABLE (1<<0)
+//from /datum/storyteller_roll/proc/st_roll(), args are the roll datum and role output
+#define COMSIG_LIVING_DICE_ROLLED "living_dice_rolled"

code/__DEFINES/~darkpack/fera/fera.dm

@@ -25,4 +25,4 @@ GLOBAL_LIST_INIT(garou_fur_colors, list(
 	"brown" = "brown"
 ))
 
-#define STATUS_EFFECT_SILVER_BULLLET_STACKS /datum/status_effect/stacking/silver_bullets
+#define STATUS_EFFECT_SILVER_BULLET_STACKS /datum/status_effect/stacking/silver_bullets

code/__DEFINES/~darkpack/splats.dm

@@ -9,5 +9,6 @@
 //#define SPLAT_FERA "splat_fera"
 #define SPLAT_GAROU "splat_garou"
 #define SPLAT_CORAX "splat_corax" // DARKPACK TODO - CORAX
+#define SPLAT_SHIFTERS list(SPLAT_GAROU, SPLAT_CORAX)
 
 #define SPLAT_ALL list(SPLAT_NONE, SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_GAROU)

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

@@ -42,7 +42,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_CHARMER "charmer"
 
 // Mutates the apperance of auras
-#define TRAIT_COLD_AURA "cold_aura"
+#define TRAIT_PALE_AURA "pale_aura"
 #define TRAIT_WARM_AURA "warm_aura"
 #define TRAIT_FRENETIC_AURA "frenetic_aura"
 
@@ -124,20 +124,34 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_WTA_GAROU_AUSPICE "wta_garou_auspice"
 // This mob has fur!
 #define TRAIT_FERA_FUR "fera_fur"
-/// If the fera is wyrm tainted. Affects their sprite.
+/// If the fera is wyrm tainted.
 #define TRAIT_WYRMTAINTED "wyrm_tainted"
+/// If the fera is wyrm tainted. Affects their sprite.
+#define TRAIT_WYRMTAINTED_SPRITE "wyrm_tainted_sprite"
 /// For living mobs to prevent adjustments to their lying angle. Used primarly for fera.
 #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"
-// Massivly boosts the range of your howl emote.
-#define TRAIT_LOUD_HOWLER "loud_howler"
 /// Prevents the mob from picking up items larger then small
 #define TRAIT_SMALL_HANDS "small_hands"
+// Traits granted via gifts
+// Massivly boosts the range of your howl emote.
+#define TRAIT_LOUD_HOWLER "loud_howler"
+#define TRAIT_RAZOR_CLAWS "razor_claws"
+
+/// Sixth sense restricted to view range
+#define TRAIT_LOCAL_SIXTHSENSE "local_sixth_sense"
 
 // BELOW ARE ALL MERITS/FLAWS
 #define TRAIT_ILLEGAL_IDENTITY "illegal_identity" // GOVERNMENT
+#define TRAIT_ANIMAL_MUSK "animal_musk"
 #define TRAIT_PERMAFANGS "permafangs"
+#define TRAIT_PIERCED_VEIL "pierced_veil"
+#define TRAIT_WEAK_WILLED "weak_willed"
+#define TRAIT_TIME_SENSE "time_sense"
+#define TRAIT_METAMORPH "metamorph"
+#define TRAIT_MERIT_UNTAMABLE "merit_untamable"
+#define TRAIT_FAIR_GLABRO "fair_glabro"
 
 
 // END TRAIT DEFINES

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

@@ -4,6 +4,8 @@
 #define CLAN_TRAIT "clan"
 #define DISCIPLINE_TRAIT "discipline"
 
+#define GIFT_TRAIT "gift"
+
 #define STAKE_TRAIT "stake"
 #define DAMAGE_TRAIT "damage"
 

code/__HELPERS/mobs.dm

@@ -403,6 +403,10 @@ GLOBAL_LIST_INIT(skin_tone_names, list(
 			override = TRUE
 		if(HAS_TRAIT(M, TRAIT_SIXTHSENSE) && message_type == DEADCHAT_REGULAR)
 			override = TRUE
+		// DARKPACK EDIT ADD START
+		if(HAS_TRAIT(M, TRAIT_LOCAL_SIXTHSENSE) && (message_type == DEADCHAT_REGULAR) && (source in orange(DEFAULT_MESSAGE_RANGE, M)))
+			override = TRUE
+		// DARKPACK EDIT ADD END
 		if(SSticker.current_state == GAME_STATE_FINISHED)
 			override = TRUE
 		if(isnewplayer(M) && !override)

code/_globalvars/traits/_traits.dm

@@ -492,7 +492,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_PERCEPTUAL_TRAUMA_BYPASS" = TRAIT_PERCEPTUAL_TRAUMA_BYPASS,
 		"TRAIT_PERFECT_ATTACKER" = TRAIT_PERFECT_ATTACKER,
 		"TRAIT_PERMANENTLY_MORTAL" = TRAIT_PERMANENTLY_MORTAL,
-		"TRAIT_PERMAFANGS" = TRAIT_PERMAFANGS,
 		"TRAIT_PHOTOGRAPHER" = TRAIT_PHOTOGRAPHER,
 		"TRAIT_PIERCEIMMUNE" = TRAIT_PIERCEIMMUNE,
 		"TRAIT_PLANT_SAFE" = TRAIT_PLANT_SAFE,
@@ -665,21 +664,22 @@ 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_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS/FLAWS
+		"TRAIT_BLOOD_DRINKER" = TRAIT_BLOOD_DRINKER, // DARKPACK EDIT ADD
 		"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
 		"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
-		"TRAIT_BLOOD_DRINKER" = TRAIT_BLOOD_DRINKER, // DARKPACK EDIT ADD
 		"TRAIT_BLUSH_OF_HEALTH" = TRAIT_BLUSH_OF_HEALTH, // DARKPACK EDIT ADD
 		"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
 		"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
 		"TRAIT_CONSENSUAL_FEEDING_ONLY" = TRAIT_CONSENSUAL_FEEDING_ONLY, // DARKPACK EDIT ADD
 		"TRAIT_DEFICIENT_VITAE" = TRAIT_DEFICIENT_VITAE, // DARKPACK EDIT ADD
 		"TRAIT_DIABLERIE" = TRAIT_DIABLERIE, // DARKPACK EDIT ADD
 		"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
 		"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
-		"TRAIT_FAKE_SOULLESS" = TRAIT_FAKE_SOULLESS, // DARKPACK EDIT ADD
+		"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_FRENETIC_AURA" = TRAIT_FRENETIC_AURA, // DARKPACK EDIT ADD
@@ -693,10 +693,12 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_IN_FRENZY" = TRAIT_IN_FRENZY, // DARKPACK EDIT ADD
 		"TRAIT_IRRESISTIBLE_VITAE" = TRAIT_IRRESISTIBLE_VITAE, // DARKPACK EDIT ADD
 		"TRAIT_LAZY" = TRAIT_LAZY, // DARKPACK EDIT ADD
+		"TRAIT_LOCAL_SIXTHSENSE" = TRAIT_LOCAL_SIXTHSENSE, // DARKPACK EDIT ADD
 		"TRAIT_LONGER_FRENZY" = TRAIT_LONGER_FRENZY, // DARKPACK EDIT ADD
 		"TRAIT_LOUD_HOWLER" = TRAIT_LOUD_HOWLER, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_MASQUERADE_VIOLATING_EYES" = TRAIT_MASQUERADE_VIOLATING_EYES, // DARKPACK EDIT ADD
 		"TRAIT_MASQUERADE_VIOLATING_FACE" = TRAIT_MASQUERADE_VIOLATING_FACE, // DARKPACK EDIT ADD
+		"TRAIT_MERIT_UNTAMABLE" = TRAIT_MERIT_UNTAMABLE, // DARKPACK EDIT ADD - MERITS/FLAWS
 		"TRAIT_MYSTICISM_KNOWLEDGE" = TRAIT_MYSTICISM_KNOWLEDGE, // DARKPACK EDIT ADD
 		"TRAIT_NECROMANCY_KNOWLEDGE" = TRAIT_NECROMANCY_KNOWLEDGE, // DARKPACK EDIT ADD
 		"TRAIT_NEEDS_BLOOD" = TRAIT_NEEDS_BLOOD, //DARKPACK EDIT ADD - Hunger and Frenzy
@@ -706,6 +708,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_PAINFUL_VAMPIRE_KISS" = TRAIT_PAINFUL_VAMPIRE_KISS, // DARKPACK EDIT ADD
 		"TRAIT_PASSDOOR" = TRAIT_PASSDOOR, // DARKPACK EDIT ADD
 		"TRAIT_PASS_THROUGH_WALLS" = TRAIT_PASS_THROUGH_WALLS, // DARKPACK EDIT ADD
+		"TRAIT_RAZOR_CLAWS" = TRAIT_RAZOR_CLAWS, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_PERMAFANGS" = TRAIT_PERMAFANGS, // DARKPACK EDIT ADD - MERITS/FLAWS
 		"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
@@ -718,6 +722,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_STAKE_RESISTANT" = TRAIT_STAKE_RESISTANT, // DARKPACK EDIT ADD
 		"TRAIT_THAUMATURGY_KNOWLEDGE" = TRAIT_THAUMATURGY_KNOWLEDGE, // DARKPACK EDIT ADD
 		"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // DARKPACK EDIT ADD
+		"TRAIT_TIME_SENSE" = TRAIT_TIME_SENSE, // DARKPACK EDIT ADD - MERITS/FLAWS
 		"TRAIT_TORPOR" = TRAIT_TORPOR, // DARKPACK EDIT ADD
 		"TRAIT_TOUGH_FLESH" = TRAIT_TOUGH_FLESH, // DARKPACK EDIT ADD
 		"TRAIT_TRANSFORM_UPDATES_ICON" = TRAIT_TRANSFORM_UPDATES_ICON, // DARKPACK EDIT ADD - WEREWOLF
@@ -731,10 +736,14 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_VTM_MORALITY" = TRAIT_VTM_MORALITY, // DARKPACK EDIT ADD
 		"TRAIT_WARM_AURA" = TRAIT_WARM_AURA, // DARKPACK EDIT ADD
 		"TRAIT_WEAK_TO_DOMINATE" = TRAIT_WEAK_TO_DOMINATE, // DARKPACK EDIT ADD - POWERS - (Dominate)
-		"TRAIT_WTA_GAROU_AUSPICE" = TRAIT_WTA_GAROU_AUSPICE, // DARKPACK EDIT ADD
-		"TRAIT_WTA_GAROU_BREED" = TRAIT_WTA_GAROU_BREED, // DARKPACK EDIT ADD
-		"TRAIT_WTA_GAROU_TRIBE" = TRAIT_WTA_GAROU_TRIBE, // DARKPACK EDIT ADD
-		"TRAIT_WYRMTAINTED" = TRAIT_WYRMTAINTED, // DARKPACK EDIT ADD
+		"TRAIT_WEAK_WILLED" = TRAIT_WEAK_WILLED, // DARKPACK EDIT ADD - MERITS/FLAWS
+		"TRAIT_WTA_GAROU_AUSPICE" = TRAIT_WTA_GAROU_AUSPICE, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_WTA_GAROU_BREED" = TRAIT_WTA_GAROU_BREED, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_WTA_GAROU_TRIBE" = TRAIT_WTA_GAROU_TRIBE, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_WYRMTAINTED" = TRAIT_WYRMTAINTED, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_WYRMTAINTED_SPRITE" = TRAIT_WYRMTAINTED_SPRITE, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_METAMORPH" = TRAIT_METAMORPH, // DARKPACK EDIT ADD - MERITS/FLAWS
+		"TRAIT_PIERCED_VEIL" = TRAIT_PIERCED_VEIL, // DARKPACK EDIT ADD - MERITS/FLAWS
 	),
 	/mob/living/carbon = list(
 		"TRAIT_BRAINLESS_CARBON" = TRAIT_BRAINLESS_CARBON,

code/_globalvars/traits/admin_tooling.dm

@@ -355,21 +355,22 @@ 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_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS/FLAWS
+		"TRAIT_BLOOD_DRINKER" = TRAIT_BLOOD_DRINKER, // DARKPACK EDIT ADD
 		"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
 		"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
-		"TRAIT_BLOOD_DRINKER" = TRAIT_BLOOD_DRINKER, // DARKPACK EDIT ADD
 		"TRAIT_BLUSH_OF_HEALTH" = TRAIT_BLUSH_OF_HEALTH, // DARKPACK EDIT ADD
 		"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
 		"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
 		"TRAIT_CONSENSUAL_FEEDING_ONLY" = TRAIT_CONSENSUAL_FEEDING_ONLY, // DARKPACK EDIT ADD
 		"TRAIT_DEFICIENT_VITAE" = TRAIT_DEFICIENT_VITAE, // DARKPACK EDIT ADD
 		"TRAIT_DIABLERIE" = TRAIT_DIABLERIE, // DARKPACK EDIT ADD
 		"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
 		"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
-		"TRAIT_FAKE_SOULLESS" = TRAIT_FAKE_SOULLESS, // DARKPACK EDIT ADD
+		"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_FRENETIC_AURA" = TRAIT_FRENETIC_AURA, // DARKPACK EDIT ADD
@@ -383,10 +384,12 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_IN_FRENZY" = TRAIT_IN_FRENZY, // DARKPACK EDIT ADD
 		"TRAIT_IRRESISTIBLE_VITAE" = TRAIT_IRRESISTIBLE_VITAE, // DARKPACK EDIT ADD
 		"TRAIT_LAZY" = TRAIT_LAZY, // DARKPACK EDIT ADD
+		"TRAIT_LOCAL_SIXTHSENSE" = TRAIT_LOCAL_SIXTHSENSE, // DARKPACK EDIT ADD
 		"TRAIT_LONGER_FRENZY" = TRAIT_LONGER_FRENZY, // DARKPACK EDIT ADD
 		"TRAIT_LOUD_HOWLER" = TRAIT_LOUD_HOWLER, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_MASQUERADE_VIOLATING_EYES" = TRAIT_MASQUERADE_VIOLATING_EYES, // DARKPACK EDIT ADD
 		"TRAIT_MASQUERADE_VIOLATING_FACE" = TRAIT_MASQUERADE_VIOLATING_FACE, // DARKPACK EDIT ADD
+		"TRAIT_MERIT_UNTAMABLE" = TRAIT_MERIT_UNTAMABLE, // DARKPACK EDIT ADD - MERITS/FLAWS
 		"TRAIT_MYSTICISM_KNOWLEDGE" = TRAIT_MYSTICISM_KNOWLEDGE, // DARKPACK EDIT ADD
 		"TRAIT_NECROMANCY_KNOWLEDGE" = TRAIT_NECROMANCY_KNOWLEDGE, // DARKPACK EDIT ADD
 		"TRAIT_NEEDS_BLOOD" = TRAIT_NEEDS_BLOOD, //DARKPACK EDIT ADD - Hunger and Frenzy
@@ -396,6 +399,8 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_PAINFUL_VAMPIRE_KISS" = TRAIT_PAINFUL_VAMPIRE_KISS, // DARKPACK EDIT ADD
 		"TRAIT_PASSDOOR" = TRAIT_PASSDOOR, // DARKPACK EDIT ADD
 		"TRAIT_PASS_THROUGH_WALLS" = TRAIT_PASS_THROUGH_WALLS, // DARKPACK EDIT ADD
+		"TRAIT_RAZOR_CLAWS" = TRAIT_RAZOR_CLAWS, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_PERMAFANGS" = TRAIT_PERMAFANGS, // DARKPACK EDIT ADD - MERITS/FLAWS
 		"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
@@ -408,6 +413,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_STAKE_RESISTANT" = TRAIT_STAKE_RESISTANT, // DARKPACK EDIT ADD
 		"TRAIT_THAUMATURGY_KNOWLEDGE" = TRAIT_THAUMATURGY_KNOWLEDGE, // DARKPACK EDIT ADD
 		"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // DARKPACK EDIT ADD
+		"TRAIT_TIME_SENSE" = TRAIT_TIME_SENSE, // DARKPACK EDIT ADD - MERITS/FLAWS
 		"TRAIT_TORPOR" = TRAIT_TORPOR, // DARKPACK EDIT ADD
 		"TRAIT_TOUGH_FLESH" = TRAIT_TOUGH_FLESH, // DARKPACK EDIT ADD
 		"TRAIT_TRANSFORM_UPDATES_ICON" = TRAIT_TRANSFORM_UPDATES_ICON, // DARKPACK EDIT ADD - WEREWOLF
@@ -421,10 +427,14 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_VTM_MORALITY" = TRAIT_VTM_MORALITY, // DARKPACK EDIT ADD
 		"TRAIT_WARM_AURA" = TRAIT_WARM_AURA, // DARKPACK EDIT ADD
 		"TRAIT_WEAK_TO_DOMINATE" = TRAIT_WEAK_TO_DOMINATE, // DARKPACK EDIT ADD - POWERS - (Dominate)
-		"TRAIT_WTA_GAROU_AUSPICE" = TRAIT_WTA_GAROU_AUSPICE, // DARKPACK EDIT ADD
-		"TRAIT_WTA_GAROU_BREED" = TRAIT_WTA_GAROU_BREED, // DARKPACK EDIT ADD
-		"TRAIT_WTA_GAROU_TRIBE" = TRAIT_WTA_GAROU_TRIBE, // DARKPACK EDIT ADD
-		"TRAIT_WYRMTAINTED" = TRAIT_WYRMTAINTED, // DARKPACK EDIT ADD
+		"TRAIT_WEAK_WILLED" = TRAIT_WEAK_WILLED, // DARKPACK EDIT ADD - MERITS/FLAWS
+		"TRAIT_WTA_GAROU_AUSPICE" = TRAIT_WTA_GAROU_AUSPICE, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_WTA_GAROU_BREED" = TRAIT_WTA_GAROU_BREED, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_WTA_GAROU_TRIBE" = TRAIT_WTA_GAROU_TRIBE, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_WYRMTAINTED" = TRAIT_WYRMTAINTED, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_WYRMTAINTED_SPRITE" = TRAIT_WYRMTAINTED_SPRITE, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_METAMORPH" = TRAIT_METAMORPH, // DARKPACK EDIT ADD - MERITS/FLAWS
+		"TRAIT_PIERCED_VEIL" = TRAIT_PIERCED_VEIL, // DARKPACK EDIT ADD - MERITS/FLAWS
 	),
 	/obj/item = list(
 		"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,

code/controllers/subsystem/processing/quirks.dm

@@ -26,6 +26,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
 	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
 ))
 
 GLOBAL_LIST_INIT(quirk_string_blacklist, generate_quirk_string_blacklist())

code/controllers/subsystem/statpanel.dm

@@ -39,9 +39,10 @@ SUBSYSTEM_DEF(statpanels)
 			"Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
 			"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss", world.timezone)]",
 			"Round Time: [ROUND_TIME()]",
-			"Local City Time: [SSticker.round_start_timeofday ? "[station_time_timestamp("hh:mm MMM")] [CURRENT_STATION_YEAR]" : "The round hasn't started yet!"]",
+			// "Station Time: [station_time_timestamp()]", // DARKPACK EDIT REMOVAL - MERITS/FLAWS - (Time sense)
 			"Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)",
-			"---", // DARKPACK EDIT ADD
+			"\n", // DARKPACK EDIT ADD
+			"Canon: [GLOB.canon_event ? "Yes" : "No"]", // DARKPACK EDIT ADD
 			"Masquerade: [SSmasquerade.get_description()]", // DARKPACK EDIT ADD
 		)
 

code/datums/quirks/negative_quirks/scarred_eye.dm

@@ -1,5 +1,5 @@
 /datum/quirk/item_quirk/scarred_eye
-	name = "Scarred Eye"
+	name = "One Eye" // DARKPACK EDIT CHANGE - MERITS/FLAWS
 	desc = "An accident in your past has cost you one of your eyes, but you got a cool eyepatch. Yarr!"
 	icon = FA_ICON_EYE_SLASH
 	value = -2
@@ -9,6 +9,7 @@
 	hardcore_value = 2
 	quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_CHANGES_APPEARANCE
 	mail_goodies = list(/obj/item/reagent_containers/cup/glass/bottle/rum, /obj/item/clothing/mask/bandana/red)
+	darkpack_allowed = TRUE // DARKPACK EDIT ADD - MERITS/FLAWS
 
 /datum/quirk_constant_data/eye_scarring
 	associated_typepath = /datum/quirk/item_quirk/scarred_eye

code/modules/client/preferences/scarred_eye.dm

@@ -14,7 +14,7 @@
 	if (!.)
 		return FALSE
 
-	return "Scarred Eye" in preferences.all_quirks
+	return /datum/quirk/item_quirk/scarred_eye::name in preferences.all_quirks // DARKPACK EDIT CHANGE
 
 /datum/preference/choiced/scarred_eye/apply_to_human(mob/living/carbon/human/target, value)
 	return

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

@@ -171,12 +171,16 @@
 		var/mob/living/carbon/human/husrc = src // gross istypesrc but easier than refactoring even further for now
 		if(husrc.skin_tone == "albino")
 			apparent_blood_volume -= (BLOOD_VOLUME_NORMAL * 0.25) // knocks you down a few pegs
-	if(HAS_TRAIT(user, TRAIT_COLD_AURA))
+	// 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.
 	if(HAS_TRAIT(user, TRAIT_WARM_AURA))
 		apparent_blood_volume += (BLOOD_VOLUME_NORMAL * 0.25)
+	*/
 	if(HAS_TRAIT(user, TRAIT_BLUSH_OF_HEALTH))
 		apparent_blood_volume += (BLOOD_VOLUME_NORMAL * 0.50)
+	// DAKRPACK EDIT ADD END
 	switch(apparent_blood_volume)
 		if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
 			. += span_warning("[t_He] [t_has] pale skin.")

code/modules/mob/mob.dm

@@ -905,7 +905,11 @@
 
 /// Adds this list to the output to the stat browser
 /mob/proc/get_status_tab_items()
-	. = list("") //we want to offset unique stuff from standard stuff
+	// DARKPACK EDIT CHANGE START - MERITS/FLAWS - (Time sense)
+	. = list()
+	. += get_time_status()
+	. += "" //we want to offset unique stuff from standard stuff
+	// DARKPACK EDIT CHANGE END
 	SEND_SIGNAL(src, COMSIG_MOB_GET_STATUS_TAB_ITEMS, .)
 	return .
 

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

@@ -26,6 +26,9 @@
 	if(HAS_TRAIT(src, TRAIT_SERPENTIS_SKIN) && !(HIDEJUMPSUIT)) // '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>")
+
 	if(!(obscured_slots & HIDEFACE))
 		switch(st_get_stat(STAT_APPEARANCE))
 			if(0)

modular_darkpack/modules/areas/code/__vtm.dm

@@ -7,6 +7,10 @@
 	outdoors = TRUE
 	var/zone_type = ZONE_MASQUERADE
 
+	// 7 is an average city street.
+	/// The rating of the gauntlet, the Gauntlet is strongest near certain types of environments
+	var/gauntlet_rating = 7 // WEREWOLF
+
 /area/vtm/powered(chan)
 	if (!requires_power)
 		return TRUE

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

@@ -4,6 +4,7 @@
 	zone_type = ZONE_NO_MASQUERADE
 	music_index = MUSIC_FOREST
 	fire_controled = FALSE
+	gauntlet_rating = 8
 
 /area/vtm/interior/endron_facility/restricted
 	name = MAIN_EVIL_COMPANY + " Facility Restricted"
@@ -23,6 +24,7 @@
 	icon_state = "supply"
 	zone_type = ZONE_NO_MASQUERADE
 	fire_controled = TRUE
+	gauntlet_rating = 6
 
 /area/vtm/interior/endron_facility/plant
 	name = "Endron Processing Plant"

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

@@ -2,6 +2,7 @@
 	name = "Children of Gaia Caern"
 	icon_state = "cog_caern"
 	zone_type = ZONE_ELYSIUM
+	gauntlet_rating = 5
 
 /area/vtm/interior/cog/pantry
 	name = "Earth's Bounty Food Pantry"

modular_darkpack/modules/areas/code/outsides/forest.dm

@@ -3,3 +3,4 @@
 	icon_state = "park"
 	zone_type = ZONE_NO_MASQUERADE
 	sound_environment = SOUND_ENVIRONMENT_FOREST
+	gauntlet_rating = 6