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

..

energy

Merge pull request #10200 from mwerezak/gun-desc

2015-08-14 03:55:43 +03:00

launcher

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

projectile

Merge pull request #10200 from mwerezak/gun-desc

2015-08-14 03:55:43 +03:00

alien.dm

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

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

energy.dm

Streamlines gun firemodes

2015-08-10 14:38:08 -04:00

launcher.dm

Muzzle-flash lighting effect for guns

2015-05-03 12:19:11 +10:00

projectile.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00