LetterJay 528c7e7837 Merge branch 'master' into upstream-merge-32277

2017-10-31 03:09:38 -04:00

..

__DATASTRUCTURES

Update globals.dm

2017-10-21 07:24:50 -05:00

__DEFINES

Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116

2017-10-29 15:48:47 -04:00

__HELPERS

Merge branch 'master' into upstream-merge-32116

2017-10-29 03:45:59 -04:00

_globalvars

Removes duplicate typecaches

2017-10-23 08:25:30 -05:00

_js

…

_onclick

one more thing to allow more mobs to qdel nicely (#32168)

2017-10-29 07:14:44 -05:00

citadel

fixes soporifics having the old two shot value

2017-10-30 17:33:01 +08:00

controllers

New ambience for ash storms (#32213)

2017-10-30 15:22:23 -05:00

datums

New ambience for ash storms (#32213)

2017-10-30 15:22:23 -05:00

game

Merge pull request #3708 from Citadel-Station-13/upstream-merge-32213

2017-10-31 03:03:37 -04:00

modules

Merge branch 'master' into upstream-merge-32277

2017-10-31 03:09:38 -04:00

_compile_options.dm

Find references fix. (#32022)

2017-10-27 04:57:15 -05:00

world.dm

…