sabiram 953f365292 Adds 'me' hotkey again. Pedantic spelling changes.

2014-12-12 15:44:22 -05:00

..

__HELPERS

Merged master/dev config.txt.

2014-12-10 16:35:39 +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 #7299 from Loganbacca/freezefix

2014-12-08 13:17:36 +00:00

controllers

Fixes mercenary mode showing up as nuclear in vote

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

datums

Merge pull request #7411 from Amunak/patch-2

2014-12-12 09:02:50 +01:00

defines

Merge resolution.

2014-12-08 13:01:04 +10:30

FEA

…

game

Merge pull request #7401 from PsiOmegaDelta/YouHaveViolatedTheLaw

2014-12-13 05:16:45 +10:30

js

…

modules

Adds 'me' hotkey again. Pedantic spelling changes.

2014-12-12 15:44:22 -05:00

TriDimension

fix some misplaced set_dir()s

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

unused

…

WorkInProgress

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

2014-12-09 09:07:38 +01:00

ZAS

…

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Merge resolution.

2014-12-08 13:01:04 +10:30

stylesheet.dm

…

world.dm

…