PsiOmegaDelta 772488fadc Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	.travis.yml
	code/setup.dm
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-06-17 09:33:34 +02:00

..

Cleanable

Fixes #9211

2015-06-17 06:50:08 +03:00

posters

Adds 7 new posters.

2015-03-06 21:14:32 -06:00

cleanable.dm

Updates bots to be mobs. Several changes.

2015-04-26 15:30:11 +03:00

contraband.dm

objects/effects, objects/structures

2015-05-30 14:37:40 +01:00

crayon.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

misc.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

remains.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

warning_stripes.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00