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

Conflicts:
	code/game/objects/items.dm

2015-07-06 18:33:09 +02:00

..

energy

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

2015-06-20 20:40:06 +02:00

launcher

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

projectile

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

2015-07-06 18:33:09 +02: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

Mostly removes creation of throwaway objects from chameleon items

2015-06-06 18:19:23 -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