PsiOmegaDelta 3c9dc10746 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/cult/runes.dm

2015-07-31 09:48:15 +02:00

..

__HELPERS

some dview tweaks & fixes

2015-07-30 19:50:32 +01:00

_defines

…

_onclick

Fixes #10230

2015-07-18 23:27:09 -04:00

ATMOSPHERICS

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

2015-07-06 17:31:41 +02:00

controllers

Added config option for initial brain organ health.

2015-07-27 15:33:54 +09:30

datums

Merge pull request #10261 from PsiOmegaDelta/150722-LawNumbering

2015-07-23 21:01:33 +03:00

defines

Adds 'Provisional' to the list of acting rank prefixes

2015-07-05 12:29:46 +01:00

FEA

…

game

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

2015-07-31 09:48:15 +02:00

js

…

modules

Fixes #10389

2015-07-31 01:33:43 -04:00

TriDimension

Fixes misleading path and proc name

2015-06-26 00:40:31 -04:00

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

some dview tweaks & fixes

2015-07-30 19:50:32 +01:00

stylesheet.dm

…

world.dm

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

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