Merge remote-tracking branch 'ParadiseSS13/master' into GoOnYourFeet

code/game/objects/structures/curtains.dm

@@ -55,5 +55,8 @@
 /obj/structure/curtain/open/shower/security
 	color = "#AA0000"
 
+/obj/structure/curtain/open/shower/centcom
+	color = "#000066"
+
 #undef SHOWER_OPEN_LAYER
 #undef SHOWER_CLOSED_LAYER

code/game/objects/structures/transit_tubes/station.dm

@@ -6,11 +6,10 @@
 	name = "station tube station"
 	icon = 'icons/obj/pipes/transit_tube_station.dmi'
 	icon_state = "closed"
-	exit_delay = 2
-	enter_delay = 3
+	exit_delay = 1
+	enter_delay = 2
 	var/pod_moving = 0
-	var/automatic_launch_time = 100
-	var/cooldown_delay = 200
+	var/cooldown_delay = 50
 	var/launch_cooldown = 0
 	var/reverse_launch = 0
 

code/game/objects/structures/transit_tubes/transit_tube.dm

@@ -10,8 +10,8 @@
 	layer = 3.1
 	anchored = 1.0
 	var/list/tube_dirs = null
-	var/exit_delay = 2
-	var/enter_delay = 1
+	var/exit_delay = 1
+	var/enter_delay = 0
 
 	// alldirs in global.dm is the same list of directions, but since
 	//  the specific order matters to get a usable icon_state, it is
@@ -20,6 +20,11 @@
 	var/global/list/tube_dir_list = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
 
 
+/obj/structure/transit_tube/CanPass(atom/movable/mover, turf/target)
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return 1
+	return !density
+
 // When destroyed by explosions, properly handle contents.
 obj/structure/transit_tube/ex_act(severity)
 	switch(severity)