Stacking Stacks

This commit is contained in:
FartMaster69420
2022-04-06 20:40:08 -04:00
parent e6912d1228
commit 0f71072173
@@ -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 ..()