From 46aab7a5dc6df5d626f2c9cf3f5f251e3fd7f4f4 Mon Sep 17 00:00:00 2001 From: KandJX <83637364+YegorKandziuba@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:41:29 +0300 Subject: [PATCH] Fix bunch of map issues (#1265) --- maps/sierra/z1-z5_sierra.dmm | 1430 +++++++++++++++++++++++++++------- 1 file changed, 1155 insertions(+), 275 deletions(-) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index d157c48c4d810..579018e35cfe5 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -297,6 +297,7 @@ pixel_x = -24 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/folder/nt, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa) "ace" = ( @@ -1338,15 +1339,20 @@ }, /area/space) "akl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/floor_decal/corner/yellow{ + dir = 1 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/starboard) +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "akm" = ( /obj/structure/bed/chair/shuttle/white{ dir = 4 @@ -2197,6 +2203,9 @@ dir = 4 }, /obj/structure/flora/pottedplant/floorleaf, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "aqz" = ( @@ -2303,6 +2312,19 @@ /obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/ward) +"arq" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/status_display{ + pixel_y = 32; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "arC" = ( /obj/structure/hygiene/sink{ dir = 8; @@ -3687,10 +3709,16 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/catwalk, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "aBA" = ( @@ -4157,7 +4185,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "aEe" = ( @@ -4850,6 +4878,15 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/garden_room) +"aJI" = ( +/obj/floor_decal/borderfloor, +/obj/floor_decal/corner/lime/border, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/seconddeck/center) "aJJ" = ( /obj/machinery/disposal, /obj/floor_decal/industrial/hatch/yellow, @@ -5037,9 +5074,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/shuttle/escape_pod/escape_pod1/station) "aLc" = ( -/obj/structure/bed/chair/office/comfy/purple{ - dir = 1 - }, +/obj/structure/bed/chair/office/comfy/purple, /turf/simulated/floor/wood/mahogany, /area/crew_quarters/heads/office/rd/cobed) "aLi" = ( @@ -6585,7 +6620,7 @@ on = 1; pixel_x = -25 }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -6643,6 +6678,20 @@ }, /turf/simulated/floor/tiled/white, /area/medical/wardhallway) +"aXK" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 9 + }, +/obj/structure/closet/hydrant{ + pixel_y = -28 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "aXM" = ( /obj/structure/table/rack/dark, /obj/item/stack/medical/splint, @@ -7679,6 +7728,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "bgx" = ( @@ -8741,7 +8791,8 @@ id_tag = "lockdown3_3" }, /obj/machinery/door/airlock/glass/civilian{ - dir = 4 + dir = 4; + autoset_access = 0 }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/fourthdeck/center) @@ -8844,6 +8895,10 @@ /obj/structure/table/steel, /obj/item/device/flashlight/lamp/green, /obj/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/wood/walnut, /area/vacant/bar) "bqL" = ( @@ -9046,6 +9101,10 @@ }, /obj/structure/table/standard, /obj/item/material/ashtray/bronze, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "brU" = ( @@ -13510,18 +13569,13 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 4 }, +/obj/structure/sign/deck/first{ + pixel_y = 35 + }, /obj/structure/sign/directions/security{ pixel_y = 24; dir = 8 }, -/obj/structure/sign/directions/infirmary{ - dir = 4; - pixel_y = 31 - }, -/obj/structure/sign/directions/science{ - pixel_y = 38; - dir = 4 - }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/center) "cbV" = ( @@ -14000,19 +14054,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/aftport) "cgh" = ( -/obj/machinery/suit_storage_unit/atmos/alt, -/obj/floor_decal/borderfloor{ - dir = 1 - }, -/obj/floor_decal/corner/yellow/border{ - dir = 1 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/floor_decal/industrial/outline/yellow, -/obj/machinery/light/spot{ - dir = 1 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_eva) +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "cgj" = ( /obj/structure/table/woodentable/maple, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -14214,6 +14268,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/hallway/primary/thirddeck/fore) +"cij" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/status_display{ + pixel_y = 32; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "cio" = ( /obj/floor_decal/borderfloor{ dir = 10 @@ -14340,6 +14407,21 @@ /obj/item/storage/box/lights/led_neon, /turf/simulated/floor/tiled/techfloor/grid, /area/storage/auxillary/port) +"cjk" = ( +/obj/structure/table/woodentable/walnut, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/device/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 15 + }, +/obj/item/reagent_containers/food/drinks/glass2/coffeecup/NT{ + pixel_y = -6; + pixel_x = 8 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "cjl" = ( /obj/structure/railing/mapped{ dir = 1 @@ -14539,6 +14621,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) "cla" = ( @@ -15033,6 +15118,21 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"cpO" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "cpQ" = ( /obj/fluid_mapped, /turf/simulated/floor/tiled/techfloor, @@ -15361,6 +15461,17 @@ /obj/paint/dark_gunmetal, /turf/simulated/wall/r_titanium, /area/exploration_shuttle/airlock) +"csX" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "csZ" = ( /obj/structure/cable/green{ d1 = 1; @@ -17379,6 +17490,24 @@ /obj/random/maintenance, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) +"cHE" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 1 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "cHJ" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 @@ -17750,6 +17879,17 @@ }, /turf/simulated/floor/tiled, /area/assembly/robotics) +"cKr" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/floor_decal/borderfloorblack/corner2, +/obj/floor_decal/corner/darkblue/bordercorner2, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "cKt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18577,6 +18717,9 @@ dir = 8; pixel_y = 24 }, +/obj/structure/sign/deck/third{ + pixel_y = 35 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "cQn" = ( @@ -19182,6 +19325,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) +"cUU" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/center) "cUY" = ( /obj/shuttle_landmark/sierra/deck4/guppy, /turf/space, @@ -19533,6 +19685,21 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/guppy_hangar/start) +"cYe" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "cYk" = ( /obj/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/regular{ @@ -20164,6 +20331,19 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/engine_room) +"dbB" = ( +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "dbD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 @@ -20268,6 +20448,18 @@ /obj/random/maintenance, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) +"dcK" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/machinery/alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "dcU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21169,10 +21361,6 @@ /obj/floor_decal/techfloor{ dir = 8 }, -/obj/machinery/rotating_alarm/security_alarm{ - dir = 4; - pixel_x = -14 - }, /obj/floor_decal/techfloor/orange/corner{ dir = 1 }, @@ -21891,6 +22079,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"dpT" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/center) "dpV" = ( /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/escape_pod/escape_pod1/station) @@ -22154,6 +22352,7 @@ /obj/floor_decal/corner/yellow/border{ dir = 1 }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/aft) "drH" = ( @@ -22243,7 +22442,7 @@ }, /area/space) "dsE" = ( -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 4 }, /obj/structure/table/steel_reinforced, @@ -23189,6 +23388,10 @@ /obj/machinery/vending/coffee{ dir = 8 }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "dzh" = ( @@ -23839,6 +24042,17 @@ "dDh" = ( /turf/simulated/wall/prepainted, /area/vacant/utility) +"dDj" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/floor_decal/borderfloorblack/corner2, +/obj/floor_decal/corner/darkblue/bordercorner2, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "dDp" = ( /obj/floor_decal/steeldecal/steel_decals4{ dir = 8 @@ -23927,10 +24141,6 @@ /obj/floor_decal/techfloor/orange/corner{ dir = 1 }, -/obj/machinery/rotating_alarm/security_alarm{ - dir = 1; - pixel_y = -13 - }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room) "dEo" = ( @@ -24781,6 +24991,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/firstdeck/forestarboard) +"dLk" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/sign/poster{ + pixel_y = 32 + }, +/turf/simulated/floor/wood/walnut, +/area/crew_quarters/lounge) "dLm" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -25013,13 +25233,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "dNj" = ( @@ -25144,7 +25364,7 @@ /obj/item/reagent_containers/food/drinks/glass2/wine, /obj/item/reagent_containers/food/drinks/bottle/tadmorwine, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/wood/walnut, @@ -25440,6 +25660,18 @@ /obj/paint_stripe/nt_red, /turf/simulated/floor/plating, /area/shuttle/petrov/cockpit) +"dQq" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/structure/bed/chair/padded/blue{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "dQs" = ( /obj/machinery/beehive, /obj/floor_decal/corner/green/half, @@ -26387,8 +26619,8 @@ "dXc" = ( /obj/structure/table/woodentable_reinforced/ebony, /obj/floor_decal/carpet/blue, -/obj/item/folder/nt, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/modular_computer/laptop/preset/custom_loadout/advanced, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa) "dXe" = ( @@ -27386,6 +27618,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engineering_monitoring) +"efa" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/lime/bordercorner2{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/seconddeck/fore) "efb" = ( /obj/structure/cable/green{ d1 = 1; @@ -27608,10 +27858,6 @@ dir = 8 }, /obj/structure/closet/emcloset/anchored, -/obj/machinery/rotating_alarm/security_alarm{ - dir = 8; - pixel_x = 14 - }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/safe_room) "egL" = ( @@ -27694,9 +27940,13 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "ehB" = ( -/obj/machinery/ai_status_display, -/turf/simulated/wall/r_wall/prepainted, -/area/engineering/gravitaional_generator) +/obj/structure/table/steel, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, +/turf/simulated/floor/wood/walnut, +/area/vacant/bar) "ehI" = ( /obj/floor_decal/techfloor{ dir = 8 @@ -29467,7 +29717,7 @@ /obj/item/frame/air_alarm{ pixel_y = -16 }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/wood/yew, /area/crew_quarters/heads/office/ce/cobed) "evv" = ( @@ -30289,9 +30539,7 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/fore) "eBA" = ( @@ -30434,6 +30682,9 @@ dir = 1 }, /obj/structure/bed/chair/padded/blue, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "eCO" = ( @@ -31904,6 +32155,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/poster{ + pixel_y = -32 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "eNR" = ( @@ -32635,6 +32889,20 @@ /obj/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/firstdeck/forestarboard) +"eUc" = ( +/obj/machinery/suit_storage_unit/atmos/alt, +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/yellow/border{ + dir = 1 + }, +/obj/floor_decal/industrial/outline/yellow, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/engine_eva) "eUd" = ( /obj/machinery/door/airlock/external/bolted{ dir = 4; @@ -32910,6 +33178,16 @@ }, /turf/space, /area/space) +"eWI" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled, +/area/hallway/primary/seconddeck/aft) "eWN" = ( /obj/structure/cable/green{ d1 = 1; @@ -33695,6 +33973,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -29 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "fcQ" = ( @@ -34452,7 +34734,7 @@ /area/turret_protected/ai) "fit" = ( /obj/structure/closet/cabinet, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -34561,6 +34843,9 @@ /obj/item/device/paicard, /obj/random/tech_supply, /obj/floor_decal/corner/yellow/mono, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/storage/primary) "fiX" = ( @@ -35684,14 +35969,26 @@ /turf/simulated/floor/lino, /area/maintenance/firstdeck/forestarboard) "fsu" = ( -/obj/machinery/button/alternate/door/bolts{ - id_tag = "bridge_safe_exterior"; - name = "safe room door-control"; - pixel_x = -25; - pixel_y = -1 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/wall/r_wall/prepainted, -/area/crew_quarters/safe_room/bridge) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/floor_decal/corner/yellow, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "fsz" = ( /obj/floor_decal/techfloor{ dir = 4 @@ -36658,13 +36955,12 @@ /obj/floor_decal/carpet/blue{ dir = 9 }, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = -24 - }, /obj/machinery/firealarm{ pixel_y = 24 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/captain) "fAD" = ( @@ -36885,7 +37181,7 @@ /area/quartermaster/hangar) "fCW" = ( /obj/structure/table/woodentable_reinforced/ebony, -/obj/item/modular_computer/laptop/preset/custom_loadout, +/obj/item/modular_computer/laptop/preset/custom_loadout/advanced, /turf/simulated/floor/carpet/red, /area/crew_quarters/heads/office/hos) "fDd" = ( @@ -37221,7 +37517,6 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/structure/table/rack, /obj/random/machine, /turf/simulated/floor/plating, /area/maintenance/thirddeck/foreport) @@ -38359,6 +38654,18 @@ d2 = 8; icon_state = "0-8" }, +/obj/structure/sign/directions/security{ + pixel_y = 24; + dir = 8 + }, +/obj/structure/sign/directions/infirmary{ + dir = 4; + pixel_y = 31 + }, +/obj/structure/sign/directions/science{ + pixel_y = 38; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/central_stairwell) "fNb" = ( @@ -38572,6 +38879,9 @@ icon_state = "4-8" }, /obj/floor_decal/corner/yellow, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "fOL" = ( @@ -38683,15 +38993,14 @@ /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos) "fPH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/thirddeck/starboard) +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/center) "fPJ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -39888,6 +40197,24 @@ /obj/random/medical, /turf/simulated/floor/tiled/techfloor/grid, /area/storage/auxillary/port) +"fZS" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 4 + }, +/obj/machinery/light/spot{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "gab" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 1 @@ -41431,6 +41758,10 @@ /area/hallway/primary/firstdeck/aft) "gnr" = ( /obj/decal/cleanable/generic, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/wood/walnut, /area/vacant/bar) "gns" = ( @@ -42134,13 +42465,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 8 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) "gsg" = ( @@ -42261,6 +42592,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "gtq" = ( @@ -42684,6 +43016,18 @@ /obj/structure/stairs/south, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/fourthdeck/aft_stairwell) +"gxm" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "gxn" = ( /obj/floor_decal/borderfloor{ dir = 4 @@ -43804,6 +44148,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/closet/hydrant{ + pixel_x = 28 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "gHq" = ( @@ -44953,9 +45300,6 @@ }, /obj/structure/closet/emcloset, /obj/floor_decal/industrial/outline/yellow, -/obj/structure/sign/deck/third{ - pixel_y = 24 - }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "gQr" = ( @@ -45029,6 +45373,10 @@ /obj/structure/bed/sofa/r/blue{ dir = 4 }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "gQN" = ( @@ -46106,7 +46454,7 @@ on = 1; pixel_x = -25 }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/office/rd/cobed) "gYM" = ( @@ -46974,6 +47322,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/crew_quarters/docking) +"hfu" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/ai_status_display{ + pixel_x = -32; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "hfv" = ( /obj/wallframe_spawn/no_grille, /obj/machinery/door/firedoor, @@ -47575,6 +47938,27 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/fourthdeck/central_stairwell) +"hkq" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "hkv" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -49445,6 +49829,14 @@ /obj/machinery/door/blast/regular, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology) +"hAJ" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/ai_status_display{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "hAO" = ( /obj/floor_decal/borderfloorblack{ dir = 1 @@ -50171,6 +50563,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/sign/deck/fourth{ + pixel_y = 35 + }, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/center) "hGt" = ( @@ -50762,7 +51157,8 @@ dir = 4 }, /obj/machinery/door/airlock/glass/civilian{ - dir = 4 + dir = 4; + autoset_access = 0 }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/fourthdeck/center) @@ -51099,6 +51495,16 @@ /obj/wallframe_spawn/no_grille, /turf/simulated/floor/plating, /area/hallway/primary/seconddeck/aft_stairwell) +"hOL" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/aft) "hOR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -53133,6 +53539,10 @@ d2 = 8; icon_state = "0-8" }, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) "ifL" = ( @@ -53901,9 +54311,6 @@ /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/outline/yellow, /obj/machinery/computer/modular/preset/civilian, -/obj/machinery/light/spot{ - dir = 1 - }, /turf/simulated/floor/tiled/monotile, /area/storage/primary) "ilt" = ( @@ -55482,6 +55889,10 @@ }, /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/fore) "izk" = ( @@ -56147,6 +56558,9 @@ /obj/machinery/vending/soda{ dir = 8 }, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "iFF" = ( @@ -56417,11 +56831,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -57555,6 +57967,10 @@ /obj/floor_decal/borderfloor, /obj/floor_decal/corner/yellow/border, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "iPk" = ( @@ -58091,6 +58507,7 @@ }, /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/monotile, /area/storage/primary) "iSZ" = ( @@ -58683,6 +59100,25 @@ "iWV" = ( /turf/simulated/wall/r_wall/hull, /area/maintenance/bridgedeck/aft) +"iWX" = ( +/obj/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 4 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 5 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 5 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "iXp" = ( /obj/structure/bed/chair/padded/blue, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -59096,6 +59532,27 @@ }, /turf/simulated/floor/reinforced, /area/shuttle/petrov/cell1) +"jbJ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "jbK" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -59364,6 +59821,9 @@ dir = 8 }, /obj/structure/flora/pottedplant/decorative, +/obj/machinery/light/spot{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "jdD" = ( @@ -59963,7 +60423,7 @@ "jit" = ( /obj/floor_decal/corner/black/full, /obj/structure/undies_wardrobe, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /turf/simulated/floor/tiled/dark, @@ -60461,9 +60921,6 @@ /obj/structure/bed/sofa/l/blue{ dir = 4 }, -/obj/machinery/light/spot{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "jmb" = ( @@ -60505,7 +60962,6 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/table/rack, /obj/random/machine, /turf/simulated/floor/plating, /area/maintenance/thirddeck/aftport) @@ -63027,9 +63483,7 @@ /obj/floor_decal/corner/red/bordercorner2{ dir = 4 }, -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/security/brig) "jIQ" = ( @@ -64894,6 +65348,25 @@ }, /turf/simulated/floor/carpet/purple, /area/crew_quarters/heads/office/rd/cobed) +"jWr" = ( +/obj/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 8 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 8 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "jWt" = ( /obj/wallframe_spawn/no_grille, /obj/machinery/door/firedoor, @@ -65503,6 +65976,10 @@ dir = 8 }, /obj/floor_decal/corner/darkblue/mono, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark/monotile, /area/hallway/primary/bridgedeck/center) "kbm" = ( @@ -67530,21 +68007,10 @@ /turf/simulated/wall/r_wall/prepainted, /area/engineering/atmos) "kre" = ( -/obj/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/structure/sign/poster{ + pixel_x = -32 }, -/turf/simulated/floor/wood/walnut, +/turf/simulated/floor/carpet, /area/crew_quarters/lounge) "krm" = ( /obj/floor_decal/corner/black{ @@ -67754,6 +68220,9 @@ /obj/machinery/vending/snack{ icon_state = "snack" }, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "ksI" = ( @@ -69920,6 +70389,9 @@ dir = 5 }, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "kIz" = ( @@ -70036,6 +70508,10 @@ }, /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/fore) "kJJ" = ( @@ -70270,6 +70746,9 @@ /area/crew_quarters/heads/captain/beach) "kLn" = ( /obj/machinery/jukebox/custom_tape/old, +/obj/machinery/light/spot{ + dir = 4 + }, /turf/simulated/floor/wood/walnut, /area/bridge/adjutants) "kLp" = ( @@ -70940,6 +71419,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "kQl" = ( @@ -71482,6 +71965,10 @@ dir = 6 }, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -21 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "kUj" = ( @@ -72753,6 +73240,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/status_display{ + pixel_y = 32; + pixel_x = -32 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "lfG" = ( @@ -74783,9 +75274,16 @@ /turf/simulated/wall/r_titanium, /area/exploration_shuttle/power) "lvy" = ( -/obj/machinery/status_display, -/turf/simulated/wall/r_wall/prepainted, -/area/engineering/gravitaional_generator) +/obj/structure/bed/chair/rounded/blue{ + dir = 8 + }, +/obj/floor_decal/corner/darkblue/mono, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/hallway/primary/bridgedeck/center) "lvz" = ( /obj/structure/railing/mapped, /turf/simulated/open, @@ -76158,9 +76656,6 @@ /obj/floor_decal/corner/darkblue/bordercorner2{ dir = 1 }, -/obj/structure/sign/deck/bridge{ - pixel_y = 24 - }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "lFj" = ( @@ -77072,6 +77567,15 @@ }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/thruster/d1starboard) +"lLW" = ( +/obj/structure/bed/chair/office/brown{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "lLY" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -79980,9 +80484,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/substation/bridgedeck) "mkt" = ( -/obj/machinery/status_display, -/turf/simulated/wall/prepainted, -/area/quartermaster/suplocker_room) +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "mku" = ( /obj/structure/cable/green{ d1 = 1; @@ -81354,6 +81864,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/rotating_alarm/security_alarm{ + dir = 8; + pixel_x = 14 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/crew_quarters/safe_room) "mwj" = ( @@ -81738,6 +82252,9 @@ /obj/structure/table/standard, /obj/item/paper_bin, /obj/item/pen, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "mzk" = ( @@ -81952,6 +82469,9 @@ /area/crew_quarters/heads/office/iaa) "mAA" = ( /obj/structure/flora/pottedplant/large, +/obj/structure/sign/poster{ + pixel_y = 32 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "mAC" = ( @@ -84078,6 +84598,10 @@ /obj/item/pen, /obj/floor_decal/corner/yellow/mono, /obj/floor_decal/industrial/outline/yellow, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/thirddeck/fore) "mRQ" = ( @@ -84427,7 +84951,7 @@ "mUO" = ( /obj/floor_decal/corner/black/full, /obj/structure/closet/cabinet, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /obj/floor_decal/corner/red, @@ -84579,14 +85103,12 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/galley/backroom) "mWv" = ( -/obj/structure/table/woodentable/walnut, -/obj/item/device/flashlight/lamp/green{ - pixel_x = -5; - pixel_y = 15 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/bed/sofa/m/beige{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) "mWw" = ( @@ -86502,6 +87024,10 @@ /obj/floor_decal/corner/yellow{ dir = 1 }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "nlv" = ( @@ -89434,6 +89960,7 @@ pixel_y = 6; pixel_x = 8 }, +/obj/machinery/light, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "nIk" = ( @@ -89691,6 +90218,24 @@ /obj/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/steel_grid, /area/security/prison) +"nKo" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/lime/bordercorner2{ + dir = 4 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/center) "nKq" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 @@ -90271,6 +90816,10 @@ /obj/item/storage/secure/safe{ pixel_y = 28 }, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/captain) "nPA" = ( @@ -90463,6 +91012,9 @@ /area/tcommsat/chamber) "nRV" = ( /obj/machinery/bookbinder, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) "nSa" = ( @@ -91511,23 +92063,9 @@ /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "obE" = ( -/obj/floor_decal/borderfloor{ - dir = 1 - }, -/obj/floor_decal/corner/lime/border{ - dir = 1 - }, -/obj/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/floor_decal/corner/lime/bordercorner2{ - dir = 4 - }, -/obj/structure/sign/deck/first{ - pixel_y = 24 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/center) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/quartermaster/hangar/upper) "obG" = ( /obj/structure/cable/green{ d1 = 2; @@ -91728,6 +92266,9 @@ /area/vacant/storage) "ocY" = ( /obj/structure/bed/sofa/l/black, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/carpet, /area/crew_quarters/lounge) "odj" = ( @@ -92332,6 +92873,9 @@ dir = 1 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "ohN" = ( @@ -94387,6 +94931,21 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/starboard) +"oxu" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 9 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "oxy" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, @@ -94525,7 +95084,7 @@ pixel_y = 18; pixel_x = -7 }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, /obj/random/toy, @@ -94927,6 +95486,12 @@ /obj/shuttle_landmark/skipjack/deck5, /turf/space, /area/space) +"oCq" = ( +/obj/structure/bed/sofa/m/beige{ + dir = 10 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "oCu" = ( /obj/machinery/door/blast/regular/escape_pod{ id_tag = "escape_pod_6" @@ -95405,6 +95970,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) "oFs" = ( @@ -96411,6 +96979,9 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) "oNZ" = ( @@ -98218,6 +98789,15 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) +"pbP" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "pbU" = ( /obj/floor_decal/corner/green, /obj/floor_decal/corner/purple/bordercorner, @@ -101342,6 +101922,18 @@ "pyn" = ( /turf/simulated/wall/r_wall/hull, /area/quartermaster/expedition/eva) +"pyq" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "pyr" = ( /obj/floor_decal/borderfloorblack{ dir = 9 @@ -103807,6 +104399,27 @@ /obj/structure/bed/chair/padded/yellow, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"pSH" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/floor_decal/corner/yellow, +/obj/structure/closet/hydrant{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "pSP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -104654,6 +105267,9 @@ /obj/floor_decal/corner/yellow{ dir = 1 }, +/obj/structure/closet/hydrant{ + pixel_y = -28 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "pZL" = ( @@ -105902,6 +106518,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/central_stairwell) +"qiM" = ( +/obj/floor_decal/borderfloorblack, +/obj/floor_decal/corner/darkblue/border, +/obj/structure/bed/chair/padded/blue{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "qiT" = ( /obj/structure/railing/mapped{ dir = 1 @@ -106802,7 +107430,9 @@ /turf/simulated/floor/tiled, /area/exploration_shuttle/cargo_r) "qrt" = ( -/obj/structure/bed/chair/office/comfy/teal, +/obj/structure/bed/chair/office/comfy/teal{ + dir = 1 + }, /turf/simulated/floor/wood/maple, /area/crew_quarters/heads/office/cmo/cobed) "qrB" = ( @@ -107624,6 +108254,16 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/storage/primary) +"qyK" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/foreport) "qyL" = ( /obj/structure/cable{ d1 = 4; @@ -107795,6 +108435,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/status_display{ + pixel_y = 32; + pixel_x = 32 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/center) "qzT" = ( @@ -110347,6 +110991,10 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/chamber) "qUp" = ( @@ -111929,6 +112577,10 @@ "rfn" = ( /obj/floor_decal/borderfloorblack, /obj/floor_decal/corner/darkblue/border, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "rfp" = ( @@ -112272,10 +112924,6 @@ /obj/structure/bed/chair/padded/blue{ dir = 8 }, -/obj/machinery/rotating_alarm/security_alarm{ - dir = 1; - pixel_y = -13 - }, /obj/floor_decal/techfloor/orange/corner{ dir = 8 }, @@ -113746,6 +114394,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/vacant/dormintories) +"rut" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 1 + }, +/obj/machinery/ship_map, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "ruz" = ( /obj/floor_decal/corner/darkblue{ dir = 1 @@ -115206,6 +115870,21 @@ "rFq" = ( /turf/simulated/wall/r_wall/prepainted, /area/rnd/xenobiology/storage2) +"rFv" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/ai_status_display{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "rFB" = ( /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/tiled/dark, @@ -115225,6 +115904,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) "rFL" = ( @@ -119527,6 +120207,12 @@ }, /turf/simulated/floor/tiled, /area/command/exploration_leader) +"snH" = ( +/obj/structure/bed/sofa/r/beige{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "snI" = ( /obj/structure/cable/green{ d1 = 1; @@ -119962,6 +120648,9 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/floor_decal/corner/yellow/mono, +/obj/machinery/light/spot{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/storage/primary) "sqV" = ( @@ -120131,6 +120820,12 @@ /obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/rnd/locker) +"ssq" = ( +/obj/structure/table/woodentable/walnut, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "sst" = ( /obj/structure/cable/green{ d1 = 4; @@ -121016,6 +121711,16 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/fourthdeck/starboard) +"szf" = ( +/obj/floor_decal/corner/yellow{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "szj" = ( /obj/structure/table/standard, /obj/item/storage/box/botanydisk, @@ -121618,6 +122323,18 @@ }, /turf/simulated/floor/plating, /area/rnd/misc_lab) +"sDz" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "sDE" = ( /obj/machinery/door/blast/regular/open{ density = 0; @@ -121985,7 +122702,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "sFU" = ( @@ -123344,6 +124064,24 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology/level1) +"sPE" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "sPH" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ id_tag = "petrov_shuttle_dock_pump" @@ -124156,7 +124894,8 @@ }, /obj/machinery/light_switch{ dir = 1; - pixel_y = -21 + pixel_y = -21; + pixel_x = 1 }, /obj/structure/table/steel_reinforced, /obj/machinery/recharger, @@ -125845,6 +126584,24 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/thirddeck/port) +"tkF" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/hallway) "tkL" = ( /obj/machinery/light_switch{ dir = 4; @@ -127480,6 +128237,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/seconddeck/aftstarboard) +"txC" = ( +/obj/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 1 + }, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/center) "txH" = ( /obj/structure/table/rack, /obj/random/maintenance, @@ -127511,6 +128280,7 @@ /obj/structure/reagent_dispensers/water_cooler{ dir = 8 }, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "tyD" = ( @@ -128706,8 +129476,8 @@ dir = 1 }, /obj/structure/bed/chair/padded/blue, -/obj/structure/closet/hydrant{ - pixel_y = 28 +/obj/item/device/radio/intercom{ + pixel_y = 26 }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) @@ -129353,7 +130123,7 @@ }, /obj/machinery/computer/arcade, /turf/simulated/floor/plating, -/area/tcommsat/chamber) +/area/maintenance/thirddeck/foreport) "tMU" = ( /obj/item/storage/mirror{ pixel_x = -26; @@ -129694,7 +130464,7 @@ /area/hallway/primary/seconddeck/center) "tPA" = ( /obj/floor_decal/corner/black/full, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -131884,7 +132654,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/wood/walnut, +/turf/simulated/floor/carpet, /area/crew_quarters/lounge) "uhk" = ( /obj/machinery/atmospherics/pipe/simple/visible/fuel, @@ -133314,6 +134084,25 @@ }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/cafe/upper) +"usD" = ( +/obj/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/floor_decal/corner/darkblue/border{ + dir = 4 + }, +/obj/floor_decal/borderfloorblack/corner2{ + dir = 6 + }, +/obj/floor_decal/corner/darkblue/bordercorner2{ + dir = 6 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/bridgedeck/aft) "usG" = ( /obj/machinery/suit_cycler/medical/alt, /obj/structure/window/basic{ @@ -135211,9 +136000,6 @@ /obj/floor_decal/borderfloorblack{ dir = 1 }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, /obj/floor_decal/corner/darkblue/border{ dir = 1 }, @@ -135229,6 +136015,9 @@ /obj/floor_decal/corner/darkblue/bordercorner2{ dir = 4 }, +/obj/structure/sign/deck/bridge{ + pixel_y = 35 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/center) "uIC" = ( @@ -136196,6 +136985,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atm{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/hallway/primary/thirddeck/center) "uPY" = ( @@ -137400,6 +138192,13 @@ /obj/structure/table/rack, /turf/simulated/floor/plating, /area/maintenance/seconddeck/port) +"vaw" = ( +/obj/structure/catwalk, +/obj/machinery/light/spot{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/quartermaster/hangar/upper) "vaA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -139270,10 +140069,10 @@ /turf/simulated/floor/tiled/dark/monotile, /area/medical/morgue/autopsy) "vnt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/computer/modular/preset/library{ + dir = 8 }, -/turf/simulated/floor/wood/walnut, +/turf/simulated/floor/carpet, /area/crew_quarters/lounge) "vnD" = ( /obj/floor_decal/spline/fancy/wood, @@ -140077,6 +140876,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) +"vuf" = ( +/obj/structure/table/woodentable/walnut, +/obj/item/book/manual/anomaly_testing, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "vut" = ( /obj/structure/table/rack, /obj/item/storage/firstaid/radiation{ @@ -140607,9 +141411,6 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 1 }, -/obj/structure/sign/deck/fourth{ - pixel_y = 24 - }, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/center) "vyf" = ( @@ -140880,6 +141681,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/dark, /area/bridge/hallway) "vAJ" = ( @@ -141236,6 +142041,7 @@ dir = 8 }, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/light/spot, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "vDg" = ( @@ -141489,9 +142295,6 @@ /turf/simulated/wall/ocp_wall, /area/rnd/toxins) "vEX" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, /obj/floor_decal/borderfloor{ dir = 1 }, @@ -141504,6 +142307,14 @@ /obj/floor_decal/corner/lime/bordercorner2{ dir = 1 }, +/obj/structure/sign/directions/science{ + pixel_y = 24; + dir = 4 + }, +/obj/structure/sign/directions/infirmary{ + dir = 4; + pixel_y = 31 + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/center) "vFf" = ( @@ -141582,6 +142393,9 @@ /obj/floor_decal/corner/darkblue/border{ dir = 1 }, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/bridgedeck/aft) "vFB" = ( @@ -144608,6 +145422,9 @@ /obj/machinery/chemical_dispenser/bar_soft/full{ dir = 1 }, +/obj/structure/sign/poster{ + pixel_y = -32 + }, /turf/simulated/floor/wood/walnut, /area/crew_quarters/lounge) "wds" = ( @@ -144936,7 +145753,7 @@ }, /obj/structure/dogbed, /mob/living/simple_animal/passive/cat/fluff/Runtime, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/carpet/blue3, @@ -145394,6 +146211,35 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/assembly/robotics) +"wiO" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/airless, +/area/solar/port) +"wiU" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/starboard) "wjg" = ( /turf/simulated/floor/tiled/techfloor, /area/maintenance/thirddeck/aftstarboard) @@ -146052,6 +146898,18 @@ /obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/storage) +"woR" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/floor_decal/corner/yellow, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/primary/thirddeck/fore) "woS" = ( /obj/floor_decal/techfloor/orange{ dir = 9 @@ -146725,7 +147583,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/office/ce/cobed) "wuG" = ( @@ -146895,6 +147753,10 @@ /obj/floor_decal/corner/yellow{ dir = 1 }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 24; + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/thirddeck/fore) "wvG" = ( @@ -148331,15 +149193,13 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/office/ce) "wLl" = ( -/obj/machinery/firealarm{ - pixel_y = 24 - }, /obj/floor_decal/borderfloor{ dir = 1 }, /obj/floor_decal/corner/lime/border{ dir = 1 }, +/obj/machinery/ship_map, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) "wLu" = ( @@ -149606,6 +150466,9 @@ dir = 1 }, /obj/floor_decal/industrial/outline/yellow, +/obj/machinery/alarm{ + pixel_y = 24 + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_eva) "wVT" = ( @@ -149778,7 +150641,7 @@ /obj/structure/bed/padded, /obj/item/bedsheet/brown, /obj/structure/sign/poster{ - pixel_y = 30 + pixel_y = 32 }, /turf/simulated/floor/carpet, /area/crew_quarters/sleep/bunk) @@ -150254,7 +151117,7 @@ response_harm = "kicks"; response_help = "pets" }, -/obj/machinery/light/small, +/obj/machinery/light, /turf/simulated/floor/carpet/purple, /area/crew_quarters/heads/office/rd/cobed) "xbp" = ( @@ -151448,6 +152311,10 @@ /obj/structure/table/standard{ name = "plastic table frame" }, +/obj/machinery/rotating_alarm/security_alarm{ + dir = 4; + pixel_x = -14 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/safe_room) "xjQ" = ( @@ -152809,6 +153676,13 @@ map_airless = 1 }, /area/vacant/prototype/engine) +"xvV" = ( +/obj/machinery/telecomms/server/presets/common, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/turf/simulated/floor/bluegrid, +/area/tcommsat/chamber) "xwc" = ( /obj/structure/cable/green{ d2 = 2; @@ -153408,6 +154282,10 @@ /obj/structure/holoplant, /turf/simulated/floor/tiled, /area/hallway/primary/fourthdeck/fore) +"xAq" = ( +/obj/structure/bed/sofa/l/beige, +/turf/simulated/floor/carpet, +/area/crew_quarters/lounge) "xAw" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -155952,6 +156830,7 @@ pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/folder/nt, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/office/iaa) "xTD" = ( @@ -157053,7 +157932,7 @@ dir = 1 }, /obj/structure/sign/deck/second{ - pixel_y = 24 + pixel_y = 35 }, /turf/simulated/floor/tiled, /area/hallway/primary/seconddeck/center) @@ -157653,6 +158532,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/chamber) "ygl" = ( @@ -157735,9 +158618,6 @@ /obj/structure/bed/chair/padded/blue{ dir = 4 }, -/obj/machinery/rotating_alarm/security_alarm{ - pixel_y = 13 - }, /obj/floor_decal/techfloor{ dir = 9 }, @@ -175918,7 +176798,7 @@ phV phV phV phV -mkt +phV drA vJC waJ @@ -207835,7 +208715,7 @@ lBq boS esk ezw -aBL +eUc gNA iTq iPj @@ -208037,7 +208917,7 @@ nsv fDd esk ezw -cgh +aBL gNA iYI gNA @@ -208455,10 +209335,10 @@ pwH pwH pwH pwH +gxm pwH pwH -pwH -pwH +cgh pwH pwH pwH @@ -208657,7 +209537,7 @@ tTX tTX tTX tTX -tTX +qyK oDh tTX tTX @@ -209068,7 +209948,7 @@ bRV quv aHM aHM -nCI +aHM xiD aLQ xog @@ -209273,7 +210153,7 @@ jHu aHM xiD aLQ -uoI +csX tQA tQA wJN @@ -209449,15 +210329,15 @@ hmD gkX cDJ eHP -xgt +rFv cdH gHp nlt pRM -nlt +szf wvA cdH -fFO +cij pnE loO oNQ @@ -209652,13 +210532,13 @@ lVr aCE eHP xgt -ehB kXN kXN kXN kXN kXN -lvy +kXN +kXN fFO pnE loO @@ -209853,7 +210733,7 @@ dnf abj fUP exY -xgt +akl kXN mGL pAL @@ -210055,7 +210935,7 @@ sSB aIM aCE eHP -xgt +cpO kXN xTq woS @@ -210063,7 +210943,7 @@ rKi acR gRz kXN -fFO +pyq pnE loO dCr @@ -210467,7 +211347,7 @@ saT uGF gRz kXN -fFO +woR pnE loO iel @@ -210661,7 +211541,7 @@ qGw gIN sln eHP -wkN +sDz kXN nqH lqX @@ -210678,7 +211558,7 @@ cbO ifH dzO loO -vnK +xvV mYT dBP jBQ @@ -211073,7 +211953,7 @@ rap lMX ttD kXN -fFO +woR fcN evm uhE @@ -211468,7 +212348,7 @@ sxK sbJ uiQ sln -eHP +hkq xgt nqE kXN @@ -211477,7 +212357,7 @@ pgK dsE roS kXN -nZd +pyq pnE evm foq @@ -211505,7 +212385,7 @@ lda lda lda lda -lda +wiO lda rtY wJN @@ -211670,7 +212550,7 @@ gYr hGh jny sln -eHP +fsu uYY bwv kXN @@ -211679,7 +212559,7 @@ kXN kXN kXN kXN -fFO +nZd eOb ezP gSf @@ -211862,7 +212742,7 @@ bHt bHt bHt iHh -akl +pvb dnR dcD sln @@ -211872,7 +212752,7 @@ sln sln sln sln -eHP +pSH xgt bwv kJI @@ -212063,9 +212943,9 @@ mmo pvb pvb pvb -oTo -fPH -akl +cYe +pvb +pvb pvb pvb pvb @@ -212075,7 +212955,7 @@ ipj ipj jCo xNk -xgt +hfu cdH gjd lzz @@ -212083,7 +212963,7 @@ lzz lzz mdZ cdH -fFO +arq shG evm xpJ @@ -212266,9 +213146,9 @@ ejn pvb eUR aBy -lgS +wiU gsf -kMY +wiU kMY kMY hEE @@ -214526,7 +215406,7 @@ sqV sqV tEF dmQ -bhA +ehB kBc qUA oFI @@ -217341,9 +218221,9 @@ hpX cKL fCJ ugW -bje -ugW -oOk +ixQ +kre +lLW cKL ksE bDX @@ -217542,10 +218422,10 @@ exx fDo cKL tod -bDX -hZQ -bDX +ixQ tdI +ssq +vnt cKL pwt bDX @@ -217744,10 +218624,10 @@ tRG oRu cKL hZQ -bDX -pDy -bDX +ixQ bje +oOk +tdI cKL sob bDX @@ -217945,9 +218825,9 @@ qAf qAf vWI cKL +dLk bDX bDX -vnt bDX bDX oue @@ -218149,7 +219029,7 @@ nTE sCT sFS mgE -kre +tJv tJv tJv haA @@ -218357,9 +219237,9 @@ ixQ svl ixQ kdh -ixQ -svl -ixQ +xAq +cjk +vuf cKL gPE ruI @@ -218559,9 +219439,9 @@ jkU qyP tRr nbg -jkU +oCq mWv -tRr +snH cKL emE geF @@ -218948,9 +219828,9 @@ fHq fHq fHq fHq -fHq -fHq -fda +obE +obE +vaw fHq fHq fHq @@ -222584,9 +223464,9 @@ msv fHq fHq fHq -fHq -fHq -fHq +obE +obE +obE fHq fHq fHq @@ -251469,7 +252349,7 @@ ims vOs ims ims -qds +efa pdu nfV tOU @@ -256319,7 +257199,7 @@ dWi fny peo aYz -ccj +aJI qOv aIS xsC @@ -263791,7 +264671,7 @@ qVI qVI qVI qVI -juk +eWI doV rRI tKC @@ -294496,7 +295376,7 @@ dEB dEB dEB kTh -obE +hKe mAC bqO tTe @@ -295506,7 +296386,7 @@ djN xjE fhX stL -hKe +nKo mDg lKS alJ @@ -297122,7 +298002,7 @@ iKp mjY aSg stL -kgs +dpT oJA fVM xsz @@ -304798,7 +305678,7 @@ mBb juu hJd cex -nSY +hOL rjg aZX nOV @@ -327823,7 +328703,7 @@ cxd fMg dBh gUj -rNl +dQq fbE fbE plB @@ -327835,7 +328715,7 @@ fbE fbE tHc gUj -ybl +cKr aqI aqI aqI @@ -328225,9 +329105,9 @@ bNB muF wIY fMg -dwT +sPE thi -rNl +qiM wJP xWY pqy @@ -328239,7 +329119,7 @@ rLG wJP eCI thi -xgB +aXK kka egZ nkO @@ -328831,7 +329711,7 @@ wtg fZb whF xZN -dBh +rut iah xgB wJP @@ -328843,7 +329723,7 @@ bWY pZM ghY wJP -dBh +rut iah xgB kka @@ -330245,7 +331125,7 @@ epB wGh kLl twd -cbV +dcK uGA srp pJF @@ -330449,7 +331329,7 @@ lKZ twd cbV iah -ybl +dDj wJP xwd rbM @@ -330459,7 +331339,7 @@ aHE bop baI wJP -dwT +tkF iah rNl nPg @@ -330651,7 +331531,7 @@ qjy twd dBh thi -xgB +oxu wJP wJP uAj @@ -330661,9 +331541,9 @@ uAj uAj wJP wJP -dBh +cHE thi -isJ +iHc sPt hqH wRf @@ -330865,7 +331745,7 @@ vXn efi vXn qbk -iHc +pbP sPt hZf hqH @@ -331081,7 +331961,7 @@ gqH gqH jwM gqH -fsu +gqH gqH qWz bQU @@ -331875,7 +332755,7 @@ ssI wNp ioI hvn -nwJ +fPH hVv gUC cFs @@ -332267,7 +333147,7 @@ cuI nWa pgS rBV -nwJ +cUU edu mEz ria @@ -332277,7 +333157,7 @@ mEz ria mEz edu -pbH +txC fEm cjn spV @@ -333684,7 +334564,7 @@ aiw eJs jnT xlV -kbe +lvy bzF bfH soR @@ -335301,7 +336181,7 @@ sMj rPt nSy wrR -gNu +fZS jDK ltN tse @@ -335505,7 +336385,7 @@ gZf wrR clD kTQ -dhX +hAJ tse lMi rNK @@ -335705,7 +336585,7 @@ fKs oHh oEO wrR -vFA +mkt fKt iTZ tse @@ -336101,7 +336981,7 @@ tuX mze jDq wdL -apA +dbB jrx apA qNw @@ -336111,7 +336991,7 @@ xSo nLX hAO hdI -rfn +dhX tse tse tse @@ -336318,11 +337198,11 @@ nLX gaH qNw qop -wdL +jWr gQI jlU qNw -qop +jbJ pmk wSG eUW @@ -336504,7 +337384,7 @@ tzM tuX aqr yfi -eWg +usD fBO tpp brI @@ -336723,7 +337603,7 @@ lWD jar eWg jdC -xHi +iWX xAj vsN tym