Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01:00

..

energy

Adds fire delay to all weapons (except automatics).

2013-07-10 21:19:21 +04:00

projectile

Cell.use checks instead of just minuses. Yay for code!

2013-09-01 00:16:11 +01:00

energy.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

projectile.dm

Fix for issue #2882 in Baystation12/master (CR-20 not updating sprite correctly when unloaded by in-hand click).

2013-05-29 13:34:54 +07:00