jack-fractal 5df2797b86 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.int

2013-11-22 20:30:23 -05:00

..

__HELPERS

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

2013-11-22 20:30:23 -05:00

_onclick

mecha fixes

2013-11-02 12:26:34 -07:00

ATMOSPHERICS

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

controllers

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

2013-11-22 20:30:23 -05:00

datums

- lots of debugging

2013-11-22 20:09:24 -05:00

defines

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

2013-11-17 16:30:42 -05:00

FEA

…

game

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

2013-11-22 20:30:23 -05:00

js

…

modules

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

2013-11-22 20:30:23 -05:00

TriDimension

Expansion of every "icon = ''" path.

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

unused

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

2013-11-17 16:30:42 -05:00

WorkInProgress

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

2013-11-17 16:30:42 -05:00

ZAS

Medical Hoopery

2013-11-14 12:40:30 -05: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' of https://github.com/Baystation12/Baystation12 into dev

2013-11-17 16:30:42 -05:00

stylesheet.dm

- major update to all systems

2013-11-17 16:23:36 -05:00

world.dm

Uncomments books. Generifies mentions of tg or baystation.

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