deathride58 d4cf5d2eba Merge branch 'master' into upstream-merge-34067

2018-01-08 20:01:59 +00:00

..

title_music

Allows easy hosting of server side lobby music (#31352)

2017-10-08 13:17:01 -05:00

title_screens

Removes standard resources from config tree

2018-01-07 20:32:08 -06:00

admin_ranks.txt

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

admins.txt

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

awaymissionconfig.txt

…

comms.txt

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

config.txt

Updates the exp config default override hours and clarifies it a bit. (#34132)

2018-01-07 18:45:35 -06:00

custom_roundstart_items.txt

commit

2017-09-02 23:39:20 -05:00

dbconfig.txt

Merge pull request #1218 from Citadel-Station-13/upstream-merge-27686

2017-06-14 08:16:02 -05:00

external_rsc_urls.txt

…

game_options.txt

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

jobs.txt

…

lavaRuinBlacklist.txt

…

maps.txt

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

mentors.txt

…

motd.txt

…

server_to_tool_bridge_port.txt

Rename server_to_bridge_port.txt to server_to_tool_bridge_port.txt

2017-06-05 07:43:33 -05:00

silicon_laws.txt

…

spaceRuinBlacklist.txt

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

unbuyableshuttles.txt

Adds disco inferno shuttle. (#33230)

2017-12-05 03:22:40 -06:00

whitelist.txt

…