From 6898a36cb1aea643f4a9d3ad5ee1d9610398e93a Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:13:15 +0100
Subject: [PATCH 1/3] e

---
 maps/shuttles/lifeboat-port.dmm      | 3 ++-
 maps/shuttles/lifeboat-starboard.dmm | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/maps/shuttles/lifeboat-port.dmm b/maps/shuttles/lifeboat-port.dmm
index 0117730f6971..61b4b6ce54f6 100644
--- a/maps/shuttles/lifeboat-port.dmm
+++ b/maps/shuttles/lifeboat-port.dmm
@@ -320,7 +320,8 @@
 /area/shuttle/lifeboat)
 "Jg" = (
 /turf/open/shuttle/escapepod{
-	icon_state = "floor8"
+	icon_state = "floor1";
+	dir = 4
 	},
 /area/shuttle/lifeboat)
 "Jw" = (
diff --git a/maps/shuttles/lifeboat-starboard.dmm b/maps/shuttles/lifeboat-starboard.dmm
index 57e302923131..d4ee3702ff37 100644
--- a/maps/shuttles/lifeboat-starboard.dmm
+++ b/maps/shuttles/lifeboat-starboard.dmm
@@ -446,7 +446,8 @@
 /area/shuttle/lifeboat)
 "VZ" = (
 /turf/open/shuttle/escapepod{
-	icon_state = "floor8"
+	icon_state = "floor1";
+	dir = 4
 	},
 /area/shuttle/lifeboat)
 "Xj" = (

From 944e4ba78f2941b09aca2578f02c9b068eaf117a Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:23:25 +0100
Subject: [PATCH 2/3] Update dropship_equipment.dm

---
 code/modules/cm_marines/dropship_equipment.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm
index bd40076ea500..63a3bac0523e 100644
--- a/code/modules/cm_marines/dropship_equipment.dm
+++ b/code/modules/cm_marines/dropship_equipment.dm
@@ -112,6 +112,7 @@
 	playsound(loc, 'sound/machines/hydraulics_2.ogg', 40, 1)
 	var/duration_time = 10
 	var/point_loc
+	var/old_loc = src.loc
 	if(ship_base)
 		duration_time = 70 //uninstalling equipment takes more time
 		point_loc = ship_base.loc
@@ -119,6 +120,8 @@
 		return
 	if(point_loc && ship_base && ship_base.loc != point_loc) //dropship flew away
 		return
+	if(old_loc != src.loc) //We somehow moved (possibly into a different powerloader)
+		return
 	if(!PC.linked_powerloader || PC.loaded || PC.linked_powerloader.buckled_mob != user)
 		return
 	PC.grab_object(user, src, "ds_gear", 'sound/machines/hydraulics_1.ogg')

From e0688e8aa372799b1fc8ff81befab5a884880c65 Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Fri, 1 Mar 2024 17:23:44 +0100
Subject: [PATCH 3/3] Revert "Update dropship_equipment.dm"

This reverts commit 944e4ba78f2941b09aca2578f02c9b068eaf117a.
---
 code/modules/cm_marines/dropship_equipment.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm
index 63a3bac0523e..bd40076ea500 100644
--- a/code/modules/cm_marines/dropship_equipment.dm
+++ b/code/modules/cm_marines/dropship_equipment.dm
@@ -112,7 +112,6 @@
 	playsound(loc, 'sound/machines/hydraulics_2.ogg', 40, 1)
 	var/duration_time = 10
 	var/point_loc
-	var/old_loc = src.loc
 	if(ship_base)
 		duration_time = 70 //uninstalling equipment takes more time
 		point_loc = ship_base.loc
@@ -120,8 +119,6 @@
 		return
 	if(point_loc && ship_base && ship_base.loc != point_loc) //dropship flew away
 		return
-	if(old_loc != src.loc) //We somehow moved (possibly into a different powerloader)
-		return
 	if(!PC.linked_powerloader || PC.loaded || PC.linked_powerloader.buckled_mob != user)
 		return
 	PC.grab_object(user, src, "ds_gear", 'sound/machines/hydraulics_1.ogg')