PsiOmega 151c5204ee Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml

2015-05-05 08:11:28 +02:00

..

ammunition

Attempts to save Yosh's code.

2015-04-25 16:39:09 +02:00

guns

Merge pull request #8971 from mwerezak/burst-fire

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

projectile

Merge pull request #8971 from mwerezak/burst-fire

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

ammunition.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03: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

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

2015-05-05 08:11:28 +02:00

projectile.dm

Fixes #9037.

2015-04-30 09:35:57 +02:00

targeting.dm

Merge pull request #8971 from mwerezak/burst-fire

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