diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index 33fddcd86e6..00974bdc23a 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -542,7 +542,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(!force) if(check_adjacent) - if(!user || !user.CanReach(destination) || !user.CanReach(parent)) + if(!user || !user.CanReach(destination) || !user.CanReach(resolve_location)) return FALSE var/list/taking = typecache_filter_list(resolve_location.contents, typecacheof(type)) if(taking.len > amount) diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 6fa5738ed0e..89537e483b2 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -13,7 +13,7 @@ if (istype(W, /obj/item/stack/ore)) user.transferItemToLoc(W, src) else if(W.atom_storage) - W.atom_storage.remove_type(/obj/item/stack/ore, src) + W.atom_storage.remove_type(/obj/item/stack/ore, src, INFINITY, TRUE, FALSE, user, null) to_chat(user, span_notice("You empty the ore in [W] into \the [src].")) else return ..() diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 3fdb9724114..24f048e48e8 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -174,7 +174,7 @@ //Fill machine with a bag! if(istype(I, /obj/item/storage/bag)) var/list/inserted = list() - if(I.atom_storage.remove_type(/obj/item/food/grown, src, limit - length(holdingitems), null, null, user, inserted)) + if(I.atom_storage.remove_type(/obj/item/food/grown, src, limit - length(holdingitems), TRUE, FALSE, user, inserted)) for(var/i in inserted) holdingitems[i] = TRUE if(!I.contents.len)