From 0c948f9425fd94aff52ba94544678dc29d94cffc Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 11 Jan 2020 06:12:12 +1000 Subject: [PATCH 1/2] Adds a bunch of wall nanomeds around station --- maps/tether/tether-01-surface1.dmm | 9 ++++ maps/tether/tether-02-surface2.dmm | 3 ++ maps/tether/tether-03-surface3.dmm | 72 ++++++++++++++++------------ maps/tether/tether-05-station1.dmm | 11 ++++- maps/tether/tether-06-station2.dmm | 58 ++++++++++++++-------- maps/tether/tether-07-station3.dmm | 77 +++++++++++++++++------------- maps/tether/tether_things.dm | 3 ++ 7 files changed, 146 insertions(+), 87 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 15a19e92a0..601c80f9e1 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -10101,6 +10101,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "arq" = ( +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) "arr" = ( @@ -17481,6 +17484,9 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "aCI" = ( @@ -28973,6 +28979,9 @@ "aWW" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, +/obj/machinery/vending/wallmed1/public{ + pixel_y = -28 + }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aWX" = ( diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 750ecb96a2..8534ca84a5 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -7269,6 +7269,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/vending/wallmed1/public{ + pixel_y = -28 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "aoK" = ( diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index e47d1cdbc4..b0d69e820b 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -6205,12 +6205,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ake" = ( -/obj/structure/bed/padded, -/obj/effect/floor_decal/techfloor{ - dir = 8 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/structure/table/standard, +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "akf" = ( /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) @@ -8517,16 +8523,15 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aof" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/light{ - icon_state = "tube1"; +/obj/structure/bed/padded, +/obj/effect/floor_decal/techfloor{ dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/panic_shelter) "aog" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) @@ -23727,8 +23732,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/assembly/chargebay) "aMw" = ( -/obj/machinery/camera/network/civilian{ - dir = 9 +/obj/structure/table/woodentable, +/obj/machinery/vending/wallmed1/public{ + pixel_x = 28 }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) @@ -27823,6 +27829,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aUg" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) +"aUh" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/reinforced, /turf/simulated/shuttle/plating/carry, @@ -28305,16 +28325,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aVr" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 - }, -/obj/structure/table/standard, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) "aVs" = ( /obj/structure/lattice, /turf/simulated/open, @@ -40060,7 +40070,7 @@ amw aDX aDZ aob -aof +aUg akY apo apO @@ -45587,7 +45597,7 @@ aUS aJl aVj aSP -aVr +ake aVu aix ajX @@ -45643,7 +45653,7 @@ aNk aNl aNJ aNP -aUg +aUh aKU abg aOk @@ -45785,7 +45795,7 @@ aNl aNl aNK aNP -aUg +aUh aKU abg aOk @@ -45927,7 +45937,7 @@ aNm aNl aNK aNP -aUg +aUh aKU abg aOk @@ -46726,7 +46736,7 @@ aac aac aio ajl -ake +aof akN als ame diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 29cbe430c6..409117380e 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -11250,6 +11250,9 @@ dir = 9 }, /obj/effect/floor_decal/techfloor, +/obj/machinery/vending/wallmed1/public{ + pixel_y = -28 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "aub" = ( @@ -17255,6 +17258,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) +"aDS" = ( +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, +/turf/simulated/floor/tiled, +/area/tether/station/visitorhallway/lounge) "aDT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31930,7 +31939,7 @@ aya ayZ azv aCl -azP +aDS azY aAg aAY diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index d0dc1ac0ba..8bebd9499f 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -10197,21 +10197,18 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "oW" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/effect/floor_decal/borderfloor/corner{ +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) @@ -10463,8 +10460,27 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "pt" = ( -/turf/simulated/wall/r_wall, -/area/medical/surgery_hallway) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner{ + dir = 4 + }, +/obj/machinery/vending/wallmed1/public{ + pixel_x = 28 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "pu" = ( /obj/structure/table/bench/wooden, /obj/effect/landmark/start{ @@ -11292,6 +11308,9 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 1 }, +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 + }, /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "qI" = ( @@ -13948,9 +13967,6 @@ "uW" = ( /turf/simulated/wall, /area/medical/morgue) -"uX" = ( -/turf/simulated/wall/r_wall, -/area/medical/morgue) "uY" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ @@ -32767,8 +32783,8 @@ DS DV FB pU -oW pt +pp qP ry sc @@ -32909,8 +32925,8 @@ DL DL DL DL -uX -uX +uW +uW uW uW uW @@ -35599,7 +35615,7 @@ kt kt kt kt -nl +oW nR qC oY diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 7c9583a04d..41d0df520e 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -13152,9 +13152,10 @@ /turf/simulated/floor/wood, /area/hallway/station/upper) "un" = ( -/obj/structure/flora/pottedplant/flower, -/turf/simulated/floor/wood, -/area/hallway/station/upper) +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) "uo" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -14602,16 +14603,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "wL" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/structure/flora/pottedplant/flower, +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/turf/simulated/floor/wood, +/area/hallway/station/upper) "wM" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/reinforced, @@ -17351,16 +17348,19 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "AK" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 }, -/obj/effect/floor_decal/corner_steel_grid{ - dir = 10 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/vending/wallmed1/public{ + pixel_y = -28 }, /turf/simulated/floor/tiled, -/area/teleporter/departing) +/area/quartermaster/foyer) "AL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17489,10 +17489,19 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "AY" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled, +/area/teleporter/departing) "AZ" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/regular, @@ -35612,7 +35621,7 @@ Aa Bl SI Da -AK +AY EB Fp Gf @@ -40428,7 +40437,7 @@ iV iV iV sq -un +wL va vQ wy @@ -40553,7 +40562,7 @@ Zy WG dj XA -AY +un ms Oz be @@ -40695,7 +40704,7 @@ UJ Xb dj XN -AY +un ms Xq be @@ -40837,7 +40846,7 @@ iW WS dj XN -AY +un ms Xq be @@ -41120,7 +41129,7 @@ jZ WR Xo XN -AY +un cK ms Xq @@ -41688,7 +41697,7 @@ ea kx dj XN -AY +un cK ms mq @@ -41712,7 +41721,7 @@ vW wD xk xY -wL +AK zJ zL Ep @@ -41973,7 +41982,7 @@ kQ TG dj XN -AY +un ms mq be @@ -42115,7 +42124,7 @@ kR Vd dj XN -AY +un ms QL be @@ -42257,7 +42266,7 @@ ZE ZB dj XB -AY +un ms Sq be diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index fbe0a8d343..793caa6530 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -381,6 +381,9 @@ var/global/list/latejoin_tram = list() req_log_access = access_cmo has_logs = 1 +/obj/machinery/vending/wallmed1/public + products = list(/obj/item/stack/medical/bruise_pack = 8,/obj/item/stack/medical/ointment = 8,/obj/item/weapon/reagent_containers/hypospray/autoinjector = 16,/obj/item/device/healthanalyzer = 4) + /obj/item/weapon/reagent_containers/pill/airlock name = "\'Airlock\' Pill" desc = "Neutralizes toxins and provides a mild analgesic effect." From 4e11d2c26a77b6c1d199ceb6aee067fb006eb6f9 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 11 Jan 2020 06:42:59 +1000 Subject: [PATCH 2/2] Removes and repositions the dispensers --- maps/tether/tether-01-surface1.dmm | 7 ++- maps/tether/tether-02-surface2.dmm | 7 ++- maps/tether/tether-03-surface3.dmm | 68 +++++++++++++++--------------- maps/tether/tether-05-station1.dmm | 14 ++---- maps/tether/tether-06-station2.dmm | 33 +++------------ maps/tether/tether-07-station3.dmm | 9 ---- 6 files changed, 51 insertions(+), 87 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 601c80f9e1..199d82b561 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -10464,7 +10464,6 @@ /area/tether/surfacebase/medical/first_aid_west) "arR" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, /obj/random/medical/lite, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/first_aid_west) @@ -17484,9 +17483,6 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/machinery/vending/wallmed1/public{ - pixel_x = -28 - }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "aCI" = ( @@ -27834,6 +27830,9 @@ }, /obj/structure/table/standard, /obj/item/clothing/head/soft/purple, +/obj/machinery/vending/wallmed1/public{ + pixel_x = 28 + }, /turf/simulated/floor/tiled, /area/crew_quarters/showers) "aUN" = ( diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 8534ca84a5..1915d55f54 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -928,8 +928,10 @@ "abT" = ( /obj/effect/floor_decal/techfloor, /obj/structure/table/steel, -/obj/item/weapon/storage/firstaid/regular, /obj/random/medical/lite, +/obj/machinery/vending/wallmed1/public{ + pixel_y = -28 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) "abU" = ( @@ -7269,9 +7271,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/vending/wallmed1/public{ - pixel_y = -28 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "aoK" = ( diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index b0d69e820b..97b05955cb 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -5303,18 +5303,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_restroom) "aiI" = ( -/obj/structure/sink{ - dir = 8; - icon_state = "sink"; - pixel_x = -12; - pixel_y = 0 +/obj/machinery/camera/network/civilian{ + dir = 9 }, -/obj/structure/mirror{ - pixel_x = -25; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/recreation_area_restroom) +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "aiJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22722,11 +22715,16 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "aKv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "aKw" = ( /obj/machinery/light/small{ dir = 1 @@ -23732,12 +23730,21 @@ /turf/simulated/floor/tiled/steel_grid, /area/assembly/chargebay) "aMw" = ( -/obj/structure/table/woodentable, -/obj/machinery/vending/wallmed1/public{ - pixel_x = 28 +/obj/structure/sink{ + dir = 8; + icon_state = "sink"; + pixel_x = -12; + pixel_y = 0 }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/obj/structure/mirror{ + pixel_x = -25; + pixel_y = 0 + }, +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/recreation_area_restroom) "aMx" = ( /obj/machinery/computer/cryopod/robot{ dir = 1; @@ -27829,19 +27836,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aUg" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 }, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "aUh" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/reinforced, @@ -40070,13 +40072,13 @@ amw aDX aDZ aob -aUg +aKv akY apo apO aqB afj -aiI +aMw arD afQ awL @@ -40921,7 +40923,7 @@ alO amx ana anF -aMw +aiI aou akY aix @@ -47631,7 +47633,7 @@ aHB aIn aIT arJ -aKv +aUg aLh aGK aGK diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 409117380e..9372846f2c 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -11250,9 +11250,6 @@ dir = 9 }, /obj/effect/floor_decal/techfloor, -/obj/machinery/vending/wallmed1/public{ - pixel_y = -28 - }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "aub" = ( @@ -16428,6 +16425,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/vending/wallmed1/public{ + pixel_x = 28 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "aCE" = ( @@ -17258,12 +17258,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/station/spacecommandmaint) -"aDS" = ( -/obj/machinery/vending/wallmed1/public{ - pixel_x = -28 - }, -/turf/simulated/floor/tiled, -/area/tether/station/visitorhallway/lounge) "aDT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31939,7 +31933,7 @@ aya ayZ azv aCl -aDS +azP azY aAg aAY diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 8bebd9499f..ffdc9e60c9 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -10197,21 +10197,10 @@ /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) "oW" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/vending/wallmed1/public{ - pixel_y = 28 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/starboard) +/obj/structure/table/reinforced, +/obj/random/tetheraid, +/turf/simulated/floor/tiled/white, +/area/maintenance/station/sec_lower) "oX" = ( /obj/structure/sign/nosmoking_1, /turf/simulated/wall, @@ -10476,9 +10465,6 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 4 }, -/obj/machinery/vending/wallmed1/public{ - pixel_x = 28 - }, /turf/simulated/floor/tiled, /area/hallway/station/starboard) "pu" = ( @@ -11308,9 +11294,6 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 1 }, -/obj/machinery/vending/wallmed1/public{ - pixel_y = 28 - }, /turf/simulated/floor/tiled/dark, /area/tether/station/public_meeting_room) "qI" = ( @@ -21117,10 +21100,6 @@ /obj/item/weapon/book/manual/medical_diagnostics_manual, /turf/simulated/floor/tiled/white, /area/maintenance/station/sec_lower) -"Nb" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/white, -/area/maintenance/station/sec_lower) "Nc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -27783,7 +27762,7 @@ at NN QN GW -Nb +oW Ft Fe at @@ -35615,7 +35594,7 @@ kt kt kt kt -oW +nl nR qC oY diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 41d0df520e..a3402bb4de 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -14604,9 +14604,6 @@ /area/quartermaster/office) "wL" = ( /obj/structure/flora/pottedplant/flower, -/obj/machinery/vending/wallmed1/public{ - pixel_y = 28 - }, /turf/simulated/floor/wood, /area/hallway/station/upper) "wM" = ( @@ -17356,9 +17353,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/machinery/vending/wallmed1/public{ - pixel_y = -28 - }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "AL" = ( @@ -17497,9 +17491,6 @@ /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, -/obj/machinery/vending/wallmed1/public{ - pixel_y = 28 - }, /turf/simulated/floor/tiled, /area/teleporter/departing) "AZ" = (