From ffa717e8d7c6b5e7dc56e33446f6584b06ae6561 Mon Sep 17 00:00:00 2001 From: Fermi Date: Sun, 4 Aug 2019 19:39:14 +0100 Subject: [PATCH] Prevents Eigenlockers from teleporting people to CC via cargoshuttle. --- code/modules/shuttle/supply.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index b54fceb3e7..2249f5f10e 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -60,6 +60,10 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( for(var/a in T.GetAllContents()) if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types)) return FALSE + if(istype(a, /obj/structure/closet))//Prevents eigenlockers from ending up at CC + var/obj/structure/closet/c = a + if(c.eigen_teleport == TRUE) + return FALSE return TRUE /obj/docking_port/mobile/supply/request(obj/docking_port/stationary/S)