PsiOmegaDelta 9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm

2015-07-11 10:58:49 +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

Moved trajectory check to during target assessment

2015-07-11 02:47:47 +12:00

targeting.dm

fixes #8391

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