Mloc-Argent ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm

2014-05-31 00:17:56 +01:00

..

glasses

Merge pull request #4723 from Jarcolr/diction

2014-04-09 21:48:19 +04:00

gloves

Fixed #4850

2014-04-30 14:11:34 -04:00

head

Merge remote-tracking branch 'upstream/master' into dev

2014-05-11 13:19:09 +00:00

masks

Squashed armalis/vox commits and human icon update commits:

2014-05-15 14:30:37 +09:30

shoes

More sensible clothing w_class

2014-04-29 14:42:22 -04:00

spacesuits

Split vox and vox armalis icons up into their own files. Set up species-level sprite files for vox and vox armalis. Removed icons/mob/vox.dmi.

2014-05-15 14:46:27 +09:30

suits

Merge remote-tracking branch 'upstream/master' into dev

2014-05-11 13:19:09 +00:00

under

Accessories are now visible when attached

2014-05-10 22:30:09 -04:00

clothing.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00