diff --git a/code/game/turfs/simulated/outdoors/outdoors_vr.dm b/code/game/turfs/simulated/outdoors/outdoors_vr.dm index 353de942852..a7233b43293 100644 --- a/code/game/turfs/simulated/outdoors/outdoors_vr.dm +++ b/code/game/turfs/simulated/outdoors/outdoors_vr.dm @@ -68,7 +68,7 @@ name = "sidewalk" desc = "Concrete shaped into a path!" icon = 'icons/turf/outdoors_vr.dmi' - icon_state = "sidewalk0" + icon_state = "sidewalk" edge_blending_priority = 1 movement_cost = -0.5 initial_flooring = /decl/flooring/outdoors/sidewalk @@ -77,7 +77,7 @@ name = "sidewalk" desc = "Concrete shaped into a path!" icon = 'icons/turf/outdoors_vr.dmi' - icon_base = "sidewalk0" + icon_base = "sidewalk" footstep_sounds = list("human" = list( 'sound/effects/footstep/LightStone1.ogg', 'sound/effects/footstep/LightStone2.ogg', @@ -86,17 +86,23 @@ /turf/simulated/floor/outdoors/sidewalk/Initialize(mapload) var/possibledirts = list( - "sidewalk0" = 150, - "sidewalk1" = 3, - "sidewalk2" = 3, - "sidewalk3" = 3, - "sidewalk4" = 3, - "sidewalk5" = 3, - "sidewalk6" = 2, - "sidewalk7" = 2, - "sidewalk8" = 2, - "sidewalk9" = 2, - "sidewalk10" = 2 + "[initial(icon_state)]" = 150, + "[initial(icon_state)]1" = 3, + "[initial(icon_state)]2" = 3, + "[initial(icon_state)]3" = 3, + "[initial(icon_state)]4" = 3, + "[initial(icon_state)]5" = 3, + "[initial(icon_state)]6" = 2, + "[initial(icon_state)]7" = 2, + "[initial(icon_state)]8" = 2, + "[initial(icon_state)]9" = 2, + "[initial(icon_state)]10" = 2 ) flooring_override = pickweight(possibledirts) return ..() + +/turf/simulated/floor/outdoors/sidewalk/side + icon_state = "side-walk" + +/turf/simulated/floor/outdoors/sidewalk/slab + icon_state = "slab" diff --git a/icons/turf/outdoors_vr.dmi b/icons/turf/outdoors_vr.dmi index 2bb9f87b7e6..2629d85a433 100644 Binary files a/icons/turf/outdoors_vr.dmi and b/icons/turf/outdoors_vr.dmi differ diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm index cde8ed8538e..03fa9a9ce31 100644 --- a/maps/gateway_vr/variable/arynthilake_a.dmm +++ b/maps/gateway_vr/variable/arynthilake_a.dmm @@ -400,9 +400,7 @@ /area/gateway/arynthilake/dome) "bV" = ( /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, -/turf/simulated/floor/outdoors/sidewalk{ - dir = 4 - }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake/dome) "bW" = ( /obj/structure/table/sifwooden_reinforced, @@ -566,9 +564,7 @@ }, /area/gateway/arynthilake/dome) "fo" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 4 - }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake/dome) "fu" = ( /obj/structure/table/darkglass, @@ -712,9 +708,7 @@ /turf/simulated/floor/tiled/eris/dark/monofloor, /area/gateway/arynthilake/dome) "jm" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 4 - }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake) "jz" = ( /obj/structure/table/rack, @@ -1275,9 +1269,7 @@ }, /area/gateway/arynthilake/dome) "uV" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 6 - }, +/turf/simulated/floor/outdoors/sidewalk/slab, /area/gateway/arynthilake/dome) "vt" = ( /obj/structure/table/standard{ @@ -1709,9 +1701,7 @@ /turf/simulated/floor/outdoors/newdirt, /area/gateway/arynthilake) "GJ" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 4 - }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake/engine) "GK" = ( /obj/structure/railing, @@ -1898,9 +1888,7 @@ /obj/machinery/door/airlock/sandstone{ name = "Automatic Door" }, -/turf/simulated/floor/outdoors/sidewalk{ - dir = 4 - }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake/dome) "LH" = ( /obj/structure/bed/pod, @@ -2220,9 +2208,7 @@ /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "Sb" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 6 - }, +/turf/simulated/floor/outdoors/sidewalk/slab, /area/gateway/arynthilake) "Sg" = ( /turf/simulated/floor/reinforced{ @@ -2497,9 +2483,7 @@ /area/gateway/arynthilake/dome) "ZT" = ( /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, -/turf/simulated/floor/outdoors/sidewalk{ - dir = 6 - }, +/turf/simulated/floor/outdoors/sidewalk/slab, /area/gateway/arynthilake/dome) (1,1,1) = {" @@ -15529,7 +15513,7 @@ aj aj aj aj -af +JK aj aj aj @@ -15669,11 +15653,11 @@ aj aj aj aj -af -af +JK +JK aj aj -af +JK mT aj aj @@ -15810,12 +15794,12 @@ aj aj aj aj -af -af -af -af -af -af +JK +JK +JK +JK +JK +JK aj aj aj @@ -15951,12 +15935,12 @@ aj aj aj aj -af -af +JK +JK al al -af -af +JK +JK aj aj aj @@ -16093,12 +16077,12 @@ mT aj aj aj -af +JK al al al -af -af +JK +JK aj aj aj @@ -16235,11 +16219,11 @@ aj aj aj aj -af +JK al CQ al -af +JK aj aj aj @@ -16376,12 +16360,12 @@ aj aj aj aj -af -af +JK +JK al al al -af +JK aj aj aj @@ -16518,12 +16502,12 @@ aj aj aj aj -af -af +JK +JK al al al -af +JK aj mT aj @@ -16661,11 +16645,11 @@ aj aj aj aj -af -af -af +JK +JK +JK al -af +JK aj aj aj @@ -16805,9 +16789,9 @@ aj aj aj aj -af -af -af +JK +JK +JK aj aj aj @@ -16948,8 +16932,8 @@ mn aj aj aj -af -af +JK +JK aj aj aj @@ -17090,9 +17074,9 @@ aj aj aj aj -af -af -af +JK +JK +JK aj aj mT @@ -17233,9 +17217,9 @@ aj aj aj aj -af -af -af +JK +JK +JK aj aj aj @@ -17376,8 +17360,8 @@ aj aj aj aj -af -af +JK +JK aj aj aj @@ -17518,7 +17502,7 @@ aj aj aj aj -af +JK aj aj aj diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm index 3a45472fc00..0b1878a26eb 100644 --- a/maps/gateway_vr/variable/arynthilake_b.dmm +++ b/maps/gateway_vr/variable/arynthilake_b.dmm @@ -13,9 +13,7 @@ /area/gateway/arynthilake) "ax" = ( /obj/random/mob/semirandom_mob_spawner/monster/d, -/turf/simulated/floor/outdoors/sidewalk{ - dir = 6 - }, +/turf/simulated/floor/outdoors/sidewalk/slab, /area/gateway/arynthilake/dome) "az" = ( /turf/simulated/floor/outdoors/grass, @@ -396,9 +394,7 @@ /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "hl" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 4 - }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake) "hr" = ( /obj/structure/flora/tree/sif, @@ -460,9 +456,7 @@ /turf/simulated/floor/wood/sif/broken, /area/gateway/arynthilake/oldcabin) "iG" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 4 - }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake/dome) "iI" = ( /turf/simulated/floor/tiled{ @@ -598,9 +592,7 @@ /obj/machinery/door/airlock/sandstone{ name = "Automatic Door" }, -/turf/simulated/floor/outdoors/sidewalk{ - dir = 4 - }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake/dome) "lt" = ( /obj/effect/floor_decal/techfloor, @@ -965,9 +957,7 @@ /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "tk" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 4 - }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake/engine) "tu" = ( /obj/structure/bookcase, @@ -1190,9 +1180,7 @@ /turf/simulated/floor/outdoors/grass/forest, /area/gateway/arynthilake) "zo" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 6 - }, +/turf/simulated/floor/outdoors/sidewalk/slab, /area/gateway/arynthilake/dome) "zp" = ( /turf/simulated/floor/water, @@ -2404,9 +2392,7 @@ /turf/simulated/floor/water, /area/gateway/arynthilake) "Za" = ( -/turf/simulated/floor/outdoors/sidewalk{ - dir = 6 - }, +/turf/simulated/floor/outdoors/sidewalk/slab, /area/gateway/arynthilake) "Zb" = ( /obj/effect/floor_decal/techfloor{ @@ -7404,7 +7390,7 @@ QA QA QA QA -iX +rt QA QA QA @@ -7546,8 +7532,8 @@ QA QA QA QA -iX -iX +rt +rt QA QA QA @@ -7687,9 +7673,9 @@ QA QA QA QA -iX -iX -iX +rt +rt +rt QA QA QA @@ -7828,9 +7814,9 @@ QA QA QA QA -iX -iX -iX +rt +rt +rt QA QA eg @@ -7970,8 +7956,8 @@ gs QA QA QA -iX -iX +rt +rt QA QA QA @@ -8111,9 +8097,9 @@ QA QA QA QA -iX -iX -iX +rt +rt +rt QA QA QA @@ -8251,11 +8237,11 @@ QA QA QA QA -iX -iX -iX +rt +rt +rt sP -iX +rt QA QA QA @@ -8392,12 +8378,12 @@ QA QA QA QA -iX -iX +rt +rt sP sP sP -iX +rt QA eg QA @@ -8534,12 +8520,12 @@ QA QA QA QA -iX -iX +rt +rt sP sP sP -iX +rt QA QA QA @@ -8677,11 +8663,11 @@ QA QA QA QA -iX +rt sP NR sP -iX +rt QA QA QA @@ -8819,12 +8805,12 @@ eg QA QA QA -iX +rt sP sP sP -iX -iX +rt +rt QA QA QA @@ -8961,12 +8947,12 @@ QA QA QA QA -iX -iX +rt +rt sP sP -iX -iX +rt +rt QA QA QA @@ -9104,12 +9090,12 @@ QA QA QA QA -iX -iX -iX -iX -iX -iX +rt +rt +rt +rt +rt +rt QA QA QA @@ -9247,11 +9233,11 @@ QA QA QA QA -iX -iX +rt +rt QA QA -iX +rt eg QA QA @@ -9391,7 +9377,7 @@ QA QA QA QA -iX +rt QA QA QA