diff --git a/code/game/objects/items/stacks/stack_vr.dm b/code/game/objects/items/stacks/stack_vr.dm index 8997ad7617..14fc8962e9 100644 --- a/code/game/objects/items/stacks/stack_vr.dm +++ b/code/game/objects/items/stacks/stack_vr.dm @@ -1,9 +1,10 @@ +// Porting stack dragging/auto stacking from TG. + /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 @@ -11,9 +12,7 @@ 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) + if(AM != src && 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 diff --git a/vorestation.dme b/vorestation.dme index 724a86ff2c..f815ad7def 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1239,6 +1239,7 @@ #include "code\game\objects\items\stacks\nanopaste_vr.dm" #include "code\game\objects\items\stacks\sandbags.dm" #include "code\game\objects\items\stacks\stack.dm" +#include "code\game\objects\items\stacks\stack_vr.dm" #include "code\game\objects\items\stacks\telecrystal.dm" #include "code\game\objects\items\stacks\tickets.dm" #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm"