Corax

code/__DEFINES/~darkpack/combat.dm

@@ -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/fera/fera.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/werewolf_tribe.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/traits/declarations.dm

@@ -126,12 +126,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 
 // 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.
@@ -142,11 +136,15 @@ 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_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/_globalvars/traits/_traits.dm

@@ -711,7 +711,9 @@ 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_SILVER_WEAKNESS" = TRAIT_SILVER_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF
+		"TRAIT_GOLD_WEAKNESS" = TRAIT_GOLD_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF - (corax)
+		"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
@@ -742,10 +744,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"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_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_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_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
 		"TRAIT_TORPOR" = TRAIT_TORPOR, // DARKPACK EDIT ADD
@@ -761,11 +762,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
 	),

code/_globalvars/traits/admin_tooling.dm

@@ -398,9 +398,9 @@ GLOBAL_LIST_INIT(admin_visible_traits, 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_SILVER_WEAKNESS" = TRAIT_SILVER_WEAKNESS, // 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
 		"TRAIT_METAMORPH" = TRAIT_METAMORPH, // DARKPACK EDIT ADD - MERITS_FLAWS
 		"TRAIT_NEEDS_BLOOD" = TRAIT_NEEDS_BLOOD, // DARKPACK EDIT ADD - Hunger and Frenzy
@@ -409,6 +409,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_GOLD_WEAKNESS" = TRAIT_GOLD_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF - (corax)
 		"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
@@ -438,11 +439,9 @@ GLOBAL_LIST_INIT(admin_visible_traits, 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
 	),

code/modules/client/preferences.dm

@@ -347,7 +347,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/list/preferences = list()
 
 	for (var/datum/preference/preference as anything in get_preferences_in_priority_order())
-		if (!preference.is_accessible(src))
+		if (!preference.visible_in_page(src)) // DARKPACK EDIT CHANGE - (is_accessible to visible_in_page)
 			continue
 
 		var/value = read_preference(preference.type)
@@ -579,6 +579,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		if (preference.must_have_relevant_trait && preference.relevant_inherent_trait)
 			if (!HAS_TRAIT(character, preference.relevant_inherent_trait))
 				continue
+
+		if (preference.must_be_accessible && !preference.is_accessible(src))
+			continue
 		// DARKPACK EDIT ADD END - TTRPG preferences
 
 		preference.apply_to_human(character, read_preference(preference.type))

code/modules/client/preferences/_preference.dm

@@ -307,7 +307,7 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key())
 /// This will, for instance, update the character preference view.
 /// Performs sanity checks.
 /datum/preferences/proc/update_preference(datum/preference/preference, preference_value)
-	if (!preference.is_accessible(src))
+	if (!preference.visible_in_page(src)) // DARKPACK EDIT CHANGE - (is_accessible to visible_in_page)
 		return FALSE
 
 	var/new_value = preference.deserialize(preference_value, src)
@@ -377,11 +377,24 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key())
 	if (!has_relevant_feature(preferences))
 		return FALSE
 
+	/* // DARKPACK EDIT REMOVAL - Moved to a wrapper proc
 	if (!should_show_on_page(preferences.current_window))
 		return FALSE
+	*/
 
 	return TRUE
 
+// DARKPACK EDIT ADD START
+/datum/preference/proc/visible_in_page(datum/preferences/preferences)
+	SHOULD_CALL_PARENT(TRUE)
+	SHOULD_NOT_SLEEP(TRUE)
+
+	if (!should_show_on_page(preferences.current_window))
+		return FALSE
+
+	return is_accessible(preferences)
+// DARKPACK EDIT ADD END
+
 /// Returns whether or not, given the PREFERENCE_TAB_*, this preference should
 /// appear.
 /datum/preference/proc/should_show_on_page(preference_tab)

code/modules/client/preferences_savefile.dm

@@ -187,8 +187,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 /datum/preferences/proc/update_character_darkpack(current_version, list/save_data)
 	if (current_version < 2)
-		if(read_preference(/datum/preference/choiced/subsplat/garou_breed) == "Metis")
-			write_preference(GLOB.preference_entries[/datum/preference/choiced/subsplat/garou_breed], BREED_CRINOS)
+		if(read_preference(/datum/preference/choiced/subsplat/fera_breed/garou) == "Metis")
+			write_preference(GLOB.preference_entries[/datum/preference/choiced/subsplat/fera_breed/garou], BREED_CRINOS)
 // DARKPACK EDIT ADD END
 
 /// checks through keybindings for outdated unbound keys and updates them

config/darkpack_config.txt

@@ -35,6 +35,7 @@ ROUNDSTART_SPLATS splat_kindred
 ROUNDSTART_SPLATS splat_ghoul
 ROUNDSTART_SPLATS splat_kinfolk
 ROUNDSTART_SPLATS splat_garou
+ROUNDSTART_SPLATS splat_corax
 
 ## If dead people and ghosts can LOOC to people who are alive.
 DISABLE_GHOST_LOOC

modular_darkpack/master_files/code/modules/client/preferences/_preference.dm

@@ -2,3 +2,5 @@
 	/// If set to TRUE, this preference will not be applied unless the character has the preference's relevant inherent trait
 	var/must_have_relevant_trait = FALSE
 
+	/// If set to TRUE, only apply preference to the mob if it acctually shows up on there sheet
+	var/must_be_accessible = FALSE

modular_darkpack/master_files/code/modules/mob/living/carbon/human/_species.dm

@@ -1,4 +1,4 @@
 
-/datum/species
-	/// Used in get_generic_name to replace gender
-	var/visible_gender_override
+/// Used in get_generic_name to replace gender
+/datum/species/proc/visible_gender_override(mob/living/carbon/human/holder)
+	return

modular_darkpack/modules/guestbook/code/human_helpers.dm

@@ -7,8 +7,9 @@
 			visible_gender = "Woman"
 		else
 			visible_gender = "Person"
-	if(dna?.species.visible_gender_override)
-		visible_gender = dna.species.visible_gender_override
+	var/override = dna?.species.visible_gender_override(src)
+	if(override)
+		visible_gender = override
 
 	return visible_gender
 

modular_darkpack/modules/jobs/code/_job_assignment.dm

@@ -72,15 +72,15 @@
 		return JOB_UNAVAILABLE_KINDRED_CLAN
 
 /datum/controller/subsystem/job/proc/check_garou_prefs(client/player_client, mob/dead/new_player/player, datum/job/possible_job, debug_prefix = "", add_job_to_log = FALSE)
-	var/datum/subsplat/werewolf/auspice/auspice = get_fera_auspice(player_client.prefs.read_preference(/datum/preference/choiced/subsplat/garou_auspice))
+	var/datum/subsplat/werewolf/auspice/auspice = get_fera_auspice(player_client.prefs.read_preference(/datum/preference/choiced/subsplat/fera_auspice/garou))
 	if(possible_job.allowed_auspice && !(auspice.name in possible_job.allowed_auspice))
 		job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_FERA_AUSPICE, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]")
 		return JOB_UNAVAILABLE_FERA_AUSPICE
 	if(possible_job.disallowed_auspice && (auspice.name in possible_job.disallowed_auspice))
 		job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_FERA_AUSPICE, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]")
 		return JOB_UNAVAILABLE_FERA_AUSPICE
 
-	var/datum/subsplat/werewolf/tribe/tribe = get_fera_tribe(player_client.prefs.read_preference(/datum/preference/choiced/subsplat/garou_tribe))
+	var/datum/subsplat/werewolf/tribe/tribe = get_fera_tribe(player_client.prefs.read_preference(/datum/preference/choiced/subsplat/fera_tribe/garou))
 	if(possible_job.allowed_tribes && !(tribe.name in possible_job.allowed_tribes))
 		job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_FERA_TRIBE, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]")
 		return JOB_UNAVAILABLE_FERA_TRIBE

modular_darkpack/modules/weapons/code/projectiles.dm

@@ -94,18 +94,10 @@
 	name = "5.56mm silver bullet"
 	armour_penetration = 20
 
-/*
 /obj/projectile/bullet/darkpack/vamp556mm/silver/on_hit(atom/target, blocked = 0, pierce_hit)
 	. = ..()
-	if(iswerewolf(target) || get_garou_splat(target))
-		var/mob/living/carbon/M = target
-		if(M.auspice.gnosis)
-			if(prob(50))
-				adjust_gnosis(-1, M)
+	fera_silver_damage(target, 4)
 
-		M.apply_damage(20, AGGRAVATED)
-		M.apply_status_effect(STATUS_EFFECT_SILVER_SLOWDOWN)
-*/
 // 5.45x39mm
 /obj/projectile/bullet/darkpack/vamp545mm
 	name = "5.45mm bullet"
@@ -195,18 +187,10 @@
 
 /obj/projectile/bullet/darkpack/vamp762x51mm/silver
 	name = "7.62x51mm silver bullet"
-/*
-/obj/projectile/bullet/darkpack/vamp762x51mm/silver/on_hit(atom/target, blocked = FALSE)
-	. = ..()
-	if(iswerewolf(target) || get_garou_splat(target))
-		var/mob/living/carbon/M = target
-		if(M.auspice.gnosis)
-			if(prob(50))
-				adjust_gnosis(-1, M)
 
-		M.apply_damage(20, CLONE)
-		M.apply_status_effect(STATUS_EFFECT_SILVER_SLOWDOWN)
-*/
+/obj/projectile/bullet/darkpack/vamp762x51mm/silver/on_hit(atom/target, blocked = FALSE, pierce_hit)
+	. = ..()
+	fera_silver_damage(target, 4)
 
 /obj/projectile/bullet/darkpack/vamp75
 	name = ".75 ball"

modular_darkpack/modules/npc/code/nonhuman/friendly/bird.dm → modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/bird.dm

@@ -1,4 +1,3 @@
-// DARKPACK TODO - CORAX - (Corax kinfolk and thus should be grouped into WTA soon.)
 /mob/living/basic/corvid
 	name = "corvid"
 	desc = "Caw."
@@ -67,7 +66,7 @@
 	// eyes_overlay.layer = ABOVE_LIGHTING_LAYER
 	. += eyes_overlay
 
-/datum/action/innate/togglecorvidflight // this action handles corvid forms toggle their flight, and swaps their sprite to be of the relevant type, I'm making it a gift because it's also what Hispo is under
+/datum/action/innate/togglecorvidflight // this action handles corvid forms toggle their flight, and swaps their sprite to be of the relevant type.
 	name = "Toggle Flight"
 	desc = "Unfurl or withdraw your wings, toggling your ability to fly"
 	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_IMMOBILE
@@ -108,8 +107,7 @@
 	message = "caws!"
 	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
 	vary = TRUE
-	// DARKPACK TODO - CORAX - (Move to wta folder)
-	sound = 'modular_darkpack/modules/npc/sound/caw.ogg'
+	sound = 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/emotes/caw.ogg'
 
 /mob/living/basic/corvid/crow
 	name = "crow"

modular_darkpack/modules/npc/code/nonhuman/friendly/bird_ai.dm → modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/bird_ai.dm

@@ -17,7 +17,7 @@
 /datum/ai_planning_subtree/random_speech/corvid
 	speech_chance = 5
 	speak = list("Caw!")
-	sound = list('modular_darkpack/modules/npc/sound/caw.ogg')
+	sound = list('modular_darkpack/modules/werewolf_the_apocalypse/sounds/emotes/caw.ogg')
 	emote_hear = list("Caws.")
 
 /datum/ai_planning_subtree/find_and_hunt_target/find_shiney