diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 5c4215e8897..98abb583f02 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -398,3 +398,12 @@
 		target.set_outside(OUTSIDE_NO)
 	to_chat(user, SPAN_NOTICE("You put up a roof over \the [target]."))
 	return TRUE
+
+/obj/item/stack/tile/elevator
+	name = "elevator floor tile"
+	singular_name = "elevator floor tile"
+	icon_state = "tile_elevator"
+	material = /decl/material/solid/metal/plasteel
+
+/obj/item/stack/tile/elevator/fifty
+	amount = 50
\ No newline at end of file
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index 65ed1198ce9..2a17bfc48db 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -297,6 +297,14 @@
 	can_paint = 1
 	footstep_type = /decl/footsteps/plating
 
+/decl/flooring/reinforced/elevator_shaft
+	name       = "elevator shaft floor"
+	icon       = 'icons/turf/floors.dmi'
+	icon_base  = "elevatorshaft"
+	flags      = TURF_REMOVE_WRENCH | TURF_ACID_IMMUNE
+	build_type = /obj/item/stack/tile/elevator
+	can_paint  = FALSE
+
 /decl/flooring/reinforced/circuit
 	name = "processing strata"
 	icon = 'icons/turf/flooring/circuit.dmi'
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index fd0fc9a541e..2616d6d1c6f 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -155,6 +155,11 @@
 /turf/simulated/floor/reinforced/n20
 	initial_gas = list(/decl/material/gas/nitrous_oxide = ATMOSTANK_NITROUSOXIDE)
 
+/turf/simulated/floor/reinforced/elevator_shaft
+	name             = "elevator shaft floor"
+	icon             = 'icons/turf/floors.dmi'
+	icon_state       = "elevatorshaft"
+	initial_flooring = /decl/flooring/reinforced/elevator_shaft
 
 /turf/simulated/floor/cult
 	name = "engraved floor"
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 7ad03f9e5d9..42a982c0848 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ