From a46dedadbcdcd9f7c788b025fe68890635c1e40c Mon Sep 17 00:00:00 2001 From: Mark Suckerberg Date: Fri, 21 Jul 2023 20:27:44 -0500 Subject: [PATCH] fixes supply pods --- code/game/objects/structures/crates_lockers/closets.dm | 2 ++ code/modules/cargo/supplypod.dm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 7d8199e5ae50..12fd3d1b1242 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -151,6 +151,8 @@ return TRUE /obj/structure/closet/dump_contents() + if(!isturf(loc)) + return var/atom/L = drop_location() for(var/atom/movable/AM as anything in src) AM.forceMove(L) diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index d02b04961cf0..d79eead9444f 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -40,7 +40,7 @@ var/openingSound //Admin sound to play when the pod opens var/leavingSound //Admin sound to play when the pod leaves var/soundVolume = 80 //Volume to play sounds at. Ignores the cap - var/bay //Used specifically for the centcom_podlauncher datum. Holds the current bay the user is launching objects from. Bays are specific rooms on the centcom map. + var/area/bay //Used specifically for the centcom_podlauncher datum. Holds the current bay the user is launching objects from. Bays are specific rooms on the centcom map. var/list/explosionSize = list(0,0,2,3) var/stay_after_drop = FALSE var/specialised = TRUE // It's not a general use pod for cargo/admin use @@ -129,7 +129,7 @@ risingPod.pixel_z = 0 //The initial value of risingPod's pixel_z is 200 because it normally comes down from a high spot animate(risingPod, pixel_z = 200, time = 10, easing = LINEAR_EASING) //Animate our rising pod if (returntobay) - holder.forceMove(bay) //Move the pod back to centcom, where it belongs + holder.forceMove(pick(bay.contents)) //Move the pod back to centcom, where it belongs QDEL_IN(risingPod, 10) reversing = FALSE //Now that we're done reversing, we set this to false (otherwise we would get stuck in an infinite loop of calling the close proc at the bottom of open() ) bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever