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

Stop stacks merging when in a machine and not being used as a construction part, fixes #68456 (#69295)

Browse Source
This commit is contained in:
RandomGamer123
2022-08-24 22:48:05 -04:00
committed by GitHub
parent e6c6eb15b5
commit 0f373cb58b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+4
View File
@@ -572,6 +572,10 @@
return FALSE
if(ismob(loc) && !inhand) // no merging with items that are on the mob
return FALSE
if(istype(loc, /obj/machinery)) // no merging items in machines that aren't both in componentparts
var/obj/machinery/machine = loc
if(!(src in machine.component_parts) || !(check in machine.component_parts))
return FALSE
return TRUE
/**