Amunak d20ccdb6b4 More name updates and refactoring for research ...

Also fixes compile errors

2014-12-18 03:26:55 +01:00

..

__HELPERS

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

2014-12-10 18:50:31 +10:30

_onclick

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

2014-12-03 11:38:54 +01:00

ATMOSPHERICS

Merge pull request #7297 from Amunak/pipez

2014-12-08 20:47:09 -05:00

controllers

Merged master/dev config.txt.

2014-12-10 16:35:39 +10:30

datums

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

2014-12-08 06:58:50 +01:00

defines

Buffed the research testing item, made more clear that it's for testing only.

2014-12-13 07:10:37 +01:00

FEA

…

game

More name updates and refactoring for research

2014-12-18 03:26:55 +01:00

js

…

modules

More name updates and refactoring for research

2014-12-18 03:26:55 +01:00

TriDimension

fix some misplaced set_dir()s

2014-12-08 10:09:09 +00:00

unused

…

WorkInProgress

Attempt to normalize computer and circuit board names and their research names.

2014-12-10 20:37:18 +01:00

ZAS

…

global.dm

…

hub.dm

…

names.dm

…

setup.dm

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

2014-12-08 15:32:49 +00:00

stylesheet.dm

…

world.dm

…