diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index 7c0873bbd31..e1b00019bcd 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm @@ -567,8 +567,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/ruin/jungle/cavecrew/engineering) @@ -595,8 +594,7 @@ dir = 2; layer = 4.1 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/ruin/powered) @@ -3184,8 +3182,7 @@ dir = 2; layer = 4.1 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/ruin/powered) @@ -4147,8 +4144,7 @@ }, /area/ruin/jungle/cavecrew/hallway) "Yw" = ( -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/storage) diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index 633747e6703..183b9eaa937 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -236,8 +236,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/outpost/engineering/atmospherics) @@ -1688,8 +1687,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/outpost/crew/cryo) @@ -6516,8 +6514,7 @@ /turf/open/floor/plasteel/tech, /area/outpost/crew/cryo) "wY" = ( -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/outpost/engineering) @@ -9394,8 +9391,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/outpost/engineering) @@ -9580,8 +9576,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/outpost/crew/canteen) "HE" = ( -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/outpost/engineering/atmospherics) @@ -13159,8 +13154,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/outpost/engineering/atmospherics) diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index 9ae7355d443..e6bcf41cb45 100644 --- a/_maps/shuttles/independent/independent_beluga.dmm +++ b/_maps/shuttles/independent/independent_beluga.dmm @@ -2774,8 +2774,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/ship/engineering) @@ -4487,8 +4486,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/ship/engineering) diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm index e0f41306f99..6e0f83fba87 100644 --- a/_maps/shuttles/independent/independent_tranquility.dmm +++ b/_maps/shuttles/independent/independent_tranquility.dmm @@ -453,9 +453,7 @@ /turf/open/floor/plating, /area/ship/crew/crewthree) "em" = ( -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi' - }, +/turf/open/floor/plasteel/stairs/modern/dark, /area/ship/bridge) "en" = ( /obj/machinery/light/directional/west, @@ -2883,9 +2881,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - dir = 8; - icon = 'icons/obj/stairs.dmi' +/turf/open/floor/plasteel/stairs/modern/dark{ + dir = 8 }, /area/ship/crew/crewfive) "xK" = ( @@ -6254,9 +6251,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi' - }, +/turf/open/floor/plasteel/stairs/modern/dark, /area/ship/bridge) "Xr" = ( /obj/machinery/light_switch{ diff --git a/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm b/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm index 7f74af3a30c..e767e35602c 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm @@ -415,9 +415,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/stairs{ - dir = 1 - }, +/turf/open/floor/plasteel/stairs/modern/dark, /area/ship/bridge) "bC" = ( /obj/structure/cable{ @@ -2788,8 +2786,8 @@ /obj/machinery/camera{ dir = 5 }, -/turf/open/floor/plasteel/stairs{ - dir = 4 +/turf/open/floor/plasteel/stairs/modern/dark{ + dir = 8 }, /area/ship/bridge) "mv" = ( @@ -3769,8 +3767,8 @@ /turf/open/floor/plasteel/white, /area/ship/crew/toilet) "qX" = ( -/turf/open/floor/plasteel/stairs{ - dir = 4 +/turf/open/floor/plasteel/stairs/modern/dark{ + dir = 8 }, /area/ship/bridge) "qY" = ( @@ -8632,7 +8630,9 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs, +/turf/open/floor/plasteel/stairs/modern/dark{ + dir = 1 + }, /area/ship/bridge) "KC" = ( /obj/structure/window/plasma/reinforced/spawner/west, @@ -9113,8 +9113,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/plasteel/stairs{ - dir = 4 +/turf/open/floor/plasteel/stairs/modern/dark{ + dir = 8 }, /area/ship/bridge) "Mo" = ( diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index ac47ad6bca6..3bfb727775d 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -118,8 +118,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/science/robotics) @@ -1105,8 +1104,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/bridge) @@ -3092,8 +3090,7 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering/atmospherics) "lI" = ( -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 4 }, /area/ship/hangar) @@ -3503,9 +3500,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi' - }, +/turf/open/floor/plasteel/stairs/modern/dark, /area/ship/engineering) "mY" = ( /obj/effect/turf_decal/siding/thinplating{ @@ -3581,8 +3576,7 @@ dir = 4; layer = 4.1 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/bridge) @@ -4214,8 +4208,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/maintenance/central) @@ -6394,8 +6387,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/crew/office) @@ -6534,8 +6526,7 @@ /obj/structure/railing/corner{ dir = 1 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 4 }, /area/ship/hangar) @@ -7509,8 +7500,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 4 }, /area/ship/hangar) @@ -7524,8 +7514,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 4 }, /area/ship/crew/office) @@ -9975,8 +9964,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/bridge) @@ -10718,8 +10706,7 @@ /area/ship/crew/canteen/kitchen) "NM" = ( /obj/machinery/light/directional/north, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 4 }, /area/ship/hangar) @@ -12922,8 +12909,7 @@ /obj/structure/sign/poster/retro/smile{ pixel_x = -32 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/bridge) diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm index 5da85bc4552..9818ef1baf6 100644 --- a/_maps/shuttles/pgf/pgf_crying_sun.dmm +++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm @@ -736,10 +736,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; - dir = 2 - }, +/turf/open/floor/plasteel/stairs/modern/dark, /area/ship/bridge) "gM" = ( /obj/machinery/door/airlock{ @@ -917,8 +914,7 @@ pixel_x = 19; pixel_y = 9 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/crew/dorm/dormtwo) @@ -1500,8 +1496,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/security) @@ -4309,8 +4304,7 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "Ir" = ( -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/bridge) @@ -5121,10 +5115,7 @@ /turf/open/floor/vault, /area/ship/security/armory) "Pb" = ( -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; - dir = 2 - }, +/turf/open/floor/plasteel/stairs/modern/dark, /area/ship/bridge) "Pd" = ( /obj/machinery/power/terminal{ @@ -6339,8 +6330,7 @@ /turf/open/floor/vault, /area/ship/security/armory) "XD" = ( -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 4 }, /area/ship/crew/cryo) diff --git a/_maps/shuttles/subshuttles/frontiersmen_gut.dmm b/_maps/shuttles/subshuttles/frontiersmen_gut.dmm index 6044e101189..b4b40c865a3 100644 --- a/_maps/shuttles/subshuttles/frontiersmen_gut.dmm +++ b/_maps/shuttles/subshuttles/frontiersmen_gut.dmm @@ -433,8 +433,7 @@ /turf/open/floor/plasteel/tech, /area/ship/storage) "Dr" = ( -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 1 }, /area/ship/storage) diff --git a/_maps/shuttles/subshuttles/minutemen_crux.dmm b/_maps/shuttles/subshuttles/minutemen_crux.dmm index 9a42bbd165e..eccd6e1ab35 100644 --- a/_maps/shuttles/subshuttles/minutemen_crux.dmm +++ b/_maps/shuttles/subshuttles/minutemen_crux.dmm @@ -333,8 +333,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/ship/bridge) diff --git a/_maps/shuttles/subshuttles/nanotrasen_falcon.dmm b/_maps/shuttles/subshuttles/nanotrasen_falcon.dmm index e88bfc4bd5f..f813f55d02e 100644 --- a/_maps/shuttles/subshuttles/nanotrasen_falcon.dmm +++ b/_maps/shuttles/subshuttles/nanotrasen_falcon.dmm @@ -497,8 +497,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, -/turf/open/floor/plasteel/stairs{ - icon = 'icons/obj/stairs.dmi'; +/turf/open/floor/plasteel/stairs/modern/dark{ dir = 8 }, /area/ship/storage/eva) diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index 7db6ebe668b..1a93a5fb178 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -1192,30 +1192,6 @@ }, /turf/open/floor/circuit/green/off, /area/ship/maintenance/starboard) -"lr" = ( -/obj/structure/closet/wall/orange/directional/south{ - name = "Engineering locker" - }, -/obj/item/clothing/shoes/workboots, -/obj/item/clothing/head/welding, -/obj/item/clothing/head/hardhat/red, -/obj/item/clothing/head/hardhat/weldhat/orange{ - pixel_x = 7; - pixel_y = 2 - }, -/obj/item/clothing/glasses/meson/engine, -/obj/item/storage/belt/utility/full/engi, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "engine fuel pump" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/item/clothing/under/syndicate/hardliners, -/obj/item/clothing/suit/hazardvest/hardliners, -/turf/open/floor/plasteel/tech, -/area/ship/engineering) "ls" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/steeldecal/steel_decals_central4, @@ -3313,9 +3289,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - dir = 8; - icon = 'icons/obj/stairs.dmi' +/turf/open/floor/plasteel/stairs/modern/dark{ + dir = 8 }, /area/ship/maintenance/starboard) "GD" = ( @@ -3687,9 +3662,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plasteel/stairs{ - dir = 8; - icon = 'icons/obj/stairs.dmi' +/turf/open/floor/plasteel/stairs/modern/dark{ + dir = 8 }, /area/ship/maintenance/port) "JO" = ( diff --git a/code/game/turfs/open/floor/plasteel_floor.dm b/code/game/turfs/open/floor/plasteel_floor.dm index 7ed16bc5631..55ad58d51bb 100644 --- a/code/game/turfs/open/floor/plasteel_floor.dm +++ b/code/game/turfs/open/floor/plasteel_floor.dm @@ -180,6 +180,14 @@ icon_state = "stairs-old" base_icon_state = "stairs-old" +/turf/open/floor/plasteel/stairs/modern + icon_state = "stairs_modern_light" + base_icon_state = "stairs_modern_light" + +/turf/open/floor/plasteel/stairs/modern/dark + icon_state = "stairs_modern_dark" + base_icon_state = "stairs_modern_dark" + /turf/open/floor/plasteel/stairs/wood color = "#5B3E1D" icon_state = "stairs-wood" diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 398d5550f81..530ff80fbe9 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ