Peacock tails!

code/modules/vore/appearance/sprite_accessories_vr.dm

@@ -2059,7 +2059,31 @@
 	icon_state = "xenotailalt_fullcolour"
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
+<<<<<<< HEAD
 	
+||||||| parent of 58dba1e323... Merge pull request #9768 from rboys2/clara-dev-peacocktail
+
+=======
+
+/datum/sprite_accessory/tail/peacocktail_red //this is ckey locked for now, but prettiebyrd wants these tails to be unlocked at a later date
+	name = "Peacock tail (vwag)"
+	desc = ""
+	icon = "icons/mob/vore/tails_vr.dmi"
+	icon_state = "peacocktail_red"
+	ani_state = "peacocktail_red_w"
+	ckeys_allowed = list("prettiebyrd")
+
+/datum/sprite_accessory/tail/peacocktail //ditto
+	name = "Peacock tail, colorable (vwag)"
+	desc = ""
+	icon = "icons/mob/vore/tails_vr.dmi"
+	icon_state = "peacocktail"
+	ani_state = "peacocktail_w"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	ckeys_allowed = list("prettiebyrd")
+
+>>>>>>> 58dba1e323... Merge pull request #9768 from rboys2/clara-dev-peacocktail
 /*
 ////////////////////////////
 /  =--------------------=  /