From bd347f9707a26a93418b67862f897b8dc7a90a8d Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Fri, 1 Mar 2024 17:24:13 +0100 Subject: [PATCH] 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')