diff --git a/code/modules/vore/appearance/sprite_accessories_yw.dm b/code/modules/vore/appearance/sprite_accessories_yw.dm index 5209a390d6..b595040c78 100644 --- a/code/modules/vore/appearance/sprite_accessories_yw.dm +++ b/code/modules/vore/appearance/sprite_accessories_yw.dm @@ -1,12 +1,3 @@ - - - - - - - - - //Wings /datum/sprite_accessory/wing/bat_purpley_yw @@ -29,3 +20,10 @@ do_colouration = 1 //Tails +/datum/sprite_accessory/tail/tripplekitsune_colorable_yw + icon = 'icons/mob/vore/tails_yw.dmi' + name = "Kitsune 3 tails - colorable" + desc = "" + icon_state = "triplekitsune" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY diff --git a/code/modules/vore/fluffstuff/custom_boxes_yw.dm b/code/modules/vore/fluffstuff/custom_boxes_yw.dm index a2c793d0fb..7458a35b00 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_yw.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_yw.dm @@ -251,4 +251,16 @@ desc = "A kit containing Vasharr's equipment." has_items = list( /obj/item/clothing/accessory/fluff/vasharr_armlets, - /obj/item/clothing/accessory/fluff/vasharr_pendant) \ No newline at end of file + /obj/item/clothing/accessory/fluff/vasharr_pendant) + +//FrenziedVorcha + +/obj/item/weapon/storage/box/fluff/philipsmirnov + name = "Psychiatric box" + desc = "A kit containing various psychiatry tools" + has_items = list( + /obj/item/weapon/fluff/fidgetspinner, + /obj/item/weapon/fluff/fidgetspinner/red, + /obj/item/weapon/fluff/fidgetspinner/yellow, + /obj/item/weapon/fluff/squeezetoy, + /obj/item/weapon/fluff/dimensioncube) \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm index 42d65e9d40..12e63eb0b0 100644 --- a/code/modules/vore/fluffstuff/custom_items_yw.dm +++ b/code/modules/vore/fluffstuff/custom_items_yw.dm @@ -275,3 +275,81 @@ random_emote = list("supresses a moan", "gasps sharply", "bites her lower lip") verb_name = "Milk" verb_desc = "Grab Ysaline's breasts and milk her, storing her fresh, warm milk in a container. This will undoubtedly turn her on." + +// ************** +// Trash +// ************** +/obj/item/weapon/fluff/fidgetspinner + name = "Fidget spinner" + desc = "A spinning stress relief toy, upsetting family, friends, and employers for 500 years." + w_class = 1.0 + icon = 'icons/vore/custom_items_yw.dmi' + icon_state = "fidgetspinner" + var/basestate = "fidgetspinner" + +/obj/item/weapon/fluff/fidgetspinner/red + name = "Red fidget spinner" + desc = "A spinning stress relief toy, upsetting family, friends, and employers for 500 years. This one is red" + w_class = 1.0 + icon = 'icons/vore/custom_items_yw.dmi' + icon_state = "fidgetspinnerr" + basestate = "fidgetspinnerr" + +/obj/item/weapon/fluff/fidgetspinner/yellow + name = "Yellow fidget spinner" + desc = "A spinning stress relief toy, upsetting family, friends, and employers for 500 years. This one is yellow" + w_class = 1.0 + icon = 'icons/vore/custom_items_yw.dmi' + icon_state = "fidgetspinnery" + basestate = "fidgetspinnery" + +/obj/item/weapon/fluff/fidgetspinner/attack_self(mob/living/user) + if(user.r_hand == src || user.l_hand == src) + if(icon_state != "[basestate]-s") + icon_state = "[basestate]-s" + user.visible_message("[user] spins the [src]!") + spawn(100) + icon_state = "[basestate]" + else + return ..() + return + +/obj/item/weapon/fluff/squeezetoy + name = "Stress relief squeeze toy" + desc = "A toy squeezed to relieve stress, it’s squeaker appears to be broken from over use." + w_class = 1.0 + icon = 'icons/vore/custom_items_yw.dmi' + icon_state = "squeezetoy" + +/obj/item/weapon/fluff/squeezetoy/attack_self(mob/living/user) + if(user.r_hand == src || user.l_hand == src) + if(icon_state != "squeezetoy-s") + icon_state = "squeezetoy-s" + user.visible_message("[user] squeezes the [src] a few times!") + spawn(50) + icon_state = "squeezetoy" + else + return ..() + return + +/obj/item/weapon/fluff/dimensioncube + var/folded = 1 + name = "Infinity cube" + desc = "All the fun of a puzzle cube without any of the challenge, a good way to relieve stress and delude yourself into a sense of accomplishment." + w_class = 1.0 + icon = 'icons/vore/custom_items_yw.dmi' + icon_state = "infinitycube0" + +/obj/item/weapon/fluff/dimensioncube/attack_self(mob/living/user) + if(user.r_hand == src || user.l_hand == src) + if(folded == 0) + icon_state = "infinitycube0" + user.visible_message("[user] folds the [src]!") + folded = 1 + else if(folded == 1) + icon_state = "infinitycube1" + user.visible_message("[user] unfolds the [src]!") + folded = 0 + else + return ..() + return \ No newline at end of file diff --git a/config/custom_items.txt b/config/custom_items.txt index bec3a4832e..8e9ab2188d 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -135,6 +135,11 @@ item_path: /obj/item/weapon/storage/box/fluff/art } # ######## E CKEYS # ######## F CKEYS +{ +ckey: frenziedvorcha +character_name: Philip Smirnov +item_path: /obj/item/weapon/storage/box/fluff/philipsmirnov +} # ######## G CKEYS { ckey: generalpantsu diff --git a/icons/mob/vore/tails_yw.dmi b/icons/mob/vore/tails_yw.dmi index cf74d73796..eb8def69e3 100644 Binary files a/icons/mob/vore/tails_yw.dmi and b/icons/mob/vore/tails_yw.dmi differ diff --git a/icons/vore/custom_items_yw.dmi b/icons/vore/custom_items_yw.dmi index 12f21a5e12..622999a1b8 100644 Binary files a/icons/vore/custom_items_yw.dmi and b/icons/vore/custom_items_yw.dmi differ