PsiOmega b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/projectiles/projectile.dm

2015-05-12 13:40:47 +02:00

..

animate.dm

Cleanup can_fire(), projectile flag

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

beams.dm

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

2015-05-12 13:40:47 +02:00

bullets.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

change.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02: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

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00