Kelenius 4500eac948 Merge and removal of a wild file ...

Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/modules/reagents/Chemistry-Holder.dm

2015-04-29 14:20:44 +03:00

..

ammunition

Attempts to save Yosh's code.

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

guns

Merge and removal of a wild file

2015-04-29 14:20:44 +03: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 pull request #8971 from mwerezak/burst-fire

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

projectile.dm

Merge pull request #8971 from mwerezak/burst-fire

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

targeting.dm

Merge pull request #8971 from mwerezak/burst-fire

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