Merge pull request #2873 from Citadel-Station-13/upstream-merge-30768

[MIRROR] Adds back required arrivals undockedness with a config
2017-09-21 07:37:04 -04:00
parent 55841673b5 a07cafa515
commit dd7189618f
3 changed files with 9 additions and 0 deletions
@@ -329,6 +329,9 @@
 		if(SSshuttle.arrivals.damaged && config.arrivals_shuttle_require_safe_latejoin)
 			src << alert("The arrivals shuttle is currently malfunctioning! You cannot join.")
 			return FALSE
+
+		if(config.arrivals_shuttle_require_undocked)
+			SSshuttle.arrivals.RequireUndocked(src)
 		arrivals_docked = SSshuttle.arrivals.mode != SHUTTLE_CALL

 	//Remove the player from the join queue if he was in one and reset the timer