PsiOmega 6c891406f9 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm

2015-06-26 19:22:31 +02:00

..

collectable.dm

…

hardhat.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

helmet.dm

…

jobs.dm

Cleared out my WIP folder.

2015-02-03 03:20:42 -07:00

misc_special.dm

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

2015-06-26 19:22:31 +02:00

misc.dm

…

soft_caps.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00