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

Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm

2015-02-10 20:59:22 -05:00

..

ammunition

Ammo magazine and casing update

2015-02-09 21:32:49 -05:00

guns

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

2015-02-10 20:59:22 -05:00

projectile

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

2015-02-10 20:59:22 -05:00

ammunition.dm

Fixes ammo_magazine icon states being handled incorrectly.

2015-02-09 21:35:37 -05:00

gun.dm

Removes IsHandgun() proc, adds slot flag

2015-02-10 20:25:41 -05:00

projectile.dm

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

2015-02-10 20:59:22 -05:00

targeting.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00