diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index ef99b525ff1..5a590c02274 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -82,12 +82,22 @@
 	throw_range = 20
 	flags = CONDUCT
 
+/obj/item/stack/tile/floor_red
+	name = "red floor tile"
+	singular_name = "red floor tile"
+	icon_state = "tile_red"
+
 /obj/item/stack/tile/floor_white
 	name = "white floor tile"
 	singular_name = "white floor tile"
 	icon_state = "tile_white"
 	matter = list("plastic" = 937.5)
 
+/obj/item/stack/tile/floor_yellow
+	name = "yellow floor tile"
+	singular_name = "yellow floor tile"
+	icon_state = "tile_yellow"
+
 /obj/item/stack/tile/floor_dark
 	name = "dark floor tile"
 	singular_name = "dark floor tile"
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index e4c3984612c..529636cd6ea 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -86,6 +86,13 @@ var/list/flooring_types
 	icon = 'icons/turf/flooring/linoleum.dmi'
 	icon_base = "lino"
 
+/decl/flooring/tiling/red
+	name = "red floor"
+	icon_base = "red"
+	has_damage_range = null
+	flags = TURF_REMOVE_CROWBAR
+	build_type = /obj/item/stack/tile/floor_red
+
 /decl/flooring/tiling/white
 	name = "white floor"
 	desc = "How sterile."
@@ -94,6 +101,13 @@ var/list/flooring_types
 	flags = TURF_REMOVE_CROWBAR
 	build_type = /obj/item/stack/tile/floor_white
 
+/decl/flooring/tiling/yellow
+	name = "yellow floor"
+	icon_base = "yellow"
+	has_damage_range = null
+	flags = TURF_REMOVE_CROWBAR
+	build_type = /obj/item/stack/tile/floor_yellow
+
 /decl/flooring/tiling/dark
 	name = "dark floor"
 	desc = "How ominous."
diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm
index 60f209e1538..8259ca899c4 100644
--- a/code/game/turfs/flooring/flooring_decals.dm
+++ b/code/game/turfs/flooring/flooring_decals.dm
@@ -28,6 +28,9 @@ var/list/floor_decals = list()
 	name = "blue corner"
 	icon_state = "corner_blue"
 
+/obj/effect/floor_decal/corner/blue/diagonal
+	icon_state = "corner_blue_diagonal"
+
 /obj/effect/floor_decal/corner/blue/full
 	icon_state = "corner_blue_full"
 
@@ -57,6 +60,10 @@ var/list/floor_decals = list()
 	name = "purple corner"
 	icon_state = "corner_purple"
 
+/obj/effect/floor_decal/corner/purple/full
+	name = "purple corner"
+	icon_state = "corner_purple_full"
+
 /obj/effect/floor_decal/corner/orange
 	name = "orange corner"
 	icon_state = "corner_orange"
@@ -69,6 +76,20 @@ var/list/floor_decals = list()
 	name = "white corner"
 	icon_state = "corner_white"
 
+/obj/effect/floor_decal/corner/white/diagonal
+	icon_state = "corner_white_diagonal"
+
+/obj/effect/floor_decal/corner/white/full
+	icon_state = "corner_white_full"
+
+/obj/effect/floor_decal/corner/grey
+	name = "grey corner"
+	icon_state = "corner_grey"
+
+/obj/effect/floor_decal/corner/grey/full
+	name = "grey corner"
+	icon_state = "corner_grey_full"
+
 /obj/effect/floor_decal/industrial/warning
 	name = "hazard stripes"
 	icon_state = "warning"
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index 8d81fc648a9..985cb2ed1b4 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -59,11 +59,21 @@
 	icon_state = "dark"
 	initial_flooring = /decl/flooring/tiling/dark
 
+/turf/simulated/floor/tiled/red
+	name = "red floor"
+	icon_state = "red"
+	initial_flooring = /decl/flooring/tiling/red
+
 /turf/simulated/floor/tiled/white
 	name = "white floor"
 	icon_state = "white"
 	initial_flooring = /decl/flooring/tiling/white
 
+/turf/simulated/floor/tiled/yellow
+	name = "yellow floor"
+	icon_state = "yellow"
+	initial_flooring = /decl/flooring/tiling/yellow
+
 /turf/simulated/floor/tiled/freezer
 	name = "tiles"
 	icon_state = "freezer"
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 62d1c1e8e90..074ca9c6334 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/turf/flooring/decals.dmi b/icons/turf/flooring/decals.dmi
index fe472cbf89c..e32c864ccb2 100644
Binary files a/icons/turf/flooring/decals.dmi and b/icons/turf/flooring/decals.dmi differ
diff --git a/icons/turf/flooring/tiles.dmi b/icons/turf/flooring/tiles.dmi
index 8c4367b9799..20a461efe6b 100644
Binary files a/icons/turf/flooring/tiles.dmi and b/icons/turf/flooring/tiles.dmi differ