Merge pull request #850 from Citadel-Station-13/upstream-merge-26980

[MIRROR] Small Click refactor.

code/game/objects/items/weapons/storage/internal.dm

@@ -5,10 +5,6 @@
 	w_class = WEIGHT_CLASS_BULKY
 	rustle_jimmies = FALSE
 
-/obj/item/weapon/storage/internal/ClickAccessible(mob/user, depth=1)
-	if(loc)
-		return loc.ClickAccessible(user, depth)
-
 /obj/item/weapon/storage/internal/Adjacent(A)
 	if(loc)
 		return loc.Adjacent(A)

code/game/objects/items/weapons/storage/storage.dm

@@ -38,7 +38,7 @@
 			return
 
 		// this must come before the screen objects only block, dunno why it wasn't before
-		if(over_object == M && (src.ClickAccessible(M, depth=STORAGE_VIEW_DEPTH) || Adjacent(M)))
+		if(over_object == M && M.CanReach(src,view_only = TRUE))
 			orient2hud(M)
 			if(M.s_active)
 				M.s_active.close(M)