cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 22:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issues

Browse Source 
Adds a check for stacktype and a turf check, preventing bad behavior.
This commit is contained in:
FartMaster69420
2022-04-14 00:01:59 -04:00
parent cdb1b8f43d
commit d7abb2e81e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack_vr.dm
+5 -1
View File
@@ -3,6 +3,10 @@
/obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible /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. if(uses_charge || S.uses_charge) // This should realistically never happen, but in case it does lets avoid breaking things.
return return
if(S.stacktype != stacktype)
return
if(S.amount >= S.max_amount)
return
var/transfer = get_amount() var/transfer = get_amount()
transfer = min(transfer, S.max_amount - S.amount) transfer = min(transfer, S.max_amount - S.amount)
@@ -15,6 +19,6 @@
S.add(transfer) S.add(transfer)
/obj/item/stack/Crossed(var/atom/movable/AM) /obj/item/stack/Crossed(var/atom/movable/AM)
if(AM != src && istype(AM, src.type) && !AM.throwing) if(isturf(AM.loc) && AM != src && istype(AM, src.type) && !AM.throwing)
merge(AM) merge(AM)
return ..() return ..()