jack-fractal 29bffb0c20 Merge branch 'master' into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html

2013-06-06 21:32:08 -04:00

..

closets

…

effects

Merge conflict resolution, using BEF.

2013-06-05 14:22:04 +09:30

items

Merge branch 'master' into bleeding-edge-freeze

2013-06-06 21:32:08 -04:00

storage

Ported coats pockets

2013-01-04 05:31:14 +04:00

structures

Taser fix v.3.2

2013-06-05 19:37:29 -05: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-06-04 13:47:26 +04:00

explosion_recursive.dm

- Recursive explosions are not available in a config option. I want to do some live testing. Once live testing is done, if they prove to be better, they can go live. Once that happens, the config option can be removed.

2013-01-15 08:19:35 +00:00

explosion.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

items.dm

Showed that huge proc in /atom what polymorphism' is.

2013-06-01 12:24:43 +04:00

objs.dm

Airlock and APC changes.

2013-05-23 16:43:29 +02:00

structures.dm

…

weapons.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00