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

..

energy

Hardsuit tweaks

2015-02-28 14:04:53 -05:00

launcher

Updates storage costs

2015-03-05 10:40:25 -05:00

projectile

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

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

alien.dm

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

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

energy.dm

Improves energy gun charge icon handling, adds ion rifle in-hand sprite.

2015-02-22 21:46:18 -05:00

launcher.dm

Fixes rocket launcher icon

2015-02-16 22:59:35 -05:00

projectile.dm

Fixes empty casings not being ejected or cycled

2015-02-16 22:59:11 -05:00