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

..

energy

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

projectile

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

alien.dm

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

energy.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

projectile.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