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

..

animate.dm

Cleanup can_fire(), projectile flag

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

beams.dm

Projectile effects - Part 2

2015-03-09 22:17:18 +13:00

bullets.dm

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

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

change.dm

Robot code clean up and fixes.

2015-03-10 13:37:20 +01: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