kevinz000 9ca8b570b2 Merge branch 'master' into upstream-merge-26705

2017-05-07 22:53:14 -07:00

..

__DATASTRUCTURES

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

__DEFINES

Clockwork component generation is twice as fast, but scriptures cost up to twice as much

2017-05-03 22:21:55 -05:00

__HELPERS

Fixes HTTPSGet being unprotected

2017-05-06 10:46:00 -05:00

_globalvars

Adds persistent trophy cases

2017-05-01 17:31:24 -05:00

_js

April sync (#360)

2017-04-13 23:37:00 -05:00

_onclick

Merge pull request #716 from Citadel-Station-13/upstream-merge-26768

2017-05-07 19:15:02 -07:00

citadel

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

controllers

fixes rejects

2017-05-07 22:24:26 -07:00

datums

Merge pull request #801 from Citadel-Station-13/upstream-merge-26921

2017-05-07 06:23:59 -07:00

game

Merge pull request #803 from Citadel-Station-13/upstream-merge-26881

2017-05-07 22:36:03 -07:00

modules

Merge branch 'master' into upstream-merge-26705

2017-05-07 22:53:14 -07:00

_compile_options.dm

Updates travis and the config to require byond 511

2017-04-19 16:42:24 -05:00

world.dm

Merge pull request #751 from Citadel-Station-13/upstream-merge-26841

2017-05-06 21:45:38 -07:00