diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 15a19e92a0..199d82b561 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" = ( @@ -10461,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) @@ -27828,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" = ( @@ -28973,6 +28978,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..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" = ( diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index e47d1cdbc4..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 @@ -6205,12 +6198,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 +8516,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) @@ -22717,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 @@ -23727,11 +23730,21 @@ /turf/simulated/floor/tiled/steel_grid, /area/assembly/chargebay) "aMw" = ( -/obj/machinery/camera/network/civilian{ - dir = 9 +/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; @@ -27823,6 +27836,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aUg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"aUh" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/reinforced, /turf/simulated/shuttle/plating/carry, @@ -28305,16 +28327,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,13 +40072,13 @@ amw aDX aDZ aob -aof +aKv akY apo apO aqB afj -aiI +aMw arD afQ awL @@ -40911,7 +40923,7 @@ alO amx ana anF -aMw +aiI aou akY aix @@ -45587,7 +45599,7 @@ aUS aJl aVj aSP -aVr +ake aVu aix ajX @@ -45643,7 +45655,7 @@ aNk aNl aNJ aNP -aUg +aUh aKU abg aOk @@ -45785,7 +45797,7 @@ aNl aNl aNK aNP -aUg +aUh aKU abg aOk @@ -45927,7 +45939,7 @@ aNm aNl aNK aNP -aUg +aUh aKU abg aOk @@ -46726,7 +46738,7 @@ aac aac aio ajl -ake +aof akN als ame @@ -47621,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 29cbe430c6..9372846f2c 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -16425,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" = ( diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index d0dc1ac0ba..ffdc9e60c9 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -10197,24 +10197,10 @@ /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/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 - }, -/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, @@ -10463,8 +10449,24 @@ /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 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/starboard) "pu" = ( /obj/structure/table/bench/wooden, /obj/effect/landmark/start{ @@ -13948,9 +13950,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{ @@ -21101,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 @@ -27767,7 +27762,7 @@ at NN QN GW -Nb +oW Ft Fe at @@ -32767,8 +32762,8 @@ DS DV FB pU -oW pt +pp qP ry sc @@ -32909,8 +32904,8 @@ DL DL DL DL -uX -uX +uW +uW uW uW uW diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 7c9583a04d..a3402bb4de 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,9 @@ /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/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/obj/structure/flora/pottedplant/flower, +/turf/simulated/floor/wood, +/area/hallway/station/upper) "wM" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/reinforced, @@ -17351,16 +17345,16 @@ /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 }, /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 +17483,16 @@ /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 + }, +/turf/simulated/floor/tiled, +/area/teleporter/departing) "AZ" = ( /obj/structure/table/glass, /obj/item/weapon/storage/firstaid/regular, @@ -35612,7 +35612,7 @@ Aa Bl SI Da -AK +AY EB Fp Gf @@ -40428,7 +40428,7 @@ iV iV iV sq -un +wL va vQ wy @@ -40553,7 +40553,7 @@ Zy WG dj XA -AY +un ms Oz be @@ -40695,7 +40695,7 @@ UJ Xb dj XN -AY +un ms Xq be @@ -40837,7 +40837,7 @@ iW WS dj XN -AY +un ms Xq be @@ -41120,7 +41120,7 @@ jZ WR Xo XN -AY +un cK ms Xq @@ -41688,7 +41688,7 @@ ea kx dj XN -AY +un cK ms mq @@ -41712,7 +41712,7 @@ vW wD xk xY -wL +AK zJ zL Ep @@ -41973,7 +41973,7 @@ kQ TG dj XN -AY +un ms mq be @@ -42115,7 +42115,7 @@ kR Vd dj XN -AY +un ms QL be @@ -42257,7 +42257,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."