mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-25 14:16:58 +01:00
[MIRROR] Fixes a borg gripper bug (#12752)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
9a3bb7684d
commit
4da9bff6d1
@@ -437,18 +437,18 @@
|
||||
..()
|
||||
return
|
||||
|
||||
/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob)
|
||||
/obj/item/stack/attackby(obj/item/W, mob/user)
|
||||
if(istype(W, /obj/item/gripper))
|
||||
var/obj/item/gripper/G = W
|
||||
G.consolidate_stacks(src)
|
||||
G.consolidate_stacks(src, user)
|
||||
if(QDELETED(src))
|
||||
return
|
||||
return TRUE
|
||||
|
||||
else if(istype(W, /obj/item/stack))
|
||||
var/obj/item/stack/S = W
|
||||
src.transfer_to(S)
|
||||
if(QDELETED(src))
|
||||
return
|
||||
return TRUE
|
||||
|
||||
if (S && user.check_current_machine(S))
|
||||
S.interact(user)
|
||||
|
||||
Reference in New Issue
Block a user