Ccomp5950 975433f898 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi

2014-01-30 12:14:44 -06:00

..

glasses

…

gloves

…

head

…

masks

…

shoes

Fixes #4355

2014-01-30 21:27:44 +10:30

spacesuits

Fixes #4078

2014-01-30 23:31:50 +10:30

suits

Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Papers in their suit slot.

2014-01-08 19:35:34 +00:00

under

…

clothing.dm

Tiny objects on ears

2014-01-09 23:45:08 +01:00