diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index 5b593e5b7f..cfc78c0dbf 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -3275,7 +3275,6 @@
 /area/ruin/space/has_grav/deepstorage/power)
 "fY" = (
 /obj/effect/turf_decal/stripes/line{
-	icon_state = "warningline";
 	dir = 4
 	},
 /obj/structure/cable/yellow{
@@ -3396,7 +3395,6 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/line{
-	icon_state = "warningline";
 	dir = 4
 	},
 /obj/structure/cable/yellow{
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 8e636c03f9..ecbbb20daa 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -4238,7 +4238,6 @@
 "kk" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
-	icon_state = "warningline";
 	dir = 4
 	},
 /obj/machinery/light{
@@ -4338,7 +4337,6 @@
 "kx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
-	icon_state = "warningline";
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
@@ -4418,11 +4416,9 @@
 "kI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/corner{
-	icon_state = "warninglinecorner";
 	dir = 1
 	},
 /obj/effect/turf_decal/stripes/corner{
-	icon_state = "warninglinecorner";
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
@@ -4431,7 +4427,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/corner,
 /obj/effect/turf_decal/stripes/corner{
-	icon_state = "warninglinecorner";
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 453ebc090d..1db3e9697d 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -58932,9 +58932,7 @@
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "cTZ" = (
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (NORTH)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
 /turf/open/floor/plasteel/white,
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index f8b6b4cfe8..154df34231 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -9126,7 +9126,6 @@
 /area/hallway/primary/central)
 "awl" = (
 /obj/effect/turf_decal/stripes/line{
-	icon_state = "warningline";
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -16174,9 +16173,7 @@
 	pixel_y = -5;
 	req_access_txt = "17"
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 2
 	},
 /turf/open/floor/plasteel/blue/corner,
@@ -16834,9 +16831,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (NORTH)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -30295,9 +30290,7 @@
 	dir = 8;
 	network = list("SS13","RD")
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 2
 	},
 /turf/open/floor/plasteel/white,
@@ -33325,9 +33318,7 @@
 	dir = 4;
 	pixel_x = 11
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (WEST)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
@@ -34763,9 +34754,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 27
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (WEST)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
 /obj/machinery/door/firedoor,
@@ -38583,9 +38572,7 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_y = -32
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (NORTH)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
 /turf/open/floor/engine,
@@ -38955,9 +38942,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 2
 	},
 /turf/open/floor/plasteel/green/side,
@@ -42150,9 +42135,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 2
 	},
 /turf/open/floor/plasteel/black,
@@ -42168,9 +42151,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (NORTH)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
 /turf/open/floor/plasteel/black,
@@ -42783,9 +42764,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (WEST)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
 /turf/open/floor/plasteel/black,
@@ -42805,9 +42784,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (EAST)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
 /turf/open/floor/plasteel/black,
@@ -45602,9 +45579,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (WEST)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
 /turf/open/floor/plasteel,
@@ -45719,9 +45694,7 @@
 	dir = 1;
 	pixel_y = 29
 	},
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (EAST)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -46277,9 +46250,7 @@
 /turf/open/floor/plasteel,
 /area/engine/engineering)
 "can" = (
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 2
 	},
 /turf/open/floor/plasteel,
@@ -46372,9 +46343,7 @@
 /turf/open/floor/plasteel,
 /area/engine/engineering)
 "cav" = (
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (NORTH)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -53350,9 +53319,7 @@
 /turf/closed/wall,
 /area/library)
 "cxC" = (
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (NORTH)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -53363,9 +53330,7 @@
 	},
 /area/library)
 "cxD" = (
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 2
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -53465,9 +53430,7 @@
 /turf/closed/wall,
 /area/library)
 "cyz" = (
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (EAST)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -53478,9 +53441,7 @@
 	},
 /area/library)
 "cyA" = (
-/obj/effect/turf_decal/stripes/line{
-	tag = "icon-warninglinecorner (WEST)";
-	icon_state = "warninglinecorner";
+/obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm
index 8a280916e2..25ed35ba1c 100644
--- a/_maps/shuttles/emergency_cere.dmm
+++ b/_maps/shuttles/emergency_cere.dmm
@@ -428,7 +428,6 @@
 /area/shuttle/escape)
 "bs" = (
 /obj/effect/turf_decal/stripes/line{
-	icon_state = "warningline";
 	dir = 1
 	},
 /obj/machinery/light{
@@ -443,7 +442,6 @@
 /area/shuttle/escape)
 "bt" = (
 /obj/effect/turf_decal/stripes/line{
-	icon_state = "warningline";
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -451,7 +449,6 @@
 "bu" = (
 /obj/effect/turf_decal/delivery,
 /obj/effect/turf_decal/stripes/line{
-	icon_state = "warningline";
 	dir = 1
 	},
 /obj/structure/closet,