Steelpoint 217809bab6 Merge branch 'master' of https://github.com/tgstation/-tg-station into SecSprtites2015 ...

Conflicts:
	icons/mob/uniform.dmi

2015-01-24 01:11:14 +08:00

..

glasses

Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit

2014-12-16 02:52:08 +03:00

gloves

Merge branch 'master' of https://github.com/tgstation/-tg-station into nitrile

2014-12-29 20:19:57 -08:00

head

SecSprites2015

2015-01-21 23:07:15 +08:00

masks

action button and headmaskform removes, terrorists win

2015-01-13 17:30:42 -05:00

shoes

coats to lockers, winter boots

2014-12-05 21:14:49 -08:00

spacesuits

Some fixes

2015-01-20 21:41:36 -06:00

suits

SecSprites2015

2015-01-21 23:07:15 +08:00

under

Fixes cargotech jumpsuit onmob sprite (revert the sprite to the old grey+lightbrown one)

2015-01-19 21:14:43 +01:00

clothing.dm

refactors clothing

2015-01-19 00:59:35 -08:00