diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 390bd8676e..7dc93d9640 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -4,34 +4,27 @@ /turf/unsimulated/beach/sand, /area/beach) "ab" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_l" +/obj/structure/window/reinforced/holowindow{ + dir = 8 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry{ - dir = 1 +/obj/structure/flora/pottedplant{ + icon_state = "plant-10" }, -/area/shuttle/supply) +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_courtroom) "ac" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry{ - dir = 1 +/obj/structure/window/reinforced/holowindow{ + dir = 8 }, -/area/shuttle/supply) +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_emptycourt) "ad" = ( -/obj/structure/shuttle/engine/propulsion, -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - landmark_tag = "supply_cc"; - name = "Centcom Supply Depot" +/obj/machinery/door/window/holowindoor{ + dir = 8 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry{ - dir = 1 - }, -/area/shuttle/supply) +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_courtroom) "ae" = ( /turf/unsimulated/mineral/virgo3b, /area/space) @@ -40,14 +33,31 @@ /turf/unsimulated/wall, /area/centcom/simulated/terminal) "ag" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_r" +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry{ - dir = 1 +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_picnicarea) +"ah" = ( +/obj/machinery/door/window/holowindoor{ + dir = 1; + name = "Jury Box" }, -/area/shuttle/supply) +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) "ai" = ( /obj/machinery/door/blast/regular{ dir = 4 @@ -60,6 +70,41 @@ }, /turf/unsimulated/wall, /area/centcom/simulated/terminal) +"ak" = ( +/obj/structure/table/woodentable/holotable, +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/obj/structure/window/reinforced/holowindow{ + dir = 1 + }, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_courtroom) +"al" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_courtroom) +"am" = ( +/obj/machinery/door/window/holowindoor{ + dir = 8; + name = "Red Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_emptycourt) +"an" = ( +/obj/structure/holostool, +/turf/simulated/floor/holofloor/desert, +/area/holodeck/source_picnicarea) +"ao" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 9 + }, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_picnicarea) "ap" = ( /turf/space, /area/space) @@ -74,6 +119,145 @@ /obj/structure/window/reinforced, /turf/unsimulated/wall, /area/space) +"at" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_picnicarea) +"au" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet/corners{ + icon_state = "carpet_corners"; + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) +"av" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) +"aw" = ( +/obj/structure/table/woodentable/holotable, +/obj/structure/window/reinforced/holowindow{ + dir = 4 + }, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_courtroom) +"ax" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_picnicarea) +"ay" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) +"az" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) +"aA" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 10 + }, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_picnicarea) +"aB" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 + }, +/turf/simulated/floor/holofloor/grass, +/area/holodeck/source_picnicarea) +"aC" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 8; + icon_state = "right" + }, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_courtroom) +"aD" = ( +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Green Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_emptycourt) +"aE" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) +"aF" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_courtroom) +"aG" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_basketball) +"aH" = ( +/obj/structure/window/reinforced/holowindow{ + dir = 8 + }, +/obj/structure/holostool, +/turf/simulated/floor/holofloor/tiled, +/area/holodeck/source_thunderdomecourt) "aI" = ( /obj/structure/window/reinforced{ dir = 4 @@ -119,14 +303,12 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_courtroom) "aR" = ( -/obj/structure/window/reinforced/holowindow{ - dir = 4 +/obj/machinery/door/window/holowindoor{ + dir = 8; + name = "Red Team" }, -/obj/structure/flora/pottedplant{ - icon_state = "plant-10" - }, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_courtroom) +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) "aS" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, @@ -145,12 +327,12 @@ /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) "aX" = ( -/obj/structure/holostool, -/obj/structure/window/reinforced/holowindow{ - dir = 4 +/obj/machinery/door/window/holowindoor{ + dir = 8; + name = "Red Team" }, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_emptycourt) +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) "aY" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 @@ -194,9 +376,14 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) "bh" = ( -/obj/machinery/door/window/holowindoor, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_courtroom) +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Green Team" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_basketball) "bi" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) @@ -240,32 +427,34 @@ /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) "br" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 8 +/obj/machinery/door/window/holowindoor{ + base_state = "right"; + dir = 8; + icon_state = "right"; + name = "Green Team" }, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_thunderdomecourt) "bs" = ( -/obj/structure/window/reinforced/holowindow{ - dir = 4 +/obj/structure/shuttle/engine/propulsion{ + icon_state = "burst_l" }, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_courtroom) +/turf/space, +/turf/simulated/shuttle/plating/airless/carry{ + dir = 1 + }, +/area/shuttle/supply) "bt" = ( /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) "bu" = ( -/obj/structure/window/reinforced/holowindow{ +/obj/structure/shuttle/engine/propulsion, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/obj/structure/window/reinforced/holowindow{ - dir = 8 - }, -/obj/structure/table/woodentable/holotable, -/turf/simulated/floor/holofloor/wood, -/area/holodeck/source_courtroom) +/area/shuttle/supply) "bv" = ( /obj/structure/window/reinforced/holowindow{ dir = 1 @@ -274,33 +463,27 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) "bw" = ( -/obj/machinery/door/window/holowindoor{ - dir = 1; - name = "Jury Box" +/obj/structure/shuttle/engine/propulsion, +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + landmark_tag = "supply_cc"; + name = "Centcom Supply Depot" }, -/obj/effect/floor_decal/carpet{ - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - dir = 4 - }, -/obj/effect/floor_decal/carpet{ +/turf/space, +/turf/simulated/shuttle/plating/airless/carry{ dir = 1 }, -/obj/effect/floor_decal/carpet{ - dir = 9 - }, -/obj/effect/floor_decal/carpet{ - dir = 5 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_courtroom) +/area/shuttle/supply) "bx" = ( -/obj/machinery/door/window/holowindoor{ - name = "Red Team" +/obj/structure/shuttle/engine/propulsion{ + icon_state = "burst_r" }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/holodeck/source_emptycourt) +/turf/space, +/turf/simulated/shuttle/plating/airless/carry{ + dir = 1 + }, +/area/shuttle/supply) "by" = ( /obj/machinery/light{ dir = 8; @@ -315,40 +498,9 @@ }, /turf/simulated/shuttle/floor, /area/shuttle/supply) -"bA" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/effect/floor_decal/spline/fancy/wood, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) "bB" = ( /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) -"bC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/holostool, -/turf/simulated/floor/holofloor/desert, -/area/holodeck/source_picnicarea) -"bD" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/holofloor/desert, -/area/holodeck/source_picnicarea) -"bE" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) -"bF" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) "bG" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -414,40 +566,6 @@ /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) -"bN" = ( -/obj/structure/window/reinforced/holowindow{ - dir = 8 - }, -/obj/structure/table/woodentable/holotable, -/turf/simulated/floor/holofloor/wood, -/area/holodeck/source_courtroom) -"bO" = ( -/obj/structure/bed/chair/holochair{ - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - dir = 1 - }, -/obj/effect/floor_decal/carpet{ - dir = 9 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_courtroom) -"bP" = ( -/obj/structure/bed/chair/holochair{ - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - dir = 4 - }, -/obj/effect/floor_decal/carpet/corners{ - dir = 9 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_courtroom) "bQ" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -473,13 +591,6 @@ /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) -"bT" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) "bU" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -559,24 +670,6 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) -"cd" = ( -/obj/structure/bed/chair/holochair{ - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - dir = 8 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_courtroom) -"ce" = ( -/obj/structure/bed/chair/holochair{ - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - dir = 4 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_courtroom) "cs" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -663,16 +756,6 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) -"cR" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) "cS" = ( /obj/structure/bed/chair/holochair{ dir = 1 @@ -704,20 +787,6 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) -"db" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 4 - }, -/turf/simulated/floor/holofloor/grass, -/area/holodeck/source_picnicarea) -"dc" = ( -/obj/machinery/door/window/holowindoor{ - base_state = "right"; - icon_state = "right" - }, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_courtroom) "dd" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -730,14 +799,6 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) -"df" = ( -/obj/machinery/door/window/holowindoor{ - base_state = "right"; - icon_state = "right"; - name = "Green Team" - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/holodeck/source_emptycourt) "dh" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -802,32 +863,6 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) -"dn" = ( -/obj/structure/bed/chair/holochair{ - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - dir = 8 - }, -/obj/effect/floor_decal/carpet, -/obj/effect/floor_decal/carpet{ - dir = 10 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_courtroom) -"do" = ( -/obj/structure/bed/chair/holochair{ - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - dir = 4 - }, -/obj/effect/floor_decal/carpet, -/obj/effect/floor_decal/carpet{ - dir = 6 - }, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_courtroom) "dq" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" @@ -941,13 +976,6 @@ /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) -"dL" = ( -/obj/structure/holostool, -/obj/structure/window/reinforced/holowindow{ - dir = 4 - }, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_basketball) "dM" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 @@ -983,13 +1011,6 @@ /obj/structure/holostool, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) -"dT" = ( -/obj/structure/holostool, -/obj/structure/window/reinforced/holowindow{ - dir = 4 - }, -/turf/simulated/floor/holofloor/tiled, -/area/holodeck/source_thunderdomecourt) "dU" = ( /obj/structure/table/holotable, /obj/machinery/readybutton{ @@ -1124,12 +1145,6 @@ /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_meetinghall) -"er" = ( -/obj/machinery/door/window/holowindoor{ - name = "Red Team" - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/holodeck/source_basketball) "es" = ( /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/holofloor/beach/sand, @@ -1139,12 +1154,6 @@ /obj/effect/overlay/coconut, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) -"eu" = ( -/obj/machinery/door/window/holowindoor{ - name = "Red Team" - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/holodeck/source_thunderdomecourt) "ev" = ( /obj/machinery/door/window/holowindoor{ base_state = "right"; @@ -1443,14 +1452,6 @@ dir = 8 }, /area/holodeck/source_meetinghall) -"fI" = ( -/obj/machinery/door/window/holowindoor{ - base_state = "right"; - icon_state = "right"; - name = "Green Team" - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/holodeck/source_basketball) "fJ" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -1462,14 +1463,6 @@ icon_state = "beach" }, /area/holodeck/source_beach) -"fL" = ( -/obj/machinery/door/window/holowindoor{ - base_state = "right"; - icon_state = "right"; - name = "Green Team" - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/holodeck/source_thunderdomecourt) "fM" = ( /obj/structure/window/reinforced/holowindow{ dir = 1 @@ -14766,10 +14759,10 @@ as aM be bf -bp -bD -bD -cP +be +be +be +be bf be aM @@ -14908,10 +14901,10 @@ as aN bf be -bq -bD -bD -cQ +bf +bf +bf +bf be bf aN @@ -15050,10 +15043,10 @@ as aM be bo -bA -bD -bD -cR +bU +bU +bU +bU da be aM @@ -15193,8 +15186,8 @@ aN bf bp bB -bD -bD +bB +bB bB cP bf @@ -15334,10 +15327,10 @@ as aM be bq -bC +an bS bS -bC +an cQ be aM @@ -15476,10 +15469,10 @@ as aM bf bp -bC +an bS bS -bC +an cP bf aM @@ -15617,12 +15610,12 @@ ap as aN be -bq -bD -bD -bD -bD -cQ +ag +bB +bB +bB +bB +at be aN dA @@ -15759,12 +15752,12 @@ ap as aM bf -br -bE -bT -bT -bE -db +bB +bB +ao +aA +bB +bB bf aM dA @@ -15901,12 +15894,12 @@ ap as aN be -bf -be -bf -bf -be -bf +bB +ao +ax +aB +aA +bB bf aN dA @@ -16043,12 +16036,12 @@ ap as aM bf -be -bF +bB +at bU bU -bF -be +ag +bB be aM dA @@ -16336,16 +16329,16 @@ bV bV dq dA +dI dH dH -dH -eK -eU -eU -eK -eK -eK -eK +eL +eL +eL +eL +eL +eL +eL fZ ap ap @@ -16482,11 +16475,11 @@ dH dH dH eK -eV -fn -fn -fn -fO +eK +eK +eK +eK +eK eK fZ ap @@ -16621,14 +16614,14 @@ dj bV dA dH -ee -eq +dH +dH eK -eW -fo -fo -fo -fP +eV +fn +fn +fn +fO eK fZ ap @@ -16763,7 +16756,7 @@ dk bV dA dH -ef +ee eq eK eW @@ -17189,7 +17182,7 @@ dk bV dA dH -eg +ef eq eK eW @@ -17331,14 +17324,14 @@ dl bV dA dH -dH -dH +eg +eq eK -eX -fp -fp -fH -fQ +eW +fo +fo +fo +fP eK fZ ap @@ -17476,11 +17469,11 @@ dH dH dH eK -eK -eK -eK -eK -eK +eX +fp +fp +fH +fQ eK fZ ap @@ -17614,16 +17607,16 @@ bZ dm dr dA -dI dH dH -eL -eL -eL -eL -eL -eL -eL +dH +eK +eU +eU +eK +eK +eK +eK fZ ap ap @@ -17887,27 +17880,27 @@ ap "} (97,1,1) = {" as -aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ +aS +bi +ah +au +ay +ay +ay +ay +aE +aS dB -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ -dJ +dM +eh +eh +eh +eY +fq +fz +fz +fz +fS fZ ap ap @@ -18029,27 +18022,27 @@ ap "} (98,1,1) = {" as -aR -bh -bs -bs -bs -bs -bs -dc -bs -aR +aS +bi +bv +av +az +az +az +az +aF +aS dB -dK -dK -dJ -dK -dK -dK -dK -dJ -dK -dK +dN +ei +ei +ei +eZ +fr +ei +ei +ei +fJ fZ ap ap @@ -18173,25 +18166,25 @@ ap as aS bi -bi -bI -ca -cw -cS -dd -cS -ds +ak +aw +aw +aw +aw +aw +aw +aw dB -dL -dL -er -dL -dL -dL -dL -fI -dL -dL +dM +eh +dN +ei +eZ +fr +ei +fJ +fz +fS fZ ap ap @@ -18315,25 +18308,25 @@ ap as aS bi -aS -bJ -cb -cx -cT -cy -cT -dt +bi +bI +ca +cw +cS +dd +cS +ds dB -dM -eh -eh -eh -eY -fq -fz -fz -fz -fS +dO +ei +dN +ei +fa +fr +ei +fJ +ei +fT fZ ap ap @@ -18457,25 +18450,25 @@ ap as aS bi -bt -bK +aS +bJ cb -cy -cy +cx +cT cy cT dt dB +dP +ej dN ei -ei -ei eZ fr ei -ei -ei fJ +fA +fU fZ ap ap @@ -18599,25 +18592,25 @@ ap as aS bi -aS -bL +bt +bK cb -cx -cT +cy +cy cy cT dt dB -dM -eh dN ei +ei +ei eZ fr ei +ei +ei fJ -fz -fS fZ ap ap @@ -18741,25 +18734,25 @@ ap as aS bi -bi -bM -cc -cz -cU -de -cU -du +aS +bL +cb +cx +cT +cy +cT +dt dB -dO -ei -dN -ei -fa -fr -ei -fJ -ei -fT +dP +ej +ej +ej +fb +fs +fA +fA +fA +fU fZ ap ap @@ -18883,25 +18876,25 @@ ap as aS bi -bu -bN -bN -bN -bN -bN -bN -bN +bi +bM +cc +cz +cU +de +cU +du dB -dP -ej -dN -ei -eZ -fr -ei -fJ -fA -fU +aG +aG +aR +aG +aG +aG +aG +bh +aG +aG fZ ap ap @@ -19023,27 +19016,27 @@ ap "} (105,1,1) = {" as -aS -bi -bv -bO -cd -cd -cd -cd -dn -aS +ab +ad +al +al +al +al +al +aC +al +ab dB -dN -ei -ei -ei -eZ -fr -ei -ei -ei -fJ +dK +dK +dJ +dK +dK +dK +dK +dJ +dK +dK fZ aq aq @@ -19165,27 +19158,27 @@ ap "} (106,1,1) = {" as -aS -bi -bw -bP -ce -ce -ce -ce -do -aS +aQ +aQ +aQ +aQ +aQ +aQ +aQ +aQ +aQ +aQ dB -dP -ej -ej -ej -fb -fs -fA -fA -fA -fU +dJ +dJ +dJ +dJ +dJ +dJ +dJ +dJ +dJ +dJ fZ aq uc @@ -20051,7 +20044,7 @@ di by bc bc -ab +bs aq ae ae @@ -20193,7 +20186,7 @@ di bn bn dE -ac +bu aq ae ae @@ -20335,7 +20328,7 @@ di bn bn dE -ad +bw aq ae ae @@ -20477,7 +20470,7 @@ bn bn bn dE -ac +bu aq ae ae @@ -20619,7 +20612,7 @@ bn bz bc bc -ag +bx aq ae ae @@ -21022,16 +21015,16 @@ aU aU aU dB -dR -dR -dR -dR -dR -dR -dR -dR -dR -dR +dU +el +el +el +fd +ft +fB +fB +fB +fV fZ aI aI @@ -21164,16 +21157,16 @@ aU aU aU dB -dS -dS -dR -dS -dS -dS -dS -dR -dS -dS +dV +em +em +em +fe +fu +em +em +em +fW dB ga ga @@ -21306,16 +21299,16 @@ aU aU aU dB -dT -dT -eu -dT -dT -dT -dT -fL -dT -dT +dV +em +em +em +fe +fu +em +em +em +fW dB gb ga @@ -21448,16 +21441,16 @@ aU aU aU dB -dU -el -el -el -fd -ft -fB -fB -fB -fV +dV +em +em +em +fe +fu +em +em +em +fW dB gc ga @@ -21874,16 +21867,16 @@ aU aU aU dB -dV -em -em -em -fe -fu -em -em -em -fW +dW +en +en +en +ff +fv +fC +fC +fC +fX dB gc ga @@ -22016,16 +22009,16 @@ aU aU aU dB -dV -em -em -em -fe -fu -em -em -em -fW +aH +aH +aX +aH +aH +aH +aH +br +aH +aH fZ aL aL @@ -22158,16 +22151,16 @@ aU aU aU dB -dV -em -em -em -fe -fu -em -em -em -fW +dS +dS +dR +dS +dS +dS +dS +dR +dS +dS dB ge gl @@ -22300,16 +22293,16 @@ aU aU aU dB -dW -en -en -en -ff -fv -fC -fC -fC -fX +dR +dR +dR +dR +dR +dR +dR +dR +dR +dR dB gf gl @@ -22573,16 +22566,16 @@ ap "} (130,1,1) = {" as -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV +aY +bk +bk +bk +bk +cA +cA +cA +cA +dv dB dX dY @@ -22715,16 +22708,16 @@ ap "} (131,1,1) = {" as -aW -aW -aV -aW -aW -aW -aW -aV -aW -aW +aZ +bl +bl +bl +bl +bl +bl +bl +bl +dw dB dX dY @@ -22857,16 +22850,16 @@ ap "} (132,1,1) = {" as -aX -aX -bx -aX -aX -aX -aX -df -aX -aX +aZ +bl +bl +bl +bl +bl +bl +bl +bl +dw dB dY dY @@ -22999,16 +22992,16 @@ ap "} (133,1,1) = {" as -aY -bk -bk -bk -bk -cA -cA -cA -cA -dv +aZ +bl +bl +bl +bl +bl +bl +bl +bl +dw dB dY dY @@ -23425,16 +23418,16 @@ ap "} (136,1,1) = {" as -aZ -bl -bl -bl -bl -bl -bl -bl -bl -dw +ba +bm +bm +bm +bm +cB +cB +cB +cB +dx dB dY eo @@ -23567,16 +23560,16 @@ ap "} (137,1,1) = {" as -aZ -bl -bl -bl -bl -bl -bl -bl -bl -dw +ac +ac +am +ac +ac +ac +ac +aD +ac +ac dB dY dY @@ -23709,16 +23702,16 @@ ap "} (138,1,1) = {" as -aZ -bl -bl -bl -bl -bl -bl -bl -bl -dw +aW +aW +aV +aW +aW +aW +aW +aV +aW +aW dB dY dY @@ -23851,16 +23844,16 @@ ap "} (139,1,1) = {" as -ba -bm -bm -bm -bm -cB -cB -cB -cB -dx +aV +aV +aV +aV +aV +aV +aV +aV +aV +aV dB dY dY diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 344acf1a0c..91f682cce2 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -5708,17 +5708,28 @@ /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence) "ajN" = ( -/obj/structure/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) -"ajO" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "holodeck"; + name = "Holodeck Privacy Shutters"; + opacity = 0 + }, +/obj/structure/window/reinforced/polarized/full{ + id = "holodeck" + }, +/obj/structure/window/reinforced/polarized{ + dir = 1; + id = "holodeck" }, /turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) +/area/holodeck_control) +"ajO" = ( +/turf/simulated/wall, +/area/holodeck_control) "ajP" = ( /obj/structure/railing{ dir = 8 @@ -5764,14 +5775,25 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenence) "ajV" = ( -/obj/structure/catwalk, -/obj/machinery/alarm{ +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + density = 0; dir = 8; - pixel_x = 25; - pixel_y = 0 + icon_state = "shutter0"; + id = "holodeck"; + name = "Holodeck Privacy Shutters"; + opacity = 0 + }, +/obj/structure/window/reinforced/polarized/full{ + id = "holodeck" + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "holodeck" }, /turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) +/area/holodeck_control) "ajW" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall, @@ -6070,20 +6092,12 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenence) "akH" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/camera/network/outside{ + icon_state = "camera"; + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenence) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/holodeck_control) "akI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, @@ -6101,20 +6115,10 @@ /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence) "akL" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 +/turf/simulated/floor/reinforced{ + name = "Holodeck Projector Floor" }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 9 - }, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_one) +/area/holodeck/alphadeck) "akM" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -6128,9 +6132,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "akO" = ( -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/obj/machinery/camera/network/civilian, +/obj/structure/table/standard, +/obj/random/soap, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) "akP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloor/corner{ @@ -6186,9 +6199,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "akV" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_one) +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) "akW" = ( /obj/structure/window/reinforced{ dir = 4 @@ -6200,15 +6218,24 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "akY" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_one) +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) "akZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_one) +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) "ala" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -22840,6 +22867,18 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) +"aLm" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) "aLn" = ( /obj/structure/grille, /obj/structure/railing{ @@ -32290,6 +32329,454 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) +"bcY" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) +"bcZ" = ( +/obj/machinery/computer/HolodeckControl{ + icon_state = "computer"; + dir = 4 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bda" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/techfloor/orange/corner{ + icon_state = "techfloororange_corners"; + dir = 8 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdb" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/holodeck_control) +"bdc" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) +"bdd" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) +"bde" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) +"bdf" = ( +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) +"bdg" = ( +/obj/machinery/door/airlock{ + name = "Holodeck" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdh" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 9 + }, +/obj/effect/floor_decal/techfloor/hole{ + icon_state = "techfloor_hole_left"; + dir = 4 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdi" = ( +/obj/effect/floor_decal/techfloor/orange/corner{ + icon_state = "techfloororange_corners"; + dir = 1 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdj" = ( +/obj/structure/catwalk, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25; + pixel_y = 0 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) +"bdk" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "holodeck" + }, +/turf/simulated/floor, +/area/holodeck_control) +"bdl" = ( +/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdm" = ( +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdn" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) +"bdo" = ( +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdp" = ( +/obj/machinery/button/windowtint{ + id = "holodeck"; + pixel_x = 35; + pixel_y = 0; + range = 14; + req_access = newlist() + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/alarm{ + alarm_id = "anomaly_testing"; + breach_detection = 0; + dir = 8; + frequency = 1439; + pixel_x = 22; + pixel_y = 0; + report_danger_level = 0 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdq" = ( +/obj/structure/table/standard, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/item/weapon/paper{ + info = "Brusies sustained in the holodeck can be healed simply by sleeping."; + name = "Holodeck Disclaimer" + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bds" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) +"bdt" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Holodeck" + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdw" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/techfloor/orange{ + dir = 10 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + icon_state = "techfloor_hole_right"; + dir = 4 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/techfloor/orange/corner{ + icon_state = "techfloororange_corners"; + dir = 8 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 28 + }, +/obj/effect/floor_decal/techfloor/orange/corner{ + icon_state = "techfloororange_corners"; + dir = 1 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdz" = ( +/obj/machinery/alarm{ + dir = 8; + pixel_x = 22; + pixel_y = 0 + }, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/structure/sink/kitchen{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdA" = ( +/obj/machinery/door/airlock/glass{ + name = "Holodeck" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/holodeck_control) +"bdB" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/public_garden_maintenence) +"bdC" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdE" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdH" = ( +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdJ" = ( +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdK" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdL" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) +"bdN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) "cGJ" = ( /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) @@ -35053,6 +35540,7 @@ aad aad aad aad +akH aad aad aad @@ -35061,8 +35549,7 @@ aad aad aad aad -aad -aad +akH aad aad aad @@ -35194,18 +35681,18 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aah -aah -aad -aad -aad +ajO +ajO +ajV +ajV +ajV +ajV +ajV +ajV +ajV +ajV +ajO +ajO aad aad aad @@ -35336,18 +35823,18 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aah -aah -aah -aah -aah +ajO +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO adK aeo aeo @@ -35478,18 +35965,18 @@ aad aad aad aad -aad -aad -aad -aad -aah -aah -aah -aah -aah -aah -aah -aah +ajN +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO adK aep adK @@ -35620,18 +36107,18 @@ aad aad aad aad -aad -aad -aad -aad -aah -aah -aah -aah -aah -aah -aah -aah +ajN +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO adK aep aep @@ -35762,18 +36249,18 @@ aad aad aad aad -aad -aad -aad -aad -aah -aah -aah -aah -aah -aah -aah -aah +ajN +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO adK adK adK @@ -35904,18 +36391,18 @@ aad aad aad aad -aad -aad -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +ajN +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO aah aah aah @@ -36046,18 +36533,18 @@ aad aad aad aad -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +ajN +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO aah aah aah @@ -36188,18 +36675,18 @@ aad aad aad aad -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +ajN +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO aah aah aah @@ -36330,18 +36817,18 @@ aad aad aad aad -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +ajN +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO aah aah aah @@ -36472,18 +36959,18 @@ aad aad aad aad -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +ajN +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO aah aah aah @@ -36614,18 +37101,18 @@ aad aad aad aad -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +ajO +akL +akL +akL +akL +akL +akL +akL +akL +akL +akL +ajO aah aah aah @@ -36756,18 +37243,18 @@ aad aad aad aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +ajO +akO +ajO +bdg +bdk +bdk +bdk +bdk +bdv +ajO +bdz +ajO aah aah aah @@ -36898,17 +37385,17 @@ aad aad aad aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -aah +ajO +ajO +ajO +bdh +bdl +bcZ +bdq +bdt +bdw +ajO +ajO ajS ajS ajS @@ -37041,17 +37528,17 @@ aad aad aah aah -aah -aah -aah -aah -aah -aah -aah -aah -aah -ajS -ajS +ajO +bda +bdi +bdm +bdo +bdp +bdu +bdx +bdy +bdA +bdC akU ali ajS @@ -37183,17 +37670,17 @@ aad aad aah aah -aah -aah -aah -aah -aah -aah -aah -aah -ajS -ajS -akL +ajO +bdb +ajO +ajO +ajO +ajO +ajO +ajO +ajO +ajO +bdD akM alj alw @@ -37325,9 +37812,9 @@ aad aah aah aah -aah -aah -aah +ajL +bdc +ajL aah aah aah @@ -37335,7 +37822,7 @@ aah ajS ajS akD -akM +bdE akN akN alx @@ -37468,7 +37955,7 @@ aad aah ajL ajL -ajL +bdd ajS ajS ajS @@ -37477,10 +37964,10 @@ ajS ajS akv akE -akN -akV -akN -aly +bdF +bdJ +bdM +bdN alN ame ajS @@ -37609,8 +38096,8 @@ aad aah aah ajL -ajM -ajM +akV +bde ajT ajY akb @@ -37619,7 +38106,7 @@ akk akq akw akE -akN +bdG akW akN aly @@ -37751,7 +38238,7 @@ aad aah aah ajL -ajN +akY ajM ajT ajY @@ -37761,7 +38248,7 @@ akk akr akx akE -akO +bdH akX akN aly @@ -37893,7 +38380,7 @@ aad aah aah ajL -ajM +akZ ajP ajS ajS @@ -37903,8 +38390,8 @@ ajS ajS aky akE -akN -akY +bdI +bdK akN aly alN @@ -38035,7 +38522,7 @@ aad aad aah ajL -ajO +aLm ajQ aah aah @@ -38046,7 +38533,7 @@ ajS ajS akF akP -akZ +bdL alk alz alO @@ -38177,7 +38664,7 @@ aad aad aah ajL -ajM +akZ ajR ajU ajZ @@ -38319,12 +38806,12 @@ aad aad aah ajL -ajM -ajN -ajV -ajM -ajM -ajM +bcY +bdf +bdj +bdn +bdn +bds akm aah aah @@ -38466,7 +38953,7 @@ ajL ajL akA ajL -ajM +akZ akm akn akn @@ -38608,7 +39095,7 @@ aah aah aah ajL -ajM +akZ ajR aki akz @@ -38750,11 +39237,11 @@ aah aah aah ajL -ajM -ajM -ajM -ajM -akH +bcY +bdn +bdn +bdn +bdB akS ald alo diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 2f1678a3ae..1a90187bee 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -32259,18 +32259,18 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab +acK +acK +acK +acK +acK +acK +acK aac aac -aab -aab -aab +acK +acK +acK aab acI acI @@ -32401,13 +32401,13 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab +acK +acK +acK +acK +acK +acK +acK aac aac aac @@ -32543,10 +32543,10 @@ aab aab aab aab -aab -aab -aab -aab +acK +acK +acK +acK aac aac aac @@ -32685,10 +32685,10 @@ aab aab aab aab -aab -aab -aab -aab +acK +acK +acK +acK aac aac aac @@ -32827,10 +32827,10 @@ aab aab aab aab -aab -aab -aab -aab +acK +acK +acK +acK aac aac aac @@ -32969,8 +32969,8 @@ aab aab aab aab -aab -aab +acK +acK aac aac aac diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 897a8641e0..021e131eb3 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -5053,15 +5053,10 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) "aiq" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/obj/machinery/portable_atmospherics/hydroponics/soil, +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) "air" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -5762,30 +5757,20 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "ajt" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/surface_three_hall) -"aju" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/public_garden_three) +"aju" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "ajv" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -6268,18 +6253,18 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) "akm" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 10 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/effect/floor_decal/corner/lime/bordercorner{ + icon_state = "bordercolorcorner"; + dir = 4 }, -/obj/machinery/light, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/public_garden_three) "akn" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -18004,13 +17989,6 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDg" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 9 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDh" = ( @@ -18023,13 +18001,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDi" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/obj/structure/window/reinforced, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 }, -/obj/machinery/portable_atmospherics/hydroponics/soil, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDj" = ( /obj/effect/floor_decal/borderfloor{ @@ -18041,42 +18020,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 1 - }, +/obj/structure/window/reinforced, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - icon_state = "bordercolorcorner"; - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 6 - }, -/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDm" = ( @@ -18139,20 +18093,11 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "aDr" = ( -/obj/structure/table/woodentable, -/obj/random/maintenance/clean, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) @@ -18273,20 +18218,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDB" = ( -/obj/structure/table/woodentable, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals6, -/obj/structure/window/reinforced{ - dir = 4 - }, +/obj/structure/table/woodentable, +/obj/random/maintenance/clean, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDC" = ( @@ -18320,42 +18260,36 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/lime/border{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lime/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/seed_storage/garden, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/public_garden_three) "aDG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/vending/hydronutrients, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals6, +/obj/structure/table/woodentable, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDH" = ( @@ -18383,46 +18317,33 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "aDJ" = ( -/obj/machinery/hologram/holopad, -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDK" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/lime/bordercorner, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 10 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/obj/machinery/portable_atmospherics/hydroponics/soil, +/obj/machinery/light, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18472,14 +18393,11 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) "aDR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 6 +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) @@ -27969,10 +27887,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "aUw" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether) +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aUx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28023,6 +27945,18 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/security/lobby) +"aUz" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aUA" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -28031,6 +27965,15 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) +"aUB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"aUC" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lime/bordercorner, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aUD" = ( /obj/structure/table/reinforced, /obj/item/weapon/reagent_containers/glass/beaker/large, @@ -28053,6 +27996,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"aUF" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/seed_storage/garden, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aUG" = ( /turf/simulated/floor/plating, /area/maintenance/lower/mining) @@ -28112,6 +28062,16 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"aUM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 6 + }, +/obj/machinery/vending/hydronutrients, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aUN" = ( /obj/machinery/firealarm{ dir = 8; @@ -28119,6 +28079,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) +"aUO" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/public_garden_three) "aUP" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -28267,6 +28233,12 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) +"aVb" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aVc" = ( /obj/machinery/alarm{ dir = 8; @@ -28275,6 +28247,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) +"aVd" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lime/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aVe" = ( /obj/structure/table/glass, /obj/item/weapon/storage/box/cups, @@ -28424,6 +28404,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"aVr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lime/bordercorner2{ + icon_state = "bordercolorcorner2"; + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aVs" = ( /obj/structure/lattice, /turf/simulated/open, @@ -28473,6 +28469,49 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) +"aVw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lime/bordercorner2, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"aVx" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +"aVy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Public Garden" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"aVz" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_three_hall) +"aVA" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aVB" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -28525,6 +28564,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) +"aVE" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aVF" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -28538,6 +28589,20 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +"aVG" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/camera/network/tether, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aVH" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -28571,6 +28636,16 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/common) +"aVK" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_three_hall) "aVL" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -28662,6 +28737,33 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) +"aVP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"aVQ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "aVR" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -28687,6 +28789,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) +"aVS" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether) "aVT" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals6, @@ -28695,6 +28802,13 @@ "aVU" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) +"aVV" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tourbus/engines) "aVW" = ( /obj/structure/bed/chair{ dir = 1 @@ -32280,13 +32394,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/engines) -"suC" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tourbus/engines) "sEq" = ( /obj/machinery/light/small, /obj/structure/cable{ @@ -37019,12 +37126,12 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac +arW +aDq +aDq +aDq +aDq +arW aac aac aac @@ -37160,14 +37267,14 @@ aac aac aac aac -aac -aac +aCZ arW -aDq -aDq +aDa +aDa +aDa +aDL arW -aac -aac +aDQ aac aac aac @@ -37301,13 +37408,15 @@ aac aac aac aac -aac -aac aCZ -arW -aDa -aDa -arW +aDc +aiq +aDe +aDe +aDe +aDe +aiF +aDc aDQ aac aac @@ -37357,8 +37466,6 @@ aac aac aac aac -aac -aac aab aab aab @@ -37442,14 +37549,16 @@ aac aac aac aac -aac -aac aCZ aDc -aDi +aDf aDe +aDj +aDr +aDr +aDA aDe -aiF +aDf aDc aDQ aac @@ -37502,8 +37611,6 @@ aac aac aac aac -aac -aac aab aab aab @@ -37583,24 +37690,24 @@ aac aac aac aac -aac -aac -aCZ -aDc +arW +arW +aDd aDf -aDe aDj +ajt +aDu +aDu +aDR aDA -aDe aDf -aDc -aDQ -aac -aac -aac -aac -aac -aac +aDT +arW +arW +aVz +aVz +aVz +agw aac aac aac @@ -37725,24 +37832,24 @@ aac aac aac aac -aac -arW -arW -aDd -aDf +aCY +aDa +aDe aDj -aDr +ajt +aDg aDB -aDJ -aDf -aDT -arW -arW -aac -aac -aac -aac -aac +aDG +aDg +aDR +aVr +aDe +aVx +aDc +aip +aVK +akl +alP aac aac aac @@ -37867,24 +37974,24 @@ aac aac aac aac -aac aCY -aDa aDe +aDe +aDn +aju +aDi +aDs +aDs +aUw +aVb aDg -aDk -aDs -aDs -aDK -aDA -aDe -aDa -aDP -aac -aac -aac -aac -aac +aDg +aDg +aVy +apS +aVP +aVQ +alP aac aac aac @@ -38009,24 +38116,24 @@ aac aac aac aac -aac aCY aDa aDe aDh -aDl +akm +aDk aDs aDs -aDL -aDR +aUz +aVd +aVw aDe -aDa -aDP -aac -aac -aac -aac -aac +aDe +aDc +aVA +apS +akn +alP aac aac aac @@ -38151,24 +38258,24 @@ aac aac aac aac -aac arW arW aDd aDf aDm +aDl aDt aDC +aUB aDM aDf aDT arW arW -aac -aac -aac -aac -aac +aVE +apS +akn +alP aac aac aac @@ -38294,23 +38401,23 @@ aac aac aac aac -aac aDb aDc aDf aDn +aDg aDu aDD +aDg aDN aDf aDc -aDS -aac -aac -aac -aac -aQU -aac +aDz +agw +air +apS +akn +alP aac aac aac @@ -38437,21 +38544,21 @@ aac aac aac aac -aac aDb aDc acm aDv -aDE +aDg +aDJ +aUC aDO aDc aDS aac -aac -agw -agw -agw agw +air +apS +akn akS alw alw @@ -38580,20 +38687,20 @@ aac aac aac aac -aac aDb arW aDw -aDF +aDg +aDJ +aUF arW aDS aac aac -aac agw -aip -ajt -akl +air +apS +akn akS alx amm @@ -38723,19 +38830,19 @@ aac aac aac aac -aac aCY aDx -aDG +aDE +aDK +aUM aDP aac aac aac -aac agw -aiq -aju -akm +aVG +apS +akn akS aly amn @@ -38865,13 +38972,13 @@ aac aac aac aac -aac aCY aDy +aDF aDH +aUO aDP aac -aac agw agw agw @@ -39007,13 +39114,13 @@ aac aac aac aac -aac arW aDz aDz +aDz +aDz arW aac -aac agw ahd ahS @@ -43618,7 +43725,7 @@ mfi jHw jpB qWU -suC +aVV aKU aOI aPb @@ -44470,7 +44577,7 @@ isR jHw gHh qWU -suC +aVV aKU aOI aPb @@ -46455,7 +46562,7 @@ aNk uSA aNJ aNP -aUw +aVS aKU abg aOk @@ -46597,7 +46704,7 @@ aNl aNl aNK aNP -aUw +aVS aKU abg aOk @@ -46739,7 +46846,7 @@ aNm aNl aNK aNP -aUw +aVS aKU abg aOk diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 4048c12d7e..e62273da50 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -37,6 +37,9 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) +"aaf" = ( +/turf/simulated/wall/r_wall, +/area/maintenance/station/abandonedholodeck) "aag" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; @@ -6697,13 +6700,8 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "alo" = ( -/obj/structure/table/standard, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled, -/area/holodeck_control) +/turf/simulated/floor, +/area/maintenance/station/abandonedholodeck) "alp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8; @@ -6826,8 +6824,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/backup) "alA" = ( -/turf/simulated/wall, -/area/holodeck_control) +/obj/structure/girder/displaced, +/turf/simulated/floor, +/area/maintenance/station/abandonedholodeck) "alB" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -7205,10 +7204,9 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "amg" = ( -/turf/simulated/floor/reinforced{ - name = "Holodeck Projector Floor" - }, -/area/holodeck/alphadeck) +/obj/structure/firedoor_assembly, +/turf/simulated/floor, +/area/maintenance/station/abandonedholodeck) "amh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7504,6 +7502,9 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, /area/hallway/station/atrium) +"amK" = ( +/turf/simulated/wall, +/area/maintenance/station/abandonedholodeck) "amL" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -7520,19 +7521,34 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "amM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/holodeck_control) +/obj/structure/table, +/turf/simulated/floor/tiled, +/area/maintenance/station/abandonedholodeck) "amN" = ( -/obj/structure/table/standard, -/obj/item/weapon/soap/nanotrasen, -/obj/machinery/light{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/network/tether{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, /turf/simulated/floor/tiled, -/area/holodeck_control) +/area/hallway/station/atrium) "amO" = ( /obj/structure/dispenser, /turf/simulated/floor, @@ -8604,14 +8620,9 @@ /turf/simulated/floor/wood/broken, /area/maintenance/abandonedlibrary) "aoV" = ( -/obj/machinery/door/firedoor/glass, -/obj/effect/floor_decal/steeldecal/steel_decals_central1{ - dir = 1 - }, -/turf/simulated/floor/tiled/monofloor{ - dir = 1 - }, -/area/holodeck_control) +/obj/structure/table, +/turf/simulated/floor, +/area/maintenance/station/abandonedholodeck) "aoW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -9375,23 +9386,31 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "aqk" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, /obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -32 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 }, -/obj/machinery/camera/network/civilian{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 }, /turf/simulated/floor/tiled, -/area/holodeck_control) +/area/hallway/station/atrium) "aql" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ icon_state = "intact"; @@ -10384,15 +10403,25 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/break_room) "ash" = ( -/turf/simulated/wall/r_wall, -/area/holodeck_control) +/obj/structure/door_assembly/multi_tile, +/turf/simulated/floor, +/area/maintenance/station/abandonedholodeck) "asi" = ( -/obj/machinery/door/airlock/glass{ - name = "Holodeck Control" +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, -/area/holodeck_control) +/area/hallway/station/atrium) "asj" = ( /obj/machinery/light_construct/small, /turf/simulated/floor/plating, @@ -10720,13 +10749,13 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "asP" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/holodeck_control) +/obj/structure/door_assembly/door_assembly_mai, +/turf/simulated/floor, +/area/maintenance/station/abandonedholodeck) "asQ" = ( -/obj/machinery/computer/HolodeckControl, -/turf/simulated/floor/tiled, -/area/holodeck_control) +/obj/structure/coatrack, +/turf/simulated/floor, +/area/maintenance/station/abandonedholodeck) "asR" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/blue/bordercorner, @@ -16615,30 +16644,12 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "aCu" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/machinery/camera/network/tether{ - dir = 9 +/obj/machinery/door/airlock/glass{ + name = "Holodeck Control" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, -/area/hallway/station/atrium) +/area/maintenance/station/abandonedholodeck) "aCv" = ( /obj/structure/reagent_dispensers/water_cooler/full, /obj/machinery/camera/network/tether{ @@ -16676,16 +16687,10 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "aCy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/door/firedoor/glass, +/obj/structure/grille/broken, /turf/simulated/floor/plating, -/area/holodeck_control) +/area/maintenance/station/abandonedholodeck) "aCz" = ( /obj/structure/bed/chair, /obj/machinery/camera/network/tether, @@ -17948,6 +17953,54 @@ }, /turf/simulated/floor/plating, /area/bridge/meeting_room) +"aEG" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/maintenance/station/abandonedholodeck) +"aEH" = ( +/obj/structure/frame/computer, +/turf/simulated/floor/tiled, +/area/maintenance/station/abandonedholodeck) +"aEI" = ( +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25; + pixel_y = 0 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/maintenance/station/abandonedholodeck) +"aEJ" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/maintenance/station/abandonedholodeck) +"aEK" = ( +/obj/item/weapon/stool/padded, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/maintenance/station/abandonedholodeck) +"aEL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/maintenance/station/abandonedholodeck) "aEM" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -17967,6 +18020,18 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"aEP" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/obj/structure/door_assembly, +/turf/simulated/floor, +/area/maintenance/station/abandonedholodeck) "aER" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 @@ -18113,15 +18178,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"aFI" = ( -/obj/structure/table/standard, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/turf/simulated/floor/tiled, -/area/holodeck_control) "aFJ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -18403,38 +18459,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"aHz" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aHQ" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1379; @@ -18636,23 +18660,6 @@ /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"aIT" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals3{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals3, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aIU" = ( /obj/machinery/light{ dir = 8 @@ -18880,23 +18887,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"aKQ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals3{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals3, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aKU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18910,18 +18900,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"aLc" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; - dir = 2; - id_tag = null; - name = "Holodeck"; - req_access = list() - }, -/obj/machinery/door/firedoor/glass, -/obj/effect/floor_decal/steeldecal/steel_decals_central1, -/turf/simulated/floor/tiled/monofloor, -/area/holodeck_control) "aLh" = ( /obj/machinery/shield_gen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -19455,34 +19433,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) -"aML" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "aMZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -19628,16 +19578,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"aOO" = ( -/obj/structure/table/standard, -/obj/item/weapon/soap/nanotrasen, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/holodeck_control) "aOS" = ( /obj/structure/cable/green{ d1 = 1; @@ -20351,15 +20291,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"aVx" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25; - pixel_y = 0 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/holodeck_control) "aVz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20510,31 +20441,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"aXl" = ( -/obj/item/weapon/stool/padded, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/holodeck_control) -"aXw" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/holodeck_control) "aXC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20700,18 +20606,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) -"aYW" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/holodeck_control) "aZg" = ( /obj/structure/table/reinforced, /obj/item/device/megaphone, @@ -36257,13 +36151,13 @@ afC aAH aCw aDZ +amN +aqk +asi +asi aCw -aHz -aIT -aKQ -aML +amN aCw -aCu aCw aTA aCw @@ -36396,18 +36290,18 @@ adO afC afC afC -ash -aCy -amM -amM -amM -aoV -aLc -amM -amM -amM -amM -ash +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf asI asI asI @@ -36538,18 +36432,18 @@ adO aac aac aac -ash +aaf +alo +alA +alo +alo amg -amg -amg -amg -amg -amg -amg -amg -amg -amg -ash +alo +alo +alo +alo +alo +aaf asJ asJ asJ @@ -36680,18 +36574,18 @@ adO aac aac aac -ash +aaf +alA +alo +alo +alo +alo amg +alo +alo +alo amg -amg -amg -amg -amg -amg -amg -amg -amg -ash +aaf asK asK asK @@ -36822,18 +36716,18 @@ adP adP aac aac +aaf +alA +alA +alo ash -amg -amg -amg -amg -amg -amg -amg -amg -amg -amg -ash +alo +alo +alo +alo +alo +alA +aaf asL atx atx @@ -36964,18 +36858,18 @@ aiz adP aac aac -ash -amg -amg -amg -amg -amg -amg -amg -amg -amg -amg -ash +aaf +alo +alo +alo +alo +alo +alo +alo +alo +alo +asQ +aaf aSo aty aty @@ -37106,18 +37000,18 @@ adP adP aac aac -ash +aaf amg -amg -amg -amg -amg -amg -amg -amg -amg -amg -ash +alo +alo +alo +alo +aoV +alo +alA +alo +alo +aaf awa asN asN @@ -37248,18 +37142,18 @@ adP aac aac aac -ash +aaf amg -amg -amg -amg -amg -amg -amg -amg -amg -amg -ash +alo +aoV +alo +alo +alo +alo +alo +alA +alo +aaf asO asO asO @@ -37390,18 +37284,18 @@ adP adP aac aac -ash -amg -amg -amg -amg -amg -amg -amg -amg -amg -amg -ash +aaf +alo +alo +aoV +aoV +alo +alo +alo +alo +alo +alo +aaf asI asI asI @@ -37532,21 +37426,21 @@ ajf adP aac aac -ash -amg -amg -amg -amg -amg -amg -amg -amg -amg -amg -asi +aaf +alA +alo +alo +alo +alo +alo +alo asP -aXw -aYW +alo +alo +aCu +aEG +aEJ +aEP baT bcO baT @@ -37674,21 +37568,21 @@ ajf adP aac aac -ash -amg -amg -amg -amg -amg -amg -amg -amg -amg -amg -amM -asQ -aXl +aaf alA +alA +alo +alo +alo +alo +alo +alo +alo +alo +aCy +aEH +aEK +amK aur bcK bfk @@ -37816,21 +37710,21 @@ adP adP aac aac -ash -amg -amg -amg -amg -amg -amg -amg -amg -amg -amg -asi -aVx -aqk -alA +aaf +alo +alo +alo +alo +alo +alo +alo +alo +alo +alo +aCu +aEI +aEL +amK aus aus aus @@ -37958,21 +37852,21 @@ aac aac aac aac -ash -alA -alo -aFI -alA -alA -alA -alA -aOO -amN -alA -alA -alA -alA -alA +aaf +amK +amM +amM +amK +amK +amK +amK +amM +amM +amK +amK +amK +amK +amK aac aac aac @@ -38101,16 +37995,16 @@ aac aac aac aac -alA -alA -alA -alA +amK +amK +amK +amK aac aac -alA -alA -alA -alA +amK +amK +amK +amK aac aac aac diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index 690f74677e..507bd65aff 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -692,6 +692,11 @@ name = "\improper Dock Two" icon_state = "dk_yellow" +/area/maintenance/station/abandonedholodeck + name = "\improper Old Holodeck" + icon_state = "dk_yellow" + flags = RAD_SHIELDED + /area/tether/station/burial name = "\improper Burial" icon_state = "chapel_morgue" @@ -1041,7 +1046,7 @@ /area/shuttle/tourbus/general name = "\improper Tour Bus" - + /area/shuttle/tourbus/cockpit name = "\improper Tour Bus Cockpit"