PsiOmega b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/projectiles/projectile.dm

2015-05-12 13:40:47 +02:00

..

ammunition

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

guns

Merge pull request #8946 from Zuhayr/miningstuff

2015-05-12 13:13:31 +03:00

projectile

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

2015-05-12 13:40:47 +02:00

ammunition.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

effects.dm

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

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

gun.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

projectile.dm

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

2015-05-12 13:40:47 +02:00

targeting.dm

Merge pull request #8971 from mwerezak/burst-fire

2015-04-28 20:24:03 +02:00