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 0ced6510e6b..df6554dce08 100644 Binary files a/icons/obj/power_vr.dmi and b/icons/obj/power_vr.dmi differ 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