kevinz000 4a2a0e8a0d Merge pull request #732 from Citadel-Station-13/upstream-merge-26778 ...

[MIRROR] Plasma vessels regenerate slowly off resin

2017-05-06 15:26:10 -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

woo

2017-05-02 11:19:14 -05:00

citadel

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

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

controllers

woo

2017-05-05 10:21:53 -05:00

datums

Fixes answering a holocall not disconnecting other calls

2017-05-05 10:28:26 -05:00

game

Merge pull request #809 from Citadel-Station-13/upstream-merge-26933

2017-05-06 14:22:08 -07:00

modules

Merge pull request #732 from Citadel-Station-13/upstream-merge-26778

2017-05-06 15:26:10 -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 branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720

2017-05-02 11:36:27 -05:00