Merge branch 'master' into pubby

code/game/objects/structures/barsigns.dm

@@ -314,6 +314,11 @@
 	icon = "thehive"
 	desc = "Comb in for some sweet drinks! Not known for serving any sappy drink."
 
+/datum/barsign/kinariscorp
+	name = "Kinaris.Co"
+	icon = "kinariscorp"
+	desc = "Provided in saturated olive, Much like the drinks."
+
 /datum/barsign/hiddensigns
 	hidden = TRUE
 

code/game/objects/structures/bedsheet_bin.dm

@@ -115,7 +115,7 @@ LINEN BINS
 
 /obj/item/bedsheet/captain
 	name = "captain's bedsheet"
-	desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
+	desc = "It has a Kinaris symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
 	icon_state = "sheetcaptain"
 	item_color = "captain"
 	dream_messages = list("authority", "a golden ID", "sunglasses", "a green disc", "an antique gun", "the captain")
@@ -214,8 +214,8 @@ LINEN BINS
 	dream_messages = list("a book", "an explosion", "lightning", "a staff", "a skeleton", "a robe", "magic")
 
 /obj/item/bedsheet/nanotrasen
-	name = "nanotrasen bedsheet"
-	desc = "It has the Nanotrasen logo on it and has an aura of duty."
+	name = "Kinaris bedsheet"
+	desc = "It has the Kinaris.Co logo on it and has an aura of duty."
 	icon_state = "sheetNT"
 	item_color = "nanotrasen"
 	dream_messages = list("authority", "an ending")

code/game/objects/structures/showcase.dm

@@ -58,7 +58,7 @@
 
 /obj/structure/showcase/mecha/marauder
 	name = "combat mech exhibit"
-	desc = "A stand with an empty old Nanotrasen Corporation combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees."
+	desc = "A stand with an empty old Kinaris.Co combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees."
 	icon = 'icons/mecha/mecha.dmi'
 	icon_state = "marauder"
 
@@ -69,30 +69,30 @@
 	icon_state = "firefighter"
 
 /obj/structure/showcase/machinery/implanter
-	name = "Nanotrasen automated mindshield implanter exhibit"
-	desc = "A flimsy model of a standard Nanotrasen automated mindshield implant machine. With secure positioning harnesses and a robotic surgical injector, brain damage and other serious medical anomalies are now up to 60% less likely!"
+	name = "Kinaris automated mindshield implanter exhibit"
+	desc = "A flimsy model of a standard Kinaris automated mindshield implant machine. With secure positioning harnesses and a robotic surgical injector, brain damage and other serious medical anomalies are now up to 60% less likely!"
 	icon = 'icons/obj/machines/implantchair.dmi'
 	icon_state = "implantchair"
 
 /obj/structure/showcase/machinery/microwave
-	name = "Nanotrasen-brand microwave"
-	desc = "The famous Nanotrasen-brand microwave, the multi-purpose cooking appliance every station needs! This one appears to be drawn onto a cardboard box."
+	name = "Kinaris-brand microwave"
+	desc = "The famous Kinaris.Co microwave, the multi-purpose cooking appliance every station needs! This one appears to be drawn onto a cardboard box."
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "mw"
 
 /obj/structure/showcase/machinery/cloning_pod
 	name = "cloning pod exhibit"
-	desc = "Signs describe how cloning pods like these ensure that every Nanotrasen employee can carry out their contracts in full, even in the unlikely event of their catastrophic death. Hopefully they aren't all made of cardboard, like this one."
+	desc = "Signs describe how cloning pods like these ensure that every Kin.Co employee can carry out their contracts in full, even in the unlikely event of their catastrophic death. Hopefully they aren't all made of cardboard, like this one."
 	icon = 'icons/obj/machines/cloning.dmi'
 	icon_state = "pod_0"
 
 /obj/structure/showcase/perfect_employee
 	name = "'Perfect Man' employee exhibit"
-	desc = "A stand with a model of the perfect Nanotrasen Employee bolted to it. Signs indicate it is robustly genetically engineered, as well as being ruthlessly loyal."
+	desc = "A stand with a model of the perfect Kinaris Employee bolted to it. Signs indicate it is robustly genetically engineered, as well as being ruthlessly loyal."
 
 /obj/structure/showcase/machinery/tv
-	name = "Nanotrasen corporate newsfeed"
-	desc = "A slightly battered looking TV. Various Nanotrasen infomercials play on a loop, accompanied by a jaunty tune."
+	name = "Kinaris-Co brand newsfeed"
+	desc = "A slightly battered looking TV. Various galactic infomercials play on a loop, accompanied by a jaunty tune."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "television"
 

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

@@ -121,13 +121,13 @@
 	setDir(turn(dir, 90))
 
 /obj/structure/sign/nanotrasen
-	name = "\improper Nanotrasen Logo"
-	desc = "A sign with the Nanotrasen Logo on it. Glory to Nanotrasen!"
+	name = "\improper Kinaris.Corp Logo"
+	desc = "A sign with the Kinaris Logo on it. Blessed be Kinaris!"
 	icon_state = "nanotrasen"
 
 /obj/structure/sign/logo
-	name = "nanotrasen logo"
-	desc = "The Nanotrasen corporate logo."
+	name = "Kinaris.Co Logo"
+	desc = "The Kinaris corporate logo."
 	icon_state = "nanotrasen_sign1"
 
 /obj/structure/sign/logo/kinaris

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