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

code/modules/shuttle/ferry.dm

@@ -37,4 +37,4 @@
 			return
 		last_request = world.time
 		to_chat(usr, "<span class='notice'>Your request has been received by CentCom.</span>")
-		to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;[HrefToken()];secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to CentCom.</font>")
+		to_chat(GLOB.admins, "<b>FERRY: <font color='#3d5bc3'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;[HrefToken()];secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to CentCom.</font>")

code/modules/shuttle/on_move.dm

@@ -179,7 +179,7 @@ All ShuttleMove procs go here
 	for(var/obj/machinery/door/airlock/A in range(1, src))  // includes src
 		A.shuttledocked = FALSE
 		A.air_tight = TRUE
-		INVOKE_ASYNC(A, /obj/machinery/door/.proc/close)
+		addtimer(CALLBACK(A, /obj/machinery/door/.proc/close), 0)
 
 /obj/machinery/door/airlock/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
 	. = ..()

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)