mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-30 15:38:02 +01:00
inhand checks are important, also necklace is smol
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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, "<span class='warning'>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.</span>")
|
||||
return 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user