Incoming e5f0165d0d Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic ...

Conflicts:
	code/datums/spells/charge.dm
	code/modules/projectiles/ammunition/special.dm
	code/modules/projectiles/guns/magic/staff.dm

2014-03-26 13:03:12 -04:00

..

effects

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

items

Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic

2014-03-26 13:03:12 -04:00

structures

Merge pull request #3173 from MrPerson/cream_of_torium

2014-03-26 03:35:55 -03:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

items.dm

Fix for changling powers arm blade and fleshy space suit.

2014-03-21 22:26:50 -07:00

objs.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

structures.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

weapons.dm

Attack sounds for all melee weapons

2014-01-28 22:46:41 +13:00