LetterJay 0c5620233e Merge pull request #4506 from Citadel-Station-13/upstream-merge-33738 ...

[MIRROR] 2 borg metal fixes for the price of one

2017-12-24 16:52:33 -06:00

..

__DATASTRUCTURES

…

__DEFINES

Fixes RND

2017-12-22 00:58:46 -08:00

__HELPERS

Merge pull request #33606 from coiax/antaghud-on-end

2017-12-21 14:24:49 -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

Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246

2017-12-21 03:22:31 -06:00

citadel

Update cit_arousal.dm

2017-12-19 17:56:06 -06:00

controllers

Merge branch 'master' into upstream-merge-33562

2017-12-21 11:30:58 -06:00

datums

Adds round ID to Show Server Revision (#33723)

2017-12-22 10:43:37 -06:00

game

2 borg metal fixes for the price of one (#33738)

2017-12-22 18:51:35 -06:00

modules

Merge pull request #4505 from Citadel-Station-13/upstream-merge-33737

2017-12-24 16:52:14 -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