PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm

2015-04-24 17:13:37 +02:00

..

bluespaceartillery.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

corpse.dm

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

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

exile.dm

Swapped the locations of the Vault and Tech Storage.

2012-12-01 01:03:15 +00:00

gateway.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

loot.dm

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

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

pamphlet.dm

Moved para and sleepy pen defines out of weapon.dm.

2012-10-13 14:37:28 +00:00

trigger.dm

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

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

zlevel.dm

Clean server start.

2015-04-18 15:32:25 +02:00