PsiOmegaDelta 93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/setup.dm

2015-07-30 10:49:37 +02:00

..

ammunition

Mostly removes creation of throwaway objects from chameleon items

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

guns

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

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

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

projectile.dm

Fixes projectiles being able to hit humans in organs they do not have.

2015-07-28 20:23:26 -04:00

targeting.dm

fixes #8391

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