LetterJay 781f40926c Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530 ...

[MIRROR] Fix shuttle autocalls when the round is already over

2017-12-17 21:24:12 -06:00

..

__DATASTRUCTURES

[MIRROR] Use associative list instead of in (#3710)

2017-10-31 00:43:39 -07:00

__DEFINES

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

__HELPERS

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

_globalvars

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

_js

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

_onclick

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

citadel

Fixes donator items not rendering properly when worn

2017-12-12 20:16:51 -05:00

controllers

Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530

2017-12-17 21:24:12 -06:00

datums

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

game

Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519

2017-12-17 20:28:07 -06:00

modules

Merge pull request #4391 from Citadel-Station-13/upstream-merge-33527

2017-12-17 21:23:42 -06:00

_compile_options.dm

Update _compile_options.dm

2017-11-23 16:37:49 -08:00

world.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00