Quick fix for tables, lockers and general drop_item

Shall do the trick
Merge pull request #2865 from Razharas/TablesLockers

Quick fix for tables, lockers and general drop_item