deathride58 e2a6e36ae5 Merge branch 'master' into upstream-merge-35383

2018-02-07 19:13:41 +00:00

..

__DEFINES

[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)

2018-02-06 19:06:31 -06:00

__HELPERS

Fixes callbacks and invoke time args failing when pushUsr was used (#35395)

2018-02-07 12:38:36 -06:00

_globalvars

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

_js

…

_onclick

Squashes silicon HUDs together (#35212)

2018-02-07 02:32:14 -06:00

citadel

FINALLY modularizes Polychromic Clothes AND modernizes all polychromic code! (#5269)

2018-02-06 19:08:08 -06:00

controllers

Re-enables round autoend

2018-02-05 14:17:14 -05:00

datums

Merge pull request #5358 from Citadel-Station-13/upstream-merge-35395

2018-02-07 19:12:35 +00:00

game

Merge branch 'master' into upstream-merge-35383

2018-02-07 19:13:41 +00:00

modules

Merge pull request #5356 from Citadel-Station-13/upstream-merge-35386

2018-02-07 19:12:13 +00:00

_compile_options.dm

…

world.dm

…