DJSnapshot de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/client/preferences.dm

2014-07-25 17:19:59 -07:00

..

energy

temporary fix for #4907

2014-07-23 21:48:32 -07:00

projectile

Merging.

2014-07-25 22:50:35 +09:30

alien.dm

Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.

2014-07-21 19:02:38 +09:30

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