From d118ae5bcfd7318b43c260d60e271208a2ea52d9 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sun, 1 Oct 2023 12:42:28 +0200 Subject: [PATCH] Fixes mail crates sometimes spawning inside the Supply shuttle engines (#22567) * Thanks Mira for giving me this proc * GDN review --- code/controllers/subsystem/SSshuttles.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/SSshuttles.dm b/code/controllers/subsystem/SSshuttles.dm index a229a3ab80c..003e49309ca 100644 --- a/code/controllers/subsystem/SSshuttles.dm +++ b/code/controllers/subsystem/SSshuttles.dm @@ -294,13 +294,11 @@ SUBSYSTEM_DEF(shuttle) if(!length(supply_shuttle_turfs)) for(var/turf/simulated/T in supply.areaInstance) - if(T.density) + if(is_blocked_turf(T)) continue - for(var/obj/structure/structure in T.contents) - if(structure.density) - continue supply_shuttle_turfs += T if(!length(supply_shuttle_turfs)) // In case some nutjob walled the supply shuttle 10 minutes into the round + stack_trace("There were no available turfs on the Supply Shuttle to spawn a mail crate in!") return var/turf/spawn_location = pick(supply_shuttle_turfs) new /obj/structure/closet/crate/mail(spawn_location)