From 4e11d2c26a77b6c1d199ceb6aee067fb006eb6f9 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 11 Jan 2020 06:42:59 +1000 Subject: [PATCH] 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 601c80f9e14..199d82b5617 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 8534ca84a58..1915d55f54c 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 b0d69e820b5..97b05955cb7 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 409117380eb..9372846f2c0 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 8bebd9499f3..ffdc9e60c95 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 41d0df520e4..a3402bb4de2 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" = (