mwerezak 7dd82f8763 Merge remote-tracking branch 'upstream/dev-freeze' into backup ...

Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm

2015-02-28 03:39:38 -05:00

..

ammunition

Misc gun tweaks

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

guns

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

2015-02-28 03:39:38 -05:00

projectile

Adjusts sniper rifle damage

2015-02-24 20:45:40 -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

Merge pull request #8157 from mwerezak/gun-rewrite

2015-02-21 07:52:58 +03:00

targeting.dm

Adds targeting hotkey

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