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

Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/admin/admin_verbs.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/syringes.dm

2015-07-30 10:38:44 +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

Fixes #10368

2015-07-29 22:48:11 -04:00

js

…

modules

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

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

TriDimension

Fixes misleading path and proc name

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

ZAS

Fire now uses the full zone size when considering the minimum amount of phoron/oxygen required to sustain a fire

2015-07-26 22:47:18 -04:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Fixes #10357

2015-07-29 20:56:01 +02:00

stylesheet.dm

…

world.dm

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

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