This commit is contained in:
Fluffy
2024-03-03 19:52:57 +00:00
committed by GitHub
parent 548bdbb3b7
commit cf056641d3
29 changed files with 119 additions and 39 deletions
@@ -255,7 +255,7 @@
if(istype(module_active, /obj/item/gripper))
var/obj/item/gripper/G = module_active
if(G.wrapped == O)
G.drop(get_turf(src), FALSE) //We don't need to see the "released X item" message if we're putting stuff in fridges and the like.
G.drop(get_turf(src), src, FALSE) //We don't need to see the "released X item" message if we're putting stuff in fridges and the like.
/mob/living/silicon/robot/drop_item()
if(istype(module_active, /obj/item/gripper))
@@ -272,7 +272,7 @@
target = loc
if (istype(W.loc, /obj/item/gripper))
var/obj/item/gripper/G = W.loc
G.drop(target, do_feedback)
G.drop(target, src, do_feedback)
return TRUE
return FALSE
@@ -107,7 +107,7 @@
/obj/item/gripper/CtrlClick(mob/user)
if(wrapped)
drop(get_turf(src))
drop(get_turf(src), user)
return
to_chat(user, SPAN_WARNING("\The [src] isn't gripping anything!"))
@@ -118,7 +118,21 @@
drop(get_turf(src), usr)
/obj/item/gripper/proc/drop(var/atom/target, mob/user, var/feedback = TRUE)
/**
* Drop an item from the gripper onto the target
*
* * target - An `/atom` to drop (move) the item onto
* * user - The `/mob` that is dropping it
* * feedback - Boolean, if `TRUE` prints a message about the drop
*/
/obj/item/gripper/proc/drop(atom/target, mob/user, feedback = TRUE)
if(!istype(target))
crash_with("The target to drop the item onto is not specified or is incorrect!")
if(!istype(user))
crash_with("The user that is performing the drop is not specified or is incorrect!")
if(wrapped)
if(wrapped.loc == src)
if(force_holder)
@@ -128,6 +142,7 @@
force_holder = null
if(feedback)
to_chat(loc, SPAN_NOTICE("You release \the [wrapped].")) // loc will always be the cyborg
wrapped = null
update_icon()
return TRUE