Chinsky 7555dd0f0b Merge branch 'master' into dev ...

Conflicts:
	code/setup.dm

2013-10-08 15:16:57 +04:00

..

__HELPERS

Massive click code rework by SuperSayu, ported from TG.

2013-10-07 20:24:21 +01:00

ATMOSPHERICS

Holding down Alt or Alt-Gr and clicking a tile will now bring up a stat panel with everything in that tile listed.

2013-10-07 20:24:21 +01:00

controllers

Merge pull request #3716 from DJSnapshot/bugfix

2013-09-30 07:53:49 -07:00

datums

Massive click code rework by SuperSayu, ported from TG.

2013-10-07 20:24:21 +01:00

defines

Massive click code rework by SuperSayu, ported from TG.

2013-10-07 20:24:21 +01:00

FEA

…

game

Merge branch 'master' into dev

2013-10-08 15:16:57 +04:00

js

…

modules

Merge branch 'master' into dev

2013-10-08 15:16:57 +04:00

TriDimension

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

unused

These files have been collapsed into root procs and can be deleted.

2013-08-16 17:48:25 -07:00

WorkInProgress

Massive click code rework by SuperSayu, ported from TG.

2013-10-07 20:24:21 +01:00

ZAS

Merge pull request #3734 from Baystation12/master

2013-10-06 11:39:36 -07:00

global.dm

First pass on experimental change that allows zones to "Sleep"

2013-09-11 11:43:42 -07:00

hub.dm

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00

names.dm

…

setup.dm

Merge branch 'master' into dev

2013-10-08 15:16:57 +04:00

stylesheet.dm

…

world.dm

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00