Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54

2019-08-24 12:52:16 +02:00
parent 23e3263fcb 62e931c62d
commit f843a53fe9
387 changed files with 10598 additions and 2161 deletions
@@ -61,6 +61,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)