skull132 b8ea5fd539 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/admin/admin_verbs.dm

2017-02-07 21:00:23 +02:00

..

__defines

Miscellaneous Tweaks (#1720)

2017-02-07 18:46:39 +02:00

_helpers

Miscellaneous Tweaks (#1720)

2017-02-07 18:46:39 +02:00

_onclick

Bay wizard port/rework (#1635)

2017-02-07 18:45:42 +02:00

ATMOSPHERICS

Fixes #1564, #1330, #1434 and #1210 (#1621)

2017-01-21 22:53:58 +02:00

controllers

Merge branch 'master' into development

2017-02-07 21:00:23 +02:00

datums

Merge branch 'master' into development

2017-02-03 19:34:31 -05:00

defines

Nuke 17 useless files (#1653)

2017-01-29 21:45:11 +02:00

game

Merge branch 'master' into development

2017-02-07 21:00:23 +02:00

js

…

modules

Merge branch 'master' into development

2017-02-07 21:00:23 +02:00

unit_tests

Vaurca Update Dec2016 (#1289)

2016-12-25 01:11:09 +02:00

ZAS

Adaptive lighting updates (#1679)

2017-01-31 00:37:56 +02:00

_macros.dm

Computer manager and more (#1406)

2017-01-20 21:45:53 +02:00

global.dm

Aurorastationify Readme & Changelog Template (#1704)

2017-02-05 22:50:22 +02:00

hub.dm

…

names.dm

…

stylesheet.dm

Unathi alt language and more fixes (#1299)

2016-12-25 20:51:15 +02:00

world.dm

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00