deathride58 3dcd88b975 Merge pull request #4009 from Citadel-Station-13/upstream-merge-32788 ...

[MIRROR] Fixes inconsistencies w/ energy descriptions

2017-11-19 05:16:15 +00:00

..

__DATASTRUCTURES

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

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

__DEFINES

Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481

2017-11-14 15:51:03 -06:00

__HELPERS

Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00

_globalvars

Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00

_js

…

_onclick

Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00

citadel

Update cit_crewobjectives_science.dm

2017-11-17 23:45:20 -05:00

controllers

Fixes setup failure edge case (#32812)

2017-11-18 13:51:40 -06:00

datums

Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786

2017-11-18 05:29:32 +00:00

game

Merge pull request #4010 from Citadel-Station-13/upstream-merge-32851

2017-11-19 04:33:08 +00:00

modules

Merge pull request #4009 from Citadel-Station-13/upstream-merge-32788

2017-11-19 05:16:15 +00:00

_compile_options.dm

…

world.dm

…