From e2ba243bde3d4b125ffa8b20eb9bfceac7e87970 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Sun, 27 Jun 2021 12:30:36 +0000 Subject: [PATCH] Map touchups --- .../objects/effects/decals/posters/posters.dm | 3 +- maps/tether/tether-01-surface1.dmm | 108 +- maps/tether/tether-02-surface2.dmm | 84 +- maps/tether/tether-03-surface3.dmm | 87 +- maps/tether/tether-04-transit.dmm | 527 +++++- maps/tether/tether-05-station1.dmm | 1612 ++++++++++++++--- maps/tether/tether_areas.dm | 4 + 7 files changed, 2049 insertions(+), 376 deletions(-) diff --git a/code/game/objects/effects/decals/posters/posters.dm b/code/game/objects/effects/decals/posters/posters.dm index 8046cf439a..7db111f8e4 100644 --- a/code/game/objects/effects/decals/posters/posters.dm +++ b/code/game/objects/effects/decals/posters/posters.dm @@ -115,7 +115,8 @@ /obj/structure/sign/poster name = "poster" desc = "A large piece of space-resistant printed paper. " - icon = 'icons/obj/contraband.dmi' + icon = 'icons/obj/contraband_vr.dmi' //VOREStation Edit + icon_state = "poster" //VOREStation Edit anchored = 1 var/decl/poster/poster_decl = null var/target_poster_decl_path = /decl/poster diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index dba05e4aee..c42104de1c 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -2913,7 +2913,7 @@ dir = 8 }, /obj/structure/sign/poster{ - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) @@ -3862,6 +3862,7 @@ dir = 8; pixel_x = 24 }, +/obj/machinery/light/small, /turf/simulated/floor/tiled, /area/rnd/hardstorage) "ags" = ( @@ -6359,9 +6360,21 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden) "akT" = ( +<<<<<<< HEAD /obj/structure/sign/poster, /turf/simulated/wall, /area/tether/surfacebase/public_garden) +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/obj/structure/sign/poster, +/turf/simulated/wall, +/area/hallway/lower/first_west) +======= +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/testingroom) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "akU" = ( /obj/item/device/radio/intercom{ dir = 8; @@ -6531,6 +6544,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/sign/poster{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden) "alh" = ( @@ -7811,6 +7827,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden) "anc" = ( @@ -10313,7 +10332,7 @@ dir = 8 }, /obj/structure/sign/poster{ - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) @@ -13313,6 +13332,9 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/checkpoint) "awi" = ( @@ -17681,6 +17703,9 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "aCI" = ( @@ -21782,6 +21807,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "aJY" = ( @@ -26703,6 +26731,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, +/obj/machinery/light, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "aTg" = ( @@ -28465,6 +28494,9 @@ "aWb" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/item/weapon/stool/padded, +/obj/structure/sign/poster{ + dir = 1 + }, /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aWc" = ( @@ -29247,6 +29279,9 @@ /obj/structure/table/steel, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aXB" = ( @@ -31154,6 +31189,7 @@ dir = 5 }, /obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/rnd/external) "bcV" = ( @@ -32625,6 +32661,10 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"fna" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled, +/area/rnd/hardstorage) "fpU" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/hidden/green, @@ -33143,6 +33183,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"haz" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/engineering/atmos/processing) "hco" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 9 @@ -33919,6 +33963,12 @@ }, /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) +"jYP" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "kbZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -34739,6 +34789,10 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) +"lZU" = ( +/obj/structure/sign/poster, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "meS" = ( /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) @@ -34822,6 +34876,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) +"mtL" = ( +/obj/structure/sign/poster, +/turf/simulated/floor/lino, +/area/crew_quarters/visitor_dining) "mvM" = ( /obj/structure/cable/green{ d1 = 4; @@ -35814,6 +35872,36 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +<<<<<<< HEAD +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"pud" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/crew_quarters/visitor_laundry) +======= +"pud" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/crew_quarters/visitor_laundry) +"pxk" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/grey/border, +/obj/structure/sign/poster, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "pyD" = ( /obj/machinery/door/airlock/maintenance/common{ name = "Mining Maintenance Access" @@ -44114,7 +44202,7 @@ axI awU aAk abN -aeR +akT aeR agl agN @@ -44647,7 +44735,7 @@ akn abE jbU akJ -akT +ahl alg alq alB @@ -45109,7 +45197,7 @@ abn abn acx afg -abv +fna abm aCm akg @@ -45849,7 +45937,7 @@ aQR aRu aPl aPl -aPl +haz aOR aTW aUv @@ -47406,7 +47494,7 @@ aOx aJI aPt aJI -aJI +jYP aQy aRD aRW @@ -53160,7 +53248,7 @@ aVA aVQ aUP aUP -bcT +pxk aVn anK aYi @@ -53297,7 +53385,7 @@ aDu atm aCQ aJV -aDu +mtL aLj aLT aME @@ -54487,7 +54575,7 @@ auB aEO lsh aFW -auB +lZU aCO jCv aIz diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index f907d6989a..9b4148072f 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -752,7 +752,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals10, /obj/structure/sign/poster{ - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -1974,6 +1974,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +<<<<<<< HEAD +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/obj/structure/sign/poster{ + pixel_y = 32 + }, +======= +/obj/structure/sign/poster{ + dir = 1 + }, +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/evidence) "acW" = ( @@ -5669,9 +5679,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, +/obj/structure/sign/poster, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "aiO" = ( @@ -6761,9 +6769,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, +/obj/structure/sign/poster, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralhall) "akF" = ( @@ -6941,8 +6947,34 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akR" = ( +<<<<<<< HEAD /turf/simulated/wall/r_wall, /area/tether/surfacebase/medical/uppersouthstairwell) +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/structure/sign/poster{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/middlehall) +======= +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/structure/sign/poster{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/middlehall) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "akS" = ( /obj/structure/window/reinforced, /obj/machinery/vending/fitness{ @@ -7634,9 +7666,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, +/obj/structure/sign/poster, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "alW" = ( @@ -10316,10 +10346,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"aqt" = ( -/obj/structure/sign/poster, -/turf/simulated/wall, -/area/tether/surfacebase/public_garden_two) "aqu" = ( /obj/structure/table/standard{ name = "plastic table frame" @@ -10330,6 +10356,9 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 9 }, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) "aqv" = ( @@ -11327,14 +11356,10 @@ /obj/effect/floor_decal/techfloor{ dir = 1 }, -/obj/machinery/vending/cigarette{ - name = "Cigarette machine"; - prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) - }, /obj/effect/floor_decal/techfloor/hole{ dir = 1 }, +/obj/machinery/vending/sovietvend, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "ash" = ( @@ -12580,6 +12605,9 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 6 }, +/obj/structure/sign/poster{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) "auk" = ( @@ -14373,12 +14401,12 @@ /area/tether/surfacebase/surface_two_hall) "axu" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/sign/poster{ - pixel_x = -32 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "axv" = ( @@ -25649,7 +25677,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/machinery/vending/snack{ +/obj/machinery/vending/weeb{ dir = 1 }, /turf/simulated/floor/tiled/monotile, @@ -35402,15 +35430,15 @@ >>>>>>> 45e710fa51... Merge pull request #10235 from Enzo-Leon/asteroid "xbt" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/sign/poster{ - pixel_x = -32 - }, /obj/structure/bed/chair{ dir = 4 }, /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "xfa" = ( @@ -40100,7 +40128,7 @@ adt adt adt akX -aqt +akX akX akX adt @@ -41240,7 +41268,7 @@ aqz aog ars atI -aqt +akX akX adt adt diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 129d74b335..5f8f2020ec 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -128463,13 +128463,13 @@ aaa /obj/effect/floor_decal/corner/red/bordercorner2{ dir = 4 }, -/obj/structure/sign/poster{ - pixel_x = 32 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/structure/sign/poster{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "abj" = ( @@ -134757,6 +134757,9 @@ aaa /obj/machinery/light{ dir = 4 }, +/obj/structure/sign/poster{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "akC" = ( @@ -137741,6 +137744,9 @@ aaa /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "apU" = ( @@ -138741,7 +138747,6 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) "arE" = ( -/obj/machinery/vending/cola, /obj/effect/floor_decal/corner/lightgrey{ dir = 9 }, @@ -138758,6 +138763,7 @@ aaa dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/vending/bepis, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) "arF" = ( @@ -141358,6 +141364,9 @@ aaa /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "awy" = ( @@ -141766,32 +141775,6 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/research) -"axb" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 8 - }, -/obj/machinery/computer/id_restorer{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "axc" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -151414,9 +151397,6 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "aNy" = ( -/obj/structure/sign/poster{ - pixel_x = -32 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -152411,7 +152391,7 @@ aaa /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "aPB" = ( -/obj/machinery/vending/snack{ +/obj/machinery/vending/weeb{ dir = 4 }, /turf/simulated/floor/tiled, @@ -152651,7 +152631,7 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "aQg" = ( -/obj/machinery/vending/cola{ +/obj/machinery/vending/bepis{ dir = 4 }, /turf/simulated/floor/tiled, @@ -155529,9 +155509,7 @@ aaa }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, -/obj/structure/sign/poster{ - pixel_y = -32 - }, +/obj/structure/sign/poster, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aVN" = ( @@ -160446,6 +160424,9 @@ aaa /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "beB" = ( @@ -161159,6 +161140,9 @@ aaa /obj/machinery/light{ dir = 1 }, +/obj/structure/sign/poster{ + dir = 4 + }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "bfY" = ( @@ -162710,15 +162694,15 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "biU" = ( -/obj/machinery/vending/snack{ - dir = 4 - }, /obj/effect/floor_decal/corner/lightgrey{ dir = 5 }, /obj/effect/floor_decal/corner/lightgrey{ dir = 10 }, +/obj/machinery/vending/sol{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "biV" = ( @@ -165973,6 +165957,12 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"eWS" = ( +/obj/structure/sign/poster{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) "faL" = ( /obj/structure/lattice, /obj/structure/cable/orange{ @@ -167136,7 +167126,7 @@ aaa dir = 4 }, /obj/structure/sign/poster{ - pixel_x = 32 + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) @@ -231693,6 +231683,9 @@ aaa /area/tether/surfacebase/security/hos) "oMK" = ( /obj/machinery/atmospherics/unary/engine, +/obj/structure/sign/poster{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) "oOD" = ( @@ -233123,9 +233116,6 @@ aaa "uiJ" = ( /obj/machinery/chemical_dispenser/full, /obj/structure/table/reinforced, -/obj/structure/sign/poster{ - pixel_x = 32 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -233135,6 +233125,9 @@ aaa /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, +/obj/structure/sign/poster{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "und" = ( @@ -248111,7 +248104,7 @@ aqR aZS aZZ anL -axb +vvA viF vKm nlf @@ -248740,7 +248733,7 @@ beU bhx beU biF -biL +eWS bjc bjj bjq diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm index 39974055a0..4dd52f7bce 100644 --- a/maps/tether/tether-04-transit.dmm +++ b/maps/tether/tether-04-transit.dmm @@ -103,14 +103,12 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) @@ -297,19 +295,286 @@ /obj/structure/disposalpipe/down{ dir = 1 }, +<<<<<<< HEAD /obj/machinery/light/small{ dir = 4; pixel_y = 0 +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4; + icon_state = "map-scrubbers" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Tether Midpoint"; + sortType = "Tether Midpoint" + }, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"nD" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 +======= +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Tether Midpoint"; + sortType = "Tether Midpoint" + }, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"nD" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff }, /obj/structure/lattice, /obj/machinery/door/firedoor/glass, +<<<<<<< HEAD /turf/simulated/open, +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/midpoint) +"oz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5; + icon_state = "intact-scrubbers" + }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"oN" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"oP" = ( +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"pK" = ( +/turf/simulated/floor/wood, +/area/tether/midpoint) +"pM" = ( +/turf/simulated/floor/plating, +======= +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/midpoint) +"oz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"oN" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"oP" = ( +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"pK" = ( +/turf/simulated/floor/wood, +/area/tether/midpoint) +"pM" = ( +/turf/simulated/floor/plating, +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/area/maintenance/tether_midpoint) +<<<<<<< HEAD "E" = ( +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"pO" = ( +/obj/machinery/media/jukebox, +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/midpoint) +"sw" = ( +/obj/machinery/vending/bepis{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/midpoint) +"sR" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, /obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/midpoint) +"tn" = ( +======= +"pO" = ( +/obj/machinery/media/jukebox, +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/midpoint) +"sw" = ( +/obj/machinery/vending/bepis{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/midpoint) +"sR" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"tn" = ( +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/obj/structure/cable{ +<<<<<<< HEAD d1 = 2; d2 = 8; icon_state = "2-8" +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"tA" = ( +/obj/structure/table/bench/padded, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"tB" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"uA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"uC" = ( +/obj/structure/table/woodentable, +/obj/machinery/holoposter{ + pixel_y = 30 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"vh" = ( +/obj/structure/table/woodentable, +/obj/structure/flora/pottedplant/small{ + pixel_y = 8 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"vt" = ( +/obj/structure/table/woodentable, +/obj/machinery/camera/network/civilian{ + dir = 1 +======= + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"tA" = ( +/obj/structure/table/bench/padded, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"tB" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"uA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"uC" = ( +/obj/structure/table/woodentable, +/obj/machinery/holoposter{ + pixel_y = 30 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"vh" = ( +/obj/structure/table/woodentable, +/obj/structure/flora/pottedplant/small{ + pixel_y = 8 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"vt" = ( +/obj/structure/table/woodentable, +/obj/machinery/camera/network/civilian{ + dir = 1 +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff }, /turf/simulated/floor/wood, /area/tether/midpoint) @@ -317,11 +582,71 @@ /obj/structure/table/bench/padded, /turf/simulated/floor/wood, /area/tether/midpoint) +<<<<<<< HEAD "G" = ( /obj/structure/grille, +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"xl" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/zpipe/down, +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, +/obj/machinery/atmospherics/pipe/zpipe/down/supply, +/obj/structure/lattice, +/obj/structure/cable{ + icon_state = "32-2" + }, +/obj/structure/disposalpipe/down, +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/maintenance/tether_midpoint) +"yi" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/engineering, +======= +"xl" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/down, +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, +/obj/machinery/atmospherics/pipe/zpipe/down/supply, +/obj/structure/lattice, +/obj/structure/cable{ + icon_state = "32-2" + }, +/obj/structure/disposalpipe/down, +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/maintenance/tether_midpoint) +"yi" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/engineering, +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +<<<<<<< HEAD "H" = ( +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"zi" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1" + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"zG" = ( +======= +"zi" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"zG" = ( +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -386,17 +711,53 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, +<<<<<<< HEAD /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled/dark, +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"Iq" = ( +/obj/machinery/light{ + dir = 2 + }, +/turf/simulated/floor/wood, +======= +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"Iq" = ( +/obj/machinery/light, +/turf/simulated/floor/wood, +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff /area/tether/midpoint) "P" = ( /obj/structure/cable{ +<<<<<<< HEAD icon_state = "1-4" +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 +======= + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff }, /obj/machinery/vending/snack{ dir = 1 @@ -420,16 +781,49 @@ dir = 5 }, /obj/machinery/light{ - dir = 8; - icon_state = "tube1" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) +<<<<<<< HEAD "T" = ( /obj/structure/table/woodentable, /obj/structure/flora/pottedplant/smallcactus{ pixel_x = 0; pixel_y = 8 +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"Kh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"KH" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" +======= +"Kh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"KH" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff }, /turf/simulated/floor/wood, /area/tether/midpoint) @@ -439,11 +833,111 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +<<<<<<< HEAD "V" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5; icon_state = "intact-scrubbers" +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"Ls" = ( +/obj/structure/disposalpipe/down{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/lattice, +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/maintenance/tether_midpoint) +"ML" = ( +/obj/structure/closet, +/obj/random/maintenance, +/obj/random/maintenance, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"Nt" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"NJ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether/midpoint) +"Oq" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/structure/lattice, +/obj/structure/disposalpipe/down, +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/maintenance/tether_midpoint) +"Or" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 +======= +"Ls" = ( +/obj/structure/disposalpipe/down{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/lattice, +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/maintenance/tether_midpoint) +"ML" = ( +/obj/structure/closet, +/obj/random/maintenance, +/obj/random/maintenance, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"Nt" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"NJ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether/midpoint) +"Oq" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/lattice, +/obj/structure/disposalpipe/down, +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/maintenance/tether_midpoint) +"Or" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff }, /obj/machinery/light{ dir = 8; @@ -487,8 +981,25 @@ icon_state = "1-2"; pixel_y = 0 }, +<<<<<<< HEAD /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/turf/simulated/floor/holofloor/tiled/dark, +/area/tether/midpoint) +"YB" = ( +/obj/structure/table/woodentable, +/obj/structure/flora/pottedplant/smallcactus{ + pixel_x = 0; + pixel_y = 8 +======= +/turf/simulated/floor/tiled/dark, +/area/tether/midpoint) +"YB" = ( +/obj/structure/table/woodentable, +/obj/structure/flora/pottedplant/smallcactus{ + pixel_y = 8 +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index df80b63db0..2929137feb 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -196,6 +196,46 @@ }, /turf/simulated/floor, /area/engineering/engine_smes) +<<<<<<< HEAD +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"aat" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor, +/area/maintenance/station/exploration) +"aau" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/effect/landmark{ + name = "JoinLateCyborg" + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/station/exploration) +======= +"aat" = ( +/obj/machinery/door/airlock/maintenance/common{ + name = "Robotic Long-Term Storage" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor, +/area/maintenance/station/exploration) +"aau" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/effect/landmark{ + name = "JoinLateCyborg" + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/station/exploration) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "aav" = ( /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -826,6 +866,92 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +<<<<<<< HEAD +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"acr" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/station/exploration) +"acs" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/station/exploration) +"act" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor, +/area/teleporter/departing) +"acu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, +/obj/machinery/porta_turret/stationary, +/turf/simulated/floor/tiled/dark{ + nitrogen = 100; + oxygen = 0; + temperature = 80 + }, +/area/tcommsat/chamber) +======= +"acr" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) +"acs" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/station/exploration) +"act" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor, +/turf/simulated/floor, +/area/teleporter/departing) +"acu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, +/obj/machinery/porta_turret/stationary, +/turf/simulated/floor/tiled/dark{ + nitrogen = 100; + oxygen = 0; + temperature = 80 + }, +/area/tcommsat/chamber) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "acv" = ( /obj/structure/table/rack{ dir = 8; @@ -890,6 +1016,155 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +<<<<<<< HEAD +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"acC" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, +/turf/simulated/floor/tiled, +/area/tcommsat/computer) +"acD" = ( +/obj/item/device/multitool, +/obj/structure/table/standard, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/tcommsat/computer) +"acE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + icon_state = "intact" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tcommsat/computer) +"acF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/firealarm{ + pixel_y = 25 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"acG" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/turretid/lethal{ + ailock = 1; + check_synth = 0; + control_area = /area/tcommsat/chamber; + desc = "A firewall prevents AIs from interacting with this device."; + name = "Telecoms lethal turret control"; + pixel_y = 29; + req_access = list(61); + req_one_access = list() + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +======= +"acC" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tcommsat/computer) +"acD" = ( +/obj/item/device/multitool, +/obj/structure/table/standard, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled, +/area/tcommsat/computer) +"acE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tcommsat/computer) +"acF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/firealarm{ + pixel_y = 25 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"acG" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/turretid/lethal{ + ailock = 1; + control_area = /area/tcommsat/chamber; + desc = "A firewall prevents AIs from interacting with this device."; + name = "Telecoms lethal turret control"; + pixel_y = 29; + req_access = list(61); + req_one_access = list() + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "acH" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -1016,11 +1291,75 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) +<<<<<<< HEAD +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"adb" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/turretid/stun{ + ailock = 1; + check_synth = 0; + control_area = /area/tcomsat; + desc = "A firewall prevents AIs from interacting with this device."; + name = "Telecoms Foyer turret control"; + pixel_y = 29; + req_access = list(61); + req_one_access = list() + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +======= +"adb" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/turretid/stun{ + ailock = 1; + control_area = /area/tcomsat; + desc = "A firewall prevents AIs from interacting with this device."; + name = "Telecoms Foyer turret control"; + pixel_y = 29; + req_access = list(61); + req_one_access = list() + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "adc" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 }, -/obj/machinery/suit_cycler/pilot, /obj/effect/floor_decal/corner/green/border{ dir = 9 }, @@ -1030,6 +1369,7 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 1 }, +/obj/structure/closet/secure_closet/pilot, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) "ade" = ( @@ -1099,13 +1439,103 @@ /turf/simulated/floor/tiled/dark, /area/storage/tech) "adj" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +<<<<<<< HEAD /turf/simulated/floor, /area/storage/emergency_storage/emergency4) +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/turf/simulated/floor, +/area/storage/emergency_storage/emergency4) +"adk" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"adl" = ( +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"adm" = ( +/obj/machinery/atmospherics/binary/passive_gate/on{ + dir = 2 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +======= +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) +"adk" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"adl" = ( +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"adm" = ( +/obj/machinery/atmospherics/binary/passive_gate/on, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "adn" = ( /obj/structure/table/rack{ dir = 8; @@ -1163,11 +1593,18 @@ /turf/simulated/floor/tiled/dark, /area/storage/tech) "adq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +<<<<<<< HEAD /turf/simulated/floor, /area/storage/emergency_storage/emergency4) "ads" = ( @@ -1182,6 +1619,61 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/maintenance/substation/civilian) +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/turf/simulated/floor, +/area/storage/emergency_storage/emergency4) +"adr" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/device/radio/beacon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"ads" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/engi{ + name = "Civilian Substation" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/maintenance/substation/civilian) +======= +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) +"adr" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/device/radio/beacon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "adt" = ( /obj/structure/cable/green{ d1 = 1; @@ -1332,6 +1824,11 @@ dir = 4 }, /obj/machinery/meter, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -16; + pixel_y = -24 + }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "adI" = ( @@ -1408,11 +1905,18 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "adU" = ( -/obj/machinery/light/small, -/obj/machinery/floodlight, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor, -/area/storage/emergency_storage/emergency4) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/cable/green, +/obj/machinery/power/apc{ + name = "south bump"; + nightshift_setting = 0; + pixel_y = -28; + req_access = list(67) + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "adV" = ( /obj/structure/closet/crate, /obj/random/maintenance/clean, @@ -1456,6 +1960,12 @@ icon_state = "pipe-c" }, /obj/structure/catwalk, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/eng_lower) "aea" = ( @@ -2130,7 +2640,6 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "afE" = ( -/obj/machinery/vending/cola, /obj/effect/floor_decal/corner/lightgrey{ dir = 9 }, @@ -2140,6 +2649,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/vending/cola/soft, /turf/simulated/floor/tiled, /area/hallway/station/docks) "afF" = ( @@ -2175,7 +2685,6 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "afJ" = ( -/obj/machinery/vending/snack, /obj/machinery/light{ dir = 1 }, @@ -2189,6 +2698,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/vending/snlvend, /turf/simulated/floor/tiled, /area/hallway/station/docks) "afK" = ( @@ -2197,6 +2707,10 @@ pixel_x = 26; pixel_y = 8 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/wood, /area/quartermaster/qm) "afL" = ( @@ -2257,6 +2771,9 @@ /obj/effect/floor_decal/corner/yellow/bordercorner2{ dir = 4 }, +/obj/structure/sign/poster{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "afR" = ( @@ -2823,6 +3340,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "aha" = ( @@ -3072,6 +3592,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "ahI" = ( @@ -3274,6 +3799,10 @@ pixel_y = 22 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/tether/exploration/hallway) "aij" = ( @@ -3311,10 +3840,6 @@ /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/borderfloor/corner2, /obj/effect/floor_decal/corner/lightgrey/bordercorner2, -/obj/machinery/computer/id_restorer{ - dir = 1; - pixel_y = -32 - }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "aio" = ( @@ -3936,6 +4461,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) "ake" = ( @@ -4678,9 +5207,6 @@ >>>>>>> a084f9e576... Merge pull request #10384 from Novacat/nova-basicfixes /turf/simulated/floor/tiled, /area/engineering/hallway) -"alQ" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/substation/civilian) "alR" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/firealarm{ @@ -4690,9 +5216,6 @@ /obj/vehicle/train/trolley, /turf/simulated/floor/tiled/monotile, /area/engineering/hallway) -"alT" = ( -/turf/simulated/wall, -/area/storage/emergency_storage/emergency4) "alV" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -4900,7 +5423,12 @@ /turf/simulated/floor/tiled, /area/engineering/engine_airlock) "amm" = ( -/obj/structure/closet/secure_closet/pilot, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -5003,10 +5531,15 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "amE" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, -/area/storage/emergency_storage/emergency4) +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "amJ" = ( /obj/machinery/telecomms/processor/preset_two, /turf/simulated/floor/tiled/dark{ @@ -5195,6 +5728,9 @@ /obj/machinery/computer/atmoscontrol{ dir = 4 }, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "anf" = ( @@ -5385,6 +5921,9 @@ icon_state = "pipe-c" }, /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/maintenance/station/eng_lower) "anF" = ( @@ -5568,22 +6107,19 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "aof" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/toilet{ dir = 4 }, -/obj/random/junk, -/turf/simulated/floor, -/area/maintenance/substation/civilian) +/obj/machinery/light/small, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock17"; + name = "Bathroom Lock"; + pixel_x = 8; + pixel_y = 25; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "aog" = ( /obj/structure/table/rack/steel, /obj/item/weapon/circuitboard/mech_recharger{ @@ -5634,10 +6170,17 @@ /turf/simulated/floor, /area/engineering/atmos/backup) "aoi" = ( -/obj/machinery/space_heater, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/plating, -/area/storage/emergency_storage/emergency4) +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = 8 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "aoj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 8 @@ -5843,9 +6386,6 @@ temperature = 80 }, /area/tcommsat/chamber) -"aoO" = ( -/turf/simulated/wall/r_wall, -/area/storage/emergency_storage/emergency4) "aoP" = ( /obj/structure/table/reinforced, /obj/item/stack/material/plasteel{ @@ -7016,11 +7556,17 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "arf" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock{ + name = "Emergency Storage" + }, /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled, -/area/maintenance/cargo) +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/storage/emergency_storage/emergency4) "arg" = ( /obj/effect/floor_decal/techfloor, /obj/structure/window/reinforced{ @@ -7204,6 +7750,10 @@ /obj/machinery/camera/network/engineering{ dir = 8 }, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "arQ" = ( @@ -7324,6 +7874,10 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 4 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "ask" = ( @@ -7441,6 +7995,7 @@ icon_state = "1-2" }, /obj/structure/railing, +/obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/station/eng_lower) "asw" = ( @@ -7740,6 +8295,9 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 1 }, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "atn" = ( @@ -8013,6 +8571,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/hallway) "aux" = ( @@ -8209,6 +8770,7 @@ /area/engineering/engine_eva) "avl" = ( /obj/machinery/light_switch{ + dir = 1; pixel_x = -12; pixel_y = -24 }, @@ -8286,6 +8848,10 @@ /obj/structure/table/reinforced, /obj/item/device/suit_cooling_unit, /obj/item/device/suit_cooling_unit, +/obj/machinery/light_switch{ + pixel_x = 11; + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/engineering/engine_eva) "avt" = ( @@ -8306,6 +8872,9 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals6, +/obj/structure/sign/poster{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "avw" = ( @@ -8498,7 +9067,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "awe" = ( /obj/machinery/light, /obj/structure/dogbed, @@ -8814,9 +9383,10 @@ d2 = 8; icon_state = "2-8" }, -/obj/random/trash_pile, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "axb" = ( /obj/structure/disposalpipe/tagger{ dir = 8; @@ -8972,8 +9542,11 @@ "axC" = ( /obj/structure/disposalpipe/segment, /obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "axD" = ( /obj/structure/disposalpipe/junction{ dir = 2; @@ -9357,7 +9930,7 @@ /obj/structure/catwalk, /obj/random/junk, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "azc" = ( /turf/simulated/wall, /area/quartermaster/office) @@ -9582,11 +10155,6 @@ /turf/simulated/floor, /area/hallway/station/atrium) "azJ" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9594,6 +10162,9 @@ dir = 1 }, /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/maintenance/station/eng_lower) "azK" = ( @@ -10163,6 +10734,7 @@ /area/quartermaster/storage) "aBH" = ( /obj/structure/disposalpipe/segment, +/obj/random/trash_pile, /turf/simulated/floor, /area/maintenance/station/eng_lower) "aBI" = ( @@ -10257,14 +10829,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/gravity_gen) -"aBR" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE" - }, -/turf/simulated/wall/r_wall, -/area/maintenance/substation/civilian) "aBT" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -10538,6 +11102,24 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "aCS" = ( +/obj/structure/table/rack{ + dir = 1 + }, +/obj/item/clothing/suit/fire/firefighter, +/obj/item/weapon/tank/oxygen, +/obj/item/clothing/mask/gas, +/obj/item/weapon/extinguisher, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/glasses/meson, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/random/junk, +/obj/random/tool, +/obj/random/maintenance/clean, +/obj/item/weapon/storage/box/lights/mixed, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -10546,11 +11128,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/railing{ - dir = 8 +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/floor, -/area/maintenance/cargo) +/turf/simulated/floor/plating, +/area/storage/emergency_storage/emergency4) "aCT" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -10635,8 +11218,9 @@ icon_state = "1-2" }, /obj/structure/catwalk, +/obj/effect/floor_decal/rust, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "aDi" = ( /obj/machinery/alarm{ dir = 8; @@ -10675,18 +11259,19 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "aDM" = ( -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" +/obj/structure/toilet{ + dir = 4 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/light/small, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock16"; + name = "Bathroom Lock"; + pixel_x = 8; + pixel_y = 25; + specialfunctions = 4 }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor, -/area/maintenance/substation/civilian) +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "aDN" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -10695,30 +11280,16 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "aDP" = ( -/obj/structure/table/rack{ - dir = 1 +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 }, -/obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/oxygen, -/obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, -/obj/item/clothing/head/hardhat/red, -/obj/item/clothing/glasses/meson, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" +/obj/structure/sink{ + pixel_y = 22 }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/random/junk, -/obj/random/tool, -/obj/random/maintenance/clean, -/obj/item/weapon/storage/box/lights/mixed, -/turf/simulated/floor/plating, -/area/storage/emergency_storage/emergency4) +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "aDR" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -11092,22 +11663,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/cargo) -"aEX" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor, -/area/maintenance/substation/civilian) "aFb" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -11123,7 +11678,7 @@ }) "aFe" = ( /obj/machinery/door/airlock{ - name = "Emergency Storage" + name = "Unisex Bathrooms" }, /obj/structure/cable/green{ d1 = 4; @@ -11131,8 +11686,17 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/storage/emergency_storage/emergency4) +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "aFJ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -11289,11 +11853,6 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "aGy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -11312,13 +11871,12 @@ /turf/simulated/wall/r_wall, /area/engineering/engineering_airlock) "aGP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/random/trash_pile, +/obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/eng_lower) "aHc" = ( @@ -11486,6 +12044,11 @@ dir = 8; icon_state = "pipe-c" }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor, /area/maintenance/station/eng_lower) "aIA" = ( @@ -13083,6 +13646,11 @@ pixel_y = -24 }, /obj/random/tech_supply, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -13; + pixel_y = -27 + }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) "aVN" = ( @@ -13693,6 +14261,11 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/hallway/station/docks) "bdT" = ( @@ -13881,8 +14454,13 @@ icon_state = "4-8" }, /obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "bhg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -13902,6 +14480,16 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) +"bhG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "bhH" = ( /obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{ frequency = 1381; @@ -13946,6 +14534,11 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -26; + pixel_y = -8 + }, /turf/simulated/floor/tiled, /area/gateway/prep_room) "biP" = ( @@ -14171,7 +14764,7 @@ icon_state = "1-2" }, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "bqK" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -14317,11 +14910,10 @@ /area/engineering/gravity_gen) "bvw" = ( /obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, +/obj/machinery/floodlight, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "bwb" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; @@ -14494,6 +15086,11 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 6 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 26; + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "bEu" = ( @@ -14682,17 +15279,20 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "bJG" = ( -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/maintenance/medical, -/obj/random/tool, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/power/smes/buildable{ + RCon_tag = "Substation - Exploration"; + output_attempt = 0 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green, +/obj/machinery/camera/network/engineering{ + dir = 4 }, /turf/simulated/floor, -/area/maintenance/station/eng_lower) +/area/maintenance/substation/civilian) "bKo" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/green{ @@ -14930,6 +15530,22 @@ temperature = 80 }, /area/tcommsat/chamber) +"bQc" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/camera/network/command{ + dir = 9 + }, +/turf/simulated/floor, +/area/maintenance/substation/civilian) "bQj" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -16198,11 +16814,13 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) "cOq" = ( -/obj/structure/catwalk, -/obj/random/junk, /obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/station/exploration) +/obj/structure/mopbucket, +/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled, +/area/janitor) "cOV" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -16492,7 +17110,6 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/corner/green/border{ dir = 8 }, @@ -16505,6 +17122,7 @@ d2 = 4; icon_state = "0-4" }, +/obj/structure/closet/secure_closet/pilot, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) "ddj" = ( @@ -16860,6 +17478,17 @@ }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) +"dqw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor, +/area/storage/emergency_storage/emergency4) "dqY" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17000,6 +17629,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -26 + }, /turf/simulated/floor/tiled/dark, /area/ai_server_room) "dwX" = ( @@ -17049,6 +17682,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" @@ -17327,7 +17964,6 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "dPx" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -17346,6 +17982,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "dPS" = ( @@ -17386,6 +18028,7 @@ /obj/machinery/camera/network/exploration{ dir = 5 }, +/obj/structure/closet/secure_closet/pilot, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) "dSp" = ( @@ -17431,6 +18074,15 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"dVD" = ( +/obj/structure/table/steel, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 9; + pixel_y = -24 + }, +/turf/simulated/floor, +/area/storage/tech) "dVT" = ( /obj/structure/closet, /obj/random/maintenance/clean, @@ -18096,6 +18748,7 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) +<<<<<<< HEAD "eJJ" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Asteroid Station"; @@ -18109,6 +18762,22 @@ /obj/structure/cable/green, /turf/simulated/floor, /area/maintenance/substation/civilian) +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +"eJJ" = ( +/obj/machinery/power/smes/buildable{ + RCon_tag = "Substation - Asteroid Civilian"; + cur_coils = 2; + output_attempt = 0 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green, +/turf/simulated/floor, +/area/maintenance/substation/civilian) +======= +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "eJU" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/wall/rshull, @@ -18455,6 +19124,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/chamber) "fdw" = ( @@ -18660,7 +19333,6 @@ name = "\improper Telecomms Solar Field" }) "fpX" = ( -/obj/structure/closet/secure_closet/pilot, /obj/effect/floor_decal/borderfloor, /obj/machinery/firealarm{ dir = 1; @@ -18805,13 +19477,10 @@ }, /area/tcommsat/chamber) "fwt" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/random/trash_pile, +/obj/machinery/light/small, /obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/station/exploration) +/turf/simulated/floor/tiled, +/area/janitor) "fwY" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -19004,6 +19673,18 @@ /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) +"fFM" = ( +/obj/structure/disposalpipe/segment, +/obj/random/junk, +/obj/random/junk, +/obj/structure/closet, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/tool, +/obj/random/tool, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "fGL" = ( /obj/machinery/light_construct/small, /turf/simulated/floor, @@ -19469,6 +20150,15 @@ }, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) +"gif" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "gjd" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -19560,6 +20250,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "gjZ" = ( @@ -19807,6 +20502,7 @@ /area/gateway) "gDl" = ( /obj/machinery/light_switch{ + dir = 1; pixel_x = -12; pixel_y = -24 }, @@ -20377,6 +21073,7 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +<<<<<<< HEAD "heQ" = ( /obj/machinery/power/apc{ dir = 4; @@ -20394,6 +21091,12 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +======= +"heB" = ( +/turf/simulated/wall, +/area/storage/emergency_storage/emergency4) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "hfo" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -20839,10 +21542,18 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "hwK" = ( -/obj/random/junk, -/obj/effect/floor_decal/rust, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor, -/area/maintenance/station/eng_lower) +/area/maintenance/substation/civilian) "hwX" = ( /obj/machinery/door/airlock/glass{ name = "Telecomms Storage"; @@ -20924,6 +21635,10 @@ /obj/item/weapon/stock_parts/subspace/treatment, /obj/item/weapon/stock_parts/subspace/treatment, /obj/item/weapon/stock_parts/subspace/treatment, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -26 + }, /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" @@ -21301,6 +22016,9 @@ dir = 10 }, /obj/structure/disposalpipe/segment, +/obj/structure/sign/poster{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) "hNs" = ( @@ -21428,6 +22146,12 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"hRu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/maintenance/substation/civilian) "hRF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -22171,7 +22895,6 @@ name = "\improper Telecomms Storage" }) "iAk" = ( -/obj/structure/closet/secure_closet/pilot, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -22190,6 +22913,7 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 4 }, +/obj/machinery/suit_cycler/pilot, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) "iAr" = ( @@ -23173,6 +23897,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "jEf" = ( @@ -23455,12 +24184,19 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "jUt" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Exploration Substation" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/random/junk, /turf/simulated/floor, -/area/maintenance/station/eng_lower) +/area/maintenance/substation/civilian) "jUS" = ( /obj/structure/cable/green{ d1 = 4; @@ -23900,14 +24636,8 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/maintenance/medical, -/obj/random/tool, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/turf/simulated/wall/r_wall, +/area/maintenance/substation/civilian) "kmS" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -23939,6 +24669,22 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"knK" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/janitor) "knR" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -24216,6 +24962,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"kAM" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -28 + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "kBZ" = ( /obj/structure/railing{ dir = 8 @@ -24629,9 +25382,6 @@ /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) "kSd" = ( -/obj/machinery/vending/cola{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -24647,6 +25397,9 @@ /obj/machinery/camera/network/tether{ dir = 4 }, +/obj/machinery/vending/fitness{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "kSu" = ( @@ -24969,6 +25722,12 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/tether/station/dock_two) +"lhm" = ( +/obj/machinery/power/breakerbox/activated{ + RCon_tag = "Exploration Substation Bypass" + }, +/turf/simulated/floor, +/area/maintenance/substation/civilian) "lhz" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -25069,7 +25828,7 @@ /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "llC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -25643,6 +26402,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "lIB" = ( @@ -26424,6 +27184,10 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "mto" = ( @@ -26462,6 +27226,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "mvn" = ( @@ -26529,6 +27296,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "myN" = ( @@ -26561,6 +27331,9 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/equipment) "mzV" = ( @@ -26611,6 +27384,14 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"mAl" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/simulated/wall/r_wall, +/area/maintenance/substation/civilian) "mBY" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -26635,7 +27416,6 @@ /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) "mCI" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -26647,6 +27427,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "mEA" = ( @@ -27231,6 +28012,24 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"neb" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "nfp" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -27400,7 +28199,9 @@ /area/tether/station/dock_one) "nll" = ( /obj/random/trash_pile, +/obj/machinery/light/small, /turf/simulated/floor, +<<<<<<< HEAD /area/maintenance/cargo) "nlw" = ( /obj/structure/disposalpipe/segment, @@ -27422,6 +28223,11 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/area/maintenance/cargo) +======= +/area/storage/emergency_storage/emergency4) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "nmN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 @@ -27542,6 +28348,15 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) +"nsH" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/engi{ + name = "Exploration Substation" + }, +/turf/simulated/floor, +/area/maintenance/substation/civilian) "ntd" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -27904,6 +28719,14 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) +"nJP" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad" + }, +/obj/structure/sign/poster, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "nKT" = ( /obj/structure/closet, /obj/random/maintenance/clean, @@ -28537,6 +29360,15 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/station/cargo) +"ovQ" = ( +/obj/machinery/firealarm{ + pixel_y = 25 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/maintenance/substation/civilian) "owo" = ( /obj/structure/window/reinforced{ dir = 4 @@ -28656,6 +29488,23 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"oEH" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/airlock{ + name = "Custodial Closet"; + req_access = list(26) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/janitor) "oFl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -28752,6 +29601,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"oRC" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "oRO" = ( /obj/effect/floor_decal/rust, /obj/structure/catwalk, @@ -29184,6 +30039,9 @@ dir = 4 }, /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/maintenance/station/eng_lower) "pwU" = ( @@ -29215,6 +30073,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "pyE" = ( @@ -29264,6 +30126,7 @@ /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "pBP" = ( +<<<<<<< HEAD /obj/machinery/power/sensor{ name = "Powernet Sensor - Asteroid Station Subgrid"; name_tag = "Asteroid Station Subgrid" @@ -29281,9 +30144,32 @@ /obj/machinery/alarm{ dir = 8; pixel_x = 25 +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Asteroid Civilian Subgrid"; + name_tag = "Asteroid Civilian Subgrid" }, -/turf/simulated/floor, -/area/maintenance/substation/civilian) +/obj/structure/cable/green, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25 +======= +/obj/machinery/door/airlock{ + id_tag = "bathroomlock16"; + name = "Toilet 2" +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "pCb" = ( /obj/machinery/light, /turf/simulated/shuttle/floor/yellow, @@ -29350,6 +30236,9 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/quartermaster/qm) +"pKC" = ( +/turf/simulated/wall, +/area/janitor) "pLb" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -29364,6 +30253,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = 4 + }, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) "pMe" = ( @@ -29378,12 +30272,22 @@ "pMf" = ( /turf/simulated/floor, /area/maintenance/station/exploration) +<<<<<<< HEAD "pMg" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/floor, /area/maintenance/station/exploration) +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +======= +"pNV" = ( +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "pOc" = ( /obj/machinery/door/window/westleft{ dir = 1 @@ -29722,6 +30626,11 @@ /area/quartermaster/foyer) "qjQ" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -25; + pixel_y = 20 + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "qkG" = ( @@ -29904,14 +30813,25 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "qri" = ( -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/engineering, -/obj/random/maintenance/medical, -/obj/random/tool, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Exploration Subgrid"; + name_tag = "Exploration Subgrid" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, /turf/simulated/floor, -/area/maintenance/station/eng_lower) +/area/maintenance/substation/civilian) "qrr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30704,11 +31624,18 @@ icon_state = "1-2" }, /obj/structure/railing, -/obj/random/junk, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/space_heater, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, +/area/storage/emergency_storage/emergency4) +"rkH" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/catwalk, +/turf/simulated/floor, +<<<<<<< HEAD /area/maintenance/cargo) "rjV" = ( /obj/structure/disposalpipe/segment, @@ -30730,6 +31657,11 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/area/maintenance/cargo) +======= +/area/storage/emergency_storage/emergency4) +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "rlr" = ( /obj/structure/table/standard, /obj/item/weapon/tape_roll, @@ -30754,6 +31686,19 @@ }, /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/belter) +"rot" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "rpf" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -30916,6 +31861,9 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) +"rxi" = ( +/turf/simulated/wall/r_wall, +/area/maintenance/substation/civilian) "rxE" = ( /obj/structure/table/steel, /obj/item/weapon/cell/high{ @@ -31590,6 +32538,10 @@ d2 = 2; icon_state = "0-2" }, +/obj/machinery/light_switch{ + pixel_x = 12; + pixel_y = 30 + }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "sme" = ( @@ -31627,6 +32579,16 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"spX" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -13; + pixel_y = -30 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/belterdock) "sqz" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet{ @@ -32718,6 +33680,13 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) +"tFR" = ( +/obj/random/junk, +/obj/random/junk, +/obj/random/tool, +/obj/structure/closet/crate, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "tGc" = ( /obj/structure/cable/green{ d1 = 2; @@ -33081,12 +34050,9 @@ /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "ucJ" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/random/junk, +/obj/effect/floor_decal/rust, /turf/simulated/floor, -/area/maintenance/cargo) +/area/storage/emergency_storage/emergency4) "ucL" = ( /obj/structure/cable{ icon_state = "1-4" @@ -33580,6 +34546,9 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 8 }, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "uKw" = ( @@ -33777,11 +34746,20 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "uTC" = ( +<<<<<<< HEAD /obj/machinery/power/breakerbox/activated{ RCon_tag = "Asteroid Station Substation Bypass" +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +/obj/machinery/power/breakerbox/activated{ + RCon_tag = "Asteroid Civilian Substation Bypass" +======= +/obj/machinery/door/airlock{ + id_tag = "bathroomlock17"; + name = "Toilet 2" +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff }, -/turf/simulated/floor, -/area/maintenance/substation/civilian) +/turf/simulated/floor/tiled/white, +/area/tether/station/restroom) "uTX" = ( /obj/structure/table/rack, /obj/item/weapon/pickaxe, @@ -33789,6 +34767,7 @@ /obj/item/weapon/tool/crowbar, /obj/item/weapon/shovel, /obj/machinery/light_switch{ + dir = 1; pixel_x = -11; pixel_y = -24 }, @@ -34040,6 +35019,14 @@ "veJ" = ( /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) +"vfW" = ( +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 31; + pixel_y = -6 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) "vga" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, @@ -34305,6 +35292,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"vAk" = ( +/obj/structure/sink{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/janitor) "vAn" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 @@ -34464,6 +35457,10 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/machinery/light_switch{ + pixel_x = -11; + pixel_y = 26 + }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "vMN" = ( @@ -34766,17 +35763,8 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "wku" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/engi{ - name = "Civilian Substation" - }, -/turf/simulated/floor, -/area/maintenance/substation/civilian) +/turf/simulated/wall, +/area/tether/station/restroom) "wmg" = ( /obj/structure/cable{ d1 = 4; @@ -34963,15 +35951,10 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "wDI" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, /obj/machinery/light, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) "wEF" = ( @@ -35590,18 +36573,17 @@ /turf/simulated/floor/tiled/dark, /area/gateway) "xnM" = ( -/obj/structure/railing{ +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -28 + }, +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor, -/area/maintenance/station/exploration) +/obj/machinery/disposal, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/janitor) "xpA" = ( /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -35646,12 +36628,21 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "xuf" = ( -/obj/machinery/light/small, -/obj/structure/railing{ - dir = 1 +/obj/item/weapon/storage/box/lights/mixed, +/obj/item/weapon/storage/box/mousetraps, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/machinery/alarm{ + breach_detection = 0; + dir = 8; + pixel_x = 27; + rcon_setting = 3; + report_danger_level = 0 }, -/turf/simulated/floor, -/area/maintenance/station/exploration) +/obj/item/weapon/soap/nanotrasen, +/obj/structure/closet, +/turf/simulated/floor/tiled, +/area/janitor) "xuh" = ( /obj/structure/cable/green{ d1 = 1; @@ -35791,6 +36782,7 @@ /obj/item/weapon/storage/box/nifsofts_mining, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, +/obj/structure/sign/poster, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "xBF" = ( @@ -44854,8 +45846,8 @@ arf bhc axC awc -rpf -tUh +rkH +heB llt aDv aDv @@ -44946,7 +45938,7 @@ aln hmm apC cue -aka +dVD aaN uWn acz @@ -44992,13 +45984,13 @@ jou mEA bVP lLY -tUh +heB aCS ucJ bvw -lwh -tUh -tUh +dqw +heB +heB aDv qai qmD @@ -45119,7 +46111,7 @@ als aij qri bJG -xOY +lhm kmO adV kAv @@ -45134,7 +46126,7 @@ jou ahb aim vzc -tUh +heB awZ bqj rjf @@ -45259,11 +46251,11 @@ avL awT auc aij -ack +ovQ hwK -ach +bQc jUt -ack +gif ack aMr aqt @@ -45401,10 +46393,10 @@ aij aij aij aij -ack -ach -ack -azD +nsH +mAl +rxi +hRu adZ aUX aMx @@ -45542,8 +46534,8 @@ atT dso dso acM -dso -dso +acr +neb ujK dso aGy @@ -45687,9 +46679,9 @@ abC anE aBH aBH -aBH +fFM aGP -kkH +tFR aeO aeO aeO @@ -45827,11 +46819,11 @@ abC abC abC puz -alQ -alQ -aBR -ads -alQ +wku +wku +wku +wku +wku aeO afy afy @@ -45968,12 +46960,12 @@ msn anc mYJ abC -azD -aBR +bhG +wku aDM -aEX +wku aof -alQ +wku aeO afy afy @@ -46113,9 +47105,9 @@ abC azJ wku pBP -eJJ +wku uTC -alQ +wku aeO afy afy @@ -46252,12 +47244,12 @@ muY mIs nay abC -cXs -alQ -alQ -alQ -alQ -alQ +rot +wku +pNV +oRC +kAM +wku aeO afy afy @@ -46395,11 +47387,11 @@ mIs nay abC cXs -alT +wku aDP adj adU -aoO +wku aeO aeO afy @@ -46537,11 +47529,11 @@ mJd nbQ abC cXs -alT +wku amE adq aoi -alT +wku aes aeP aeU @@ -46679,11 +47671,11 @@ asP tfx bZv azI -alT -alT +wku +wku aFe -alT -alT +wku +wku crl nre acm @@ -47000,8 +47992,16 @@ hLW sBs nob azc +<<<<<<< HEAD lLC azV +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +aah +azV +======= +aah +vfW +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff aBP pmX aDS @@ -47158,7 +48158,7 @@ pyQ bwH fva cVW -cHV +spX seR tBs kAo @@ -47255,6 +48255,7 @@ smz smz smz smz +<<<<<<< HEAD bWY etY xgV @@ -47265,6 +48266,29 @@ xgV icR iRq xgV +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +bWY +etY +aaD +aaD +aaD +aaD +abn +aaD +abU +aaD +======= +oEH +pKC +aaD +aaD +aaD +aaD +abn +aaD +abU +aaD +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff ahL phy vYO @@ -47397,7 +48421,7 @@ dch dQR eVP smz -bfH +knK xnM xgV fID @@ -47539,7 +48563,7 @@ dge lSR fpX smz -hrw +vAk fwt xgV fQE @@ -47823,6 +48847,7 @@ amm dUk ybD smz +<<<<<<< HEAD bfH pMg xgV @@ -47833,6 +48858,29 @@ hlK hlK jyy xgV +||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff +bfH +acr +aaD +aaK +aaY +abh +abp +abQ +aca +aaD +======= +etY +etY +aaD +aaK +aaY +abh +abp +abQ +aca +aaD +>>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff rUS kVK lvh @@ -47999,7 +49047,7 @@ aDz aDz aDy aEc -aEh +nJP awN btM xur diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index dccd5f9e77..bfe39dccae 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -951,6 +951,10 @@ name = "\improper Dock Three" icon_state = "dk_yellow" +/area/tether/station/restroom + name = "\improper Unisex Restroom" + icon_state = "dk_yellow" + /area/maintenance/station/abandonedholodeck name = "\improper Old Holodeck" icon_state = "dk_yellow"