cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
FartMaster69420
2022-04-06 21:01:13 -04:00
parent 0f71072173
commit 8fa89518ba
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack_vr.dm
+5 -6
View File
@@ -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 ..()