LetterJay 7c3c270e2a Merge branch 'master' into upstream-merge-37749

2018-05-15 00:50:13 -05:00

..

__DEFINES

Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646

2018-05-15 00:47:59 -05:00

__HELPERS

Fixes robots appearing as deactivated at round end (#37804)

2018-05-13 12:08:46 -05:00

_globalvars

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

_js

…

_onclick

Adds (fake) ambient occlusion as a client preference

2018-05-07 22:08:08 -05:00

controllers

Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646

2018-05-15 00:47:59 -05:00

datums

Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646

2018-05-15 00:47:59 -05:00

game

Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646

2018-05-15 00:47:59 -05:00

modules

Merge branch 'master' into upstream-merge-37749

2018-05-15 00:50:13 -05:00

_compile_options.dm

Merge pull request #37000 from tgstation/KorPhaeron-patch-2

2018-04-11 15:12:55 -05:00

world.dm

…