LetterJay a9c91b4d00 Merge pull request #6127 from Citadel-Station-13/upstream-merge-36689 ...

[MIRROR] Hotfix for #36688 - Excludes non-carbon-based life from the disco machine's dance4 proc to fix pAI "resting/getting up" chat spam

2018-04-01 19:51:58 -05:00

..

__DEFINES

Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548

2018-04-01 19:50:43 -05:00

__HELPERS

Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548

2018-04-01 19:50:43 -05:00

_globalvars

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

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

_js

…

_onclick

Merge pull request #36829 from MrStonedOne/onclick_rework

2018-04-01 08:24:12 -05:00

controllers

Merge pull request #36829 from MrStonedOne/onclick_rework

2018-04-01 08:24:12 -05:00

datums

Merge pull request #6178 from Citadel-Station-13/shit

2018-04-01 19:51:39 -05:00

game

Merge pull request #6127 from Citadel-Station-13/upstream-merge-36689

2018-04-01 19:51:58 -05:00

modules

Merge pull request #6188 from Citadel-Station-13/upstream-merge-36822

2018-04-01 19:51:17 -05:00

_compile_options.dm

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

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

world.dm

…