From 5ebb86b60351bea08499c410737adec5c2b7488b Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 12 Feb 2022 16:34:04 -0500 Subject: [PATCH 1/2] Adds Slicker hair and Tall Bunny ears --- .../new_player/sprite_accessories_ear_vr.dm | 21 ++++++++++++++++++ .../mob/new_player/sprite_accessories_vr.dm | 6 +++++ icons/mob/vore/ears_32x64.dmi | Bin 5996 -> 6675 bytes 3 files changed, 27 insertions(+) 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 234a03f2ca875c76d07a62b0ce5cb11ac24f5410..4fd59c7e69d61f88d08453a3f6ee037f3667aa93 100644 GIT binary patch literal 6675 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 literal 5996 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 From 8eb3523fb81150b66db2eac698e208ffab56dc88 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 13 Feb 2022 01:22:28 -0700 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/mob/new_player/sprite_accessories_ear_vr.dm | 3 --- 1 file changed, 3 deletions(-) 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 c00ca9f7d0..41ed65cfac 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm @@ -798,8 +798,6 @@ extra_overlay = "jackalope-antlers" do_colouration = 1 color_blend_mode = ICON_MULTIPLY -<<<<<<< HEAD -======= /datum/sprite_accessory/ears/kittyr name = "kitty right only, colorable" @@ -818,4 +816,3 @@ extra_overlay = "bunny-tall-inner" do_colouration = 1 color_blend_mode = ICON_MULTIPLY ->>>>>>> 657bedb35d6... Merge pull request #12200 from Heroman3003/bradny