Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04:00

..

ammunition

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

guns

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

projectile

Adds sharp and edge flags to appropriate items

2014-06-16 13:26:44 -04:00

ammunition.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

gun.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04: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