Chinsky 01512e571b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into lockdown ...

Conflicts:
	code/game/machinery/doors/firedoor.dm

2013-10-11 22:29:59 +04:00

..

__HELPERS

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

_onclick

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

ATMOSPHERICS

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

controllers

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00

datums

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

defines

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

FEA

…

game

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into lockdown

2013-10-11 22:29:59 +04:00

js

…

modules

Merge remote-tracking branch 'upstream/master' into dev

2013-10-11 12:44:44 +03: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

Merge branch 'master' into dev-freeze

2013-10-08 22:01:16 +01:00

ZAS

Much better solution to the zone geometry bug.

2013-10-10 10:25:20 +01: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 'dev-freeze' into dev

2013-10-10 14:37:41 +04:00

stylesheet.dm

…

world.dm

Uncomments books. Generifies mentions of tg or baystation.

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