Zuhayr b47d91b612 Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

..

__HELPERS

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

_onclick

Merge remote-tracking branch 'upstream/dev' into stun-baton

2014-07-31 14:31:21 -04:00

ATMOSPHERICS

Updates disposal bin pressurization

2014-08-07 19:31:17 -04:00

controllers

Fixes machines being able to put the radio controller to sleep

2014-08-16 14:37:44 -04:00

datums

Merge pull request #5957 from mwerezak/train-cost

2014-08-13 18:34:51 +04:00

defines

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

FEA

…

game

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

js

…

modules

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

TriDimension

…

unused

…

WorkInProgress

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

ZAS

Fixes phoron reactions with oxygen not following a consistent reaction equation

2014-08-13 19:56:02 +02:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

stylesheet.dm

…

world.dm

Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area.

2014-08-16 05:28:45 +04:00