Chinsky 5b168c8e4b Merge branch 'dev-freeze' into dev ...

Conflicts:
	icons/obj/ammo.dmi

2013-11-30 05:15:22 +04:00

..

ammunition

Commiting SueTheCake's detective things.

2013-11-27 04:10:06 +04:00

guns

Commiting SueTheCake's detective things.

2013-11-27 04:10:06 +04:00

projectile

…

ammunition.dm

…

gun.dm

Merge branch 'master' into dev-freeze

2013-11-30 05:11:36 +04:00

projectile.dm

Fix to fix a fix that needs fixing.

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

targeting.dm

…