PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm

2015-08-21 20:27:48 +02:00

..

Cleanable

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

posters

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

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