LetterJay ba5306c8fe Merge pull request #4415 from Citadel-Station-13/upstream-merge-33568 ...

[MIRROR] Fixes zombie stun immunity, more pep in their step

2017-12-18 15:25:13 -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

Consolidates NEB code into a modular package

2017-12-15 16:57:22 +08: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 #4414 from Citadel-Station-13/upstream-merge-33553

2017-12-18 15:21:07 -06:00

modules

Merge pull request #4415 from Citadel-Station-13/upstream-merge-33568

2017-12-18 15:25:13 -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