MrPerson 645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor ...

Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm

2014-06-09 01:50:44 -07:00

..

effects

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

2014-06-09 01:50:44 -07:00

items

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

2014-06-09 01:50:44 -07:00

structures

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

2014-06-09 01:50:44 -07: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

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

2014-06-09 01:50:44 -07:00

objs.dm

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

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

structures.dm

meteorhit() is kill

2014-04-22 12:16:02 -05:00

weapons.dm

Attack sounds for all melee weapons

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