From 430663e621734201fa90cfce65b2ecb73a9d12d7 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Mon, 4 Apr 2022 19:52:19 -0400 Subject: [PATCH] These too --- maps/groundbase/gb-z1.dmm | 312 +++++++++++++++++++++++++++++--------- maps/groundbase/gb-z3.dmm | 18 ++- 2 files changed, 253 insertions(+), 77 deletions(-) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index afd94d5b2dc..2dc1e00b882 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -187,6 +187,14 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/chamber) +"ay" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/outdoors/sidewalk/virgo3c, +/area/groundbase/level1/centsquare) "az" = ( /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/dark, @@ -358,15 +366,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/or1) -"aU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) "aV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ @@ -624,6 +623,11 @@ /area/groundbase/level1/eastspur) "bL" = ( /obj/machinery/vending/loadout/accessory, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "bO" = ( @@ -954,6 +958,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/foyer) +"cH" = ( +/obj/item/weapon/stool/baystool/padded{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/cafe) "cI" = ( /obj/machinery/power/apc{ dir = 8 @@ -1174,6 +1187,11 @@ "dj" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/bar_soft/full, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 21 + }, /turf/simulated/floor/lino, /area/groundbase/civilian/bar) "dk" = ( @@ -2385,6 +2403,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/virgo3c{ edge_blending_priority = -1; outdoors = 0 @@ -3224,6 +3243,15 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) +"iE" = ( +/obj/structure/table/bench/padded, +/obj/effect/landmark/start/entertainer, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "iF" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Science Substation Bypass" @@ -4099,12 +4127,6 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) -"kN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/groundbase/civilian/cafe) "kP" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -4845,6 +4867,10 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/security/briefing) +"mL" = ( +/obj/machinery/media/jukebox, +/turf/simulated/floor/wood, +/area/groundbase/civilian/cafe) "mM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5402,6 +5428,10 @@ }, /obj/item/weapon/storage/toolbox/electrical, /obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "om" = ( @@ -5473,6 +5503,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "ov" = ( @@ -6289,6 +6324,14 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) +"qC" = ( +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/lhallway) "qD" = ( /turf/simulated/wall/r_wall, /area/groundbase/command/ai/chamber) @@ -8713,6 +8756,17 @@ outdoors = 0 }, /area/maintenance/groundbase/level1/swtunnel) +"wY" = ( +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/groundbase/security/lobby) "wZ" = ( /obj/machinery/conveyor{ dir = 8; @@ -9079,6 +9133,18 @@ temperature = 80 }, /area/groundbase/command/tcomms) +"xR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/cafe) "xS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, @@ -9685,13 +9751,16 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/robot) "zu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/table/hardwoodtable, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "Cafe"; + layer = 3.3 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/lino, /area/groundbase/civilian/cafe) "zv" = ( /obj/machinery/requests_console/preset/engineering{ @@ -11156,15 +11225,6 @@ outdoors = 0 }, /area/maintenance/groundbase/level1/netunnel) -"Dg" = ( -/obj/item/weapon/stool/baystool/padded{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/groundbase/civilian/cafe) "Dh" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 5 @@ -11339,6 +11399,15 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/substation/medcargo) +"DF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/cafe) "DG" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 @@ -12175,6 +12244,14 @@ temperature = 80 }, /area/groundbase/command/tcomms) +"Ga" = ( +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/halls) "Gb" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -12767,13 +12844,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/engineering/techstorage) -"HF" = ( -/obj/structure/table/marble, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/groundbase/civilian/cafe) "HG" = ( /obj/structure/cable{ icon_state = "2-8" @@ -12809,6 +12879,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/simulated/floor/bmarble, /area/groundbase/civilian/cafe) "HJ" = ( @@ -13060,6 +13133,11 @@ "Is" = ( /obj/machinery/vending/loadout/uniform, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/autoresleeving) "It" = ( @@ -13288,6 +13366,11 @@ /obj/machinery/camera/network/medbay, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"IZ" = ( +/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ + outdoors = 0 + }, +/area/groundbase/command/ai/foyer) "Ja" = ( /obj/machinery/atmospherics/pipe/tank/phoron, /turf/simulated/floor/tiled/techmaint, @@ -14046,6 +14129,15 @@ temperature = 80 }, /area/groundbase/command/tcomms) +"KW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/cafe) "KX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -14143,6 +14235,15 @@ /obj/random/coin/sometimes, /turf/simulated/floor/tiled, /area/groundbase/civilian/toolstorage) +"Lf" = ( +/obj/machinery/power/apc{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/cafe) "Lg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14198,6 +14299,16 @@ /obj/effect/landmark/start/intern, /turf/simulated/floor/tiled, /area/groundbase/civilian/foodplace) +"Lp" = ( +/obj/structure/table/bench/padded, +/obj/effect/landmark/start/entertainer, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "Lq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -15404,6 +15515,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "On" = ( @@ -16461,6 +16575,14 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/substation/medcargo) +"Rw" = ( +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/engine) "Rx" = ( /obj/structure/cable{ icon_state = "2-4" @@ -16499,6 +16621,18 @@ /obj/structure/table/glass, /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) +"RA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, +/area/groundbase/level1/centsquare) "RC" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ @@ -16695,6 +16829,14 @@ /obj/effect/landmark/vermin, /turf/simulated/floor/lino, /area/groundbase/civilian/bar) +"Sc" = ( +/obj/machinery/camera/network/command{ + dir = 4 + }, +/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ + outdoors = 0 + }, +/area/groundbase/command/ai/foyer) "Se" = ( /obj/effect/floor_decal/industrial/danger{ dir = 8 @@ -17001,6 +17143,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/security/halls) +"SO" = ( +/obj/structure/table/marble, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/cafe) "SP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -17871,6 +18020,11 @@ "Vl" = ( /obj/item/weapon/book/manual/rotary_electric_generator, /obj/structure/table/reinforced, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 24 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) "Vm" = ( @@ -18733,6 +18887,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) +"Xu" = ( +/obj/structure/table/bench/padded, +/obj/item/device/radio/intercom{ + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "Xv" = ( /obj/machinery/light{ dir = 1 @@ -18743,6 +18904,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) "Xz" = ( @@ -19088,16 +19253,10 @@ }, /area/maintenance/groundbase/level1/stunnel) "Yx" = ( -/obj/structure/table/hardwoodtable, -/obj/machinery/door/blast/gate/thin{ - dir = 8; - id = "Cafe"; - layer = 3.3 +/obj/item/device/radio/intercom{ + pixel_y = -24 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/groundbase/civilian/cafe) "Yy" = ( /obj/structure/cable/yellow{ @@ -19268,6 +19427,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "YX" = ( @@ -23372,7 +23534,7 @@ MO pj ht ut -yA +iE vV bo bE @@ -23807,7 +23969,7 @@ KR ut AA GF -ut +Xu pj MO MO @@ -23921,11 +24083,11 @@ MO MO MO MO -FF +Sc lH LP lH -FF +IZ MO MO MO @@ -25644,7 +25806,7 @@ MO pj ht ut -yA +Lp vV ht pj @@ -26138,7 +26300,7 @@ Ic fw vv Hj -Tk +Ga Xj Tk jv @@ -26692,7 +26854,7 @@ Yf cB ij bp -fm +wY ZE iz IG @@ -29634,16 +29796,16 @@ Ul Oz Oz Om -Oz -Oz -Oz -Oz -Oz -Oz -Oz -Oz -Oz -Oz +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay YW Oz Oz @@ -29775,7 +29937,7 @@ tG tG Wp Eb -aU +RA Eb Eb Yt @@ -30059,9 +30221,9 @@ qE qE hr qX -zu +xR xt -HF +SO hr dk yO @@ -30201,7 +30363,7 @@ qE qE hr Wb -kN +DF RI np hr @@ -30343,9 +30505,9 @@ qE qE hr mb -kN -vi +DF vi +Yx hr pi Pb @@ -30484,8 +30646,8 @@ YQ YQ yu hr -vi -kN +Lf +KW pZ vi hr @@ -30627,9 +30789,9 @@ Ko Mu hr qV -Dg -vi +cH vi +mL hr zT hv @@ -30769,7 +30931,7 @@ pK hM hr gb -Yx +zu Rs gb hr @@ -32890,7 +33052,7 @@ oT Yp Ni jz -wA +qC ox wA DQ @@ -34220,7 +34382,7 @@ cU TL ej aw -ZF +Rw al UD wa diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 59b367533d7..ad29f7ac467 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -1546,6 +1546,14 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient4) +"CS" = ( +/obj/item/device/radio/intercom{ + pixel_y = -24 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ + outdoors = 0 + }, +/area/groundbase/level3/escapepad) "CU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2278,6 +2286,12 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/nw) +"Pd" = ( +/obj/item/device/radio/intercom{ + pixel_y = -24 + }, +/turf/simulated/floor/tiled/virgo3c, +/area/groundbase/medical/patio) "Pf" = ( /obj/machinery/mineral/equipment_vendor/survey, /turf/simulated/floor/tiled, @@ -6074,7 +6088,7 @@ ow ow ow ow -ow +CS hl Kr Kr @@ -15591,7 +15605,7 @@ xX xX xX OD -xX +Pd Vm Vm Vm