Forgot to Convert to our Code.

Fixed to our liking. Also changed back to Baskets and Water Containers
and Cleaning up code.
Taking out Water Bottles and Caned Beans
Merge branch '0.9f-of-Team-Wasteland-Mod' of https://github.com/GSN-Pager/GSN_WASTELAND_FULL into 0.9f-of-Team-Wasteland-Mod