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

..

emergency_shield.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

energy_field.dm

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

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

sheldwallgen.dm

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

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

shield_capacitor.dm

refactor 'dir = ' into 'set_dir()'

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

shield_gen_external.dm

…

shield_gen.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00