deathride58 f89f9c372e Merge pull request #6344 from Citadel-Station-13/upstream-merge-36693 ...

[MIRROR] Slightly bandaid fix for ntnet json/xorencrypt runtimes

2018-04-11 21:36:35 +00:00

..

__DEFINES

Merge pull request #6367 from Citadel-Station-13/upstream-merge-37136

2018-04-11 21:27:58 +00:00

__HELPERS

Removes some unused math defines/procs

2018-04-11 14:15:14 -05:00

_globalvars

Merge branch 'master' into synctesting

2018-04-09 21:43:26 +00:00

_js

syncs defines

2018-01-03 23:15:49 -05:00

_onclick

Cult spell buttons will no longer hold an empty slot in the regular action bar (#36791)

2018-04-11 05:08:47 -05:00

controllers

Fixes signals being raised too soon

2018-04-11 15:02:30 -05:00

datums

Merge pull request #6356 from Citadel-Station-13/upstream-merge-37082

2018-04-11 21:31:46 +00:00

game

Merge pull request #6348 from Citadel-Station-13/upstream-merge-37088

2018-04-11 21:35:21 +00:00

modules

Merge pull request #6344 from Citadel-Station-13/upstream-merge-36693

2018-04-11 21:36:35 +00:00

_compile_options.dm

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

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

world.dm

Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217

2018-01-10 19:59:51 +00:00