Kelenius bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm

2015-08-21 16:15:07 +03:00

..

effects

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

items

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

random

Final tweaks to recipe availability and material inheritance.

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

structures

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

buckling.dm

…

empulse.dm

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

2015-08-11 08:21:06 +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 branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

objs.dm

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

structures.dm

Ports /tg/'s meteor implementation.

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

weapons.dm

…