skull132 cdd4772177 Merge branch 'master' into merge/level_dev_master ...

# Conflicts:
#	code/game/machinery/vending.dm
#	maps/exodus-1.dmm
#	maps/exodus-2.dmm

2016-12-19 00:23:19 +02:00

..

__defines

Bay merge fixes (#1225)

2016-12-18 10:52:16 +02:00

__HELPERS

…

_helpers

Merge branch 'upstream/development' into development

2016-12-18 01:06:45 +02:00

_onclick

…

ATMOSPHERICS

…

controllers

Merge branch 'upstream/development' into development

2016-12-18 01:06:45 +02:00

datums

Merge branch 'master' into merge/level_dev_master

2016-12-19 00:23:19 +02:00

defines

Merge branch 'master' into merge/level_dev_master

2016-12-19 00:23:19 +02:00

game

Merge branch 'master' into merge/level_dev_master

2016-12-19 00:23:19 +02:00

js

…

modules

Merge branch 'master' into merge/level_dev_master

2016-12-19 00:23:19 +02:00

unit_tests

Implement Vaurca mob tests (#1244)

2016-12-19 00:16:10 +02:00

ZAS

…

_macros.dm

…

global.dm

Merge branch 'upstream/development' into development

2016-12-18 01:06:45 +02:00

hub.dm

…

names.dm

…

setup.dm.back

Merge branch 'upstream/development' into development

2016-12-18 01:06:45 +02:00

stylesheet.dm

…

world.dm

…