Jordan Brown 23eb6e4aec Merge upstream

2017-06-08 16:30:35 -04:00

..

__DATASTRUCTURES

[s] Moves sensitive data out of GLOB (#26039)

2017-04-12 19:53:13 +02:00

__DEFINES

Merge remote-tracking branch 'tgstation/master' into gang_points_refactor

2017-06-08 11:05:12 -07:00

__HELPERS

Merge branch 'master' into goonchatv3

2017-06-07 20:06:46 -04:00

_globalvars

Blood Cult Nerf: Restricted Nar-Sie summoning locations (#28137)

2017-06-08 07:28:40 -04:00

_js

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

_onclick

Blood Cult Nerf: Restricted Nar-Sie summoning locations (#28137)

2017-06-08 07:28:40 -04:00

controllers

Revert "Players cannot observe before PREGAME is reached"

2017-06-08 13:04:58 -04:00

datums

Merge upstream

2017-06-08 16:30:35 -04:00

game

Merge upstream

2017-06-08 16:30:35 -04:00

modules

Merge upstream

2017-06-08 16:30:35 -04:00

_compile_options.dm

TGS3 DM changes (#26534)

2017-06-01 21:16:07 +02:00

world.dm

Fix to round_id and .getserverlog (#28130)

2017-06-07 09:37:53 -03:00