LetterJay d4b3ea1a49 Merge pull request #5768 from Citadel-Station-13/upstream-merge-36059 ...

[MIRROR] Adds rum and coke, corrects Cuba Libre recipe

2018-03-03 02:45:57 -06:00

..

__DEFINES

Update traits.dm

2018-03-02 21:27:56 -05:00

__HELPERS

[MIRROR] [READY]Circuit balance (#5760)

2018-03-02 20:05:28 -06:00

_globalvars

Some antag fixes. (#35690)

2018-02-16 10:35:55 -06:00

_js

…

_onclick

Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440

2018-03-02 23:37:41 -06:00

citadel

[MIRROR] Renames various reagent IDs to be more descriptive (#5634)

2018-02-24 09:35:48 -06:00

controllers

Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440

2018-03-02 23:37:41 -06:00

datums

Adds minor roundstart traits! (ala CDDA, etc.)

2018-03-02 14:38:18 -06:00

game

Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440

2018-03-02 23:37:41 -06:00

modules

Merge pull request #5768 from Citadel-Station-13/upstream-merge-36059

2018-03-03 02:45:57 -06:00

_compile_options.dm

[READY]Randomized Station Time + Night Shifts

2018-02-21 12:02:28 -06:00

world.dm

…