Merge branch 'pr-38604'

Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
This commit is contained in:
Jordan Brown
2018-06-28 14:22:03 -04:00
248 changed files with 461 additions and 471 deletions

View File

@@ -134,7 +134,7 @@
/datum/config_entry/flag/no_summon_events //Allowed
/datum/config_entry/flag/no_intercept_report //Whether or not to send a communications intercept report roundstart. This may be overriden by gamemodes.
/datum/config_entry/flag/no_intercept_report //Whether or not to send a communications intercept report roundstart. This may be overridden by gamemodes.
/datum/config_entry/number/arrivals_shuttle_dock_window //Time from when a player late joins on the arrivals shuttle to when the shuttle docks on the station
config_entry_value = 55