diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm
index bf67d74263d1..3b022f161b5d 100644
--- a/_maps/map_files/GaxStation/GaxStation.dmm
+++ b/_maps/map_files/GaxStation/GaxStation.dmm
@@ -2373,6 +2373,7 @@
 /obj/effect/turf_decal/trimline/red/corner{
 	dir = 4
 	},
+/obj/effect/turf_decal/ramp_middle,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "bfb" = (
@@ -5499,8 +5500,11 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "cES" = (
+/obj/effect/turf_decal/ramp_middle{
+	dir = 4
+	},
 /turf/open/floor/plasteel/stairs/goon/dark_stairs_wide{
-	dir = 8
+	dir = 4
 	},
 /area/bridge)
 "cEZ" = (
@@ -6113,6 +6117,9 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 1
 	},
+/obj/effect/turf_decal/ramp_corner{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "cVa" = (
@@ -6167,6 +6174,9 @@
 /obj/effect/turf_decal/trimline/secred/filled/corner/lower{
 	dir = 1
 	},
+/obj/effect/turf_decal/ramp_middle{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "cWe" = (
@@ -7304,6 +7314,9 @@
 /area/security/checkpoint/medical)
 "dxA" = (
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower,
+/obj/effect/turf_decal/ramp_middle{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "dxH" = (
@@ -7515,6 +7528,13 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel/white,
 /area/science/research)
+"dDw" = (
+/obj/effect/turf_decal/trimline/white/filled/corner/lower{
+	dir = 1
+	},
+/obj/effect/turf_decal/ramp_middle,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "dDx" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -13152,6 +13172,12 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 6
 	},
+/obj/effect/turf_decal/ramp_middle{
+	dir = 8
+	},
+/obj/effect/turf_decal/ramp_middle{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "gfu" = (
@@ -14466,6 +14492,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/brig)
+"gMF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/ramp_middle,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "gMU" = (
 /obj/effect/turf_decal/trimline/secred/filled/line/lower,
 /turf/open/floor/plasteel,
@@ -14593,7 +14628,12 @@
 /obj/effect/turf_decal/trimline/red/arrow_ccw{
 	dir = 4
 	},
-/turf/open/floor/plasteel/stairs/goon/dark_stairs_alone,
+/obj/effect/turf_decal/ramp_middle{
+	dir = 1
+	},
+/turf/open/floor/plasteel/stairs/goon/dark_stairs_alone{
+	dir = 1
+	},
 /area/hallway/secondary/entry)
 "gRV" = (
 /obj/machinery/atmospherics/pipe/layer_manifold{
@@ -15203,6 +15243,9 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/effect/turf_decal/ramp_corner{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "hjs" = (
@@ -20374,6 +20417,9 @@
 /obj/effect/turf_decal/trimline/secred/warning/lower{
 	dir = 4
 	},
+/obj/effect/turf_decal/ramp_corner{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "jHj" = (
@@ -20996,7 +21042,12 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/stairs/goon/stairs_middle,
+/obj/effect/turf_decal/ramp_middle{
+	dir = 1
+	},
+/turf/open/floor/plasteel/stairs/goon/stairs_middle{
+	dir = 1
+	},
 /area/hallway/secondary/entry)
 "jXr" = (
 /obj/effect/spawner/structure/window/reinforced/shutter,
@@ -21140,6 +21191,9 @@
 /obj/effect/turf_decal/trimline/white/filled/line/lower{
 	dir = 1
 	},
+/obj/effect/turf_decal/ramp_corner{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "kbY" = (
@@ -24555,8 +24609,11 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "lMp" = (
+/obj/effect/turf_decal/ramp_middle{
+	dir = 4
+	},
 /turf/open/floor/plasteel/stairs/goon/dark_stairs_wide2{
-	dir = 8
+	dir = 4
 	},
 /area/bridge)
 "lMu" = (
@@ -24859,6 +24916,10 @@
 	},
 /turf/open/floor/plasteel/freezer,
 /area/crew_quarters/toilet)
+"lSG" = (
+/obj/effect/turf_decal/ramp_middle,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "lSI" = (
 /obj/effect/decal/cleanable/glass,
 /obj/structure/disposalpipe/segment,
@@ -24967,6 +25028,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/ramp_middle,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "lVT" = (
@@ -27476,8 +27538,11 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/ramp_middle{
+	dir = 4
+	},
 /turf/open/floor/plasteel/stairs/goon/dark_stairs_wide2{
-	dir = 8
+	dir = 4
 	},
 /area/bridge)
 "nlR" = (
@@ -28666,6 +28731,9 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{
 	dir = 4
 	},
+/obj/effect/turf_decal/ramp_middle{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "nMW" = (
@@ -30635,6 +30703,9 @@
 /obj/effect/turf_decal/trimline/secred/filled/corner/lower{
 	dir = 4
 	},
+/obj/effect/turf_decal/ramp_corner{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "oRt" = (
@@ -31099,6 +31170,9 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 4
 	},
+/obj/effect/turf_decal/ramp_middle{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "pgd" = (
@@ -34358,6 +34432,9 @@
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower,
+/obj/effect/turf_decal/ramp_middle{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "qJl" = (
@@ -34572,7 +34649,9 @@
 /obj/effect/turf_decal/ramp_middle{
 	dir = 1
 	},
-/turf/open/floor/plasteel/stairs/goon/stairs_middle,
+/turf/open/floor/plasteel/stairs/goon/stairs_middle{
+	dir = 1
+	},
 /area/hydroponics/garden)
 "qQC" = (
 /obj/machinery/navbeacon{
@@ -34691,6 +34770,9 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "qSn" = (
+/obj/effect/turf_decal/ramp_middle{
+	dir = 1
+	},
 /turf/open/floor/plasteel/stairs/goon/stairs_wide{
 	dir = 1
 	},
@@ -35174,6 +35256,10 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 5
 	},
+/obj/effect/turf_decal/ramp_middle{
+	dir = 8
+	},
+/obj/effect/turf_decal/ramp_middle,
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "rdP" = (
@@ -37968,6 +38054,9 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 4
 	},
+/obj/effect/turf_decal/ramp_corner{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "sup" = (
@@ -43461,6 +43550,9 @@
 /obj/structure/railing,
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower,
+/obj/effect/turf_decal/ramp_corner{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "vgJ" = (
@@ -45515,6 +45607,9 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{
 	dir = 1
 	},
+/obj/effect/turf_decal/ramp_middle{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/bridge)
 "wgK" = (
@@ -45596,7 +45691,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/stairs/goon/stairs_alone{
-	dir = 8
+	dir = 4
 	},
 /area/escapepodbay)
 "wiA" = (
@@ -46050,6 +46145,9 @@
 /obj/effect/turf_decal/trimline/red/arrow_ccw{
 	dir = 1
 	},
+/obj/effect/turf_decal/ramp_middle{
+	dir = 4
+	},
 /turf/open/floor/plasteel/stairs/goon/dark_stairs_alone{
 	dir = 4
 	},
@@ -47203,6 +47301,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
 	},
+/obj/effect/turf_decal/ramp_middle,
+/obj/effect/turf_decal/ramp_middle{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "wYp" = (
@@ -48159,6 +48261,9 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/storage)
 "xus" = (
+/obj/effect/turf_decal/ramp_middle{
+	dir = 1
+	},
 /turf/open/floor/plasteel/stairs/goon/stairs2_wide{
 	dir = 1
 	},
@@ -49395,6 +49500,14 @@
 "xXn" = (
 /turf/closed/wall/r_wall,
 /area/security/detectives_office)
+"xXs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/ramp_corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
 "xXt" = (
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower,
 /turf/open/floor/plasteel,
@@ -92575,7 +92688,7 @@ vvd
 vmy
 vvd
 qSn
-nPi
+dDw
 vvd
 atx
 pnP
@@ -92832,7 +92945,7 @@ qub
 wcy
 lzE
 jWH
-lzE
+gMF
 oAE
 nVD
 kMw
@@ -93089,7 +93202,7 @@ mPt
 vvd
 vvd
 xus
-vvd
+lSG
 rRY
 atx
 pnP
@@ -94890,7 +95003,7 @@ rrI
 faQ
 btB
 wYh
-aAR
+xXs
 aAR
 blt
 aAR
diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm
index c858aaa01b93..62d27a646491 100644
--- a/_maps/map_files/IceMeta/IceMeta.dmm
+++ b/_maps/map_files/IceMeta/IceMeta.dmm
@@ -2222,10 +2222,10 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/office)
 "aHc" = (
-/obj/structure/stairs/goon/wide/right{
+/obj/effect/turf_decal/ramp_middle{
 	dir = 1
 	},
-/obj/effect/turf_decal/ramp_middle{
+/obj/structure/stairs/wide_right{
 	dir = 1
 	},
 /turf/open/floor/plating,
@@ -13008,10 +13008,10 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "dRf" = (
-/obj/structure/stairs/goon/wide/left{
+/obj/effect/turf_decal/ramp_middle{
 	dir = 1
 	},
-/obj/effect/turf_decal/ramp_middle{
+/obj/structure/stairs/wide_left{
 	dir = 1
 	},
 /turf/open/floor/plating,
@@ -32243,10 +32243,10 @@
 /turf/open/floor/plasteel/vaporwave,
 /area/storage/art)
 "jvC" = (
-/obj/structure/stairs/goon/wide/right{
+/obj/effect/turf_decal/ramp_middle{
 	dir = 1
 	},
-/obj/effect/turf_decal/ramp_middle{
+/obj/structure/stairs/wide_right{
 	dir = 1
 	},
 /turf/open/floor/plating,
@@ -45321,10 +45321,10 @@
 /turf/open/floor/plasteel/cafeteria,
 /area/mine/break_room)
 "ncA" = (
-/obj/structure/stairs/goon/wide/left{
+/obj/effect/turf_decal/ramp_middle{
 	dir = 1
 	},
-/obj/effect/turf_decal/ramp_middle{
+/obj/structure/stairs/wide_left{
 	dir = 1
 	},
 /turf/open/floor/plating,
@@ -77778,10 +77778,12 @@
 /turf/open/floor/plasteel/dark,
 /area/engine/foyer)
 "wop" = (
-/obj/structure/stairs/goon/wide,
 /obj/effect/turf_decal/ramp_middle{
 	dir = 1
 	},
+/obj/structure/stairs/wide_mid{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/mine/living_quarters)
 "wot" = (
@@ -79078,10 +79080,12 @@
 /turf/open/floor/plasteel,
 /area/quartermaster/sorting)
 "wHy" = (
-/obj/structure/stairs/goon/wide,
 /obj/effect/turf_decal/ramp_middle{
 	dir = 1
 	},
+/obj/structure/stairs/wide_mid{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/mine/abandoned)
 "wHH" = (
diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm
index 9c6225a364e5..bcf7e57fae4d 100644
--- a/code/game/objects/structures/stairs.dm
+++ b/code/game/objects/structures/stairs.dm
@@ -8,9 +8,9 @@
 
 /obj/structure/stairs
 	name = "stairs"
-	icon = 'icons/obj/stairs.dmi'
-	icon_state = "stairs"
-	layer = EMISSIVE_FLOOR_LAYER
+	icon = 'goon/icons/turfs/floors.dmi'
+	icon_state = "stairs_alone"
+	layer = BELOW_OPEN_DOOR_LAYER
 	anchored = TRUE
 	move_resist = INFINITY
 
@@ -18,18 +18,6 @@
 	var/terminator_mode = STAIR_TERMINATOR_AUTOMATIC
 	var/turf/listeningTo
 
-/obj/structure/stairs/north
-	dir = NORTH
-
-/obj/structure/stairs/south
-	dir = SOUTH
-
-/obj/structure/stairs/east
-	dir = EAST
-
-/obj/structure/stairs/west
-	dir = WEST
-
 /obj/structure/stairs/Initialize(mapload)
 	GLOB.stairs += src
 	if(force_open_above)
@@ -96,14 +84,6 @@
 		for(var/mob/living/buckled as anything in climber.buckled_mobs)
 			buckled.pulling?.move_from_pull(buckled, loc, buckled.glide_size)
 
-
-/obj/structure/stairs/update_icon_state()
-	. = ..()
-	if(isTerminator())
-		icon_state = "stairs_t"
-	else
-		icon_state = "stairs"
-
 /obj/structure/stairs/vv_edit_var(var_name, var_value)
 	. = ..()
 	if(!.)
@@ -157,24 +137,66 @@
 			return FALSE
 	return TRUE
 
-// For the sake of keeping the same sprite as /turf/open/floor/plasteel/stairs/goon/stairs
-// One-tile stairs
-/obj/structure/stairs/goon
-	icon = 'goon/icons/turfs/floors.dmi'
-	icon_state = "stairs_alone"
-	base_icon_state = "stairs_alone"
 
-// Middle
-/obj/structure/stairs/goon/wide
+/obj/structure/stairs/wide_mid
 	icon_state = "stairs_middle"
 	base_icon_state = "stairs_middle"
 
-// Left side
-/obj/structure/stairs/goon/wide/left
+/obj/structure/stairs/wide_left
 	icon_state = "stairs_wide"
 	base_icon_state = "stairs_wide"
 
-// Right side
-/obj/structure/stairs/goon/wide/right
+/obj/structure/stairs/wide_right
 	icon_state = "stairs2_wide"
 	base_icon_state = "stairs2_wide"
+
+
+/obj/structure/stairs/white
+	icon_state = "medstairs_alone"
+	base_icon_state = "medstairs_alone"
+
+/obj/structure/stairs/white/wide_mid
+	icon_state = "medstairs_middle"
+	base_icon_state = "medstairs_middle"
+
+/obj/structure/stairs/white/wide_left
+	icon_state = "medstairs_wide"
+	base_icon_state = "medstairs_wide"
+
+/obj/structure/stairs/white/wide_right
+	icon_state = "medstairs2_wide"
+	base_icon_state = "medstairs2_wide"
+
+
+/obj/structure/stairs/wood
+	icon_state = "woodstairs_alone"
+	base_icon_state = "woodstairs_alone"
+
+/obj/structure/stairs/wood/wide_mid
+	icon_state = "woodstairs_middle"
+	base_icon_state = "woodstairs_middle"
+
+/obj/structure/stairs/wood/wide_left
+	icon_state = "woodstairs_wide"
+	base_icon_state = "woodstairs_wide"
+
+/obj/structure/stairs/wood/wide_right
+	icon_state = "woodstairs2_wide"
+	base_icon_state = "woodstairs2_wide"
+
+
+/obj/structure/stairs/dark
+	icon_state = "darkstairs_alone"
+	base_icon_state = "darkstairs_alone"
+
+/obj/structure/stairs/dark/wide_mid
+	icon_state = "darkstairs_middle"
+	base_icon_state = "darkstairs_middle"
+
+/obj/structure/stairs/dark/wide_left
+	icon_state = "darkstairs_wide"
+	base_icon_state = "darkstairs_wide"
+
+/obj/structure/stairs/dark/wide_right
+	icon_state = "darkstairs2_wide"
+	base_icon_state = "darkstairs2_wide"
diff --git a/goon/icons/turfs/floors.dmi b/goon/icons/turfs/floors.dmi
index b5b3a57b9852..1cb6f302fc01 100644
Binary files a/goon/icons/turfs/floors.dmi and b/goon/icons/turfs/floors.dmi differ
diff --git a/icons/obj/stairs.dmi b/icons/obj/stairs.dmi
deleted file mode 100644
index 5c3f378ced99..000000000000
Binary files a/icons/obj/stairs.dmi and /dev/null differ