Chinsky 3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev ...

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm

2014-10-20 04:52:45 +04:00

..

glasses

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

2014-10-20 04:52:45 +04:00

gloves

Fixes #6613 and #6492

2014-10-08 23:10:12 +10:30

head

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

2014-10-20 04:52:45 +04:00

masks

Fixes #6783, moves spacesuits to a separate file

2014-10-18 22:12:15 -04:00

shoes

Fixed footcuff creation glitch

2014-09-17 18:01:04 +02:00

spacesuits

Fixes #6783, moves spacesuits to a separate file

2014-10-18 22:12:15 -04:00

suits

Fixes #6783, moves spacesuits to a separate file

2014-10-18 22:12:15 -04:00

under

Fixes #6783, moves spacesuits to a separate file

2014-10-18 22:12:15 -04:00

clothing.dm

Fixes #6783, moves spacesuits to a separate file

2014-10-18 22:12:15 -04:00