Revert "prepare to merge with liams changes"

This reverts commit 7604fe952a88362ccb7ab1697d3f2b152c68abde.
added weapons to rooms

weapons now draw in rooms and are randomly distributed at the start of
the game. the code to get the images from the res folder has also been
changed
player names are now actually set