Zuhayr 32d799e53e Line ending conflict resolution.

2014-12-22 23:27:06 +10:30

..

__HELPERS

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

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

_onclick

Removed now-redundant buckle check.

2014-12-13 23:11:59 +10:30

ATMOSPHERICS

Merge pull request #7297 from Amunak/pipez

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

controllers

Reserve PascalCase inits

2014-12-16 16:20:50 +02:00

datums

Reserve PascalCase inits

2014-12-16 16:20:50 +02: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

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

game

Line ending conflict resolution.

2014-12-22 23:27:06 +10:30

js

…

modules

Line ending conflict resolution.

2014-12-22 23:27:06 +10:30

TriDimension

fix some misplaced set_dir()s

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

unused

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

WorkInProgress

Fixed capitalization of 'engine control console'.

2014-12-18 23:15:22 +01:00

ZAS

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

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

Makes 'other' PM colour way darker.

2014-12-14 17:03:54 +01:00

world.dm

Fixes manual runtimes without modifying the construction of every object

2014-12-13 09:35:36 -05:00