mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-10 14:45:40 +01:00
Magboot and glove fix (#19415)
* Magboot and glove fix * Update armblade.dm * Update leash.dm
This commit is contained in:
@@ -59,7 +59,7 @@
|
||||
desc = "A grotesque weapon made out of bone and flesh that cleaves through people as a hot knife through butter."
|
||||
icon = 'icons/obj/weapons.dmi'
|
||||
icon_state = "arm_blade"
|
||||
w_class = ITEMSIZE_HUGE
|
||||
w_class = ITEMSIZE_NO_CONTAINER
|
||||
force = 5
|
||||
throwforce = 0 //Just to be on the safe side
|
||||
throw_range = 0
|
||||
@@ -81,12 +81,12 @@
|
||||
span_warningplain("You hear organic matter ripping and tearing!"))
|
||||
src.creator = loc
|
||||
|
||||
/obj/item/melee/changeling/dropped(mob/user)
|
||||
..()
|
||||
/obj/item/melee/changeling/dropped(mob/user, equipping, slot)
|
||||
visible_message(span_warning("With a sickening crunch, [creator] reforms their arm!"),
|
||||
span_notice("We assimilate the weapon back into our body."),
|
||||
span_warningplain("You hear organic matter ripping and tearing!"))
|
||||
playsound(src, 'sound/effects/blobattack.ogg', 30, 1)
|
||||
..()
|
||||
|
||||
/obj/item/melee/changeling/Destroy()
|
||||
creator = null
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
icon = 'icons/obj/weapons.dmi'
|
||||
icon_state = "electric_hand"
|
||||
show_examine = FALSE
|
||||
w_class = ITEMSIZE_NO_CONTAINER
|
||||
item_flags = DROPDEL | NOSTRIP
|
||||
|
||||
/obj/item/finger_lockpick/Initialize(mapload)
|
||||
@@ -38,7 +39,9 @@
|
||||
if(ismob(loc))
|
||||
to_chat(loc, span_notice("We shape our finger to fit inside electronics, and are ready to force them open."))
|
||||
|
||||
/obj/item/finger_lockpick/dropped(mob/user)
|
||||
/obj/item/finger_lockpick/dropped(mob/user, equipping, slot)
|
||||
if(equipping)
|
||||
return ..()
|
||||
..()
|
||||
to_chat(user, span_notice("We discreetly shape our finger back to a less suspicious form."))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user