tkdrg 96237278fa Merge branch 'master' into meido ...

Conflicts:
	code/modules/clothing/under/miscellaneous.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi

2014-12-25 12:41:29 -03:00

..

jobs

warden bug, warden belt, backpacks

2014-12-17 09:19:04 -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

Fixes collectable hat capitalization and changes the descriptions on some items.

2014-11-21 10:24:12 -05:00

miscellaneous.dm

Merge branch 'master' into meido

2014-12-25 12:41:29 -03: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