Chinsky e74cd95fec Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/turfs/turf.dm
	code/modules/clothing/spacesuits/rig.dm

2013-02-02 23:10:12 +04:00

..

glasses

…

gloves

…

head

…

masks

…

shoes

…

spacesuits

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-02-02 23:10:12 +04:00

suits

…

under

…

clothing.dm

…