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

..

effects

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

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

items

Ports /tg/'s meteor implementation.

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

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

Ports /tg/'s meteor implementation.

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

buckling.dm

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

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

empulse.dm

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

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

explosion_recursive.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

explosion.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00

items.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

objs.dm

Merge pull request #9362 from Kelenius/ofResearchAndPrototypes

2015-05-25 19:55:01 +02:00

structures.dm

Ports /tg/'s meteor implementation.

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

weapons.dm

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00