diff --git a/maps/yw/cryogaia-04-maintenance.dmm b/maps/yw/cryogaia-04-maintenance.dmm index a512c6924e2..340c57b0f54 100644 --- a/maps/yw/cryogaia-04-maintenance.dmm +++ b/maps/yw/cryogaia-04-maintenance.dmm @@ -893,6 +893,10 @@ /obj/random/maintenance/security, /turf/simulated/floor/tiled/dark, /area/cryogaia/outpost/tower/south) +"aEP" = ( +/obj/structure/boulder, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "aFa" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -1295,6 +1299,29 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/crew_quarters/recreation_area) +"aPO" = ( +/obj/structure/closet/crate{ + opened = 1 + }, +/obj/item/weapon/glass_extra/straw{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/weapon/glass_extra/straw{ + pixel_x = 11; + pixel_y = 5 + }, +/obj/item/weapon/glass_extra/straw{ + pixel_x = 11; + pixel_y = -2 + }, +/obj/item/weapon/glass_extra/straw{ + pixel_y = -4 + }, +/obj/item/weapon/glass_extra/straw, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/maintenance/starboard) "aQf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1475,6 +1502,18 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) +"aUX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/glass_extra/straw{ + pixel_x = 11; + pixel_y = -2 + }, +/obj/item/weapon/glass_extra/straw{ + pixel_x = -5; + pixel_y = 5 + }, +/turf/simulated/floor, +/area/maintenance/starboard) "aVd" = ( /obj/structure/cable{ d1 = 4; @@ -2114,6 +2153,11 @@ }, /turf/simulated/floor/tiled, /area/security/prison) +"bqe" = ( +/obj/structure/girder, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "bqp" = ( /obj/structure/closet/firecloset/full/double, /turf/simulated/floor/plating, @@ -2601,6 +2645,10 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/hallway/primary/starboard) +"bJK" = ( +/obj/item/weapon/reagent_containers/food/condiment/carton/flour, +/turf/simulated/floor, +/area/maintenance/starboard) "bJT" = ( /obj/structure/cable/green{ d1 = 2; @@ -2757,6 +2805,10 @@ temperature = 80 }, /area/tcommsat/chamber) +"bNz" = ( +/obj/item/weapon/pickaxe/silver, +/turf/simulated/mineral/floor, +/area/mine/explored/lower_rock) "bNH" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/spline/plain{ @@ -3244,7 +3296,7 @@ dir = 8 }, /turf/simulated/floor/water/hotspring, -/area/mine/explored/lower_rock) +/area/maintenance/aft) "cbM" = ( /obj/machinery/light{ dir = 4 @@ -3365,6 +3417,12 @@ /obj/structure/railing, /turf/simulated/floor/water/hotspring, /area/hallway/lower/central) +"ceR" = ( +/obj/random/trash_pile, +/obj/item/clothing/ears/earring/dangle/silver, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/medical_lower) "ceS" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -3864,6 +3922,14 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"ctJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/starboard) "cum" = ( /obj/structure/table/standard, /obj/item/weapon/stock_parts/subspace/amplifier, @@ -4099,7 +4165,7 @@ icon_state = "1-2" }, /turf/simulated/floor, -/area/mine/explored/lower_rock) +/area/maintenance/starboard) "cBP" = ( /obj/structure/foamedmetal, /turf/simulated/floor/plating, @@ -4222,6 +4288,10 @@ /obj/structure/sign/painting/chapel_secure, /turf/simulated/wall, /area/chapel/main) +"cFy" = ( +/obj/structure/closet/crate/mimic/cointoss, +/turf/simulated/mineral/floor, +/area/mine/explored/lower_rock) "cFM" = ( /obj/machinery/light{ dir = 8 @@ -5697,6 +5767,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) +"dxM" = ( +/obj/random/multiple/legtrap, +/turf/simulated/floor, +/area/maintenance/lowfloor3) "dyo" = ( /obj/machinery/door/airlock{ name = "Restroom" @@ -5880,6 +5954,15 @@ "dFr" = ( /turf/simulated/wall/r_wall, /area/security/sorting) +"dFC" = ( +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 8 + }, +/obj/machinery/light/small/emergency/flicker{ + dir = 8 + }, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "dFP" = ( /obj/structure/table/standard, /obj/machinery/newscaster{ @@ -5895,6 +5978,10 @@ temperature = 80 }, /area/tcommsat/chamber) +"dGr" = ( +/obj/random/multiple/legtrap, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "dGx" = ( /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/wood/sif, @@ -5927,6 +6014,10 @@ /obj/structure/target_stake, /turf/simulated/floor/tiled/dark, /area/security/range) +"dHA" = ( +/obj/structure/girder, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "dIf" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/green{ @@ -6537,6 +6628,12 @@ }, /turf/simulated/floor/tiled, /area/civilian/atrium/lower) +"eay" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/mineral/floor/mud, +/area/mine/explored/lower_rock) "eaz" = ( /obj/machinery/door/airlock/glass{ name = "Pool" @@ -6615,6 +6712,20 @@ /obj/effect/floor_decal/corner_techfloor_gray, /turf/simulated/floor, /area/maintenance/maintroom7) +"ech" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/shadow/silhouette{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/loot_pile/maint/boxfort, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "eci" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -7222,6 +7333,11 @@ }, /turf/simulated/floor/wood, /area/library) +"esc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/reagent_containers/food/snacks/cheesewedge, +/turf/simulated/floor/plating, +/area/maintenance/medical_lower) "esn" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/structure/closet/firecloset, @@ -7544,6 +7660,10 @@ name = "Holodeck Projector Floor" }, /area/crew_quarters/sleep/Dorm_1/holo) +"eBi" = ( +/obj/effect/decal/cleanable/flour, +/turf/simulated/floor, +/area/maintenance/starboard) "eBq" = ( /obj/machinery/door/airlock/glass{ name = "Telecomms Storage"; @@ -7728,9 +7848,7 @@ "eGU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/shadow/floor, -/obj/structure/railing{ - dir = 1 - }, +/obj/item/stack/rods, /turf/simulated/floor/bronze, /area/chapel/office) "eHd" = ( @@ -8083,6 +8201,16 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway_lower) +"eSU" = ( +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/maintenance/starboard) "eTn" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 5; @@ -8937,9 +9065,6 @@ /obj/item/weapon/stool/baystool/padded{ dir = 8 }, -/obj/structure/micro_tunnel{ - dir = 8 - }, /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor, /area/maintenance/maintroom8) @@ -10975,6 +11100,10 @@ /obj/structure/window/reinforced, /turf/simulated/floor/grass, /area/civilian/atrium/lower) +"gHm" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "gHn" = ( /obj/structure/sign/poster, /turf/simulated/wall/r_wall, @@ -11206,7 +11335,7 @@ amount = 1 }, /turf/simulated/floor, -/area/mine/explored/lower_rock) +/area/maintenance/aft) "gPz" = ( /obj/structure/bed/chair/sofa/pew/right, /obj/effect/floor_decal/chapel{ @@ -12216,6 +12345,7 @@ /obj/structure/railing/overhang/waterless{ dir = 8 }, +/obj/item/stack/rods, /turf/simulated/floor/bronze, /area/chapel/office) "hqA" = ( @@ -12970,13 +13100,13 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/door/airlock/angled_bay/double/glass/engineering{ - dir = 8; - name = "Active Hotspring Access" - }, /obj/machinery/door/firedoor/multi_tile{ dir = 2 }, +/obj/machinery/door/airlock/angled_bay/double/glass/common{ + dir = 8; + name = "Active Hotpsring Access" + }, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -13019,11 +13149,11 @@ /turf/simulated/floor/carpet, /area/chapel/main) "hNE" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/micro_tunnel{ + layer = 2.8 }, -/turf/simulated/floor, -/area/mine/explored/lower_rock) +/turf/simulated/floor/wood/sif, +/area/maintenance/blueserg) "hOl" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -13629,6 +13759,14 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"iei" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 8 + }, +/obj/random/maintenance/engineering, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "iej" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -13970,6 +14108,13 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"ini" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/starboard) "inm" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -14296,6 +14441,15 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/entrance) +"iut" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/weapon/smes_coil/super_capacity, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 + }, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "iuv" = ( /obj/machinery/disease2/isolator, /obj/effect/floor_decal/corner/lime/full, @@ -14408,6 +14562,10 @@ }, /turf/simulated/floor/grass, /area/civilian/atrium/lower) +"iwT" = ( +/obj/structure/door_assembly/door_assembly_eng, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "ixD" = ( /obj/structure/cable/green{ d1 = 1; @@ -14613,9 +14771,9 @@ /obj/machinery/door/firedoor/multi_tile{ dir = 2 }, -/obj/machinery/door/airlock/angled_bay/double/glass/engineering{ +/obj/machinery/door/airlock/angled_bay/double/glass/common{ dir = 8; - name = "Active Hotspring Access" + name = "Active Hotpsring Access" }, /turf/simulated/floor, /area/maintenance/starboard) @@ -14729,7 +14887,7 @@ icon_state = "2-4" }, /turf/simulated/floor, -/area/mine/explored/lower_rock) +/area/maintenance/aft) "iFJ" = ( /obj/structure/foamedmetal, /turf/simulated/floor, @@ -14774,6 +14932,7 @@ pixel_x = -8; pixel_y = 26 }, +/obj/structure/micro_tunnel, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "iGj" = ( @@ -14951,6 +15110,11 @@ }, /turf/simulated/floor/plating, /area/hallway/primary/starboard) +"iIY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/loot_pile/maint/boxfort, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/starboard) "iJq" = ( /obj/structure/bed/chair/comfy/beige, /obj/item/stack/tile/carpet, @@ -15255,6 +15419,10 @@ }, /turf/simulated/floor/tiled, /area/medical/medbaylower) +"iUM" = ( +/mob/living/simple_mob/animal/passive/mouse/mining, +/turf/simulated/mineral/floor, +/area/maintenance/medical_lower) "iUS" = ( /obj/machinery/recharge_station, /turf/simulated/floor/bluegrid, @@ -17045,6 +17213,11 @@ /obj/effect/decal/shadow/floor, /turf/simulated/floor/water/hotspring, /area/hallway/lower/fore) +"jQa" = ( +/obj/structure/catwalk, +/obj/random/maintenance/cargo, +/turf/simulated/floor/water/indoors, +/area/maintenance/starboard) "jQd" = ( /obj/machinery/atmospherics/valve{ dir = 4 @@ -18114,6 +18287,9 @@ /obj/structure/sign/directions/ladder_up, /turf/simulated/wall, /area/maintenance/aft) +"kqu" = ( +/turf/simulated/mineral/floor/mud, +/area/maintenance/aft) "kqE" = ( /obj/machinery/cryopod, /obj/machinery/ai_status_display{ @@ -18828,11 +19004,13 @@ /turf/simulated/floor/tiled/freezer, /area/security/perma/bathroom) "kHv" = ( -/obj/structure/bed/chair/wood{ - dir = 1 +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXCAVATION PROHIBITED'."; + name = "EXCAVATION PROHIBITED"; + pixel_y = -32 }, -/turf/simulated/floor/bronze, -/area/chapel/office) +/turf/simulated/floor/water/deep/indoors, +/area/maintenance/chapel) "kHz" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19811,6 +19989,10 @@ /obj/item/pizzabox/old, /turf/simulated/floor, /area/maintenance/starboard) +"ljg" = ( +/obj/random/multiple/legtrap, +/turf/simulated/floor, +/area/maintenance/atmos_control) "lkp" = ( /obj/structure/cable/green{ d1 = 2; @@ -20826,6 +21008,16 @@ }, /turf/simulated/floor, /area/maintenance/chapel) +"lLZ" = ( +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 8 + }, +/obj/effect/floor_decal/corner_techfloor_gray, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/starboard) "lMK" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/visible/red{ @@ -20902,6 +21094,22 @@ "lNQ" = ( /turf/simulated/mineral/cave, /area/vacant/vacant_site/private) +"lNT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/trash_pile, +/obj/item/weapon/glass_extra/straw{ + pixel_y = -4 + }, +/obj/item/weapon/glass_extra/straw{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/weapon/glass_extra/straw{ + pixel_x = 11; + pixel_y = -2 + }, +/turf/simulated/floor, +/area/maintenance/starboard) "lOb" = ( /obj/structure/cable{ d1 = 4; @@ -22187,6 +22395,12 @@ }, /turf/simulated/floor/plating, /area/security/perma/control) +"mEE" = ( +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn/maintpred, +/turf/simulated/floor/plating, +/area/maintenance/medical_lower) "mFf" = ( /obj/machinery/door/airlock/glass_atmos{ name = "Atmospherics Monitoring Room"; @@ -22933,13 +23147,6 @@ /obj/structure/trash_pile, /turf/simulated/floor/tiled/dark, /area/cryogaia/outpost/tower/south) -"mYz" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor, -/area/maintenance/starboard) "mYZ" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -23564,6 +23771,12 @@ }, /turf/simulated/floor/tiled/hydro, /area/hydroponics) +"nsd" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/mineral/floor, +/area/mine/explored/lower_rock) "nsk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -24381,6 +24594,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) +"nWe" = ( +/mob/living/simple_mob/animal/passive/mouse/brown, +/turf/simulated/mineral/floor, +/area/maintenance/medical_lower) "nWk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/boulder, @@ -25004,6 +25221,21 @@ }, /turf/simulated/floor/tiled, /area/holodeck_control) +"olp" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/micro_tunnel, +/turf/simulated/floor/plating, +/area/maintenance/security_lower) "olL" = ( /obj/structure/cable/green{ d1 = 4; @@ -25051,6 +25283,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/crew_quarters/recreation_area) +"omP" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/obj/random/maintenance/cargo, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "omT" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25695,7 +25939,7 @@ "oGx" = ( /obj/structure/loot_pile/maint/boxfort, /turf/simulated/floor, -/area/mine/explored/lower_rock) +/area/maintenance/aft) "oGB" = ( /obj/machinery/vending/hydronutrients{ dir = 1 @@ -26342,6 +26586,12 @@ /obj/machinery/door/window/southleft, /turf/simulated/floor/tiled/freezer, /area/medical/toilet) +"oWp" = ( +/obj/machinery/light/small/emergency/flicker{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/starboard) "oWt" = ( /obj/machinery/light/small{ dir = 1 @@ -26476,6 +26726,16 @@ /obj/random/medical/lite, /turf/simulated/floor/tiled/techfloor, /area/maintenance/maintroom5) +"paS" = ( +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 1 + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "paV" = ( /obj/effect/floor_decal/chapel{ dir = 8 @@ -26671,6 +26931,10 @@ temperature = 80 }, /area/tcommsat/chamber) +"pfV" = ( +/obj/structure/boulder, +/turf/simulated/mineral/floor, +/area/mine/explored/lower_rock) "pgh" = ( /obj/structure/catwalk, /obj/machinery/camera/autoname{ @@ -27545,6 +27809,14 @@ /area/medical/medbaylower) "pDr" = ( /obj/structure/table/reinforced, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "pshopfront1"; + name = "Shopfront Shutters"; + opacity = 0 + }, /turf/simulated/floor, /area/hallway/primary/starboard) "pDR" = ( @@ -27791,7 +28063,7 @@ icon_state = "1-8" }, /turf/simulated/floor, -/area/mine/explored/lower_rock) +/area/maintenance/aft) "pLh" = ( /obj/item/weapon/stool/padded{ dir = 1 @@ -27912,6 +28184,9 @@ /obj/random/junk, /obj/item/device/binoculars/spyglass, /obj/structure/loot_pile/maint/boxfort, +/obj/structure/micro_tunnel{ + layer = 2.8 + }, /turf/simulated/floor, /area/maintenance/maintroom8) "pNW" = ( @@ -29258,6 +29533,14 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +"qAX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 1 + }, +/obj/effect/floor_decal/corner_techfloor_gray, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "qAZ" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -29287,6 +29570,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/dorms) +"qCf" = ( +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "qCF" = ( /obj/structure/cable/green{ d1 = 1; @@ -29352,6 +29645,10 @@ "qDO" = ( /turf/simulated/wall/r_wall, /area/maintenance/fish) +"qDT" = ( +/obj/structure/micro_tunnel, +/turf/simulated/mineral/floor, +/area/maintenance/medical_lower) "qDV" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/weapon/reagent_containers/glass/bucket, @@ -29360,6 +29657,10 @@ "qDW" = ( /turf/unsimulated/wall/ice, /area/mine/unexplored/lower_rock) +"qEl" = ( +/obj/item/weapon/pickaxe/two_pick, +/turf/simulated/mineral/floor, +/area/maintenance/medical_lower) "qEB" = ( /turf/simulated/floor/plating, /area/maintenance/lowfloor1) @@ -29502,6 +29803,18 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/cyan, /turf/simulated/floor/tiled, /area/engineering/atmos) +"qKo" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/random/junk, +/obj/structure/largecrate, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "qKs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -30541,11 +30854,9 @@ /turf/simulated/floor, /area/maintenance/medical_lower) "rtU" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, +/obj/structure/catwalk, +/obj/random/maintenance/engineering, +/turf/simulated/floor/water/indoors, /area/maintenance/starboard) "ruu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30991,6 +31302,17 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"rHe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner_techfloor_gray, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 1 + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 + }, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "rHv" = ( /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/dirt, @@ -31061,6 +31383,10 @@ /obj/structure/curtain/bed, /turf/simulated/floor/tiled/dark, /area/maintenance/maintroom8) +"rJs" = ( +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/lowfloor3) "rJy" = ( /obj/item/device/geiger/wall{ dir = 1; @@ -31512,6 +31838,10 @@ "rWM" = ( /turf/simulated/mineral/cave, /area/maintenance/lowfloor1) +"rXh" = ( +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/starboard) "rXv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32109,6 +32439,11 @@ /obj/structure/closet/crate/radiation, /turf/simulated/floor/tiled/dark, /area/medical/biostorage2) +"ssv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/frame, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "ssL" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -32671,6 +33006,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/atmos_control) +"sJn" = ( +/obj/random/multiple/legtrap, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/mine/explored/lower_rock) "sJR" = ( /obj/machinery/door/morgue{ dir = 2; @@ -33094,12 +33435,25 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/dorms) +"sUa" = ( +/obj/item/weapon/glass_extra/straw{ + pixel_y = -4 + }, +/turf/simulated/floor, +/area/maintenance/starboard) "sUd" = ( /obj/effect/landmark{ name = "blobstart" }, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"sUw" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/decal/shadow/floor, +/turf/simulated/mineral/floor, +/area/mine/explored/lower_rock) "sUA" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -33223,6 +33577,10 @@ "sXK" = ( /turf/simulated/floor, /area/maintenance/lowfloor2) +"sXZ" = ( +/mob/living/simple_mob/animal/passive/mouse, +/turf/simulated/floor, +/area/mine/explored/lower_rock) "sYR" = ( /obj/machinery/biogenerator, /obj/effect/floor_decal/corner/green{ @@ -33367,7 +33725,6 @@ /turf/simulated/floor/tiled, /area/engineering/hallway_lower) "tbT" = ( -/obj/effect/decal/godray, /obj/structure/showcase/yw/chaplain, /obj/effect/decal/shadow/silhouette, /turf/simulated/floor/carpet, @@ -33547,11 +33904,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "thM" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, +/obj/random/maintenance/cargo, /turf/simulated/floor, -/area/mine/explored/lower_rock) +/area/maintenance/starboard) "thU" = ( /obj/structure/dogbed, /turf/simulated/floor/carpet/tealcarpet, @@ -34148,6 +34503,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/aft) +"tyR" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXCAVATION PROHIBITED'."; + name = "EXCAVATION PROHIBITED"; + pixel_x = 32 + }, +/turf/simulated/floor, +/area/maintenance/starboard) "tyY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, @@ -34356,7 +34719,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbaylower) "tFq" = ( -/obj/random/junk, +/obj/structure/loot_pile/maint/boxfort, /turf/simulated/floor, /area/maintenance/starboard) "tFB" = ( @@ -35639,6 +36002,10 @@ }, /turf/simulated/floor/plating, /area/security/perma/control) +"uiE" = ( +/obj/item/weapon/glass_extra/straw, +/turf/simulated/floor, +/area/maintenance/starboard) "uiR" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 8 @@ -35680,7 +36047,7 @@ dir = 4 }, /turf/simulated/floor/water/hotspring, -/area/mine/explored/lower_rock) +/area/maintenance/aft) "ukv" = ( /obj/machinery/door/airlock/maintenance/sec{ name = "Security Maintenance"; @@ -35809,6 +36176,9 @@ /obj/item/weapon/storage/toolbox/mechanical, /turf/simulated/floor, /area/tcomstorage) +"upi" = ( +/turf/simulated/mineral/floor, +/area/maintenance/starboard) "upP" = ( /obj/machinery/gibber, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -36925,7 +37295,7 @@ icon_state = "2-8" }, /turf/simulated/floor, -/area/mine/explored/lower_rock) +/area/maintenance/starboard) "uRF" = ( /obj/structure/sink{ dir = 8; @@ -37085,6 +37455,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/micro_tunnel{ + layer = 2.8 + }, /turf/simulated/floor/tiled/dark, /area/cryogaia/outpost/tower/south) "uXP" = ( @@ -37519,6 +37892,11 @@ /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/starboard) +"vkq" = ( +/obj/item/weapon/glass_extra/straw, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/maintenance/starboard) "vkt" = ( /obj/effect/floor_decal/chapel{ dir = 8 @@ -38920,6 +39298,10 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) +"vYR" = ( +/obj/structure/boulder, +/turf/simulated/mineral/floor, +/area/maintenance/starboard) "vZg" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/brown, @@ -42609,6 +42991,11 @@ /obj/structure/frame{ anchored = 1 }, +/obj/machinery/button/remote/blast_door{ + id = "pshopfront1"; + name = "Shopfront Shutters"; + pixel_x = -26 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/starboard) "yeY" = ( @@ -42720,9 +43107,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/micro_tunnel{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -42887,6 +43271,11 @@ /area/hallway/lower/aft) "ymn" = ( /obj/structure/table/steel, +/obj/item/weapon/spacecash/c1, +/obj/item/weapon/glass_extra/straw{ + pixel_y = 5 + }, +/obj/effect/decal/cleanable/flour, /turf/simulated/floor, /area/maintenance/starboard) @@ -43421,7 +43810,7 @@ jeh iCb btj btj -btj +dxM jol bkU bkU @@ -43584,7 +43973,7 @@ bkU bkU btj btj -btj +rJs cIb btj kwf @@ -45329,7 +45718,7 @@ hYh hYh hYh sFq -iHZ +hNE iHZ iHZ iHZ @@ -50255,7 +50644,7 @@ xVh xVh xoJ xoJ -tQz +olp aEc gEt gEt @@ -50274,7 +50663,7 @@ wop ueP ewy wMW -vAe +ljg kRh iqD eyv @@ -50560,9 +50949,9 @@ ttU ixT hPz hPz +hPz ixT -ixT -ixT +hPz opN ttU kBU @@ -50722,9 +51111,9 @@ ixT ixT hPz hPz -ixT -oUs -ixT +hPz +mEE +hPz opN ttU xVh @@ -50883,10 +51272,10 @@ vRU ixT oOP hPz +qDT +hPz +hPz hPz -ixT -ixT -ixT opN ttU tWY @@ -51045,8 +51434,8 @@ vRU ixT oUs hPz -hPz -fvG +esc +iUM hPz hPz opN @@ -51207,9 +51596,9 @@ vRU ixT hPz hPz -hPz -hPz -hPz +qEl +nWe +ceR hPz opN ttU @@ -51370,7 +51759,7 @@ oUs hPz hPz hPz -hPz +mBq hPz hPz opN @@ -59927,7 +60316,7 @@ lfy nHo udd fgD -vWR +kHv nHo mHL sdj @@ -60902,14 +61291,14 @@ qON mwy mwy mHL -nWk +giF eGU nne hqz giF mqU mHL -kHv +mqU jVR mHL mwy @@ -61712,10 +62101,10 @@ yeh bMH jnb bMH -bMH +ini lDp bMH -mYz +bMH bMH bMH bMH @@ -61885,7 +62274,7 @@ vkF pOQ bMH jnb -jnb +ctJ siP bMH bMH @@ -62039,14 +62428,14 @@ whU eNq kjM eNq -mwy -mwy -mwy +ssv +rHe +iut eNq -wxf -whU +iIY +rXh tFq -rtU +fSn ulC eNq hYh @@ -62202,13 +62591,13 @@ eNq eNq eNq mwy -mwy -mwy -eNq -eNq -eNq +iei +qAX eNq eNq +lLZ +gkQ +eSU eNq eNq mwy @@ -62364,14 +62753,14 @@ mwy mwy iDy mwy -mwy -mwy -mwy -mwy -mwy -mwy -mwy -mwy +gZI +iwT +dHA +gZI +ech +qKo +omP +gZI mwy mwy mwy @@ -62392,7 +62781,7 @@ mwy mwy mwy mwy -mwy +aDx hYh eNq ppn @@ -62527,14 +62916,14 @@ eNq whU eNq eNq -mwy -mwy -mwy -mwy -mwy -mwy -mwy -mwy +emb +emb +dFC +euH +qCf +paS +emb +emb mwy mwy eNq @@ -62554,8 +62943,8 @@ mwy mwy mwy mwy -mwy -hYh +aDx +aDx mwy uAF uAF @@ -62689,14 +63078,14 @@ eNq whU cqw eNq -mwy +gZI eNq eNq eNq eNq eNq eNq -mwy +emb mwy mwy mwy @@ -62843,7 +63232,7 @@ eNq hYh eNq cqw -hFb +rtU hIa qgD dJA @@ -62854,11 +63243,11 @@ vko eNq qjE wso -whU +eBi ymn kpQ eNq -mwy +sXZ whU mwy mwy @@ -63011,13 +63400,13 @@ dJA dJA hIa hIa -hFb +jQa whU eNq wso whU -whU -whU +bJK +eBi whU eNq mwy @@ -63034,11 +63423,11 @@ eNq whU whU whU +tyR whU whU -whU -mwy -mwy +gZI +gZI mwy mwy hYh @@ -63194,12 +63583,12 @@ euH gZI eNq dQL +upi +vYR +gZI mwy -mwy -mwy -mwy -mwy -mwy +gZI +gZI hYh hYh hYh @@ -63330,7 +63719,7 @@ hYh whU hYh hYh -whU +thM mwy eNq eNq @@ -63347,7 +63736,7 @@ eNq whU whU eNq -whU +qwI eNq mwy mwy @@ -63356,10 +63745,10 @@ vau mwy mwy whU +vYR mwy mwy -mwy -mwy +pfV mwy mwy hYh @@ -63521,12 +63910,12 @@ whU mwy mwy mwy +kOT +cFy mwy -mwy -mwy -hYh -hYh -hYh +gZI +pfV +pfV hYh kOT uTl @@ -63563,11 +63952,11 @@ qWN myF mwy mwy -emb -emb -emb -emb -emb +mEg +mEg +mEg +mEg +mEg vSL kzD igt @@ -63674,20 +64063,20 @@ mwy whU eNq eNq -whU -whU -whU +fSn +sUa +lNT mwy mwy whU mwy mwy +gZI +bqe +pfV mwy -mwy -mwy -mwy -hYh -hYh +bNz +kOT hYh hYh hYh @@ -63724,12 +64113,12 @@ dPA cQi hnb mwy -emb -emb +mEg +mEg mwy mwy mwy -emb +mEg vSL vSL qXw @@ -63750,7 +64139,7 @@ xtX hYh hYh hYh -kOT +bDk kOT hYh hYh @@ -63836,20 +64225,20 @@ mwy whU mwy eNq -whU -whU -whU +aPO +aUX +vkq mwy mwy whU mwy mwy +gZI +gZI +gZI mwy -mwy -mwy -mwy -hYh hYh +bqe hYh hYh hYh @@ -63889,10 +64278,10 @@ mwy mwy mwy mwy -emb +mEg oGx -emb -emb +mEg +mEg vSL vSL dXQ @@ -63912,7 +64301,7 @@ mwy hYh hYh hYh -kOT +bDk kOT kOT hYh @@ -63998,9 +64387,9 @@ mwy whU mwy mwy -whU -whU -whU +wso +uiE +fSn eNq eNq whU @@ -64009,13 +64398,13 @@ mwy mwy mwy mwy -mwy -hYh +gZI hYh +gZI hYh hYh hYh -kOT +emb uTl aDx tEY @@ -64054,11 +64443,11 @@ njl cDp wxc njl -emb -emb -emb -hNE -emb +mEg +mEg +mEg +esO +mEg mgo cWl bGF @@ -64177,8 +64566,8 @@ hYh hYh hYh hYh -hYh -hYh +gHm +gZI aDx tEY sLI @@ -64218,10 +64607,10 @@ nYx njl wxc iFF -cBt +eLt pKZ -emb -emb +mEg +mEg udc lOA vUX @@ -64238,7 +64627,7 @@ hYh hYh hYh kOT -kOT +bDk hYh hYh hYh @@ -64339,8 +64728,8 @@ hYh hYh hYh hYh -hYh -hYh +bqe +gHm hYh tEY tEY @@ -64379,11 +64768,11 @@ tPq sSg lop njl -hNE -gZI +esO +mgo cbH -gZI -mwy +mgo +jtl udc naj oAD @@ -64401,7 +64790,7 @@ hYh hYh kOT kOT -kOT +bDk kOT kOT hYh @@ -64485,7 +64874,7 @@ mwy gZI roe emb -emb +dGr gZI mwy whU @@ -64501,8 +64890,8 @@ hYh hYh hYh hYh -hYh -hYh +emb +aEP hYh hYh hYh @@ -64542,11 +64931,11 @@ jaY glh wxc gPx -mwy -oXm -mwy -mwy -wwE +jtl +rOc +jtl +jtl +udc mgo gcm bnp @@ -64654,17 +65043,17 @@ whU mwy mwy mwy +gZI mwy mwy mwy -mwy -hYh hYh hYh hYh hYh hYh hYh +bqe hYh hYh hYh @@ -64703,13 +65092,13 @@ sGP tmV tzc njl -hNE -gZI +esO +mgo ukn -gZI -wwE -wwE -mwy +mgo +udc +udc +jtl vUX iFk hMP @@ -64812,12 +65201,12 @@ emb unS gZI mwy +tyR whU whU whU -whU -whU -mwy +oWp +sUw mwy mwy hYh @@ -64865,13 +65254,13 @@ wxc hHH njl njl -hNE -emb -emb -wwE -wwE -kOT -kOT +esO +mEg +mEg +udc +udc +kqu +kqu gcm pNO fvJ @@ -64976,12 +65365,12 @@ gZI mwy eNq mwy -mwy -mwy -mwy -mwy -mwy -mwy +eay +nsd +nsd +kOT +bDk +tEY hYh hYh hYh @@ -65027,13 +65416,13 @@ wxc uRz cBt cBt -thM -emb -emb -wwE +pwU +mEg +mEg +udc mwy -kOT -kOT +kqu +kqu gcm tea gcm @@ -65132,17 +65521,17 @@ whU mwy gZI emb -unS +sJn unS gZI mwy mwy mwy mwy -mwy -mwy -mwy -mwy +bDk +bDk +kOT +bDk mwy hYh hYh @@ -65188,16 +65577,16 @@ mwy mwy mwy mVN -emb -emb -emb +whU +whU +whU mwy mwy mwy -kOT +kqu mwy mwy -kOT +bDk mwy mwy mwy @@ -65301,9 +65690,9 @@ mwy mwy mwy mwy -mwy -mwy -mwy +tEY +bDk +bDk mwy mwy hYh @@ -65464,8 +65853,8 @@ mwy hYh hYh hYh -hYh -hYh +tEY +tEY hYh hYh hYh diff --git a/maps/yw/cryogaia-05-main.dmm b/maps/yw/cryogaia-05-main.dmm index 965a06c3e8d..1b83457a8ae 100644 --- a/maps/yw/cryogaia-05-main.dmm +++ b/maps/yw/cryogaia-05-main.dmm @@ -428,16 +428,24 @@ /turf/simulated/floor/tiled/white, /area/medical/medbaymain) "ait" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8; + layer = 2.4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8; + pixel_x = 9 + }, +/turf/simulated/floor/wood/alt/parquet, /area/crew_quarters/captain) "aiI" = ( /obj/structure/cable/green{ @@ -815,6 +823,7 @@ dir = 6 }, /obj/effect/floor_decal/rust, +/obj/effect/floor_decal/techfloor/hole, /turf/simulated/floor/tiled/old_tile/blue, /area/bridge/blueshield) "apU" = ( @@ -1152,11 +1161,11 @@ /turf/simulated/floor, /area/engineering/engine_room) "awo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "awH" = ( @@ -2688,7 +2697,12 @@ "bbe" = ( /obj/structure/displaycase, /obj/machinery/light, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/borderfloor/full, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + color = "#7a412a"; + dir = 8 + }, +/turf/simulated/floor/tiled, /area/crew_quarters/captain) "bbF" = ( /obj/structure/window/reinforced, @@ -2874,25 +2888,24 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room) "bfa" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 6 +/obj/machinery/holoposter{ + dir = 1; + pixel_y = -32 }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/borderfloor{ dir = 8; - pixel_x = 9 + layer = 2.5 }, /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/spline/plain{ dir = 8; - layer = 2.9 + pixel_x = 9 }, -/obj/machinery/holoposter{ - dir = 1; - pixel_y = -32 +/turf/simulated/floor/tiled{ + icon_state = "monotile" }, -/turf/simulated/floor/tiled, /area/crew_quarters/locker) "bfd" = ( /obj/structure/bed/chair/office/light{ @@ -3413,6 +3426,10 @@ /area/engineering/engine_room) "bql" = ( /obj/structure/filingcabinet, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + color = "#7a412a"; + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bqO" = ( @@ -3778,7 +3795,16 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/wood, +/obj/structure/flora/pottedplant{ + icon_state = "plant-22" + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/captain) "bAF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4548,6 +4574,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/docking_lounge) +"bNK" = ( +/obj/machinery/computer/communications{ + dir = 8 + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 + }, +/obj/effect/floor_decal/corner_techfloor_gray, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/captain) "bNN" = ( /obj/structure/cable{ d1 = 1; @@ -4827,17 +4863,14 @@ /turf/simulated/floor/tiled, /area/storage/art) "bUj" = ( -/obj/machinery/door/airlock/maintenance/command{ - req_access = list(19) +/obj/structure/bed/chair/comfy/brown{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor, -/area/maintenance/bridge) +/turf/simulated/floor/carpet/blue2, +/area/crew_quarters/captain) "bUF" = ( /obj/structure/closet/secure_closet/freezer/money, /obj/item/weapon/storage/secure/briefcase/money{ @@ -5271,6 +5304,15 @@ "cct" = ( /turf/simulated/floor, /area/maintenance/research_port) +"ccy" = ( +/obj/machinery/newscaster/security_unit{ + pixel_x = 32 + }, +/obj/structure/table/woodentable, +/obj/item/weapon/book/manual/security_space_law, +/obj/item/device/taperecorder, +/turf/simulated/floor/wood/alt/parquet, +/area/crew_quarters/captain) "ccD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6306,11 +6348,17 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/security) "cvq" = ( -/obj/machinery/vending/cigarette{ - dir = 1 +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/wood, -/area/crew_quarters/captain) +/obj/machinery/door/airlock/maintenance/command{ + req_access = list(19) + }, +/turf/simulated/floor/plating, +/area/maintenance/bridge) "cvG" = ( /obj/structure/shuttle/window, /obj/structure/grille, @@ -7510,6 +7558,10 @@ dir = 2; icon_state = "pipe-c" }, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a"; + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "cUe" = ( @@ -8267,9 +8319,6 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/bridge_hallway) "diw" = ( @@ -8278,6 +8327,14 @@ }, /turf/simulated/floor/tiled, /area/teleporter) +"diB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/bridge) "diD" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/green{ @@ -9175,15 +9232,13 @@ /turf/simulated/floor/tiled, /area/engineering/foyer) "dCs" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donut, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood/alt/parquet, /area/crew_quarters/captain) "dCU" = ( /obj/structure/railing{ @@ -10493,12 +10548,12 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "ebn" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 1 - }, /obj/effect/landmark/start{ name = "Colony Director" }, +/obj/structure/bed/chair/office/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "ebC" = ( @@ -13228,15 +13283,13 @@ /area/cryogaia/station/ert_arrival) "fiK" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + icon_state = "4-8" }, /obj/structure/cable{ - icon_state = "2-8" + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/bridge) "fiQ" = ( @@ -13245,11 +13298,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/monofloor, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/bridge_hallway) "fjm" = ( @@ -17274,11 +17330,8 @@ "gHf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 - }, /obj/effect/floor_decal/borderfloor{ - layer = 2.9 + layer = 2.5 }, /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/plain{ @@ -17710,17 +17763,10 @@ /turf/simulated/floor/tiled/techfloor, /area/server) "gRG" = ( -/obj/structure/table/woodentable, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos/relief{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/alt/parquet, /area/crew_quarters/captain) "gRH" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos/relief, @@ -17791,7 +17837,10 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "gTu" = ( -/obj/machinery/vending/coffee{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a"; dir = 1 }, /turf/simulated/floor/wood, @@ -18719,6 +18768,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "hlS" = ( @@ -19032,8 +19082,9 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "hsz" = ( -/obj/structure/flora/pottedplant{ - icon_state = "plant-22" +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a"; + dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -20509,11 +20560,10 @@ /turf/simulated/floor/tiled, /area/quartermaster/miningwing) "hWv" = ( -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Captain's Office" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/alt/parquet, /area/crew_quarters/captain) "hWz" = ( /obj/effect/floor_decal/corner_oldtile/purple, @@ -21018,11 +21068,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "iic" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 - }, /obj/effect/floor_decal/borderfloor{ - layer = 2.9 + layer = 2.5 }, /obj/effect/floor_decal/spline/plain, /obj/effect/floor_decal/spline/plain{ @@ -21386,11 +21433,14 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" }, /turf/simulated/floor/plating, /area/maintenance/bridge) @@ -21511,9 +21561,6 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/workshop) "isE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -22716,6 +22763,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack/corner, /turf/simulated/floor/wood, /area/crew_quarters/captain) "iRr" = ( @@ -24885,14 +24933,11 @@ /turf/simulated/floor, /area/engineering/engine_room) "jMn" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/device/taperecorder, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/carpet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/table/woodentable, +/obj/item/weapon/storage/box/donut, +/turf/simulated/floor/wood/alt/parquet, /area/crew_quarters/captain) "jMN" = ( /obj/structure/table/standard{ @@ -25827,6 +25872,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a"; + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "kgR" = ( @@ -27500,11 +27549,13 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "kOm" = ( -/obj/machinery/computer/communications{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/wood, -/area/crew_quarters/captain) +/turf/simulated/floor/plating, +/area/maintenance/bridge) "kOn" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/box/swabs{ @@ -27849,6 +27900,16 @@ /obj/structure/sign/nosmoking_1, /turf/simulated/wall, /area/medical/medbay_primary_storage) +"kVf" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4; + layer = 2.5 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "kVr" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -27990,6 +28051,17 @@ /obj/vehicle/train/engine, /turf/simulated/floor/tiled/steel_grid, /area/engineering/workshop) +"kYd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/bridge) "kYk" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28206,7 +28278,11 @@ /turf/simulated/floor/tiled/steel, /area/security/security_cell_hallway) "lcR" = ( -/mob/living/simple_mob/animal/passive/fox/renault, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a"; + dir = 1 + }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/crew_quarters/captain) "lde" = ( @@ -29581,11 +29657,11 @@ /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) "lGP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock{ name = "Private Restroom" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/captain) "lGU" = ( @@ -29726,6 +29802,9 @@ /obj/machinery/camera/network/command{ c_tag = "Colony Director's office North" }, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a" + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "lJN" = ( @@ -30803,8 +30882,12 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "meK" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 9 +/obj/machinery/holoposter{ + pixel_y = 32 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4; + layer = 2.5 }, /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -30813,14 +30896,9 @@ dir = 4; pixel_x = -10 }, -/obj/effect/floor_decal/borderfloor{ - dir = 4; - layer = 2.9 - }, -/obj/machinery/holoposter{ - pixel_y = 32 +/turf/simulated/floor/tiled{ + icon_state = "monotile" }, -/turf/simulated/floor/tiled, /area/crew_quarters/locker) "mfg" = ( /obj/effect/floor_decal/industrial/warning{ @@ -31439,7 +31517,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor, /turf/simulated/floor/wood, /area/crew_quarters/captain) "mro" = ( @@ -31985,6 +32066,15 @@ "mAC" = ( /turf/simulated/wall/r_wall, /area/bridge/meeting_room) +"mAE" = ( +/obj/machinery/vending/coffee{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "mAP" = ( /obj/structure/bed/chair{ dir = 8 @@ -31992,15 +32082,10 @@ /turf/simulated/floor/tiled, /area/civilian/atrium/central) "mAX" = ( -/obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/melee/chainofcommand, -/obj/machinery/newscaster/security_unit{ - pixel_x = 32 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/alt/parquet, /area/crew_quarters/captain) "mBa" = ( /obj/structure/grille, @@ -33540,6 +33625,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a" + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "mZe" = ( @@ -34787,6 +34875,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/delivery) "nvX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + layer = 2.5 + }, /obj/effect/floor_decal/spline/plain{ dir = 1 }, @@ -34794,12 +34888,6 @@ dir = 1; pixel_y = -9 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - layer = 2.9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled{ icon_state = "monotile" }, @@ -34936,8 +35024,8 @@ /turf/simulated/floor/tiled/steel_grid, /area/quartermaster) "nyf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -34971,7 +35059,7 @@ /area/chapel/monastery) "nzg" = ( /obj/item/weapon/book/manual/nuclear, -/turf/simulated/floor/wood, +/turf/simulated/floor/plating/eris/under, /area/crew_quarters/captain) "nzq" = ( /obj/structure/bed/chair/office/dark, @@ -35360,10 +35448,11 @@ /turf/simulated/floor/plating/snow/plating/cryogaia, /area/borealis2/outdoors/grounds) "nGV" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wood/alt/parquet, /area/crew_quarters/captain) "nHc" = ( /obj/structure/cable/green{ @@ -35392,6 +35481,15 @@ "nHi" = ( /turf/simulated/wall, /area/crew_quarters/kitchen) +"nHJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/bridge) "nHZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ @@ -37330,8 +37428,12 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/bridge) "ovr" = ( @@ -39661,7 +39763,11 @@ /area/engineering/engine_airlock) "pni" = ( /obj/machinery/suit_cycler/captain, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_techfloor_gray, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/captain) "pnx" = ( /obj/machinery/atmospherics/unary/vent_pump/on, @@ -40121,13 +40227,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/delivery) "pvQ" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet, +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/captain) "pwg" = ( /obj/structure/bed/chair/shuttle{ @@ -41135,10 +41236,10 @@ /turf/simulated/floor/plating, /area/maintenance/substation/medical) "pSd" = ( -/obj/machinery/computer/arcade{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a" }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "pSf" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -42254,22 +42355,12 @@ /turf/simulated/floor/tiled/steel, /area/security/hallway) "qoY" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 6 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8; - pixel_x = 9 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8; - layer = 2.9 +/obj/structure/table/woodentable, +/obj/machinery/photocopier/faxmachine{ + department = "Captain's Office" }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) +/turf/simulated/floor/wood/alt/parquet, +/area/crew_quarters/captain) "qoZ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/blue{ @@ -44073,7 +44164,9 @@ c_tag = "Bridge Hallway Fore Port"; dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/bridge_hallway) "raN" = ( @@ -45837,6 +45930,10 @@ name = "north bump"; pixel_y = 24 }, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a"; + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "rMA" = ( @@ -46816,6 +46913,18 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) +"sfA" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/monofloor, +/turf/simulated/floor/tiled, +/area/bridge_hallway) "sfE" = ( /obj/effect/floor_decal/corner/paleblue/full, /obj/effect/floor_decal/corner/paleblue/full{ @@ -47769,6 +47878,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + color = "#7a412a"; + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "syb" = ( @@ -48895,6 +49008,16 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled/techmaint, /area/cryogaia/outpost/tower/west) +"sWe" = ( +/obj/structure/flora/pottedplant{ + icon_state = "plant-22" + }, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a"; + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "sWk" = ( /obj/machinery/door/firedoor/glass/hidden, /turf/simulated/floor/tiled, @@ -49394,8 +49517,8 @@ c_tag = "Colony Director's Office South"; dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos/relief{ - dir = 1 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -49987,7 +50110,14 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/wood, +/obj/machinery/vending/cigarette, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 + }, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/captain) "tsI" = ( /turf/simulated/floor/plating, @@ -50047,6 +50177,12 @@ }, /turf/simulated/floor/tiled/steel, /area/security/briefing_room) +"tvE" = ( +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/turf/simulated/floor/tiled/old_tile/blue, +/area/bridge/blueshield) "tvJ" = ( /turf/simulated/wall/r_wall, /area/engineering/foyer) @@ -50665,6 +50801,10 @@ /area/hallway/primary/starboard) "tFw" = ( /obj/structure/bed/chair/office/light, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a"; + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "tFD" = ( @@ -51273,7 +51413,11 @@ /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/void/captain, /obj/item/clothing/head/helmet/space/void/captain, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner_techfloor_gray, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/captain) "tSD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -52676,10 +52820,10 @@ /turf/simulated/floor/plating/snow/plating/cryogaia, /area/borealis2/outdoors/exterior) "uDs" = ( -/obj/machinery/computer/card{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a"; + dir = 4 }, -/obj/item/weapon/card/id/gold/captain/spare, /turf/simulated/floor/wood, /area/crew_quarters/captain) "uDB" = ( @@ -52999,6 +53143,7 @@ /area/maintenance/substation/research) "uKg" = ( /obj/structure/dogbed, +/mob/living/simple_mob/animal/passive/fox/renault, /turf/simulated/floor/wood, /area/crew_quarters/captain) "uKx" = ( @@ -53225,6 +53370,9 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/monofloor{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/bridge_hallway) "uQY" = ( @@ -55943,20 +56091,11 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "vWX" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 }, +/obj/structure/grille, /turf/simulated/floor/plating, /area/maintenance/bridge) "vXr" = ( @@ -56704,6 +56843,9 @@ name = "Colony Director Office Door"; pixel_x = 30 }, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + color = "#7a412a" + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "wlm" = ( @@ -56911,22 +57053,19 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "woj" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4; - layer = 2.9 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4; - pixel_x = -10 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/monofloor{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/crew_quarters/locker) +/area/bridge_hallway) "wor" = ( /obj/effect/floor_decal/corner_oldtile/purple, /obj/effect/floor_decal/corner_oldtile/purple{ @@ -58264,8 +58403,9 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "wMV" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 4; + layer = 2.5 }, /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -58274,11 +58414,9 @@ dir = 4; pixel_x = -10 }, -/obj/effect/floor_decal/borderfloor{ - dir = 4; - layer = 2.9 +/turf/simulated/floor/tiled{ + icon_state = "monotile" }, -/turf/simulated/floor/tiled, /area/crew_quarters/locker) "wMW" = ( /obj/machinery/power/apc{ @@ -58603,19 +58741,16 @@ }, /area/quartermaster/disposals) "wTU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor{ dir = 1; - layer = 2.9 + layer = 2.5 }, /obj/effect/floor_decal/spline/plain{ - dir = 1; - pixel_y = -9 + dir = 1 }, /obj/effect/floor_decal/spline/plain{ - dir = 1 + dir = 1; + pixel_y = -9 }, /turf/simulated/floor/tiled{ icon_state = "monotile" @@ -58718,10 +58853,12 @@ /turf/simulated/floor/plating, /area/maintenance/medbay) "wYk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/table/woodentable, +/obj/item/weapon/melee/chainofcommand, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/captain) "wYu" = ( /obj/structure/cable{ @@ -59573,12 +59710,9 @@ /turf/simulated/floor/tiled/steel, /area/medical/patient_wing) "xoC" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 6 - }, /obj/effect/floor_decal/borderfloor{ dir = 8; - layer = 2.9 + layer = 2.5 }, /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -59587,7 +59721,9 @@ dir = 8; pixel_x = 9 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled{ + icon_state = "monotile" + }, /area/crew_quarters/locker) "xoH" = ( /obj/effect/floor_decal/corner_oldtile/purple, @@ -59768,21 +59904,15 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "xtd" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1; - pixel_y = -9 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - layer = 2.9 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/tiled{ - icon_state = "monotile" +/obj/structure/table/woodentable, +/obj/machinery/recharger{ + pixel_y = 4 }, -/area/crew_quarters/locker) +/turf/simulated/floor/wood/alt/parquet, +/area/crew_quarters/captain) "xtp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -59822,9 +59952,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "xtL" = ( -/obj/machinery/newscaster/security_unit{ +/obj/machinery/ai_status_display{ pixel_y = 32 }, +/obj/effect/floor_decal/spline/fancy/wood{ + color = "#7a412a" + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "xtN" = ( @@ -60046,10 +60179,11 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/docking_lounge) "xxI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/bed/chair/comfy/brown, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/captain) "xxL" = ( /obj/structure/railing, @@ -60232,6 +60366,7 @@ /turf/simulated/floor/tiled, /area/civilian/atrium/central) "xBO" = ( +/obj/effect/floor_decal/techfloor/hole, /turf/simulated/floor/tiled/old_tile/blue, /area/bridge/blueshield) "xCe" = ( @@ -60971,10 +61106,18 @@ /turf/simulated/floor/tiled/red, /area/security/security_equiptment_storage) "xSa" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 +/obj/effect/floor_decal/borderfloorblack{ + dir = 8; + layer = 2.4 }, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8; + pixel_x = 9 + }, +/turf/simulated/floor/wood/alt/parquet, /area/crew_quarters/captain) "xSd" = ( /turf/simulated/wall, @@ -60991,21 +61134,16 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "xSp" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - layer = 2.9 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1; - pixel_y = -9 +/obj/machinery/computer/card{ + dir = 8 }, -/turf/simulated/floor/tiled{ - icon_state = "monotile" +/obj/item/weapon/card/id/gold/captain/spare, +/obj/effect/floor_decal/corner_techfloor_gray{ + dir = 4 }, -/area/crew_quarters/locker) +/obj/effect/floor_decal/corner_techfloor_gray, +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/captain) "xSv" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; @@ -61870,13 +62008,11 @@ /turf/simulated/floor/tiled/techmaint, /area/cryogaia/outpost/tower/southwest) "yin" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 8 - }, +/obj/structure/bed/chair/comfy/brown, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/blue2, /area/crew_quarters/captain) "yiT" = ( /obj/machinery/door/airlock/maintenance{ @@ -77336,9 +77472,9 @@ qNr fnG odQ uQq +sfA gdR -gdR -gdR +woj fiQ fnG gaA @@ -78792,7 +78928,7 @@ rMt sxT fQq fQq -cvq +fQq jHW gvj iEL @@ -78953,12 +79089,12 @@ ubC xtL ait xSa -fQq -gTu +xSa +hsz rAA fQq iRh -fQq +kVf tSv ubC gKe @@ -79112,11 +79248,11 @@ xbv gEY xbv rsl -fQq +pSd dCs jMn nGV -vzb +gTu hjF vzb mrm @@ -79277,14 +79413,14 @@ ubC lJK yin pvQ -fQq +bUj lcR wAC uKg nyf thA ubC -dbb +xau pAF aQA ueN @@ -79436,10 +79572,10 @@ xbv vqw rCo ubC -fQq +xtL xxI wYk -fQq +bUj tFw hTN ebn @@ -79605,13 +79741,13 @@ hWv hsz wkY uDs -kOm +uDs bql ubC mDL gEY hGQ -xBO +tvE utl lrY wco @@ -79659,7 +79795,7 @@ apa aIc wEa isE -qoY +xoC xoC xoC bfa @@ -79760,14 +79896,14 @@ xbv dbb aOp ubC +mAE +ccy +xtd +qoY +sWe ubC -ubC -ubC -ubC -ubC -ubC -ubC -ubC +xSp +bNK ubC ubC xbv @@ -79820,7 +79956,7 @@ anR juF hrN snP -xSp +wTU uUj vgX vgX @@ -79921,19 +80057,19 @@ aJz jFI ovd fiK -mux -mux -mux -mux -mux -mux -stE -mux -mux -mux -mux -bUj -vWX +ubC +ubC +ubC +ubC +ubC +ubC +ubC +ubC +ubC +ubC +xau +xbv +gEY aQA wLz uJe @@ -80081,20 +80217,20 @@ lCj uDf bCZ xbv -xbv -xbv -xbv -xbv -xbv -xbv -xbv -xbv -xbv -xbv -xbv -xau -dbb -xbv +nHJ +diB +kOm +kOm +kOm +kOm +kOm +kOm +kYd +kOm +kOm +kOm +kOm +cvq ioS aQA aQA @@ -80242,17 +80378,17 @@ uDf uDf uDf bCZ -uDf -uDf -uDf -uDf -uDf -uDf -uDf -uDf -uDf -uDf -uDf +xbv +xbv +xbv +xbv +xbv +xbv +xbv +xbv +xbv +xbv +xbv xbv xbv xbv @@ -80306,7 +80442,7 @@ anR juF hUr snP -xtd +wTU pBb pnS pnS @@ -80470,8 +80606,8 @@ dYW wEa aKm meK -woj -woj +wMV +wMV wMV cUe nLs @@ -80652,7 +80788,7 @@ uDf ikj uDf uDf -vwb +uDf uDf uDf owQ @@ -80912,7 +81048,7 @@ usR usR usR usR -qNF +vWX uXr mRe wZI @@ -81074,7 +81210,7 @@ usR usR usR usR -qNF +vWX uXr fFX mcX @@ -81228,7 +81364,7 @@ doR doR uDf uDf -aac +usR usR usR usR @@ -81390,7 +81526,7 @@ doR doR doR doR -aac +usR usR usR usR @@ -85014,7 +85150,7 @@ uDf uDf uDf uDf -uDf +vwb uDf uDf uDf diff --git a/maps/yw/cryogaia-06-upper.dmm b/maps/yw/cryogaia-06-upper.dmm index f024c0c2c55..f0bdc4ab070 100644 --- a/maps/yw/cryogaia-06-upper.dmm +++ b/maps/yw/cryogaia-06-upper.dmm @@ -3994,8 +3994,8 @@ /area/cryogaia/station/pathfinder_office) "iK" = ( /obj/structure/table/woodentable, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/tiled, /area/cryogaia/station/pathfinder_office) @@ -4012,6 +4012,9 @@ /obj/effect/landmark/start{ name = "Pathfinder" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/cryogaia/station/pathfinder_office) "iN" = ( @@ -4235,6 +4238,9 @@ /obj/effect/floor_decal/corner_oldtile/gray{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos/relief{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/cryogaia/station/pathfinder_office) "ji" = ( @@ -11534,12 +11540,6 @@ }, /turf/simulated/floor/tiled, /area/security/watchtower) -"NQ" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/open/cryogaia, -/area/borealis2/outdoors/grounds/upper) "NR" = ( /obj/effect/floor_decal/corner/paleblue/full{ dir = 8 @@ -13797,6 +13797,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbayupper) +"Zs" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/micro_tunnel, +/turf/simulated/floor/plating, +/area/cryogaia/station/hallway/primary/upper/south) "Zt" = ( /turf/simulated/floor/tiled/techmaint, /area/cryogaia/outpost/tower/northeast) @@ -31977,17 +31995,17 @@ nQ nQ nQ nQ -TK -Sq -Sq -Sq -Sq -Sq -Sq -Sq -Sq -Sq -Sq +kW +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN AN AN AN @@ -32139,18 +32157,18 @@ nQ nQ nQ nQ -nQ -nQ -nQ -nQ -nQ -nQ -nQ -nQ -nQ -nQ -nQ -TK +cN +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq Sq Sq vT @@ -33494,7 +33512,7 @@ KH KH bb dj -vG +Zs LC mD JG @@ -34268,7 +34286,7 @@ nQ nQ nQ nQ -NQ +nQ nQ nQ nQ