mwerezak ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite ...

Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm

2015-02-10 20:59:22 -05:00

..

animate.dm

Fixes #3777

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

beams.dm

The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs.

2015-02-08 04:03:19 -07: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

Flash projectile adjustment

2015-02-10 19:54:30 -05:00

force.dm

Code formatting, EOL at EOF fixes, refactoring

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

special.dm

Fix indent thing for pointdefense

2015-02-08 04:03:19 -07:00