diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index a4048fe2a9..f18b695198 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -873,6 +873,20 @@ ckeywhitelist = list("scree") character_name = list("Scree") +/datum/gear/fluff/avida_dress + path = /obj/item/clothing/under/skirt/outfit/fluff/avida + display_name = "Avida's Dress" + slot = slot_w_uniform + ckeywhitelist = list("scree") + character_name = list("Avida") + +/datum/gear/fluff/avida_hat + path = /obj/item/clothing/head/fluff/avida + display_name = "Avida's Hat" + slot = slot_head + ckeywhitelist = list("scree") + character_name = list("Avida") + /datum/gear/fluff/alfonso_sunglasses path = /obj/item/clothing/glasses/sunglasses/fluff/alfonso display_name = "Alfonso's Sunglasses" 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 41ed65cfac..2e18791beb 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm @@ -754,6 +754,16 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/ears/bnnuy2 + name = "Bnnuy Ears 2" + desc = "" + icon = 'icons/mob/vore/ears_32x64.dmi' + icon_state = "bnnuy2" + extra_overlay = "bnnuy-inner" + extra_overlay2 = "bnnuy-tips2" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/ears/sandfox name = "Sandfox Ears" desc = "" diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 4aaaf40d7a..532503b7e0 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -625,6 +625,40 @@ else return 1 +//scree:Avida +/obj/item/clothing/under/skirt/outfit/fluff/avida + name = "purple dress" + desc = "A clingy purple dress with red lacework, with a hole at the back for a tail." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "avidadress" + item_state = "avidadress" + item_icons = list( + slot_l_hand_str = 'icons/vore/custom_clothes_left_hand_vr.dmi', + slot_r_hand_str = 'icons/vore/custom_clothes_right_hand_vr.dmi', + slot_w_uniform_str = 'icons/vore/custom_onmob_vr.dmi' + ) + +//scree:Avida +/obj/item/clothing/head/fluff/avida + name = "purple witch hat" + desc = "A pointy purple hat with a wide brim, with a red hatband. It appears to have ear-holes in it." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "avidahat" + item_state = "avidahat" + item_icons = list( + slot_l_hand_str = 'icons/vore/custom_clothes_left_hand_vr.dmi', + slot_r_hand_str = 'icons/vore/custom_clothes_right_hand_vr.dmi', + slot_head_str = 'icons/vore/custom_onmob_32x48_vr.dmi' + ) + +/obj/item/clothing/head/fluff/avida/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) + if(..()) + if(H.ear_style.name == "Bnnuy Ears"||H.ear_style.name == "Bnnuy Ears 2") //check if wearer's ear sprite is compatible with trimmed icon + item_state = initial(src.item_state) + else //if not, just use a generic icon + item_state = "avidahatnoears" + return TRUE + //natje:Pumila /obj/item/clothing/under/fluff/aluranevines name = "Pumila's vines" @@ -645,27 +679,6 @@ else return 1 -/obj/item/clothing/under/fluff/screesuit - name = "Scree's feathers" - desc = "A mop of fluffy blue feathers, the honkmother only knows what kind of bird they originally came from." - - icon = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "screesuit" - - icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "screesuit_mob" - -/obj/item/clothing/under/fluff/screesuit/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) - if(..()) - if(H.ckey != "scree") - to_chat(H, "Are you just going to tape them on or what? This isn't gonna work.") - return 0 - else - return 1 - -/obj/item/clothing/under/fluff/screesuit/digest_act(var/atom/movable/item_storage = null) - return FALSE - //HOS Hardsuit /obj/item/clothing/suit/space/void/security/fluff/hos // ToDo: Rig version. name = "\improper prototype voidsuit" diff --git a/icons/mob/vore/ears_32x64.dmi b/icons/mob/vore/ears_32x64.dmi index 4fd59c7e69..a661c9e3c7 100644 Binary files a/icons/mob/vore/ears_32x64.dmi and b/icons/mob/vore/ears_32x64.dmi differ diff --git a/icons/vore/custom_clothes_left_hand_vr.dmi b/icons/vore/custom_clothes_left_hand_vr.dmi index ec5dd4b55a..17ac4c3a7e 100644 Binary files a/icons/vore/custom_clothes_left_hand_vr.dmi and b/icons/vore/custom_clothes_left_hand_vr.dmi differ diff --git a/icons/vore/custom_clothes_right_hand_vr.dmi b/icons/vore/custom_clothes_right_hand_vr.dmi index 2fc3bdb14f..d77e0fa248 100644 Binary files a/icons/vore/custom_clothes_right_hand_vr.dmi and b/icons/vore/custom_clothes_right_hand_vr.dmi differ diff --git a/icons/vore/custom_onmob_32x48_vr.dmi b/icons/vore/custom_onmob_32x48_vr.dmi index 2889db5cc0..827ab1fb47 100644 Binary files a/icons/vore/custom_onmob_32x48_vr.dmi and b/icons/vore/custom_onmob_32x48_vr.dmi differ