Chinsky 4c628ff2c5 Merge pull request #10483 from PsiOmegaDelta/150811-AntagName ...

Fixes #10468 and #10467

2015-08-11 19:39:15 +03:00

..

__HELPERS

Merge pull request #10400 from Baystation12/master

2015-08-01 19:44:22 +02:00

_defines

…

_onclick

qdel/Destroy entries.

2015-07-21 14:22:01 +02:00

ATMOSPHERICS

…

controllers

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

2015-08-11 12:20:54 +02:00

datums

Crew monitor balance and lag fixes.

2015-08-11 09:27:18 +02:00

defines

…

FEA

…

game

Merge pull request #10483 from PsiOmegaDelta/150811-AntagName

2015-08-11 19:39:15 +03:00

js

…

modules

Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes

2015-08-12 01:54:31 +09:30

TriDimension

…

ZAS

anchored and unsimulated objects are no longer considered for airflow

2015-07-30 21:00:42 +01:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Moved custom_synthetic.dmi into a proper define.

2015-08-09 16:48:20 +09:30

stylesheet.dm

…

world.dm

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

2015-07-30 10:38:44 +02:00