Preliminary barber stuff, map updates

barber gets comb and scissors. only scissors do damage, adds few new
floors, etc. Keeping the current lighting system for a bit.