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

Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-03-13 09:23:26 +01:00

..

ammunition

Misc gun tweaks

2015-02-23 18:25:22 -05:00

guns

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

2015-03-13 09:23:26 +01:00

projectile

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

2015-03-13 09:23:26 +01:00

ammunition.dm

Adds mercenary sniper rifle

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

effects.dm

Projectile effects - Part 1

2015-03-09 22:17:06 +13:00

gun.dm

Fixes accuracy not being reset when unzoomed

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

projectile.dm

Projectile effects - Part 2

2015-03-09 22:17:18 +13:00

targeting.dm

Adds targeting hotkey

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