diff --git a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm index 7c90da6f44..c00ca9f7d0 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm @@ -798,3 +798,24 @@ extra_overlay = "jackalope-antlers" do_colouration = 1 color_blend_mode = ICON_MULTIPLY +<<<<<<< HEAD +======= + +/datum/sprite_accessory/ears/kittyr + name = "kitty right only, colorable" + icon = 'icons/mob/vore/ears_uneven.dmi' + desc = "" + icon_state = "kittyrinner" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "kittyr" + +/datum/sprite_accessory/ears/bunny_tall + name = "Bunny Tall Ears" + desc = "" + icon = 'icons/mob/vore/ears_32x64.dmi' + icon_state = "bunny-tall" + extra_overlay = "bunny-tall-inner" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY +>>>>>>> 657bedb35d6... Merge pull request #12200 from Heroman3003/bradny diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 772bc92d85..ddbd108209 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -462,6 +462,12 @@ species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) gender = NEUTER +/datum/sprite_accessory/hair/slicker + name = "Slicker" + icon = 'icons/mob/human_face_vr.dmi' + icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_state = "hair_slicker" + /datum/sprite_accessory/facial_hair icon = 'icons/mob/human_face_or_vr.dmi' color_blend_mode = ICON_MULTIPLY diff --git a/icons/mob/vore/ears_32x64.dmi b/icons/mob/vore/ears_32x64.dmi index 234a03f2ca..4fd59c7e69 100644 Binary files a/icons/mob/vore/ears_32x64.dmi and b/icons/mob/vore/ears_32x64.dmi differ