Merge remote-tracking branch 'upstream/master' into call-it-whatever-the-fuck-i-want

code/game/objects/structures/signs/_signs.dm

@@ -129,3 +129,8 @@
 	name = "Kinaris.Co Logo"
 	desc = "The Kinaris corporate logo."
 	icon_state = "nanotrasen_sign1"
+
+/obj/structure/sign/logo/kinaris
+	name = "kinaris logo"
+	desc = "The Kinaris corprate logo. Radiant."
+	icon_state = "kinaris_sign1"

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

@@ -126,6 +126,7 @@
 /obj/structure/transit_tube/station/proc/launch_pod()
 	if(launch_cooldown >= world.time)
 		return
+	density = FALSE
 	for(var/obj/structure/transit_tube_pod/pod in loc)
 		if(!pod.moving)
 			pod_moving = 1
@@ -148,6 +149,7 @@
 			pod.setDir(tube_dirs[1]) //turning the pod around for next launch.
 		launch_cooldown = world.time + cooldown_delay
 		open_animation()
+		density = TRUE
 		sleep(OPEN_DURATION + 2)
 		pod_moving = 0
 		if(!QDELETED(pod))

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

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/atmospherics/pipes/transit_tube.dmi'
 	icon_state = "straight"
 	desc = "A transit tube for moving things around."
-	density = TRUE
+	density = FALSE
 	layer = LOW_ITEM_LAYER
 	anchored = TRUE
 	climbable = 1
@@ -16,7 +16,7 @@
 
 /obj/structure/transit_tube/CanPass(atom/movable/mover, turf/target)
 	if(istype(mover) && (mover.pass_flags & PASSGLASS))
-		return 1
+		return TRUE
 	return !density
 
 /obj/structure/transit_tube/New(loc, newdirection)
@@ -189,7 +189,6 @@
 	dir = WEST
 
 /obj/structure/transit_tube/diagonal/crossing
-	density = FALSE
 	icon_state = "diagonal_crossing"
 	tube_construction = /obj/structure/c_transit_tube/diagonal/crossing
 
@@ -263,7 +262,6 @@
 /obj/structure/transit_tube/crossing
 	icon_state = "crossing"
 	tube_construction = /obj/structure/c_transit_tube/crossing
-	density = FALSE
 
 //mostly for mapping use
 /obj/structure/transit_tube/crossing/horizontal

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

@@ -88,7 +88,7 @@
 /obj/structure/c_transit_tube/curved
 	icon_state = "curved0"
 	build_type = /obj/structure/transit_tube/curved
-	flipped_build_type = /obj/structure/transit_tube/curved/flipped
+	flipped_build_type = /obj/structure/c_transit_tube/curved/flipped
 	base_icon = "curved"
 
 /obj/structure/c_transit_tube/curved/flipped

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

@@ -3,7 +3,7 @@
 	icon_state = "pod"
 	animate_movement = FORWARD_STEPS
 	anchored = TRUE
-	density = TRUE
+	density = FALSE
 	layer = BELOW_OBJ_LAYER
 	var/moving = 0
 	var/datum/gas_mixture/air_contents = new()
@@ -136,13 +136,11 @@
 		sleep(last_delay)
 		setDir(next_dir)
 		forceMove(next_loc) // When moving from one tube to another, skip collision and such.
-		density = current_tube.density
 
 		if(current_tube && current_tube.should_stop_pod(src, next_dir))
 			current_tube.pod_stopped(src, dir)
 			break
 
-	density = TRUE
 	moving = 0
 
 	var/obj/structure/transit_tube/TT = locate(/obj/structure/transit_tube) in loc