Zuhayr d2803ec4d7 Merge resolution.

2014-12-13 23:10:46 +10:30

..

__HELPERS

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

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

_onclick

Removes now redundant face_at checks, allows observers to face.

2014-12-12 12:56:50 +01:00

ATMOSPHERICS

Merge pull request #7297 from Amunak/pipez

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

controllers

Fixes mercenary mode showing up as nuclear in vote

2014-12-12 04:20:05 +01:00

datums

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

2014-12-12 09:04:09 +01:00

defines

Fixes the heap fix.

2014-12-09 18:42:54 -07:00

FEA

refactor 'dir = ' into 'set_dir()'

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

game

Merge resolution.

2014-12-13 23:10:46 +10:30

js

…

modules

Merge resolution.

2014-12-13 23:10:46 +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

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

2014-12-09 09:07:38 +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

Reverted colours to previous iteration.

2014-12-11 14:20:41 +10:30

world.dm

Merge pull request #7127 from Zuhayr/lathe

2014-11-25 10:43:03 +01:00