mwerezak 11e5497368 Merge remote-tracking branch 'upstream/dev' into gun-rewrite ...

Conflicts:
	code/modules/projectiles/projectile/bullets.dm

2015-02-18 18:28:18 -05:00

..

ammunition

Gear again

2015-02-18 15:35:37 -05:00

guns

Gear again

2015-02-18 15:35:37 -05:00

projectile

Merge remote-tracking branch 'upstream/dev' into gun-rewrite

2015-02-18 18:28:18 -05:00

ammunition.dm

Adds mercenary sniper rifle

2015-02-14 22:33:43 -05:00

gun.dm

Fixes accuracy not being reset when unzoomed

2015-02-16 23:00:25 -05:00

projectile.dm

Improves bullet projectile embedding handling

2015-02-18 18:09:24 -05:00

targeting.dm

Adds targeting hotkey

2015-02-11 22:54:40 -05:00