diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index 71d97071b7b..46e8617a5ab 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -6756,7 +6756,7 @@ "czV" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/apcenter) "czW" = (/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},/turf/simulated/floor/tiled/monotile,/area/hallway/primary/seconddeck/fpcenter) "czX" = (/obj/structure/sign/directions/evac{dir = 2; pixel_y = -10},/turf/simulated/wall/r_wall,/area/hallway/primary/seconddeck/apcenter) -"czY" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/command{name = "Head of Personnel"; req_access = list(57)},/turf/simulated/floor/tiled,/area/crew_quarters/heads/sc/hop) +"czY" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/command{name = "Head of Personnel"; req_access = list(57)},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/heads/sc/hop) "czZ" = (/obj/machinery/ai_status_display,/turf/simulated/wall/r_wall,/area/crew_quarters/heads/sc/hop) "cAa" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/paleblue/border{dir = 9},/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/ascenter) "cAb" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/paleblue/bordercorner{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/ascenter) @@ -8518,7 +8518,7 @@ "dhP" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Library"},/turf/simulated/floor/tiled/steel_grid,/area/library) "dhQ" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/camera/network/second_deck{c_tag = "Second Deck - Aft Hallway Four"; dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/green/border{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/aft) "dhR" = (/obj/machinery/newscaster{pixel_x = 30; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/chapel/main) -"dhS" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Chapel Office"; req_access = list(27)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/lino,/area/chapel/office) +"dhS" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Chapel Office"; req_access = list(27)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/chapel/office) "dhT" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = list(12,25,27,28,35)},/turf/simulated/floor/plating,/area/maintenance/chapel) "dhU" = (/turf/simulated/wall/r_wall,/area/chapel/main) "dhV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/bar) @@ -8607,8 +8607,8 @@ "djA" = (/obj/structure/bookcase{name = "Forbidden Knowledge"},/turf/simulated/floor/carpet,/area/library) "djB" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/green/bordercorner2{dir = 10},/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/aft) "djC" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/green/bordercorner2{dir = 5},/turf/simulated/floor/tiled,/area/hallway/primary/seconddeck/aft) -"djD" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Chapel"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/chapel/main) -"djE" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Chapel"},/turf/simulated/floor/tiled/dark,/area/chapel/main) +"djD" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Chapel"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel_grid,/area/chapel/main) +"djE" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Chapel"},/turf/simulated/floor/tiled/steel_grid,/area/chapel/main) "djF" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/chapel/main) "djG" = (/obj/machinery/door/morgue{dir = 2; name = "Confession Booth"},/turf/simulated/floor/tiled/dark,/area/chapel/main) "djH" = (/obj/machinery/door/morgue{dir = 2; name = "Confession Booth (Chaplain)"; req_access = list(22)},/turf/simulated/floor/tiled/dark,/area/chapel/main) @@ -8628,7 +8628,7 @@ "djV" = (/obj/structure/table/woodentable,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/item/device/paicard,/turf/simulated/floor/wood,/area/library) "djW" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/landmark/start{name = "Librarian"},/turf/simulated/floor/wood,/area/library) "djX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/library) -"djY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock{name = "Library Office"; req_access = list(37)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/carpet,/area/library) +"djY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock{name = "Library Office"; req_access = list(37)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/steel_grid,/area/library) "djZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/library) "dka" = (/obj/structure/bed/chair/comfy/brown,/obj/effect/landmark/start{name = "Librarian"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/carpet,/area/library) "dkb" = (/turf/simulated/floor/carpet,/area/library) @@ -8771,7 +8771,7 @@ "dmI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/seconddeck/locker/locker_toilet) "dmJ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/seconddeck/locker/locker_toilet) "dmK" = (/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/seconddeck/locker/locker_toilet) -"dmL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Unisex Showers"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/seconddeck/locker/locker_toilet) +"dmL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Unisex Showers"},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/seconddeck/locker/locker_toilet) "dmM" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 1},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/seconddeck/locker/locker_toilet) "dmN" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/item/weapon/bikehorn/rubberducky,/obj/machinery/alarm{dir = 8; pixel_x = 22; pixel_y = 0},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/seconddeck/locker/locker_toilet) "dmO" = (/obj/machinery/vending/cola,/turf/simulated/floor/tiled/dark,/area/crew_quarters/seconddeck/locker) @@ -9495,7 +9495,7 @@ "dAE" = (/obj/structure/firedoor_assembly,/turf/simulated/floor/plating,/area/maintenance/thirddeck/forestarboard) "dAF" = (/turf/simulated/wall/r_wall,/area/maintenance/solars/forestarboardsolar) "dAG" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/forestarboardsolar) -"dAH" = (/obj/structure/cable/yellow,/turf/simulated/floor/airless,/area/solar/foreportsolar) +"dAH" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/solar/foreportsolar) "dAI" = (/obj/item/stack/cable_coil/yellow,/turf/simulated/floor/reinforced/airless,/area/thirddeck/roof) "dAJ" = (/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/foreportsolar) "dAK" = (/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/power/solar_control{id = "foreportsolar"; name = "Fore Port Solar Control"; track = 0},/turf/simulated/floor/plating,/area/maintenance/solars/foreportsolar) @@ -9522,9 +9522,9 @@ "dBf" = (/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/forestarboardsolar) "dBg" = (/obj/structure/cable/yellow,/turf/simulated/floor/airless,/area/solar/forestarboardsolar) "dBh" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/airless,/area/solar/foreportsolar) -"dBi" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/airless,/area/solar/foreportsolar) -"dBj" = (/turf/simulated/floor/airless,/area/solar/foreportsolar) -"dBk" = (/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/airless,/area/solar/foreportsolar) +"dBi" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/airless,/area/solar/foreportsolar) +"dBj" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area/solar/foreportsolar) +"dBk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Bathroom"},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/heads/sc/sd) "dBl" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk,/turf/simulated/floor/airless,/area/solar/foreportsolar) "dBm" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; layer = 3.3; master_tag = "fore_port_solar_airlock"; name = "exterior access button"; pixel_x = 25; pixel_y = -25; req_access = list(); req_one_access = list(11,24)},/obj/structure/catwalk,/turf/simulated/floor/airless,/area/solar/foreportsolar) "dBn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "fore_port_solar_outer"; locked = 1; name = "Engineering External Access"; req_access = list(11,13)},/turf/simulated/floor/plating,/area/maintenance/solars/foreportsolar) @@ -9565,7 +9565,7 @@ "dBW" = (/turf/simulated/floor/airless,/area/solar/forestarboardsolar) "dBX" = (/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/airless,/area/solar/forestarboardsolar) "dBY" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/airless,/area/solar/forestarboardsolar) -"dBZ" = (/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/airless,/area/solar/foreportsolar) +"dBZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall/r_wall,/area/crew_quarters/heads/sc/sd) "dCa" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5; icon_state = "intact"; tag = "icon-intact-f (NORTHEAST)"},/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/foreportsolar) "dCb" = (/obj/machinery/atmospherics/pipe/manifold/hidden,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/foreportsolar) "dCc" = (/obj/machinery/atmospherics/pipe/manifold/hidden,/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/foreportsolar) @@ -10096,7 +10096,7 @@ "dMh" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd) "dMi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd) "dMj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd) -"dMk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock{name = "Bathroom"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/heads/sc/sd) +"dMk" = (/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/obj/machinery/computer/station_alert/all,/turf/simulated/floor/tiled/dark,/area/bridge) "dMl" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/heads/sc/sd) "dMm" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/heads/sc/sd) "dMn" = (/obj/structure/closet/crate,/obj/item/clothing/mask/gas,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/plating,/area/maintenance/thirddeck/aftstarboard) @@ -10122,7 +10122,7 @@ "dMH" = (/obj/machinery/status_display,/turf/simulated/wall/r_wall,/area/hallway/primary/thirddeck/central) "dMI" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/bridge) "dMJ" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/tiled,/area/bridge) -"dMK" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock/command{name = "Station Director's Quarters"; req_access = list(20)},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/heads/sc/sd) +"dMK" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/solar/aftportsolar) "dML" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/light,/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd) "dMM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd) "dMN" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/heads/sc/sd) @@ -10245,7 +10245,7 @@ "dPa" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/bridge) "dPb" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/bridge) "dPc" = (/obj/structure/table/reinforced,/obj/item/weapon/folder/yellow,/obj/item/device/flashlight,/obj/item/device/flashlight{pixel_x = 2; pixel_y = 2},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/yellow/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 8},/turf/simulated/floor/tiled/dark,/area/bridge) -"dPd" = (/obj/structure/window/reinforced,/obj/structure/frame/computer,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/yellow/border,/turf/simulated/floor/tiled/dark,/area/bridge) +"dPd" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) "dPe" = (/obj/machinery/computer/atmos_alert,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/yellow/border{dir = 6},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 6},/turf/simulated/floor/tiled/dark,/area/bridge) "dPf" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor/tiled/dark,/area/bridge) "dPg" = (/obj/machinery/computer/rcon,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/yellow/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 8},/turf/simulated/floor/tiled/dark,/area/bridge) @@ -10311,7 +10311,7 @@ "dQo" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Maintenance Access"; req_one_access = list(12,19)},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plating,/area/maintenance/thirddeck/aftstarboard) "dQp" = (/turf/simulated/wall/r_wall,/area/maintenance/solars/aftstarboardsolar) "dQq" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar) -"dQr" = (/obj/structure/cable/yellow,/turf/simulated/floor/airless,/area/solar/aftportsolar) +"dQr" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area/solar/aftportsolar) "dQs" = (/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar) "dQt" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar) "dQu" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"; tag = "icon-manifold-f (NORTH)"},/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar) @@ -10357,11 +10357,10 @@ "dRi" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1; icon_state = "map"; tag = "icon-manifold-f (NORTH)"},/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar) "dRj" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; icon_state = "intact"; tag = "icon-intact-f (SOUTHWEST)"},/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar) "dRk" = (/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar) -"dRl" = (/obj/structure/cable/yellow,/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) +"dRl" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area/solar/aftportsolar) "dRm" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/airless,/area/solar/aftportsolar) -"dRn" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/airless,/area/solar/aftportsolar) -"dRo" = (/turf/simulated/floor/airless,/area/solar/aftportsolar) -"dRp" = (/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/airless,/area/solar/aftportsolar) +"dRn" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) +"dRo" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) "dRq" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk,/turf/simulated/floor/airless,/area/solar/aftportsolar) "dRr" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; layer = 3.3; master_tag = "aft_port_solar_airlock"; name = "exterior access button"; pixel_x = 25; pixel_y = -25; req_access = list(); req_one_access = list(11,24)},/obj/structure/catwalk,/turf/simulated/floor/airless,/area/solar/aftportsolar) "dRs" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "aft_port_solar_outer"; locked = 1; name = "Engineering External Access"; req_access = list(11,13)},/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar) @@ -10404,11 +10403,7 @@ "dSd" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "aft_starboard_solar_outer"; locked = 1; name = "Engineering External Access"; req_access = list(11,13)},/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar) "dSe" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; layer = 3.3; master_tag = "aft_starboard_solar_airlock"; name = "exterior access button"; pixel_x = -25; pixel_y = -25; req_access = list(); req_one_access = list(11,24)},/obj/structure/catwalk,/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) "dSf" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk,/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) -"dSg" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) -"dSh" = (/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) -"dSi" = (/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) "dSj" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) -"dSk" = (/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/airless,/area/solar/aftportsolar) "dSl" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{id = "aftportsolar"; name = "Aft Port Solar Control"; track = 0},/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar) "dSm" = (/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Aft Port"; dir = 1},/obj/machinery/light/small,/obj/item/weapon/stool,/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar) "dSn" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/plating,/area/maintenance/solars/aftportsolar) @@ -10425,7 +10420,6 @@ "dSy" = (/obj/structure/cable,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/table/steel,/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/obj/item/stack/cable_coil/yellow,/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar) "dSz" = (/obj/machinery/light/small,/obj/machinery/camera/network/engineering{c_tag = "ENG - Solar Aft Starboard"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar) "dSA" = (/obj/structure/cable/yellow,/obj/machinery/power/solar_control{id = "aftstarboardsolar"; name = "Aft Starboard Solar Control"; track = 0},/turf/simulated/floor/plating,/area/maintenance/solars/aftstarboardsolar) -"dSB" = (/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/airless,/area/solar/aftstarboardsolar) "dSC" = (/obj/structure/cable/yellow{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/catwalk,/turf/simulated/floor/airless,/area/solar/aftportsolar) "dSD" = (/obj/structure/table/steel,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/thirddeck/aftport) "dSE" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/table/steel,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/maintenance/thirddeck/aftport) @@ -11113,8 +11107,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaagaadaadaaaaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzMdzNdzAdzedzMdzNdzAdzedzMdzNdzAdzedzMdzNdzAdzedzMdzNdzAdzedzedzedzedzedzedzedzedzedzedAgdAgdAgdAgdAgdAgdAgdzedzedzedzedzedzedzedzidzidzidzOdzPdzQdzRdAhdzRdAidAjdzUdzidzidzidzedzedzedzedzedzedzedAkdAkdAkdAkdAkdAkdAkdzedzedzedzedzedzedzedzedzedzedzJdzVdzLdzedzJdzVdzLdzedzJdzVdzLdzedzJdzVdzLdzedzJdzVdzLdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaagaafaaaaafaaaaaaaaaaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzMdzNdzAdzedzMdzNdzAdzedzMdzNdzAdzedzMdzNdzAdzedzMdzNdzAdzedzedzedzedzedzedAldAmdAmdAmdAmdAndAodApdAqdArdAgdzedzedzedzedzedAsdAtdAtdAudAudAvdAwdAxdzRdzRdzRdzGdAydAzdzidzidzedzedzedzedzedzedzedzedAkdAAdABdACdADdAEdAFdAFdAFdAFdAGdzedzedzedzedzedzedzJdzVdzLdzedzJdzVdzLdzedzJdzVdzLdzedzJdzVdzLdzedzJdzVdzLdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaafaaaaaaaaaaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedAHdzedzedzedAHdzedzedzedAHdzedzedzedAHdzedzedzedAHdzedzedAIdzedAJdAJdAJdAldAKdALdAMdANdAOdAqdAqdAqdAPdAgdzedzedzedzedzedAQdzedzedzidzidzidARdASdATdAUdATdAVdAWdzidzidzidzedzedzedzedzedzedzedzedAkdAXdAYdAZdAZdBadBbdBcdBddBedAGdBfdBfdBfdzedzedzedzedBgdzedzedzedBgdzedzedzedBgdzedzedzedBgdzedzedzedBgdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaafaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedBhdBidBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBjdBkdBldBmdBndBodBpdBqdBrdBsdBtdBudBvdBwdBxdBydBzdAgaaaaaaaaaaaaaaadBAaaaaaadzidzidzidzpdBBdBCdBDdBEdBFdzkdzidzidziaaaaaadBGaaaaaaaaaaaaaaadAkdBHdBIdBJdBJdBKdBLdBMdBNdBOdBPdBQdBRdBSdBTdBUdBVdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBXdBYdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaafdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedBZdzedzedzedBZdzedzedzedBZdzedzedzedBZdzedzedzedBZdzedzedzedzedAJdCadCbdCcdCddCedCfdANdCgdAqdChdCidAgdAgaaaaaaaaaaaaaaadBAaaaaaaaaaaaadzidzidzidzidCjdzidzidzidziaaaaaaaaaaaadBGaaaaaaaaaaaaaaadAkdAkdCkdCldAZdCmdBbdCndCodCpdCqdCrdCsdBfdzedzedzedzedCtdzedzedzedCtdzedzedzedCtdzedzedzedCtdzedzedzedCtdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaafaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedBhdBjdBjdBjdBidBjdBjdBjdBidBjdBjdBjdBidBjdBjdBjdBidBjdBjdBjdBidBjdBjdBldBmdBndBodBpdBqdBrdBsdBtdBudBvdBwdBxdBydBzdAgaaaaaaaaaaaaaaadBAaaaaaadzidzidzidzpdBBdBCdBDdBEdBFdzkdzidzidziaaaaaadBGaaaaaaaaaaaaaaadAkdBHdBIdBJdBJdBKdBLdBMdBNdBOdBPdBQdBRdBSdBTdBUdBVdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBWdBXdBYdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaafdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedAHdzedzedzedAHdzedzedzedAHdzedzedzedAHdzedzedzedAHdzedzedzedzedAJdCadCbdCcdCddCedCfdANdCgdAqdChdCidAgdAgaaaaaaaaaaaaaaadBAaaaaaaaaaaaadzidzidzidzidCjdzidzidzidziaaaaaaaaaaaadBGaaaaaaaaaaaaaaadAkdAkdCkdCldAZdCmdBbdCndCodCpdCqdCrdCsdBfdzedzedzedzedCtdzedzedzedCtdzedzedzedCtdzedzedzedCtdzedzedzedCtdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCuaaaaaaaaadCuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaafaafaafdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzMdCvdzAdzedzMdCvdzAdzedzMdCvdzAdzedzMdCvdzAdzedzMdCvdzAdzedzedzedzedzedzedAldAmdAmdAmdAgdCwdCxdAgdAgdAgaaaaaaaaaaaaaaaaaadAQdzedzedzedCydCydCydCydzidCzdCAdCBdCydCydCydzedzedzedzeaaaaaaaaaaaaaaaaaadAkdAkdAkdCCdCDdAkdAFdAFdAFdAGdzedzedzedzedzedzedzJdCEdzLdzedzJdCEdzLdzedzJdCEdzLdzedzJdCEdzLdzedzJdCEdzLdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCuaaaaaaaaadCuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaafaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzMdCvdzAdzedzMdCvdzAdzedzMdCvdzAdzedzMdCvdzAdzedzMdCvdzAdzedzedzedzedzedzedzedzedzedzedAgdCFdAqdAgaaaaaaaaaaabaaaaaadzedzedAQdzedzedzedCydCGdCHdCIdCJdCKdCLdCMdCHdCNdCydzedzedzedzedzedzeaaaaaaaabaaaaaaaaadAkdAZdCOdAkdzedzedzedzedzedzedzedzedzedzedzJdCEdzLdzedzJdCEdzLdzedzJdCEdzLdzedzJdCEdzLdzedzJdCEdzLdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadCuaaaaaaaaadCuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaaaaafaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzMdCvdzAdzedzMdCvdzAdzedzMdCvdzAdzedzMdCvdzAdzedzMdCvdzAdzedzedzedzedzedzedzedzedzedzedAgdCPdCQdAgaaaaaaaaaaaaaaadzedzedzedAQdzedzedCRdCydCSdCTdCUdCVdCWdCXdCYdCZdCZdCydzedzedzedzedzedzedzeaaaaaaaaaaaaaaadAkdAXdDadAkdzedzedzedzedzedzedzedzedzedzedzJdCEdzLdzedzJdCEdzLdzedzJdCEdzLdzedzJdCEdzLdzedzJdCEdzLdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxdzxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -11137,18 +11131,18 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKwdKwdKwdKwdKwdKwdKxdKydIJdKzdKAdKBdKCdKCdKDdINdKEdKFdKGdIMdKHdKIdKJdKKdKLdKMdKMdKMdKJdKNdKLdKMdKOdIYdKPdKQdKRdIXdKSdKTdKUdJcaaaaaadKVdKWdKXdKVdKVdKVdKVdKVdKVdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaadaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaafaafaafaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKwdKYdKZdIJdIJdIJdIJdIJdIJdIJdIMdIMdIMdIMdIMdLadLbdLcdLddLedLedLfdLgdLhdLidLjdLkdLldIYdIYdIYdIYdIYdJcdJcdJcdJcaaaaaadKVdLmdLndKVdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKwdLodLpdKwaaaaaadLqdLrdLsdLtdLudLvdLwdLxdLqdLydLzdLAdLBdLCdLDdLEdLDdLBdLBdLAdLFdLGdLHdLIdLJdLKdLLdLHdLMdLNdLHaaaaaadKVdLOdLPdKVdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaafaafaafaadaWzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKwdKYdLQdKwaaaaaadLqdLRdLSdLTdLUdLVdLWdLXdLqdLYdLZdGmdMadMbdFJdFIdFJdMcdMddGmdMedMfdLHdMgdMhdMidMjdMkdMldMmdLHaaaaaadKVdMndModKVdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKwdKYdMpdMqaaaaaadMrdLvdMsdMtdMudMvdMwdMxdMydMzdMAdMBdMadMCdMDdTEdMFdFJdMGdMHdMIdMJdMKdMLdMMdMNdMOdLHdMPdMQdLHaaaaaadMRdMSdMTdKVdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKwdKYdLQdKwaaaaaadLqdLRdLSdLTdLUdLVdLWdLXdLqdLYdLZdGmdMadMbdFJdFIdFJdMcdMddGmdMedMfdLHdMgdMhdMidMjdBkdMldMmdLHaaaaaadKVdMndModKVdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKwdKYdMpdMqaaaaaadMrdLvdMsdMtdMudMvdMwdMxdMydMzdMAdMBdMadMCdMDdTEdMFdFJdMGdMHdMIdMJdBZdMLdMMdMNdMOdLHdMPdMQdLHaaaaaadMRdMSdMTdKVdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKwdMUdMVdMqaaaaaadMWdMXdMYdMZdNadMZdNbdNcdLqdNddNedGmdNfdNgdNhdTFdNjdNkdNldGmdNmdNndLHdLHdLHdNodLHdLHdLHdLHdLHaaaaaadMRdNpdNqdKVdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaagaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaafaafdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKwdNrdNsdMqaaaaaadNtdNudLvdLvdNvdLvdLvdNwdLqdLYdLZdNxdNxdNydNzdNAdNBdNCdNxdNxdMedMfdLHdNDdNEdNFdNGdNHdNIdNJdLHaaaaaadMRdNKdNLdKVdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaafaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedNMdNNdNOdzedNMdNNdNOdzedNMdNNdNOdzedNMdNNdNOdzedNMdNNdNOdzedzedzedzedzedzedzedzedzedzedKwdNrdNPdKwaaaaaadNQdNRdNSdLvdNTdNUdNVdNWdNXdNYdNZdOadObdOcdOddTGdOfdOcdOgdOhdOidOjdOkdOldOmdOndOodOpdOqdOrdLHaaaaaadKVdOsdNLdKVdzedzedzedzedzedzedzedzedzedzedOtdOudOvdzedOtdOudOvdzedOtdOudOvdzedOtdOudOvdzedOtdOudOvdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaafaafaafaaTaafaaaaaaaagaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaaaaafaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedzedzedzedzedzedzedzedzedzedKwdNrdOxdKwdKwdLqdLqdLqdOydOzdOAdOzdOydLqdLqdOBdOCdODdOEdOFdOEdOGdOEdOFdOEdOEdOHdOIdLHdLHdOJdOKdOLdOMdONdOOdLHdLHdKVdKVdOPdNLdKVdzedzedzedzedzedzedzedzedzedzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaafaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedzedzedzedzedzedzedzedzedzedKwdNrdLQdORdOSdLqdOTdOUdOVdOWdNTdLvdLvdOXdTHdOZdPadPbdPcdPddPedPfdPgdPhdPidPjdPkdPldTIdPndPodPpdPqdPrdPsdOpdPtdLHdPudPvdPwdNLdKVdzedzedzedzedzedzedzedzedzedzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaaaaafaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedzedzedzedzedzedzedzedzedzedKwdNrdLQdORdOSdLqdOTdOUdOVdOWdNTdLvdLvdOXdTHdOZdPadPbdPcdMkdPedPfdPgdPhdPidPjdPkdPldTIdPndPodPpdPqdPrdPsdOpdPtdLHdPudPvdPwdNLdKVdzedzedzedzedzedzedzedzedzedzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedzedzedzedzedzedzedzedzedzedKwdNrdLQdLQdLQdPxdLvdPydPzdPAdPBdPCdPDdLqdPEdPFdPGdPHdPGdPGdPGdPHdPGdPGdPGdPGdPGdPFdPIdLHdPJdOpdOodPKdOpdOpdPLdLHdPMdPNdPOdNLdKVdzedzedzedzedzedzedzedzedzedzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedNMdOwdNOdzedzedzedzedzedzedPPdPQdPQdPQdKwdPRdKydKydKydLqdPSdPTdPUdLvdPVdPTdPWdPXdPYdPZdQadQbdQcdPGdPGdQddPGdPGdQedQfdQgdQhdQidQjdQkdOpdQldQmdMhdOpdQndLHdKWdKWdKWdQodKVdQpdQpdQpdQqdzedzedzedzedzedzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedOtdOQdOvdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaafaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaafaafaafdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedQrdzedzedzedQrdzedzedzedQrdzedzedzedQrdzedzedzedQrdzedzedzedzedQsdQtdQudQvdQwdQxdQydQzdQAdQBdQCdQDdLqdLqdQEdQFdQGdQHdQEdLqdLqdQIdQJdQKdNxdQLdQMdQNdQOdQPdQQdQRdNxdQSdQTdQUdLHdLHdQVdQWdQXdMhdQYdLHdLHdQZdRadRbdRcdRddRedRfdRgdRhdRidRjdRkdzedzedzedzedRldzedzedzedRldzedzedzedRldzedzedzedRldzedzedzedRldzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedRmdRndRodRodRodRodRodRodRodRodRodRodRodRodRodRodRodRodRodRodRodRodRpdRqdRrdRsdRtdRudRvdRwdRxdRydRzdRAdRBdRBdRCdRDdLqdLqdREdRFdRGdRHdNQaaaaaaaaaaaadRIdNxdQIdRJdRKdRLdQKdNxdNxaaaaaaaaaaaadRMdRNdROdRPdRQdLHdLHdRRdRSdRTdRUdRVdRWdRXdRYdRZdSadSbdScdSddSedSfdSgdShdShdShdShdShdShdShdShdShdShdShdShdShdShdShdShdShdShdShdShdSidSjdzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedSkdzedzedzedSkdzedzedzedSkdzedzedzedSkdzedzedzedSkdzedzedzedzedQsdQsdQsdPPdSldSmdSndQzdSodLQdLQdSpdSqdKwdSrdSsdSsdSsdSsdStdzedzedzedzedzedSrdSsdSsdSsdSsdSsdStdSudzedzedzedzedSrdSsdSsdSsdSsdStdKVdSvdSwdSwdSwdSxdRddSydSzdSAdQqdRkdRkdRkdzedzedzedzedSBdzedzedzedSBdzedzedzedSBdzedzedzedSBdzedzedzedSBdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaafaafaafdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedMKdzedzedzedMKdzedzedzedMKdzedzedzedMKdzedzedzedMKdzedzedzedzedQsdQtdQudQvdQwdQxdQydQzdQAdQBdQCdQDdLqdLqdQEdQFdQGdQHdQEdLqdLqdQIdQJdQKdNxdQLdQMdQNdQOdQPdQQdQRdNxdQSdQTdQUdLHdLHdQVdQWdQXdMhdQYdLHdLHdQZdRadRbdRcdRddRedRfdRgdRhdRidRjdRkdzedzedzedzedPddzedzedzedPddzedzedzedPddzedzedzedPddzedzedzedPddzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedRmdRldRldRldQrdRldRldRldQrdRldRldRldQrdRldRldRldQrdRldRldRldQrdRldRldRqdRrdRsdRtdRudRvdRwdRxdRydRzdRAdRBdRBdRCdRDdLqdLqdREdRFdRGdRHdNQaaaaaaaaaaaadRIdNxdQIdRJdRKdRLdQKdNxdNxaaaaaaaaaaaadRMdRNdROdRPdRQdLHdLHdRRdRSdRTdRUdRVdRWdRXdRYdRZdSadSbdScdSddSedSfdRndRndRodRndRndRndRodRndRndRndRodRndRndRndRodRndRndRndRodRndRndRndSjdzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedzedMKdzedzedzedMKdzedzedzedMKdzedzedzedMKdzedzedzedMKdzedzedzedzedQsdQsdQsdPPdSldSmdSndQzdSodLQdLQdSpdSqdKwdSrdSsdSsdSsdSsdStdzedzedzedzedzedSrdSsdSsdSsdSsdSsdStdSudzedzedzedzedSrdSsdSsdSsdSsdStdKVdSvdSwdSwdSwdSxdRddSydSzdSAdQqdRkdRkdRkdzedzedzedzedPddzedzedzedPddzedzedzedPddzedzedzedPddzedzedzedPddzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaagaafaafaaaaaaaaaaaaaaaaafaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedNMdSCdNOdzedNMdSCdNOdzedNMdSCdNOdzedNMdSCdNOdzedNMdSCdNOdzedzedzedzedzedzedPPdPQdPQdPQdPQdSDdSEdSFdSGdSHdKwdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKVdSIdSwdSJdSKdSLdQpdQpdQpdQpdQqdzedzedzedzedzedzedOtdSMdOvdzedOtdSMdOvdzedOtdSMdOvdzedOtdSMdOvdzedOtdSMdOvdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzeaafaafaafaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedNMdSCdNOdzedNMdSCdNOdzedNMdSCdNOdzedNMdSCdNOdzedNMdSCdNOdzedzedzedzedzedzedzedzedzedzedKwdKwdKwdKwdKwdKwdKwdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedKVdKVdKVdKVdKVdKVdKVdzedzedzedzedzedzedzedzedzedzedOtdSMdOvdzedOtdSMdOvdzedOtdSMdOvdzedOtdSMdOvdzedOtdSMdOvdzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaadaadaaTaadaadaaaaaaaaadzedzedzedzedzedzedzedzedzedzedzedzedNMdSCdNOdzedNMdSCdNOdzedNMdSCdNOdzedNMdSCdNOdzedNMdSCdNOdzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedzedOtdSMdOvdzedOtdSMdOvdzedOtdSMdOvdzedOtdSMdOvdzedOtdSMdOvdzedzedzedzedzedzedzedzedzedzedzedzedzeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index 04bb0e2fa09..c664b133ee7 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -624,8 +624,8 @@ "lZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/main) "ma" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/surface/outpost/main) "mb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/turf/simulated/floor/tiled,/area/surface/outpost/main) -"mc" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/surface/outpost/main) -"md" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled,/area/surface/outpost/main) +"mc" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/surface/outpost/main) +"md" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/turf/simulated/floor/tiled,/area/surface/outpost/main) "me" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/embedded_controller/radio/airlock/access_controller{id_tag = "main2_airlock_control"; name = "Main Access Console"; pixel_x = 26; pixel_y = -26; tag_exterior_door = "main2_airlock_exterior"; tag_interior_door = "main2_airlock_interior"},/turf/simulated/floor/tiled,/area/surface/outpost/main) "mf" = (/obj/machinery/door/airlock/mining{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "main2_airlock_interior"; locked = 1; name = "Main Outpost Interior"},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1379; master_tag = "main2_airlock_control"; name = "Main Access Button"; pixel_x = 6; pixel_y = -26; req_access = null},/turf/simulated/floor/tiled,/area/surface/outpost/main) "mg" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled,/area/surface/outpost/main) @@ -1580,7 +1580,7 @@ "Et" = (/turf/unsimulated/wall/planetary/sif{icon_state = "rock-dark"},/area/surface/south) "Eu" = (/obj/effect/step_trigger/teleporter/wild/to_wild,/turf/simulated/floor/outdoors/grass/sif/forest/planetuse,/area/surface/south) "Ev" = (/turf/unsimulated/wall/planetary/sif{icon_state = "rock-dark"},/area/surface/southeast) - + (1,1,1) = {" aaaaaaaaaaaaaaaaababababababababababababababababababababababababababababababababababababababababababababababababababababababababacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacadaeaeaeacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf aaagagagagagagagahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahahaiajajajajajajajajajajajajajajajajakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakalamamamakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakakajajajajajajajajajajajajajajaiananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananao @@ -1627,7 +1627,7 @@ aaagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagag aaagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagaEapapapapapapapapapapapapapapapapapapamamamamamamamamamamamamamamamamamamamamaqamamamamamamamamamamamamamamamamamamamamaqamamamapapapapapapapapapjrkzkAkBjvkCkDkEkFkFjOkGkHhHhHkIkJkKkLkMkNkOhHapapapapamapapapapapajajajajajajajajajajajajajajajajajajajajajajajaiananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananao aaagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagaEapapapapapapapapapapapapapapapapapapapapapapapapamamamamamapapapapapapapapapaqapapapapapapapapapapapapapapapapapapapapaqamamamapapapapapapapapapkPkQkQkQkQkQkQkQkPkRkSkTkUkVhHhIkWhIhIhHhHhHhHapapapapapapapapapajajajajajajajajajajajajajajajajajajajajajajajajaiananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananao aaagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagaEapapapapapapapapapapapapapapapapapapapapapapapapapamamamamapapkXkXkXkXkYkYkZlakZlblblblblclclblblblbapapapapapapapapapaqamamamapapapapapapapapapkPldlelflelglhliljlklllmlngcjOlolplqlrlsltlulvlwamapapapapapapapajajajajajajajajajajajajajajajajajajajajajajajajaiananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananao -aaagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagaEapapapapapapapapapapapapapapapapapapapapapapapapapapamamapapkXkXlxlylzlAlBlClDlElFlGlHlIlJlKlLlMlNlblbapapapapapapapapaqlOlOlPapapapapapapapapapkPlQlRlRlRlRlSlTlUlVlWlXlYlZmambmcmdmemfmgmhmimjamamamapapapapajajajajajajajajajajajajajajajajajajajajajajajajajaiananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananao +aaagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagaEapapapapapapapapapapapapapapapapapapapapapapapapapapamamapapkXkXlxlylzlAlBlClDlElFlGlHlIlJlKlLlMlNlblbapapapapapapapapaqlOlOlPapapapapapapapapapkPlQlRlRlRlRlSlTlUlVlWlXlYlZmambmdmcmemfmgmhmimjamamamapapapapajajajajajajajajajajajajajajajajajajajajajajajajajaiananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananao aaagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagaEapapapapapapapapapapapapapapapapapapapapapapapapapapamamapapkXmklAlAlAmlmmlCmnmolFmpmqmrmsmtmumumvmwlbapapapapapapapapmxmymzmAmAapapapapapapapapmBmCmDmDmDmDmEmFmBhimGmHmIgcjOmJmKmLmMkFmNmOkFmPapamamapapapapajajajajajajajajajajajajajajajajajajajajajajajajajaiananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananao aaagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagaEapapapapapapapapapapapapapapapapapapapapapapapapapapamamapapkXlxlAmQlAmRlAlCmSmTlFmUlMmVmWmXmYmZlMnalbapapapapapapapapnbncndnemyapapapapapapapapmBnfngnfngnfnfnhkPnigcnjkUnknlnmnnnmnmkFkFkFkFapapapamamapapajajajajajajajajajajajajajajajajajajajajajajajajajajaiananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananao aaagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagagaEapapapapapapapapapapapapapapapapapapapapapapapapapapamamapapkXnolAnpnqnrnslCntnulFnvnwnxnynznAnAnBnClbapapapapapapapapnbnDnEnFmyapapapapapapapapkPnGnHnInJnKnfnLkPkFjOnMkHnlnlnNnOnPnQnRnlapapapapapapamapapajajajajajajajajajajajajajajajajajajajajajajajajajajaiananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananao @@ -1838,3 +1838,4 @@ DODYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDY DODYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYDYEeEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEqEaEaEaEaEaEaEaEaEaEaEaEaEaEqEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEaEbEbEbEbEbEbEbEbEbEbEbEbEbEbErEbEbEbEbEbEbEbEbEbEbEbEbEbErEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEbEeEfEfEfEfEfEfEfEfEfEfEfEfEfEfEfEfEfEfEfEfEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgEgDX DODODODODODODODOEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsDODODODODODODODODODODOEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEsEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEuEuEuEuEuEuEuEuEuEuEuEuEuEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEuEuEuEuEuEuEuEuEuEuEuEuEuEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEtEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvDXDXDXDXDXDXDXDXDXDXDXDXDXEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEvEv "} + diff --git a/maps/southern_cross/southern_cross-4.dmm b/maps/southern_cross/southern_cross-4.dmm index 5dcb0cb8bf5..b4b02cefc7c 100644 --- a/maps/southern_cross/southern_cross-4.dmm +++ b/maps/southern_cross/southern_cross-4.dmm @@ -244,7 +244,6 @@ "eJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; use_power = 0},/obj/machinery/light,/turf/simulated/floor/reinforced,/area/surface/outpost/research/xenoarcheology/isolation_b) "eK" = (/obj/machinery/atmospherics/pipe/manifold/hidden/yellow,/obj/machinery/alarm/monitor/isolation{alarm_id = "isolation_two"; dir = 1; pixel_x = 0; pixel_y = -22},/turf/simulated/floor/reinforced,/area/surface/outpost/research/xenoarcheology/isolation_b) "eL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Isolation Cell 2"; dir = 1},/turf/simulated/floor/reinforced,/area/surface/outpost/research/xenoarcheology/isolation_b) -"eM" = (/turf/simulated/mineral/floor/ignore_mapgen/sif,/area/space) "eN" = (/obj/machinery/door/airlock/research{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "xenoarch1_airlock_exterior"; locked = 1; name = "Research Exterior Airlock"},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "xenoarch1_airlock_control"; name = "Xenoarch Access Button"; pixel_x = 0; pixel_y = -24; req_access = null},/turf/simulated/floor/tiled,/area/surface/outpost/research/xenoarcheology) "eO" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/effect/floor_decal/rust/part_rusted1,/turf/simulated/floor/tiled,/area/surface/outpost/research/xenoarcheology) "eP" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/research/xenoarcheology) @@ -659,7 +658,7 @@ aaababababababababababababababababababababababababababababababababababababababab aaababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdpcVcVcVcVcVdqacacababcxdrdsdtdudvdwdxajakdyakdzdAdBdCdDdEdFcrcrcrcrcrdGacacabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaa aaababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdpcVcVcVcVcVdqacacababcxdHdIdJdKdLdMdNcFdOdPdQaudRdSdTdUdVdWdXdYdZeaebdGacacacababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaa aaababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdpecedeccVeedqacacababcxdKdKcxefegeheiejekdPdQbHelbKbKemeneoepeqeresebdGacacacababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaa -aaababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdpcVcVcVcVetdqacacaceuakevewakexexeyezeAeBdPdQaueCeDeEeFeGeHeIeJeKeLebdGeMacabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaa +aaababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdpcVcVcVcVetdqacacaceuakevewakexexeyezeAeBdPdQaueCeDeEeFeGeHeIeJeKeLebdGacacabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaa aaababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdpecedeccVetdqacacaceueNeOePeQeReSeTeUeVeWeXeYeZfafbfcfdfefffgfgfgfgfgdGacacabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaa aaababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdpcVcVcVcVetdqacacaceuajfhfiajfjfkflfmfnfofpfqaufrdhdhfsftfufvfwfxfyfzacacacabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaa aaababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababdpecedeccVcVdqacacacacfAfAfAfAfBfCfDfEfAfFfGfHfIfJfKfLfMfNeofOfPfQfRfzacacababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaa @@ -675,3 +674,4 @@ aaababababababababababababababababababababababababababababababababababababababab aaabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababiaacacacababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaibicicicaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} + diff --git a/maps/southern_cross/southern_cross-8.dmm b/maps/southern_cross/southern_cross-8.dmm index 19179209fa2..bec566ab129 100644 --- a/maps/southern_cross/southern_cross-8.dmm +++ b/maps/southern_cross/southern_cross-8.dmm @@ -11,6 +11,11 @@ "k" = (/turf/simulated/floor/water/deep,/area/surface/outside/river/svartan) "l" = (/obj/effect/zone_divider,/turf/simulated/floor/water,/area/surface/outside/river/svartan) "m" = (/obj/effect/zone_divider,/turf/simulated/floor/water/deep,/area/surface/outside/river/svartan) +"n" = (/turf/simulated/wall/wood,/area/surface/outside/wilderness) +"o" = (/turf/simulated/floor/wood,/area/surface/outside/wilderness) +"p" = (/turf/simulated/wall/wood,/area/surface/outside/river/svartan) +"q" = (/turf/simulated/floor/wood,/area/surface/outside/river/svartan) +"r" = (/turf/simulated/floor/plating/sif/planetuse,/area/surface/outside/wilderness) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeefffffffffffffeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbaaaaaaaaaaaaaaaaaaaa @@ -108,18 +113,18 @@ acccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccgccccccccccccccc acccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccgcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddcccddddddddddddddddddddddddddhddddddddddddddddddddddddddddddddddjjjjjjjjjjjjkkkkkkkjjjjjdda ajjjjjjjccccccccccccccccccccccccccccccccccccccccccccccccccccccccgccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddcccdddddddddddddddddddddddddhdddddddddddddddddjjjjjdddddddddjjjjjjjjjjjjjkkkkkjjjjjjjdddda ajjjjjjjjjjjjjjjccccccccccccccccccccccccccccccccccccccccccccccccgcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccdddddddddddddddddddddddhddddddddddddddddjjjjjjjjjjjjjjjjjjkkkkkkjkkkkkjjjjjjjddddddda -akkkkkkkjjjjjjjjjjjjjjjjccccccccccccccccccccccccccccccccccccccccgccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddddddddddddddddddddddhdddjjjjjdjjjjjjjjjkkjjjjjjjjjjjkkkkkkkkkjkkjjjjjjddddddddddda -akkkkkkkkkkkkkkkjjjjjjjjjjjjjcccccccccccccccccccccccccccccccccccgcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccdddddddddddddddddddddljjjjjjjjjjjjjjjjjkkkkkkkkkkkkkkkkkkkkkkkjjjjjjdddddddddddddda -ajjjjjjjkkkkkkkkkkkkkkkkjjjjjjjjjjccccccccccccccccccccccccccccccgcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccdccccccdddddddddddddddddjjjljjjjjjjjjjjkkkkkkkkkkkkkkkkkkkkkkjjjjjjjjjjddddddddddddddddda -ajjjjjjjjjjjjjjjjkkkkkkkkkkkkjjjjjjjccjcccccccccccccccccccccccccgcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccdcccccccddddddddddddjjjjjjjljjjkkkkkkjjkkkkkkkkjjjjjjjjjjjjjjjjjjjjjdddddddddddddddddddda -acccjjjjjjjjjjjjjjjjjjkkkkkkkkkkkkjjjjjjjjjjjjjjjcccccccccccccccgcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddcccccccdddddddddjjjjjjjkkmkkkkkkkkkjjjjjjjjjjjjjjjjjjjjjjjjddddddddddddddddddddddddddda -acccccccccccccjjjjjjjjjjjjjjjjjjkkkkkkkjjjjjjjjjjjccccccccccjjjjljjjjjjjjjjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddcccccccddjjjjjjjjjkkkkkkmkkkkjjjjjjjjjjjjjjjddddddddddddddddddddddddddddddddddddddddda -accccccccccccccccccccjjjjjjjjjjjjjkkkkkkkkkkkkkkkkjjjjjjjjjjjjjjljjjjjjjjjjjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddcccjjjjjjjkkjjkkkkkkkkjljjjjjjjjjjjjjjdddddddddddddddddddddddddddddddddddddddddddddda -acccccccccccccccccccccccccjjjjjjjjjjjjjjkkkkkkkkkkkkkkkkkkkkkkkkmkkkkkkkkkkjjjjjcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccdcjjjjjjjjkkkjjkkkjjjjjjljjjjjjjjjjdddddddddddddddddddddddddddddddddddddddddddddddddda -accccccccccccccccccccccccccccccccjjjjjjjjjjjjjjjjjjjkkkkkkkkkkkkmkkkkkkkkkkkjjjjjjjjjjjcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccjjjjjkkkkkkkkkjjjjjjjjjjjhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda -accccccccccccccccccccccccccccccccccccccjjjjjjjjjjjjjjjjjjjjjjjjjljjjjjjjjkkkkkkkjjjjjjjjjjjjjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccjjjjjjjjkkkkkkkkkjjjjjjjjjddddhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda -accccccccccccccccccccccccccccccccccccccccccccjjjjjjjjjjjjjjjjjjjljjjjjjjjjjkkkkkkkkkkkkjjjjjjjjjccjjjccccjjjcccccccccccccccccccccccccccccccccccccccccccccccccjjjjjjjjjjjkkkkkkkjjjjjjjjjjddddddddhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda -accccccccccccccccccccccccccccccccccccccccccccccccccjjjjjjjjcccccgjjjjjjjjjjjjkkkkkkkkkkkkkkkkjjjjjjjjjjjjjjjjjjjjjccccccccccccccccccccccccccccccccccccccccjjjjjjkkkjjjjjkkjjjjjjjjjjcccddddddddddhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda +akkkkkkkjjjjjjjjjjjjjjjjccccccccccccccccccccccccccccccccccccccccgccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddddddddddddddddddddddhnoopjjjjdjjjjjjjjjkkjjjjjjjjjjjkkkkkkkkkjkkjjjjjjddddddddddda +akkkkkkkkkkkkkkkjjjjjjjjjjjjjcccccccccccccccccccccccccccccccccccgcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccdddddddddddddddddddddljqqjjjjjjjjjjjjjjkkkkkkkkkkkkkkkkkkkkkkkjjjjjjdddddddddddddda +ajjjjjjjkkkkkkkkkkkkkkkkjjjjjjjjjjccccccccccccccccccccccccccccccgcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccdccccccdddddddddddddddddjjjljqqjjjjjjjjkkkkkkkkkkkkkkkkkkkkkkjjjjjjjjjjddddddddddddddddda +ajjjjjjjjjjjjjjjjkkkkkkkkkkkkjjjjjjjccjcccccccccccccccccccccccccgcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccdcccccccddddddddddddjjjjjjjljqqkkkkkkjjkkkkkkkkjjjjjjjjjjjjjjjjjjjjjdddddddddddddddddddda +acccjjjjjjjjjjjjjjjjjjkkkkkkkkkkkkjjjjjjjjjjjjjjjcccccccccccroongcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddcccccccdddddddddjjjjjjjkkmkqqkkkkkkjjjjjjjjjjjjjjjjjjjjjjjjddddddddddddddddddddddddddda +acccccccccccccjjjjjjjjjjjjjjjjjjkkkkkkkjjjjjjjjjjjccccccccccjqqjljjjjjjjjjjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddcccccccddjjjjjjjjjkkkkkkmkqqkjjjjjjjjjjjjjjjddddddddddddddddddddddddddddddddddddddddda +accccccccccccccccccccjjjjjjjjjjjjjkkkkkkkkkkkkkkkkjjjjjjjjjjjqjjljjjjjjjjjjjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddcccjjjjjjjkkjjkkkkkkkkjljqqjjjjjjjjjjjdddddddddddddddddddddddddddddddddddddddddddddda +acccccccccccccccccccccccccjjjjjjjjjjjjjjkkkkkkkkkkkkkkkkkkkkkqqkmkkkkkkkkkkjjjjjcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccdcjjjjjjjjkkkjjkkkjjjjjjljqqjjjjjjjdddddddddddddddddddddddddddddddddddddddddddddddddda +accccccccccccccccccccccccccccccccjjjjjjjjjjjjjjjjjjjkkkkkkkkkkqkmkkkkkkkkkkkjjjjjjjjjjjcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccjjjjjkkkkkkkkkjjjjjjjjjjjhnoondddddddddddddddddddddddddddddddddddddddddddddddddddddddda +accccccccccccccccccccccccccccccccccccccjjjjjjjjjjjjjjjjjjjjjjqqjljjjjjjjjkkkkkkkjjjjjjjjjjjjjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccjjjjjjjjkkkkkkkkkjjjjjjjjjddddhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda +accccccccccccccccccccccccccccccccccccccccccccjjjjjjjjjjjjjjjjqqjljjjjjjjjjjkkkkkkkkkkkkjjjjjjjjjccjjjccccjjjcccccccccccccccccccccccccccccccccccccccccccccccccjjjjjjjjjjjkkkkkkkjjjjjjjjjjddddddddhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda +accccccccccccccccccccccccccccccccccccccccccccccccccjjjjjjjjcnoongjjjjjjjjjjjjkkkkkkkkkkkkkkkkjjjjjjjjjjjjjjjjjjjjjccccccccccccccccccccccccccccccccccccccccjjjjjjkkkjjjjjkkjjjjjjjjjjcccddddddddddhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda acccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccgcccccccjjjjjjjjkkkkkkkkkkkkkkkkjjkkkjjjjkkkjjjjjjjjjjjjcccccjjjjccccccccccccccccccccccjjjjjjkkkkkjjjjjjjjjjjjjcdcccccccdddddddddhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda acccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccgccccccccccjjjjjjjjjjjjjjjjjkkkjjjjkkkjjjkkkkkkkkkjjjjjjjjjjjjjjjjjjjjjjjjccccccjjjjjjjjjjkkkkkkjjjjjjjjjjccccccddccccccccddcddddhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda acccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccgccccccccccccjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjkkkkkkkjjjjjkkkkkkkkkjjjjjjjjjjjjjjjjjjjjjjkkkkkkkjjjjjjcccccccccccccdcccccccccddddddhdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddda diff --git a/maps/submaps/cave_submaps/Mineshaft1.dmm b/maps/submaps/cave_submaps/Mineshaft1.dmm index 01a639074b1..8d1d499d567 100644 --- a/maps/submaps/cave_submaps/Mineshaft1.dmm +++ b/maps/submaps/cave_submaps/Mineshaft1.dmm @@ -22,7 +22,7 @@ "v" = (/obj/structure/table/standard,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/turf/simulated/floor,/area/submap/cave/AMine1) "w" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor,/area/submap/cave/AMine1) "x" = (/turf/simulated/floor,/area/submap/cave/AMine1) -"y" = (/obj/machinery/power/apc{pixel_x = 31},/turf/simulated/floor,/area/submap/cave/AMine1) +"y" = (/obj/machinery/power/apc{operating = 0; pixel_x = 31},/turf/simulated/floor,/area/submap/cave/AMine1) "z" = (/obj/structure/ore_box,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1) "A" = (/obj/machinery/light/small{dir = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/AMine1) "B" = (/obj/structure/closet/crate/trashcart,/turf/simulated/floor,/area/submap/cave/AMine1) diff --git a/maps/submaps/cave_submaps/Scave1.dmm b/maps/submaps/cave_submaps/Scave1.dmm index 59872d153ae..075cf84f004 100644 --- a/maps/submaps/cave_submaps/Scave1.dmm +++ b/maps/submaps/cave_submaps/Scave1.dmm @@ -2,20 +2,18 @@ "b" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/cave/Scave1) "c" = (/obj/effect/spider/stickyweb,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "d" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"e" = (/obj/effect/spider/spiderling,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"e" = (/obj/effect/spider/spiderling/frost,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "f" = (/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "g" = (/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c100,/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "h" = (/obj/item/weapon/grenade/spawnergrenade/spider,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"i" = (/mob/living/simple_animal/hostile/giant_spider/hunter,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"i" = (/mob/living/simple_animal/hostile/giant_spider/frost,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) "j" = (/obj/random/toolbox,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"k" = (/mob/living/simple_animal/hostile/giant_spider,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"l" = (/mob/living/simple_animal/hostile/giant_spider/nurse,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"m" = (/obj/effect/decal/mecha_wreckage/ripley,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"n" = (/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"o" = (/obj/item/device/flashlight,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"p" = (/obj/effect/spider/stickyweb,/obj/effect/spider/stickyweb,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"q" = (/obj/effect/spider/stickyweb,/mob/living/simple_animal/hostile/giant_spider/hunter,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) -"r" = (/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"k" = (/obj/effect/decal/mecha_wreckage/ripley,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"l" = (/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"m" = (/obj/item/device/flashlight,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"n" = (/obj/effect/spider/stickyweb,/obj/effect/spider/stickyweb,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"o" = (/obj/effect/spider/stickyweb,/mob/living/simple_animal/hostile/giant_spider/frost,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) +"p" = (/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/Scave1) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -28,47 +26,21 @@ aadbbfddddcbbdedbbbbbddddddbaa aadbbgfbbdddddddbccedddbdedbba aabbbbbbbddcdddddddddddbhibbaa aabbbbbbdddbbbjcddddddbbbbbbaa -aabbbbbcdkdbbbbbbcdkddcbbbbaaa +aabbbbbcdidbbbbbbcdiddcbbbbaaa aabbbbbcddcbbbbbbbddddcbbbaaaa -aabbbbbbidcbbbbbbbdlddcbbbaaaa -aabbbbbbdddbbbbbbmddddcbbbaaaa -aabbbbbbdcdbbbbbbnddddcbbbaaaa -aabbbbbbdddbbbbbbcddldcbbbaaaa +aabbbbbbidcbbbbbbbdiddcbbbaaaa +aabbbbbbdddbbbbbbkddddcbbbaaaa +aabbbbbbdcdbbbbbblddddcbbbaaaa +aabbbbbbdddbbbbbbcddidcbbbaaaa aadbbbbbddibbbbbbbccdddbbbaaaa -aaodbbbbddbbbbbbbbbkcddbbbaaaa +aamdbbbbddbbbbbbbbbicddbbbaaaa aaddbbbbdddbbbbbbbbbbddbbdaaaa -aadddpddddddbbbbbbbbdedbbdaaaa -aaddppcddddddqbcdddddcbbbdaaaa -aardbbbbbdddddddddddcbbbbdaaaa +aadddnddedddbbbbbbbbdedbbdaaaa +aaddnncddddddobcdddddcbbbdaaaa +aapdbbbbbdddddddddddcbbbbdaaaa aabbbbbbbbcdddcdddddcbbbbbaaaa aabbbbbbbbbbbbbbbibbbbbbbbaaaa aabbbbbbbbbbbbbbbbbbbbbbbbaaaa aaaaabbbbabbbbbbbaabbbbbbaaaaa -abbccccbbbbccbbbbbbbbbbcccbaaa -aabccbbbdbbccbbbbcccbbbbebbbaa -aabbbbefeebbbdddbcccbeeefeebaa -aaebbgeeeehbbefebbbbbeeeeeebaa -aaebbigbbeeeeeeebddfeeebefebba -aabbbbbbbeedeeeeeeeeeeebjkbbaa -aabcccbbeeecccldeeeeeebbbbbbaa -aabcccbdemeccccccdemeedbbbbaaa -aabcccbdeedccccccceeeedbcbaaaa -aabcccbbkedccccccceneedbcbaaaa -aabccccbeeeccccccoeeeedbcbaaaa -aabccccbpdeccccccqeeeedbcbaaaa -aabbbccbpeeccccccdeenedbcbaaaa -aaebbccbpekcccccccddeeebcbaaaa -aarebccbppcccccccccmdeebbbaaaa -aaeebbbbpppcccccccccceebbeaaaa -aaeeepeeeeeeccccccccefebbeaaaa -aaeeppdeeeeeeqcdeeeeedbbbeaaaa -aarebbbbbeeeeeeeeeeedbbbbeaaaa -aabbbbccbbdeeedeeeeedbccbbaaaa -aabbcccccbbbbbbbbkbbbbccbbaaaa -aabbbbccbbbbbbccbbbbbcccbbaaaa -aaaaabbbbabbbbccbaabbbbbbaaaaa -aaaaabbbbaabaabbbaaabbabaaaaaa -aaaaaaabbaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} diff --git a/maps/submaps/surface_submaps/DJOutpost1.dmm b/maps/submaps/surface_submaps/DJOutpost1.dmm index 15bbc8ae8bd..93570d4afa8 100644 --- a/maps/submaps/surface_submaps/DJOutpost1.dmm +++ b/maps/submaps/surface_submaps/DJOutpost1.dmm @@ -1,7 +1,7 @@ "a" = (/turf/template_noop,/area/template_noop) "b" = (/turf/simulated/wall/wood,/area/submap/DJOutpost1) -"c" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{tag = "icon-shardmedium"; icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"d" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"c" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/obj/item/weapon/material/shard{tag = "icon-shardmedium"; icon_state = "shardmedium"},/obj/item/stack/rods,/turf/simulated/floor,/area/submap/DJOutpost1) +"d" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor,/area/submap/DJOutpost1) "e" = (/turf/simulated/floor/wood,/area/submap/DJOutpost1) "f" = (/obj/machinery/telecomms/relay/preset/ruskie,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "g" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/wood,/area/submap/DJOutpost1) @@ -10,47 +10,51 @@ "j" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/item/device/radio/headset/heads/captain/alt{desc = "A headset belonging to a Sif Free Radio DJ. SFR, best tunes in the wilderness."; name = "SFR headset"},/obj/item/weapon/material/hatchet/tacknife/combatknife,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "k" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "l" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{tag = "icon-intercom (WEST)"; icon_state = "intercom"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"m" = (/obj/machinery/computer/message_monitor,/obj/item/weapon/paper/monitorkey,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"n" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"o" = (/obj/effect/decal/remains,/obj/item/clothing/under/dress/blacktango,/obj/effect/decal/cleanable/blood,/obj/item/device/universal_translator/ear,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"p" = (/obj/structure/bed/chair/office/dark{tag = "icon-officechair_dark (WEST)"; icon_state = "officechair_dark"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"q" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"r" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"s" = (/obj/structure/bed/chair/wood{tag = "icon-wooden_chair (WEST)"; icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"t" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/vir,/obj/item/weapon/book/manual/excavation,/obj/item/weapon/book/manual/engineering_construction,/obj/item/weapon/storage/bible,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"u" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"v" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/phone,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"w" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom,/obj/item/device/multitool,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"x" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio,/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; pixel_x = 24},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"y" = (/obj/machinery/biogenerator,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"z" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"A" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/seed_extractor,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"B" = (/obj/structure/bed/chair/wood{tag = "icon-wooden_chair (NORTH)"; icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"C" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"D" = (/obj/structure/table/woodentable,/obj/item/weapon/material/hatchet,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"E" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"F" = (/obj/structure/table/rack,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"G" = (/obj/machinery/light/flamp,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"H" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 15; tag = "icon-sink (EAST)"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"I" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"J" = (/obj/structure/table/rack,/obj/item/ammo_magazine/clip/c545/hunter,/obj/item/weapon/gun/projectile/shotgun/pump/rifle,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"K" = (/obj/structure/table/rack,/obj/item/device/gps/on{gps_tag = "Sif Free Radio"},/obj/item/device/flashlight/lantern,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"L" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"m" = (/obj/machinery/computer/message_monitor,/obj/item/weapon/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"n" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor,/area/submap/DJOutpost1) +"o" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/submap/DJOutpost1) +"p" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"q" = (/obj/effect/decal/remains,/obj/item/clothing/under/dress/blacktango,/obj/effect/decal/cleanable/blood,/obj/item/device/universal_translator/ear,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"r" = (/obj/structure/bed/chair/office/dark{tag = "icon-officechair_dark (WEST)"; icon_state = "officechair_dark"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"s" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/bed/chair/office/dark{dir = 1},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"t" = (/obj/effect/overlay/snow/floor,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/closet/crate,/obj/item/stack/material/phoron{amount = 25},/turf/simulated/floor,/area/submap/DJOutpost1) +"u" = (/obj/structure/table/woodentable,/obj/item/trash/candle,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"v" = (/obj/structure/bed/chair/wood{tag = "icon-wooden_chair (WEST)"; icon_state = "wooden_chair"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"w" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/vir,/obj/item/weapon/book/manual/excavation,/obj/item/weapon/book/manual/engineering_construction,/obj/item/weapon/storage/bible,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"x" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"y" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/phone,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"z" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom,/obj/item/device/multitool,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"A" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio,/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 4; environ = 1; equipment = 1; lighting = 1; locked = 0; name = "Sif Free Radio APC"; pixel_x = 24},/obj/structure/cable/yellow,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"B" = (/obj/effect/overlay/snow/floor,/obj/machinery/power/port_gen/pacman,/obj/structure/cable/yellow,/turf/simulated/floor,/area/submap/DJOutpost1) +"C" = (/obj/machinery/biogenerator,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"D" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/unajerky,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"E" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/seed_extractor,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"F" = (/obj/structure/bed/chair/wood{tag = "icon-wooden_chair (NORTH)"; icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"G" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"H" = (/obj/structure/table/woodentable,/obj/item/weapon/material/hatchet,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"I" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"J" = (/obj/structure/table/rack,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"K" = (/obj/machinery/light/flamp,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"L" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 15; tag = "icon-sink (EAST)"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"M" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/clown,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"N" = (/obj/structure/table/rack,/obj/item/ammo_magazine/clip/c545/hunter,/obj/item/weapon/gun/projectile/shotgun/pump/rifle,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"O" = (/obj/structure/table/rack,/obj/item/device/gps/on{gps_tag = "Sif Free Radio"},/obj/item/device/flashlight/lantern,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"P" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/wood,/area/submap/DJOutpost1) (1,1,1) = {" -aaaaaaaaaaaaaaa -aaabcbbbbbdbaaa -aabbeebfgfgbbaa -abbehebeeeeibba -adehjekeeelemda -abneeobeeelpqba -abrsetbeeuvwxba -abbbbbbkbbbbbba -abneeeeeeeeeyba -abzeeeeeeeeeAba -adBeebbCbbeeDda -abbEebFeGbeHbba -aabbIbJeKbLbbaa -aaabdbbCbbdbaaa -aaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaa +aaabcbbbbbdbaaaa +aabbeebfgfgbbaaa +abbehebeeeeibbaa +adehjekeeelemnoa +abpeeqbeeelrsbta +abuvewbeexyzAbBa +abbbbbbkbbbbbbaa +abpeeeeeeeeeCbaa +abDeeeeeeeeeEbaa +adFeebbGbbeeHdaa +abbIebJeKbeLbbaa +aabbMbNeObPbbaaa +aaabdbbGbbdbaaaa +aaaaaaaaaaaaaaaa "} diff --git a/maps/submaps/surface_submaps/Lab1.dmm b/maps/submaps/surface_submaps/Lab1.dmm index f19ff17e2ae..1050b495033 100644 --- a/maps/submaps/surface_submaps/Lab1.dmm +++ b/maps/submaps/surface_submaps/Lab1.dmm @@ -18,7 +18,7 @@ "r" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "s" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "t" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) -"u" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 8; name = "Unknown APC"; pixel_x = -24},/turf/simulated/wall/r_wall,/area/submap/Lab1) +"u" = (/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/hyper; dir = 8; name = "Unknown APC"; operating = 0; pixel_x = -24},/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "v" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "w" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) "x" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor/tiled/steel_dirty,/area/submap/Lab1) @@ -46,7 +46,7 @@ acghhihhjhhjhhihhhca ackhgcdfcllcdfchhhca acmhncbbchhcbbcohpca acqhrcbbcshcbbcthtca -achhhubbchhcbbcvhwca +acuhhcbbchhcbbcvhwca acdefcbbcllcbbcdefca abbbbbbbbbbbbbbbbbba abbbbbbbbbbbbbbbbbba diff --git a/maps/submaps/surface_submaps/forest_areas.dm b/maps/submaps/surface_submaps/forest_areas.dm index 2a7972b8d7b..d082484ef55 100644 --- a/maps/submaps/surface_submaps/forest_areas.dm +++ b/maps/submaps/surface_submaps/forest_areas.dm @@ -46,6 +46,7 @@ /area/submap/Blackshuttledown name = "BSD" + requires_power = FALSE /area/submap/Cragzone1 name = "Craggy1"