diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 21596308172..9f055d83a9e 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -85,6 +85,8 @@ update_icon() + + /obj/item/weapon/claymore/fluff // MrBarrelrolll: Maximus Greenwood name = "Greenwood's Blade" desc = "A replica claymore with strange markings scratched into the blade." @@ -171,6 +173,28 @@ icon_state = "jello_guitar" item_state = "jello_guitar" +/obj/item/fluff/wingler_comb + name = "blue comb" + desc = "A blue comb, it looks like it was made to groom a Tajaran's fur." + icon = 'icons/obj/custom_items.dmi' + icon_state = "wingler_comb" + attack_verb = "combed" + force = 0 + throwforce = 0 + var/used = 0 + +/obj/item/fluff/wingler_comb/attack_self(mob/user as mob) + if(used) + return + + var/mob/living/carbon/human/target = user + if(!istype(target) || !istype(target.species, /datum/species/tajaran)) // Only catbeasts, kthnx. + return + + if(target.change_body_accessory("Jay Wingler Tail")) + to_chat(target, "You comb your tail with the [src].") + used = 1 + ////////////////////////////////// //////////// Clothing //////////// ////////////////////////////////// diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index 677e4b42784..9583f2f4285 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -102,6 +102,13 @@ var/global/list/body_accessory_by_species = list("None" = null) return 0 +/datum/body_accessory/tail/wingler_tail // Jay wingler fluff tail + name = "Jay Wingler Tail" + + icon_state = "winglertail" + animated_icon_state = "winglertail_a" + + //Vulpkanin /datum/body_accessory/tail/vulpkanin_2 name = "Vulpkanin Alt 1 (Bushy)" diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index c315fbbdc2f..9a319c6f5dc 100644 Binary files a/icons/mob/body_accessory.dmi and b/icons/mob/body_accessory.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index a2c5117d204..53724fd9706 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ