dannno 3dc5a04038 Merge branch 'master' of https://github.com/tgstation/-tg-station into bandanno's ...

Conflicts:
	config/admins.txt

2015-01-12 15:55:51 -05:00

..

jobs

makes the second cook spawn in short order clothes, fixes chef uniform

2014-12-28 01:12:49 -08:00

chameleon.dm

Fixes spelling errors in clothing item descriptions and adds/edits descriptions for others.

2014-11-20 23:26:10 -05:00

color.dm

u know what it is

2015-01-11 16:08:21 -05:00

miscellaneous.dm

Revert "Adds Nien's HoS formal sprites so they dont look like a Prince suit."

2015-01-07 09:12:39 -08:00

pants.dm

Adds new undershirts, jeans and pants by WalterJe

2014-11-23 13:58:32 -03:00

shorts.dm

more NT ports

2014-10-01 18:36:57 -07:00

syndicate.dm

revert jumpsuit armor changes

2014-12-13 00:38:31 -08:00

ties.dm

Adds 3 more scarves

2014-12-19 00:24:01 -03:00