Fixes conflicts

Fixes conflicts

code/modules/vore/appearance/preferences_vr.dm

@@ -11,10 +11,16 @@
 
 	// Horray Furries!
 	var/datum/sprite_accessory/ears/ear_style = null
+	var/red_ear = 30
+	var/g_ear = 30
+	var/b_ear = 30
 	var/datum/sprite_accessory/tail/tail_style = null
 	var/r_tail = 30
 	var/g_tail = 30
 	var/b_tail = 30
+	var/r_tail2 = 30
+	var/g_tail2 = 30
+	var/b_tail2 = 30
 
 	// Custom Species Name
 	var/custom_species

code/modules/vore/appearance/sprite_accessories_vr.dm

@@ -176,6 +176,35 @@
 	desc = ""
 	icon_state = "antlers"
 
+/datum/sprite_accessory/ears/otie
+	name = "otie, colorable"
+	desc = ""
+	icon_state = "otie"
+	do_colouration = 1
+
+/datum/sprite_accessory/ears/cow
+	name = "cow, horns"
+	desc = ""
+	icon_state = "cow"
+
+/datum/sprite_accessory/ears/cowc
+	name = "cow, horns, colorable"
+	desc = ""
+	icon_state = "cow-c"
+	do_colouration = 1
+
+/datum/sprite_accessory/ears/zears
+	name = "jagged ears"
+	desc = ""
+	icon_state = "zears"
+	do_colouration = 1
+
+/datum/sprite_accessory/ears/elfs
+	name = "elven ears"
+	desc = ""
+	icon_state = "elfs"
+	do_colouration = 1
+
 // Special snowflake ears go below here.
 
 /datum/sprite_accessory/ears/molenar_kitsune
@@ -267,7 +296,8 @@
 	var/show_species_tail = 0 // If false, do not render species' tail.
 	var/clothing_can_hide = 1 // If true, clothing with HIDETAIL hides it
 	var/desc = "You should not see this..."
-	var/ani_state //State when wagging/animated
+	var/ani_state // State when wagging/animated
+	var/extra_overlay_w // Wagging state for extra overlay
 
 /datum/sprite_accessory/tail/invisible
 	name = "hide species-sprite tail"
@@ -321,6 +351,7 @@
 	desc = ""
 	icon_state = "stripeytail"
 	do_colouration = 1
+	extra_overlay = "stripeytail_mark"
 
 /datum/sprite_accessory/tail/stripeytail_brown
 	name = "stripey taj, brown"
@@ -642,6 +673,7 @@
 	desc = ""
 	icon_state = "ringtail"
 	do_colouration = 1
+	extra_overlay = "ringtail_mark"
 
 /datum/sprite_accessory/tail/holly
 	name = "tigress tail (Holly)"
@@ -662,6 +694,8 @@
 	icon_state = "curltail"
 	ani_state = "curltail_w"
 	do_colouration = 1
+	extra_overlay = "curltail_mark"
+	extra_overlay_w = "curltail_mark_w"
 
 /datum/sprite_accessory/tail/shorttail
 	name = "shorttail (vwag)"
@@ -676,6 +710,8 @@
 	icon_state = "tigertail"
 	ani_state = "tigertail_w"
 	do_colouration = 1
+	extra_overlay = "tigertail_mark"
+	extra_overlay_w = "tigertail_mark_w"
 
 /datum/sprite_accessory/tail/vulp_new
 	name = "new vulp tail (vwag)"
@@ -683,6 +719,21 @@
 	icon_state = "vulptail"
 	ani_state = "vulptail_w"
 	do_colouration = 1
+	extra_overlay = "vulptail_mark"
+	extra_overlay_w = "vulptail_mark_w"
+
+/datum/sprite_accessory/tail/otietail
+	name = "otie tail (vwag)"
+	desc = ""
+	icon_state = "otie"
+	ani_state = "otie_w"
+	do_colouration = 1
+
+/datum/sprite_accessory/tail/ztail
+	name = "jagged flufftail"
+	desc = ""
+	icon_state = "ztail"
+	do_colouration = 1
 
 /datum/sprite_accessory/tail/shock
 	name = "pharoah hound tail (Shock Diamond)"
@@ -696,7 +747,6 @@
 	icon_state = "snaketail"
 	do_colouration = 1
 
-
 //For all species tails. Includes haircolored tails.
 /datum/sprite_accessory/tail/special
 	name = "Blank tail. Do not select."
@@ -889,10 +939,20 @@
 	name = "Wolf"
 	icon_state = "wolf_s"
 
+/datum/sprite_accessory/tail/taur/wolf/wolf_2c
+	name = "Wolf dual-color"
+	icon_state = "wolf_s"
+	extra_overlay = "wolf_markings"
+
 /datum/sprite_accessory/tail/taur/naga
 	name = "Naga"
 	icon_state = "naga_s"
 
+/datum/sprite_accessory/tail/taur/naga/naga_2c
+	name = "Naga dual-color"
+	icon_state = "naga_s"
+	extra_overlay = "naga_markings"
+
 /datum/sprite_accessory/tail/taur/horse
 	name = "Horse"
 	icon_state = "horse_s"
@@ -905,6 +965,11 @@
 	name = "Lizard"
 	icon_state = "lizard_s"
 
+/datum/sprite_accessory/tail/taur/lizard/lizard_2c
+	name = "Lizard dual-color"
+	icon_state = "lizard_s"
+	extra_overlay = "lizard_markings"
+
 /datum/sprite_accessory/tail/taur/spider
 	name = "Spider"
 	icon_state = "spider_s"
@@ -917,10 +982,23 @@
 	name = "Feline"
 	icon_state = "feline_s"
 
+/datum/sprite_accessory/tail/taur/feline/feline_2c
+	name = "Feline dual-color"
+	icon_state = "feline_s"
+	extra_overlay = "feline_markings"
+
 /datum/sprite_accessory/tail/taur/slug
 	name = "Slug"
 	icon_state = "slug_s"
 
+/*/datum/sprite_accessory/tail/taur/drake //Yeah hold that thought for a bit. These got no suit compatibility yet.
+	name = "Drake"
+	icon_state = "drake_s"
+
+/datum/sprite_accessory/tail/taur/otie
+	name = "Otie"
+	icon_state = "otie_s"*/
+
 //wickedtemp: Chakat Tempest
 /datum/sprite_accessory/tail/taur/feline/tempest
 	name = "Feline (wickedtemp)"

code/modules/vore/appearance/update_icons_vr.dm

@@ -5,7 +5,7 @@
 	if(ear_style && !(head && (head.flags_inv & BLOCKHEADHAIR)))
 		var/icon/ears_s = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.icon_state)
 		if(ear_style.do_colouration)
-			ears_s.Blend(rgb(src.r_hair, src.g_hair, src.b_hair), ear_style.color_blend_mode)
+			ears_s.Blend(rgb(src.red_ear, src.g_ear, src.b_ear), ear_style.color_blend_mode)
 		if(ear_style.extra_overlay)
 			var/icon/overlay = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.extra_overlay)
 			ears_s.Blend(overlay, ICON_OVERLAY)
@@ -27,8 +27,15 @@
 			tail_s.Blend(rgb(src.r_tail, src.g_tail, src.b_tail), tail_style.color_blend_mode)
 		if(tail_style.extra_overlay)
 			var/icon/overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay)
-			tail_s.Blend(overlay, ICON_OVERLAY)
-			qdel(overlay)
+			if(wagging && tail_style.ani_state)
+				overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay_w)
+				overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode)
+				tail_s.Blend(overlay, ICON_OVERLAY)
+				qdel(overlay)
+			else
+				overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode)
+				tail_s.Blend(overlay, ICON_OVERLAY)
+				qdel(overlay)
 
 		if(isTaurTail(tail_style))
 			return image(tail_s, "pixel_x" = -16)