Incoming e5f0165d0d Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic ...

Conflicts:
	code/datums/spells/charge.dm
	code/modules/projectiles/ammunition/special.dm
	code/modules/projectiles/guns/magic/staff.dm

2014-03-26 13:03:12 -04:00

..

ammunition

Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic

2014-03-26 13:03:12 -04:00

guns

Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic

2014-03-26 13:03:12 -04:00

projectile

Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic

2014-03-26 13:03:12 -04:00

ammunition.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

firing.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

gun.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

projectile.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul

2014-02-09 22:37:20 -08:00