Jordan Brown 675b5570b8 Merge pull request #36807 from vuonojenmustaturska/champrojectoragain ...

Fixes some edge cases with chameleon projectors and sleepers

2018-03-31 06:13:00 -05:00

..

__DEFINES

Fixes wet floor scaling (#36697)

2018-03-26 10:49:42 -05:00

__HELPERS

Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)

2018-03-28 12:15:06 -05:00

_globalvars

Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

2018-03-14 16:49:40 -05:00

_js

…

_onclick

[MIRROR] fixes lava planet appearing in transit / wrong z level (#6067)

2018-03-22 06:11:08 -05:00

controllers

Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398

2018-03-27 17:47:11 +00:00

datums

Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)

2018-03-28 12:15:06 -05:00

game

Merge pull request #36807 from vuonojenmustaturska/champrojectoragain

2018-03-31 06:13:00 -05:00

modules

Merge pull request #6137 from Citadel-Station-13/upstream-merge-36700

2018-03-31 06:13:35 -05:00

_compile_options.dm

[MIRROR] Sets the default preload_rsc to 2 (#6051)

2018-03-21 15:55:47 -05:00

world.dm

…