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

..

animate.dm

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

beams.dm

Improves gun scope zooming

2015-02-14 22:12:16 -05:00

bullets.dm

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

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

change.dm

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

energy.dm

Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm

2015-02-14 13:38:05 -05:00

force.dm

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

special.dm

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00