diff --git a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm index 087f7d22756..bd0900addb7 100644 --- a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm +++ b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset-Lower.dmm @@ -790,12 +790,6 @@ dir = 4 }, /area/f13/building) -"axc" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/blue/side{ - dir = 9 - }, -/area/f13/building) "axw" = ( /obj/structure/simple_door/bunker, /turf/open/water, @@ -2550,13 +2544,6 @@ icon_state = "greenrustyfull" }, /area/f13/building/sewers) -"bFg" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/water{ - icon = 'icons/turf/pool.dmi'; - icon_state = "pool_tile" - }, -/area/f13/building) "bFx" = ( /turf/closed/wall/f13/ruins, /area/f13/tunnel) @@ -5325,10 +5312,6 @@ icon_state = "greenrustyfull" }, /area/f13/building/sewers) -"bYx" = ( -/obj/structure/sign/poster/contraband/space_cola, -/turf/closed/wall/f13/wood/house/clean, -/area/f13/building) "bZa" = ( /obj/structure/table/glass, /obj/effect/decal/cleanable/dirt, @@ -6356,12 +6339,6 @@ dir = 8 }, /area/f13/building) -"cwX" = ( -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel/whiteblue/corner{ - dir = 1 - }, -/area/f13/building) "cxn" = ( /obj/structure/table/wood/junk, /obj/effect/spawner/lootdrop/f13/common, @@ -7029,9 +7006,9 @@ /turf/open/floor/plasteel/f13, /area/f13/tunnel) "cXz" = ( -/turf/open/floor/plasteel/whiteblue/side{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, /area/f13/building) "cXE" = ( /obj/structure/barricade/wooden/planks/pregame, @@ -7337,7 +7314,10 @@ /turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/caves) "dkR" = ( -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, /area/f13/building) "dlb" = ( /obj/effect/decal/cleanable/blood/tracks, @@ -7963,11 +7943,10 @@ }, /area/f13/building) "dHb" = ( -/obj/item/toy/poolnoodle/blue, -/turf/open/water{ - icon = 'icons/turf/pool.dmi'; - icon_state = "pool_tile" - }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/rust, /area/f13/building) "dHd" = ( /obj/structure/chair/office/dark{ @@ -8420,9 +8399,10 @@ }, /area/f13/building/massfusion) "dWM" = ( -/turf/open/floor/plasteel/blue/side{ - dir = 10 - }, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, /area/f13/building) "dWX" = ( /obj/structure/table_frame/wood, @@ -8547,13 +8527,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"eas" = ( -/obj/structure/pool/Lboard, -/turf/open/water{ - icon = 'icons/turf/pool.dmi'; - icon_state = "pool_tile" - }, -/area/f13/building) "eaR" = ( /obj/item/trash/f13/porknbeans, /turf/open/indestructible/ground/inside/mountain, @@ -9079,10 +9052,6 @@ /obj/item/mine/stun, /turf/open/indestructible/ground/inside/mountain, /area/f13/tunnel) -"evI" = ( -/obj/structure/mineral_door/paperframe, -/turf/open/floor/plasteel/white, -/area/f13/building) "evQ" = ( /obj/structure/closet/crate/footlocker{ anchored = 1 @@ -10295,9 +10264,8 @@ /area/f13/caves) "fjJ" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/whiteblue/side{ - dir = 1 - }, +/obj/structure/closet/cabinet/anchored, +/turf/open/floor/wood_common, /area/f13/building) "fjV" = ( /obj/structure/chair/folding, @@ -12414,52 +12382,16 @@ /turf/open/floor/plating/tunnel, /area/f13/building/sewers) "gHn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/clothing/under/swimsuit/red{ - pixel_y = 8; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/red{ - pixel_y = 8; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/red{ - pixel_y = 8; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/red{ - pixel_y = 8; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/striped{ - pixel_y = 7; - pixel_x = 8 - }, -/obj/item/clothing/under/swimsuit/striped{ - pixel_y = 7; - pixel_x = 8 - }, -/obj/item/clothing/under/swimsuit/striped{ - pixel_y = 7; - pixel_x = 8 +/obj/structure/sink{ + dir = 1; + pixel_y = 16 }, -/obj/item/clothing/under/swimsuit/striped{ - pixel_y = 7; - pixel_x = 8 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13{ + color = "#818181"; + icon_state = "floorrustysolid" }, -/obj/item/clothing/under/swimsuit/white, -/obj/item/clothing/under/swimsuit/white, -/obj/item/clothing/under/swimsuit/white, -/obj/item/clothing/under/swimsuit/white, -/obj/item/clothing/under/swimsuit/white, -/obj/item/clothing/shoes/f13/swimfins, -/obj/item/clothing/shoes/f13/swimfins, -/obj/item/clothing/shoes/f13/swimfins, -/turf/open/floor/plasteel/whiteblue/side, /area/f13/building) "gHo" = ( /obj/structure/bed, @@ -12636,14 +12568,9 @@ }, /area/f13/caves) "gNL" = ( +/obj/machinery/microwave/stove, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - pixel_x = -16 - }, -/obj/structure/chair/bench, -/turf/open/floor/plasteel/whiteblue/side{ - dir = 1 - }, +/turf/open/floor/wood_common, /area/f13/building) "gNN" = ( /obj/machinery/chem_dispenser, @@ -13597,9 +13524,16 @@ /turf/open/indestructible/ground/outside/water, /area/f13/caves) "hxw" = ( -/turf/open/floor/plasteel/blue/side{ +/obj/machinery/shower{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/decoration/vent/rusty, +/turf/open/floor/f13{ + color = "#818181"; + icon_state = "floorrustysolid" + }, /area/f13/building) "hxH" = ( /mob/living/simple_animal/hostile/handy/gutsy/flamer{ @@ -13772,10 +13706,6 @@ icon_state = "horizontalbottombordertop2" }, /area/f13/caves) -"hDm" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/f13/wood/house/clean, -/area/f13/building) "hDn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/optable, @@ -13853,15 +13783,6 @@ icon_state = "greenrustyfull" }, /area/f13/building/sewers) -"hGM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel/whiteblue/side{ - dir = 8 - }, -/area/f13/building) "hHr" = ( /obj/effect/decal/cleanable/dirt{ color = "#363636" @@ -14097,10 +14018,10 @@ /area/f13/caves) "hPb" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/whiteblue/side{ - dir = 8 +/obj/structure/chair/folding{ + dir = 1 }, +/turf/open/floor/wood_common, /area/f13/building) "hPv" = ( /obj/effect/decal/cleanable/blood{ @@ -14558,15 +14479,10 @@ }, /area/f13/building) "ief" = ( -/obj/structure/chair/comfy/plywood{ - dir = 4 - }, -/obj/structure/fluff/beach_umbrella/cap, -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" +/obj/structure/curtain{ + color = "#845f58" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood_common, /area/f13/building) "iej" = ( /obj/structure/handrail/g_central{ @@ -14577,11 +14493,6 @@ icon_state = "greenrustyfull" }, /area/f13/building/sewers) -"iek" = ( -/turf/open/floor/plasteel/blue/side{ - dir = 1 - }, -/area/f13/building) "ieA" = ( /obj/structure/closet/crate{ anchored = 1; @@ -15213,13 +15124,6 @@ "ixO" = ( /turf/open/indestructible/ground/inside/subway, /area/f13/building) -"iyc" = ( -/obj/item/bikehorn/rubberducky, -/turf/open/water{ - icon = 'icons/turf/pool.dmi'; - icon_state = "pool_tile" - }, -/area/f13/building) "iyn" = ( /obj/structure/simple_door/bunker, /turf/open/indestructible/ground/inside/subway, @@ -15627,8 +15531,11 @@ /turf/open/floor/plasteel/f13/vault_floor/dark, /area/f13/building/hospital) "iJw" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/whiteblue/side, +/obj/machinery/light{ + dir = 1; + light_color = "#884444" + }, +/turf/open/floor/wood_common, /area/f13/building) "iJH" = ( /obj/structure/cable{ @@ -15754,11 +15661,12 @@ }, /area/f13/building/sewers) "iMZ" = ( -/obj/structure/chair/comfy/plywood{ - dir = 4 +/obj/structure/table, +/obj/machinery/light{ + dir = 1; + light_color = "#884444" }, -/obj/structure/fluff/beach_umbrella/security, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood_common, /area/f13/building) "iNd" = ( /obj/structure/table, @@ -16285,12 +16193,10 @@ }, /area/f13/building) "jfO" = ( -/obj/structure/chair/comfy/plywood{ - dir = 1 - }, -/obj/structure/fluff/beach_umbrella/science, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light, +/turf/open/floor/wood_common, /area/f13/building) "jfZ" = ( /obj/structure/table, @@ -16418,12 +16324,6 @@ /obj/effect/spawner/lootdrop/f13/rare, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/caves) -"jlj" = ( -/obj/structure/pool/Rboard, -/turf/open/floor/plasteel/blue/side{ - dir = 4 - }, -/area/f13/building) "jlI" = ( /obj/structure/table/wood/bar, /obj/effect/decal/cleanable/dirt, @@ -17200,7 +17100,11 @@ }, /area/f13/caves) "jNW" = ( -/turf/closed/wall/f13/wood/house/clean, +/obj/structure/window/fulltile/wood, +/obj/structure/curtain{ + color = "#808080" + }, +/turf/open/floor/wood_common, /area/f13/building) "jNY" = ( /obj/machinery/button/door{ @@ -17990,11 +17894,6 @@ icon_state = "greenrustyfull" }, /area/f13/building/sewers) -"koy" = ( -/turf/open/floor/plasteel/blue/side{ - dir = 4 - }, -/area/f13/building) "kpv" = ( /turf/open/floor/plating/tunnel{ icon_state = "tunnelchess2" @@ -19398,13 +19297,6 @@ icon_state = "greenrustyfull" }, /area/f13/tunnel) -"lmF" = ( -/obj/item/toy/beach_ball, -/turf/open/water{ - icon = 'icons/turf/pool.dmi'; - icon_state = "pool_tile" - }, -/area/f13/building) "lmU" = ( /obj/item/chair/wood/modern, /obj/effect/decal/cleanable/dirt, @@ -20557,11 +20449,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/f13/wood, /area/f13/building) -"lVu" = ( -/turf/open/floor/plasteel/whiteblue/side{ - dir = 8 - }, -/area/f13/building) "lVv" = ( /obj/machinery/microwave/stove, /turf/open/floor/wood_wide, @@ -20632,11 +20519,10 @@ }, /area/f13/caves) "lXr" = ( -/obj/item/reagent_containers/food/snacks/cola_float, -/turf/open/water{ - icon = 'icons/turf/pool.dmi'; - icon_state = "pool_tile" - }, +/obj/structure/simple_door/repaired, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, /area/f13/building) "lXt" = ( /obj/structure/wreck/trash/four_barrels, @@ -22090,14 +21976,6 @@ }, /turf/open/floor/engine, /area/f13/building) -"mTf" = ( -/obj/structure/towel_rack{ - pixel_y = 27 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel/whiteblue/side, -/area/f13/building) "mTh" = ( /obj/machinery/door/window/brigdoor/security/cell/left/directional/north{ dir = 4 @@ -22325,10 +22203,6 @@ /obj/effect/spawner/lootdrop/f13/uncommon, /turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/caves) -"mZY" = ( -/obj/structure/sign/poster/official/soft_cap_pop_art, -/turf/closed/wall/f13/wood/house/clean, -/area/f13/building) "naI" = ( /obj/item/stack/cable_coil, /turf/open/indestructible/ground/inside/subway, @@ -23250,8 +23124,8 @@ /area/f13/building) "nHj" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/white, +/obj/structure/table, +/turf/open/floor/wood_common, /area/f13/building) "nHu" = ( /obj/effect/overlay/junk/oldpipes, @@ -23920,9 +23794,6 @@ icon_state = "darkrustysolid" }, /area/f13/building/massfusion) -"oeY" = ( -/turf/open/floor/plasteel/whiteblue/corner, -/area/f13/building) "oeZ" = ( /obj/structure/simple_door/repaired, /turf/open/floor/wood_common{ @@ -24061,12 +23932,6 @@ /obj/structure/simple_door/metal, /turf/open/floor/plating/tunnel, /area/f13/caves) -"okX" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/blue/side{ - dir = 6 - }, -/area/f13/building) "ola" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/bar{ @@ -24342,15 +24207,8 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/building/sewers) "otF" = ( -/obj/structure/table/wood, -/obj/structure/bedsheetbin/towel{ - pixel_y = 5 - }, -/obj/structure/bedsheetbin/towel{ - pixel_y = -11 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/white, +/obj/structure/closet/cabinet/anchored, +/turf/open/floor/wood_common, /area/f13/building) "otS" = ( /obj/machinery/autolathe/ammo, @@ -24514,12 +24372,6 @@ icon_state = "yellowdirtyfull" }, /area/f13/caves) -"oyw" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/blue/side{ - dir = 5 - }, -/area/f13/building) "oyC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/barber{ @@ -25050,9 +24902,17 @@ /turf/open/floor/plasteel/f13/vault_floor/yellow/yellowchess/yellowchess2, /area/f13/caves) "oQP" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = 16 + }, +/obj/machinery/light/small{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/whiteblue/side{ - dir = 4 +/turf/open/floor/f13{ + color = "#818181"; + icon_state = "floorrustysolid" }, /area/f13/building) "oQZ" = ( @@ -26005,8 +25865,13 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/sewers) "puE" = ( +/obj/structure/curtain{ + color = "#845f58" + }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, /area/f13/building) "puP" = ( /obj/effect/decal/cleanable/dirt{ @@ -26042,11 +25907,10 @@ /turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/caves) "pvT" = ( +/obj/machinery/microwave/stove, /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/bench, -/turf/open/floor/plasteel/whiteblue/side{ - dir = 1 - }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, /area/f13/building) "pwb" = ( /obj/effect/decal/cleanable/blood/old, @@ -26154,8 +26018,12 @@ /area/f13/caves) "pzi" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/twohanded/required/kirbyplants/random, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13{ + color = "#818181"; + icon_state = "floorrustysolid" + }, /area/f13/building) "pzk" = ( /obj/effect/decal/cleanable/dirt, @@ -26326,11 +26194,11 @@ /turf/open/water, /area/f13/caves) "pCS" = ( -/obj/structure/chair/comfy/plywood{ - dir = 4 - }, -/obj/structure/fluff/beach_umbrella, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/cabinet/anchored, +/turf/open/floor/wood_common, /area/f13/building) "pDv" = ( /obj/structure/rack, @@ -26719,10 +26587,9 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/caves) "pPp" = ( -/obj/structure/chair/bench, -/turf/open/floor/plasteel/whiteblue/side{ - dir = 1 - }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light, +/turf/open/floor/wood_common, /area/f13/building) "pPz" = ( /obj/effect/turf_decal/box, @@ -27054,16 +26921,9 @@ /turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/caves) "qae" = ( -/obj/structure/table/wood, -/obj/item/toy/poolnoodle/blue, -/obj/item/toy/poolnoodle/blue, -/obj/item/toy/poolnoodle/red, -/obj/item/toy/poolnoodle/red, -/obj/item/toy/poolnoodle/yellow, -/obj/item/toy/poolnoodle/blue, -/obj/item/toy/poolnoodle/blue, -/obj/item/toy/poolnoodle, -/turf/open/floor/plasteel/white, +/obj/structure/bed, +/obj/item/bedsheet/red, +/turf/open/floor/wood_common, /area/f13/building) "qas" = ( /obj/machinery/vending/wallmed{ @@ -28759,11 +28619,6 @@ icon_state = "tunnelrusty" }, /area/f13/caves) -"rcn" = ( -/obj/structure/chair/comfy/plywood, -/obj/structure/fluff/beach_umbrella/syndi, -/turf/open/floor/plasteel/white, -/area/f13/building) "rco" = ( /obj/effect/decal/cleanable/oil, /turf/open/indestructible/ground/inside/subway, @@ -30071,13 +29926,14 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "rVx" = ( -/obj/structure/pool/ladder{ - dir = 2; - pixel_y = 15 +/obj/machinery/shower{ + dir = 8 }, -/turf/open/water{ - icon = 'icons/turf/pool.dmi'; - icon_state = "pool_tile" +/obj/effect/decal/cleanable/dirt, +/obj/structure/decoration/vent/rusty, +/turf/open/floor/f13{ + color = "#818181"; + icon_state = "floorrustysolid" }, /area/f13/building) "rVA" = ( @@ -30446,13 +30302,6 @@ icon_state = "yellowrustyfull" }, /area/f13/tunnel) -"sgm" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/blue/side{ - dir = 8 - }, -/area/f13/building) "sgp" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/water, @@ -30691,15 +30540,19 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/caves) "spG" = ( -/obj/structure/chair/comfy/plywood{ +/obj/structure/toilet{ dir = 4 }, -/obj/structure/fluff/beach_umbrella/engine, -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13{ + color = "#818181"; + icon_state = "floorrustysolid" }, -/turf/open/floor/plasteel/white, /area/f13/building) "sqg" = ( /obj/structure/table/reinforced, @@ -30986,12 +30839,6 @@ icon_state = "whiterustysolid" }, /area/f13/tunnel) -"szo" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/blue/side{ - dir = 1 - }, -/area/f13/building) "szv" = ( /mob/living/simple_animal/hostile/ghoul, /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid{ @@ -31149,7 +30996,9 @@ }, /area/f13/caves) "sDT" = ( -/turf/open/floor/plasteel/blue/side, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, /area/f13/building) "sDZ" = ( /obj/structure/reagent_dispensers/barrel/dangerous, @@ -31427,11 +31276,16 @@ /turf/open/floor/f13/wood, /area/f13/building) "sNJ" = ( -/obj/structure/chair/comfy/plywood{ - dir = 4 +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/f13{ + color = "#818181"; + icon_state = "floorrustysolid" }, -/obj/structure/fluff/beach_umbrella/engine, -/turf/open/floor/plasteel/white, /area/f13/building) "sNR" = ( /obj/effect/spawner/structure/window/reinforced, @@ -31670,10 +31524,13 @@ }, /area/f13/building) "sUo" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/blue/side{ +/obj/structure/toilet{ dir = 8 }, +/turf/open/floor/f13{ + color = "#818181"; + icon_state = "floorrustysolid" + }, /area/f13/building) "sUC" = ( /obj/structure/table/wood/settler, @@ -32308,14 +32165,10 @@ }, /area/f13/building/massfusion) "tnR" = ( -/obj/item/toy/poolnoodle/blue, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel/whiteblue/side{ - dir = 8 +/obj/structure/chair/folding{ + dir = 1 }, +/turf/open/floor/wood_common, /area/f13/building) "tnV" = ( /obj/machinery/light/small{ @@ -33939,12 +33792,6 @@ name = "cave" }, /area/f13/caves) -"utu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/blue/side{ - dir = 4 - }, -/area/f13/building) "utC" = ( /obj/machinery/light/small{ dir = 1 @@ -35114,12 +34961,8 @@ }, /area/f13/bunker) "vgH" = ( -/obj/structure/towel_rack{ - pixel_y = 27 - }, -/turf/open/floor/plasteel/whiteblue/corner{ - dir = 8 - }, +/obj/structure/table, +/turf/open/floor/wood_common, /area/f13/building) "vgN" = ( /obj/effect/decal/cleanable/glass, @@ -35361,10 +35204,10 @@ /turf/open/floor/f13/wood, /area/f13/caves) "vpj" = ( +/obj/structure/bed, +/obj/item/bedsheet/red, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/whiteblue/side{ - dir = 8 - }, +/turf/open/floor/wood_common, /area/f13/building) "vpl" = ( /obj/structure/disposalpipe/trunk{ @@ -36742,12 +36585,6 @@ /obj/structure/simple_door/tent, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) -"wlz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/wood, -/turf/open/floor/plasteel/whiteblue/side, -/area/f13/building) "wlL" = ( /obj/structure/reagent_dispensers/barrel/dangerous, /obj/effect/spawner/lootdrop/f13/uncommon, @@ -37595,13 +37432,6 @@ name = "Strong Door" }, /area/f13/caves) -"wNN" = ( -/obj/machinery/grill, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/whiteblue/corner{ - dir = 4 - }, -/area/f13/building) "wNV" = ( /obj/machinery/light/small{ dir = 8 @@ -38599,10 +38429,12 @@ /turf/open/indestructible/ground/inside/subway, /area/f13/building/sewers) "xvz" = ( -/turf/open/water{ - icon = 'icons/turf/pool.dmi'; - icon_state = "pool_tile" +/obj/structure/curtain{ + color = "#845f58" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, /area/f13/building) "xvT" = ( /obj/structure/bed/mattress, @@ -39906,95 +39738,6 @@ icon_state = "whitedirtysolid" }, /area/f13/building/hospital) -"yjn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/wood, -/obj/item/clothing/under/swimsuit/black{ - pixel_y = 9; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/black{ - pixel_y = 9; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/black{ - pixel_y = 9; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/black{ - pixel_y = 9; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/blue{ - pixel_y = 10; - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/blue{ - pixel_y = 10; - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/blue{ - pixel_y = 10; - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/blue{ - pixel_y = 10; - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/blue{ - pixel_y = 10; - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/blue{ - pixel_y = 10; - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/earth{ - pixel_y = -2; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/earth{ - pixel_y = -2; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/earth{ - pixel_y = -2; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/earth{ - pixel_y = -2; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/earth{ - pixel_y = -2; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/earth{ - pixel_y = -2; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/earth{ - pixel_y = -2; - pixel_x = -7 - }, -/obj/item/clothing/under/swimsuit/green{ - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/green{ - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/green{ - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/green{ - pixel_x = 5 - }, -/obj/item/clothing/under/swimsuit/green{ - pixel_x = 5 - }, -/obj/item/clothing/shoes/f13/swimfins, -/turf/open/floor/plasteel/whiteblue/side, -/area/f13/building) "yjt" = ( /obj/structure/rack, /obj/item/stack/sheet/metal/fifty, @@ -43860,18 +43603,18 @@ fqv roN gcv gcv +bOb +bOb +bOb +iad jNW +bOb +bOb +bOb +lXr jNW -jNW -jNW -mZY -evI -evI -jNW -jNW -bYx -jNW -jNW +bOb +bOb uKv mEa tkZ @@ -44117,18 +43860,18 @@ fqv tkZ gcv uQG -jNW +bOb iMZ -spG -pCS -pzi -puE -puE +hPb pCS -ief -sNJ +vpj +iad +vgH +tnR +yik +mbQ qae -jNW +bOb gcv gcv hmB @@ -44374,18 +44117,18 @@ bOb tkZ gcv gcv -jNW -dkR -puE -dkR -dkR -dkR -dkR -nHj +bOb +mbQ +mbQ +yik +yik +dHb dkR -puE +cXz +mbQ +mbQ otF -jNW +bOb hXn gcv gcv @@ -44631,18 +44374,18 @@ bOb tkZ gcv gcv -jNW -rcn -puE -puE -puE -puE -puE -puE +rte +mbQ +iad +iad +ief +jtH puE -dkR +dHb +jtH +cXz jfO -jNW +bOb mLe gcv gcv @@ -44888,18 +44631,18 @@ bOb roN gcv gcv -evI -oeY -oQP +bOb +mbQ +iad oQP +hUy +jtH +pzi +spG +jtH cXz cXz -cXz -cXz -cXz -cXz -wNN -jNW +bOb hXn gcv afb @@ -45145,18 +44888,18 @@ lJz roN gcv gcv -jNW -mTf -axc -sgm +bOb +fyn +iad +rVx sUo +jtH hxw -hxw -hxw -hxw +sNJ +jtH dWM pvT -hDm +iad hXn mEa tkZ @@ -45402,18 +45145,18 @@ bOb roN gcv gcv -jNW -yjn -szo -lmF -xvz -bFg +bOb +bOb +iad +jtH +iad dHb -xvz -xvz -sDT -pvT -hDm +dHb +dHb +jtH +jtH +jtH +iad tIS mEa tkZ @@ -45659,18 +45402,18 @@ bOb tkZ gcv gcv -jNW +bOb +fyn +bOb +uPY +fwF +jtH gHn -iek -xvz -lXr -xvz -xvz -xvz -xvz +spG +jtH sDT gNL -hDm +iad gcv mEa tkZ @@ -45916,18 +45659,18 @@ bOb tkZ hXn uQG -jNW -wlz -szo +bOb +mbQ +bOb rVx -xvz -xvz -xvz -xvz -xvz -sDT -pvT -hDm +wBV +jtH +wBV +hxw +bOb +mbQ +mbQ +iad gcv mEa tkZ @@ -46173,18 +45916,18 @@ bOb cnR hXn gcv -jNW +bOb iJw -szo -iyc -xvz -eas +bOb +iad xvz +jtH xvz -lmF -sDT +jtH +bOb +yik pPp -jNW +bOb gcv gcv tkZ @@ -46430,18 +46173,18 @@ gcv gcv hXn gcv -jNW -iJw -oyw -koy -koy -jlj -koy -utu -utu -okX +rte +mbQ +mbQ +yik +yik +iad +yik +yik +mbQ +yik fjJ -jNW +bOb gcv mEa tkZ @@ -46687,18 +46430,18 @@ gcv gcv hXn hXn -jNW +bOb vgH tnR -hPb -vpj -vpj +yik vpj +iad +nHj hPb -hGM -lVu -cwX -jNW +mbQ +yik +vpj +bOb gcv mEa tkZ @@ -46944,18 +46687,18 @@ tkZ tkZ gcv gcv +bOb +bOb +bOb +bOb jNW +bOb +bOb +bOb +rte jNW -jNW -jNW -jNW -jNW -jNW -jNW -jNW -jNW -jNW -jNW +bOb +bOb tIS mEa tkZ diff --git a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm index 5c23556d0be..7f600981dc7 100644 --- a/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm +++ b/_maps/map_files/Pahrump-Sunset/Pahrump-Sunset.dmm @@ -501,16 +501,13 @@ /area/f13/building/abandoned) "abZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cum, -/obj/effect/decal/cleanable/chem_pile, -/obj/effect/decal/cleanable/dirt, -/obj/structure/destructible/tribal_torch/wall{ - dir = 8 +/turf/open/water{ + icon = 'icons/turf/pool.dmi'; + icon_state = "pool_tile" }, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/building/abandoned) +/area/f13/building/abandoned{ + name = "Pool" + }) "aca" = ( /obj/structure/table/optable, /obj/structure/table/optable, @@ -11654,8 +11651,11 @@ /turf/open/floor/f13/wood, /area/f13/ruins) "aNO" = ( -/obj/structure/simple_door/room, -/turf/open/floor/plasteel/f13/vault_floor/neutral, +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 1 + }, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "aNP" = ( /obj/structure/chair/comfy, @@ -12829,18 +12829,17 @@ /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralchess, /area/f13/building/abandoned) "aRz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/cabinet/anchored{ - pixel_y = 10 +/obj/machinery/light{ + dir = 8; + pixel_y = -16 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/f13/common, -/obj/effect/spawner/lootdrop/f13/common, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/towel_rack{ + pixel_y = 27 }, -/area/f13/building/abandoned) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "aRA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -12976,15 +12975,6 @@ name = "dirty floor" }, /area/f13/building/abandoned) -"aRV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/wood/club, -/obj/effect/decal/cleanable/shreds, -/obj/effect/decal/cleanable/flour, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/building/abandoned) "aRW" = ( /obj/structure/tires/five, /turf/open/indestructible/ground/outside/sidewalk{ @@ -14247,20 +14237,14 @@ /turf/open/floor/wood_common, /area/f13/building/coyote/nash/school/groundfloor) "aWc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d"; dir = 1 }, -/obj/structure/flora/chomp/bush2{ - color = "#338833" - }, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/pink_three, /turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/area/f13/building/abandoned) "aWd" = ( /obj/machinery/light/small{ dir = 4; @@ -14271,14 +14255,13 @@ }, /area/f13/wasteland/city) "aWg" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/boritos, -/turf/open/floor/wood_common{ - color = "#779999" +/turf/open/water{ + icon = 'icons/turf/pool.dmi'; + icon_state = "pool_tile" }, -/area/f13/building/abandoned) +/area/f13/building/abandoned{ + name = "Pool" + }) "aWh" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -15447,13 +15430,11 @@ }, /area/f13/building/abandoned) "baF" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/obj/machinery/light, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "baH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt{ @@ -18577,12 +18558,10 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "blT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "bar" - }, -/area/f13/building/abandoned) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "blU" = ( /mob/living/simple_animal/pet/dog/eyebot{ desc = "This eyebot's weapons module has been removed and replaced with a loudspeaker. It appears to be shouting about Bighorn."; @@ -19200,7 +19179,9 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned) "bpl" = ( -/turf/closed/wall/f13/coyote/oldwood, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/blue_two, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "bpn" = ( /obj/structure/chair/left{ @@ -20304,7 +20285,8 @@ }, /area/f13/building/trader) "bvH" = ( -/turf/open/floor/plasteel/f13/vault_floor/neutral, +/obj/structure/flora/tree/cherryblossom, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "bvS" = ( /obj/effect/turf_decal/weather/dirt{ @@ -20406,7 +20388,7 @@ color = "#a98c5d" }, /turf/open/indestructible/ground/outside/dirt, -/area/f13/building/abandoned) +/area/f13/wasteland/nash) "bwA" = ( /obj/structure/chair/booth{ dir = 8 @@ -20797,6 +20779,9 @@ /area/f13/wasteland/coyote/nash/southeastcornercamp) "byY" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d" + }, /turf/open/indestructible/ground/outside/gravel{ color = "#999999" }, @@ -21430,20 +21415,20 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "bEq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/sofa/right{ - color = "#475340"; - dir = 1 - }, -/obj/structure/chair/sofa{ - color = "#475340"; - dir = 1 +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 }, -/area/f13/building/abandoned) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland/nash) "bEr" = ( /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d" @@ -22600,14 +22585,28 @@ /turf/open/indestructible/ground/outside/gravel, /area/f13/wasteland/city) "bSb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/effect/spawner/lootdrop/lighter, -/obj/effect/spawner/lootdrop/f13/common, -/turf/open/floor/f13{ - icon_state = "bar" +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 }, -/area/f13/building/abandoned) +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/obj/structure/window/fulltile/wood{ + layer = 3 + }, +/obj/structure/curtain{ + color = "#c40e0e" + }, +/turf/open/floor/wood_common{ + color = "#779999" + }, +/area/f13/building/abandoned{ + name = "Pool" + }) "bSg" = ( /obj/effect/turf_decal/weather/dirt, /turf/open/indestructible/ground/outside/road{ @@ -27722,10 +27721,35 @@ }, /area/f13/building/coyote/nash/massfus/groundfloor/east) "cNW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/f13/wood/house/broken, -/area/f13/building/abandoned) +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 0; + pixel_x = 19 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 16 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 12; + pixel_x = 17 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/building/abandoned{ + name = "Pool" + }) "cOe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/tree/jungle{ @@ -31097,13 +31121,13 @@ }, /area/f13/building/abandoned) "dCK" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/towel_rack{ + pixel_y = 27 }, -/area/f13/building/abandoned) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "dCM" = ( /obj/structure/reagent_dispensers/barrel/explosive, /turf/open/floor/plasteel, @@ -31351,18 +31375,55 @@ }, /area/f13/wasteland/city) "dFw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light{ dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 8 +/obj/structure/table/wood, +/obj/item/clothing/under/swimsuit/red{ + pixel_y = 8; + pixel_x = -7 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/obj/item/clothing/under/swimsuit/red{ + pixel_y = 8; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/red{ + pixel_y = 8; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/red{ + pixel_y = 8; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/striped{ + pixel_y = 7; + pixel_x = 8 + }, +/obj/item/clothing/under/swimsuit/striped{ + pixel_y = 7; + pixel_x = 8 + }, +/obj/item/clothing/under/swimsuit/striped{ + pixel_y = 7; + pixel_x = 8 + }, +/obj/item/clothing/under/swimsuit/striped{ + pixel_y = 7; + pixel_x = 8 + }, +/obj/item/clothing/under/swimsuit/white, +/obj/item/clothing/under/swimsuit/white, +/obj/item/clothing/under/swimsuit/white, +/obj/item/clothing/under/swimsuit/white, +/obj/item/clothing/under/swimsuit/white, +/obj/item/clothing/shoes/f13/swimfins, +/obj/item/clothing/shoes/f13/swimfins, +/obj/item/clothing/shoes/f13/swimfins, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "dFy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/camera_assembly, @@ -31432,15 +31493,6 @@ icon_state = "horizontaloutermain2" }, /area/f13/wasteland/city) -"dFU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/simple_door/repaired, -/obj/effect/decal/cleanable/dirt, -/obj/structure/destructible/tribal_torch/wall, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/building/abandoned) "dGh" = ( /obj/item/stack/f13Cash/random/low, /turf/open/floor/f13/wood, @@ -31803,6 +31855,9 @@ color = "#a98c5d"; dir = 1 }, +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d" + }, /turf/open/indestructible/ground/outside/gravel{ color = "#999999" }, @@ -32304,13 +32359,6 @@ icon_state = "horizontalbottomborderbottom0" }, /area/f13/wasteland/city/nash/redriverdepotroad) -"dPv" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/f13/wood/house, -/area/f13/building/abandoned) "dPz" = ( /mob/living/simple_animal/hostile/ghoul, /obj/effect/decal/cleanable/dirt, @@ -35300,18 +35348,22 @@ }, /area/f13/building/abandoned) "eAB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/structure/destructible/tribal_torch/wall{ - dir = 1; - pixel_y = 8 +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/obj/effect/spawner/lootdrop/f13/common, -/turf/open/floor/f13{ - icon_state = "bar" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 0; + pixel_x = 19 }, -/area/f13/building/abandoned) +/turf/open/indestructible/ground/outside/water, +/area/f13/building/abandoned{ + name = "Pool" + }) "eAI" = ( /obj/structure/fence/corner{ dir = 5 @@ -36211,18 +36263,14 @@ }, /area/f13/building) "eMe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/junk/small/tv{ - desc = "Advertisements would've played on this tv before the bombs dropped."; - icon = 'icons/fallout/objects/decorations.dmi'; - icon_state = "television"; - name = "pre-war advertising television" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/curtain{ + color = "#845f58"; + layer = 5 }, -/area/f13/building/abandoned) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "eMh" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_3" @@ -36290,11 +36338,8 @@ /turf/open/floor/wood_common, /area/f13/building/abandoned) "eMz" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 4 - }, -/turf/closed/wall/f13/coyote/oldwood, +/obj/structure/flora/tree/cherryblossom3, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "eMB" = ( /obj/structure/simple_door/room, @@ -36600,19 +36645,14 @@ /turf/open/floor/f13, /area/f13/building/abandoned) "eQQ" = ( -/obj/structure/flora/grass/wasteland{ - icon_state = "tall_grass_6" - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 1 +/obj/structure/fluff/beach_umbrella/security, +/obj/structure/chair/comfy/plywood{ + dir = 8 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "eQT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/weather/dirt, @@ -42386,21 +42426,17 @@ /turf/open/floor/plasteel/f13/vault_floor/blue, /area/f13/ruins) "ggj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/bed/old{ +/obj/structure/pool/ladder{ + dir = 2; pixel_y = 15 }, -/obj/structure/bed/old, -/obj/item/blanket{ - pixel_y = 15 +/turf/open/water{ + icon = 'icons/turf/pool.dmi'; + icon_state = "pool_tile" }, -/obj/item/blanket, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/building/abandoned) +/area/f13/building/abandoned{ + name = "Pool" + }) "ggm" = ( /obj/structure/table, /obj/item/storage/backpack/duffelbag/med/surgery, @@ -43736,14 +43772,21 @@ /turf/open/floor/plasteel/f13/vault_floor/neutral/neutralsolid, /area/f13/building/abandoned) "gym" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d" +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/shreds, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/obj/structure/mineral_door/paperframe{ + color = "71797E" + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned) "gyn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt{ @@ -46538,13 +46581,8 @@ /turf/open/floor/grass, /area/f13/building) "hdO" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 1 - }, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d" - }, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/purple, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "hdV" = ( @@ -49080,9 +49118,9 @@ /turf/open/indestructible/ground/outside/sidewalk, /area/f13/building) "hJI" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 8 +/obj/machinery/light{ + dir = 8; + pixel_y = 0 }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/indestructible/ground/outside/dirt, @@ -49388,23 +49426,14 @@ }, /area/f13/bar/nash) "hNE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/overlay/junk/toilet{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/effect/overlay/junk/sink{ - pixel_x = -8; - pixel_y = 23 - }, -/obj/effect/overlay/junk/mirror{ - pixel_x = -8; - pixel_y = 32 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/machinery/light{ + dir = 1 }, -/area/f13/building/abandoned) +/obj/machinery/grill, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "hNF" = ( /obj/structure/flora/junglebush, /turf/open/indestructible/ground/outside/dirt, @@ -50340,10 +50369,12 @@ /turf/closed/wall/mineral/brick, /area/f13/building/bank) "hYa" = ( -/obj/structure/window/fulltile/house/broken, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common, -/area/f13/building/abandoned) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "hYe" = ( /obj/effect/overlay/junk/sink{ dir = 4; @@ -54227,10 +54258,12 @@ color = "#a98c5d"; dir = 4 }, -/turf/open/indestructible/ground/outside/gravel{ - color = "#999999" +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" }, -/area/f13/wasteland/nash) +/area/f13/building/abandoned{ + name = "Pool" + }) "iOX" = ( /obj/structure/chair/wood{ dir = 1 @@ -55384,18 +55417,13 @@ /turf/open/floor/f13/wood, /area/f13/ruins) "jcv" = ( -/obj/structure/window/fulltile/wood{ - layer = 3 - }, -/obj/structure/curtain{ - color = "#c40e0e" - }, -/obj/structure/railing{ - color = "#A47449" - }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 1 }, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/pink, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "jcz" = ( /obj/structure/flora/grass/wasteland{ @@ -55755,22 +55783,8 @@ /turf/open/floor/f13/wood, /area/f13/ruins) "jhE" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 4 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam" - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 16 - }, -/turf/open/indestructible/ground/outside/water, +/obj/structure/flora/wild_plant/flower/blue_two, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "jhF" = ( /obj/structure/flora/grass/wasteland{ @@ -56041,7 +56055,16 @@ color = "#a98c5d"; dir = 8 }, -/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 + }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/nash) "jkU" = ( @@ -56682,14 +56705,18 @@ }, /area/f13/wasteland/city/nash/downtown) "jtQ" = ( -/obj/structure/spacevine{ - name = "vines" - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/brflowers, -/turf/closed/wall/mineral/brick, -/area/f13/building/abandoned) +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" + }, +/area/f13/building/abandoned{ + name = "Pool" + }) "jtV" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -60588,19 +60615,8 @@ }, /area/f13/wasteland/city/nash/downtown) "koT" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam" - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 0; - pixel_x = 19 - }, -/turf/open/indestructible/ground/outside/water, +/obj/structure/flora/wild_plant/flower/purple_two, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "koX" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -61928,23 +61944,17 @@ }, /area/f13/building/massfusion) "kFC" = ( -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 1; - pixel_y = 12 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke" +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 8 }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 0; - pixel_x = 19 +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 }, -/turf/open/indestructible/ground/outside/water, -/area/f13/building/abandoned) +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland/nash) "kFF" = ( /obj/structure/destructible/tribal_torch/wall/lit, /obj/machinery/recycler, @@ -62335,10 +62345,12 @@ /turf/open/floor/wood_common, /area/f13/building/coyote/nash/school/groundfloor) "kKt" = ( -/obj/structure/window/fulltile/house, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common, -/area/f13/building/abandoned) +/obj/structure/table/wood, +/obj/structure/bedsheetbin/towel, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "kKu" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/f13/uncommon, @@ -64163,6 +64175,9 @@ /obj/structure/flora/chomp/bush2{ color = "#338833" }, +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d" + }, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland/nash) "lfg" = ( @@ -64268,22 +64283,8 @@ /turf/open/floor/f13/wood, /area/f13/building/abandoned) "lgi" = ( -/obj/item/clothing/under/swimsuit/black, -/obj/item/clothing/under/swimsuit/black, -/obj/item/clothing/under/swimsuit/blue, -/obj/item/clothing/under/swimsuit/blue, -/obj/item/clothing/under/swimsuit/earth, -/obj/item/clothing/under/swimsuit/earth, -/obj/item/clothing/under/swimsuit/green, -/obj/item/clothing/under/swimsuit/green, -/obj/item/clothing/under/swimsuit/red, -/obj/item/clothing/under/swimsuit/red, -/obj/item/clothing/under/swimsuit/striped, -/obj/item/clothing/under/swimsuit/striped, -/obj/item/clothing/under/swimsuit/white, -/obj/item/clothing/under/swimsuit/white, -/obj/structure/table/wood, -/turf/open/floor/plasteel/f13/vault_floor/neutral, +/obj/structure/flora/wild_plant/flower/blue, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "lgk" = ( /obj/structure/table/booth, @@ -65384,11 +65385,27 @@ /turf/open/floor/f13/wood, /area/f13/ruins) "ltt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/f13/wood/house/broken, -/area/f13/building/abandoned) +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 + }, +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" + }, +/area/f13/building/abandoned{ + name = "Pool" + }) "ltv" = ( /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d"; @@ -65443,20 +65460,22 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/white, /area/f13/building/coyote/nash/museum/groundfloor) "luk" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 1 +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 }, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d" +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 }, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 4 +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/area/f13/building/abandoned{ + name = "Pool" + }) "lul" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_4" @@ -65638,17 +65657,14 @@ /turf/open/floor/f13/wood, /area/f13/ruins) "lwS" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/trash_stack, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 1 - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/obj/item/bikehorn/rubberducky, +/turf/open/water{ + icon = 'icons/turf/pool.dmi'; + icon_state = "pool_tile" + }, +/area/f13/building/abandoned{ + name = "Pool" + }) "lwU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/cabinet, @@ -66622,15 +66638,13 @@ }, /area/f13/wasteland/city) "lHc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/sofa/right{ - color = "#475340"; - dir = 1 - }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/machinery/light{ + dir = 4 }, -/area/f13/building/abandoned) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "lHe" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -67909,19 +67923,17 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "lVA" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 4 +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 }, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 8 +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" }, -/turf/open/indestructible/ground/outside/gravel{ - color = "#999999" - }, -/area/f13/wasteland/nash) +/area/f13/building/abandoned{ + name = "Pool" + }) "lVF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -68389,15 +68401,14 @@ /turf/open/floor/carpet/red, /area/f13/bar/heaven) "maz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/dresser{ - pixel_y = 5 - }, -/obj/effect/decal/cleanable/flour, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/building/abandoned) +/obj/item/reagent_containers/food/snacks/cola_float, +/turf/open/water{ + icon = 'icons/turf/pool.dmi'; + icon_state = "pool_tile" + }, +/area/f13/building/abandoned{ + name = "Pool" + }) "maC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/sandbags, @@ -68682,13 +68693,14 @@ }, /area/f13/building) "mcY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/simple_door/tent, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/item/toy/beach_ball, +/turf/open/water{ + icon = 'icons/turf/pool.dmi'; + icon_state = "pool_tile" }, -/area/f13/building/abandoned) +/area/f13/building/abandoned{ + name = "Pool" + }) "mdh" = ( /obj/structure/fence, /turf/open/indestructible/ground/outside/dirt{ @@ -72548,13 +72560,23 @@ }, /area/f13/wasteland/city) "mWA" = ( -/obj/structure/flora/junglebush/large, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 8 +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/obj/structure/spacevine{ + name = "vines" + }, +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" + }, +/area/f13/building/abandoned) "mWD" = ( /mob/living/simple_animal/hostile/bloatfly, /turf/open/indestructible/ground/outside/sidewalk{ @@ -75173,12 +75195,24 @@ }, /area/f13/building/coyote/nash/massfus/parkinglot) "nyU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/fridge, -/turf/open/floor/f13{ - icon_state = "bar" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke" }, -/area/f13/building/abandoned) +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 0; + pixel_x = 19 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/building/abandoned{ + name = "Pool" + }) "nzb" = ( /obj/structure/simple_door/tent, /obj/structure/decoration/rag, @@ -76343,16 +76377,23 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "nNM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/structure/destructible/tribal_torch/wall{ +/obj/structure/fence/wooden{ + density = 0; dir = 1; - pixel_y = 8 + pixel_x = 14 }, -/obj/effect/spawner/lootdrop/f13/common, -/turf/open/floor/f13{ - icon_state = "bar" +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/obj/structure/window/fulltile/wood{ + layer = 3 + }, +/obj/structure/curtain{ + color = "#c40e0e" }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/f13/building/abandoned) "nNO" = ( /obj/effect/turf_decal/weather/dirt, @@ -77402,12 +77443,12 @@ }, /area/f13/wasteland/city/nash/downtown) "oab" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/destructible/tribal_torch/wall, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 8 }, +/obj/structure/flora/wild_plant/flower/orange, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "oac" = ( /obj/structure/table, @@ -77602,14 +77643,14 @@ /turf/open/indestructible/ground/outside/desert, /area/f13/caves) "ocf" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/destructible/tribal_torch/wall, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/fluff/beach_umbrella/science, +/obj/structure/chair/comfy/plywood{ + dir = 8 }, -/area/f13/building/abandoned) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "och" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -79340,16 +79381,15 @@ }, /area/f13/building/coyote/nash/museum/groundfloor) "owx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/destructible/tribal_torch/wall, -/obj/structure/chair/sofa/left{ - color = "#475340"; - dir = 1 +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 }, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/mineral_door/paperframe{ + color = "71797E" }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, /area/f13/building/abandoned) "owz" = ( /obj/structure/ladder/unbreakable{ @@ -79363,15 +79403,19 @@ }, /area/f13/building/tribal) "owD" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 1 - }, -/obj/structure/flora/chomp/bush2{ - color = "#338833" - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/obj/structure/table/wood, +/obj/item/toy/poolnoodle/blue, +/obj/item/toy/poolnoodle/blue, +/obj/item/toy/poolnoodle/red, +/obj/item/toy/poolnoodle/red, +/obj/item/toy/poolnoodle/yellow, +/obj/item/toy/poolnoodle/blue, +/obj/item/toy/poolnoodle/blue, +/obj/item/toy/poolnoodle, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "owM" = ( /obj/structure/simple_door/interior, /obj/effect/decal/cleanable/dirt, @@ -79527,11 +79571,8 @@ dir = 1; pixel_x = -14 }, -/obj/structure/spacevine{ - name = "vines" - }, -/turf/closed/wall/f13/sunset/brick_small_dark{ - color = "#AA5555" +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" }, /area/f13/building/abandoned) "oyD" = ( @@ -83475,23 +83516,17 @@ }, /area/f13/wasteland) "psC" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 4 - }, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 8 +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 }, -/turf/open/indestructible/ground/outside/gravel{ - color = "#999999" +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" }, -/area/f13/wasteland/nash) +/area/f13/building/abandoned{ + name = "Pool" + }) "psD" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_6" @@ -84516,19 +84551,12 @@ }, /area/f13/wasteland/city/nash/theloop) "pCI" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/effect/overlay/junk/curtain, -/obj/structure/decoration/vent/rusty{ - pixel_y = -9 - }, -/obj/machinery/shower{ - dir = 4 - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" }, -/area/f13/building/abandoned) +/area/f13/building/abandoned{ + name = "Pool" + }) "pCJ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -85341,32 +85369,9 @@ /turf/open/indestructible/ground/outside/gravel, /area/f13/wasteland) "pMz" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam" - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 0; - pixel_x = 19 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 16 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 12; - pixel_x = 17 - }, -/turf/open/indestructible/ground/outside/water, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/pink_two, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "pMA" = ( /obj/structure/nest/randomized{ @@ -87685,15 +87690,15 @@ }, /area/f13/building/coyote/nash/firestation) "qqy" = ( -/obj/structure/spacevine{ - name = "vines" - }, /obj/effect/turf_decal/weather/dirt{ dir = 6 }, -/obj/structure/flora/ausbushes/brflowers, -/turf/closed/wall/mineral/brick, -/area/f13/building/abandoned) +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" + }, +/area/f13/building/abandoned{ + name = "Pool" + }) "qqE" = ( /obj/structure/barricade/wooden, /turf/open/indestructible/ground/outside/road{ @@ -88223,7 +88228,12 @@ "qwS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/f13/coyote/oldwood, +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 1 + }, +/obj/structure/flora/wild_plant/flower/orange, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "qwT" = ( /obj/effect/spawner/lootdrop/f13/armor/clothes, @@ -91019,13 +91029,13 @@ }, /area/f13/building/tribal) "rcz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 1 }, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/pink_two, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "rcB" = ( /obj/structure/flora/grass/wasteland{ @@ -92420,12 +92430,11 @@ }, /area/f13/wasteland/city) "rrW" = ( -/obj/structure/spacevine{ - name = "vines" +/obj/structure/flora/chomp/bush2{ + color = "#338833" }, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/ausbushes/ppflowers, -/turf/closed/wall/mineral/brick, +/obj/structure/flora/tree/cherryblossom4, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "rrZ" = ( /obj/effect/landmark/start/f13/wastelander, @@ -93302,13 +93311,28 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vault1, /area/f13/bar/heaven) "rEP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/junk/micro, -/turf/open/floor/f13{ - icon_state = "bar" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/area/f13/building/abandoned) +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 0; + pixel_x = 19 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 16 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/building/abandoned{ + name = "Pool" + }) "rEQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/wreck/trash/machinepile, @@ -98685,11 +98709,32 @@ }, /area/f13/wasteland/city) "sQt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/f13/wood/house, -/area/f13/building/abandoned) +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = 14 + }, +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 + }, +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" + }, +/area/f13/building/abandoned{ + name = "Pool" + }) "sQw" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/ghoul/reaver, @@ -99854,11 +99899,13 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "tbM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/f13/wood/house, -/area/f13/building/abandoned) +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 4 + }, +/obj/structure/table/wood/club, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/wasteland/nash) "tbW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -100013,16 +100060,8 @@ }, /area/f13/building/abandoned) "tdV" = ( -/obj/structure/railing{ - color = "#A47449"; - dir = 4 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam" - }, -/turf/open/indestructible/ground/outside/water, +/obj/structure/flora/wild_plant/flower/orange, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "tea" = ( /obj/effect/landmark/vertibird{ @@ -100046,16 +100085,6 @@ }, /turf/open/floor/f13/wood, /area/f13/store) -"tef" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/shreds, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/wood_common{ - color = "#779999" - }, -/area/f13/building/abandoned) "teg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/f13/outside/road{ @@ -100459,9 +100488,10 @@ }, /area/f13/wasteland) "tiB" = ( -/obj/structure/table/wood, -/obj/structure/bedsheetbin/towel, -/turf/open/floor/plasteel/f13/vault_floor/neutral, +/obj/structure/flora/chomp/bush2{ + color = "#338833" + }, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "tiK" = ( /obj/effect/turf_decal/weather/dirt{ @@ -100874,14 +100904,14 @@ }, /area/f13/building/abandoned) "toD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/chem_pile, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/fluff/beach_umbrella/cap, +/obj/structure/chair/comfy/plywood{ + dir = 8 }, -/area/f13/building/abandoned) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "toE" = ( /obj/structure/decoration/rag, /turf/closed/wall/mineral/brick, @@ -102747,12 +102777,8 @@ }, /area/f13/building/abandoned) "tGS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/simple_door/dirtyglass, -/turf/open/floor/wood_common{ - color = "#779999" +/turf/closed/wall/f13/wood/house/clean{ + color = "71797E" }, /area/f13/building/abandoned) "tGT" = ( @@ -102840,15 +102866,8 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building/abandoned) "tIq" = ( -/obj/structure/destructible/tribal_torch/wall/lit{ - dir = 1; - pixel_y = 12 - }, -/obj/item/clothing/under/misc/bathrobe, -/obj/item/clothing/under/misc/bathrobe, -/obj/item/clothing/under/misc/bathrobe, -/obj/structure/table/wood, -/turf/open/floor/plasteel/f13/vault_floor/neutral, +/obj/structure/flora/wild_plant/flower/purple, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "tIr" = ( /obj/structure/weightlifter, @@ -103060,18 +103079,96 @@ }, /area/f13/wasteland/city) "tKM" = ( -/obj/structure/flora/grass/coyote/four, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d" +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/wood, +/obj/item/clothing/under/swimsuit/black{ + pixel_y = 9; + pixel_x = -7 }, -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 8 +/obj/item/clothing/under/swimsuit/black{ + pixel_y = 9; + pixel_x = -7 }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/obj/item/clothing/under/swimsuit/black{ + pixel_y = 9; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/black{ + pixel_y = 9; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/blue{ + pixel_y = 10; + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/blue{ + pixel_y = 10; + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/blue{ + pixel_y = 10; + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/blue{ + pixel_y = 10; + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/blue{ + pixel_y = 10; + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/blue{ + pixel_y = 10; + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/earth{ + pixel_y = -2; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/earth{ + pixel_y = -2; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/earth{ + pixel_y = -2; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/earth{ + pixel_y = -2; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/earth{ + pixel_y = -2; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/earth{ + pixel_y = -2; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/earth{ + pixel_y = -2; + pixel_x = -7 + }, +/obj/item/clothing/under/swimsuit/green{ + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/green{ + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/green{ + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/green{ + pixel_x = 5 + }, +/obj/item/clothing/under/swimsuit/green{ + pixel_x = 5 + }, +/obj/item/clothing/shoes/f13/swimfins, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "tKP" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -105457,14 +105554,15 @@ }, /area/f13/wasteland) "uoJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/shreds, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/fence/wooden{ + density = 0; + dir = 1; + pixel_x = -14 }, -/area/f13/building/abandoned) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "uoU" = ( /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d"; @@ -105614,10 +105712,6 @@ }, /area/f13/building/coyote/nash/firestation) "uqA" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 4 - }, /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d" }, @@ -105626,7 +105720,7 @@ id = "redwatersewersresidential" }, /turf/open/indestructible/ground/outside/dirt, -/area/f13/building/abandoned) +/area/f13/wasteland/nash) "uqG" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -105771,12 +105865,11 @@ /turf/open/floor/f13/wood, /area/f13/building/coyote/nash/museum/groundfloor) "utd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bookcase, -/obj/effect/spawner/lootdrop/f13/common, -/turf/open/floor/wood_common{ - color = "#779999" +/obj/structure/flora/chomp/bush2{ + color = "#338833" }, +/obj/structure/flora/wild_plant/flower/red_two, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "utf" = ( /obj/effect/turf_decal/weather/dirt{ @@ -110251,10 +110344,14 @@ }, /area/f13/wasteland/city) "vwx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/grass, -/area/f13/wasteland/nash) +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 1 + }, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/blue, +/turf/open/indestructible/ground/outside/dirt, +/area/f13/building/abandoned) "vwy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -111369,26 +111466,14 @@ /turf/open/floor/plating/f13/inside/gravel, /area/f13/wasteland) "vKM" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam" - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 0; - pixel_x = 19 +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 4 }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 16 +/turf/closed/wall/f13/coyote/fortress_brick{ + color = "#775555" }, -/turf/open/indestructible/ground/outside/water, -/area/f13/building/abandoned) +/area/f13/wasteland/nash) "vKS" = ( /obj/structure/flora/rock/pile/largejungle, /obj/structure/flora/ausbushes/stalkybush, @@ -112629,13 +112714,35 @@ }, /area/f13/wasteland/city/nash/downtown) "vZd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/overlay/junk/curtain, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13{ - icon_state = "bar" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/area/f13/building/abandoned) +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 16 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 0; + pixel_x = 19 + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 12; + pixel_x = 17 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/building/abandoned{ + name = "Pool" + }) "vZh" = ( /obj/structure/closet/crate/bin, /obj/effect/decal/cleanable/dirt/dust, @@ -114525,7 +114632,12 @@ color = "#a98c5d"; dir = 8 }, -/turf/closed/wall/f13/coyote/oldwood, +/obj/effect/turf_decal/weather/dirt{ + color = "#a98c5d"; + dir = 1 + }, +/obj/structure/flora/tree/cherryblossom3, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "wwh" = ( /obj/effect/decal/cleanable/blood/drip, @@ -114668,14 +114780,15 @@ }, /area/f13/wasteland/nash) "wxx" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/effect/spawner/lootdrop/f13/common, -/turf/open/floor/f13{ - icon_state = "bar" +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" }, -/area/f13/building/abandoned) +/turf/open/indestructible/ground/outside/water, +/area/f13/building/abandoned{ + name = "Pool" + }) "wxE" = ( /obj/structure/railing/dancing_pole{ pixel_y = 10 @@ -114748,16 +114861,17 @@ }, /area/f13/tunnel) "wyl" = ( -/obj/effect/turf_decal/weather/dirt{ - color = "#a98c5d"; - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/chomp/bush2{ - color = "#338833" - }, -/turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/obj/structure/table/wood, +/obj/item/clothing/under/misc/bathrobe, +/obj/item/clothing/under/misc/bathrobe, +/obj/item/clothing/under/misc/bathrobe, +/obj/item/clothing/under/misc/bathrobe, +/obj/item/clothing/under/misc/bathrobe, +/obj/item/clothing/under/misc/bathrobe, +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "wyy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/junk/small/table, @@ -117987,32 +118101,9 @@ }, /area/f13/building) "xiS" = ( -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam" - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 16 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 0; - pixel_x = 19 - }, -/obj/structure/spacevine{ - icon = 'icons/effects/effects.dmi'; - icon_state = "smoke"; - name = "steam"; - pixel_y = 12; - pixel_x = 17 - }, -/turf/open/indestructible/ground/outside/water, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/red, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "xiU" = ( /obj/structure/flora/grass/coyote/twentyone, @@ -120908,9 +120999,21 @@ }, /area/f13/wasteland) "xRv" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall/f13/wood/house/broken, -/area/f13/building/abandoned) +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam" + }, +/obj/structure/spacevine{ + icon = 'icons/effects/effects.dmi'; + icon_state = "smoke"; + name = "steam"; + pixel_y = 16 + }, +/turf/open/indestructible/ground/outside/water, +/area/f13/building/abandoned{ + name = "Pool" + }) "xRE" = ( /obj/effect/decal/cleanable/oil/slippery{ pixel_x = -10; @@ -121315,9 +121418,9 @@ }, /area/f13/building/abandoned) "xWK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/f13/wood/house/broken, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/pink, +/turf/open/indestructible/ground/outside/dirt, /area/f13/building/abandoned) "xWN" = ( /obj/structure/flora/grass/coyote/one, @@ -121649,9 +121752,10 @@ }, /area/f13/building/coyote/nash/massfus/sidebuilding) "ybq" = ( -/obj/item/trash/boritos, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/wild_plant/flower/pink_three, /turf/open/indestructible/ground/outside/dirt, -/area/f13/wasteland/nash) +/area/f13/building/abandoned) "ybs" = ( /obj/effect/decal/cleanable/dirt{ color = "000000" @@ -122337,24 +122441,14 @@ }, /area/f13/ruins) "yiU" = ( -/obj/structure/fence/wooden{ - density = 0; - dir = 1; - pixel_x = 14 - }, -/obj/structure/fence/wooden{ - density = 0; - dir = 1; - pixel_x = -14 - }, -/obj/structure/spacevine{ - name = "vines" - }, -/obj/structure/flora/ausbushes/brflowers, -/turf/closed/wall/f13/sunset/brick_small_dark{ - color = "#AA5555" +/obj/structure/fluff/beach_umbrella/engine, +/obj/structure/chair/comfy/plywood{ + dir = 8 }, -/area/f13/building/abandoned) +/turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria, +/area/f13/building/abandoned{ + name = "Pool" + }) "yiW" = ( /obj/structure/spacevine, /turf/open/indestructible/ground/outside/road{ @@ -132074,11 +132168,11 @@ dtG bhh dMQ lRi -ksL -wvR +caB wvR -bpl -bpl +oab +hft +rrW vRK ffy fWe @@ -132332,9 +132426,9 @@ qyA rij hMg dJE -bpl -kFC -pMz +vwx +tiB +hft xiS vRK oAi @@ -132588,11 +132682,11 @@ aEZ aqQ bhx joj -ksL -jcv +caB +rcz koT pMz -pMz +xWK vRK vRK rkl @@ -132845,10 +132939,10 @@ bcs wKI gSD joj -ksL +caB jcv tdV -vKM +hft jhE vRK pKW @@ -133102,11 +133196,11 @@ wnC gdr fVO sSP -ksL -bpl -bvH -bvH -bvH +caB +aNO +utd +xiS +ybq vRK rCW uDB @@ -133359,11 +133453,11 @@ hxJ vWh scB xtt -ksL +caB aNO bvH -bvH -bvH +hft +hdO vRK lhz oRz @@ -133616,8 +133710,8 @@ wwp kUT rij lff -ksL -bpl +caB +aWc tIq tiB lgi @@ -133876,7 +133970,7 @@ dNK byY qwS bpl -bpl +hft eMz gAn lyB @@ -134133,8 +134227,8 @@ sMi sMi iOq psC -lVA -eMo +psC +pCI vRK pKW mfc @@ -134385,13 +134479,13 @@ tIh ksL dLe qqy -rij -rij -rij +luk +sQt +ltt jtQ dFw tKM -caB +pCI vRK rCW wuA @@ -134641,14 +134735,14 @@ sAk fvw aWK bwy -rij +luk aRz -tef -abZ -rij -aWc -gym -caB +blT +blT +uoJ +blT +blT +pCI vRK bzq rDE @@ -134897,15 +134991,15 @@ xjB sAk xlK aWK -hdO -rij -maz +eiJ +bSb +blT +aWg +aWg +abZ aWg -toD -hYa -eQQ baF -caB +pCI vRK bzq rDE @@ -135155,14 +135249,14 @@ sAk fvw aXj uqA -rij -aRV +bSb +blT ggj -rcz -rij +aWg lwS -stY -caB +aWg +blT +pCI gAn lhz ozV @@ -135411,15 +135505,15 @@ ezh sAk tIh aWK -ayh -rij -muX -tbM +fnZ +bSb +blT +aWg mcY -rij -sBT -luk -caB +aWg +abZ +blT +pCI vRK pKW ozV @@ -135668,15 +135762,15 @@ ayh bVH bVH aWK -rij +oyC +pCI +blT +aWg +aWg +aWg +maz +blT pCI -oab -ixZ -bcs -utd -rij -dNK -nxL vRK rCW wuA @@ -135925,15 +136019,15 @@ iRj bII bDN aWK -rij +oyC hNE -kff -dFU -hxJ -hxJ +blT +blT +blT +blT hYa -caB -mWA +blT +pCI vRK bzq sns @@ -136182,15 +136276,15 @@ gos ivb bDN aWK -oyC -xRv -xWK -ltt -dCK +gym +blT +blT +blT +eQQ ocf yiU -caB -gfx +toD +pCI vRK bzq ozV @@ -136439,15 +136533,15 @@ lda evh nmh aWK -yiU -bSb +owx blT -sQt -uoJ -dCK -tGS -bce -ewL +blT +blT +blT +blT +blT +baF +pCI vRK jrf vfs @@ -136697,14 +136791,14 @@ eNy eNy jxf oyC -nNM -ymf -dPv -gzP +pCI +pCI +pCI +pCI dCK -rij -lAu -bII +blT +blT +pCI gAn pKW sns @@ -136953,15 +137047,15 @@ omh npK jun aWK -rij +oyC nyU -aWZ +cNW vZd -hxJ -owx -rij -tfE -vwx +eMe +blT +blT +owD +pCI gAn mRW gNH @@ -137210,15 +137304,15 @@ xju bII fja aWK -rij +nNM eAB -tKs +cNW cNW eMe -bEq +blT kKt wyl -vwx +pCI vRK lyB sns @@ -137467,15 +137561,15 @@ xju gUQ dRP bce -oyC +mWA wxx rEP xRv -bcs +eMe lHc -rij -owD -bII +pCI +pCI +pCI vRK bzq ozV @@ -137724,15 +137818,15 @@ omh caB lAu uIr -ayh -rij -oyC -yiU -oyC -rij -rrW -tfE -ivb +tGS +pCI +pCI +pCI +lVA +lVA +pCI +gfx +gfx vRK lhz oYh @@ -137971,8 +138065,8 @@ rij blp tfE gfx -wJZ -wJZ +vKM +tbM omh omh omh @@ -137980,15 +138074,15 @@ omh omh aWK tfE -bQW -cOY +gfx +kFC +jkL +jkL jkL -xPk -xPk -hJI -hJI ivb -ybq +hJI +bEq +gfx cmf gAn pKW