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

Conflicts:
	code/game/objects/items/weapons/power_cells.dm

2015-05-22 08:26:13 +02:00

..

ammunition

Changed steel material name to a define.

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

guns

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

2015-05-22 08:26:13 +02:00

projectile

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

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

ammunition.dm

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

2015-05-16 22:38:01 +02:00

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-16 22:38:01 +02:00

targeting.dm

Merge pull request #8971 from mwerezak/burst-fire

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