Garou Drip Update

code/__DEFINES/obj_flags.dm

@@ -70,7 +70,7 @@
 #define WEAPON_DESCRIPTION_INITIALIZED (1<<21)
 /// If an item causes bluespace interference when teleported with.
 #define BLUESPACE_INTERFERENCE (1<<22)
-#define ACTIVE_WORLD_ICON (1<<23) // DARKPACK EDIT ADD - World Icons
+#define ACTIVE_ONFLOOR_ICON (1<<23) // DARKPACK EDIT ADD - ONFLOOR_ICONS
 
 // Flags for the clothing_flags var on /obj/item/clothing
 

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

@@ -16,25 +16,28 @@
 #define BREED_CORAX_HOMID "Corax Homid"
 #define BREED_CORVID "Corvid"
 
-#define FEATURE_FUR_COLOR "fera_fur"
+#define FEATURE_FERA_FUR_COLOR "fera_fur_color"
+#define FEATURE_FERA_HAIR(splat_id) "fera_hair" + splat_id
+#define FEATURE_FERA_BODY(splat_id) "fera_body" + splat_id
+#define FEATURE_FERA_CLOTHES(splat_id) "fera_clothes" + splat_id
 
-// fera will likely have a seperate list of colors but uses the same feature or var as other fera
-GLOBAL_LIST_INIT(garou_fur_colors, list(
-	"black" = "black",
-	"gray" = "gray",
-	"red" = "red",
-	"white" = "white",
-	"ginger" = "ginger",
-	"brown" = "brown",
-))
-
-GLOBAL_LIST_INIT(corax_fur_colors, list(
-	"black" = "black",
-	"brown" = "brown",
-	"white" = "white",
-	"green" = "green",
-	"red" = "red",
-	"gray" = "gray",
+GLOBAL_ALIST_INIT(fera_fur_colors, alist(
+	SPLAT_GAROU = list(
+		"black" = "black",
+		"gray" = "gray",
+		"red" = "red",
+		"white" = "white",
+		"ginger" = "ginger",
+		"brown" = "brown",
+	),
+	SPLAT_CORAX = list(
+		"black" = "black",
+		"brown" = "brown",
+		"white" = "white",
+		"green" = "green",
+		"red" = "red",
+		"gray" = "gray",
+	)
 ))
 
 #define STATUS_EFFECT_DELIRIUM /datum/status_effect/delirium

code/controllers/subsystem/sprite_accessories.dm

@@ -102,6 +102,12 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
 	feature_list[FEATURE_TAIL_MONKEY] = INIT_ACCESSORY(/datum/sprite_accessory/tails/monkey)
 	feature_list[FEATURE_TAIL_XENO] = INIT_ACCESSORY(/datum/sprite_accessory/tails/xeno)
 
+	// DARKPACK EDIT ADD START - WEREWOLF
+	feature_list[FEATURE_FERA_HAIR(SPLAT_GAROU)] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/fera_feature/hair/garou)
+	feature_list[FEATURE_FERA_BODY(SPLAT_GAROU)] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/fera_feature/body/garou)
+	feature_list[FEATURE_FERA_CLOTHES(SPLAT_GAROU)] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/fera_feature/clothes/garou)
+	// DARKPACK EDIT ADD END
+
 /// This proc just initializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name
 /datum/controller/subsystem/accessories/proc/init_hair_gradients()
 	hair_gradients_list = list()

code/modules/food_and_drinks/equipment/kitchen_utensils.dm

@@ -248,8 +248,8 @@
 
 /obj/item/kitchen/spoon/update_overlays()
 	. = ..()
-	// DARKPACK EDIT ADD START - WORLD_ICON
-	if(item_flags & ACTIVE_WORLD_ICON) // World icons have nothing but the base state atm
+	// DARKPACK EDIT ADD START - ONFLOOR_ICONS
+	if(item_flags & ACTIVE_ONFLOOR_ICON) // World icons have nothing but the base state atm
 		return
 	// DARKPACK EDIT ADD END
 	if(reagents.total_volume <= 0)

code/modules/projectiles/guns/ballistic.dm

@@ -270,8 +270,8 @@
 
 /obj/item/gun/ballistic/update_overlays()
 	. = ..()
-	// DARKPACK EDIT ADD START - WORLD_ICON
-	if(item_flags & ACTIVE_WORLD_ICON) // World icons have nothing but the base state atm
+	// DARKPACK EDIT ADD START - ONFLOOR_ICONS
+	if(item_flags & ACTIVE_ONFLOOR_ICON) // World icons have nothing but the base state atm
 		return
 	// DARKPACK EDIT ADD END
 

code/modules/reagents/reagent_containers.dm

@@ -287,8 +287,8 @@
 	. = ..()
 	if(!fill_icon_thresholds)
 		return
-	// DARKPACK EDIT ADD START - WORLD_ICON
-	if(item_flags & ACTIVE_WORLD_ICON) // world icons dont have reagent filling
+	// DARKPACK EDIT ADD START - ONFLOOR_ICONS
+	if(item_flags & ACTIVE_ONFLOOR_ICON) // world icons dont have reagent filling
 		return
 	// DARKPACK EDIT ADD END
 	if(!reagents.total_volume)

modular_darkpack/master_files/code/game/atom/atom_examine.dm

@@ -1,5 +1,5 @@
 /obj/item/get_examine_icon(mob/user)
-	if(item_flags & ACTIVE_WORLD_ICON)
+	if(item_flags & ACTIVE_ONFLOOR_ICON)
 		return icon2html(initial(icon), user, initial(icon_state))
 	else
 		return icon2html(src, user)

modular_darkpack/master_files/code/game/objects/items.dm

@@ -3,8 +3,10 @@
 	///Set to null to disallow breaking.
 	var/cuff_break_strength_needed = null
 
+	// ONFLOOR_ICONS
 	var/onflooricon
 	var/onflooricon_state
+
 	var/masquerade_violating
 
 	// STORYTELLR_STATS

modular_darkpack/modules/ert/code/items/first_team.dm

@@ -366,13 +366,13 @@
 
 /obj/item/gun/ballistic/automatic/l6_saw/darkpack/update_icon_state()
 	. = ..()
-	if(item_flags & ACTIVE_WORLD_ICON)
+	if(item_flags & ACTIVE_ONFLOOR_ICON)
 		return
 	inhand_icon_state = "[base_icon_state][magazine ? "mag":"nomag"]"
 
 /obj/item/gun/ballistic/automatic/l6_saw/darkpack/update_overlays()
 	. = ..()
-	if(item_flags & ACTIVE_WORLD_ICON)
+	if(item_flags & ACTIVE_ONFLOOR_ICON)
 		return
 	. += "px249f_door_[cover_open ? "open" : "closed"]"
 

modular_darkpack/modules/onfloor_icons/code/dynamic_item_icon.dm

@@ -40,8 +40,8 @@
 	item.icon = initial(item.icon)
 	item.pixel_w = initial(item.pixel_w)
 
-	if(item.item_flags & ACTIVE_WORLD_ICON)
-		item.item_flags &= ~ACTIVE_WORLD_ICON
+	if(item.item_flags & ACTIVE_ONFLOOR_ICON)
+		item.item_flags &= ~ACTIVE_ONFLOOR_ICON
 
 	item.update_icon()
 	item.update_greyscale()
@@ -53,8 +53,8 @@
 	if (item.onflooricon_state)
 		item.icon_state = item.onflooricon_state
 
-	if(!(item.item_flags & ACTIVE_WORLD_ICON))
-		item.item_flags |= ACTIVE_WORLD_ICON
+	if(!(item.item_flags & ACTIVE_ONFLOOR_ICON))
+		item.item_flags |= ACTIVE_ONFLOOR_ICON
 
 	item.update_icon()
 	//item.update_greyscale()

modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/corvid/_bird.dm

@@ -64,11 +64,14 @@
 /mob/living/basic/corvid/update_overlays()
 	. = ..()
 
-	var/mutable_appearance/eyes_overlay = mutable_appearance(icon, "eyes[HAS_TRAIT(src, TRAIT_MOVE_FLYING) ? "_flying" : ""]")
-	SET_PLANE(eyes_overlay, ABOVE_LIGHTING_PLANE, src)
+	/*
+	var/mutable_appearance/eyes_overlay = mutable_appearance(icon, "eyes[HAS_TRAIT(src, TRAIT_MOVE_FLYING) ? "_flying" : ""]", -EYES_LAYER, src)
 	eyes_overlay.color = sprite_eye_color
-	// eyes_overlay.layer = ABOVE_LIGHTING_LAYER
 	. += eyes_overlay
+	*/
+
+	var/mutable_appearance/emissive_overlay = emissive_appearance(icon, "eyes[HAS_TRAIT(src, TRAIT_MOVE_FLYING) ? "_flying" : ""]", src, effect_type = EMISSIVE_SPECULAR)
+	. += emissive_overlay
 
 /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"

modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/customization/_customization.dm

@@ -0,0 +1,26 @@
+/datum/preference/choiced/fera_feature
+	abstract_type = /datum/preference/choiced/fera_feature
+	savefile_identifier = PREFERENCE_CHARACTER
+	category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
+	priority = PREFERENCE_PRIORITY_WORLD_OF_DARKNESS
+	// must_have_relevant_trait = TRUE
+	must_be_accessible = TRUE
+	var/feature_key
+	var/splat_id
+
+/datum/preference/choiced/fera_feature/init_possible_values()
+	return assoc_to_keys_features(SSaccessories.feature_list[feature_key])
+
+
+/datum/preference/choiced/fera_feature/apply_to_human(mob/living/carbon/human/target, value)
+	target.dna.features[feature_key] = value
+
+/datum/preference/choiced/fera_feature/is_accessible(datum/preferences/preferences)
+	. = ..()
+	var/datum/splat/splat_path = preferences.read_preference(/datum/preference/choiced/splats)
+	if(!ispath(splat_path) || splat_path::id != splat_id)
+		return FALSE
+
+
+/datum/sprite_accessory/fera_feature
+	abstract_type = /datum/sprite_accessory/fera_feature

modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/customization/fera_body.dm

@@ -0,0 +1,52 @@
+/datum/sprite_accessory/fera_feature/body
+	abstract_type = /datum/sprite_accessory/fera_feature/body
+
+
+
+/datum/preference/choiced/fera_feature/garou_body
+	savefile_key = "garou_body"
+	feature_key = FEATURE_FERA_BODY(SPLAT_GAROU)
+	splat_id = SPLAT_GAROU
+
+
+/datum/sprite_accessory/fera_feature/body/garou
+	abstract_type = /datum/sprite_accessory/fera_feature/body/garou
+
+/datum/sprite_accessory/fera_feature/body/garou/scar_1
+	name = "Right Eye Scar"
+	icon_state = "scar1"
+
+/datum/sprite_accessory/fera_feature/body/garou/scar_2
+	name = "Left Eye Scar"
+	icon_state = "scar2"
+
+/datum/sprite_accessory/fera_feature/body/garou/scar_3
+	name = "Nose Scar"
+	icon_state = "scar3"
+
+/datum/sprite_accessory/fera_feature/body/garou/scar_4
+	name = "Chest Scar"
+	icon_state = "scar4"
+
+/datum/sprite_accessory/fera_feature/body/garou/scar_5
+	name = "Leg Scar"
+	icon_state = "scar5"
+
+/datum/sprite_accessory/fera_feature/body/garou/scar_6
+	name = "Head Scar"
+	icon_state = "scar6"
+
+/datum/sprite_accessory/fera_feature/body/garou/scar_7
+	name = "Shoulder Scar"
+	icon_state = "scar7"
+
+/datum/sprite_accessory/fera_feature/body/garou/scar_8
+	name = "Right Artificial Arm"
+	icon_state = "scar8"
+
+/datum/sprite_accessory/fera_feature/body/garou/scar_9
+	name = "Left Artificial Arm"
+	icon_state = "scar9"
+
+/datum/dna_block/feature/accessory/garou_body
+	feature_key = FEATURE_FERA_BODY(SPLAT_GAROU)

modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/customization/fera_clothes.dm

@@ -0,0 +1,76 @@
+/datum/sprite_accessory/fera_feature/clothes
+	abstract_type = /datum/sprite_accessory/fera_feature/clothes
+
+
+
+/datum/preference/choiced/fera_feature/garou_clothes
+	savefile_key = "garou_clothes"
+	feature_key = FEATURE_FERA_CLOTHES(SPLAT_GAROU)
+	splat_id = SPLAT_GAROU
+
+
+/datum/sprite_accessory/fera_feature/clothes/garou
+	abstract_type = /datum/sprite_accessory/fera_feature/clothes/garou
+
+/datum/sprite_accessory/fera_feature/clothes/garou/loincloth
+	name = "Loincloth"
+	icon_state = "loincloth"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/green_tribal
+	name = "Green Tribal Accessories"
+	icon_state = "green_tribal"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/beige_tribal
+	name = "Beige Tribal Accessories"
+	icon_state = "beige_tribal"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/leather_mantle
+	name = "Leather Mantle"
+	icon_state = "leather_mantle"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/studs
+	name = "Studs"
+	icon_state = "studs"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/dark_mantle
+	name = "Dark Mantle"
+	icon_state = "dark_mantle"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/loincloth_armband
+	name = "Loincloth & Armband"
+	icon_state = "loincloth_armband"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/skull_necklace
+	name = "Skull Necklace"
+	icon_state = "skull_necklace"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/metal_armour // yuck br*tish
+	name = "Metal Armor" // Fixed it teehee
+	icon_state = "metal_armour" // Vile disgusting spelling
+
+/datum/sprite_accessory/fera_feature/clothes/garou/fur_mantle
+	name = "Fur Mantle"
+	icon_state = "fur_mantle"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/fur_necklace_and_vambrace
+	name = "Fur Necklace & Vambraces"
+	icon_state = "fur_necklace_and_vambrace"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/armour_loincloth // yuck br*tish again...
+	name = "Armor & Loincloth" // Fixed it lalalala
+	icon_state = "armour_loincloth"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/red_cloak // litle red riding hood
+	name = "Red Cloak"
+	icon_state = "red_cloak"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/formal_tribal
+	name = "Formal Tribal Attire"
+	icon_state = "formal_tribal"
+
+/datum/sprite_accessory/fera_feature/clothes/garou/dollar_necklace
+	name = "$$$ Bling"
+	icon_state = "dollar_necklace"
+
+/datum/dna_block/feature/accessory/garou_clothes
+	feature_key = FEATURE_FERA_CLOTHES(SPLAT_GAROU)

modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/customization/fera_hair.dm

@@ -0,0 +1,33 @@
+
+/datum/sprite_accessory/fera_feature/hair
+	abstract_type = /datum/sprite_accessory/fera_feature/hair
+
+
+
+/datum/preference/choiced/fera_feature/garou_hair
+	savefile_key = "garou_hair"
+	feature_key = FEATURE_FERA_HAIR(SPLAT_GAROU)
+	splat_id = SPLAT_GAROU
+
+
+/datum/sprite_accessory/fera_feature/hair/garou
+	abstract_type = /datum/sprite_accessory/fera_feature/hair/garou
+
+/datum/sprite_accessory/fera_feature/hair/garou/hair_1
+	name = "Mohawk"
+	icon_state = "hair1"
+
+/datum/sprite_accessory/fera_feature/hair/garou/hair_2
+	name = "Long"
+	icon_state = "hair2"
+
+/datum/sprite_accessory/fera_feature/hair/garou/hair_3
+	name = "Undercut"
+	icon_state = "hair3"
+
+/datum/sprite_accessory/fera_feature/hair/garou/hair_4
+	name = "Beard"
+	icon_state = "hair4"
+
+/datum/dna_block/feature/accessory/garou_hair
+	feature_key = FEATURE_FERA_HAIR(SPLAT_GAROU)