PsiOmegaDelta bad9c103eb Merge remote-tracking branch 'upstream/dev' into 150605-Meteors ...

Conflicts:
	code/game/gamemodes/meteor/meteors.dm

2015-06-05 14:59:52 +02:00

..

particle_accelerator

Ports /tg/'s meteor implementation.

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

act.dm

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

collector.dm

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

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

containment_field.dm

Ports /tg/'s meteor implementation.

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

emitter.dm

Ports /tg/'s meteor implementation.

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

field_generator.dm

Ports /tg/'s meteor implementation.

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

generator.dm

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

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

investigate.dm

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

singularity.dm

Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).

2015-06-04 22:51:15 +03:00