PsiOmegaDelta 0bf3c39095 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm

2015-07-28 07:59:49 +02:00

..

__HELPERS

make lighting falloff a macro and optimize turfs-in-view

2015-07-22 16:22:28 +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

Compilation fixes.

2015-07-27 10:03:31 +02:00

js

…

modules

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

2015-07-28 07:59:49 +02:00

TriDimension

Fixes misleading path and proc name

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

ZAS

Fixes liquid fuel fire regression

2015-07-13 20:45:57 -04:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Merge pull request #10323 from mwerezak/accessory-fix

2015-07-27 09:36:02 +02:00

stylesheet.dm

…

world.dm

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

2015-07-12 14:49:31 +02:00