From 5b015b64063e135f3fecd23477bb3e1bfd723a5c Mon Sep 17 00:00:00 2001
From: SuhEugene <32931701+SuhEugene@users.noreply.github.com>
Date: Fri, 27 Oct 2023 15:06:25 +0300
Subject: [PATCH] UwU

---
 maps/sierra/sierra_decals.dm |   4 +
 maps/sierra/z1-z5_sierra.dmm | 519 ++++++++++-------------------------
 2 files changed, 155 insertions(+), 368 deletions(-)

diff --git a/maps/sierra/sierra_decals.dm b/maps/sierra/sierra_decals.dm
index 0275c78bb7cf3..bca5cfe229e93 100644
--- a/maps/sierra/sierra_decals.dm
+++ b/maps/sierra/sierra_decals.dm
@@ -82,3 +82,7 @@
 
 /obj/floor_decal/industrial/hatch/green
 	color = COLOR_GREEN_GRAY
+
+/obj/floor_decal/stairs
+	icon = 'icons/obj/structures/stairs.dmi'
+	icon_state = "above"
diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm
index b7d270d8100b5..a2895c58d58f0 100644
--- a/maps/sierra/z1-z5_sierra.dmm
+++ b/maps/sierra/z1-z5_sierra.dmm
@@ -783,8 +783,7 @@
 /area/maintenance/fourthdeck/forestarboard)
 "afD" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/structure/flora/pottedplant/minitree,
 /obj/machinery/light{
@@ -1127,8 +1126,7 @@
 /area/crew_quarters/cafe)
 "aiB" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /obj/machinery/light/spot{
 	dir = 8
@@ -1266,8 +1264,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/seconddeck/aftport)
@@ -1518,8 +1515,7 @@
 	},
 /obj/catwalk_plated,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
@@ -1567,7 +1563,6 @@
 "alY" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
-	icon_state = "closed";
 	id_tag = "petrov_shuttle_inner";
 	name = "Petrov Interior Access"
 	},
@@ -2155,8 +2150,7 @@
 	dir = 8
 	},
 /obj/floor_decal/techfloor{
-	dir = 6;
-	icon_state = "techfloor_edges"
+	dir = 6
 	},
 /obj/machinery/flasher{
 	dir = 8;
@@ -3813,8 +3807,7 @@
 /area/hallway/primary/firstdeck/aft)
 "aCc" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/xenoflora)
@@ -4989,8 +4982,7 @@
 /area/maintenance/firstdeck/forestarboard)
 "aKQ" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/machinery/papershredder,
 /obj/machinery/alarm{
@@ -6317,8 +6309,7 @@
 	dir = 8
 	},
 /obj/floor_decal/techfloor{
-	dir = 1;
-	icon_state = "techfloor_edges"
+	dir = 1
 	},
 /obj/structure/sign/warning/fire{
 	pixel_y = 32
@@ -6513,7 +6504,6 @@
 "aWI" = (
 /obj/structure/stairs/west,
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/monotile,
@@ -7030,8 +7020,7 @@
 	icon_state = "4-8"
 	},
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 4;
-	icon_state = "corner_techfloor_grid"
+	dir = 4
 	},
 /obj/floor_decal/techfloor/orange/corner{
 	dir = 4
@@ -7060,7 +7049,6 @@
 /obj/machinery/door/firedoor,
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/hatch{
-	icon_state = "closed";
 	id_tag = "tox_airlock_interior"
 	},
 /turf/simulated/floor/reinforced{
@@ -7531,8 +7519,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
@@ -8307,7 +8294,6 @@
 "bmi" = (
 /obj/floor_decal/corner/paleblue/border,
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/structure/cable/green{
@@ -10222,8 +10208,7 @@
 /area/medical/locker)
 "bBr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -10380,8 +10365,7 @@
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fourthdeck/aft)
@@ -10497,8 +10481,7 @@
 	dir = 4
 	},
 /obj/floor_decal/industrial/warning/corner{
-	dir = 1;
-	icon_state = "warningcorner"
+	dir = 1
 	},
 /obj/floor_decal/corner/purple,
 /turf/simulated/floor/tiled,
@@ -14048,8 +14031,7 @@
 "chc" = (
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -14702,7 +14684,6 @@
 /area/crew_quarters/heads/office/cmo)
 "cmR" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/monotile,
@@ -16340,8 +16321,7 @@
 	dir = 4
 	},
 /obj/structure/window/reinforced/tinted{
-	dir = 8;
-	icon_state = "rwindow"
+	dir = 8
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/white,
@@ -18838,8 +18818,7 @@
 /obj/random/bomb_supply,
 /obj/random/bomb_supply,
 /obj/floor_decal/techfloor{
-	dir = 1;
-	icon_state = "techfloor_edges"
+	dir = 1
 	},
 /obj/random/maintenance,
 /obj/random/maintenance,
@@ -21126,8 +21105,7 @@
 /area/crew_quarters/docking)
 "dkf" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/photocopier/faxmachine{
@@ -22645,7 +22623,6 @@
 /area/shuttle/petrov/cell3)
 "dwo" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/floor_decal/corner/paleblue/border,
@@ -22905,8 +22882,7 @@
 	},
 /obj/machinery/light,
 /obj/floor_decal/techfloor{
-	dir = 8;
-	icon_state = "techfloor_edges"
+	dir = 8
 	},
 /obj/floor_decal/industrial/warning{
 	dir = 8
@@ -24349,7 +24325,6 @@
 /area/quartermaster/hangar/upper)
 "dIL" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/floor_decal/corner/paleblue/bordercorner,
@@ -24697,8 +24672,7 @@
 	dir = 4
 	},
 /obj/floor_decal/industrial/warning/corner{
-	dir = 8;
-	icon_state = "warningcorner"
+	dir = 8
 	},
 /obj/machinery/porta_turret{
 	dir = 8
@@ -26718,8 +26692,7 @@
 	req_access = list("ACCESS_RESEARCH")
 	},
 /obj/floor_decal/industrial/warning/corner{
-	dir = 1;
-	icon_state = "warningcorner"
+	dir = 1
 	},
 /obj/floor_decal/corner/purple,
 /obj/floor_decal/industrial/warning/corner{
@@ -27360,7 +27333,6 @@
 /area/maintenance/firstdeck/foreport)
 "efM" = (
 /obj/machinery/door/airlock/highsecurity{
-	icon_state = "closed";
 	locked = 1;
 	name = "AI Core Access"
 	},
@@ -27396,8 +27368,7 @@
 /area/hallway/primary/fourthdeck/center)
 "egb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/structure/cable{
 	d1 = 1;
@@ -27581,14 +27552,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tcommsat/chamber)
-"ehL" = (
-/obj/floor_decal/corner/green/border{
-	dir = 10
-	},
-/turf/simulated/floor/reinforced{
-	map_airless = 1
-	},
-/area/space)
 "ehT" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -29824,8 +29787,7 @@
 /area/crew_quarters/visitors)
 "ezv" = (
 /obj/floor_decal/techfloor{
-	dir = 6;
-	icon_state = "techfloor_edges"
+	dir = 6
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/seconddeck/aftstarboard)
@@ -30497,8 +30459,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
@@ -31790,8 +31751,7 @@
 /area/bridge/marine_room)
 "eOb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -33525,8 +33485,7 @@
 /area/hydroponics)
 "fcN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -33622,7 +33581,6 @@
 /obj/machinery/shield_diffuser,
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
-	icon_state = "closed";
 	id_tag = "solar_bridge_port_outer";
 	locked = 1;
 	name = "Engineering External Access"
@@ -34290,8 +34248,7 @@
 	dir = 4
 	},
 /obj/floor_decal/techfloor{
-	dir = 6;
-	icon_state = "techfloor_edges"
+	dir = 6
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
@@ -35810,8 +35767,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
@@ -36021,8 +35977,7 @@
 /area/maintenance/firstdeck/centralport)
 "fwu" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 4;
-	icon_state = "bordercolorhalf"
+	dir = 4
 	},
 /obj/floor_decal/corner/yellow{
 	dir = 9
@@ -36070,8 +36025,7 @@
 /area/crew_quarters/heads/office/hop)
 "fwJ" = (
 /obj/floor_decal/corner/red/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/bridge/lobby)
@@ -36289,8 +36243,7 @@
 /area/rnd/misc_lab)
 "fyW" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
@@ -36929,8 +36882,7 @@
 /area/engineering/hardstorage)
 "fEy" = (
 /obj/floor_decal/corner/red/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/floor_decal/borderfloorblack/corner{
 	dir = 4
@@ -37186,8 +37138,7 @@
 	},
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/aftstarboard)
@@ -38210,12 +38161,10 @@
 "fNa" = (
 /obj/machinery/vending/cola,
 /obj/floor_decal/corner/red/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/floor_decal/corner/red{
-	dir = 6;
-	icon_state = "corner_white"
+	dir = 6
 	},
 /obj/machinery/power/apc{
 	dir = 4;
@@ -39120,8 +39069,7 @@
 "fUJ" = (
 /obj/floor_decal/industrial/warning/corner,
 /obj/floor_decal/industrial/warning/corner{
-	dir = 1;
-	icon_state = "warningcorner"
+	dir = 1
 	},
 /turf/simulated/floor/reinforced{
 	map_airless = 1
@@ -39138,8 +39086,7 @@
 /area/maintenance/firstdeck/centralport)
 "fUO" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /turf/simulated/floor/reinforced,
 /area/engineering/atmos/storage)
@@ -40290,8 +40237,7 @@
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/waterstore)
@@ -40893,7 +40839,6 @@
 	dir = 8
 	},
 /obj/floor_decal/corner/green/border{
-	icon_state = "bordercolor";
 	dir = 8
 	},
 /obj/floor_decal/borderfloorblack/corner2{
@@ -43136,8 +43081,7 @@
 /area/hallway/primary/seconddeck/center)
 "gDL" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/engineering/atmos)
@@ -44736,8 +44680,7 @@
 	dir = 8
 	},
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 4;
-	icon_state = "corner_techfloor_grid"
+	dir = 4
 	},
 /obj/floor_decal/techfloor/orange/corner{
 	dir = 4
@@ -45578,8 +45521,7 @@
 	icon_state = "2-4"
 	},
 /obj/floor_decal/techfloor{
-	dir = 10;
-	icon_state = "techfloor_edges"
+	dir = 10
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
@@ -46105,8 +46047,7 @@
 /area/crew_quarters/galley)
 "gZZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -48613,7 +48554,6 @@
 /area/medical/virology/atmos)
 "hvZ" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/floor_decal/corner/paleblue/border,
@@ -49445,8 +49385,7 @@
 "hBS" = (
 /obj/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /obj/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/techfloor,
@@ -49644,8 +49583,7 @@
 	icon_state = "4-8"
 	},
 /obj/floor_decal/industrial/warning/corner{
-	dir = 4;
-	icon_state = "warningcorner"
+	dir = 4
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
@@ -50530,7 +50468,6 @@
 	dir = 1
 	},
 /obj/floor_decal/industrial/warning/corner{
-	icon_state = "warningcorner";
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
@@ -51469,12 +51406,10 @@
 "hTO" = (
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced/tinted{
-	dir = 8;
-	icon_state = "rwindow"
+	dir = 8
 	},
 /obj/structure/window/reinforced/tinted{
-	dir = 1;
-	icon_state = "rwindow"
+	dir = 1
 	},
 /obj/machinery/button/blast_door{
 	id_tag = "infimary_hall_lockdown";
@@ -53509,7 +53444,6 @@
 /area/medical/locker)
 "ike" = (
 /obj/machinery/door/airlock/highsecurity{
-	icon_state = "closed";
 	locked = 1;
 	name = "AI Core Access"
 	},
@@ -54101,8 +54035,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/aft)
@@ -54279,7 +54212,6 @@
 	dir = 4
 	},
 /obj/floor_decal/industrial/warning/corner{
-	icon_state = "warningcorner";
 	dir = 8
 	},
 /obj/floor_decal/industrial/warning/corner{
@@ -54543,8 +54475,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /obj/structure/cable/green{
 	d1 = 1;
@@ -55008,7 +54939,6 @@
 /area/security/sierra/interrogation)
 "ixA" = (
 /obj/floor_decal/corner/green/border{
-	icon_state = "bordercolor";
 	dir = 10
 	},
 /turf/simulated/floor/reinforced{
@@ -56339,8 +56269,7 @@
 /area/maintenance/firstdeck/forestarboard)
 "iIm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable{
 	d1 = 1;
@@ -57378,7 +57307,6 @@
 "iPQ" = (
 /obj/floor_decal/corner/paleblue/border,
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -58574,8 +58502,7 @@
 /area/vacant/sauna)
 "iYT" = (
 /obj/floor_decal/industrial/warning/corner{
-	dir = 1;
-	icon_state = "warningcorner"
+	dir = 1
 	},
 /obj/floor_decal/industrial/warning/corner{
 	dir = 8
@@ -58883,8 +58810,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/seconddeck/aftport)
@@ -61959,8 +61885,7 @@
 /area/rnd/xenobiology/level1)
 "jCd" = (
 /obj/machinery/atmospherics/pipe/simple/visible/green{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/machinery/meter,
 /turf/simulated/floor/tiled/techfloor,
@@ -62004,7 +61929,6 @@
 	autoclose = 0;
 	frequency = 1379;
 	heat_proof = 1;
-	icon_state = "closed";
 	id_tag = "incinerator_airlock_interior";
 	locked = 1;
 	name = "Mixing Room Interior Airlock"
@@ -62964,8 +62888,7 @@
 /area/maintenance/firstdeck/foreport)
 "jKL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /obj/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
@@ -63673,8 +63596,7 @@
 	pixel_y = 24
 	},
 /obj/floor_decal/techfloor{
-	dir = 5;
-	icon_state = "techfloor_edges"
+	dir = 5
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/vacant/storage)
@@ -63777,7 +63699,6 @@
 	dir = 10
 	},
 /obj/floor_decal/corner/green/border{
-	icon_state = "bordercolor";
 	dir = 10
 	},
 /obj/floor_decal/borderfloorblack/corner2{
@@ -66896,7 +66817,6 @@
 /area/storage/eva)
 "kog" = (
 /obj/machinery/door/airlock/hatch{
-	icon_state = "closed";
 	id_tag = "prototype_access_hatch";
 	locked = 1
 	},
@@ -67206,8 +67126,7 @@
 /area/crew_quarters/heads/office/cmo/cobed)
 "kqy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -67293,8 +67212,7 @@
 	},
 /obj/floor_decal/industrial/warning/corner,
 /obj/floor_decal/industrial/warning/corner{
-	dir = 1;
-	icon_state = "warningcorner"
+	dir = 1
 	},
 /turf/simulated/floor/reinforced{
 	map_airless = 1
@@ -69872,8 +69790,7 @@
 	icon_state = "robotics"
 	},
 /obj/floor_decal/techfloor{
-	dir = 6;
-	icon_state = "techfloor_edges"
+	dir = 6
 	},
 /obj/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/techfloor,
@@ -70332,8 +70249,7 @@
 	},
 /obj/floor_decal/industrial/warning/corner,
 /obj/floor_decal/industrial/warning/corner{
-	dir = 1;
-	icon_state = "warningcorner"
+	dir = 1
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/turret_protected/ai_teleport)
@@ -71006,12 +70922,7 @@
 /obj/random/drinkbottle,
 /obj/random/maintenance,
 /obj/random/maintenance,
-/obj/random/single{
-	icon = 'icons/obj/playing_cards.dmi';
-	icon_state = "deck";
-	name = "randomly spawned deck of cards";
-	spawn_object = /obj/item/deck
-	},
+/obj/random/single/playing_cards,
 /obj/machinery/button/blast_door{
 	id_tag = "comissary_shutters";
 	name = "Counter Shutters";
@@ -71110,8 +71021,7 @@
 /area/shuttle/petrov/gas)
 "kTu" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/rnd/xenobiology/xenoflora)
@@ -71855,8 +71765,7 @@
 "laz" = (
 /obj/item/stool/padded,
 /obj/floor_decal/corner/yellow/half{
-	dir = 4;
-	icon_state = "bordercolorhalf"
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/suplocker_room)
@@ -73229,8 +73138,7 @@
 	dir = 4
 	},
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 8;
-	icon_state = "corner_techfloor_grid"
+	dir = 8
 	},
 /obj/floor_decal/techfloor/corner{
 	dir = 8
@@ -74191,8 +74099,7 @@
 /area/hallway/primary/firstdeck/fore)
 "lty" = (
 /obj/floor_decal/techfloor{
-	dir = 6;
-	icon_state = "techfloor_edges"
+	dir = 6
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/firstdeck/aftport)
@@ -74748,7 +74655,6 @@
 /area/space)
 "lxj" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/floor_decal/corner/paleblue/border,
@@ -74851,7 +74757,6 @@
 "lyu" = (
 /obj/floor_decal/corner/paleblue/border,
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/monotile,
@@ -75364,8 +75269,7 @@
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/structure/cable/green{
 	d1 = 1;
@@ -75918,8 +75822,7 @@
 /area/hallway/primary/firstdeck/center)
 "lFH" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /obj/wallframe_spawn/reinforced/no_grille,
 /turf/simulated/floor/plating,
@@ -76736,8 +76639,7 @@
 /area/security/sierra/hallway/aft)
 "lLu" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 4;
-	icon_state = "bordercolorhalf"
+	dir = 4
 	},
 /obj/machinery/firealarm{
 	dir = 4;
@@ -76888,7 +76790,6 @@
 /area/turret_protected/ai)
 "lMR" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/floor_decal/corner/paleblue/bordercorner{
@@ -77205,8 +77106,7 @@
 /area/storage/primary)
 "lOT" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/incinerator)
@@ -77332,8 +77232,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -79394,8 +79293,7 @@
 	},
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/aftstarboard)
@@ -82763,8 +82661,7 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/red{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /obj/machinery/power/apc/super/critical{
 	dir = 1;
@@ -82772,8 +82669,7 @@
 	pixel_y = 24
 	},
 /obj/floor_decal/techfloor{
-	dir = 8;
-	icon_state = "techfloor_edges"
+	dir = 8
 	},
 /obj/floor_decal/industrial/warning{
 	dir = 8
@@ -85089,8 +84985,7 @@
 /area/rnd/misc_lab)
 "ncQ" = (
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 4;
-	icon_state = "corner_techfloor_grid"
+	dir = 4
 	},
 /obj/floor_decal/techfloor/orange/corner{
 	dir = 4
@@ -85138,8 +85033,7 @@
 "ndj" = (
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced/tinted{
-	dir = 8;
-	icon_state = "rwindow"
+	dir = 8
 	},
 /obj/structure/window/reinforced,
 /obj/item/paper_bin{
@@ -85698,8 +85592,7 @@
 	icon_state = "4-8"
 	},
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 4;
-	icon_state = "corner_techfloor_grid"
+	dir = 4
 	},
 /obj/floor_decal/techfloor/corner{
 	dir = 4
@@ -87137,8 +87030,7 @@
 /area/rnd/servers)
 "nsf" = (
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 8;
-	icon_state = "corner_techfloor_grid"
+	dir = 8
 	},
 /obj/floor_decal/techfloor/corner{
 	dir = 8
@@ -87955,8 +87847,7 @@
 /area/quartermaster/office/post)
 "nyw" = (
 /obj/floor_decal/techfloor{
-	dir = 6;
-	icon_state = "techfloor_edges"
+	dir = 6
 	},
 /obj/machinery/constructable_frame/machine_frame,
 /turf/simulated/floor/tiled/techfloor,
@@ -88076,8 +87967,7 @@
 	},
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/firstdeck/aftport)
@@ -88868,7 +88758,6 @@
 	dir = 1
 	},
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/item/reagent_containers/food/snacks/candy/donor{
@@ -89370,7 +89259,6 @@
 /obj/machinery/door/firedoor,
 /obj/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/hatch{
-	icon_state = "closed";
 	id_tag = "tox_airlock_exterior";
 	locked = 1
 	},
@@ -89674,8 +89562,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fourthdeck/aft)
@@ -92308,8 +92195,7 @@
 	icon_state = "1-4"
 	},
 /obj/floor_decal/techfloor{
-	dir = 10;
-	icon_state = "techfloor_edges"
+	dir = 10
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
@@ -93041,8 +92927,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/firstdeck/aft)
@@ -93460,7 +93345,6 @@
 /area/crew_quarters/heads/office/hos)
 "oto" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/structure/hygiene/sink{
@@ -94403,8 +94287,7 @@
 	},
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/machinery/alarm{
 	dir = 1;
@@ -94414,8 +94297,7 @@
 /area/maintenance/seconddeck/aftstarboard)
 "oBh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -94730,8 +94612,7 @@
 /area/quartermaster/expedition)
 "oDO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -94962,7 +94843,6 @@
 "oFb" = (
 /obj/floor_decal/corner/paleblue/border,
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/machinery/firealarm{
@@ -96069,8 +95949,7 @@
 /area/medical/maintenance_equipstorage)
 "oOu" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/machinery/photocopier,
 /obj/item/device/radio/intercom{
@@ -98478,8 +98357,7 @@
 	dir = 4
 	},
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/floor_decal/steeldecal/steel_decals4{
 	dir = 1
@@ -99354,8 +99232,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/plating,
@@ -99500,8 +99377,7 @@
 /area/medical/surgery/second)
 "pnE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -99701,8 +99577,7 @@
 /area/maintenance/firstdeck/centralstarboard)
 "ppn" = (
 /obj/floor_decal/techfloor{
-	dir = 10;
-	icon_state = "techfloor_edges"
+	dir = 10
 	},
 /obj/structure/closet/secure_closet/personal,
 /obj/floor_decal/industrial/outline/grey,
@@ -100043,8 +99918,7 @@
 /area/medical/virology/lab)
 "prP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -100351,8 +100225,7 @@
 	},
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /turf/simulated/floor/plating,
 /area/thruster/d1port)
@@ -102872,8 +102745,7 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/waterstore)
@@ -103311,8 +103183,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /turf/simulated/floor/plating,
 /area/quartermaster/hangar)
@@ -105584,8 +105455,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/machinery/meter,
 /turf/simulated/floor/tiled/techfloor,
@@ -105977,8 +105847,7 @@
 /area/hallway/primary/bridgedeck/aft)
 "qoq" = (
 /obj/floor_decal/techfloor{
-	dir = 10;
-	icon_state = "techfloor_edges"
+	dir = 10
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/firstdeck/aftport)
@@ -106205,8 +106074,7 @@
 /area/maintenance/firstdeck/forestarboard)
 "qqj" = (
 /obj/floor_decal/industrial/warning/corner{
-	dir = 1;
-	icon_state = "warningcorner"
+	dir = 1
 	},
 /obj/floor_decal/industrial/warning/corner,
 /turf/simulated/floor/reinforced{
@@ -106256,7 +106124,6 @@
 /area/maintenance/firstdeck/centralstarboard)
 "qqN" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/floor_decal/corner/paleblue/border,
@@ -107355,7 +107222,6 @@
 /area/crew_quarters/heads/office/iaa/cobed)
 "qAw" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/floor_decal/corner/paleblue/bordercorner{
@@ -108655,7 +108521,6 @@
 "qLi" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
-	icon_state = "closed";
 	id_tag = "ai_core_outer";
 	locked = 1;
 	name = "AI Core Internal Access"
@@ -109095,8 +108960,7 @@
 /area/maintenance/firstdeck/centralstarboard)
 "qNV" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -109955,7 +109819,6 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/engineering{
-	icon_state = "closed";
 	name = "Bridge Solar Access"
 	},
 /obj/structure/cable{
@@ -110413,8 +110276,7 @@
 	dir = 8
 	},
 /obj/floor_decal/techfloor{
-	dir = 10;
-	icon_state = "techfloor_edges"
+	dir = 10
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
@@ -110425,8 +110287,7 @@
 /area/solar/bridge_starboard)
 "qYL" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/structure/table/standard,
 /obj/item/reagent_containers/food/drinks/glass2/coffeecup/one{
@@ -111014,8 +110875,7 @@
 /obj/decal/cleanable/dirt,
 /obj/structure/catwalk,
 /obj/floor_decal/industrial/warning/corner{
-	dir = 8;
-	icon_state = "warningcorner"
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/seconddeck)
@@ -112581,8 +112441,7 @@
 	dir = 4
 	},
 /obj/floor_decal/industrial/warning/corner{
-	dir = 1;
-	icon_state = "warningcorner"
+	dir = 1
 	},
 /obj/floor_decal/corner/purple,
 /turf/simulated/floor/tiled,
@@ -114676,8 +114535,7 @@
 	dir = 4
 	},
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 8;
-	icon_state = "corner_techfloor_grid"
+	dir = 8
 	},
 /obj/floor_decal/techfloor/corner{
 	dir = 8
@@ -114997,8 +114855,7 @@
 	dir = 10
 	},
 /obj/floor_decal/techfloor{
-	dir = 8;
-	icon_state = "techfloor_edges"
+	dir = 8
 	},
 /obj/floor_decal/industrial/warning{
 	dir = 8
@@ -115020,7 +114877,6 @@
 /obj/floor_decal/corner/lightgrey/mono,
 /obj/floor_decal/corner/black/mono,
 /obj/floor_decal/corner/green/border{
-	icon_state = "bordercolor";
 	dir = 10
 	},
 /obj/floor_decal/corner/green/bordercorner{
@@ -116060,8 +115916,7 @@
 "rRf" = (
 /obj/machinery/recharge_station,
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/floor_decal/corner/yellow{
 	dir = 6
@@ -116961,8 +116816,7 @@
 	dir = 8
 	},
 /obj/floor_decal/techfloor{
-	dir = 10;
-	icon_state = "techfloor_edges"
+	dir = 10
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/firstdeck/aftport)
@@ -117095,8 +116949,7 @@
 /area/crew_quarters/cafe/upper)
 "rYW" = (
 /obj/floor_decal/techfloor{
-	dir = 6;
-	icon_state = "techfloor_edges"
+	dir = 6
 	},
 /obj/structure/closet/crate/freezer,
 /obj/random/medical,
@@ -118585,8 +118438,7 @@
 	},
 /obj/machinery/navbeacon/sierra/SD_fore2,
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 8;
-	icon_state = "corner_techfloor_grid"
+	dir = 8
 	},
 /obj/floor_decal/techfloor/orange/corner{
 	dir = 8
@@ -120908,8 +120760,7 @@
 	pixel_y = -22
 	},
 /obj/floor_decal/techfloor{
-	dir = 6;
-	icon_state = "techfloor_edges"
+	dir = 6
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
@@ -122441,8 +122292,7 @@
 	},
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /turf/simulated/floor/plating,
 /area/thruster/d1starboard)
@@ -123074,8 +122924,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/floor_decal/techfloor/orange{
 	dir = 4
@@ -123906,8 +123755,7 @@
 "sXB" = (
 /obj/floor_decal/corner/green/three_quarters,
 /obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/structure/hygiene/sink{
 	dir = 8;
@@ -124596,7 +124444,6 @@
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/engineering{
-	icon_state = "closed";
 	name = "Bridge Solar Access"
 	},
 /obj/structure/cable{
@@ -125882,8 +125729,7 @@
 "tpf" = (
 /obj/machinery/atmospherics/pipe/manifold/visible,
 /obj/floor_decal/techfloor{
-	dir = 10;
-	icon_state = "techfloor_edges"
+	dir = 10
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/thirddeck/port)
@@ -128552,8 +128398,7 @@
 /area/hallway/primary/seconddeck/aft)
 "tKH" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary,
 /obj/floor_decal/industrial/outline/yellow,
@@ -129373,7 +129218,6 @@
 /area/hallway/primary/thirddeck/aft_stairwell)
 "tRI" = (
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /obj/floor_decal/corner/paleblue/border,
@@ -129880,8 +129724,7 @@
 /area/hallway/primary/fourthdeck/center)
 "tUS" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 4;
-	icon_state = "bordercolorhalf"
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/deckofficer)
@@ -130285,8 +130128,7 @@
 /area/bridge/adjutants)
 "tXY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -130370,8 +130212,7 @@
 	},
 /obj/catwalk_plated,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/structure/cable/green{
 	d1 = 1;
@@ -130644,8 +130485,7 @@
 	},
 /obj/random/junk,
 /obj/floor_decal/techfloor{
-	dir = 5;
-	icon_state = "techfloor_edges"
+	dir = 5
 	},
 /obj/machinery/power/apc{
 	dir = 4;
@@ -132782,7 +132622,6 @@
 	},
 /obj/machinery/door/airlock/multi_tile/glass/research{
 	dir = 8;
-	icon_state = "closed";
 	id_tag = "PetrovAccess";
 	name = "Petrov Access"
 	},
@@ -133413,8 +133252,7 @@
 /area/rnd/storage)
 "uzw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /obj/structure/cable/green{
 	d1 = 2;
@@ -135869,11 +135707,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fourthdeck/foreport)
 "uSJ" = (
-/obj/effect{
-	dir = 4;
-	icon = 'icons/obj/structures/stairs.dmi';
-	name = "stairs";
-	icon_state = "above"
+/obj/floor_decal/stairs{
+	dir = 4
 	},
 /obj/floor_decal/spline/fancy/black{
 	dir = 1
@@ -136436,8 +136271,7 @@
 	dir = 1
 	},
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 8;
-	icon_state = "corner_techfloor_grid"
+	dir = 8
 	},
 /obj/floor_decal/techfloor/corner{
 	dir = 8;
@@ -137397,12 +137231,7 @@
 	dir = 1
 	},
 /obj/random/maintenance,
-/obj/random/single{
-	icon = 'icons/obj/playing_cards.dmi';
-	icon_state = "deck";
-	name = "randomly spawned deck of cards";
-	spawn_object = /obj/item/deck
-	},
+/obj/random/single/playing_cards,
 /obj/machinery/door/window/westleft{
 	name = "Commissary rack";
 	req_access = newlist()
@@ -139901,7 +139730,6 @@
 	},
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
-	icon_state = "closed";
 	id_tag = "solar_bridge_port_inner";
 	locked = 1;
 	name = "Engineering External Access"
@@ -141430,7 +141258,6 @@
 	autoclose = 0;
 	frequency = 1379;
 	heat_proof = 1;
-	icon_state = "closed";
 	id_tag = "incinerator_airlock_exterior";
 	locked = 1;
 	name = "Mixing Room Exterior Airlock"
@@ -141629,8 +141456,7 @@
 /area/thruster/d3port)
 "vMB" = (
 /obj/floor_decal/corner/red/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/floor_decal/borderfloorblack/corner,
 /obj/floor_decal/industrial/danger/corner,
@@ -142114,7 +141940,6 @@
 	},
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
-	icon_state = "closed";
 	id_tag = "solar_bridge_inner";
 	locked = 1;
 	name = "Engineering External Access"
@@ -142176,8 +142001,7 @@
 /area/vacant/utility)
 "vQW" = (
 /obj/floor_decal/corner/red/half{
-	dir = 4;
-	icon_state = "bordercolorhalf"
+	dir = 4
 	},
 /obj/floor_decal/corner/red{
 	dir = 9
@@ -142579,12 +142403,7 @@
 /area/quartermaster/hangar_stairs/upper)
 "vTC" = (
 /obj/structure/table/standard,
-/obj/random/single{
-	icon = 'icons/obj/playing_cards.dmi';
-	icon_state = "deck";
-	name = "randomly spawned deck of cards";
-	spawn_object = /obj/item/deck
-	},
+/obj/random/single/playing_cards,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -143269,7 +143088,6 @@
 "vXJ" = (
 /obj/floor_decal/corner/paleblue/border,
 /obj/floor_decal/corner/paleblue/border{
-	icon_state = "bordercolor";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/monotile,
@@ -143432,8 +143250,7 @@
 /area/hallway/infirmary)
 "vYV" = (
 /obj/floor_decal/corner_techfloor_grid{
-	dir = 8;
-	icon_state = "corner_techfloor_grid"
+	dir = 8
 	},
 /obj/floor_decal/techfloor/orange/corner{
 	dir = 8
@@ -145242,7 +145059,6 @@
 "wnT" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
-	icon_state = "closed";
 	id_tag = "petrov_shuttle_outer";
 	name = "Petrov Exterior Access"
 	},
@@ -145293,8 +145109,7 @@
 /area/crew_quarters/cafe/upper)
 "wod" = (
 /obj/floor_decal/techfloor{
-	dir = 5;
-	icon_state = "techfloor_edges"
+	dir = 5
 	},
 /obj/floor_decal/corner/red{
 	dir = 8
@@ -145386,8 +145201,7 @@
 /area/engineering/gravitaional_generator)
 "wpa" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 4;
-	icon_state = "bordercolorhalf"
+	dir = 4
 	},
 /obj/machinery/light{
 	dir = 4
@@ -145986,8 +145800,7 @@
 	dir = 8
 	},
 /obj/floor_decal/techfloor{
-	dir = 6;
-	icon_state = "techfloor_edges"
+	dir = 6
 	},
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
@@ -146163,8 +145976,7 @@
 /area/security/sierra/hallway/aft)
 "wvp" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/floor_decal/corner/yellow{
 	dir = 6
@@ -146545,8 +146357,7 @@
 /obj/structure/catwalk,
 /obj/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -146618,8 +146429,7 @@
 /area/engineering/engine_room)
 "wzi" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/structure/bed/chair/office/brown{
 	dir = 1
@@ -147116,11 +146926,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/thirddeck/port)
 "wEw" = (
-/obj/effect{
-	dir = 4;
-	icon = 'icons/obj/structures/stairs.dmi';
-	name = "stairs";
-	icon_state = "above"
+/obj/floor_decal/stairs{
+	dir = 4
 	},
 /turf/simulated/floor/wood/bamboo,
 /area/crew_quarters/garden_room)
@@ -147965,8 +147772,7 @@
 /obj/item/folder/white,
 /obj/item/folder/white,
 /obj/structure/window/reinforced/tinted{
-	dir = 1;
-	icon_state = "rwindow"
+	dir = 1
 	},
 /obj/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -148205,8 +148011,7 @@
 /area/maintenance/seconddeck/starboard)
 "wPr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/blue{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/floor_decal/industrial/warning{
 	dir = 8
@@ -148245,12 +148050,10 @@
 /area/bridge/marine_room)
 "wPK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/blue{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
-	icon_state = "closed";
 	id_tag = "ai_core_inner";
 	locked = 1;
 	name = "AI Internal Access"
@@ -148487,8 +148290,7 @@
 /area/thruster/d3port)
 "wRA" = (
 /obj/floor_decal/corner/yellow/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/machinery/light{
 	dir = 8
@@ -149250,8 +149052,7 @@
 /area/crew_quarters/heads/office/iaa)
 "wYN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 5;
-	icon_state = "intact"
+	dir = 5
 	},
 /obj/floor_decal/techfloor/orange{
 	dir = 9
@@ -149492,7 +149293,6 @@
 /area/bridge/hallway)
 "xaM" = (
 /obj/machinery/atmospherics/unary/freezer{
-	icon_state = "freezer";
 	dir = 4
 	},
 /obj/floor_decal/corner/green/half{
@@ -149521,7 +149321,6 @@
 	dir = 4
 	},
 /obj/floor_decal/industrial/warning/corner{
-	icon_state = "warningcorner";
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
@@ -150778,7 +150577,6 @@
 "xkk" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
-	icon_state = "closed";
 	id_tag = "ai_bridge_inner";
 	locked = 1;
 	name = "Engineering External Access"
@@ -151244,7 +151042,6 @@
 /obj/machinery/shield_diffuser,
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
-	icon_state = "closed";
 	id_tag = "solar_bridge_outer";
 	locked = 1;
 	name = "Engineering External Access"
@@ -151916,8 +151713,7 @@
 	icon_state = "pipe-c"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -152098,13 +151894,11 @@
 /area/hallway/primary/seconddeck/fore)
 "xvT" = (
 /obj/floor_decal/industrial/warning/corner{
-	dir = 8;
-	icon_state = "warningcorner"
+	dir = 8
 	},
 /obj/floor_decal/industrial/warning/corner,
 /obj/floor_decal/industrial/warning/corner{
-	dir = 1;
-	icon_state = "warningcorner"
+	dir = 1
 	},
 /turf/simulated/floor/reinforced{
 	map_airless = 1
@@ -153067,8 +152861,7 @@
 /area/maintenance/seconddeck/port)
 "xDK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4;
-	icon_state = "intact"
+	dir = 4
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -153088,8 +152881,7 @@
 /area/hallway/primary/thirddeck/fore)
 "xDT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -153531,7 +153323,6 @@
 	},
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
-	icon_state = "closed";
 	id_tag = "ai_bridge_outer";
 	locked = 1;
 	name = "Engineering External Access"
@@ -154142,12 +153933,10 @@
 /area/quartermaster/hangar)
 "xLQ" = (
 /obj/floor_decal/corner/red/half{
-	dir = 8;
-	icon_state = "bordercolorhalf"
+	dir = 8
 	},
 /obj/floor_decal/corner/red{
-	dir = 6;
-	icon_state = "corner_white"
+	dir = 6
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -154409,8 +154198,7 @@
 /area/hallway/primary/bridgedeck/center)
 "xNI" = (
 /obj/structure/reagent_dispensers/water_cooler{
-	dir = 1;
-	icon_state = "water_cooler"
+	dir = 1
 	},
 /turf/simulated/floor/wood/walnut,
 /area/crew_quarters/lounge)
@@ -155163,7 +154951,6 @@
 	pixel_x = -2
 	},
 /obj/structure/curtain/open/shower{
-	icon_state = "closed";
 	opacity = 1
 	},
 /obj/item/bikehorn/rubberducky,
@@ -155524,8 +155311,7 @@
 	},
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 6;
-	icon_state = "intact"
+	dir = 6
 	},
 /turf/simulated/floor/plating,
 /area/thruster/d3starboard)
@@ -155989,8 +155775,7 @@
 	},
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 9;
-	icon_state = "intact"
+	dir = 9
 	},
 /obj/structure/cable/green{
 	d1 = 1;
@@ -156433,8 +156218,7 @@
 /area/hallway/primary/seconddeck/center)
 "ydg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/structure/cable{
 	d1 = 4;
@@ -157165,7 +156949,6 @@
 "yhZ" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1379;
-	icon_state = "closed";
 	id_tag = "ai_core_outer";
 	locked = 1;
 	name = "AI Core Internal Access"
@@ -282646,7 +282429,7 @@ lko
 lko
 lko
 tSD
-ehL
+ixA
 rtT
 rtT
 rtT
@@ -297556,7 +297339,7 @@ rtT
 rtT
 aTh
 xdF
-ehL
+ixA
 lCZ
 aTh
 yad
@@ -297620,7 +297403,7 @@ fOP
 tSD
 tSD
 tSD
-ehL
+ixA
 gSd
 rtT
 rtT