diff --git a/code/game/objects/items/stacks/stack_vr.dm b/code/game/objects/items/stacks/stack_vr.dm new file mode 100644 index 00000000000..8997ad76178 --- /dev/null +++ b/code/game/objects/items/stacks/stack_vr.dm @@ -0,0 +1,19 @@ +/obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible + var/transfer = get_amount() + transfer = min(transfer, S.max_amount - S.amount) + if(pulledby) + pulledby.start_pulling(S) + //S.copy_evidences(src) + transfer_fingerprints_to(S) + if(blood_DNA) + S.blood_DNA |= blood_DNA + use(transfer) + S.add(transfer) + +/obj/item/stack/Crossed(var/atom/movable/AM) + //if(istype(AM, /obj/item/stack) && istype(src, /obj/item/stack)) + if(AM != src) + if(istype(AM, src.type) && !AM.throwing) + log_and_message_admins("AM is [AM] and source is [src] going ahead with merge.") + merge(AM) + return ..() \ No newline at end of file