Tigercat2000 d5ae124a92 Merge remote-tracking branch 'upstream/master' into bay_equipping ...

Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi

2016-06-13 20:11:29 -07:00

..

glasses

Clean up the horrific mess of 6bae633 through 468944f

2016-05-25 15:27:00 -07:00

gloves

Of powergloves and pedantry

2016-06-01 17:09:16 -04:00

head

Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into disguise

2016-05-16 19:00:26 -07:00

masks

smh, vox

2016-05-07 19:37:33 +02:00

shoes

Fixes camera assemblies and orange shoes not respecting NODROP (#4654)

2016-06-13 01:39:26 -04:00

spacesuits

Fixes paths, snipers, turrets, mechas, some other things.

2016-05-31 22:50:59 -04:00

suits

Fixes Laser Armor

2016-06-04 00:50:18 -04:00

under

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

2016-06-13 20:11:29 -07:00

clothing.dm

Refactors examine code to make disguising a humanoid's species possible with s string specified in clothing item definitions. Cardborg disguises now say their wearer is "a high-tech robot!" when they are examined.

2016-05-16 18:59:17 -07:00