Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT

This commit is contained in:
Letter N
2020-08-22 13:40:36 +08:00
147 changed files with 3447 additions and 803 deletions

View File

@@ -534,4 +534,4 @@
config_entry_value = 6
/datum/config_entry/number/max_shuttle_size
config_entry_value = 250
config_entry_value = 500