From 046e5ced8d6b9c9eed1e53ad7b1781a1cb9fc7b5 Mon Sep 17 00:00:00 2001
From: Luc <89928798+lewcc@users.noreply.github.com>
Date: Fri, 20 Oct 2023 15:15:09 -0400
Subject: [PATCH] Transit tube hotfixes (#22944)

* hotfixes

* removes dated comment
---
 .../RandomRuins/SpaceRuins/oldstation.dmm     | 84 ++++++++++---------
 .../transit_tubes/transit_tube_pod.dm         | 11 +--
 2 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
index 9d516a618b1..221e378c02e 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
@@ -639,13 +639,13 @@
 /turf/template_noop,
 /area/template_noop)
 "bW" = (
-/obj/structure/transit_tube,
 /obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/transit_tube/horizontal,
 /turf/simulated/floor/plating/airless,
 /area/ruin/ancientstation/betanorth)
 "bX" = (
-/obj/structure/transit_tube,
 /obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/transit_tube/horizontal,
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation)
 "bY" = (
@@ -742,8 +742,8 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation)
 "cj" = (
-/obj/structure/transit_tube,
 /obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/transit_tube/horizontal,
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation/thetacorridor)
 "ck" = (
@@ -1088,9 +1088,7 @@
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation)
 "de" = (
-/obj/structure/transit_tube{
-	icon_state = "E-W-Pass"
-	},
+/obj/structure/transit_tube/crossing/horizontal,
 /turf/template_noop,
 /area/space/nearstation)
 "df" = (
@@ -1145,12 +1143,6 @@
 /obj/machinery/door/airlock/research,
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation/rnd)
-"dn" = (
-/obj/structure/transit_tube{
-	icon_state = "N-S"
-	},
-/turf/template_noop,
-/area/space/nearstation)
 "do" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -5055,6 +5047,16 @@
 /obj/machinery/power/tesla_coil,
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation/thetacorridor)
+"Db" = (
+/obj/structure/transit_tube/crossing,
+/turf/template_noop,
+/area/space/nearstation)
+"Lu" = (
+/obj/structure/transit_tube/horizontal{
+	dir = 4
+	},
+/turf/template_noop,
+/area/space/nearstation)
 "LD" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -5070,6 +5072,10 @@
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating/airless,
 /area/ruin/ancientstation/betanorth)
+"VT" = (
+/obj/structure/transit_tube/horizontal,
+/turf/template_noop,
+/area/space/nearstation)
 "Xq" = (
 /mob/living/simple_animal/hostile/hivebot,
 /obj/effect/decal/cleanable/dirt,
@@ -5571,7 +5577,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aH
 bf
 aW
@@ -5619,7 +5625,7 @@ aa
 uQ
 aa
 aa
-cX
+VT
 aa
 aa
 uQ
@@ -5667,7 +5673,7 @@ aa
 aa
 aa
 aa
-de
+VT
 aa
 aa
 uQ
@@ -5715,7 +5721,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 ae
@@ -5763,7 +5769,7 @@ aa
 aa
 aa
 aa
-cX
+Lu
 aa
 uQ
 ck
@@ -5811,7 +5817,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 ae
@@ -5859,7 +5865,7 @@ aa
 aa
 aa
 aa
-cX
+de
 aa
 uQ
 ck
@@ -5907,7 +5913,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 ae
@@ -5955,7 +5961,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 uQ
 eK
@@ -6003,7 +6009,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 dp
@@ -6051,7 +6057,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 uQ
@@ -6099,7 +6105,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 uQ
@@ -6147,7 +6153,7 @@ aa
 aa
 aa
 aa
-de
+VT
 aa
 aa
 cU
@@ -6195,7 +6201,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 cU
@@ -6243,7 +6249,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 cU
 cU
@@ -7395,7 +7401,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 dg
 dA
@@ -7411,7 +7417,7 @@ lH
 dg
 dg
 aa
-cX
+VT
 aa
 aa
 aa
@@ -7442,7 +7448,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 aa
@@ -7459,7 +7465,7 @@ lI
 dg
 aa
 aa
-cX
+VT
 aa
 aa
 aa
@@ -7492,7 +7498,7 @@ aa
 aa
 aa
 dk
-cX
+Db
 aa
 dg
 dg
@@ -7507,7 +7513,7 @@ dg
 dg
 aa
 aa
-cX
+VT
 aa
 aa
 aa
@@ -7591,7 +7597,7 @@ aa
 aa
 aa
 aa
-dn
+VT
 aa
 aa
 uQ
@@ -7603,7 +7609,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 aa
@@ -7635,7 +7641,7 @@ aa
 aa
 aa
 aa
-dn
+aa
 aa
 aa
 ab
@@ -7651,7 +7657,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 aa
@@ -7683,7 +7689,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 ab
@@ -7699,7 +7705,7 @@ aa
 aa
 aa
 aa
-cX
+VT
 aa
 aa
 aa
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index a08dd320650..c3e96f9b3b6 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -33,9 +33,10 @@
 	air_contents.nitrogen = MOLES_N2STANDARD
 	air_contents.temperature = T20C
 
-	// Give auto tubes time to align before trying to start moving
-	spawn(5)
-		follow_tube()
+	for(var/obj/structure/transit_tube/tube in loc)
+		dir = pick(tube.directions())
+		break
+	follow_tube()
 
 /obj/structure/transit_tube_pod/update_icon_state()
 	. = ..()
@@ -224,9 +225,9 @@
 
 		if(!moving)
 			for(var/obj/structure/transit_tube/station/station in loc)
-				if(dir in station.directions())
+				if((dir in station.directions()) || (turn(dir, 180) in station.directions()))
 					if(!station.pod_moving)
-						if(direction == station.dir)
+						if(direction == turn(station.boarding_dir, 180))
 							if(station.hatch_state == TRANSIT_TUBE_OPEN)
 								eject(mob, direction)