Merge branch 'master' into upstream-merge-31371

2017-10-08 15:37:46 -04:00
parent 4a2d9f82a1 0f5443140d
commit 9f1c6cef0c
43 changed files with 256 additions and 87 deletions
@@ -268,3 +268,8 @@ CONFIG_DEF(flag/allow_extended_miscreants)
 		GLOB.MAX_EX_LIGHT_RANGE = value
 		GLOB.MAX_EX_FLASH_RANGE = value
 		GLOB.MAX_EX_FLAME_RANGE = value
+
+CONFIG_DEF(number/emergency_shuttle_autocall_threshold)
+	min_val = 0
+	max_val = 1
+	integer = FALSE