PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm

2015-08-13 08:09:28 +02:00

..

ammunition

Mostly removes creation of throwaway objects from chameleon items

2015-06-06 18:19:23 -04:00

guns

Streamlines gun firemodes

2015-08-10 14:38:08 -04:00

projectile

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

2015-07-11 10:58:49 +02:00

ammunition.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

effects.dm

Projectile visual bug fixes

2015-07-11 00:06:44 +12:00

gun.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +02:00

projectile.dm

Merge pull request #10184 from mwerezak/projectile-cleanup

2015-08-13 07:26:58 +03:00

targeting.dm

fixes #8391

2015-07-09 13:23:13 -07:00