From 1572eeee0e0e15c0678a8cced42bef25941bb52c Mon Sep 17 00:00:00 2001 From: Amy Date: Sat, 14 Nov 2020 12:54:25 -0600 Subject: [PATCH] inhand checks are important, also necklace is smol --- code/modules/vore/fluffstuff/custom_clothes_vr.dm | 3 +-- code/modules/vore/fluffstuff/custom_items_vr.dm | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index ada43c11a22..768e820b3f6 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2011,7 +2011,6 @@ Departamental Swimsuits, for general use /obj/item/clothing/suit/space/rig/fluff/nikki //don't believe the path name, this ain't spaceworthy at all. see /obj/item/weapon/rig/nikki name = "cape" desc = "Snazzy!" - icon = 'icons/vore/custom_onmob_vr.dmi' icon_state = "nikki" item_flags = 0 // NO SPACE TRAVEL, IT'S JUST A CAPE breach_threshold = 1 // see above @@ -2107,7 +2106,7 @@ Departamental Swimsuits, for general use ..() /obj/item/clothing/head/fluff/nikki/AltClick(mob/user) - if (translocator) + if (translocator && (user.get_inactive_hand() == src)) translocator_unequip(translocator, user) /obj/item/clothing/head/fluff/nikki/attack_self(mob/user) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 8dcb6d0affc..4fc1824b205 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1258,10 +1258,11 @@ /obj/item/weapon/rig/nikki name = "weird necklace" desc = "A necklace with a brilliantly blue gem encased in protective glass." - icon = 'icons/vore/custom_items_vr.dmi' + icon = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_onmob_vr.dmi' suit_type = "probably not magical" icon_state = "nikki" + w_class = ITEMSIZE_SMALL // It is after all only a necklace armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // this isn't armor, it's a dorky frickin cape siemens_coefficient = 0.9 slowdown = 0 @@ -1288,7 +1289,7 @@ if(..()) if (M.ckey == "ryumi") return 1 - else + else if (M.get_active_hand == src) to_chat(M, "For some reason, the necklace seems to never quite get past your head when you try to put it on... Weird, it looked like it would fit.") return 0