deathride58 b8d6bc53cf Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432 ...

[MIRROR] Fixes brain damage json runtime

2018-03-17 23:50:10 +00:00

..

__DEFINES

Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432

2018-03-17 23:50:10 +00:00

__HELPERS

Merge pull request #36432 from ShizCalev/braindamageeventruntime

2018-03-17 07:54:04 -05:00

_globalvars

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

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

_js

syncs defines

2018-01-03 23:15:49 -05:00

_onclick

Allows traitor AI's to take direct control of turrets. (#36154)

2018-03-17 07:53:01 -05:00

controllers

[READY] Refactors wet floors to a component (#36130)

2018-03-17 07:53:11 -05:00

datums

Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432

2018-03-17 23:50:10 +00:00

game

Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432

2018-03-17 23:50:10 +00:00

modules

Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432

2018-03-17 23:50:10 +00:00

_compile_options.dm

Merge pull request #36190 from MrStonedOne/patch-489

2018-03-07 01:32:41 -06:00

world.dm

Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217

2018-01-10 19:59:51 +00:00