Neerti 94a2ec5bf1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2 ...

Conflicts:
	.travis.yml
	polaris.dme

2015-07-26 16:01:27 -04:00

..

effects

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2

2015-07-16 22:46:53 -04:00

items

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

2015-07-26 16:01:27 -04: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-07-24 10:53:57 +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

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

2015-07-10 12:57:46 +02:00

items.dm

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

2015-07-14 08:21:12 +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

…