From ddef3443071e0dd6399d3abc7d85fa4ee2a6411b Mon Sep 17 00:00:00 2001 From: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com> Date: Wed, 10 Jul 2024 18:27:39 -0600 Subject: [PATCH] Resprites Catwalk Tiles to match TG's floortiles (#84819) ## About The Pull Request Forgive me Maintainers, for I have sinned. Months ago, a year ago, maybe longer, I PR'd some new and improved sprites for the Catwalk Tiles here to TG. And when I did, I did not use the right tile palettes for reference. I have come to atone. ![image](https://github.com/tgstation/tgstation/assets/76465278/16605b30-455c-4c17-863b-00451a76fe27) ![image](https://github.com/tgstation/tgstation/assets/76465278/2d91e1b0-37c9-4916-b02a-9b23db0e3028) ![image](https://github.com/tgstation/tgstation/assets/76465278/c4233dec-1871-42ac-848b-2e8e94454dbc) ![image](https://github.com/tgstation/tgstation/assets/76465278/d8f09852-a8aa-4093-a4fd-68ddcbbc51af) ![image](https://github.com/tgstation/tgstation/assets/76465278/ff219529-d91c-459c-b8dc-b95e44890fa6) Additionally, I removed a duplicate white catwalk tile (flat_white - the one left is iron_white) and changed the `none`/error icon in the file to double as both an error marker, and a template of the catwalk mesh for future catwalk tile sprites. ## Why It's Good For The Game Consistent matching tile sprites are much, much nicer to look at. ## Changelog :cl: image: re-sprited Catwalk Floor Tiles to fit with TG floor tiles /:cl: --- _maps/map_files/Birdshot/birdshot.dmm | 56 +++++------ _maps/map_files/NorthStar/north_star.dmm | 2 +- _maps/map_files/wawastation/wawastation.dmm | 88 +++++++++--------- _maps/shuttles/emergency_northstar.dmm | 6 +- .../objects/items/stacks/tiles/tile_types.dm | 7 -- code/game/turfs/open/floor/catwalk_plating.dm | 9 -- icons/obj/tiles.dmi | Bin 33359 -> 33132 bytes icons/turf/floors/catwalk_plating.dmi | Bin 4353 -> 4221 bytes .../84819_replace_flat_white_catwalks.txt | 5 + 9 files changed, 81 insertions(+), 92 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/84819_replace_flat_white_catwalks.txt diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 3e765d5d167..a542ef51774 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -4698,7 +4698,7 @@ id = "rdoffice"; name = "Research Director's Shutters" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/cubicle) "bOa" = ( /obj/effect/turf_decal/sand/plating, @@ -11605,7 +11605,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/security/checkpoint/science) "eqz" = ( /obj/effect/turf_decal/siding/white/corner{ @@ -16520,7 +16520,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/mechbay) "gaF" = ( /obj/machinery/stasis{ @@ -19442,7 +19442,7 @@ /area/station/maintenance/starboard/greater) "gYH" = ( /obj/machinery/vending/wardrobe/robo_wardrobe, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "gZf" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -28764,7 +28764,7 @@ name = "Cytology Lab" }, /obj/effect/mapping_helpers/airlock/access/all/science/research, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "jQv" = ( /obj/structure/cable, @@ -32022,7 +32022,7 @@ id = "rdoffice"; name = "Research Director's Shutters" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/command/heads_quarters/rd) "kSv" = ( /obj/structure/disposalpipe/segment{ @@ -37670,7 +37670,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/lab) "mEq" = ( /obj/structure/closet/crate/wooden{ @@ -41777,7 +41777,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/cubicle) "nYk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -43053,7 +43053,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/cytology) "ovt" = ( /obj/machinery/door/airlock/maintenance{ @@ -47168,7 +47168,7 @@ name = "Gun Lab" }, /obj/effect/mapping_helpers/airlock/access/all/science/general, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/auxlab/firing_range) "pLj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47246,7 +47246,7 @@ /obj/effect/mapping_helpers/airlock/access/all/science/genetics, /obj/machinery/door/firedoor, /obj/structure/cable, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "pML" = ( /obj/structure/lattice/catwalk, @@ -48605,7 +48605,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "qiz" = ( /obj/effect/spawner/structure/window, @@ -49548,7 +49548,7 @@ name = "Break Room" }, /obj/effect/mapping_helpers/airlock/access/all/science/general, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "qzL" = ( /obj/structure/disposalpipe/segment{ @@ -49677,7 +49677,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/light/small/directional/north, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "qBi" = ( /obj/effect/decal/cleanable/dirt, @@ -52607,7 +52607,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/genetics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "rwl" = ( /obj/structure/lattice/catwalk, @@ -54424,7 +54424,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "rZq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57984,7 +57984,7 @@ name = "Research Division Server Room" }, /obj/effect/mapping_helpers/airlock/access/all/science/rd, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/server) "tfy" = ( /obj/structure/closet/firecloset, @@ -61277,7 +61277,7 @@ name = "Augment Corridor" }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "uhe" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -62709,7 +62709,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/south, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "uEC" = ( /obj/structure/window/reinforced/spawner/directional/east, @@ -64348,7 +64348,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "veA" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, @@ -64714,7 +64714,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "vkh" = ( /turf/closed/wall, @@ -64730,7 +64730,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/lab) "vkr" = ( /obj/structure/cable, @@ -68009,7 +68009,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "wfE" = ( /obj/effect/turf_decal/tile/brown/opposingcorners, @@ -69052,7 +69052,7 @@ id = "rdoffice"; name = "Research Director's Shutters" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "wwY" = ( /obj/effect/spawner/random/trash/mess, @@ -71460,7 +71460,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/server) "xfm" = ( /obj/structure/cable, @@ -73305,7 +73305,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/mechbay) "xEd" = ( /obj/structure/cable, @@ -73961,7 +73961,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/auxlab/firing_range) "xOm" = ( /obj/effect/turf_decal/delivery, @@ -74473,7 +74473,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/cubicle) "xTV" = ( /obj/machinery/ai_slipper{ diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 3e4e2fa6355..8f7285e09da 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -90788,7 +90788,7 @@ }, /obj/machinery/shower/directional/south, /obj/structure/fluff/shower_drain, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "xrh" = ( /obj/effect/turf_decal/tile/blue{ diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index d9ee5460f5b..a2ec3989358 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -458,7 +458,7 @@ /obj/machinery/door/firedoor, /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "agO" = ( /obj/effect/decal/cleanable/dirt, @@ -1044,7 +1044,7 @@ /obj/structure/cable, /obj/effect/turf_decal/siding/purple/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "aqM" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -2405,7 +2405,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/lab) "aNH" = ( /obj/machinery/door/airlock/security/glass{ @@ -2860,7 +2860,7 @@ /obj/effect/mapping_helpers/apc/full_charge, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "aXg" = ( /obj/structure/railing{ @@ -8436,7 +8436,7 @@ /area/station/cargo/miningoffice) "dci" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "dck" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -8672,7 +8672,7 @@ }, /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "dgS" = ( /obj/structure/cable, @@ -9382,7 +9382,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "drz" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -11410,7 +11410,7 @@ /area/station/command/heads_quarters/qm) "eaL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "eaS" = ( /obj/effect/turf_decal/siding/wood{ @@ -13777,7 +13777,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/science) "eUB" = ( -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "eUD" = ( /obj/effect/turf_decal/plaque{ @@ -17186,7 +17186,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "gdP" = ( /obj/structure/lattice, @@ -17479,7 +17479,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "gjt" = ( /obj/machinery/pdapainter/medbay, @@ -17655,7 +17655,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "gmd" = ( /obj/effect/spawner/structure/window/reinforced, @@ -20450,7 +20450,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/lab) "hle" = ( /obj/machinery/light/directional/south, @@ -21584,7 +21584,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/lab) "hED" = ( /turf/closed/wall/r_wall, @@ -22965,7 +22965,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "ifc" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -23384,7 +23384,7 @@ /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "iol" = ( /turf/closed/wall/r_wall, @@ -24800,7 +24800,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "iOE" = ( /obj/item/pickaxe/mini, @@ -25198,7 +25198,7 @@ /obj/structure/cable, /obj/effect/turf_decal/siding/purple, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "iXR" = ( /obj/structure/cable, @@ -25519,7 +25519,7 @@ /obj/effect/turf_decal/siding/purple{ dir = 1 }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "jer" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -28627,7 +28627,7 @@ id = "Xenolab"; name = "Test Chamber Blast Door" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "ked" = ( /obj/structure/cable, @@ -29507,7 +29507,7 @@ /area/station/engineering/atmos) "krO" = ( /obj/structure/cable, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "krP" = ( /turf/closed/wall/r_wall, @@ -31640,7 +31640,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "lfd" = ( /obj/machinery/door/airlock/external/glass, @@ -32832,7 +32832,7 @@ "lBZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "lCk" = ( /obj/effect/turf_decal/siding/dark_blue{ @@ -33808,7 +33808,7 @@ /obj/effect/landmark/navigate_destination/dockarrival, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "lUF" = ( /obj/structure/transport/linear/public, @@ -36489,7 +36489,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "mRI" = ( /obj/effect/mob_spawn/corpse/human/clown, @@ -36811,7 +36811,7 @@ /obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "mYs" = ( /obj/machinery/door/airlock/public/glass{ @@ -38742,7 +38742,7 @@ }, /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "nIb" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -40428,7 +40428,7 @@ "osT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "osX" = ( /obj/effect/decal/cleanable/dirt, @@ -42728,7 +42728,7 @@ /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "piS" = ( /obj/structure/girder/displaced, @@ -46989,7 +46989,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/lab) "qIS" = ( /obj/machinery/cryo_cell, @@ -48874,7 +48874,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ dir = 4 }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/ordnance) "roO" = ( /obj/machinery/door/airlock/security/glass{ @@ -49628,7 +49628,7 @@ "rBq" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/purple, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "rBt" = ( /obj/effect/turf_decal/stripes/line{ @@ -55187,7 +55187,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "tvB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -55542,7 +55542,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/lab) "tCE" = ( /obj/effect/turf_decal/tile/neutral, @@ -55890,7 +55890,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "tIE" = ( /obj/effect/landmark/secequipment, @@ -56359,7 +56359,7 @@ "tPE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "tPJ" = ( /obj/machinery/light_switch/directional/west, @@ -56914,7 +56914,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "tZW" = ( /obj/machinery/camera/autoname/directional/south, @@ -57772,7 +57772,7 @@ "uoP" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, /obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/treatment_center) "uoY" = ( /obj/structure/cable, @@ -62764,7 +62764,7 @@ /obj/structure/cable, /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "weg" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -63755,7 +63755,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/lab) "wxQ" = ( /obj/machinery/computer/operating{ @@ -64825,7 +64825,7 @@ /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "wPU" = ( /obj/machinery/light/small/directional/west, @@ -65677,7 +65677,7 @@ /obj/structure/window/reinforced/spawner/directional/north, /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/xenobiology) "xeW" = ( /obj/effect/turf_decal/tile/brown{ @@ -65751,7 +65751,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/lab) "xgn" = ( /obj/structure/mannequin/skeleton{ @@ -66288,7 +66288,7 @@ /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "xqO" = ( /obj/docking_port/stationary/escape_pod{ diff --git a/_maps/shuttles/emergency_northstar.dmm b/_maps/shuttles/emergency_northstar.dmm index e934a65b722..798a4d9671a 100644 --- a/_maps/shuttles/emergency_northstar.dmm +++ b/_maps/shuttles/emergency_northstar.dmm @@ -183,10 +183,10 @@ pixel_x = -3; pixel_y = 2 }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/shuttle/escape) "qf" = ( -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/shuttle/escape) "qK" = ( /obj/machinery/stasis, @@ -347,7 +347,7 @@ /obj/machinery/door/airlock/survival_pod/glass{ name = "Emergency Shuttle Treatment" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/shuttle/escape) "Eh" = ( /obj/machinery/power/shuttle_engine/propulsion/left, diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 89e6cae389d..4b89719998c 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -1265,7 +1265,6 @@ /obj/item/stack/tile/catwalk_tile/iron, /obj/item/stack/tile/catwalk_tile/iron_white, /obj/item/stack/tile/catwalk_tile/iron_dark, - /obj/item/stack/tile/catwalk_tile/flat_white, /obj/item/stack/tile/catwalk_tile/titanium, /obj/item/stack/tile/catwalk_tile/iron_smooth //this is the original greenish one ) @@ -1291,12 +1290,6 @@ icon_state = "darkiron_catwalk" turf_type = /turf/open/floor/catwalk_floor/iron_dark -/obj/item/stack/tile/catwalk_tile/flat_white - name = "flat white catwalk floor" - singular_name = "flat white catwalk floor tile" - icon_state = "flatwhite_catwalk" - turf_type = /turf/open/floor/catwalk_floor/flat_white - /obj/item/stack/tile/catwalk_tile/titanium name = "titanium catwalk floor" singular_name = "titanium catwalk floor tile" diff --git a/code/game/turfs/open/floor/catwalk_plating.dm b/code/game/turfs/open/floor/catwalk_plating.dm index 765482cf78c..6e2979b8512 100644 --- a/code/game/turfs/open/floor/catwalk_plating.dm +++ b/code/game/turfs/open/floor/catwalk_plating.dm @@ -76,12 +76,6 @@ floor_tile = /obj/item/stack/tile/catwalk_tile/iron_dark catwalk_type = "darkiron" -/turf/open/floor/catwalk_floor/flat_white - name = "white large plated catwalk floor" - icon_state = "flatwhite_above" - floor_tile = /obj/item/stack/tile/catwalk_tile/flat_white - catwalk_type = "flatwhite" - /turf/open/floor/catwalk_floor/titanium name = "titanium plated catwalk floor" icon_state = "titanium_above" @@ -111,9 +105,6 @@ /turf/open/floor/catwalk_floor/iron_dark/telecomms initial_gas_mix = TCOMMS_ATMOS -/turf/open/floor/catwalk_floor/flat_white/airless - initial_gas_mix = AIRLESS_ATMOS - /turf/open/floor/catwalk_floor/titanium/Airless initial_gas_mix = AIRLESS_ATMOS diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 2c2aae54de3c2f1855dd7e210fea35938dfbc6c0..85d4b82a498c066814bee6c8ea5872a83f489f51 100644 GIT binary patch delta 11828 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 F{{s-?fZG57 diff --git a/icons/turf/floors/catwalk_plating.dmi b/icons/turf/floors/catwalk_plating.dmi index b49c46564de508d0ddc8fd050c50655d6ffe6352..800d0c8dfffcdb408472963441180bcd44c083a9 100644 GIT binary patch literal 4221 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 HD&&6v?2t7g literal 4353 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 qg;w^;-I5+q8oTZz8c0T}3+=oafZhWsB3o^Wdb diff --git a/tools/UpdatePaths/Scripts/84819_replace_flat_white_catwalks.txt b/tools/UpdatePaths/Scripts/84819_replace_flat_white_catwalks.txt new file mode 100644 index 00000000000..3d957e815f4 --- /dev/null +++ b/tools/UpdatePaths/Scripts/84819_replace_flat_white_catwalks.txt @@ -0,0 +1,5 @@ +# replaces redundant flat_white catwalk tiles with iron_white + +/turf/open/floor/catwalk_floor/flat_white : /turf/open/floor/catwalk_floor/iron_white{@OLD} +/turf/open/floor/catwalk_floor/flat_white/@SUBTYPES : /turf/open/floor/catwalk_floor/iron_white/@SUBTYPES{@OLD} +/obj/item/stack/tile/catwalk_tile/flat_white : /obj/item/stack/tile/catwalk_tile/iron_white{@OLD}