PsiOmegaDelta 3a55b130a0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	.travis.yml
	code/modules/virus2/disease2.dm
	maps/exodus-5.dmm

2015-08-14 08:34:42 +02:00

..

rig

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

2015-08-14 08:34:42 +02:00

void

Updates more hats

2015-06-28 01:50:05 -04:00

alien.dm

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

2015-07-14 08:21:12 +02:00

breaches.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

captain.dm

Updates more hats

2015-06-28 01:50:05 -04:00

miscellaneous.dm

Updates more hats

2015-06-28 01:50:05 -04:00

spacesuits.dm

Updates more hats

2015-06-28 01:50:05 -04:00

syndi.dm

Updates more hats

2015-06-28 01:50:05 -04:00