mwerezak fac32d07e9 Merge remote-tracking branch 'upstream/dev' into boolit ...

Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm

2015-02-07 00:57:04 -05:00

..

animate.dm

Fixes #3777

2013-10-16 11:21:51 +01:00

beams.dm

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

2015-02-07 00:57:04 -05:00

bullets.dm

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

change.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

energy.dm

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

force.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

special.dm

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30