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

Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/power/rust/core_gen.dm
	code/modules/power/rust/fuel_compressor_construction.dm
	code/modules/power/rust/fuel_injector.dm

2015-07-01 22:46:40 +02:00

..

particle_accelerator.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

particle_chamber.dm

Recommitting PA sprites by Flash Kirby.

2013-09-01 21:10:39 +01:00

particle_control.dm

Adds Destroys.

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

particle_emitter.dm

refactor 'dir = ' into 'set_dir()'

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

particle_power.dm

Recommitting PA sprites by Flash Kirby.

2013-09-01 21:10:39 +01:00

particle.dm

Removes the RUST engine.

2015-07-01 15:50:55 +09:30