Fix Elevators and conflict

cmss13-devs · Dec 2, 2024 · 62e5dda · 62e5dda
1 parent bc34519
commit 62e5dda
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/code/game/machinery/doors/poddoor/two_tile.dm b/code/game/machinery/doors/poddoor/two_tile.dm
@@ -21,14 +21,13 @@
 	QDEL_NULL(f2)
 	return ..()
 
-/obj/structure/machinery/door/poddoor/two_tile/open()
-	if(!density)
-		return
-
 /obj/structure/machinery/door/poddoor/two_tile/open(forced = FALSE)
 	if(operating) //doors can still open when emag-disabled
 		return FALSE
 
+	if(!density)
+		return
+
 	operating = DOOR_OPERATING_OPENING
 	start_opening()
 
@@ -61,14 +60,14 @@
 	f4.density = FALSE
 	..()
 
-/obj/structure/machinery/door/poddoor/two_tile/close()
-	if(density)
-		return
 
 /obj/structure/machinery/door/poddoor/two_tile/close(forced = FALSE)
 	if(operating)
 		return FALSE
 
+	if(density)
+		return
+
 	start_closing()
 	addtimer(CALLBACK(src, PROC_REF(close_fully)), openspeed, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT)
 	return TRUE