PsiOmegaDelta 2d15bb1312 Merge pull request #7435 from mwerezak/esword ...

Adds NOBLOODY to holoswords

2014-12-13 09:17:08 +01: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

refactor 'dir = ' into 'set_dir()'

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

game

Merge pull request #7435 from mwerezak/esword

2014-12-13 09:17:08 +01:00

js

…

modules

Merge pull request #7385 from Zuhayr/dev-freeze

2014-12-13 12:25:13 +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 resolution.

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

stylesheet.dm

Reverted colours to previous iteration.

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

world.dm

…