Merge pull request #6297 from CHOMPStation2/upstream-merge-14938

[MIRROR] Variety Add-on

code/modules/mob/new_player/sprite_accessories_ear_vr.dm

@@ -929,4 +929,72 @@
 	desc = ""
 	icon = 'icons/mob/vore/ears_vr.dmi'
 	icon_state = "kara_horn"
-	ckeys_allowed = list("satinisle")
+	ckeys_allowed = list("satinisle")
+
+/datum/sprite_accessory/ears/shark
+	name = "shark ears (Colorable)"
+	desc = ""
+	icon_state = "shark_ears"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/sharkhigh
+	name = "shark upper ears (Colorable)"
+	desc = ""
+	icon_state = "shark_ears_upper"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/sharklow
+	name = "shark lower ears (Colorable)"
+	desc = ""
+	icon_state = "shark_ears_lower"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/sharkfin
+	name = "shark fin (Colorable)"
+	desc = ""
+	icon_state = "shark_fin"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/sharkfinalt
+	name = "shark fin alt style (Colorable)"
+	desc = ""
+	icon_state = "shark_fin_alt"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/ears/sharkboth
+	name = "shark ears and fin (Colorable)"
+	desc = ""
+	icon_state = "shark_ears"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "shark_fin"
+
+/datum/sprite_accessory/ears/sharkbothalt
+	name = "shark ears and fin alt style (Colorable)"
+	desc = ""
+	icon_state = "shark_ears"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "shark_fin_alt"
+
+/datum/sprite_accessory/ears/sharkhighboth
+	name = "shark upper ears and fin (Colorable)"
+	desc = ""
+	icon_state = "shark_ears_upper"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "shark_fin"
+
+/datum/sprite_accessory/ears/sharklowhboth
+	name = "shark lower ears and fin alt style (Colorable)"
+	desc = ""
+	icon_state = "shark_ears_lower"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "shark_fin_alt"
+

code/modules/mob/new_player/sprite_accessories_extra_vr.dm

@@ -981,3 +981,17 @@
 	icon_state = "nevrean_long"
 	color_blend_mode = ICON_MULTIPLY
 	body_parts = list(BP_HEAD)
+
+/datum/sprite_accessory/marking/vr_heterochromia_l
+	name = "Heterochromia (left eye)"
+	icon = 'icons/mob/human_races/markings_vr.dmi'
+	icon_state = "heterochromia_l"
+	body_parts = list(BP_HEAD)
+
+/datum/sprite_accessory/marking/vr_teshi_heterochromia_l
+	name = "Heterochromia (Teshari) (left eye)"
+	icon = 'icons/mob/human_races/markings_vr.dmi'
+	icon_state = "teshi_heterochromia_l"
+	body_parts = list(BP_HEAD)
+	species_allowed = list(SPECIES_TESHARI)
+

code/modules/mob/new_player/sprite_accessories_tail_vr.dm

@@ -1377,3 +1377,32 @@
 	clip_mask_icon = 'icons/mob/vore/taurs_vr.dmi'
 	clip_mask_state = "taur_clip_mask_def" //Used to clip off the lower part of suits & uniforms.
 	extra_overlay = "horse" //I can't believe this works.
+	
+/datum/sprite_accessory/tail/turkey //Would have been a really good thing for Thanksgiving probably but I'm not going to wait that long.
+	name = "turkey"
+	desc = ""
+	icon_state = "turkey"
+
+/datum/sprite_accessory/tail/shark_markings
+	name = "akula tail, colorable, tail and fins"
+	desc = ""
+	icon_state = "sharktail"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "sharktail_markings"
+
+/datum/sprite_accessory/tail/shark_stripes
+	name = "akula tail, colorable, stripe"
+	desc = ""
+	icon_state = "sharktail"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "sharktail_stripemarkings"
+
+/datum/sprite_accessory/tail/shark_tips
+	name = "akula tail, colorable, tips"
+	desc = ""
+	icon_state = "sharktail"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "sharktail_tipmarkings"