From a7e92bbd527abe13001f2462675f925889dc448b Mon Sep 17 00:00:00 2001 From: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Date: Wed, 26 Feb 2025 17:34:22 +0000 Subject: [PATCH] Dorm privacy switch and station map fixes (#17217) * Dorm privacy switch and station map fixes Added privacy switches to all dorm rooms, these buttons make an overlay appear on the room for ghosts preventing them seeing inside. This does not currently prevent them hearing emotes from inside the room, it's purely a visual block. Fixed station maps for the map linter PR, still have many more to do but those are out of the scope of this PR, just wanted to tick these ones off whilst I'm editing the maps anyway. * Also adds an air alarm to the atmos breakroom --- code/modules/power/privacy_switch.dm | 10 +- icons/obj/power_vr.dmi | Bin 27750 -> 28137 bytes maps/groundbase/gb-misc.dmm | 135 +++++------- maps/groundbase/gb-z2.dmm | 40 ++++ maps/groundbase/gb-z3.dmm | 10 +- maps/stellar_delight/ship_misc.dmm | 123 ++++------- maps/stellar_delight/stellar_delight1.dmm | 47 +++- maps/stellar_delight/stellar_delight2.dmm | 3 - maps/stellar_delight/stellar_delight3.dmm | 3 - maps/tether/submaps/tether_misc.dmm | 252 +++++++++------------- maps/tether/tether-01-surface1.dmm | 72 ++++--- maps/tether/tether-02-surface2.dmm | 26 +-- maps/tether/tether-03-surface3.dmm | 32 +-- maps/tether/tether-05-station1.dmm | 18 +- 14 files changed, 370 insertions(+), 401 deletions(-) diff --git a/code/modules/power/privacy_switch.dm b/code/modules/power/privacy_switch.dm index c18a6a295c8..1552f8373b6 100644 --- a/code/modules/power/privacy_switch.dm +++ b/code/modules/power/privacy_switch.dm @@ -1,14 +1,14 @@ /obj/structure/privacyswitch name = "privacy switch" - desc = "A special switch to increase the room's privavy. (Blocks ghosts from seeing the area)" + desc = "A special switch to increase the room's privavy. (Blocks ghosts from seeing the area, green indicates that ghosts are blocked.) Please disable this after use so that people can see the room is free more easily." icon = 'icons/obj/power_vr.dmi' - icon_state = "light0" + icon_state = "privacy0" var/nextUse = 0 /obj/structure/privacyswitch/Initialize() var/area/A = get_area(src) if(A?.flag_check(AREA_BLOCK_GHOST_SIGHT)) - icon_state = "light1" + icon_state = "privacy1" . = ..() /obj/structure/privacyswitch/attack_ai(mob/user) @@ -28,13 +28,13 @@ if(A.flag_check(AREA_BLOCK_GHOST_SIGHT)) A.flags ^= AREA_BLOCK_GHOST_SIGHT - icon_state = "light0" + icon_state = "privacy0" ghostnet.removeArea(A) to_chat(user, span_notice("The area is no longer protected from ghost vison.")) log_and_message_admins("toggled ghost vision in [A] on.", user) else A.flags ^= AREA_BLOCK_GHOST_SIGHT - icon_state = "light1" + icon_state = "privacy1" ghostnet.addArea(A) to_chat(user, span_notice("The area is now protected from ghost vison.")) log_and_message_admins("toggled ghost vision in [A] off.", user) diff --git a/icons/obj/power_vr.dmi b/icons/obj/power_vr.dmi index 0ced6510e6b30a59668daa37f2722f1c1cda4012..df6554dce0849106da100315b3a0f3ceb527749a 100644 GIT binary patch delta 7288 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 OURR9FE*2X&hW$Sm`MT!- delta 6918 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 diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm index a0c93058647..e4be2af24c7 100644 --- a/maps/groundbase/gb-misc.dmm +++ b/maps/groundbase/gb-misc.dmm @@ -1512,10 +1512,6 @@ }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm3) -"eG" = ( -/turf/space, -/turf/space/transit/north, -/area/space) "eH" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2420,31 +2416,6 @@ /obj/structure/prop/alien/power, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm6) -"hG" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdown"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/space, -/turf/space/transit/north, -/area/space) -"hH" = ( -/obj/effect/step_trigger/teleporter/random{ - affect_ghosts = 1; - name = "escapeshuttle_leave"; - teleport_x = 25; - teleport_x_offset = 245; - teleport_y = 25; - teleport_y_offset = 245; - teleport_z = 4; - teleport_z_offset = 4 - }, -/turf/space, -/turf/space/transit/north, -/area/space) "hX" = ( /obj/structure/table/woodentable/holotable, /obj/effect/landmark/costume/pirate, @@ -2972,10 +2943,6 @@ icon_state = "monotile" }, /area/holodeck/source_gym) -"PL" = ( -/turf/space, -/turf/space, -/area/space) "PM" = ( /turf/simulated/floor/smole/megablocks, /area/holodeck/source_smoleworld) @@ -14496,9 +14463,9 @@ ZC ZC ZC ZC -hH -hH -hH +ZC +ZC +ZC ap eI eI @@ -14638,9 +14605,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -14780,9 +14747,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -14922,9 +14889,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15064,9 +15031,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15206,9 +15173,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15348,9 +15315,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15490,9 +15457,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15612,29 +15579,29 @@ Yx Yx Yx Yx -hG -hG -hG -hG -hG -hG -eG -eG -hG -hG -eG -eG -eG -eG -eG -eG -eG -eG -eG -eG -eG -eG -hH +Yx +Yx +Yx +Yx +Yx +Yx +ZF +ZF +Yx +Yx +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZC ap eI eI @@ -16837,11 +16804,11 @@ ap ap ap ap -PL ap ap ap -PL +ap +ap ap xp ap @@ -17263,11 +17230,11 @@ ap ap ap ap -PL ap ap ap -PL +ap +ap ap xp ap diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 19569f82bc7..737f99f3e5c 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -2048,6 +2048,11 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/privacyswitch{ + dir = 4; + pixel_x = -30; + pixel_y = -27 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "fc" = ( @@ -3702,6 +3707,11 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/privacyswitch{ + pixel_y = -27; + dir = 8; + pixel_x = 30 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room5) "jK" = ( @@ -8826,6 +8836,11 @@ dir = 1; pixel_y = -30 }, +/obj/structure/privacyswitch{ + dir = 1; + pixel_y = -30; + pixel_x = -5 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "yC" = ( @@ -9721,6 +9736,11 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/privacyswitch{ + dir = 4; + pixel_x = -30; + pixel_y = -27 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room6) "Bj" = ( @@ -13403,6 +13423,11 @@ pixel_x = 7; id = "dorm8" }, +/obj/structure/privacyswitch{ + dir = 4; + pixel_x = -30; + pixel_y = -27 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room8) "Lu" = ( @@ -15392,6 +15417,11 @@ pixel_x = -7; id = "dorm7" }, +/obj/structure/privacyswitch{ + pixel_y = -27; + dir = 8; + pixel_x = 30 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room7) "QP" = ( @@ -15761,6 +15791,11 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/privacyswitch{ + pixel_y = -27; + dir = 8; + pixel_x = 30 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room3) "RR" = ( @@ -16975,6 +17010,11 @@ pixel_x = -27; id = "dorm2" }, +/obj/structure/privacyswitch{ + dir = 4; + pixel_y = 27; + pixel_x = -30 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "Vz" = ( diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 99416b3b972..be97cd06cb9 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -3207,6 +3207,14 @@ /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) +"WN" = ( +/obj/structure/privacyswitch{ + dir = 4; + pixel_y = 27; + pixel_x = -28 + }, +/turf/simulated/floor/carpet/retro, +/area/groundbase/dorms/bathroom) "WO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -9350,7 +9358,7 @@ mr Rq jP ip -ip +WN TU Rq jv diff --git a/maps/stellar_delight/ship_misc.dmm b/maps/stellar_delight/ship_misc.dmm index 01f2c019d30..43cf130c974 100644 --- a/maps/stellar_delight/ship_misc.dmm +++ b/maps/stellar_delight/ship_misc.dmm @@ -1512,10 +1512,6 @@ }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm3) -"eG" = ( -/turf/space, -/turf/space/transit/north, -/area/space) "eH" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2424,31 +2420,6 @@ /obj/structure/prop/alien/power, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm6) -"hG" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdown"; - nostop = 1; - stopper = 0; - tiles = 0 - }, -/turf/space, -/turf/space/transit/north, -/area/space) -"hH" = ( -/obj/effect/step_trigger/teleporter/random{ - affect_ghosts = 1; - name = "escapeshuttle_leave"; - teleport_x = 25; - teleport_x_offset = 245; - teleport_y = 25; - teleport_y_offset = 245; - teleport_z = 4; - teleport_z_offset = 4 - }, -/turf/space, -/turf/space/transit/north, -/area/space) "hX" = ( /obj/structure/table/woodentable/holotable, /obj/effect/landmark/costume/pirate, @@ -14476,9 +14447,9 @@ ZC ZC ZC ZC -hH -hH -hH +ZC +ZC +ZC ap eI eI @@ -14618,9 +14589,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -14760,9 +14731,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -14902,9 +14873,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15044,9 +15015,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15186,9 +15157,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15328,9 +15299,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15470,9 +15441,9 @@ ZF ZF ZF ZF -eG -eG -hH +ZF +ZF +ZC ap eI eI @@ -15592,29 +15563,29 @@ Yx Yx Yx Yx -hG -hG -hG -hG -hG -hG -eG -eG -hG -hG -eG -eG -eG -eG -eG -eG -eG -eG -eG -eG -eG -eG -hH +Yx +Yx +Yx +Yx +Yx +Yx +ZF +ZF +Yx +Yx +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZC ap eI eI diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index 0749458fd96..7ab25c0f3ec 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -12721,6 +12721,11 @@ pixel_x = -24; pixel_y = -24 }, +/obj/structure/privacyswitch{ + dir = 1; + pixel_x = -19; + pixel_y = -24 + }, /turf/simulated/floor/carpet, /area/stellardelight/deck1/dorms/dorm5) "AC" = ( @@ -13468,6 +13473,11 @@ pixel_x = 25; pixel_y = -24 }, +/obj/structure/privacyswitch{ + dir = 1; + pixel_x = 20; + pixel_y = -24 + }, /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm3) "Cc" = ( @@ -16767,6 +16777,11 @@ pixel_y = -8; specialfunctions = 4 }, +/obj/structure/privacyswitch{ + pixel_y = 5; + pixel_x = -32; + dir = 4 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/exam_room) "Js" = ( @@ -17301,6 +17316,10 @@ pixel_x = 25; pixel_y = 25 }, +/obj/structure/privacyswitch{ + pixel_y = 25; + pixel_x = 20 + }, /turf/simulated/floor/carpet, /area/stellardelight/deck1/dorms/dorm1) "KH" = ( @@ -17370,6 +17389,11 @@ pixel_x = -24; pixel_y = -24 }, +/obj/structure/privacyswitch{ + dir = 1; + pixel_x = -19; + pixel_y = -24 + }, /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm6) "KN" = ( @@ -18328,6 +18352,11 @@ pixel_x = 25; pixel_y = -24 }, +/obj/structure/privacyswitch{ + dir = 1; + pixel_x = 20; + pixel_y = -24 + }, /turf/simulated/floor/carpet, /area/stellardelight/deck1/dorms/dorm4) "MR" = ( @@ -18526,6 +18555,10 @@ pixel_x = 25; pixel_y = 25 }, +/obj/structure/privacyswitch{ + pixel_y = 25; + pixel_x = 20 + }, /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm2) "Np" = ( @@ -20886,12 +20919,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/angled_bay/standard/glass{ dir = 4; door_color = "#333333"; @@ -21051,6 +21078,10 @@ pixel_x = -24; pixel_y = 25 }, +/obj/structure/privacyswitch{ + pixel_y = 25; + pixel_x = -19 + }, /turf/simulated/floor/carpet, /area/stellardelight/deck1/dorms/dorm8) "SI" = ( @@ -21238,6 +21269,10 @@ pixel_x = -24; pixel_y = 25 }, +/obj/structure/privacyswitch{ + pixel_y = 25; + pixel_x = -19 + }, /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm7) "SZ" = ( diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index d26d1886ebc..c497f23d57b 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -9107,9 +9107,6 @@ /area/stellardelight/deck2/port) "tM" = ( /obj/structure/table/rack, -/obj/structure/bed/chair/wheelchair{ - dir = 4 - }, /obj/structure/bed/chair/wheelchair{ dir = 4 }, diff --git a/maps/stellar_delight/stellar_delight3.dmm b/maps/stellar_delight/stellar_delight3.dmm index 2e51d9e5443..ecb046084e7 100644 --- a/maps/stellar_delight/stellar_delight3.dmm +++ b/maps/stellar_delight/stellar_delight3.dmm @@ -13295,9 +13295,6 @@ /turf/simulated/floor/tiled/monotile, /area/stellardelight/deck3/commandhall) "Vr" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, /obj/structure/table/reinforced, /obj/item/paper_bin{ pixel_x = -3; diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 6fd74b68191..50dd87d839a 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -28,11 +28,6 @@ "ae" = ( /turf/unsimulated/mineral/virgo3b, /area/space) -"af" = ( -/obj/structure/table/woodentable/holotable, -/turf/space, -/turf/simulated/floor/holofloor/wood, -/area/holodeck/source_game_room) "ag" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -59,16 +54,6 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) -"ai" = ( -/obj/structure/bed/chair/holochair{ - dir = 4 - }, -/obj/effect/floor_decal/carpet{ - dir = 8 - }, -/turf/space, -/turf/simulated/floor/holofloor/carpet, -/area/holodeck/source_game_room) "aj" = ( /obj/machinery/light{ dir = 1 @@ -592,23 +577,8 @@ "bO" = ( /obj/structure/table/woodentable/holotable, /obj/effect/landmark/costume/elpresidente, -/turf/space, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) -"bP" = ( -/obj/effect/step_trigger/teleporter/random{ - affect_ghosts = 1; - name = "escapeshuttle_leave"; - teleport_x = 25; - teleport_x_offset = 245; - teleport_y = 25; - teleport_y_offset = 245; - teleport_z = 4; - teleport_z_offset = 4 - }, -/turf/space, -/turf/space/transit/north, -/area/space) "bQ" = ( /turf/space/internal_edge/left, /area/space) @@ -2739,10 +2709,6 @@ "Gq" = ( /turf/unsimulated/wall, /area/beach) -"Gs" = ( -/turf/space, -/turf/space/transit/north, -/area/space) "Gw" = ( /obj/effect/overlay/palmtree_l, /turf/unsimulated/beach/sand, @@ -3015,10 +2981,6 @@ "Pr" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) -"Px" = ( -/turf/space, -/turf/simulated/floor/holofloor/wood, -/area/holodeck/source_game_room) "PM" = ( /turf/simulated/floor/smole/megablocks, /area/holodeck/source_smoleworld) @@ -13324,10 +13286,10 @@ Jz Jz Jz Jz -bP -bP -bP -bP +Jz +Jz +Jz +Jz iO El El @@ -13466,10 +13428,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -13608,10 +13570,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -13750,10 +13712,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -13892,10 +13854,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -14034,10 +13996,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -14176,10 +14138,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -14318,10 +14280,10 @@ JL jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -14460,10 +14422,10 @@ JL jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -14602,10 +14564,10 @@ JL jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -14744,10 +14706,10 @@ JL jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -14886,10 +14848,10 @@ JL jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -15028,10 +14990,10 @@ JL jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -15170,10 +15132,10 @@ JL jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -15312,10 +15274,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -15454,10 +15416,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -15596,10 +15558,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -15738,10 +15700,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -15880,10 +15842,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -16022,10 +15984,10 @@ jf jf jf jf -Gs -Gs -Gs -bP +jf +jf +jf +Jz iO El El @@ -16144,30 +16106,30 @@ ap ap ap ap -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP -bP +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz +Jz iO El El @@ -17369,7 +17331,7 @@ Xs vY HU Pr -af +HU HU Pr lX @@ -17795,11 +17757,11 @@ Pr Pr gZ QU -ai +QU QU QU yr -Px +Pr lA fZ ap diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index dabe7246c84..36fc7256b53 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -15630,24 +15630,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) -"aAu" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/virgo3b_indoors, -/area/maintenance/lower/solars) "aAv" = ( /obj/structure/cable{ icon_state = "1-4" @@ -16982,8 +16964,6 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "aCL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/mining, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -19637,6 +19617,11 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/privacyswitch{ + dir = 8; + pixel_y = 11; + pixel_x = 24 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm2) "aHF" = ( @@ -19842,6 +19827,11 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/privacyswitch{ + dir = 8; + pixel_y = 11; + pixel_x = 24 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm1) "aHX" = ( @@ -21957,6 +21947,10 @@ pixel_y = 26 }, /obj/random/drinkbottle, +/obj/structure/privacyswitch{ + pixel_y = 26; + pixel_x = 5 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "aLT" = ( @@ -22605,6 +22599,10 @@ dir = 1; pixel_y = -24 }, +/obj/structure/privacyswitch{ + pixel_y = -24; + pixel_x = -11 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) "aNk" = ( @@ -23227,6 +23225,10 @@ pixel_y = 26 }, /obj/random/carp_plushie, +/obj/structure/privacyswitch{ + pixel_y = 26; + pixel_x = 5 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) "aOr" = ( @@ -23605,6 +23607,10 @@ dir = 1; pixel_y = -24 }, +/obj/structure/privacyswitch{ + pixel_y = -24; + pixel_x = -11 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "aPa" = ( @@ -24329,6 +24335,10 @@ pixel_y = 26 }, /obj/random/donkpocketbox, +/obj/structure/privacyswitch{ + pixel_y = 26; + pixel_x = 5 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "aQl" = ( @@ -24827,6 +24837,10 @@ dir = 1; pixel_y = -24 }, +/obj/structure/privacyswitch{ + pixel_y = -24; + pixel_x = -11 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "aRk" = ( @@ -25433,6 +25447,10 @@ pixel_y = 26 }, /obj/random/donkpocketbox, +/obj/structure/privacyswitch{ + pixel_y = 26; + pixel_x = 5 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "aSt" = ( @@ -25889,6 +25907,10 @@ dir = 1; pixel_y = -24 }, +/obj/structure/privacyswitch{ + pixel_y = -24; + pixel_x = -11 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) "aTz" = ( @@ -28438,6 +28460,11 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/structure/privacyswitch{ + dir = 8; + pixel_y = 11; + pixel_x = 24 + }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) "aYv" = ( @@ -35492,9 +35519,6 @@ /obj/machinery/station_map{ pixel_y = 32 }, -/obj/machinery/station_map{ - pixel_y = 32 - }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "pFF" = ( @@ -40513,7 +40537,7 @@ aib aib iwg iwg -aAu +aAs iwg iwg iwg diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 7394e42b9ea..7fd81250a39 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -17513,18 +17513,6 @@ }, /turf/simulated/floor, /area/bridge_hallway) -"aEN" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "aEO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -30276,7 +30264,6 @@ dir = 1 }, /obj/structure/grille, -/obj/structure/grille, /obj/structure/window/reinforced{ dir = 8 }, @@ -32951,6 +32938,13 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"paD" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/wood, +/area/engineering/lower/breakroom) "pkt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -46367,7 +46361,7 @@ aNP aOF aPq aQh -aNP +paD aRx aSd aSd @@ -46631,7 +46625,7 @@ aBW aCL aDC aAJ -aEN +azH aFp aGg aGK @@ -46773,7 +46767,7 @@ aze aCM aDD aAJ -aEN +azH aFp aFp aFp diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index d9abcfe93a3..33490b5e395 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -1942,7 +1942,6 @@ dir = 9 }, /obj/machinery/vitals_monitor, -/obj/machinery/vitals_monitor, /obj/machinery/light, /obj/structure/cable/green{ icon_state = "1-2" @@ -10790,13 +10789,14 @@ /turf/simulated/floor/grass, /area/hydroponics) "asj" = ( -/turf/space, -/turf/simulated/wall/fancy_shuttle{ - fancy_shuttle_tag = "lifeboat1" +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/area/shuttle/tether{ - base_turf = /turf/simulated/floor/reinforced - }) +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tether/surfacebase/shuttle_pad) "ask" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -27486,7 +27486,6 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall/nwest) "aWu" = ( @@ -35383,12 +35382,6 @@ /obj/structure/bed/chair/wheelchair{ dir = 4 }, -/obj/structure/bed/chair/wheelchair{ - dir = 4 - }, -/obj/structure/bed/chair/wheelchair{ - dir = 4 - }, /obj/machinery/power/apc{ cell_type = /obj/item/cell/super; dir = 8; @@ -44557,9 +44550,6 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entrepreneur) "xan" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/firedoor, /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -57184,7 +57174,7 @@ aKU aKU aKU aKU -daD +asj aKU aKU aKU @@ -59032,7 +59022,7 @@ aNP uSA aNP aNP -asj +aME aKU abg aOk @@ -59174,7 +59164,7 @@ fzG aNK aNK uzl -asj +aME aKU abg aOk @@ -59316,7 +59306,7 @@ aNm eLD aNm aNm -asj +aME aKU abg aOk diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index ca032fdb283..cec5b3ea351 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -660,9 +660,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_airlock) @@ -14859,19 +14856,6 @@ fancy_shuttle_tag = "secbus" }, /area/shuttle/securiship/engines) -"cbX" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "cargo_shutter"; - layer = 3.3; - name = "Cargo Shutters" - }, -/turf/simulated/floor/plating, -/area/quartermaster/office) "cbY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -44914,7 +44898,7 @@ oWu qkG mkL iDA -cbX +yjH tnC tWj jhJ