added floor to rooms
fixed merge conflict in main because of network shit