cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 01:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12680 from FartMaster69420/stack-stacking

Browse Source 
Stack Stacking
This commit is contained in:
Casey
2022-04-06 23:22:43 -04:00
committed by GitHub
parent 5b7871baef f121f7fa1a
commit ec84f1b428
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/game/objects/items/stacks/stack_vr.dm Normal file
View File

@@ -0,0 +1,20 @@
// Porting stack dragging/auto stacking from TG.
/obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible
if(uses_charge || S.uses_charge) // This should realistically never happen, but in case it does lets avoid breaking things.
return
var/transfer = get_amount()
transfer = min(transfer, S.max_amount - S.amount)
if(pulledby)
pulledby.start_pulling(S)
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(AM != src && istype(AM, src.type) && !AM.throwing)
merge(AM)
return ..()

1
vorestation.dme
View File

@@ -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"