Skip to content

Commit

Permalink
Updates wood stair sprite (#2889)
Browse files Browse the repository at this point in the history
## About The Pull Request

![606b4c254b5ef69e78735a06a9b43dad-1](https://github.com/shiptest-ss13/Shiptest/assets/118859017/bd04272f-c8c1-48b3-b027-00e5c922aa33)
Wood stairs are currently recolored plasteel stairs, which look bad.
This PR overlays @Imaginos16's wood floor sprites on wood stairs, making
them more in-line with our current tileset. This PR also adds subtypes
for different types of wood stairs.

## Why It's Good For The Game
Stair good.

## Changelog

🆑
tweak: Wood stair sprites have been updated to be more in-line with wood
floors.
/🆑
  • Loading branch information
goober3 authored Apr 17, 2024
1 parent 9a7e51b commit 79a08fa
Show file tree
Hide file tree
Showing 11 changed files with 148 additions and 32 deletions.
4 changes: 2 additions & 2 deletions _maps/RandomRuins/BeachRuins/beach_knights_rest.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"dF" = (
/obj/structure/mineral_door/iron,
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 4
},
/area/ruin/beachplanet/knight)
Expand Down Expand Up @@ -940,7 +940,7 @@
/area/overmap_encounter/planetoid/beachplanet/explored)
"ZS" = (
/obj/structure/mineral_door/iron,
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 8
},
/area/ruin/beachplanet/knight)
Expand Down
14 changes: 7 additions & 7 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 4
},
/area/overmap_encounter/planetoid/jungle/explored)
Expand Down Expand Up @@ -509,7 +509,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"dI" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 1
},
/area/overmap_encounter/planetoid/jungle/explored)
Expand Down Expand Up @@ -1132,7 +1132,7 @@
"hZ" = (
/obj/structure/spider/stickyweb,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/stairs/medium,
/turf/open/floor/plasteel/stairs/mid,
/area/overmap_encounter/planetoid/jungle/explored)
"ib" = (
/obj/item/stack/sheet/metal,
Expand Down Expand Up @@ -1759,7 +1759,7 @@
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 8
},
/area/overmap_encounter/planetoid/jungle/explored)
Expand Down Expand Up @@ -2732,7 +2732,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"te" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 4
},
/area/overmap_encounter/planetoid/jungle/explored)
Expand Down Expand Up @@ -3029,7 +3029,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"vd" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/stairs/medium,
/turf/open/floor/plasteel/stairs/mid,
/area/overmap_encounter/planetoid/jungle/explored)
"ve" = (
/obj/structure/railing{
Expand Down Expand Up @@ -3478,7 +3478,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/stairs/medium,
/turf/open/floor/plasteel/stairs/mid,
/area/overmap_encounter/planetoid/jungle/explored)
"xT" = (
/obj/structure/table/reinforced,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,7 @@
/turf/open/floor/plating,
/area/overmap_encounter/planetoid/jungle/explored)
"nZ" = (
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 1
},
/area/ruin/jungle/interceptor/forehall)
Expand Down Expand Up @@ -6138,7 +6138,7 @@
"YQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/stairs/medium,
/turf/open/floor/plasteel/stairs/mid,
/area/ruin/jungle/interceptor/afthall)
"YT" = (
/obj/structure/catwalk/over/plated_catwalk/dark,
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_asteroid_20x20.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
},
/area/hangar)
"pW" = (
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
planetary_atmos = 1
},
/area/hangar)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_valor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4298,7 +4298,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 8
},
/area/ship/cargo)
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/minutemen/minutemen_vela.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@
/turf/open/floor/carpet/nanoweave/purple,
/area/ship/science)
"jh" = (
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 1
},
/area/ship/hallway/central)
Expand Down Expand Up @@ -6643,7 +6643,7 @@
/turf/open/floor/circuit/green,
/area/ship/science/ai_chamber)
"KC" = (
/turf/open/floor/plasteel/stairs/medium,
/turf/open/floor/plasteel/stairs/mid,
/area/ship/hallway/central)
"KE" = (
/obj/machinery/firealarm/directional/south,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3998,7 +3998,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 4
},
/area/ship/cargo)
Expand Down
18 changes: 8 additions & 10 deletions _maps/shuttles/solgov/solgov_inkwell.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1716,7 +1716,7 @@
pixel_y = 0;
pixel_x = -26
},
/turf/open/floor/plasteel/stairs/wood{
/turf/open/floor/plasteel/stairs/wood/left{
dir = 1
},
/area/ship/bridge)
Expand Down Expand Up @@ -2435,7 +2435,7 @@
/area/ship/crew/canteen/kitchen)
"qe" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/stairs/wood{
/turf/open/floor/plasteel/stairs/wood/right{
dir = 1
},
/area/ship/bridge)
Expand Down Expand Up @@ -3704,9 +3704,8 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/stairs/wood{
dir = 8;
color = "#D5A66E"
/turf/open/floor/plasteel/stairs/wood/birch{
dir = 8
},
/area/ship/crew/dorm/dormthree)
"xF" = (
Expand Down Expand Up @@ -6301,7 +6300,7 @@
/obj/structure/railing/wood{
dir = 4
},
/turf/open/floor/plasteel/stairs/wood,
/turf/open/floor/plasteel/stairs/wood/right,
/area/ship/bridge)
"Qt" = (
/obj/machinery/power/terminal{
Expand Down Expand Up @@ -6462,7 +6461,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/stairs/wood,
/turf/open/floor/plasteel/stairs/wood/left,
/area/ship/bridge)
"Rh" = (
/obj/effect/turf_decal/techfloor,
Expand Down Expand Up @@ -6892,9 +6891,8 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/stairs/wood{
dir = 8;
color = "#543C30"
/turf/open/floor/plasteel/stairs/wood/walnut{
dir = 8
},
/area/ship/crew/dorm/dormtwo)
"TV" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_litieguai.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2291,7 +2291,7 @@
/obj/structure/cable{
icon_state = "2-9"
},
/turf/open/floor/plasteel/stairs/medium{
/turf/open/floor/plasteel/stairs/mid{
dir = 1
},
/area/ship/storage/eva)
Expand Down
128 changes: 123 additions & 5 deletions code/game/turfs/open/floor/plasteel_floor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@
/turf/open/floor/plasteel/cult/airless
initial_gas_mix = AIRLESS_ATMOS


/turf/open/floor/plasteel/stairs //considering removal
icon = 'icons/turf/floors.dmi'
icon_state = "stairs"
Expand All @@ -169,7 +168,7 @@
icon_state = "stairs-l"
base_icon_state = "stairs-l"

/turf/open/floor/plasteel/stairs/medium
/turf/open/floor/plasteel/stairs/mid
icon_state = "stairs-m"
base_icon_state = "stairs-m"

Expand All @@ -182,9 +181,128 @@
base_icon_state = "stairs-old"

/turf/open/floor/plasteel/stairs/wood
color = "#A47449"
barefootstep = "wood"
footstep = "wood"
color = "#5B3E1D"
icon_state = "stairs-wood"
base_icon_state = "stairs-wood"
barefootstep = FOOTSTEP_WOOD_BAREFOOT
footstep = FOOTSTEP_WOOD_CLAW

/turf/open/floor/plasteel/stairs/wood/left
icon_state = "stairs-wood-l"
base_icon_state = "stairs-wood-l"

/turf/open/floor/plasteel/stairs/wood/mid
icon_state = "stairs-wood-m"
base_icon_state = "stairs-wood-m"

/turf/open/floor/plasteel/stairs/wood/right
icon_state = "stairs-wood-r"
base_icon_state = "stairs-wood-r"

/turf/open/floor/plasteel/stairs/wood/mahogany
color = WOOD_COLOR_RICH

/turf/open/floor/plasteel/stairs/wood/mahogany/left
icon_state = "stairs-wood-l"
base_icon_state = "stairs-wood-l"

/turf/open/floor/plasteel/stairs/wood/mahogany/mid
icon_state = "stairs-wood-m"
base_icon_state = "stairs-wood-m"

/turf/open/floor/plasteel/stairs/wood/mahogany/right
icon_state = "stairs-wood-r"
base_icon_state = "stairs-wood-r"

/turf/open/floor/plasteel/stairs/wood/maple
color = WOOD_COLOR_PALE

/turf/open/floor/plasteel/stairs/wood/maple/left
icon_state = "stairs-wood-l"
base_icon_state = "stairs-wood-l"

/turf/open/floor/plasteel/stairs/wood/maple/mid
icon_state = "stairs-wood-m"
base_icon_state = "stairs-wood-m"

/turf/open/floor/plasteel/stairs/wood/maple/right
icon_state = "stairs-wood-r"
base_icon_state = "stairs-wood-r"

/turf/open/floor/plasteel/stairs/wood/ebony
color = WOOD_COLOR_BLACK

/turf/open/floor/plasteel/stairs/wood/ebony/left
icon_state = "stairs-wood-l"
base_icon_state = "stairs-wood-l"

/turf/open/floor/plasteel/stairs/wood/ebony/mid
icon_state = "stairs-wood-m"
base_icon_state = "stairs-wood-m"

/turf/open/floor/plasteel/stairs/wood/ebony/right
icon_state = "stairs-wood-r"
base_icon_state = "stairs-wood-r"

/turf/open/floor/plasteel/stairs/wood/walnut
color = WOOD_COLOR_CHOCOLATE

/turf/open/floor/plasteel/stairs/wood/walnut/left
icon_state = "stairs-wood-l"
base_icon_state = "stairs-wood-l"

/turf/open/floor/plasteel/stairs/wood/walnut/mid
icon_state = "stairs-wood-m"
base_icon_state = "stairs-wood-m"

/turf/open/floor/plasteel/stairs/wood/walnut/right
icon_state = "stairs-wood-r"
base_icon_state = "stairs-wood-r"

/turf/open/floor/plasteel/stairs/wood/bamboo
color = WOOD_COLOR_PALE2

/turf/open/floor/plasteel/stairs/wood/bamboo/left
icon_state = "stairs-wood-l"
base_icon_state = "stairs-wood-l"

/turf/open/floor/plasteel/stairs/wood/bamboo/mid
icon_state = "stairs-wood-m"
base_icon_state = "stairs-wood-m"

/turf/open/floor/plasteel/stairs/wood/bamboo/right
icon_state = "stairs-wood-r"
base_icon_state = "stairs-wood-r"

/turf/open/floor/plasteel/stairs/wood/birch
color = WOOD_COLOR_PALE3

/turf/open/floor/plasteel/stairs/wood/birch/left
icon_state = "stairs-wood-l"
base_icon_state = "stairs-wood-l"

/turf/open/floor/plasteel/stairs/wood/birch/mid
icon_state = "stairs-wood-m"
base_icon_state = "stairs-wood-m"

/turf/open/floor/plasteel/stairs/wood/birch/right
icon_state = "stairs-wood-r"
base_icon_state = "stairs-wood-r"

/turf/open/floor/plasteel/stairs/wood/yew
color = WOOD_COLOR_YELLOW

/turf/open/floor/plasteel/stairs/wood/yew/left
icon_state = "stairs-wood-l"
base_icon_state = "stairs-wood-l"

/turf/open/floor/plasteel/stairs/wood/yew/mid
icon_state = "stairs-wood-m"
base_icon_state = "stairs-wood-m"

/turf/open/floor/plasteel/stairs/wood/yew/right
icon_state = "stairs-wood-r"
base_icon_state = "stairs-wood-r"

/turf/open/floor/plasteel/rockvault
icon_state = "rockvault"
Expand Down
Binary file modified icons/turf/floors.dmi
Binary file not shown.

0 comments on commit 79a08fa

Please sign in to comment.