PsiOmega e9581c823c Fixes the CMO's doors ...

The CMO's remote door control should now work again.
The CMO's doors are now powered by the ACP in his office.
The command staff now have offices, don't quarters. Felt a bit generous to call them such.

2014-10-02 08:21:08 +02:00

..

__HELPERS

Merg resolution.

2014-10-02 02:33:06 +09:30

_onclick

Merg resolution.

2014-10-02 02:33:06 +09:30

ATMOSPHERICS

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

2014-09-30 23:23:05 +09:30

controllers

Merge branch 'master' of https://github.com/Ikmachek/Baystation12

2014-09-30 10:36:01 -04:00

datums

Commit repair

2014-09-28 17:13:42 -04:00

defines

Adds gambling tables

2014-09-28 21:48:57 +02:00

FEA

…

game

Fixes the CMO's doors

2014-10-02 08:21:08 +02:00

js

…

modules

Merg resolution.

2014-10-02 02:33:06 +09:30

TriDimension

Merge pull request #6275 from RavingManiac/dev

2014-09-09 17:54:53 +04:00

unused

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

2014-09-10 22:14:37 +01:00

WorkInProgress

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

ZAS

Merge pull request #6565 from Mloc/bs12-fan

2014-10-01 13:39:35 +04:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Large merge resultion. Used remote for map conflicts.

2014-09-23 21:41:54 +09:30

stylesheet.dm

…

world.dm

…