Merge pull request #57 from FalloutFalcon/darkpack-pull-6-1-26

Darkpack Pull 6/1/26

Author: FalloutFalcon

_maps/map_files/Vampire/runtimetown.dmm

@@ -17,3 +17,7 @@
 #define LETHAL "lethal"
 // exists in code/__DEFINES/~darkpack/aggravated_damage.dm
 //#define AGGRAVATED
+
+// To convert a measure of yards into tiles/range
+#define YARDS / 5
+#define YARDS_TO_TILES * 5

code/__DEFINES/~darkpack/combat.dm

@@ -9,10 +9,13 @@
 #define MAX_GNOSIS 10
 #define PRIMAL_URGE_PLACEHOLDER 3
 
-#define BREED_HOMID "Homid"
+#define BREED_GAROU_HOMID "Garou Homid"
 #define BREED_LUPUS "Lupus"
 #define BREED_CRINOS "Crinos"
 
+#define BREED_CORAX_HOMID "Corax Homid"
+#define BREED_CORVID "Corvid"
+
 #define FEATURE_FUR_COLOR "fera_fur"
 
 // fera will likely have a seperate list of colors but uses the same feature or var as other fera
@@ -22,7 +25,16 @@ GLOBAL_LIST_INIT(garou_fur_colors, list(
 	"red" = "red",
 	"white" = "white",
 	"ginger" = "ginger",
-	"brown" = "brown"
+	"brown" = "brown",
+))
+
+GLOBAL_LIST_INIT(corax_fur_colors, list(
+	"black" = "black",
+	"brown" = "brown",
+	"white" = "white",
+	"green" = "green",
+	"red" = "red",
+	"gray" = "gray",
 ))
 
 #define STATUS_EFFECT_DELIRIUM /datum/status_effect/delirium

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

@@ -16,10 +16,8 @@
 #define TRIBE_STARGAZERS "Stargazers"
 #define TRIBE_BLACK_SPIRAL_DANCERS "Black Spiral Dancers"
 
-#define TRIBE_CORAX "Corax" // DARKPACK TODO - CORAX
-
-#define TRIBE_LIST_ALL list(TRIBE_RONIN, TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS, TRIBE_BLACK_SPIRAL_DANCERS, TRIBE_CORAX)
-#define TRIBE_LIST_GAIA list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS, TRIBE_CORAX)
-#define TRIBE_LIST_WYLD list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_SHADOW_LORDS, TRIBE_CORAX)
+#define TRIBE_LIST_ALL list(TRIBE_RONIN, TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS, TRIBE_BLACK_SPIRAL_DANCERS)
+#define TRIBE_LIST_GAIA list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS)
+#define TRIBE_LIST_WYLD list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_SHADOW_LORDS)
 #define TRIBE_LIST_WEAVER list(TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS)
 #define TRIBE_LIST_WYRM list(TRIBE_BLACK_SPIRAL_DANCERS)

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

@@ -1,7 +1,8 @@
 #define CALIBER_9MMPARA "9x19mm Parabellum"
 #define CALIBER_45ACP ".45 ACP"
 #define CALIBER_44MAG ".44 Magnum"
-#define CALIBER_50CAL ".50" // DARKPACK TODO: Seperate into .50 BMG and .50 AE
+#define CALIBER_50CAL_BMG ".50 BMG"
+#define CALIBER_50CAL_AE ".50 AE"
 #define CALIBER_545SOVIET "5.45x39mm"
 #define CALIBER_556NATO "5.56mm NATO"
 #define CALIBER_46HK "4.6x30mm HK"

code/__DEFINES/~darkpack/guns.dm

@@ -8,7 +8,7 @@
 /// Parent type for shifters. Not player facing. Shouldnt be needed but put here for clarity.
 //#define SPLAT_FERA "splat_fera"
 #define SPLAT_GAROU "splat_garou"
-#define SPLAT_CORAX "splat_corax" // DARKPACK TODO - CORAX
+#define SPLAT_CORAX "splat_corax"
 #define SPLAT_SHIFTERS list(SPLAT_GAROU, SPLAT_CORAX)
 
 #define SPLAT_PRIO_HALFSPLAT 100

code/__DEFINES/~darkpack/splats.dm

@@ -45,7 +45,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_PALE_AURA "pale_aura"
 #define TRAIT_DECEPTIVE_AURA "deceptive_aura"
 #define TRAIT_FRENETIC_AURA "frenetic_aura"
+#define TRAIT_HIDDEN_DIABLERIE "hidden_diablerie"
 
+#define TRAIT_HIDDEN_WYRMTAINT "hidden_wyrmtaint"
 #define TRAIT_BLUSH_OF_HEALTH "blush_of_health"
 /// The mob will automatically breach the Masquerade when seen by others, with no exceptions
 #define TRAIT_UNMASQUERADE "unmasquerade"
@@ -128,12 +130,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_FERA_FORMS "fera_forms"
 // If the splat uses the WTA renown system described in W20 p. 245
 #define TRAIT_FERA_RENOWN "wta_fera_renown"
-/// If the species has garou breeds to select.
-#define TRAIT_WTA_GAROU_BREED "wta_garou_breeds"
-// if the species has garou tribes to select.
-#define TRAIT_WTA_GAROU_TRIBE "wta_garou_tribes"
-// If the species has garou auspices to select.
-#define TRAIT_WTA_GAROU_AUSPICE "wta_garou_auspice"
 // This mob has fur!
 #define TRAIT_FERA_FUR "fera_fur"
 /// If the fera is wyrm tainted.
@@ -144,11 +140,17 @@ 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"
+// 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"
+#define TRAIT_GOLD_WEAKNESS "gold_weakness"
+// Delirium is effectivly two levels weaker
+#define TRAIT_WEAK_DELIRIUM "weak_delirium"
+// Massivly boosts the range of your howl emote.
+#define TRAIT_LOUD_WARCRY "loud_warcry"
 /// 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

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

@@ -405,8 +405,8 @@ GLOBAL_LIST_INIT(skin_tone_names, list(
 			override = SEE_DEADCHAT_ADMIN
 		if(HAS_TRAIT(M, TRAIT_SIXTHSENSE) && message_type == DEADCHAT_REGULAR)
 			override = SEE_DEADCHAT_NORMAL
-		// DARKPACK EDIT ADD START
-		if(HAS_TRAIT(M, TRAIT_LOCAL_SIXTHSENSE) && (message_type == DEADCHAT_REGULAR) && (source in orange(DEFAULT_MESSAGE_RANGE, M)))
+		// DARKPACK EDIT ADD START - WEREWOLF - (Spirit Speech)
+		if(HAS_TRAIT(M, TRAIT_LOCAL_SIXTHSENSE) && (message_type == DEADCHAT_REGULAR) && ((follow_target || turf_target) in orange(DEFAULT_MESSAGE_RANGE, M)))
 			override = SEE_DEADCHAT_NORMAL
 		// DARKPACK EDIT ADD END
 		if(SSticker.current_state == GAME_STATE_FINISHED)

code/__HELPERS/mobs.dm

@@ -20,10 +20,10 @@ GLOBAL_LIST_INIT(office_ambience, list(
 ))
 
 GLOBAL_LIST_INIT(music_assoc,list(
-	MUSIC_CITY = list('modular_darkpack/modules/ambience/sounds/music/downtown.ogg', 'modular_darkpack/modules/ambience/sounds/music/downtown_alt.ogg', 'modular_darkpack/modules/ambience/sounds/music/what_comes_next.ogg'),
+	MUSIC_CITY = list('modular_darkpack/modules/ambience/sounds/music/downtown.ogg', 'modular_darkpack/modules/ambience/sounds/music/downtown_alt.ogg', 'modular_darkpack/modules/ambience/sounds/music/what_comes_next.ogg', 'modular_darkpack/modules/ambience/sounds/music/vtm_redemption_nyc_hub.ogg'),
 	MUSIC_FOREST = list('modular_darkpack/modules/ambience/sounds/music/night_ambience.ogg', 'modular_darkpack/modules/ambience/sounds/music/for_my_clan.ogg'),
 	MUSIC_CHURCH = list('modular_darkpack/modules/ambience/sounds/music/hahihaho.ogg'),
-	MUSIC_PRINCE = list('modular_darkpack/modules/ambience/sounds/music/prince.ogg'),
+	MUSIC_PRINCE = list('modular_darkpack/modules/ambience/sounds/music/prince.ogg', 'modular_darkpack/modules/ambience/sounds/music/elysium.ogg'),
 	MUSIC_BAR = list('modular_darkpack/modules/ambience/sounds/music/naive.ogg'),
 	MUSIC_HOLLYWOOD = list('modular_darkpack/modules/ambience/sounds/music/hollywood.ogg', 'modular_darkpack/modules/ambience/sounds/music/open_season.ogg', 'modular_darkpack/modules/ambience/sounds/music/is_it_all_worth_it.ogg'),
 	MUSIC_SANTAMONICA = list('modular_darkpack/modules/ambience/sounds/music/santamonica.ogg'),

code/_globalvars/darkpack/lists/ambience.dm

@@ -693,14 +693,18 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // 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_FLIGHT" = TRAIT_FERA_FLIGHT, // DARKPACK EDIT ADD - WEREWOLF
 		"TRAIT_FERA_FORMS" = TRAIT_FERA_FORMS, // 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_GHOST_VISION" = TRAIT_GHOST_VISION, // DARKPACK EDIT ADD - POWERS - (Necromancy)
+		"TRAIT_GOLD_WEAKNESS" = TRAIT_GOLD_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF - (corax)
 		"TRAIT_GRIP_OF_THE_DAMNED" = TRAIT_GRIP_OF_THE_DAMNED, // DARKPACK EDIT ADD
 		"TRAIT_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
+		"TRAIT_HIDDEN_DIABLERIE" = TRAIT_HIDDEN_DIABLERIE, //DARKPACK EDIT ADD
+		"TRAIT_HIDDEN_WYRMTAINT" = TRAIT_HIDDEN_WYRMTAINT, // DARKPACK EDIT ADD
 		"TRAIT_HOMOSEXUAL" = TRAIT_HOMOSEXUAL, // DARKPACK EDIT ADD
 		"TRAIT_HORRIFIC_APPEARANCE" = TRAIT_HORRIFIC_APPEARANCE, // DARKPACK EDIT ADD - Cappadocian Quirk
 		"TRAIT_HUNGRY" = TRAIT_HUNGRY, // DARKPACK EDIT ADD
@@ -712,7 +716,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"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
-		"TRAIT_LOUD_HOWLER" = TRAIT_LOUD_HOWLER, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_LOUD_WARCRY" = TRAIT_LOUD_WARCRY, // 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
@@ -739,13 +743,13 @@ 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_SILVER_WEAKNESS" = TRAIT_SILVER_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF
 		"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
 		"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
@@ -762,11 +766,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_VITAE_ADDICTION" = TRAIT_VITAE_ADDICTION, // DARKPACK EDIT ADD
 		"TRAIT_VTM_CLANS" = TRAIT_VTM_CLANS, // DARKPACK EDIT ADD
 		"TRAIT_VTM_MORALITY" = TRAIT_VTM_MORALITY, // DARKPACK EDIT ADD
+		"TRAIT_WEAK_DELIRIUM" = TRAIT_WEAK_DELIRIUM, // DARKPACK EDIT ADD - WEREWOLF - (corax)
 		"TRAIT_WEAK_TO_DOMINATE" = TRAIT_WEAK_TO_DOMINATE, // DARKPACK EDIT ADD - POWERS - (Dominate)
 		"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
 	),