LetterJay
|
5a65cdc939
|
Merge branch 'master' into upstream-merge-31309
|
2017-10-07 01:07:59 -04:00 |
|
Jordan Brown
|
b17a770299
|
Config option to automatically call the shuttle for high casualties (#31309)
|
2017-10-06 21:35:49 -05:00 |
|
deathride58
|
5cefa71992
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
|
2017-10-04 20:18:03 -04:00 |
|
Jordan Brown
|
f1dfc1b6db
|
Merge pull request #31252 from MrStonedOne/whatthefuckcyberboss
Partial revert of #30763 (datum config refactor)
|
2017-10-03 17:55:05 -05:00 |
|
deathride58
|
70f06cfe35
|
config. > CONFIG_GET
|
2017-10-01 19:56:44 -04:00 |
|
LetterJay
|
0ab234ceb0
|
Merge branch 'master' into upstream-merge-31000
|
2017-10-01 03:31:49 -04:00 |
|
Jordan Brown
|
116041d621
|
Server tools API v3.1
|
2017-09-28 22:20:46 -05:00 |
|
Jordan Brown
|
e5ef3d2405
|
Configuration datum refactor
|
2017-09-28 21:37:53 -05:00 |
|