phil235 45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix ...

Conflicts:
	code/modules/recycling/disposal.dm

2014-10-15 18:23:40 +02:00

..

effects

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

2014-10-15 18:23:40 +02:00

items

Merge pull request #4759 from Donkie/pipes2

2014-10-15 11:36:25 -03:00

structures

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

2014-10-15 18:23:40 +02:00

empulse.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-03-13 00:08:20 -03:00

explosion_recursive.dm

Explosion Optimizations

2014-01-04 19:29:17 -05:00

explosion.dm

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

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

items.dm

Merge pull request #5124 from MrPerson/implant_action_button

2014-10-11 18:15:44 +02:00

objs.dm

fixes some stuff gia told me to fix

2014-08-31 14:27:40 +02:00

structures.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

weapons.dm

Attack sounds for all melee weapons

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