Merge pull request #7450 from lbnesquik/Kot-Cyborg-tweaky-tweka

Manipulators now also drop items with alt click.
This commit is contained in:
Atermonera
2020-08-12 11:26:20 -07:00
committed by VirgoBot
parent b59f7d7723
commit 13350bae16

View File

@@ -38,6 +38,10 @@
drop_item() drop_item()
return return
/obj/item/weapon/gripper/AltClick(mob/user)
drop_item()
return
/obj/item/weapon/gripper/omni /obj/item/weapon/gripper/omni
name = "omni gripper" name = "omni gripper"
desc = "A strange grasping tool that can hold anything a human can, but still maintains the limitations of application its more limited cousins have." desc = "A strange grasping tool that can hold anything a human can, but still maintains the limitations of application its more limited cousins have."
@@ -252,12 +256,15 @@
return resolved return resolved
return ..() return ..()
/obj/item/weapon/gripper/verb/drop_item() /obj/item/weapon/gripper/verb/drop_gripper_item()
set name = "Drop Item" set name = "Drop Item"
set desc = "Release an item from your magnetic gripper." set desc = "Release an item from your magnetic gripper."
set category = "Robot Commands" set category = "Robot Commands"
drop_item()
obj/item/weapon/gripper/proc/drop_item()
if(!wrapped) if(!wrapped)
//There's some weirdness with items being lost inside the arm. Trying to fix all cases. ~Z //There's some weirdness with items being lost inside the arm. Trying to fix all cases. ~Z
for(var/obj/item/thing in src.contents) for(var/obj/item/thing in src.contents)
@@ -268,7 +275,7 @@
wrapped = null wrapped = null
return return
to_chat(src.loc, "<span class='danger'>You drop \the [wrapped].</span>") to_chat(src.loc, "<span class='notice'>You drop \the [wrapped].</span>")
wrapped.loc = get_turf(src) wrapped.loc = get_turf(src)
wrapped = null wrapped = null
//update_icon() //update_icon()