Mloc-Argent 9896e44d8a Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/__HELPERS/unsorted.dm

2014-06-12 18:56:26 +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

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

masks

Fixes #5138

2014-06-03 20:10:24 -04:00

shoes

Compile fix for a fix for legcuffs.

2014-06-12 02:50:11 +04:00

spacesuits

Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits.

2014-05-27 01:18:07 +09:30

suits

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

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

under

Fixes shoulder holster

2014-06-08 15:25:04 +01:00

clothing.dm

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

2014-06-12 18:56:26 +01:00