Fixed segfaults (hopefully)

if condition in AddRooms let rooms that were too big through
Loops were looking to far into the vector
Merge conflict