PsiOmega 5de22ace82 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm

2015-05-10 10:43:46 +02:00

..

boxing.dm

Removes most instances of item_color

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

color.dm

Adjusts glove siemen coefficients

2015-04-22 16:46:14 -04:00

miscellaneous.dm

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

2015-05-10 10:43:46 +02:00