Jordan Brown c48b35a0b2 Merge pull request #36787 from Davidj361/36744-twistedHealthFix ...

Removed health cost for Twisted Construction upon casting on a wrong object

2018-03-31 06:16:50 -05:00

..

__DEFINES

Fixes wet floor scaling (#36697)

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

__HELPERS

Merge pull request #6155 from Citadel-Station-13/upstream-merge-36554

2018-03-31 06:17:58 -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 #6155 from Citadel-Station-13/upstream-merge-36554

2018-03-31 06:17:58 -05:00

datums

Merge pull request #6148 from Citadel-Station-13/upstream-merge-36750

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

game

Merge pull request #6154 from Citadel-Station-13/upstream-merge-36477

2018-03-31 06:17:37 -05:00

modules

Merge pull request #36787 from Davidj361/36744-twistedHealthFix

2018-03-31 06:16:50 -05:00

_compile_options.dm

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

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

world.dm

…