SuperSexySpacemans
Included raptor's recent PRs that conflicted
Spoffy's requests to fix up sexyspaceman

-removed duplicate line and refactored as spoffy asked
-changed salivatingarnies to surplusclothing
-commented out hazard tape
-Put can_roll on the base of under, put can_roll = 1 onto the uniforms
that can roll

-missing icons added
-changelog updated
Fixed the telescience disruptor in the armory

-Fixed the telescience disruptor in the armory
-Fixed the missing wire in the clown's office
Removed Hazard Tape from changelog

Removed Hazard Tape from changelog
Merge pull request #113 from FlavoredCactus/SuperSexySpaceman

SuperSexySpacemans (now annotated since 2big)