From b4a5066c5662e616f87820dcbafe2f998e09010c Mon Sep 17 00:00:00 2001 From: Enzo-Leon Date: Sat, 15 Apr 2023 19:37:03 -0700 Subject: [PATCH] RP-Map-Adjustments-Addendum --- maps/groundbase/gb-z1.dmm | 576 +++++++++++++++++++++++--------------- maps/groundbase/gb-z2.dmm | 99 +++++-- 2 files changed, 426 insertions(+), 249 deletions(-) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 268221d1aad..ed5284b76dc 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -437,12 +437,24 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "aZ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/groundbase/engineering/lobby) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock{ + name = "Men's Restroom" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk/side, +/area/groundbase/civilian/mensrestroom) "ba" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/dark, @@ -992,24 +1004,17 @@ }, /area/maintenance/groundbase/level1/nwtunnel) "cp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/vending/wallmed1/public{ - pixel_y = 28 +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = 12 }, -/turf/simulated/floor/tiled/asteroid_steel, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) "cq" = ( /obj/structure/table/standard, @@ -2163,11 +2168,11 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/eva) "eI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/medical/resleeving) +/turf/simulated/wall, +/area/groundbase/medical/autoresleeving) "eJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ @@ -2946,14 +2951,19 @@ /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/northspur) "gu" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/button/remote/airlock{ + id = "z1stall4"; + specialfunctions = 4; + pixel_y = 26 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/toilet{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, -/area/groundbase/medical/lhallway) +/area/groundbase/civilian/mensrestroom) "gv" = ( /turf/simulated/wall/r_wall, /area/groundbase/security/hos) @@ -4452,11 +4462,10 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "jT" = ( -/obj/structure/disposaloutlet, /obj/machinery/light{ dir = 1 }, -/obj/structure/disposalpipe/trunk, +/obj/machinery/washing_machine, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "jU" = ( @@ -4754,10 +4763,10 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/morgue) "kB" = ( -/obj/random/vendorall, /obj/machinery/alarm{ dir = 8 }, +/obj/machinery/vending/bepis, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "kC" = ( @@ -4792,7 +4801,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "kF" = ( @@ -4994,10 +5002,10 @@ /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "kX" = ( -/obj/random/vendorall, /obj/machinery/firealarm{ dir = 4 }, +/obj/machinery/vending/cigarette, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "kY" = ( @@ -6283,6 +6291,10 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/centsquare) "nO" = ( @@ -6515,6 +6527,13 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/groundbase/medical/morgue) +"oq" = ( +/obj/machinery/door/airlock{ + id_tag = "z1stall4"; + name = "Men's Restroom Stall" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "or" = ( /obj/structure/stairs/spawner/west, /obj/structure/railing/grey{ @@ -6868,10 +6887,6 @@ dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) @@ -7059,6 +7074,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) +"pI" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/black{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk, +/area/groundbase/level1/centsquare) "pJ" = ( /obj/machinery/light{ dir = 4 @@ -7477,6 +7499,7 @@ dir = 1; pixel_y = -22 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) "qP" = ( @@ -7679,6 +7702,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) +"rk" = ( +/obj/machinery/alarm{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/security/range) "rl" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -8078,25 +8107,10 @@ /turf/simulated/floor, /area/groundbase/engineering/storage) "sk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 }, -/obj/structure/mirror{ - icon_state = "mirror_broke"; - pixel_y = 37 - }, -/obj/structure/sink/kitchen{ - pixel_y = 16 - }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/firealarm{ - dir = 1 - }, -/turf/simulated/floor/tiled/asteroid_steel, +/turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) "sl" = ( /obj/machinery/camera/network/engineering{ @@ -8371,6 +8385,15 @@ }, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/groundbase/level1/southwestspur) +"sU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/outdoors/sidewalk, +/area/groundbase/level1/centsquare) "sV" = ( /turf/simulated/floor/outdoors/newdirt{ outdoors = 0 @@ -8651,6 +8674,9 @@ }, /obj/structure/table/steel, /obj/item/weapon/gun/energy/laser/practice, +/obj/machinery/alarm{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/security/range) "tB" = ( @@ -8825,6 +8851,19 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) +"tZ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "ua" = ( /turf/simulated/wall, /area/groundbase/level1/se) @@ -8848,10 +8887,6 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) "ue" = ( -/obj/machinery/door/airlock{ - name = "Men's Restroom" - }, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -8861,7 +8896,15 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/turf/simulated/floor/bmarble, +/obj/structure/disposalpipe/tagger{ + dir = 4; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) "uf" = ( /obj/structure/table/standard, @@ -9204,10 +9247,6 @@ /obj/machinery/alarm{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ external_pressure_bound = 101.3; external_pressure_bound_default = 101.3; @@ -9324,19 +9363,13 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "vl" = ( -/obj/machinery/light/small, -/obj/structure/toilet/prison{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/machinery/button/remote/airlock{ - dir = 4; - id = "z1stall4"; - pixel_x = -27; - specialfunctions = 4 +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/asteroid_steel, +/turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) "vm" = ( /obj/machinery/smartfridge/drinks, @@ -9517,25 +9550,23 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/security/halls) "vI" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "2-8" }, -/obj/machinery/alarm{ - pixel_y = 28 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/obj/machinery/light_switch{ - pixel_x = 15; - pixel_y = 30 +/obj/effect/floor_decal/corner/paleblue{ + dir = 4 }, -/turf/simulated/floor/tiled/asteroid_steel, +/turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) "vK" = ( /obj/structure/table/bench/padded, @@ -10143,19 +10174,15 @@ /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/storage) "xe" = ( -/obj/machinery/light/small, -/obj/structure/toilet/prison{ - dir = 8 - }, -/obj/machinery/button/remote/airlock{ +/obj/structure/sink/kitchen{ dir = 4; - id = "z1stall5"; - pixel_x = -27; - specialfunctions = 4 + pixel_x = 12 }, -/obj/effect/floor_decal/rust, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/asteroid_steel, +/obj/machinery/light/small, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) "xf" = ( /obj/machinery/power/breakerbox/activated{ @@ -10687,7 +10714,6 @@ /obj/machinery/firealarm{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "ys" = ( @@ -10752,6 +10778,19 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/or2) +"yy" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/table/bench/steel, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/security/range) "yz" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -10770,12 +10809,14 @@ /obj/effect/floor_decal/corner/pink{ dir = 6 }, -/obj/machinery/disposal/wall/cleaner{ - dir = 8 - }, /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/disposal/wall/cleaner{ + desc = "Automatically cleans and transports items to the local auto-resleeving facilities."; + dir = 8; + name = "auto-resleeving equipment deposit" + }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) "yD" = ( @@ -11265,6 +11306,9 @@ /obj/structure/closet/firecloset/full, /turf/simulated/floor, /area/maintenance/groundbase/trashpit) +"zP" = ( +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "zQ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -11360,10 +11404,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "Ab" = ( @@ -11570,10 +11610,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "AC" = ( @@ -11704,6 +11740,15 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) +"AU" = ( +/obj/machinery/alarm{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "AV" = ( /obj/machinery/light{ dir = 4 @@ -11814,13 +11859,14 @@ }, /area/groundbase/level1/se) "Bj" = ( -/obj/machinery/door/airlock{ - id_tag = "z1stall5"; - name = "Men's Restroom Stall" +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = 12 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) "Bk" = ( /turf/simulated/floor/outdoors/newdirt_nograss{ @@ -12278,6 +12324,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) "Cn" = ( @@ -12761,7 +12808,8 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) @@ -12785,13 +12833,13 @@ /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level1/northspur) "DB" = ( -/obj/machinery/door/airlock{ - id_tag = "z1stall4"; - name = "Men's Restroom Stall" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel_ridged, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, /area/groundbase/civilian/mensrestroom) "DC" = ( /obj/structure/bookcase, @@ -12807,6 +12855,13 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hos) +"DD" = ( +/obj/machinery/door/airlock{ + id_tag = "z1stall5"; + name = "Men's Restroom Stall" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "DE" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -13449,13 +13504,13 @@ /turf/simulated/floor, /area/groundbase/unexplored/outdoors) "Fg" = ( -/obj/random/vendorall, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /obj/machinery/camera/network/civilian{ dir = 8 }, +/obj/machinery/vending/snack, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "Fh" = ( @@ -13598,6 +13653,9 @@ dir = 8 }, /obj/structure/table/steel, +/obj/item/weapon/gun/energy/laser/practice, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/goggles, /turf/simulated/floor/tiled/dark, /area/security/range) "FB" = ( @@ -13670,12 +13728,11 @@ /turf/simulated/floor/tiled/dark, /area/security/range) "FJ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/black{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/groundbase/engineering/lobby) +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "FK" = ( /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled, @@ -13737,6 +13794,20 @@ /obj/structure/window/reinforced/polarized/full, /turf/simulated/floor, /area/groundbase/engineering/ce) +"FT" = ( +/obj/machinery/button/remote/airlock{ + id = "z1stall5"; + specialfunctions = 4; + pixel_y = 26 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/toilet{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "FU" = ( /obj/machinery/light{ dir = 8 @@ -13779,6 +13850,16 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) +"FZ" = ( +/obj/structure/flora/pottedplant/unusual, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "Ga" = ( /obj/item/device/radio/intercom{ dir = 4; @@ -14275,7 +14356,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/sign/painting/library_secure{ pixel_x = -30 @@ -14976,14 +15056,15 @@ /turf/simulated/floor/tiled/techfloor, /area/groundbase/civilian/arrivals) "IP" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 +/obj/machinery/vending/wallmed1/public{ + dir = 4; + pixel_x = -28 }, -/turf/simulated/floor, -/area/groundbase/engineering/lobby) +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "IQ" = ( /obj/structure/bed/chair/comfy/orange{ dir = 8 @@ -15322,18 +15403,17 @@ /area/groundbase/command/ai/chamber) "JJ" = ( /obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/medical{ id_tag = "Resleeving"; name = "Resleeving Lab"; req_access = list(5); req_one_access = null }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/resleeving) "JL" = ( @@ -16748,6 +16828,19 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/iaa1) +"MY" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/flora/pottedplant/unusual, +/obj/machinery/light/small, +/obj/effect/floor_decal/corner/paleblue/full, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "MZ" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -17653,6 +17746,21 @@ }, /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) +"Pk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/disposal/wall/cleaner{ + desc = "Automatically cleans and transports items to the local auto-resleeving facilities."; + dir = 8; + name = "auto-resleeving equipment deposit" + }, +/obj/structure/disposalpipe/trunk, +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "Pl" = ( /turf/simulated/floor/tiled/dark, /area/groundbase/security/warden) @@ -17798,6 +17906,19 @@ outdoors = 0 }, /area/maintenance/groundbase/level1/swtunnel) +"PD" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -30 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "PE" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -18114,6 +18235,13 @@ outdoors = 0 }, /area/groundbase/security/lobby) +"Qw" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 10 + }, +/turf/simulated/floor/outdoors/sidewalk, +/area/groundbase/level1/centsquare) "Qx" = ( /obj/machinery/conveyor{ dir = 4; @@ -19857,10 +19985,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) "UC" = ( @@ -19881,11 +20005,11 @@ }, /area/maintenance/groundbase/level1/netunnel) "UF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/groundbase/engineering/lobby) +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "UG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -20549,6 +20673,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) +"Wp" = ( +/obj/machinery/atmospherics/unary/outlet_injector{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor{ + edge_blending_priority = -1 + }, +/area/groundbase/level1/centsquare) "Wq" = ( /obj/machinery/button/remote/blast_door{ dir = 8; @@ -20565,7 +20698,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "Ws" = ( @@ -20701,9 +20833,8 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/centsquare) @@ -21027,7 +21158,6 @@ dir = 8 }, /obj/structure/table/steel, -/obj/item/weapon/gun/energy/laser/practice, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 20 @@ -21155,6 +21285,7 @@ name = "Engineering" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/bmarble, /area/groundbase/engineering/lobby) "XE" = ( @@ -21518,6 +21649,12 @@ "YC" = ( /turf/simulated/floor/outdoors/newdirt, /area/groundbase/level1/centsquare) +"YD" = ( +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/mensrestroom) "YE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor/southleft{ @@ -22065,7 +22202,6 @@ /area/groundbase/engineering/storage) "ZV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/medical{ id_tag = "Resleeving Shower"; @@ -24047,7 +24183,7 @@ DF Qr Qr Qr -Qr +rk Wy ce ce @@ -24897,7 +25033,7 @@ Wy oK AO Wn -JL +yy JL qT Wy @@ -32532,8 +32668,8 @@ yd Vh eR eR -eR -eR +pc +pc eR eR eR @@ -32674,8 +32810,8 @@ Eb Vh eR eR -eR -eR +pc +pc pc eR eR @@ -33080,7 +33216,7 @@ jn in Nz HN -Dz +eI Is Ko Mu @@ -33215,14 +33351,14 @@ jn jn pP wB -eI +wB wB Ap jn IY Dy qO -nb +Dz ZG pK hM @@ -33245,8 +33381,8 @@ eR pc pc pc -eR -eR +pc +pc eR eR eR @@ -33361,7 +33497,7 @@ Aa Wr kE JJ -gu +Fc UA WS ZO @@ -33810,7 +33946,7 @@ Eb Vh eR eR -eR +pc pc pc pc @@ -33818,9 +33954,9 @@ eR eR eR nN -Bv -Bv -Bv +sU +sU +sU WH Ku Gx @@ -33952,16 +34088,16 @@ Eb Vh eR eR -eR +pc pc pc pc pc eR +Yt +Qy Eb -TK -Eb -Eb +Yt aD GQ Mj @@ -34094,17 +34230,17 @@ Eb Vh eR eR -eR -eR -eR -eR -eR -eR -Yt -TK -Lt -Lt -ua +pc +pc +tj +tj +tj +tj +tj +aZ +tj +tj +tj IS IS bg @@ -34238,14 +34374,14 @@ eR eR eR eR -eR -eR -eR -eR tj +FZ +IP +AU +PD ue -tj -tj +tZ +MY tj ua ua @@ -34380,11 +34516,11 @@ eR eR eR eR -eR -eR -eR -eR tj +YD +FJ +FJ +Pk vI DB vl @@ -34522,14 +34658,14 @@ Eb Eb Eb Eb -Eb -Eb -Eb -Eb +tj +oq +tj +DD tj sk -tj -tj +zP +UF tj Lt Lt @@ -34664,10 +34800,10 @@ Eb Eb Eb Eb -Eb -FE -lZ -lZ +tj +gu +tj +FT tj cp Bj @@ -34808,8 +34944,8 @@ Eb FE Wl Wl -IP -IP +Wl +Wl Wl Wl Wl @@ -34946,12 +35082,12 @@ Bv wx YC Eb -Eb -AL +lZ +Wp Qc Tx -UF -UF +BW +BW ld Hw Xw @@ -35088,12 +35224,12 @@ YC wv lT lT -lT -lT +Qw +pI XD Cm -aZ -FJ +Eu +Eu Eu Eu yK diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 556b419c263..55007f41dba 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -1470,6 +1470,24 @@ }, /turf/simulated/floor/tiled, /area/groundbase/command/hop) +"ed" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/dorms) "ee" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -4867,6 +4885,16 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/hall) +"nL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/tagger{ + dir = 8; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/dorms) "nM" = ( /obj/structure/bed/chair/office/dark, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -13649,10 +13677,9 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "Mq" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "Mr" = ( @@ -18179,6 +18206,20 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) +"Zq" = ( +/obj/machinery/disposal/wall/cleaner{ + desc = "Automatically cleans and transports items to the local auto-resleeving facilities."; + dir = 8; + name = "auto-resleeving equipment deposit" + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/loading{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/dorms) "Zr" = ( /obj/structure/closet/secure_closet/hydroponics{ req_access = list(77) @@ -24668,7 +24709,7 @@ LN Xb BY eC -Mm +ed uZ Ie aF @@ -25102,7 +25143,7 @@ Wu RP XK As -Mq +bE IX yc jW @@ -25244,7 +25285,7 @@ jr iP Dw Dw -Yp +Mq Sy Cu bN @@ -25386,7 +25427,7 @@ hZ iA aA iA -iA +nL Ca sk bN @@ -25528,7 +25569,7 @@ pK Yp Ct Ai -Yp +Zq eM Sq jM @@ -30417,12 +30458,12 @@ oH oH oH oH -oH -oH -oH -oH -oH -oH +QD +QD +QD +QD +QD +QD Bo Bo Bo @@ -30559,10 +30600,10 @@ oH oH oH oH -oH -oH -oH -oH +QD +QD +QD +QD QD Bo Bo @@ -30701,10 +30742,10 @@ oH oH oH oH -oH -oH -oH -oH +QD +QD +QD +QD QD Bo Bo @@ -30843,10 +30884,10 @@ oH oH oH oH -oH -oH -oH -oH +QD +QD +QD +QD Bo Bo Bo @@ -30985,10 +31026,10 @@ oH oH oH oH -oH +QD Bo -oH -oH +QD +QD Bo Bo Bo