fixes annoying bug

shiptest-ss13 · Dec 13, 2024 · cf73fb0 · cf73fb0
1 parent ecad782
commit cf73fb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm
@@ -33,6 +33,8 @@
 #define SHUTTLE_TOUCHES_EDGE "landing area overlaps with map border"
 #define SHUTTLE_OUR_MOBILEDOCK_FORBIDS_DOCKING "our mobile docking port is docked, forbidding docking"
 #define SHUTTLE_TARGET_MOBILEDOCK_FORBIDS_DOCKING "target's mobile docking port is docked forbidding docking"
+#define SHUTTLE_PORT_IS_ADJUSTING "port is in the middle of adjusting another ship to land"
+
 
 //Launching Shuttles to CentCom
 #define NOLAUNCH -1

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
@@ -341,7 +341,8 @@
 		dwidth = olddwidth
 		height = oldheight
 		width = oldwidth
-		is_adjusting_now = FALSE
+	is_adjusting_now = FALSE
+
 
 /obj/docking_port/stationary/transit
 	name = "transit dock"
@@ -600,6 +601,8 @@
 			return SHUTTLE_ALREADY_DOCKED
 
 	if(S.adjust_dock_for_landing && intention_to_dock)
+		if(S.is_adjusting_now)
+			return SHUTTLE_PORT_IS_ADJUSTING
 		S.adjust_dock_to_shuttle(src)
 
 	if(istype(S, /obj/docking_port/stationary/transit))