Merge remote-tracking branch 'upstream/master' into wounds-part-2

This commit is contained in:
Timothy Teakettle
2020-08-02 18:11:07 +01:00
84 changed files with 5111 additions and 4076 deletions

View File

@@ -470,3 +470,5 @@
/datum/config_entry/flag/minimaps_enabled
config_entry_value = TRUE
/datum/config_entry/string/centcom_ban_db // URL for the CentCom Galactic Ban DB API