diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index a3639171dc4..bab1d1a7f55 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -205,7 +205,7 @@
 					if(do_after_cooldown(target))
 						if(disabled) return
 						chassis.spark_system.start()
-						target:ReplaceWithFloor()
+						target:ReplaceWithPlating()
 						playsound(target, 'Deconstruct.ogg', 50, 1)
 						chassis.give_power(energy_drain)
 				else if (istype(target, /turf/simulated/floor))
@@ -232,7 +232,7 @@
 					set_ready_state(0)
 					if(do_after_cooldown(target))
 						if(disabled) return
-						target:ReplaceWithFloor()
+						target:ReplaceWithPlating()
 						playsound(target, 'Deconstruct.ogg', 50, 1)
 						chassis.spark_system.start()
 						chassis.use_power(energy_drain*2)
diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm
index 667ac47e479..43ddfc7fdcb 100644
--- a/code/game/objects/items/robot_items.dm
+++ b/code/game/objects/items/robot_items.dm
@@ -232,7 +232,7 @@
 						if(!cell.use(30))	return
 						user << "Building Floor..."
 						activate()
-						A:ReplaceWithFloor()
+						A:ReplaceWithPlating()
 						return
 
 					if(istype(A, /turf/simulated/floor))
@@ -263,7 +263,7 @@
 						playsound(src.loc, 'click.ogg', 50, 1)
 						if(do_after(user, 40))
 							activate()
-							A:ReplaceWithFloor()
+							A:ReplaceWithPlating()
 						return
 
 					if(istype(A, /turf/simulated/wall/r_wall))
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 7820af4db70..2641c63e742 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -79,7 +79,7 @@ RCD
 					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 					spark_system.set_up(5, 0, src)
 					src.spark_system.start()
-					A:ReplaceWithFloor()
+					A:ReplaceWithPlating()
 					matter--
 					user << "The RCD now holds [matter]/30 matter-units."
 					desc = "A RCD. It currently holds [matter]/30 matter-units."
@@ -124,7 +124,7 @@ RCD
 					if(!disabled && matter >= 4)
 						spark_system.set_up(5, 0, src)
 						src.spark_system.start()
-						A:ReplaceWithFloor()
+						A:ReplaceWithPlating()
 						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
 						matter -= 4
 						user << "The RCD now holds [matter]/30 matter-units."
diff --git a/code/game/objects/stacks/metal.dm b/code/game/objects/stacks/metal.dm
index c05e4715aa1..34bcdbf7be8 100644
--- a/code/game/objects/stacks/metal.dm
+++ b/code/game/objects/stacks/metal.dm
@@ -129,6 +129,7 @@ var/global/list/datum/stack_recipe/r_metal_recipes = list ( \
 	return
 
 /obj/item/stack/tile/steel/proc/build(turf/S as turf)
-	var/turf/simulated/floor/W = S.ReplaceWithFloor()
-	W.make_plating()
+	S.ReplaceWithPlating()
+//	var/turf/simulated/floor/W = S.ReplaceWithFloor()
+//	W.make_plating()
 	return
\ No newline at end of file
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index aef7dff3fec..5c4ea94a86e 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -5,6 +5,7 @@ obj/structure
 	icon_state = "girder"
 	anchored = 1
 	density = 1
+	layer = 2
 	var/state = 0
 
 	attackby(obj/item/W as obj, mob/user as mob)
@@ -77,6 +78,8 @@ obj/structure
 				user << "\blue You added the plating!"
 				var/turf/Tsrc = get_turf(src)
 				Tsrc.ReplaceWithWall()
+				for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
+					P.layer = 1
 				W:use(2)
 				del(src)
 			return
@@ -88,6 +91,8 @@ obj/structure
 					user << "\blue Wall fully reinforced!"
 					var/turf/Tsrc = get_turf(src)
 					Tsrc.ReplaceWithRWall()
+					for(var/obj/machinery/atmospherics/pipe/P in Tsrc)
+						P.layer = 1
 					if (W)
 						W:use(1)
 					del(src)
@@ -100,6 +105,12 @@ obj/structure
 					new/obj/structure/girder/reinforced( src.loc )
 					del(src)
 					return
+		else if(istype(W, /obj/item/pipe))
+			var/obj/item/pipe/P = W
+			if (P.pipe_type in list(0, 1, 5))	//simple pipes, simple bends, and simple manifolds.
+				user.drop_item()
+				P.loc = src.loc
+				user << "\blue You fit the pipe into the [src]!"
 		else
 			..()
 
diff --git a/code/game/turf.dm b/code/game/turf.dm
index 10902f962ba..bc9104b1368 100644
--- a/code/game/turf.dm
+++ b/code/game/turf.dm
@@ -272,7 +272,7 @@
 			new /obj/item/stack/sheet/metal( src )
 			new /obj/item/stack/sheet/metal( src )
 
-	ReplaceWithFloor(explode)
+	ReplaceWithPlating(explode)
 
 /turf/simulated/wall/examine()
 	set src in oview(1)
@@ -354,7 +354,7 @@
 			O.anchored = 1
 			O.density = 1
 			O.layer = 5
-			var/turf/simulated/floor/F = ReplaceWithFloor()
+			var/turf/simulated/floor/F = ReplaceWithPlating()
 			F.burn_tile()
 			F.icon_state = "wall_thermite"
 			user << "\red The thermite melts the wall."
@@ -390,7 +390,7 @@
 			O.anchored = 1
 			O.density = 1
 			O.layer = 5
-			var/turf/simulated/floor/F = ReplaceWithFloor()
+			var/turf/simulated/floor/F = ReplaceWithPlating()
 			F.burn_tile()
 			F.icon_state = "wall_thermite"
 			user << "\red The thermite melts the wall."
@@ -464,7 +464,7 @@
 			O.anchored = 1
 			O.density = 1
 			O.layer = 5
-			var/turf/simulated/floor/F = ReplaceWithFloor()
+			var/turf/simulated/floor/F = ReplaceWithPlating()
 			F.burn_tile()
 			F.icon_state = "wall_thermite"
 			user << "\red The thermite melts the wall."
@@ -507,7 +507,7 @@
 			O.anchored = 1
 			O.density = 1
 			O.layer = 5
-			var/turf/simulated/floor/F = ReplaceWithFloor()
+			var/turf/simulated/floor/F = ReplaceWithPlating()
 			F.burn_tile()
 			F.icon_state = "wall_thermite"
 			user << "\red The thermite melts the wall."