Darkpack Pull 6/15/2026

_maps/map_files/Vampire/special_fran/endron_ruin.dmm

@@ -68,10 +68,6 @@
 "bb" = (
 /turf/open/misc/dirt,
 /area/vtm/outside/forest)
-"bf" = (
-/obj/effect/spawner/random/trash/garbage,
-/turf/open/water/bloodwave,
-/area/vtm/interior/forest/cave/bane)
 "bi" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/trimline/red/line{
@@ -250,13 +246,6 @@
 	},
 /turf/open/water/bloodwave,
 /area/vtm/interior/forest/cave/bane)
-"ee" = (
-/obj/effect/turf_decal/darkpack/cave{
-	dir = 10
-	},
-/obj/effect/spawner/random/trash/garbage,
-/turf/open/water/bloodwave,
-/area/vtm/interior/forest/cave/bane)
 "ef" = (
 /obj/structure/flora/rock/pile/darkpack,
 /turf/open/floor/plating/rough,
@@ -289,14 +278,6 @@
 	},
 /turf/open/floor/city/plating,
 /area/vtm/interior/endron_facility/forest)
-"eJ" = (
-/obj/structure/lattice/catwalk,
-/obj/effect/spawner/random/trash/grime{
-	spawn_loot_count = 20;
-	spawn_scatter_radius = 3
-	},
-/turf/open/water/acid,
-/area/vtm/interior/endron_facility/forest)
 "eK" = (
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 8
@@ -595,13 +576,6 @@
 /obj/item/clothing/head/vampire/pentex_beret,
 /turf/open/floor/city/factory,
 /area/vtm/interior/endron_facility/forest)
-"iZ" = (
-/obj/effect/turf_decal/darkpack/cave{
-	dir = 10
-	},
-/obj/effect/spawner/random/trash/mess,
-/turf/open/water/bloodwave,
-/area/vtm/interior/forest/cave/bane)
 "jf" = (
 /obj/structure/table,
 /obj/item/trash/raisins,
@@ -757,7 +731,6 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 4
 	},
-/obj/effect/spawner/random/trash/garbage,
 /turf/open/water/bloodwave,
 /area/vtm/interior/forest/cave/bane)
 "ly" = (
@@ -882,11 +855,6 @@
 /obj/effect/mapping_helpers/door/lock,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/endron_facility/forest)
-"nl" = (
-/obj/effect/turf_decal/darkpack/cave,
-/obj/effect/spawner/random/trash/garbage,
-/turf/open/water/bloodwave,
-/area/vtm/interior/forest/cave/bane)
 "nv" = (
 /obj/machinery/shower/directional/north,
 /obj/structure/curtain,
@@ -1054,13 +1022,6 @@
 	},
 /turf/cordon/secret,
 /area/misc/cordon)
-"pD" = (
-/obj/effect/turf_decal/darkpack/cave{
-	dir = 8
-	},
-/obj/effect/spawner/random/trash/garbage,
-/turf/open/water/bloodwave,
-/area/vtm/interior/forest/cave/bane)
 "pG" = (
 /obj/effect/turf_decal/darkpack/dirt,
 /obj/effect/turf_decal/darkpack/dirt/corner{
@@ -1336,13 +1297,6 @@
 /obj/effect/spawner/random/trash/janitor_supplies,
 /turf/open/floor/city/circled,
 /area/vtm/interior/endron_facility/forest)
-"tE" = (
-/obj/effect/turf_decal/darkpack/cave/corner{
-	dir = 8
-	},
-/obj/effect/spawner/random/trash/garbage,
-/turf/open/water/bloodwave,
-/area/vtm/interior/forest/cave/bane)
 "tG" = (
 /obj/structure/fence{
 	dir = 4
@@ -1713,14 +1667,9 @@
 /turf/closed/wall/vampwall/rock,
 /area/vtm/interior/forest/cave/bane)
 "zn" = (
-/obj/structure/rack{
-	density = 0;
-	icon = 'icons/obj/tank.dmi';
-	icon_state = "holder";
-	name = "tank rack"
-	},
 /obj/item/tank/internals/anesthetic,
 /obj/item/clothing/mask/breath/medical,
+/obj/structure/rack,
 /turf/open/floor/city/circled,
 /area/vtm/interior/endron_facility/forest)
 "zx" = (
@@ -1809,7 +1758,6 @@
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 5
 	},
-/obj/effect/spawner/random/trash/garbage,
 /turf/open/water/bloodwave,
 /area/vtm/interior/forest/cave/bane)
 "Bl" = (
@@ -1979,13 +1927,6 @@
 /obj/effect/spawner/random/trash/mess,
 /turf/open/floor/city/factory,
 /area/vtm/interior/endron_facility/forest)
-"Dh" = (
-/obj/effect/turf_decal/darkpack/cave{
-	dir = 1
-	},
-/obj/effect/spawner/random/trash/garbage,
-/turf/open/water/bloodwave,
-/area/vtm/interior/forest/cave/bane)
 "Dl" = (
 /obj/effect/turf_decal/darkpack/dirt{
 	dir = 6
@@ -2056,13 +1997,6 @@
 /obj/effect/mob_spawn/corpse/human/endron,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/endron_facility/forest)
-"Ee" = (
-/obj/effect/turf_decal/darkpack/cave{
-	dir = 5
-	},
-/obj/effect/spawner/random/trash/garbage,
-/turf/open/water/bloodwave,
-/area/vtm/interior/forest/cave/bane)
 "Ef" = (
 /obj/effect/turf_decal/darkpack/cave{
 	dir = 5
@@ -2349,7 +2283,6 @@
 /area/vtm/interior/endron_facility/forest)
 "HB" = (
 /obj/effect/decal/garou_glyph/wyrm{
-	pixel_x = 0;
 	pixel_y = 31
 	},
 /turf/open/misc/dirt,
@@ -6015,7 +5948,7 @@ wD
 wD
 bi
 Mh
-YT
+tw
 sL
 Pw
 Nj
@@ -6232,7 +6165,7 @@ mK
 Mf
 wD
 HO
-eJ
+tw
 Ul
 Ox
 qz
@@ -7405,7 +7338,7 @@ za
 za
 Ef
 FR
-iZ
+IA
 za
 Jk
 za
@@ -7513,7 +7446,7 @@ za
 za
 za
 za
-Dh
+ed
 wb
 IA
 RS
@@ -7624,11 +7557,11 @@ za
 za
 CX
 Ux
-tE
+Wi
+eK
 eK
-pD
 eK
-ee
+IA
 Lp
 Lp
 hP
@@ -7734,7 +7667,7 @@ EE
 Ak
 CX
 Ux
-bf
+Pg
 Pg
 Pg
 Wi
@@ -7847,7 +7780,7 @@ Pg
 wb
 Pg
 Pg
-nl
+ev
 Lp
 JR
 Iv
@@ -8171,7 +8104,7 @@ md
 Lp
 CX
 Ux
-bf
+Pg
 Pg
 Pg
 ev
@@ -8279,7 +8212,7 @@ za
 Lp
 iN
 RS
-Ee
+CX
 Ux
 Pg
 KX

code/__DEFINES/icon_smoothing.dm

@@ -244,6 +244,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
 #define SMOOTH_GROUP_COLOR_COUNTERTOP S_OBJ(90) ///obj/structure/table/countertop/(color)
 // DARKPACK EDIT END
 #define SMOOTH_GROUP_CITY_LOW_WALL S_TURF(91) ///obj/structure/platform/lowwall // DARKPACK EDIT ADD - WALLS
+#define SMOOTH_GROUP_FF_TABLES S_OBJ(92) ///obj/structure/table/countertop/fastfood // DARKPACK EDIT ADD - DECOR
 
 /// Performs the work to set smoothing_groups and canSmoothWith.
 /// An inlined function used in both turf/Initialize and atom/Initialize.

code/__DEFINES/~darkpack/auras.dm

@@ -21,6 +21,7 @@
 #define AURA_SAD COLOR_SILVER // Silver
 #define AURA_SPIRITUAL COLOR_GOLD // Gold
 #define AURA_SUSPICIOUS COLOR_STRONG_BLUE // Dark Blue
+#define AURA_CONFIDENCE COLOR_VIVID_YELLOW // Primarly for the Shadow Lords gift "Aura of Confidence"
 
 // Modifier auras.
 #define AURA_ANXIOUS "Anxious" // Auras appear scrambled like static or white noise
@@ -65,7 +66,8 @@ GLOBAL_LIST_INIT(aura_list, sort_list(list(
 	"Anxious" = AURA_ANXIOUS,
 	"Confused" = AURA_CONFUSED,
 	"Daydreaming" = AURA_DAYDREAMING,
-	"Psychotic" = AURA_PSYCHOTIC
+	"Psychotic" = AURA_PSYCHOTIC,
+	"Confidence" = AURA_CONFIDENCE,
 )))
 
 GLOBAL_LIST_INIT(emotion_to_quality, sort_list(list(
@@ -94,5 +96,6 @@ GLOBAL_LIST_INIT(emotion_to_quality, sort_list(list(
 	"Anxious" = "anxiety",
 	"Confused" = "confusion",
 	"Daydreaming" = "absentmindedness",
-	"Psychotic" = "psychosis"
+	"Psychotic" = "psychosis",
+	"Confidence" = "confidence",
 )))

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

@@ -7,5 +7,7 @@
 //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 base of /datum/storyteller_roll/proc/st_roll(): (mob/living/roller, datum/storyteller_roll/roll_datum, output)
+//from base of /datum/storyteller_roll/proc/st_roll(): (mob/living/roller, datum/storyteller_roll/roll_datum, atom/target)
+#define COMSIG_LIVING_PRE_DICE_ROLLED "living_pre_dice_rolled"
+//from base of /datum/storyteller_roll/proc/st_roll(): (mob/living/roller, datum/storyteller_roll/roll_datum, atom/target, output)
 #define COMSIG_LIVING_DICE_ROLLED "living_dice_rolled"

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

@@ -152,6 +152,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_SMALL_HANDS "small_hands"
 // Traits granted via gifts
 #define TRAIT_RAZOR_CLAWS "razor_claws"
+#define TRAIT_JAMMING_WEAPONS "jamming_weapons"
+#define TRAIT_NATURAL "natural"
+#define TRAIT_AURA_OF_CONFIDENCE "aura_of_confidence"
 
 /// Sixth sense restricted to view range
 #define TRAIT_LOCAL_SIXTHSENSE "local_sixth_sense"

code/_globalvars/traits/_traits.dm

@@ -39,6 +39,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
 		"TRAIT_UNLINKABLE_FISHING_SPOT" = TRAIT_UNLINKABLE_FISHING_SPOT,
 		"TRAIT_TETHER_ATTACHED" = TRAIT_TETHER_ATTACHED,
+		"TRAIT_NATURAL" = TRAIT_NATURAL, // DARKPACK EDIT ADD - WEREWOLF
 	),
 	/atom/movable = list(
 		"TRAIT_ACTIVE_STORAGE" = TRAIT_ACTIVE_STORAGE,
@@ -675,6 +676,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"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_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
 		"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
@@ -692,8 +694,8 @@ 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_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_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
 		"TRAIT_FAIR_GLABRO" = TRAIT_FAIR_GLABRO, // DARKPACK EDIT ADD - MERITS_FLAWS
@@ -718,6 +720,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"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_JAMMING_WEAPONS" = TRAIT_JAMMING_WEAPONS, // DARKPACK EDIT ADD - WEREWOLF
 		"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
@@ -754,7 +757,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_STAKE_IMMUNE" = TRAIT_STAKE_IMMUNE, // DARKPACK EDIT ADD
 		"TRAIT_STAKE_RESISTANT" = TRAIT_STAKE_RESISTANT, // DARKPACK EDIT ADD
 		"TRAIT_STILLNESS_OF_DEATH" = TRAIT_STILLNESS_OF_DEATH, // DARKPACK EDIT ADD - Gargoyle Quirk
-		"TRAIT_THE_LARGEST_MAW" = TRAIT_THE_LARGEST_MAW, // DARKPACK EDIT ADD - MERITS/FLAWS
+		"TRAIT_THE_LARGEST_MAW" = TRAIT_THE_LARGEST_MAW, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_THIRD_EYE" = TRAIT_THIRD_EYE, // DARKPACK EDIT ADD - Tremere & Salubri Quirk
 		"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // DARKPACK EDIT ADD
 		"TRAIT_TIME_SENSE" = TRAIT_TIME_SENSE, // DARKPACK EDIT ADD - MERITS_FLAWS

code/_globalvars/traits/admin_tooling.dm

@@ -9,6 +9,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_RUSTIMMUNE" = TRAIT_RUSTIMMUNE,
 		"TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES,
 		"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
+		"TRAIT_NATURAL" = TRAIT_NATURAL, // DARKPACK EDIT ADD - WEREWOLF
 	),
 	/atom/movable = list(
 		"TRAIT_ASHSTORM_IMMUNE" = TRAIT_ASHSTORM_IMMUNE,
@@ -363,6 +364,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"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_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
 		"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
@@ -399,6 +401,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"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_JAMMING_WEAPONS" = TRAIT_JAMMING_WEAPONS, // DARKPACK EDIT ADD - WEREWOLF
 		"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