worst away map. I'm adding more soon anyways.
Merge branch 'master' of https://github.com/UristMcStation/UristMcStation
New hairstyles.
Fixes Combat borgs
More underwear, I'll add them when I get time.
Merge pull request #170 from Knoxon/master

Fixes Combat borgs
Merge pull request #10 from UristMcStation/master

Merge updates from UristMcStation