LetterJay 761035b391 Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960 ...

[MIRROR] Fix some inconsistencies relating to resting

2018-05-27 14:39:18 -05:00

..

__DEFINES

Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631

2018-05-27 01:32:02 -05:00

__HELPERS

Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631

2018-05-27 01:32:02 -05:00

_globalvars

Disallow effects from being scanned by the chameleon projector (#38017)

2018-05-25 07:38:01 -05:00

_js

…

_onclick

Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay

2018-05-25 10:49:21 -05:00

controllers

Merge pull request #6904 from Citadel-Station-13/upstream-merge-38055

2018-05-26 18:40:25 -05:00

datums

Merge pull request #6895 from Citadel-Station-13/upstream-merge-38023

2018-05-25 23:28:01 -05:00

game

Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960

2018-05-27 14:39:18 -05:00

modules

Merge pull request #6914 from Citadel-Station-13/upstream-merge-38054

2018-05-27 14:38:53 -05:00

_compile_options.dm

Updates BYOND links to use HTTPS (#37918)

2018-05-20 15:31:28 -05:00

world.dm

…