diff --git a/_maps/map_files/coyote_bayou/Newboston-Upper.dmm b/_maps/map_files/coyote_bayou/Newboston-Upper.dmm index b5b70b07eb..d530a9d40f 100644 --- a/_maps/map_files/coyote_bayou/Newboston-Upper.dmm +++ b/_maps/map_files/coyote_bayou/Newboston-Upper.dmm @@ -1,22 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ad" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/structure/curtain{ - open = 0 - }, -/obj/machinery/shower{ - pixel_y = 27 - }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/plasteel/showroomfloor, /area/f13/wasteland/city/newboston/house/cabin_three) "ae" = ( -/obj/structure/curtain{ - color = "#363636"; - alpha = 255 - }, /obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/north, /turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_seven) "af" = ( @@ -73,7 +61,9 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/chair/sofa/left, +/obj/structure/chair/sofa/left{ + color = "#353535" + }, /turf/open/floor/carpet/blue, /area/f13/wasteland/city/newboston/bank) "ar" = ( @@ -261,6 +251,20 @@ "aX" = ( /turf/open/transparent/openspace, /area/f13/tribe) +"aZ" = ( +/obj/machinery/computer/arcade/orion_trail{ + icon_screen = "library"; + icon_state = "oldcomp"; + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/table, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/carpet/arcade, +/area/f13/wasteland/city/newboston/house/cabin_two) "ba" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -282,10 +286,11 @@ /turf/open/floor/plasteel/f13/vault_floor/purple, /area/f13/building) "bd" = ( -/obj/structure/table/wood/settler, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/machinery/light, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) "be" = ( /obj/effect/turf_decal/weather/dirt{ @@ -316,7 +321,10 @@ /turf/open/floor/plasteel/f13/vault_floor/neutral/white/whitepurplechess, /area/f13/building/hospital/clinic/nash) "bi" = ( -/turf/open/floor/carpet/vault, +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/house/cabin_two) "bj" = ( /obj/effect/turf_decal/weather/dirt{ @@ -338,6 +346,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/rack, +/obj/item/storage/belt/xenoarch/full, +/obj/item/storage/belt/xenoarch/full, /turf/open/floor/plasteel/f13/vault_floor/purple/side{ dir = 8 }, @@ -382,7 +392,7 @@ icon_state = "skin" }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "bA" = ( @@ -392,6 +402,14 @@ }, /turf/open/floor/f13/wood, /area/f13/building/tribal) +"bC" = ( +/obj/structure/chair/sofa/corp/left{ + dir = 1 + }, +/turf/open/floor/f13{ + icon_state = "floorrusty" + }, +/area/f13/building) "bD" = ( /obj/item/mop, /obj/structure/janitorialcart, @@ -404,18 +422,19 @@ }, /area/f13/building) "bH" = ( -/obj/structure/simple_door/wood, -/obj/item/lock_bolt{ - dir = 1 +/obj/structure/sign/poster/prewar/poster61{ + pixel_x = 32 }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/bed/double, +/obj/item/bedsheet/doublesheetrd, +/turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/house/cabin_three) "bI" = ( /obj/structure/spacevine{ color = "#225522" }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "bL" = ( @@ -438,6 +457,12 @@ icon_state = "bluedirtychess2" }, /area/f13/building) +"bT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood_common, +/area/f13/building) "bZ" = ( /obj/structure/toilet, /turf/open/floor/f13{ @@ -525,15 +550,18 @@ "ck" = ( /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = 3 + pixel_y = 3; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -6 + pixel_y = -6; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -2 + pixel_y = -2; + plane = -14 }, /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -596,18 +624,17 @@ /turf/open/floor/plasteel/cult, /area/f13/building/tribal) "cy" = ( -/obj/structure/table/wood/settler, -/obj/item/pen/fountain, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/structure/chair/comfy/beige{ + dir = 8 }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) "cz" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/turf/open/floor/plasteel/darkpurple/corner{ - dir = 8 +/obj/structure/simple_door/tentflap_cloth, +/obj/structure/spacevine{ + opacity = 1 }, +/turf/open/floor/plasteel/f13/stone/rugged, /area/f13/wasteland/city/newboston/house/cabin_four) "cA" = ( /obj/structure/disposalpipe/segment, @@ -688,14 +715,32 @@ /turf/open/transparent/openspace, /area/f13/wasteland/city/newboston/outdoors) "cR" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 4 }, -/turf/open/floor/carpet/vault, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) "cS" = ( -/obj/item/reagent_containers/rag/towel/random, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_two) "cT" = ( /obj/effect/turf_decal/weather/dirt{ @@ -772,6 +817,10 @@ /obj/structure/wreck/trash/machinepiletwo, /turf/open/floor/plasteel/f13/vault_floor/purple/side, /area/f13/building) +"de" = ( +/obj/structure/spacevine, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland/city/newboston/house/cabin_three) "df" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, @@ -853,8 +902,7 @@ dir = 4 }, /obj/structure/chair/sofa/corp/right{ - dir = 1; - icon_state = "corp_sofaend_left" + dir = 1 }, /turf/open/floor/f13{ icon_state = "floorrusty" @@ -913,7 +961,7 @@ "dN" = ( /obj/structure/simple_door/interior, /obj/effect/turf_decal/siding/wood/corner, -/turf/open/floor/wood_mosaic/wood_mosaic_light, +/turf/open/floor/wood_common/wood_common_dark, /area/f13/wasteland/city/newboston/house) "dR" = ( /obj/structure/fence/corner/wooden{ @@ -1033,10 +1081,21 @@ }, /area/f13/building) "es" = ( -/obj/structure/closet/cabinet/anchored, -/obj/item/razor, -/obj/effect/spawner/lootdrop/clothing_high, -/turf/open/floor/carpet/purple, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/table/wood/settler, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/flashlight/lamp/green{ + pixel_y = 14; + pixel_x = 6; + layer = 3.1 + }, +/obj/item/lighter/heart, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_three) "et" = ( /obj/effect/decal/cleanable/dirt, @@ -1075,7 +1134,7 @@ randomize_xy = 0 }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "ex" = ( @@ -1108,8 +1167,8 @@ /turf/open/floor/f13/wood, /area/f13/building) "eD" = ( -/obj/item/reagent_containers/rag/towel/random, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/chair/office/dark, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_one) "eF" = ( /obj/machinery/light/small{ @@ -1133,8 +1192,22 @@ }, /turf/open/floor/wood_common/wood_common_dark, /area/f13/wasteland/city/newboston/house) +"eK" = ( +/obj/structure/window/fulltile/house, +/obj/structure/curtain/directional/west{ + color = "#1e549c" + }, +/turf/open/floor/wood_common, +/area/f13/building/hospital/clinic/nash) "eM" = ( -/turf/open/floor/plasteel/darkpurple/corner, +/obj/structure/chair/sofa/left{ + dir = 8; + color = "#990033" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/carpet/red, /area/f13/wasteland/city/newboston/house/cabin_four) "eP" = ( /obj/structure/railing{ @@ -1144,7 +1217,12 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "eQ" = ( -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/easel, +/obj/item/canvas/nineteenXnineteen, +/obj/structure/sign/poster/contraband/pinup_topless{ + pixel_y = 32 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_three) "eS" = ( /obj/structure/curtain{ @@ -1162,7 +1240,12 @@ /turf/closed/wall/f13/coyote/oldwood, /area/f13/wasteland/city/newboston/house/cabin_six) "eX" = ( -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole{ + dir = 1; + pixel_y = 4 + }, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_one) "eY" = ( /obj/structure/flora/chomp/bones/lbone{ @@ -1199,10 +1282,12 @@ /turf/open/floor/carpet/red, /area/f13/building/hospital/clinic/nash) "ff" = ( -/obj/item/clothing/shoes/jackboots, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/structure/table, +/obj/machinery/processor/chopping_block, +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/wasteland/city/newboston/house/cabin_two) "fg" = ( /obj/effect/decal/cleanable/dirt, @@ -1452,6 +1537,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/purple, /area/f13/building) +"fV" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "fW" = ( /obj/structure/simple_door/wood, /obj/item/lock_bolt{ @@ -1641,13 +1744,10 @@ }, /area/f13/tribe) "gH" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/chair/stool, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/structure/fireplace{ + dir = 4 }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) "gI" = ( /obj/machinery/computer/operating{ @@ -1657,6 +1757,13 @@ icon_state = "bluedirtychess2" }, /area/f13/building) +"gJ" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 1 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "gK" = ( /obj/machinery/light/small/broken{ dir = 1 @@ -1668,13 +1775,14 @@ /area/f13/building) "gL" = ( /obj/structure/window/fulltile/house, -/obj/structure/curtain{ - color = "#845f58" - }, /obj/structure/railing{ color = "#A47449"; dir = 1 }, +/obj/structure/curtain/directional/south{ + color = "#845f58"; + alpha = 200 + }, /turf/open/floor/wood_common, /area/f13/building) "gN" = ( @@ -1839,24 +1947,17 @@ /turf/open/floor/f13/wood, /area/f13/building/tribal) "hh" = ( -/obj/structure/toilet{ - dir = 4; - pixel_x = -3 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/light/small{ dir = 8 }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_one) "hi" = ( -/obj/structure/closet/cabinet/anchored, -/obj/item/razor, -/obj/effect/spawner/lootdrop/clothing_high, -/turf/open/floor/carpet/vault, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland/city/newboston/house/cabin_four) "hj" = ( /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland/city/newboston/outdoors) @@ -1893,15 +1994,18 @@ "hq" = ( /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = 3 + pixel_y = 3; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -6 + pixel_y = -6; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -2 + pixel_y = -2; + plane = -14 }, /obj/structure/railing{ color = "#A47449"; @@ -1985,9 +2089,7 @@ }, /area/f13/ncr) "hC" = ( -/obj/item/bedsheet/purple, -/obj/structure/bed/wooden, -/turf/open/floor/carpet/purple, +/turf/closed/wall/f13/coyote/oldwood, /area/f13/wasteland/city/newboston/house/cabin_three) "hD" = ( /obj/structure/fluff/railing{ @@ -2039,7 +2141,7 @@ /area/f13/building/tribal) "hK" = ( /obj/structure/simple_door/interior, -/turf/open/floor/plating/f13/outside/roof/metal, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_seven) "hO" = ( /obj/structure/chair/office/dark, @@ -2070,20 +2172,17 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital/clinic/nash) "hV" = ( -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/storage/fancy/egg_box, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/obj/structure/closet/secure_closet/freezer/fridge{ - anchored = 1 - }, -/turf/open/floor/plasteel/darkpurple/corner, -/area/f13/wasteland/city/newboston/house/cabin_three) -"hW" = ( -/obj/structure/table/reinforced, -/obj/machinery/processor/chopping_block, -/turf/open/floor/plasteel/darkpurple/corner{ +/obj/structure/railing{ + color = "#A47449"; dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) +"hW" = ( +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/west, +/turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_three) "hX" = ( /obj/structure/table/booth, @@ -2165,7 +2264,7 @@ randomize_xy = 0 }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "il" = ( @@ -2233,15 +2332,18 @@ "is" = ( /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = 3 + pixel_y = 3; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -6 + pixel_y = -6; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -2 + pixel_y = -2; + plane = -14 }, /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -2372,15 +2474,18 @@ "iQ" = ( /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = 3 + pixel_y = 3; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -6 + pixel_y = -6; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -2 + pixel_y = -2; + plane = -14 }, /obj/structure/lattice/catwalk, /turf/open/transparent/openspace, @@ -2444,11 +2549,11 @@ /turf/open/floor/engine, /area/f13/building) "jc" = ( -/obj/structure/bed, /obj/effect/spawner/lootdrop/bedsheet, /obj/machinery/light_switch{ pixel_x = 22 }, +/obj/structure/bed/wooden, /turf/open/floor/carpet, /area/f13/wasteland/city/newboston/house/cabin_six) "jd" = ( @@ -2519,8 +2624,18 @@ }, /area/f13/city) "jk" = ( -/obj/machinery/door/airlock/freezer, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/simple_door/wood, +/obj/structure/barricade/wooden{ + layer = 3.5; + obj_integrity = 5; + name = "weak wooden boarding" + }, +/obj/structure/barricade/wooden/crude{ + layer = 3.4; + obj_integrity = 5; + name = "weak wooden boarding" + }, +/turf/open/floor/wood_common/wood_common_dark, /area/f13/wasteland/city/newboston/house/cabin_four) "jl" = ( /obj/structure/disposalpipe/trunk{ @@ -2577,9 +2692,33 @@ icon_state = "skin" }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) +"jw" = ( +/obj/structure/toilet_paper{ + pixel_y = 16; + pixel_x = -8 + }, +/obj/structure/mirror{ + pixel_y = 32; + pixel_x = 7 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 24; + pixel_x = 7 + }, +/obj/machinery/light/small{ + dir = 1; + pixel_y = 20; + pixel_x = -9 + }, +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/wasteland/city/newboston/house/cabin_two) "jx" = ( /obj/machinery/camera{ c_tag = "Xenobiology South"; @@ -2600,27 +2739,20 @@ /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_seven) "jz" = ( -/obj/structure/curtain{ - color = "#475340"; - alpha = 255 +/obj/structure/window/fulltile/house, +/obj/structure/curtain/directional/north{ + color = "#1e549c" }, -/obj/structure/window/fulltile/wood, /turf/open/floor/wood_common, -/area/f13/wasteland/city/newboston/house/cabin_five) +/area/f13/building/hospital/clinic/nash) "jA" = ( /obj/structure/chair/office/dark, /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building) "jB" = ( -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/storage/fancy/egg_box, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/obj/structure/closet/secure_closet/freezer/fridge{ - anchored = 1 - }, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" - }, +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/south, +/turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_one) "jD" = ( /turf/closed/wall/f13/tunnel, @@ -2834,6 +2966,14 @@ icon_state = "floorrustysolid" }, /area/f13/building) +"ky" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 1 + }, +/obj/machinery/light/small, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "kz" = ( /obj/structure/railing{ color = "#A47449"; @@ -2856,7 +2996,8 @@ /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_seven) "kD" = ( -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/simple_door/wood, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_two) "kE" = ( /turf/closed/wall/r_wall/f13/vault, @@ -2915,6 +3056,18 @@ }, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_seven) +"kR" = ( +/obj/structure/decoration/vent{ + name = "drain"; + layer = 2.0 + }, +/obj/item/reagent_containers/rag/towel/random, +/obj/machinery/shower{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/building) "kS" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -2991,8 +3144,11 @@ /turf/open/floor/wood_wide, /area/f13/wasteland/city/newboston/outdoors) "kZ" = ( -/obj/structure/curtain, /obj/structure/window/fulltile/house, +/obj/structure/curtain/directional/north{ + color = "#ACD1E9"; + alpha = 200 + }, /turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_seven) "la" = ( @@ -3072,6 +3228,15 @@ /mob/living/simple_animal/cow/brahmin, /turf/open/indestructible/ground/outside/dirt, /area/f13/tribe) +"lk" = ( +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/f13/wasteland/city/newboston/house/cabin_four) +"ll" = ( +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/east, +/turf/open/floor/wood_common, +/area/f13/wasteland/city/newboston/house/cabin_four) "ln" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/science/glass{ @@ -3206,6 +3371,13 @@ icon_state = "floorrusty" }, /area/f13/wasteland) +"lI" = ( +/obj/structure/simple_door/wood, +/obj/item/lock_bolt{ + dir = 1 + }, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "lJ" = ( /obj/structure/fence/wooden{ icon_state = "end_wood"; @@ -3264,6 +3436,18 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/indestructible/ground/outside/dirt, /area/f13/tribe) +"lW" = ( +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/obj/item/kitchen/knife, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/wasteland/city/newboston/house/cabin_two) "lX" = ( /obj/structure/chair/office/dark, /obj/effect/decal/cleanable/dirt, @@ -3296,21 +3480,20 @@ /turf/open/floor/f13/wood, /area/f13/building/tribal) "me" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12 +/obj/structure/decoration/vent{ + name = "drain"; + layer = 2.0 }, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" +/obj/item/reagent_containers/rag/towel/random, +/obj/machinery/shower{ + pixel_y = 17 }, -/area/f13/wasteland/city/newboston/house/cabin_one) +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/wasteland/city/newboston/house/cabin_two) "mf" = ( -/obj/structure/bed/wooden, -/obj/item/bedsheet/hos{ - desc = "A comfortable red bedsheet."; - name = "Comfy Red Bedsheet" +/turf/closed/indestructible/riveted/boss{ + name = "ancient wall" }, -/turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/wasteland/city/newboston/house/cabin_four) "mi" = ( /turf/open/floor/plasteel/f13/vault_floor/purple, @@ -3327,6 +3510,14 @@ /obj/item/bedsheet/black, /turf/open/floor/carpet/red, /area/f13/brotherhood) +"ml" = ( +/obj/structure/window/fulltile/house, +/obj/structure/curtain/directional/south{ + color = "#ACD1E9"; + alpha = 200 + }, +/turf/open/floor/wood_common, +/area/f13/building) "mm" = ( /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d" @@ -3343,12 +3534,15 @@ /turf/open/floor/carpet/green, /area/f13/wasteland/city/newboston/house/cabin_five) "mo" = ( -/obj/structure/table/wood/settler, -/obj/item/pen/fountain, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/structure/rug/mat/welcome{ + pixel_y = -7; + pixel_x = -7 }, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland/city/newboston/house/cabin_four) "mq" = ( /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d"; @@ -3491,13 +3685,7 @@ }, /area/f13/building) "mM" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 1; - icon_state = "corp_sofaend_left" - }, -/turf/open/floor/f13{ - icon_state = "floorrusty" - }, +/turf/closed/wall/f13/coyote/oldwood, /area/f13/building) "mN" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -3566,7 +3754,7 @@ "mX" = ( /obj/structure/decoration/rag, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "mZ" = ( @@ -3652,6 +3840,10 @@ /obj/effect/spawner/lootdrop/f13/uncommon, /turf/open/floor/carpet/black, /area/f13/brotherhood) +"nn" = ( +/obj/machinery/light, +/turf/open/floor/carpet/purple, +/area/f13/wasteland/city/newboston/house/cabin_three) "np" = ( /obj/structure/rack, /obj/item/stack/sheet/glass/fifty, @@ -3695,6 +3887,25 @@ dir = 1 }, /area/f13/building) +"nx" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_three) "ny" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/coffee{ @@ -3723,26 +3934,30 @@ /area/f13/building/tribal) "nB" = ( /obj/structure/window/fulltile/house, -/obj/structure/curtain{ - color = "#845f58" - }, /obj/structure/railing{ color = "#A47449" }, +/obj/structure/curtain/directional/north{ + color = "#845f58"; + alpha = 200 + }, /turf/open/floor/wood_common, /area/f13/building) "nC" = ( /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = 3 + pixel_y = 3; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -6 + pixel_y = -6; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -2 + pixel_y = -2; + plane = -14 }, /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -3765,6 +3980,13 @@ "nH" = ( /turf/closed/wall/r_wall, /area/f13/brotherhood) +"nI" = ( +/obj/effect/turf_decal/siding/white, +/obj/machinery/shower{ + dir = 4 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/f13/wasteland/city/newboston/house/cabin_three) "nK" = ( /turf/open/floor/plasteel/f13/vault_floor/green/white, /area/f13/building) @@ -3852,17 +4074,22 @@ /turf/open/floor/plasteel/f13/vault_floor/green/white/side, /area/f13/building) "nW" = ( -/obj/structure/table/wood/settler, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/sign/poster/contraband/pinup_shower{ + pixel_y = 32 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_three) "nY" = ( /obj/structure/rug/carpet3, /turf/open/floor/carpet, /area/f13/wasteland/city/newboston/house) "nZ" = ( -/obj/structure/dresser, -/turf/open/floor/carpet/vault, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/structure/window/fulltile/house, +/obj/structure/curtain/directional/south{ + color = "#1e549c" + }, +/turf/open/floor/wood_common, +/area/f13/building/hospital/clinic/nash) "oc" = ( /obj/structure/fence/wooden, /turf/open/indestructible/ground/inside/mountain, @@ -3873,9 +4100,17 @@ /obj/effect/spawner/bundle/costume/plaguedoctor, /turf/open/floor/carpet/blue, /area/f13/building) +"of" = ( +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/west, +/turf/open/floor/wood_common, +/area/f13/wasteland/city/newboston/house/cabin_seven) "oi" = ( -/obj/structure/curtain, /obj/structure/window/fulltile/house, +/obj/structure/curtain/directional/north{ + color = "#ACD1E9"; + alpha = 200 + }, /turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_five) "oj" = ( @@ -4050,6 +4285,11 @@ /obj/effect/decal/cleanable/oil, /turf/closed/wall/r_wall/rust, /area/f13/building) +"oV" = ( +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/west, +/turf/open/floor/wood_common, +/area/f13/wasteland/city/newboston/house/cabin_one) "oW" = ( /obj/structure/railing/corner, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -4312,11 +4552,12 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) "pT" = ( -/obj/structure/simple_door/wood, -/obj/item/lock_bolt{ - dir = 1 +/obj/structure/window/fulltile/house, +/obj/structure/curtain/directional/east{ + color = "#ACD1E9"; + alpha = 200 }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_two) "pV" = ( /obj/structure/chair/stool/bar, @@ -4402,15 +4643,18 @@ "qn" = ( /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = 3 + pixel_y = 3; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -6 + pixel_y = -6; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -2 + pixel_y = -2; + plane = -14 }, /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -4474,8 +4718,11 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/wasteland/city/newboston/outdoors) "qv" = ( -/obj/item/clothing/shoes/jackboots, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/chair/sofa/left{ + color = "#353535"; + dir = 1 + }, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/house/cabin_three) "qw" = ( /obj/structure/railing, @@ -4506,6 +4753,10 @@ "qF" = ( /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"qH" = ( +/obj/structure/simple_door/interior, +/turf/open/floor/wood_common, +/area/f13/building) "qI" = ( /obj/structure/rack, /obj/item/storage/box/monkeycubes, @@ -4567,15 +4818,20 @@ /turf/open/floor/f13, /area/f13/brotherhood) "qP" = ( -/obj/structure/table/wood/settler, -/obj/item/export/bottle/champagne, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/pool/ladder{ + dir = 2; + pixel_y = 15 + }, +/turf/open/indestructible/ground/outside/water{ + name = "hot spring"; + color = "#BBBBBB" + }, /area/f13/wasteland/city/newboston/house/cabin_four) "qQ" = ( /obj/structure/railing{ dir = 8 }, -/obj/structure/chair/sofa/corp/right{ +/obj/structure/chair/sofa/corp/left{ dir = 1 }, /turf/open/floor/f13{ @@ -4603,12 +4859,13 @@ /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland) "qW" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/turf/open/floor/plasteel/darkpurple/corner{ - dir = 8 +/obj/machinery/light/small{ + dir = 1; + pixel_y = 20; + pixel_x = -9 }, -/area/f13/wasteland/city/newboston/house/cabin_three) +/turf/open/floor/carpet, +/area/f13/building) "qZ" = ( /obj/structure/curtain{ color = "#5c131b"; @@ -4640,6 +4897,12 @@ icon_state = "floorrustysolid" }, /area/f13/building) +"rk" = ( +/obj/machinery/light_switch{ + pixel_y = -20 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_three) "rl" = ( /obj/machinery/light/small{ dir = 8 @@ -4720,7 +4983,7 @@ /area/f13/building) "rz" = ( /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "rB" = ( @@ -4775,6 +5038,11 @@ /obj/machinery/smartfridge/bottlerack/alchemy_rack, /turf/open/floor/f13/wood, /area/f13/building/tribal) +"rL" = ( +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/east, +/turf/open/floor/wood_common, +/area/f13/building) "rM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4785,9 +5053,9 @@ /turf/open/floor/plasteel/f13/vault_floor/purple, /area/f13/building) "rN" = ( -/obj/structure/grille, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/f13/vault_floor/neutral, +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/north, +/turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_two) "rO" = ( /obj/machinery/smartfridge/extract/preloaded, @@ -4853,8 +5121,9 @@ /turf/open/floor/plasteel/cult, /area/f13/building/tribal) "sb" = ( -/obj/structure/table/wood/settler, -/turf/open/floor/carpet/vault, +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/east, +/turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_one) "se" = ( /obj/structure/destructible/tribal_torch/wall/lit{ @@ -4882,6 +5151,12 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"sf" = ( +/obj/structure/fireplace{ + dir = 4 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland/city/newboston/house/cabin_four) "sh" = ( /turf/closed/indestructible/f13/matrix, /area/f13/ncr) @@ -4919,6 +5194,11 @@ /mob/living/simple_animal/hostile/raider/ranged, /turf/open/floor/f13/wood, /area/f13/wasteland) +"ss" = ( +/obj/structure/simple_door/wood, +/obj/item/lock_bolt, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "st" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/coffee{ @@ -4946,7 +5226,7 @@ /obj/structure/decoration/rag, /obj/structure/flora/ausbushes/lavendergrass, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "sB" = ( @@ -4965,21 +5245,19 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/tribe) "sC" = ( -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" +/obj/item/lock_bolt{ + dir = 1 }, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/structure/simple_door/interior, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland/city/newboston/house/cabin_one) "sD" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/structure/curtain{ - open = 0 - }, -/obj/machinery/shower{ - pixel_y = 27 +/obj/structure/closet/cabinet/anchored{ + pixel_x = -4; + pixel_y = 7 }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/effect/spawner/lootdrop/f13/common_toys, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_one) "sF" = ( /obj/structure/window/reinforced{ @@ -5023,6 +5301,30 @@ /obj/effect/spawner/lootdrop/f13/rare, /turf/open/floor/plating/f13/outside/road, /area/f13/brotherhood) +"sS" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/railing{ + color = "#A47449" + }, +/obj/structure/chair/metal{ + dir = 4 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "sT" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -5058,6 +5360,12 @@ icon_state = "yellowdirtyfull" }, /area/f13/building) +"sX" = ( +/obj/structure/chair/sofa/right{ + color = "#990033" + }, +/turf/open/floor/carpet/red, +/area/f13/wasteland/city/newboston/house/cabin_four) "sY" = ( /obj/structure/destructible/tribal_torch/lit, /obj/effect/turf_decal/weather/dirt{ @@ -5137,6 +5445,13 @@ "tp" = ( /turf/closed/wall/f13/coyote/oldwood, /area/f13/wasteland/city/newboston/house/cabin_seven) +"tq" = ( +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/north{ + color = "#845f58" + }, +/turf/open/floor/wood_common, +/area/f13/building) "tr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5228,6 +5543,13 @@ icon_state = "floorrustysolid" }, /area/f13/building) +"tI" = ( +/obj/item/lock_bolt{ + dir = 1 + }, +/obj/structure/simple_door/house, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_three) "tJ" = ( /turf/closed/wall/f13/vault, /area/f13/brotherhood) @@ -5279,11 +5601,10 @@ /turf/open/transparent/openspace, /area/f13/wasteland) "tQ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 +/turf/open/water{ + icon = 'icons/turf/pool.dmi'; + icon_state = "pool_tile" }, -/turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/wasteland/city/newboston/house/cabin_three) "tR" = ( /obj/effect/turf_decal/weather/dirt, @@ -5301,7 +5622,10 @@ /turf/open/floor/carpet/royalblack, /area/f13/brotherhood) "tV" = ( -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/indestructible/ground/outside/water{ + name = "hot spring"; + color = "#BBBBBB" + }, /area/f13/wasteland/city/newboston/house/cabin_four) "tX" = ( /obj/structure/destructible/tribal_torch/wall/lit{ @@ -5310,8 +5634,8 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) "ua" = ( -/obj/structure/bed, /obj/effect/spawner/lootdrop/bedsheet, +/obj/structure/bed/wooden, /turf/open/floor/carpet, /area/f13/wasteland/city/newboston/house) "uf" = ( @@ -5371,9 +5695,12 @@ /turf/open/floor/f13/wood, /area/f13/building/tribal) "um" = ( -/obj/structure/dresser, -/turf/open/floor/plasteel/f13/vault_floor/red, -/area/f13/wasteland/city/newboston/house/cabin_four) +/obj/structure/railing{ + color = "#A47449"; + dir = 4 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "un" = ( /obj/machinery/light{ dir = 1 @@ -5570,8 +5897,15 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) "uO" = ( -/obj/item/reagent_containers/rag/towel/random, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/table/wood, +/obj/machinery/computer/terminal{ + dir = 8; + termtag = "Public" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_four) "uP" = ( /obj/structure/window/fulltile/house{ @@ -5596,16 +5930,21 @@ /turf/closed/mineral/random/low_chance, /area/f13/caves) "uS" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder/constructed, -/turf/open/floor/plasteel/darkpurple/corner{ - dir = 1 - }, -/area/f13/wasteland/city/newboston/house/cabin_three) +/obj/structure/bed/double, +/obj/item/bedsheet/doubletranspride, +/turf/open/floor/carpet, +/area/f13/building) "uU" = ( -/obj/machinery/door/airlock/freezer, -/turf/open/floor/plasteel/f13/vault_floor/red, -/area/f13/wasteland/city/newboston/house/cabin_one) +/obj/structure/bookshelf{ + pixel_y = 20 + }, +/obj/machinery/light/small{ + dir = 1; + pixel_y = 20; + pixel_x = -9 + }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/house/cabin_two) "uW" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/condiment/pack/coffee{ @@ -5623,9 +5962,26 @@ /turf/open/floor/f13/wood, /area/f13/building/tribal) "uY" = ( -/turf/closed/wall/r_wall/f13vault{ - icon_state = "2-i" +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/lattice/catwalk, +/obj/structure/spacevine{ + opacity = 1 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_three) "uZ" = ( /turf/open/floor/grass{ @@ -5742,10 +6098,8 @@ /turf/open/floor/engine, /area/f13/building) "vu" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/carpet/vault, +/obj/structure/fireplace, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/house/cabin_two) "vv" = ( /obj/structure/table/wood, @@ -5755,9 +6109,15 @@ "vx" = ( /obj/structure/spacevine, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) +"vz" = ( +/obj/structure/railing/corner/end{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/wasteland/city/newboston/outdoors) "vB" = ( /obj/item/chair, /turf/open/floor/f13{ @@ -5783,6 +6143,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/f13/building) +"vG" = ( +/obj/structure/chair/sofa/right{ + color = "#353535" + }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/house/cabin_three) "vH" = ( /obj/structure/sink{ dir = 8; @@ -5831,9 +6197,10 @@ /turf/open/floor/plasteel/f13/vault_floor/neutral/white/whitepurplechess, /area/f13/building/hospital/clinic/nash) "vO" = ( -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/structure/bookshelf{ + pixel_y = 20 }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) "vT" = ( /obj/structure/fluff/railing{ @@ -5913,9 +6280,15 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) "wi" = ( -/obj/machinery/door/airlock/freezer, -/turf/open/floor/carpet/purple, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/structure/railing{ + color = "#A47449"; + dir = 1 + }, +/obj/structure/railing{ + color = "#A47449" + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/caves) "wj" = ( /obj/structure/railing/corner/end{ dir = 8 @@ -6017,6 +6390,29 @@ /obj/effect/turf_decal/weather/dirt, /turf/open/water, /area/f13/building/tribal) +"wu" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/machinery/light/small{ + dir = 1; + pixel_y = 20; + pixel_x = -9 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "ww" = ( /obj/effect/turf_decal/weather/dirt{ color = "#a98c5d" @@ -6043,12 +6439,13 @@ /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland/city/newboston/outdoors) "wE" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder/constructed, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 1; + pixel_y = 12 }, -/area/f13/wasteland/city/newboston/house/cabin_one) +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/plasteel/f13/stone/rugged, +/area/f13/wasteland/city/newboston/house/cabin_four) "wF" = ( /obj/machinery/light/small{ dir = 8 @@ -6056,10 +6453,14 @@ /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland/city/newboston/outdoors) "wH" = ( -/obj/item/clothing/shoes/jackboots, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/structure/rug/mat/welcome{ + pixel_y = -7; + pixel_x = -7 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) "wI" = ( /obj/effect/turf_decal/siding/wood{ @@ -6134,8 +6535,7 @@ }, /area/f13/building) "wS" = ( -/obj/item/kirbyplants, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_four) "wT" = ( /obj/structure/rack, @@ -6171,16 +6571,9 @@ }, /area/f13/wasteland) "wX" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/structure/curtain{ - open = 0 - }, -/obj/machinery/shower{ - pixel_y = 27 - }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/bed/double, +/obj/item/bedsheet/doublesheetbrown, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_four) "wY" = ( /obj/structure/destructible/tribal_torch/wall/lit{ @@ -6200,13 +6593,15 @@ }, /area/f13/tribe) "xb" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/chair/stool, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/structure/table, +/obj/machinery/computer/arcade/battle{ + icon_state = "oldcomp"; + icon_screen = "library"; + dir = 4; + pixel_x = -2; + pixel_y = 9 }, +/turf/open/floor/carpet/arcade, /area/f13/wasteland/city/newboston/house/cabin_two) "xc" = ( /obj/machinery/light/floor, @@ -6238,10 +6633,13 @@ /turf/open/floor/engine, /area/f13/building) "xg" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/carpet/purple, +/obj/structure/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_three) "xh" = ( /obj/structure/table/wood, @@ -6265,17 +6663,25 @@ }, /area/f13/building) "xl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/transparent/openspace, -/area/f13/wasteland) +/obj/structure/closet/cabinet/anchored{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/locked_box/weapon/range/tier2, +/turf/open/floor/wood_common, +/area/f13/building) "xm" = ( /obj/structure/railing{ dir = 4 }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/wasteland/city/newboston/outdoors) +"xn" = ( +/obj/structure/sign/poster/contraband/revolver{ + pixel_x = 32 + }, +/turf/open/floor/carpet/purple, +/area/f13/wasteland/city/newboston/house/cabin_three) "xp" = ( /obj/structure/table/wood, /obj/item/defibrillator/primitive, @@ -6380,6 +6786,28 @@ }, /turf/open/floor/f13/wood, /area/f13/building) +"xI" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/railing{ + color = "#A47449" + }, +/obj/structure/table, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "xK" = ( /obj/structure/flora/grass/wasteland{ icon_state = "tall_grass_2" @@ -6435,6 +6863,14 @@ icon_state = "floorrusty" }, /area/f13/building) +"xS" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/light_switch{ + pixel_y = 26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "xT" = ( /obj/structure/closet/cabinet/anchored, /obj/effect/spawner/lootdrop/f13/uncommon, @@ -6474,16 +6910,18 @@ }, /area/f13/tribe) "yh" = ( -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/storage/fancy/egg_box, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/obj/structure/closet/secure_closet/freezer/fridge{ - anchored = 1 +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 5 }, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" +/obj/item/flashlight/lamp/green{ + pixel_y = 14; + pixel_x = -5; + layer = 3.1 }, -/area/f13/wasteland/city/newboston/house/cabin_two) +/turf/open/floor/carpet/black, +/area/f13/wasteland/city/newboston/house/cabin_four) "yi" = ( /obj/structure/stone_tile/slab, /obj/structure/stone_tile/surrounding_tile, @@ -6516,7 +6954,7 @@ randomize_xy = 0 }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "yp" = ( @@ -6561,12 +6999,28 @@ }, /turf/open/floor/f13, /area/f13/brotherhood) +"yz" = ( +/obj/structure/chair/wood/wings{ + dir = 1 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_three) "yA" = ( /obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/f13/wood, /area/f13/building/tribal) +"yC" = ( +/obj/structure/railing{ + color = "#A47449"; + dir = 1 + }, +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "yD" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -6605,6 +7059,23 @@ /obj/item/t_scanner/adv_mining_scanner/lesser, /turf/open/floor/plasteel/f13/vault_floor/purple, /area/f13/building) +"yM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/shower{ + dir = 8 + }, +/obj/structure/curtain, +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/decoration/vent{ + name = "drain"; + layer = 2.0 + }, +/turf/open/floor/f13{ + icon_state = "whitegreenrustychess" + }, +/area/f13/building) "yQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6853,6 +7324,14 @@ name = "concrete wall" }, /area/f13/building) +"zI" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/doublesheetbrown, +/obj/machinery/light_switch{ + pixel_y = 26 + }, +/turf/open/floor/carpet/black, +/area/f13/wasteland/city/newboston/house/cabin_one) "zJ" = ( /obj/structure/railing/corner{ dir = 4 @@ -7094,12 +7573,14 @@ }, /area/f13/tribe) "An" = ( -/obj/structure/simple_door/wood, -/obj/item/lock_bolt{ - dir = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/red, -/area/f13/wasteland/city/newboston/house/cabin_one) +/obj/structure/bookshelf{ + pixel_y = 20 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland/city/newboston/house/cabin_four) "Ao" = ( /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/house/cabin_three) @@ -7143,7 +7624,7 @@ icon_state = "skin" }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "Aw" = ( @@ -7276,6 +7757,12 @@ /obj/effect/landmark/start/f13/dualcitizen, /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) +"AX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "AZ" = ( /obj/structure/table, /obj/machinery/computer/terminal{ @@ -7321,6 +7808,10 @@ }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/wasteland) +"Bg" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "Bh" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -7372,7 +7863,7 @@ /area/f13/building) "Bn" = ( /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal/atonement) "Bo" = ( @@ -7489,15 +7980,18 @@ "BL" = ( /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = 3 + pixel_y = 3; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -6 + pixel_y = -6; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -2 + pixel_y = -2; + plane = -14 }, /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -7594,14 +8088,11 @@ }, /area/f13/building) "BY" = ( -/obj/structure/curtain{ - color = "#c40e0e"; - pixel_y = -32; - alpha = 255 - }, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_mosaic/wood_mosaic_light, /area/f13/wasteland/city/newboston/house/cabin_two) "BZ" = ( /obj/effect/turf_decal/stripes/line, @@ -7616,9 +8107,13 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) "Cc" = ( -/obj/structure/table/wood/settler, -/turf/open/floor/carpet/vault, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/structure/closet/cabinet/anchored{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/effect/spawner/lootdrop/f13/common_toys, +/turf/open/floor/carpet/black, +/area/f13/wasteland/city/newboston/house/cabin_four) "Cd" = ( /obj/effect/turf_decal/trimline/neutral{ icon_state = "trimline_fill" @@ -7640,6 +8135,25 @@ icon_state = "floorrusty" }, /area/f13/building) +"Ci" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/machinery/grill, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "Ck" = ( /obj/machinery/door/airlock/highsecurity, /turf/open/floor/f13{ @@ -7690,18 +8204,17 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) "Cq" = ( -/obj/structure/grille, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/f13/vault_floor/neutral, +/obj/structure/curtain/directional/north, +/obj/structure/window/fulltile/house, +/turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_three) "Cr" = ( -/obj/structure/curtain{ - color = "#c40e0e"; - pixel_y = -32; - alpha = 255 +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/west{ + color = "#475340" }, -/turf/open/floor/plasteel/f13/vault_floor/red, -/area/f13/wasteland/city/newboston/house/cabin_three) +/turf/open/floor/wood_common, +/area/f13/wasteland/city/newboston/house/cabin_five) "Cs" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -7836,6 +8349,15 @@ }, /turf/open/floor/carpet/royalblack, /area/f13/brotherhood) +"CO" = ( +/obj/machinery/light_switch{ + pixel_x = 22 + }, +/obj/structure/chair/sofa/left{ + color = "#353535" + }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/house/cabin_three) "CQ" = ( /obj/structure/flora/chomp/bones/lribs1{ pixel_x = -10; @@ -7868,12 +8390,23 @@ /turf/open/floor/plasteel/f13/vault_floor/neutral, /area/f13/building) "CT" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 }, -/turf/open/floor/plasteel/f13/vault_floor/red, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_one) "CU" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/fullgrass, @@ -8064,7 +8597,7 @@ color = "#225522" }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "DA" = ( @@ -8119,22 +8652,15 @@ /turf/open/floor/f13/wood, /area/f13/building/tribal) "DI" = ( -/obj/structure/grille, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/f13/vault_floor/neutral, +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/north, +/turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_four) "DJ" = ( -/obj/structure/toilet{ - dir = 4; - pixel_x = -3 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 8 +/obj/structure/chair/office/dark{ + dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_four) "DL" = ( /turf/open/floor/f13{ @@ -8189,6 +8715,31 @@ }, /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, /area/f13/building) +"DU" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 10 + }, +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_one) "DV" = ( /obj/machinery/iv_drip, /turf/open/floor/f13{ @@ -8253,6 +8804,29 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/wasteland) +"Ee" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/flashlight/lamp/green{ + pixel_y = 14; + pixel_x = -5; + layer = 3.1 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 8 + }, +/obj/item/reagent_containers/food/drinks/beer/light{ + pixel_x = 7; + pixel_y = 3 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark{ + pixel_x = 7 + }, +/area/f13/building) "Ef" = ( /obj/machinery/light/small{ dir = 4 @@ -8306,6 +8880,14 @@ /obj/item/stack/medical/mesh/aloe, /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) +"Eq" = ( +/obj/effect/turf_decal/siding{ + color = "#2e2e2e"; + dir = 8 + }, +/obj/structure/bed/dogbed, +/turf/open/floor/wood_mosaic/wood_mosaic_dark, +/area/f13/wasteland/city/newboston/house/cabin_six) "Es" = ( /obj/structure/toilet{ dir = 4 @@ -8370,9 +8952,37 @@ randomize_xy = 0 }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) +"Ez" = ( +/obj/structure/simple_door/wood, +/turf/open/floor/wood_common/wood_common_dark, +/area/f13/wasteland/city/newboston/house/cabin_four) +"EA" = ( +/obj/structure/toilet_paper{ + pixel_y = 16; + pixel_x = -8 + }, +/obj/structure/mirror{ + pixel_y = 32; + pixel_x = 7 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 24; + pixel_x = 7 + }, +/obj/machinery/light/small{ + dir = 1; + pixel_y = 20; + pixel_x = -9 + }, +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, +/area/f13/building) "EC" = ( /obj/structure/railing, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, @@ -8450,6 +9060,22 @@ dir = 8 }, /area/f13/building) +"EP" = ( +/obj/structure/barricade/wooden{ + layer = 3.5; + obj_integrity = 5; + name = "weak wooden boarding" + }, +/obj/structure/barricade/wooden/crude{ + layer = 3.4; + obj_integrity = 5; + name = "weak wooden boarding" + }, +/obj/structure/spacevine{ + opacity = 1 + }, +/turf/open/indestructible/ground/inside/mountain, +/area/f13/wasteland/city/newboston/house/cabin_three) "EQ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -8466,11 +9092,7 @@ }, /area/f13/building) "ET" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_one) "EU" = ( /obj/structure/bed/old{ @@ -8504,7 +9126,7 @@ /turf/open/floor/plating/f13/outside/roof/metal/corrugated, /area/f13/wasteland) "Fd" = ( -/turf/open/floor/carpet/vault, +/turf/open/transparent/openspace, /area/f13/wasteland/city/newboston/house/cabin_one) "Fe" = ( /obj/structure/mirror{ @@ -8549,9 +9171,13 @@ icon_state = "housebase" }, /area/f13/wasteland) +"Fi" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "Fj" = ( -/obj/structure/bed, /obj/effect/spawner/lootdrop/bedsheet, +/obj/structure/bed/wooden, /turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_seven) "Fk" = ( @@ -8744,6 +9370,9 @@ }, /turf/open/floor/wood_wide, /area/f13/wasteland/city/newboston/outdoors) +"FN" = ( +/turf/open/floor/wood_common, +/area/f13/building) "FO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/office/dark{ @@ -8854,6 +9483,13 @@ color = "#777777" }, /area/f13/tribe) +"Gg" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) "Gi" = ( /obj/machinery/vending/medical/researchgrants, /turf/open/floor/plasteel/f13/vault_floor/yellow/corner{ @@ -8982,7 +9618,15 @@ }, /area/f13/tribe) "GG" = ( -/turf/open/floor/plasteel/darkpurple/corner, +/obj/item/storage/box/dice{ + pixel_y = 7 + }, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/house/cabin_three) "GI" = ( /obj/machinery/vending/wardrobe/medi_wardrobe/free, @@ -9014,6 +9658,13 @@ icon_state = "floorrusty" }, /area/f13/building) +"GN" = ( +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/west{ + color = "#845f58" + }, +/turf/open/floor/wood_common, +/area/f13/building) "GP" = ( /obj/structure/flora/tree/jungle{ color = "#999999" @@ -9168,10 +9819,7 @@ }, /area/f13/building) "HC" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_three) "HD" = ( /obj/structure/curtain{ @@ -9193,6 +9841,14 @@ /obj/structure/destructible/tribal_torch/wall/lit, /turf/open/floor/f13/wood, /area/f13/building/tribal) +"HG" = ( +/obj/structure/table/wood/fancy/orange, +/obj/item/storage/box/dice{ + pixel_y = 7 + }, +/obj/item/reagent_containers/food/snacks/cakeslice/apple, +/turf/open/floor/carpet/orange, +/area/f13/wasteland/city/newboston/house/cabin_one) "HH" = ( /obj/structure/chair/middle{ dir = 8 @@ -9243,6 +9899,10 @@ }, /turf/open/floor/f13, /area/f13/brotherhood) +"HO" = ( +/obj/structure/bed/dogbed, +/turf/open/floor/carpet/orange, +/area/f13/wasteland/city/newboston/house/cabin_one) "HP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -9338,7 +9998,15 @@ /turf/open/indestructible/ground/outside/dirt, /area/f13/tribe) "If" = ( -/obj/structure/dresser, +/obj/structure/closet/cabinet/anchored{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/effect/spawner/lootdrop/clothing_high, +/obj/item/razor, +/obj/structure/sign/poster/contraband/pinup_bed{ + pixel_x = 32 + }, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/house/cabin_three) "Ig" = ( @@ -9424,7 +10092,7 @@ "Ip" = ( /obj/structure/simple_door/interior, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/f13/wood, +/turf/open/floor/wood_mosaic/wood_mosaic_dark, /area/f13/wasteland/city/newboston/house/cabin_six) "Iq" = ( /obj/structure/railing/corner{ @@ -9462,11 +10130,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/wasteland/city/newboston/outdoors) "Ix" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/carpet/black, /area/f13/wasteland/city/newboston/house/cabin_four) "Iy" = ( /obj/item/hemostat/tribal, @@ -9491,6 +10155,13 @@ }, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) +"ID" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "IE" = ( /obj/structure/fence/wooden{ dir = 8; @@ -9511,13 +10182,14 @@ /area/f13/building) "II" = ( /obj/structure/window/fulltile/house, -/obj/structure/curtain{ - color = "#845f58" - }, /obj/structure/railing{ color = "#A47449"; dir = 4 }, +/obj/structure/curtain/directional/west{ + alpha = 200; + color = "#845f58" + }, /turf/open/floor/wood_common, /area/f13/building) "IJ" = ( @@ -9727,6 +10399,12 @@ /obj/structure/chair, /turf/open/floor/carpet/black, /area/f13/brotherhood) +"Jl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "Jp" = ( /obj/machinery/computer/arcade, /turf/open/floor/f13{ @@ -9803,12 +10481,22 @@ }, /area/f13/tribe) "JE" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" +/obj/machinery/light_switch{ + pixel_y = 26 }, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/structure/chair/sofa/right, +/turf/open/floor/carpet/orange, +/area/f13/wasteland/city/newboston/house/cabin_one) +"JF" = ( +/obj/structure/closet/cabinet, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythreeXtwentythree, +/obj/structure/sign/poster/official/twelve_gauge{ + pixel_x = -32 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_three) "JI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/broken, @@ -9855,6 +10543,12 @@ /obj/effect/decal/fakelattice, /turf/open/transparent/openspace, /area/f13/wasteland) +"JR" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/carpet/arcade, +/area/f13/wasteland/city/newboston/house/cabin_two) "JS" = ( /obj/structure/chair/office{ dir = 4 @@ -10034,20 +10728,17 @@ /obj/item/seeds/rose, /turf/open/floor/f13/wood, /area/f13/building/tribal) -"KF" = ( -/obj/effect/turf_decal/siding{ - color = "#2e2e2e"; - dir = 8 - }, -/obj/structure/bed/dogbed, -/turf/open/floor/wood_mosaic/wood_mosaic_dark, -/area/f13/wasteland/city/newboston/house/cabin_six) "KG" = ( /obj/structure/simple_door/metal/fence/wooden{ dir = 2 }, /turf/open/indestructible/ground/outside/dirt, /area/f13/tribe) +"KH" = ( +/obj/structure/bed/wooden, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/house/cabin_two) "KI" = ( /obj/structure/table/wood, /obj/structure/bed/mattress{ @@ -10315,16 +11006,11 @@ /area/f13/tribe) "LI" = ( /obj/structure/closet/crate/bin/trashbin, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/wasteland/city/newboston/outdoors) "LK" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12 - }, -/turf/open/floor/plasteel/darkpurple/corner{ - dir = 8 - }, +/turf/open/transparent/openspace, /area/f13/wasteland/city/newboston/house/cabin_three) "LL" = ( /obj/structure/sink/well, @@ -10389,21 +11075,13 @@ }, /area/f13/wasteland) "LW" = ( -/obj/machinery/door/airlock/freezer, -/turf/open/floor/carpet/purple, +/obj/structure/simple_door/wood, +/turf/open/floor/plasteel/f13/vault_floor/red, /area/f13/wasteland/city/newboston/house/cabin_three) "LY" = ( -/obj/structure/toilet{ - dir = 4; - pixel_x = -3 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/item/reagent_containers/rag/towel/random, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/plasteel/showroomfloor, /area/f13/wasteland/city/newboston/house/cabin_three) "Ma" = ( /obj/structure/destructible/tribal_torch/wall/lit{ @@ -10463,13 +11141,15 @@ /turf/open/transparent/openspace, /area/f13/wasteland/city/newboston/outdoors) "Mk" = ( -/obj/item/reagent_containers/rag/towel/random, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/simple_door/house, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_three) "Mm" = ( -/turf/open/floor/plasteel/darkpurple/corner{ - dir = 4 +/obj/structure/chair/sofa/right{ + color = "#353535"; + dir = 1 }, +/turf/open/floor/carpet/royalblack, /area/f13/wasteland/city/newboston/house/cabin_three) "Mn" = ( /obj/machinery/door/airlock/hatch{ @@ -10495,6 +11175,10 @@ color = "#777777" }, /area/f13/tribe) +"Mq" = ( +/obj/structure/chair/sofa/corner, +/turf/open/floor/carpet/orange, +/area/f13/wasteland/city/newboston/house/cabin_one) "Mr" = ( /obj/structure/table/wood/settler, /obj/effect/spawner/lootdrop/f13/common, @@ -10632,6 +11316,15 @@ color = "#777777" }, /area/f13/tribe) +"MI" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, +/area/f13/wasteland/city/newboston/outdoors) "MJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/filingcabinet{ @@ -10697,24 +11390,10 @@ /turf/open/floor/carpet/blue, /area/f13/building/hospital/clinic/nash) "MU" = ( -/obj/structure/table/wood/settler, -/obj/item/storage/fancy/cigarettes/cigars, -/obj/item/lighter{ - color = "#3e4821"; - desc = "That's one fancy Zippo!"; - heat = 2500; - icon_state = "lighter_overlay_plain"; - light_power = 2; - light_range = 1; - name = "Pre-War Military Lighter"; - pixel_x = 8; - pixel_y = -2 - }, -/obj/structure/curtain{ - color = "black"; - pixel_y = -32 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_four) "MV" = ( /obj/machinery/shower{ @@ -10753,13 +11432,17 @@ /turf/open/floor/f13/wood, /area/f13/building) "Nb" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12 +/obj/item/soap/homemade, +/obj/structure/table/wood, +/obj/item/reagent_containers/rag/towel/random{ + pixel_y = 10 }, -/turf/open/floor/plasteel/darkpurple/corner{ - dir = 1 +/obj/item/reagent_containers/rag/towel/random{ + pixel_y = 5 }, +/obj/item/reagent_containers/rag/towel/random, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/plasteel/f13/stone/rugged, /area/f13/wasteland/city/newboston/house/cabin_four) "Nf" = ( /obj/structure/closet/cabinet/anchored{ @@ -10772,21 +11455,24 @@ /area/f13/wasteland/city/newboston/house/cabin_six) "Ng" = ( /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/caves) "Nh" = ( /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = 3 + pixel_y = 3; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -6 + pixel_y = -6; + plane = -14 }, /obj/structure/barricade/wooden/planks{ density = 0; - pixel_y = -2 + pixel_y = -2; + plane = -14 }, /obj/structure/lattice/catwalk, /turf/open/transparent/openspace, @@ -10822,7 +11508,7 @@ randomize_xy = 0 }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "Nq" = ( @@ -10844,6 +11530,10 @@ color = "#777777" }, /area/f13/tribe) +"Nt" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/f13/wood, +/area/f13/building) "Nv" = ( /obj/item/storage/backpack/duffelbag/med/surgery{ pixel_y = 7 @@ -10883,10 +11573,15 @@ }, /area/f13/building) "ND" = ( -/obj/item/bedsheet/purple, -/obj/structure/bed/wooden, -/turf/open/floor/carpet/vault, -/area/f13/wasteland/city/newboston/house/cabin_one) +/obj/structure/chair/sofa{ + color = "#990033" + }, +/turf/open/floor/carpet/red, +/area/f13/wasteland/city/newboston/house/cabin_four) +"NG" = ( +/obj/structure/table/wood, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/house/cabin_two) "NH" = ( /obj/structure/railing{ color = "#A47449"; @@ -10919,9 +11614,11 @@ /turf/open/floor/plasteel/f13/vault_floor/green/white, /area/f13/building) "NM" = ( -/obj/item/bedsheet/purple, -/obj/structure/bed/wooden, -/turf/open/floor/carpet/vault, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_mosaic/wood_mosaic_light, /area/f13/wasteland/city/newboston/house/cabin_two) "NN" = ( /obj/structure/table/reinforced, @@ -11029,6 +11726,25 @@ dir = 8 }, /area/f13/building) +"Oj" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/chair/metal, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "Ok" = ( /obj/machinery/shower{ dir = 4; @@ -11064,10 +11780,15 @@ /turf/open/floor/f13, /area/f13/brotherhood) "Ot" = ( -/turf/closed/wall/r_wall/f13vault{ - icon_state = "2-i" +/obj/structure/table/wood/settler, +/obj/item/pen/fountain, +/obj/item/storage/crayons, +/obj/item/toy/crayon/spraycan, +/obj/structure/sign/poster/prewar/poster93{ + pixel_x = -32 }, -/area/f13/wasteland/city/newboston/house/cabin_two) +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_three) "Ou" = ( /obj/structure/railing{ color = "#A47449"; @@ -11133,12 +11854,12 @@ /turf/closed/wall/r_wall/f13vault{ icon_state = "2-i" }, -/area/f13/wasteland/city/newboston/house/cabin_four) +/area/f13/caves) "OJ" = ( -/obj/item/canvas/twentythreeXtwentythree, -/obj/item/canvas/twentythreeXnineteen, -/obj/structure/table/wood/settler, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_three) "OM" = ( /obj/structure/rack, @@ -11180,12 +11901,28 @@ /turf/open/floor/carpet, /area/f13/wasteland) "OQ" = ( -/obj/structure/table/reinforced, -/obj/machinery/processor/chopping_block, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 }, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + color = "#A47449"; + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_one) "OR" = ( /obj/structure/railing{ dir = 1 @@ -11327,17 +12064,16 @@ /turf/open/floor/plasteel/f13/vault_floor/purple, /area/f13/building) "Pu" = ( -/obj/structure/table/wood/settler, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/structure/table, +/obj/machinery/reagentgrinder/constructed, +/obj/effect/turf_decal/siding/white{ + dir = 9 }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/wasteland/city/newboston/house/cabin_two) "Pv" = ( -/obj/structure/curtain{ - color = "#363636"; - alpha = 255 - }, /obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/north, /turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_six) "Pw" = ( @@ -11365,12 +12101,15 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/building/tribal) +"Px" = ( +/obj/item/storage/box/dice, +/obj/structure/table/wood/fancy/red, +/turf/open/floor/carpet/red, +/area/f13/wasteland/city/newboston/house/cabin_four) "PA" = ( -/obj/structure/table/reinforced, -/obj/machinery/processor/chopping_block, -/turf/open/floor/plasteel/darkpurple/corner{ - dir = 8 - }, +/obj/structure/table/wood/fancy/red, +/obj/item/lighter/gold, +/turf/open/floor/carpet/red, /area/f13/wasteland/city/newboston/house/cabin_four) "PC" = ( /obj/structure/table, @@ -11385,10 +12124,14 @@ /turf/open/floor/plasteel/f13/vault_floor/neutral/white/whitepurplechess, /area/f13/building/hospital/clinic/nash) "PD" = ( -/obj/structure/closet/cabinet/anchored, -/obj/item/razor, -/obj/effect/spawner/lootdrop/clothing_high, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/destructible/tribal_torch/wall/lit{ + dir = 8; + layer = 3 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/plasteel/f13/stone/rugged, /area/f13/wasteland/city/newboston/house/cabin_four) "PE" = ( /obj/structure/railing{ @@ -11456,14 +12199,23 @@ /turf/open/floor/plasteel/cult, /area/f13/building/tribal) "PR" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 12 +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 }, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 }, -/area/f13/wasteland/city/newboston/house/cabin_two) +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/caves) "PS" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -11482,6 +12234,28 @@ }, /turf/open/floor/carpet/red, /area/f13/building) +"PU" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "PW" = ( /turf/open/floor/plasteel/f13/vault_floor/floor, /area/f13/building) @@ -11503,11 +12277,10 @@ /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid, /area/f13/building) "PZ" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder/constructed, -/turf/open/floor/plasteel/darkpurple/corner{ - dir = 1 +/obj/structure/chair/comfy/beige{ + dir = 8 }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_four) "Qa" = ( /obj/structure/flora/grass/wasteland, @@ -11523,9 +12296,8 @@ /area/f13/building) "Qc" = ( /obj/structure/window/fulltile/wood, -/obj/structure/curtain{ - color = "#475340"; - alpha = 255 +/obj/structure/curtain/directional/north{ + color = "#475340" }, /turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_five) @@ -11577,11 +12349,7 @@ /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "Qk" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" - }, +/turf/closed/wall/f13/coyote/oldwood, /area/f13/wasteland/city/newboston/house/cabin_one) "Ql" = ( /obj/effect/turf_decal/stripes/line{ @@ -11651,6 +12419,28 @@ /obj/effect/landmark/start/f13/hunter, /turf/open/indestructible/ground/inside/mountain, /area/f13/building/tribal) +"QA" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 8 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_one) "QB" = ( /obj/structure/table/booth, /obj/effect/spawner/lootdrop/f13/uncommon, @@ -11665,14 +12455,10 @@ }, /area/f13/building/tribal/atonement) "QD" = ( -/obj/structure/chair/comfy{ - dir = 1 - }, -/obj/structure/curtain{ - color = "black"; - pixel_y = -32 +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_four) "QF" = ( /obj/structure/table/wood, @@ -11772,9 +12558,9 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/wasteland/city/newboston/house/cabin_six) "QV" = ( -/obj/structure/grille, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/f13/vault_floor/neutral, +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/north, +/turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_one) "QW" = ( /obj/structure/chair/sofa{ @@ -11836,7 +12622,7 @@ dir = 6 }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "Ri" = ( @@ -11864,18 +12650,13 @@ "Rm" = ( /obj/structure/spacevine, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/caves) "Rn" = ( /obj/structure/window/fulltile/house, -/obj/structure/curtain{ - color = "#1e549c"; - alpha = 255 - }, -/obj/structure/curtain{ - color = "#1e549c"; - alpha = 255 +/obj/structure/curtain/directional/east{ + color = "#1e549c" }, /turf/open/floor/wood_common, /area/f13/building/hospital/clinic/nash) @@ -11925,6 +12706,17 @@ }, /turf/open/floor/carpet/cyan, /area/f13/building) +"Rv" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table/wood/settler, +/obj/item/clothing/shoes/jackboots, +/obj/structure/sign/poster/official/soft_cap_pop_art{ + pixel_x = -32 + }, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_three) "Rw" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ywflowers, @@ -11972,9 +12764,33 @@ }, /obj/structure/flora/ausbushes/fullgrass, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) +"RN" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/structure/toilet_paper{ + pixel_y = 16; + pixel_x = -8 + }, +/obj/structure/mirror{ + pixel_y = 32; + pixel_x = 7 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 24; + pixel_x = 7 + }, +/obj/machinery/light/small{ + dir = 1; + pixel_y = 20; + pixel_x = -9 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/f13/wasteland/city/newboston/house/cabin_three) "RO" = ( /obj/item/kirbyplants, /turf/open/floor/f13/wood, @@ -11985,12 +12801,8 @@ /turf/open/floor/plasteel/f13/vault_floor/purple, /area/f13/building/hospital/clinic/nash) "RQ" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder/constructed, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" - }, -/area/f13/wasteland/city/newboston/house/cabin_two) +/turf/closed/wall/f13/coyote/oldwood, +/area/f13/caves) "RR" = ( /obj/structure/spacevine{ opacity = 1 @@ -12074,16 +12886,7 @@ }, /area/f13/building) "Sf" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/structure/curtain{ - open = 0 - }, -/obj/machinery/shower{ - pixel_y = 27 - }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/closed/wall/f13/coyote/oldwood, /area/f13/wasteland/city/newboston/house/cabin_two) "Sg" = ( /obj/structure/flora/grass/wasteland{ @@ -12166,6 +12969,29 @@ "Sv" = ( /turf/closed/indestructible/rock, /area/f13/tunnel) +"Sx" = ( +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/building) +"Sz" = ( +/obj/structure/bed/wooden, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/bedsheet{ + icon_state = "sheetgondola" + }, +/obj/item/bedsheet{ + icon_state = "sheetgondola" + }, +/obj/structure/dresser{ + pixel_x = 5; + pixel_y = 19; + density = 0 + }, +/turf/open/floor/f13/wood, +/area/f13/building) +"SA" = ( +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/house/cabin_three) "SC" = ( /obj/structure/curtain{ color = "#5c131b"; @@ -12291,10 +13117,12 @@ /turf/open/floor/engine, /area/f13/building) "SY" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/transparent/openspace, -/area/f13/wasteland) +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "SZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/f13/vault_floor/floor, @@ -12308,11 +13136,14 @@ /turf/open/floor/plasteel/f13/vault_floor/purple, /area/f13/building/hospital/clinic/nash) "Td" = ( -/obj/structure/rack, -/obj/item/storage/belt/xenoarch/full, -/obj/item/storage/belt/xenoarch/full, -/turf/open/floor/plasteel/f13/vault_floor/purple, -/area/f13/building) +/obj/structure/bookshelf{ + pixel_y = 20 + }, +/obj/machinery/light_switch{ + pixel_x = 22 + }, +/turf/open/floor/carpet/royalblack, +/area/f13/wasteland/city/newboston/house/cabin_two) "Te" = ( /obj/effect/landmark/start/f13/chief, /turf/open/indestructible/ground/inside/mountain, @@ -12365,14 +13196,15 @@ /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland/city/newboston/outdoors) "Tr" = ( -/obj/structure/curtain{ - color = "#845f58" - }, /obj/structure/railing{ color = "#A47449"; dir = 8 }, /obj/structure/window/fulltile/house, +/obj/structure/curtain/directional/east{ + color = "#845f58"; + alpha = 200 + }, /turf/open/floor/wood_common, /area/f13/building) "Ts" = ( @@ -12411,12 +13243,15 @@ icon_state = "bluedirtychess2" }, /area/f13/building) -"Tx" = ( -/obj/structure/curtain{ - color = "black"; - pixel_y = -32 +"Tw" = ( +/obj/structure/sign/poster/contraband/pinup_funk{ + pixel_y = 32 }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_three) +"Tx" = ( +/obj/machinery/light, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_four) "Ty" = ( /obj/item/melee/onehanded/knife/ritualdagger{ @@ -12456,6 +13291,9 @@ }, /turf/open/indestructible/ground/outside/dirt, /area/f13/tribe) +"TF" = ( +/turf/open/floor/carpet/arcade, +/area/f13/wasteland/city/newboston/house/cabin_two) "TG" = ( /obj/structure/railing, /obj/structure/railing{ @@ -12477,17 +13315,11 @@ randomize_xy = 0 }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "TI" = ( -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/storage/fancy/egg_box, -/obj/effect/spawner/lootdrop/f13/foodspawner, -/obj/structure/closet/secure_closet/freezer/fridge{ - anchored = 1 - }, -/turf/open/floor/plasteel/darkpurple/corner, +/turf/closed/wall/f13/coyote/oldwood, /area/f13/wasteland/city/newboston/house/cabin_four) "TK" = ( /obj/machinery/computer/terminal{ @@ -12503,10 +13335,29 @@ /turf/open/floor/f13/wood, /area/f13/building/tribal) "TM" = ( -/obj/structure/closet/cabinet/anchored, -/obj/item/razor, -/obj/effect/spawner/lootdrop/clothing_high, -/turf/open/floor/carpet/vault, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 4 + }, +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) "TN" = ( /obj/structure/wreck/trash/machinepile, @@ -12515,7 +13366,9 @@ }, /area/f13/building) "TO" = ( -/obj/structure/table/wood/settler, +/obj/machinery/light_switch{ + pixel_y = 26 + }, /turf/open/floor/carpet/purple, /area/f13/wasteland/city/newboston/house/cabin_three) "TP" = ( @@ -12591,12 +13444,38 @@ /obj/structure/table/booth, /turf/open/floor/f13/wood, /area/f13/building) +"TZ" = ( +/obj/structure/toilet_paper{ + pixel_y = 16; + pixel_x = -8 + }, +/obj/structure/mirror{ + pixel_y = 32; + pixel_x = 7 + }, +/obj/structure/sink{ + dir = 1; + pixel_y = 24; + pixel_x = 7 + }, +/obj/machinery/light/small{ + dir = 1; + pixel_y = 20; + pixel_x = -9 + }, +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/f13{ + icon_state = "whitegreenrustychess" + }, +/area/f13/building) "Ua" = ( /obj/structure/spacevine{ color = "#225522" }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/caves) "Uc" = ( @@ -12640,6 +13519,10 @@ }, /turf/open/floor/f13, /area/f13/brotherhood) +"Uk" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "Um" = ( /obj/structure/table/wood, /obj/structure/destructible/tribal_torch/wall/lit{ @@ -12697,9 +13580,9 @@ }, /area/f13/building) "UA" = ( -/obj/machinery/door/airlock/freezer, -/turf/open/floor/plasteel/f13/vault_floor/red, -/area/f13/wasteland/city/newboston/house/cabin_two) +/obj/structure/bed/dogbed, +/turf/open/floor/carpet/red, +/area/f13/wasteland/city/newboston/house/cabin_four) "UC" = ( /obj/machinery/light/small{ dir = 4 @@ -12939,9 +13822,10 @@ /turf/open/floor/f13/wood, /area/f13/building/tribal) "Vr" = ( -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" +/obj/structure/chair/sofa/left{ + dir = 8 }, +/turf/open/floor/carpet/orange, /area/f13/wasteland/city/newboston/house/cabin_one) "Vs" = ( /obj/structure/bed/pod, @@ -13011,15 +13895,28 @@ /turf/open/floor/carpet/red, /area/f13/brotherhood) "VF" = ( -/obj/structure/table/reinforced, -/obj/machinery/processor/chopping_block, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "blueyellowfull" +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 }, +/obj/machinery/grill, +/turf/open/floor/wood_fancy/wood_fancy_dark, /area/f13/wasteland/city/newboston/house/cabin_one) "VH" = ( /obj/structure/table/wood/fancy/blackred, /obj/item/storage/box/dice, +/obj/item/lighter/bullet, /turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_seven) "VL" = ( @@ -13095,13 +13992,18 @@ /turf/open/floor/carpet, /area/f13/wasteland) "VV" = ( -/obj/machinery/door/airlock/freezer, -/turf/open/floor/plasteel/f13/vault_floor/red, -/area/f13/wasteland/city/newboston/house/cabin_three) +/obj/structure/dresser{ + pixel_x = 5; + pixel_y = 19; + density = 0 + }, +/turf/open/floor/carpet, +/area/f13/building) "VW" = ( -/turf/open/floor/plasteel/darkpurple/corner{ - dir = 4 +/obj/structure/chair/sofa/corner{ + color = "#990033" }, +/turf/open/floor/carpet/red, /area/f13/wasteland/city/newboston/house/cabin_four) "VX" = ( /obj/effect/turf_decal/trimline/neutral{ @@ -13138,6 +14040,15 @@ }, /turf/open/floor/wood_wide, /area/f13/wasteland/city/newboston/outdoors) +"Wa" = ( +/obj/structure/table/wood/settler, +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/reagent_containers/food/snacks/pizzaslice/sassysage, +/turf/open/floor/wood_fancy/wood_fancy_dark, +/area/f13/wasteland/city/newboston/house/cabin_three) "Wb" = ( /obj/structure/simple_door/wood, /obj/structure/decoration/rag, @@ -13183,6 +14094,17 @@ icon_state = "floorrustysolid" }, /area/f13/building) +"Wl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small, +/obj/structure/closet/cabinet/anchored{ + pixel_x = 7; + pixel_y = 3 + }, +/turf/open/floor/f13/wood{ + icon_state = "housewood2-broken" + }, +/area/f13/building) "Wm" = ( /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/building/hospital/clinic/nash) @@ -13207,17 +14129,9 @@ }, /area/f13/building) "Wr" = ( -/obj/structure/toilet{ - dir = 4; - pixel_x = -3 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/obj/structure/window/fulltile/wood, +/obj/structure/curtain/directional/east, +/turf/open/floor/wood_common, /area/f13/wasteland/city/newboston/house/cabin_two) "Ws" = ( /obj/structure/railing{ @@ -13233,13 +14147,13 @@ /turf/open/floor/plating/f13/outside/roof/metal, /area/f13/wasteland/city/newboston/outdoors) "Wu" = ( -/obj/structure/rack, -/obj/machinery/light{ - dir = 8 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/obj/item/storage/belt/xenoarch/full, -/obj/item/storage/belt/xenoarch/full, -/turf/open/floor/plasteel/f13/vault_floor/purple, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland/city/newboston/house/cabin_one) +"Wv" = ( +/turf/open/floor/carpet, /area/f13/building) "Wx" = ( /obj/structure/railing{ @@ -13307,30 +14221,31 @@ /turf/open/floor/engine, /area/f13/building) "WM" = ( -/obj/structure/curtain{ - color = "#c40e0e"; - pixel_y = -32; - alpha = 255 - }, -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" - }, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) "WN" = ( -/turf/open/floor/plasteel/f13/vault_floor/red{ - icon_state = "bluedirtysolid" +/obj/structure/table, +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 }, +/turf/open/floor/plasteel/f13/vault_floor/misc/cmo, /area/f13/wasteland/city/newboston/house/cabin_two) "WO" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/plasteel/f13/vault_floor/red, +/turf/open/floor/plasteel/f13/stone/rugged, /area/f13/wasteland/city/newboston/house/cabin_four) "WP" = ( -/obj/structure/dresser, -/turf/open/floor/carpet/vault, -/area/f13/wasteland/city/newboston/house/cabin_one) +/obj/structure/bookshelf{ + pixel_y = 20 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland/city/newboston/house/cabin_four) "WQ" = ( /obj/structure/table/glass, /obj/machinery/camera{ @@ -13352,10 +14267,17 @@ }, /area/f13/building) "WS" = ( -/turf/closed/wall/r_wall/f13vault{ - icon_state = "2-i" - }, +/obj/structure/simple_door/wood, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) +"WT" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ghoul, +/obj/item/mop, +/turf/open/floor/f13{ + icon_state = "whitegreenrustychess" + }, +/area/f13/building) "WX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -13371,10 +14293,9 @@ /turf/closed/wall/f13/coyote/darkwoodwall, /area/f13/building/hospital/clinic/nash) "WZ" = ( -/obj/structure/chair/stool, -/obj/item/pen/fountain, -/turf/open/floor/plasteel/f13/vault_floor/red, -/area/f13/wasteland/city/newboston/house/cabin_three) +/obj/structure/simple_door/interior, +/turf/open/floor/f13/wood, +/area/f13/building) "Xc" = ( /obj/item/lock_bolt{ dir = 8 @@ -13411,7 +14332,7 @@ randomize_xy = 0 }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "Xh" = ( @@ -13423,7 +14344,7 @@ icon_state = "skin" }, /turf/closed/indestructible/riveted/boss{ - name = "temple wall" + name = "ancient wall" }, /area/f13/building/tribal) "Xi" = ( @@ -13516,6 +14437,28 @@ /obj/machinery/microwave, /turf/open/floor/plasteel/f13/vault_floor/purple/white/corner, /area/f13/building) +"XE" = ( +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/railing{ + color = "#A47449"; + dir = 10 + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "XF" = ( /obj/structure/destructible/tribal_torch/lit, /obj/structure/flora/ausbushes/ppflowers, @@ -13710,13 +14653,30 @@ /turf/open/transparent/openspace, /area/f13/building/tribal) "Ys" = ( -/obj/structure/easel, -/obj/item/canvas/nineteenXnineteen, -/turf/open/floor/plasteel/f13/vault_floor/red, -/area/f13/wasteland/city/newboston/house/cabin_three) +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = 3; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -6; + plane = -14 + }, +/obj/structure/barricade/wooden/planks{ + density = 0; + pixel_y = -2; + plane = -14 + }, +/obj/structure/railing{ + color = "#A47449" + }, +/turf/open/floor/wood_fancy/wood_fancy_light, +/area/f13/wasteland) "Yu" = ( -/obj/machinery/door/airlock/freezer, -/turf/open/floor/carpet/purple, +/obj/structure/simple_door/wood, +/obj/item/lock_bolt, +/turf/open/floor/wood_fancy/wood_fancy_light, /area/f13/wasteland/city/newboston/house/cabin_one) "Yv" = ( /obj/structure/table/wood/settler, @@ -13831,6 +14791,11 @@ /obj/structure/flora/ausbushes/leafybush, /turf/open/indestructible/ground/outside/dirt, /area/f13/tribe) +"YS" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_mosaic/wood_mosaic_light, +/area/f13/wasteland/city/newboston/house/cabin_two) "YU" = ( /obj/structure/stone_tile/surrounding/burnt, /obj/structure/stone_tile/center, @@ -13908,6 +14873,11 @@ "Zh" = ( /turf/open/transparent/openspace, /area/f13/wasteland/city/newboston/outdoors) +"Zi" = ( +/obj/structure/simple_door/interior, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood_common, +/area/f13/building) "Zj" = ( /obj/effect/fake_stairs/north, /turf/open/floor/f13{ @@ -26378,7 +27348,7 @@ qV qV qV qV -tN +qV tN tN tN @@ -26635,7 +27605,7 @@ qV qV qV qV -tN +qV tN tN tN @@ -26892,7 +27862,7 @@ qV qV qV qV -tN +qV tN tN tN @@ -27149,7 +28119,7 @@ qV qV qV qV -tN +qV tN tN tN @@ -27406,7 +28376,7 @@ qV qV qV qV -tN +qV tN tN tN @@ -27663,7 +28633,7 @@ qV qV qV qV -tN +qV tN tN tN @@ -27920,7 +28890,7 @@ qV qV qV qV -tN +qV tN tN tN @@ -28177,7 +29147,7 @@ qV qV qV qV -tN +qV tN tN tN @@ -28434,7 +29404,7 @@ qV qV qV qV -tN +qV tN tN tN @@ -33608,33 +34578,186 @@ tN tN tN tN -LS -tu -tu -lG -tu -bx -GZ -GZ -GZ -GZ -GZ +LS +tu +tu +lG +tu +bx +GZ +GZ +GZ +GZ +GZ +tN +tN +tN +tN +tN +tN +Fb +Fb +Fb +Fb +Fb +Fb +Fb +Fb +Fb +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +hD +KQ +KQ +KQ +KQ +KQ +KQ +KQ +yU +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +GZ +GZ +GZ +GZ +GZ +GZ +GZ +GZ +GZ +GZ +tN +tN +tN +tN +tN +GZ +GZ +GZ +GZ +GZ +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +qV +qV +qV +qV +qV +qV +qV +qV +qV +qV +qV +qV +qV +qV +qV +qV +tN +tN +tN +GU +GU +GU +GU +GU +GU +GU +GU +GU +GU +GU +Yj +"} +(77,1,1) = {" +Yj +GU +GU +qF +GU +GU +GU +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN tN tN tN tN tN tN -Fb -Fb -Fb -Fb -Fb -Fb -Fb -Fb -Fb -tN tN tN tN @@ -33654,23 +34777,6 @@ tN tN tN tN -hD -KQ -KQ -KQ -KQ -KQ -KQ -KQ -yU -tN -tN -tN -tN -tN -tN -tN -tN tN tN tN @@ -33682,32 +34788,26 @@ tN tN tN tN +Fb +Fb +Fb +Fb +Fb +Fb +Fb +Fb +Fb tN tN tN tN tN tN -GZ -GZ -GZ -GZ -GZ -GZ -GZ -GZ -GZ -GZ tN tN tN tN tN -GZ -GZ -GZ -GZ -GZ tN tN tN @@ -33728,136 +34828,6 @@ qV qV qV qV -qV -qV -qV -qV -qV -qV -qV -tN -tN -tN -GU -GU -GU -GU -GU -GU -GU -GU -GU -GU -GU -Yj -"} -(77,1,1) = {" -Yj -GU -GU -qF -GU -GU -GU -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -Fb -Fb -Fb -Fb -Fb -Fb -Fb -Fb -Fb -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -tN -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL tN tN tN @@ -34098,23 +35068,23 @@ tN tN tN tN -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +qV +qV +qV +qV +qV +qV +qV +qV +qV tN tN tN @@ -34355,23 +35325,23 @@ tN tN tN tN -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +tN +qV +tN +tN +qV +tN +tN +qV +qV tN tN tN @@ -34612,23 +35582,23 @@ tN tN tN tN -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +qV +qV tN tN tN @@ -34869,23 +35839,23 @@ tN tN tN tN -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +qV +qV +tN +tN +tN +qV +qV +qV +qV tN tN tN @@ -35126,23 +36096,23 @@ tN tN tN tN -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +qV +qV +tN +tN +qV +qV +qV +qV +qV tN tN tN @@ -35383,23 +36353,23 @@ tN tN tN tN -AK -AK -AK -AK -AK -AK -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +qV +qV +qV +tN +tN +qV +qV +qV +qV tN tN tN @@ -35640,23 +36610,23 @@ tN tN tN tN -AK -AK -AK -AK -AK -AK -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +qV +qV +qV +qV +tN +tN +qV +qV +qV tN tN tN @@ -35897,23 +36867,23 @@ tN tN tN tN -AK -AK -AK -AK -AK -AK -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +qV +qV +qV +qV +qV +tN +tN +qV +qV tN tN tN @@ -36154,20 +37124,20 @@ tN tN tN tN -AK -AK -AK -AK -AK -AK -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN tN tN tN @@ -36343,7 +37313,7 @@ tN tN TC WY -Zz +Rn Rn TC WY @@ -36411,20 +37381,20 @@ tN tN tN tN -AK -AK -AK -AK -AK -AK -CL -CL -CL -CL -CL -CL -CL -CL +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN +tN tN tN tN @@ -36672,16 +37642,16 @@ AK AK AK AK -AK -AK -CL -CL -CL -CL CL CL CL CL +mM +rL +rL +mM +PU +XE tN tN tN @@ -36855,7 +37825,7 @@ tN tN tN tN -Zz +nZ kP mz df @@ -36929,16 +37899,16 @@ AK AK AK AK -AK -AK -CL -CL -CL -CL CL CL CL CL +mM +VV +Wv +mM +Ci +Ys tN tN tN @@ -37123,7 +38093,7 @@ dX dX TC ZJ -Zz +Rn TC TC dK @@ -37186,16 +38156,16 @@ AK AK AK AK -AK -AK -CL -CL -CL -CL -CL -CL CL CL +mM +mM +mM +qW +uS +mM +wu +Ys tN tN tN @@ -37439,20 +38409,20 @@ tN tN tN tN +AK +AK +AK +AK CL CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +ml +kR +Zi +bT +bT +Zi +fV +sS tN tN tN @@ -37639,7 +38609,7 @@ TC ga ga bw -Zz +jz Zh Zh Dk @@ -37696,20 +38666,20 @@ tN tN tN tN +AK +AK +AK +AK CL CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +mM +EA +mM +xl +FN +mM +Oj +xI tN tN tN @@ -37953,20 +38923,20 @@ tN tN tN tN +AK +AK +AK +AK CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +mM +mM +mM +mM +mM +qH +mM +mM +mM tN tN tN @@ -38210,20 +39180,20 @@ tN tN tN tN +AK +AK +AK +AK CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +mM +TZ +WT +WZ +Bg +Bg +Bg +Sx +tq tN tN tN @@ -38232,7 +39202,7 @@ tN tN tN OR -mM +mK Yh MC kU @@ -38467,20 +39437,20 @@ tN tN tN tN +AK +AK +AK +AK CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL -CL +mM +mM +yM +mM +Sx +Gg +Bg +Bg +tq tN tN tN @@ -38667,7 +39637,7 @@ TC ga ga bw -Zz +jz Zh Zh cc @@ -38730,14 +39700,14 @@ tN tN tN tN -CL -CL -CL -CL -CL -CL -CL -CL +mM +mM +mM +WZ +mM +di +ky +mM tN tN tN @@ -38987,14 +39957,14 @@ tN tN tN tN -CL -CL -CL -CL -CL -CL -CL -CL +gJ +WZ +kU +Nt +mM +di +hV +tq tN tN tN @@ -39179,7 +40149,7 @@ Zz TC TC TC -Zz +eK TC TC Zh @@ -39244,14 +40214,14 @@ tN tN tN tN -CL -CL -CL -CL -CL -CL -CL -CL +yC +mM +Sz +Wl +mM +Ee +Bg +tq tN tN tN @@ -39260,7 +40230,7 @@ tN tN tN OR -mK +bC Yh MC kU @@ -39501,14 +40471,14 @@ tN tN tN tN -CL -CL -CL -CL -CL -CL -CL -CL +mM +mM +GN +mM +mM +mM +GN +mM tN tN tN @@ -40197,18 +41167,18 @@ GU GU GU GU -GU qF qF -WS -WS -WS -WS -WS -WS -WS -WS -WS +qF +Qk +Qk +Qk +sb +Qk +Qk +Qk +sb +Qk Cv qu Zh @@ -40453,16 +41423,16 @@ GU GU GU GU -GU -GU +qF qF GU -WS +GU +Qk sD hh ET WS -cy +WM gH WM QV @@ -40709,18 +41679,18 @@ GU GU GU GU -GU -GU -GU +qF qF GU -WS -eX +RQ +RQ +Qk +zI eD eX -uU -vO +Qk vO +cy WM QV dK @@ -40966,19 +41936,19 @@ GU GU GU GU -GU -GU qF qF GU -WS -WS -WS -WS -WS -bd +RQ +PR +Qk +Qk +oV +Qk +Qk vO WM +WM QV dK EC @@ -41223,20 +42193,20 @@ Ap Ap Ap GU -GU -qF qF +um GU -GU -WS +RQ +cR +cR TM cR -Fd +cR Yu -vO -vO +Wu +Wu bd -WS +Qk Ej EC Zh @@ -41480,20 +42450,20 @@ Ap Ap Ap Ap -gw -qF -qF -GU -GU -WS -sb +wi +Ap +Ap +Ap Fd -WS -WS -vO -vO +Fd +Fd +Fd +Fd +Qk +JE +HG wH -WS +sC dK dK Cv @@ -41737,20 +42707,20 @@ Ap Ap Ap Ap -gw -qF -GU -GU -GU -WS -WP +wi +Ap +Ap +Ap +Fd +Fd +Fd +Fd Fd -WS jB +Mq Vr -Vr -Vr -An +HO +Qk dK dK dK @@ -41766,7 +42736,7 @@ HX tn Rs tn -jz +Qc tN tN tN @@ -41995,19 +42965,19 @@ hq hq qF qF -qF -GU -GU +eP GU -WS -ND +RQ +QA +DU +Fd +Fd Fd -WS Qk -wE -me -VF -WS +Qk +Qk +Qk +Qk dK xm dK @@ -42023,7 +42993,7 @@ Ji aR zt KO -jz +Qc tN tN tN @@ -42254,17 +43224,17 @@ GU qF qF GU -GU -GU -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot +RQ +VF +CT +OQ +OQ +OQ +ss +Uk +aZ +xb +Sf dK Zh Iu @@ -42510,17 +43480,17 @@ Ap GU qF qF -qF -GU GU -Ot +RQ +RQ +pT Sf Wr -CT -Ot -mo -xb -BY +Sf +Sf +xS +JR +TF rN dK Zh @@ -42536,7 +43506,7 @@ cw Ac cw cw -cw +Cr SU tN tN @@ -42767,17 +43737,17 @@ GU GU qF qF -qF GU GU -Ot +RQ +me kD cS +cS kD -UA -WN -WN BY +NM +AX rN dK Pk @@ -43025,17 +43995,17 @@ GU GU qF qF -qF GU -Ot -Ot -Ot -Ot -Ot -Pu -WN -BY -rN +RQ +jw +Sf +uU +NG +Sf +Fi +YS +ID +lI dK dK ci @@ -43282,17 +44252,17 @@ GU GU GU qF -qF GU -Ot -hi +RQ +Sf +Sf vu bi -wi -WN -WN +Sf +Jl +SY Pu -Ot +rN dK dK dK @@ -43541,15 +44511,15 @@ GU qF qF GU -Ot -Cc -bi -Ot -Ot -WN +GU +Sf +Td +KH +Sf WN +lW ff -Ot +Sf dK dK dK @@ -43798,15 +44768,15 @@ DO GU qF GU -Ot -nZ -bi -Ot -yh -sC -sC -sC -pT +RQ +Sf +Sf +Sf +Sf +Sf +Sf +Sf +Sf dK dK dK @@ -43816,7 +44786,7 @@ pn eW ZH ZH -KF +Eq Pv Zh Zh @@ -44055,16 +45025,16 @@ DO GU qF GU +hC +RN +nI +tQ +hC Ot -NM -bi -Ot -JE -RQ -PR -OQ -Ot -dK +Rv +JF +hC +Ej xm dK eW @@ -44312,16 +45282,16 @@ DO GU qF qF -uY -uY -uY -uY -uY -uY -uY -uY -uY -Ej +hC +ad +LY +tQ +hC +Tw +HC +HC +Cq +dK Zh Iu eW @@ -44569,15 +45539,15 @@ DO DO GU qF -uY -ad -LY -tQ -uY -nW -HC -Cr -Cq +hC +hC +Mk +hC +hC +eQ +yz +rk +hC dK Zh Iu @@ -44826,14 +45796,14 @@ Vh DO GU qF -uY -eQ -Mk -eQ -VV -eQ -eQ -Cr +hC +Wa +HC +HC +hC +nW +HC +HC Cq dK Ts @@ -45083,15 +46053,15 @@ Vh DO GU qF -uY -uY -uY -uY -uY -nW -WZ -Ys -uY +hC +es +xg +OJ +LW +OJ +OJ +OJ +tI dK dK dK @@ -45340,15 +46310,15 @@ xP DO GU qF -uY -es -xg +hC +TO Ao -LW -eQ -eQ -OJ -uY +nn +hC +vG +SA +qv +Cq dK oW xm @@ -45597,15 +46567,15 @@ zz DO GU qF -uY -TO -Ao -uY -uY -eQ -eQ -qv -uY +hC +If +bH +xn +hC +CO +GG +Mm +hC dK EC tN @@ -45854,16 +46824,16 @@ Vh DO GU qF -uY -If -Ao -uY -hV -Mm -GG -Mm -bH -dK +hC +hC +hC +hC +hC +hW +hC +hW +hC +MI EC tN tN @@ -46111,16 +47081,16 @@ DO DO GU qF -uY -hC -Ao -uY -qW -uS +de +EP +nx +LK +LK LK -hW uY -Ej +LK +LK +Iu rW tN tN @@ -46132,7 +47102,7 @@ tp tp tp tp -ae +of tp tp tN @@ -46368,16 +47338,16 @@ GU GU GU qF -OH -OH -OH -OH -OH -OH -OH -OH -OH -dK +TI +TI +TI +TI +TI +TI +TI +ll +TI +vz Mg tN tN @@ -46621,19 +47591,19 @@ GU GU GU GU -GU -GU -GU qF -OH +qF +qF +qF +TI wX DJ Ix -OH +Ez wS -WO -tV -OH +sf +wS +DI dK Mg tN @@ -46881,16 +47851,16 @@ qF qF GU GU -qF -OH -tV +GU +TI +yh uO -tV -jk -tV -tV +Cc +TI +WP +PZ Tx -DI +TI dK BH tN @@ -47135,20 +48105,20 @@ GU GU GU GU -qF -qF -qF -qF -OH -OH -OH -OH -OH -tV -tV +GU +GU +Yj +Yj +TI +TI +TI +TI +TI +An +hi QD -DI -dK +TI +Ej EC tN tN @@ -47390,19 +48360,19 @@ us GU GU GU -us GU GU GU GU -qF -OH -PD -WO -tV -jk -tV -tV +Yj +mf +mf +mf +mf +mf +TI +sX +PA MU DI dK @@ -47648,22 +48618,22 @@ GU GU GU GU -us -us -us GU GU -OH -qP -tV -OH -OH -tV -tV -tV -OH -Ej -EC +GU +Yj +mf +lk +PD +WO +cz +jk +ND +Px +mo +vC +xm +FH tN tN Fo @@ -47908,19 +48878,19 @@ GU GU GU GU -GU -GU -OH -um +Yj +mf +wE +qP tV -OH +mf TI VW eM -VW -vC -xm -FH +UA +DI +tN +tN tN tN Fo @@ -48165,17 +49135,17 @@ GU GU GU GU -GU -GU -OH +Yj mf -tV -OH -PA Nb -cz -PZ -OH +tV +tV +mf +TI +TI +TI +TI +TI tN tN tN @@ -48420,14 +49390,14 @@ CR IQ IQ OU -IQ -IQ -IQ -IQ -OH -OH -OH -OH +GU +GU +Yj +mf +mf +mf +mf +mf OH OH OH @@ -48678,14 +49648,14 @@ gE nv OU IQ -Wu -Td IQ IQ -qF -qF -qF -qF +IQ +IQ +OH +OH +OH +OH qF qF nu @@ -61810,9 +62780,9 @@ tN tN tN tN -No tN -No +tN +tN tN tN tN @@ -62064,12 +63034,12 @@ GU GU tN tN -No -SY -SY tN -No -No +tN +tN +tN +tN +tN tN tN tN @@ -62323,10 +63293,10 @@ GU GU tN tN -xl -No tN -No +tN +tN +tN tN tN tN @@ -62582,7 +63552,7 @@ GU GU GU tN -No +tN tN tN tN @@ -63356,9 +64326,9 @@ Yj GU GU GU -No tN -No +tN +tN tN tN tN @@ -63873,9 +64843,9 @@ Yj GU GU tN -No -SY -No +tN +tN +tN tN tN tN @@ -64394,11 +65364,11 @@ GU GU tN tN -SY tN tN tN -No +tN +tN tN tN tN diff --git a/_maps/map_files/coyote_bayou/Newboston.dmm b/_maps/map_files/coyote_bayou/Newboston.dmm index b0bbfba701..3a8e0ec7d3 100644 --- a/_maps/map_files/coyote_bayou/Newboston.dmm +++ b/_maps/map_files/coyote_bayou/Newboston.dmm @@ -9083,9 +9083,8 @@ }, /area/f13/building) "fvZ" = ( -/obj/structure/mirror, -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/f13/coyote/oldwood, +/obj/structure/stairs/west, +/turf/open/floor/f13/wood, /area/f13/building) "fwi" = ( /obj/effect/decal/cleanable/dirt{ @@ -9411,13 +9410,8 @@ /turf/open/indestructible/ground/outside/water, /area/f13/tribe) "fDQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/small/broken{ - dir = 8 - }, -/turf/open/floor/f13{ - icon_state = "whitegreenrustychess" - }, +/obj/machinery/light/small, +/turf/open/floor/f13/wood, /area/f13/building) "fDY" = ( /turf/open/indestructible/ground/outside/gravel, @@ -9913,17 +9907,6 @@ /obj/structure/chair/bench, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) -"fWu" = ( -/obj/machinery/shower{ - dir = 8 - }, -/obj/structure/decoration/vent, -/obj/item/soap/deluxe, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "whitegreenrustychess" - }, -/area/f13/building) "fWA" = ( /obj/item/storage/backpack/satchel/explorer, /obj/effect/spawner/lootdrop/trash, @@ -10252,6 +10235,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/cabinet/anchored, /obj/effect/spawner/lootdrop/clothing_middle, +/obj/item/lockpick_set, /turf/open/floor/f13/wood{ icon_state = "housewood2-broken" }, @@ -15310,6 +15294,9 @@ /obj/item/kitchen/rollingpin, /obj/item/kitchen/knife/butcher, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/f13{ icon_state = "whitegreenrustychess" }, @@ -24403,9 +24390,14 @@ /area/f13/wasteland) "oIV" = ( /obj/structure/bed/wooden, -/obj/item/bedsheet/gondola, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/bedsheet{ + icon_state = "sheetgondola" + }, +/obj/item/bedsheet{ + icon_state = "sheetgondola" + }, /turf/open/floor/f13/wood, /area/f13/building) "oJg" = ( @@ -27337,6 +27329,7 @@ /obj/structure/chair/sofa{ dir = 1 }, +/obj/machinery/light, /turf/open/floor/f13/wood, /area/f13/building) "qtL" = ( @@ -31545,13 +31538,6 @@ icon_state = "housewood2" }, /area/f13/building) -"sMa" = ( -/obj/structure/simple_door/interior, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "whitegreenrustychess" - }, -/area/f13/building) "sMx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -32204,6 +32190,9 @@ "tgn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/dresser, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/f13/wood, /area/f13/building) "tgv" = ( @@ -33468,6 +33457,13 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/structure/stairs/north{ + icon_state_override = "rockpile"; + icon_state = "rockpile"; + color = "#43392c"; + layer = 3; + name = "climbable rubble" + }, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building) "tQw" = ( @@ -36703,15 +36699,6 @@ icon_state = "floorrustysolid" }, /area/f13/building) -"vUc" = ( -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/f13{ - icon_state = "whitegreenrustychess" - }, -/area/f13/building) "vUt" = ( /obj/item/storage/box/ingredients/carnivore, /obj/item/storage/box/ingredients/carnivore, @@ -37330,15 +37317,8 @@ /turf/open/floor/plasteel/f13/vault_floor/blue/white/whitebluechess, /area/f13/building/abandoned) "wpm" = ( -/obj/structure/sink{ - dir = 1; - pixel_y = 15 - }, -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ghoul, -/turf/open/floor/f13{ - icon_state = "whitegreenrustychess" - }, +/obj/effect/fake_stairs/west, +/turf/open/floor/f13/wood, /area/f13/building) "wqx" = ( /obj/structure/billboard/powerlines2{ @@ -64947,8 +64927,8 @@ wEQ vxt umI sZG -sMa sZG +uAa yde tPQ tPQ @@ -65204,7 +65184,7 @@ baI vxt ndf sZG -vxt +fvZ fDQ yde tPQ @@ -65460,9 +65440,9 @@ mDP aoo vxt iYY -fvZ +sZG wpm -vxt +uAa acS tPQ tPQ @@ -65718,8 +65698,8 @@ jeU uVv hcA sZG -vUc -fWu +uAa +nNC yde tPQ tPQ diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index b8cc7b2555..0e3716feb4 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -1,6 +1,10 @@ GLOBAL_LIST_EMPTY(cable_list) //Index for all cables, so that powernets don't have to look through the entire world all the time GLOBAL_LIST_EMPTY(portals) //list of all /obj/effect/portal GLOBAL_LIST_EMPTY(airlocks) //list of all airlocks + +/// List of all curtains for button tracking +GLOBAL_LIST_EMPTY(curtains) + GLOBAL_LIST_EMPTY(mechas_list) //list of all mechs. Used by hostile mobs target tracking. GLOBAL_LIST_EMPTY(shuttle_caller_list) //list of all communication consoles and AIs, for automatic shuttle calls when there are none. GLOBAL_LIST_EMPTY(machines) //NOTE: this is a list of ALL machines now. The processing machines list is SSmachine.processing ! diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index cf6629381d..9710ff7786 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -830,3 +830,30 @@ proc/give_mob_washies(mob/living/L, obj/machinery/shower/S) playsound(loc, 'sound/weapons/tap.ogg', 50, 1) if(BURN) playsound(loc, 'sound/items/welder.ogg', 80, 1) + +/obj/structure/curtain/directional + color = "#363636" + alpha = 255 + desc = "A curtain that you can only open from one side." + +/obj/structure/curtain/directional/north + dir = NORTH + +/obj/structure/curtain/directional/south + dir = SOUTH + +/obj/structure/curtain/directional/east + dir = EAST + +/obj/structure/curtain/directional/west + dir = WEST + +/obj/structure/curtain/directional/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) + if(isliving(user)) + var/mob/living/L = user + if(L.Adjacent(src) && L?.mobility_flags & MOBILITY_USE) + if(get_dir(src,user) != dir) + balloon_alert(user, "You can only open the [src] from \the [dir2text(dir)]! ") + else + playsound(loc, 'sound/effects/curtain.ogg', 50, 1) + toggle() diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index c8bd10ce53..e83986ea73 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/modular_coyote/code/objects.dm b/modular_coyote/code/objects.dm index 64ed6903cb..7819a22df1 100644 --- a/modular_coyote/code/objects.dm +++ b/modular_coyote/code/objects.dm @@ -1153,6 +1153,8 @@ desc = "Roll around on it!" icon = 'modular_coyote/icons/objects/run_carpets.dmi' icon_state = "carpet" + plane = FLOOR_PLANE + layer = BELOW_OPEN_DOOR_LAYER /obj/structure/rug/carpet2 name = "royal purple run carpet"