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

Conflicts:
	.travis.yml
	code/setup.dm
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-06-17 09:33:34 +02:00

..

effects

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

2015-06-17 09:33:34 +02:00

items

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

2015-06-16 10:52:33 +02:00

random

Final tweaks to recipe availability and material inheritance.

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

structures

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

2015-06-17 09:33:34 +02:00

buckling.dm

…

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-06-07 10:30:27 +02:00

items.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02: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

…