Kyep dd8897fd22 Fixes merge conflict

2016-07-07 21:57:42 -07:00

..

glasses

Mass replace

2016-07-07 19:34:02 -07:00

gloves

Of powergloves and pedantry

2016-06-01 17:09:16 -04:00

head

Mass replace

2016-07-07 19:34:02 -07:00

masks

tweaks

2016-07-02 01:45:44 -04:00

shoes

Mass replace

2016-07-07 19:34:02 -07:00

spacesuits

Mass replace

2016-07-07 19:34:02 -07:00

suits

Mass replace

2016-07-07 19:34:02 -07:00

under

Mass replace

2016-07-07 19:34:02 -07:00

clothing.dm

Fixes merge conflict

2016-07-07 21:57:42 -07:00