Mloc-Hibernia e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm

2014-05-11 13:19:09 +00:00

..

ammunition

Adds 9 new Chameleon items.

2014-03-23 14:08:23 -07:00

guns

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

2014-05-03 16:56:19 +01:00

projectile

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

2014-05-03 16:56:19 +01:00

ammunition.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

gun.dm

Fixes gum.dm firerate

2014-04-30 18:23:42 -05:00

projectile.dm

Fix to fix a fix that needs fixing.

2013-11-20 16:00:07 -08:00

targeting.dm

Fixes #4716

2014-05-10 00:33:09 +09:30