diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm index d26242666853..3fdaafbbf5ee 100644 --- a/_maps/map_files220/MetaStation/MetaStation.dmm +++ b/_maps/map_files220/MetaStation/MetaStation.dmm @@ -343,11 +343,6 @@ /obj/structure/disposalpipe/segment, /obj/effect/landmark/start/security_officer, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -764,6 +759,7 @@ pixel_x = 5; pixel_y = 3 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -786,6 +782,7 @@ /area/station/public/fitness) "ain" = ( /obj/structure/closet/firecloset, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -943,7 +940,6 @@ /obj/structure/sign/pods{ pixel_y = 32 }, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -1255,7 +1251,6 @@ /turf/simulated/floor/plasteel, /area/station/public/fitness) "alm" = ( -/obj/machinery/light/directional/north, /obj/machinery/firealarm/directional/west, /obj/structure/closet/crate/can, /turf/simulated/floor/plasteel{ @@ -1401,6 +1396,12 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/door_control/shutter/north{ + id = "kitchen_counter"; + name = "Kitchen Counter Shutters"; + pixel_x = -6; + req_access_txt = "28" + }, /turf/simulated/floor/plasteel{ icon_state = "whitecorner" }, @@ -1994,7 +1995,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 }, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/station/public/fitness) "aoG" = ( @@ -2419,6 +2420,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/alarm/directional/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -2616,9 +2619,9 @@ /obj/effect/turf_decal/delivery/hollow, /mob/living/simple_animal/bot/secbot/armsky, /obj/structure/cable/yellow{ - d1 = 4; + d1 = 2; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" }, /obj/structure/cable/yellow{ d1 = 2; @@ -3007,6 +3010,7 @@ "atP" = ( /obj/structure/sign/poster/official/random/south, /obj/structure/closet/masks, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -3081,7 +3085,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/auxsolarstarboard) "atW" = ( -/obj/machinery/light/directional/south, /obj/machinery/economy/vending/cola, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" @@ -3265,6 +3268,7 @@ "auH" = ( /obj/machinery/economy/vending/coffee, /obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -3394,6 +3398,17 @@ /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/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -3818,7 +3833,6 @@ /area/station/public/sleep) "awO" = ( /obj/machinery/computer/arcade/recruiter, -/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "awP" = ( @@ -4563,7 +4577,6 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -4746,12 +4759,6 @@ "aAG" = ( /turf/simulated/wall, /area/station/engineering/atmos) -"aAH" = ( -/obj/effect/landmark/lightsout, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/station/public/dorms) "aAI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -4926,12 +4933,17 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/start/security_officer, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -5564,9 +5576,9 @@ dir = 6 }, /obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) @@ -5864,7 +5876,6 @@ "aFe" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave{ - pixel_x = -3; pixel_y = 6 }, /turf/simulated/floor/plasteel{ @@ -5890,6 +5901,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -5921,9 +5943,9 @@ /area/station/public/dorms) "aFK" = ( /obj/structure/table, -/obj/machinery/light/small/directional/north, /obj/structure/bedsheetbin, /obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -6517,7 +6539,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "aIk" = ( -/obj/machinery/light/directional/west, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -7484,8 +7506,6 @@ }, /area/station/public/dorms) "aLg" = ( -/obj/machinery/light/small/directional/south, -/obj/machinery/alarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7494,6 +7514,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -7943,11 +7964,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aMs" = ( @@ -7962,7 +7978,6 @@ codes_txt = "patrol;next_patrol=14.9-CrewQuarters-Central"; location = "14.8-Dorms-Lockers" }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -7987,6 +8002,7 @@ /area/station/service/clown) "aMy" = ( /obj/structure/closet/wardrobe/pjs, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -8653,7 +8669,7 @@ }, /area/station/legal/courtroom) "aOS" = ( -/obj/machinery/light/small/directional/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -9530,6 +9546,7 @@ pixel_y = 5 }, /obj/structure/table/reinforced, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "aRQ" = ( @@ -9537,7 +9554,6 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "aRS" = ( -/obj/machinery/light/directional/north, /obj/structure/chair/comfy/black, /obj/structure/sign/poster/official/random/north, /turf/simulated/floor/carpet, @@ -11706,7 +11722,6 @@ /area/station/engineering/smes) "aYF" = ( /obj/machinery/washing_machine, -/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "cmo" @@ -11957,20 +11972,24 @@ /turf/simulated/wall, /area/station/supply/storage) "aZu" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - dir = 4; icon_state = "red" }, -/area/station/security/permabrig) +/area/station/security/brig) "aZx" = ( /obj/machinery/flasher{ id = "AI"; @@ -12162,6 +12181,7 @@ pixel_y = 5 }, /obj/machinery/alarm/directional/east, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18251,6 +18271,7 @@ /obj/structure/mirror{ pixel_y = -34 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -18259,7 +18280,6 @@ /obj/structure/toilet{ pixel_y = 13 }, -/obj/machinery/light/directional/south, /obj/machinery/light_switch/south, /obj/effect/landmark/start/captain, /turf/simulated/floor/plasteel{ @@ -18971,6 +18991,7 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "Internal Affairs Office" }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -19532,6 +19553,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/command/office/captain) "bug" = ( @@ -21099,6 +21121,7 @@ /obj/structure/bed/dogbed/ian, /mob/living/simple_animal/pet/dog/corgi/Ian, /obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/command/office/hop) "byf" = ( @@ -21153,7 +21176,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/light/directional/north, /obj/machinery/power/apc/directional/north, /turf/simulated/floor/carpet, /area/station/command/office/hop) @@ -21341,7 +21363,6 @@ /turf/simulated/floor/wood, /area/station/service/bar) "byJ" = ( -/obj/machinery/light/small/directional/east, /obj/machinery/computer/card{ dir = 8 }, @@ -21394,16 +21415,6 @@ icon_state = "darkbluecorners" }, /area/station/command/bridge) -"byY" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkneutralfull" - }, -/area/station/ai_monitored/storage/eva) "byZ" = ( /obj/structure/window/reinforced{ dir = 1 @@ -21447,6 +21458,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood, /area/station/command/office/captain/bedroom) "bzh" = ( @@ -21842,7 +21854,6 @@ /area/station/science/robotics) "bAl" = ( /obj/machinery/economy/vending/boozeomat, -/obj/machinery/light/small/directional/west, /turf/simulated/floor/wood, /area/station/command/office/captain) "bAm" = ( @@ -21893,9 +21904,10 @@ /turf/simulated/floor/wood, /area/station/service/bar) "bAx" = ( -/obj/machinery/light/directional/north, -/turf/simulated/floor/wood, -/area/station/service/bar) +/obj/structure/disposalpipe/segment, +/obj/machinery/light/directional/west, +/turf/simulated/floor/plasteel, +/area/station/security/brig) "bAy" = ( /obj/machinery/computer/arcade, /obj/machinery/camera{ @@ -23161,7 +23173,6 @@ /area/station/command/office/captain) "bEn" = ( /obj/machinery/alarm/directional/east, -/obj/machinery/light/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -23923,10 +23934,11 @@ /obj/item/kirbyplants{ level = 4.1 }, -/obj/machinery/light/directional/south, /obj/effect/turf_decal/woodsiding{ dir = 1 }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -24651,15 +24663,23 @@ }, /area/station/service/bar) "bJM" = ( -/obj/machinery/computer/security/telescreen/entertainment/directional/east, -/obj/structure/chair/stool/bar, -/obj/effect/turf_decal/woodsiding{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" +/obj/machinery/alarm/directional/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/station/service/bar) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/security/brig) "bJN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24916,16 +24936,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/secondary/bridge) -"bKU" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkneutralfull" - }, -/area/station/ai_monitored/storage/eva) "bKX" = ( /obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -25031,17 +25041,6 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) "bLu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -25392,6 +25391,7 @@ /area/station/maintenance/apmaint) "bNb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -26056,7 +26056,6 @@ pixel_y = 4 }, /obj/item/storage/toolbox/mechanical, -/obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -27456,7 +27455,6 @@ }, /area/station/service/kitchen) "bUe" = ( -/obj/machinery/light/directional/south, /obj/machinery/economy/vending/chefdrobe, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -27855,6 +27853,7 @@ pixel_y = 6 }, /obj/effect/turf_decal/tile/bar, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitecorner" @@ -28204,6 +28203,7 @@ }, /obj/item/paper_bin, /obj/item/pen/blue, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "bWD" = ( @@ -28432,7 +28432,6 @@ /area/station/science/research) "bXk" = ( /obj/structure/table, -/obj/machinery/light/small/directional/north, /obj/item/paper_bin{ pixel_x = -2; pixel_y = 2 @@ -28456,6 +28455,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -28644,7 +28644,6 @@ c_tag = "Chapel - Funeral Parlour"; dir = 8 }, -/obj/machinery/light/small/directional/east, /obj/machinery/driver_button{ id_tag = "chapelgun"; name = "Chapel Mass Driver"; @@ -29009,6 +29008,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkneutralfull" }, @@ -29581,7 +29581,6 @@ /area/station/hallway/primary/central) "caQ" = ( /obj/machinery/economy/vending/hydronutrients, -/obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) @@ -30492,7 +30491,6 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "greenblue" @@ -30721,6 +30719,17 @@ name = "HoS Junction"; sort_type_txt = "7" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/security/brig) "cer" = ( @@ -30810,7 +30819,8 @@ "ceU" = ( /obj/structure/chair, /obj/item/radio/intercom/locked/confessional{ - pixel_x = -28 + pixel_x = -22; + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -31640,7 +31650,6 @@ /obj/item/food/snacks/grown/pumpkin{ pixel_y = 5 }, -/obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -32106,11 +32115,20 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "cjf" = ( -/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "greenblue" + dir = 4; + icon_state = "red" }, -/area/station/service/hydroponics) +/area/station/security/permabrig) "cjh" = ( /obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 1 @@ -32351,6 +32369,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/security/brig) "cjX" = ( @@ -34403,7 +34432,8 @@ dir = 1 }, /obj/item/radio/intercom/locked/confessional{ - pixel_x = 28 + pixel_x = 22; + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -34758,7 +34788,6 @@ /turf/simulated/floor/plating/airless, /area/station/maintenance/turbine) "ctw" = ( -/obj/machinery/light/directional/west, /obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -34877,7 +34906,6 @@ }, /area/station/medical/storage) "ctX" = ( -/obj/machinery/light/directional/north, /obj/structure/rack, /obj/item/crutches, /obj/item/crutches, @@ -36459,7 +36487,6 @@ pixel_x = 8; pixel_y = 2 }, -/obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -36817,13 +36844,13 @@ /obj/structure/closet{ name = "Evidence Closet 2" }, -/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -37291,13 +37318,13 @@ /obj/structure/sign/kiddieplaque/remembrance{ pixel_y = 32 }, -/obj/machinery/light/small/directional/north, /obj/structure/table/wood, /obj/item/food/snacks/grown/poppy, /obj/item/food/snacks/grown/poppy, /obj/item/food/snacks/grown/poppy, /obj/item/food/snacks/grown/poppy, /obj/item/food/snacks/grown/poppy, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/station/service/chapel) "cCu" = ( @@ -38252,6 +38279,7 @@ "cFF" = ( /obj/structure/closet/l3closet/general, /obj/item/clothing/mask/gas, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitegreen" @@ -41915,7 +41943,6 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "cUa" = ( -/obj/machinery/light/directional/north, /obj/effect/landmark/start/paramedic, /turf/simulated/floor/plasteel{ dir = 9; @@ -42100,7 +42127,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "cUM" = ( -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -42771,8 +42797,8 @@ /area/station/public/fitness) "cXJ" = ( /obj/structure/table/wood, -/obj/machinery/alarm/directional/west, /obj/item/storage/fancy/crayons, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -44187,7 +44213,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/xenobio_north) "dfo" = ( -/obj/machinery/light/small/directional/north, /obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -45082,7 +45107,6 @@ /obj/structure/table, /obj/item/storage/photo_album, /obj/item/camera, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "dxa" = ( @@ -45481,7 +45505,11 @@ /obj/structure/table/wood, /obj/machinery/recharger, /obj/item/lighter/zippo/hos{ - pixel_x = 12 + pixel_x = 14; + pixel_y = 2 + }, +/obj/item/stamp/hos{ + pixel_y = 12 }, /turf/simulated/floor/wood, /area/station/command/office/hos) @@ -45570,16 +45598,6 @@ icon_state = "white" }, /area/station/medical/medbay) -"dMo" = ( -/obj/structure/bed/roller, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whiteblue" - }, -/area/station/medical/reception) "dMK" = ( /obj/machinery/atmospherics/binary/valve/open, /turf/simulated/floor/plating, @@ -46110,9 +46128,6 @@ }, /area/station/medical/cryo) "dZp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -46159,7 +46174,6 @@ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "greenblue" }, @@ -46188,6 +46202,11 @@ /area/station/maintenance/port) "dZZ" = ( /obj/structure/closet/emcloset, +/obj/machinery/power/apc/directional/east, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/floor/plasteel, /area/station/security/brig) "eak" = ( @@ -46360,7 +46379,6 @@ }, /obj/structure/reagent_dispensers/watertank/high, /obj/item/reagent_containers/glass/bucket, -/obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) @@ -47060,22 +47078,12 @@ }, /area/station/security/prisonlockers) "evm" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -48320,7 +48328,6 @@ /turf/simulated/floor/plating, /area/station/science/break_room) "fae" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -48435,7 +48442,6 @@ /obj/machinery/computer/brigcells{ dir = 8 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/station/command/office/hos) "fdc" = ( @@ -48456,12 +48462,18 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "fdu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/security/brig) "fdz" = ( @@ -49329,16 +49341,13 @@ }, /area/station/medical/virology) "fxV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkneutralfull" +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 }, -/area/station/security/evidence) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/north, +/turf/simulated/floor/plasteel, +/area/station/security/permabrig) "fyt" = ( /obj/structure/table, /obj/item/folder, @@ -49482,7 +49491,6 @@ "fAU" = ( /obj/structure/table/glass, /obj/item/radio/intercom/directional/west, -/obj/machinery/light/directional/west, /obj/item/storage/box/iv_bags{ pixel_x = 4; pixel_y = 6 @@ -49688,20 +49696,9 @@ }, /area/station/medical/virology) "fGA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Brig - Hallway - Entrance" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel, /area/station/security/brig) "fGE" = ( @@ -49891,11 +49888,6 @@ /area/station/hallway/primary/central) "fJr" = ( /obj/machinery/disposal, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -50625,22 +50617,15 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "gdb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/camera{ + c_tag = "Security - Office - Port - East"; + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "redcorner" + icon_state = "red" }, -/area/station/security/brig) +/area/station/security/main) "gdt" = ( /obj/structure/closet/crate, /obj/item/storage/box/drinkingglasses, @@ -50907,6 +50892,7 @@ /obj/machinery/computer/security/telescreen/prison{ pixel_y = -30 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -51322,7 +51308,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "gvd" = ( -/obj/machinery/light/directional/south, /obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel, /area/station/security/main) @@ -53079,8 +53064,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "hkf" = ( -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -53147,6 +53132,7 @@ /obj/structure/closet/secure_closet/security, /obj/structure/extinguisher_cabinet/directional/north, /obj/item/id_skin/donut, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -53356,11 +53342,10 @@ /turf/simulated/floor/plating, /area/station/security/prisonlockers) "hpp" = ( -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel{ - icon_state = "red" - }, -/area/station/security/permabrig) +/obj/structure/closet/secure_closet/atmos_personal, +/obj/machinery/light/directional/east, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos) "hpJ" = ( /obj/structure/cable{ d2 = 8; @@ -54523,6 +54508,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -54633,6 +54619,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -54831,10 +54818,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fore) -"hWk" = ( -/obj/machinery/light/directional/south, -/turf/simulated/floor/carpet/arcade, -/area/station/public/arcade) "hWr" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, @@ -54917,14 +54900,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "hYL" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/light/directional/east, +/turf/simulated/floor/plasteel{ + icon_state = "redcorner" }, -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) +/area/station/hallway/primary/fore) "hYV" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -54935,6 +54915,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/lightsout, /turf/simulated/floor/plasteel, /area/station/public/dorms) "hZi" = ( @@ -55184,7 +55165,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "yellow" @@ -55725,7 +55705,6 @@ /turf/simulated/floor/plasteel, /area/station/security/brig) "irj" = ( -/obj/machinery/light/small/directional/north, /obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -55952,7 +55931,6 @@ /turf/simulated/floor/carpet, /area/station/public/vacant_office) "iwm" = ( -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -56347,6 +56325,7 @@ /area/station/engineering/control) "iFi" = ( /obj/structure/table, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -56509,7 +56488,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, /obj/structure/cable/yellow{ d1 = 4; @@ -56899,15 +56878,24 @@ }, /area/station/science/toxins/launch) "iQK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -58309,8 +58297,8 @@ "jIM" = ( /obj/structure/table/reinforced, /obj/item/taperecorder, -/obj/item/flashlight/lamp, /obj/item/wirecutters/security, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -59272,10 +59260,10 @@ /obj/effect/turf_decal/woodsiding{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/keycard_auth/north, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "kds" = ( @@ -59715,18 +59703,22 @@ /turf/simulated/floor/plating, /area/station/science/toxins/mixing) "kri" = ( -/obj/machinery/light_switch/east{ - pixel_y = -6 +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/machinery/camera{ - c_tag = "Security - Office - Port - East"; - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" + icon_state = "white" }, -/area/station/security/main) +/area/station/medical/virology) "krx" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -59988,7 +59980,6 @@ /turf/simulated/floor/plating, /area/station/engineering/atmos) "kyo" = ( -/obj/machinery/light/directional/west, /obj/machinery/economy/vending/lawdrobe, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -60321,11 +60312,8 @@ /turf/simulated/floor/engine, /area/station/science/xenobiology) "kEh" = ( -/obj/machinery/power/apc/directional/north, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "kEk" = ( @@ -62255,7 +62243,6 @@ c_tag = "Dormitories - Fore"; dir = 8 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -62954,19 +62941,8 @@ }, /area/station/science/xenobiology) "lHl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/directional/north, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/alarm/directional/north, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -63141,6 +63117,7 @@ /area/station/maintenance/fore) "lKs" = ( /obj/machinery/firealarm/directional/south, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -63413,8 +63390,7 @@ }, /obj/structure/table/wood, /obj/item/cigbutt/cigarbutt{ - pixel_x = 5; - pixel_y = -1 + pixel_y = 2 }, /obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; @@ -64054,6 +64030,7 @@ pixel_x = 8 }, /obj/machinery/light_switch/west, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -64505,7 +64482,6 @@ name = "Distro to Waste"; on = 0 }, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -65692,7 +65668,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -66535,6 +66510,7 @@ "njo" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/stripes/end, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "nju" = ( @@ -66634,17 +66610,6 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "nls" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/junction{ dir = 1; icon_state = "pipe-j2" @@ -66807,7 +66772,6 @@ icon_state = "map-right-MS"; pixel_y = 32 }, -/obj/machinery/light/directional/north, /obj/item/radio/alternative{ pixel_x = 8; pixel_y = 4 @@ -66878,6 +66842,7 @@ /obj/structure/table/wood, /obj/item/clothing/mask/cigarette/pipe, /obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood, /area/station/service/bar) "nsJ" = ( @@ -66923,6 +66888,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67112,7 +67078,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -67329,17 +67295,6 @@ }, /area/station/engineering/break_room) "nCH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -67580,7 +67535,6 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "nIi" = ( -/obj/machinery/alarm/directional/north, /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -68251,6 +68205,7 @@ dir = 1; network = list("Prison","SS13") }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -68296,18 +68251,22 @@ }, /area/station/security/permabrig) "obP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 8; + icon_state = "1-8" }, /obj/structure/cable/yellow{ - d1 = 1; + d1 = 2; d2 = 8; - icon_state = "1-8" + icon_state = "2-8" }, /turf/simulated/floor/plasteel, /area/station/security/brig) @@ -68969,7 +68928,6 @@ }, /area/station/legal/lawoffice) "oyM" = ( -/obj/machinery/light/small/directional/east, /obj/machinery/computer/security/telescreen/entertainment/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -69602,6 +69560,7 @@ autolink_id = "dloop_atm_meter"; name = "Distribution Loop" }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -69664,25 +69623,6 @@ icon_state = "darkbluecorners" }, /area/station/command/bridge) -"oRt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel, -/area/station/security/brig) "oRx" = ( /obj/machinery/door/airlock/security/glass, /obj/effect/mapping_helpers/airlock/autoname, @@ -70076,7 +70016,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -70097,7 +70036,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/light/small/directional/west, /obj/item/coin/plasma, /obj/item/melee/chainofcommand, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -70702,7 +70640,6 @@ c_tag = "Atmospherics - Port"; dir = 4 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -71266,7 +71203,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "pGO" = ( -/obj/machinery/light/directional/east, /obj/structure/closet/secure_closet/security, /obj/machinery/alarm/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -71708,7 +71644,6 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 6 }, -/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel, @@ -72183,6 +72118,7 @@ "pZe" = ( /obj/effect/turf_decal/delivery/hollow, /obj/machinery/atmospherics/portable/canister/oxygen, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) "qal" = ( @@ -72222,11 +72158,13 @@ }, /area/station/security/main) "qaA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /obj/structure/cable/yellow{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -72357,6 +72295,7 @@ dir = 1 }, /obj/machinery/economy/vending/sovietsoda, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73231,7 +73170,6 @@ /obj/item/storage/fancy/egg_box, /obj/item/reagent_containers/condiment/flour, /obj/item/reagent_containers/condiment/rice, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -74141,6 +74079,7 @@ /obj/item/storage/secure/safe{ pixel_y = 32 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -75697,17 +75636,6 @@ }, /area/station/science/research) "rFq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -76289,9 +76217,6 @@ }, /area/station/security/execution) "rUG" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -76314,7 +76239,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) "rUN" = ( @@ -76504,8 +76428,8 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -76773,6 +76697,17 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -76867,8 +76802,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 8; + icon_state = "1-8" }, /obj/structure/cable/yellow{ d1 = 2; @@ -77077,7 +77012,6 @@ /area/station/service/kitchen) "spf" = ( /obj/structure/filingcabinet/security, -/obj/machinery/light/directional/west, /obj/machinery/computer/guestpass{ pixel_x = -28 }, @@ -77768,6 +77702,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -78046,6 +77981,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -78729,22 +78665,18 @@ "tcD" = ( /obj/structure/table, /obj/item/storage/box/donkpockets{ - pixel_x = -14; - pixel_y = 6 + pixel_x = -8; + pixel_y = 4 }, /obj/item/storage/fancy/donut_box{ - pixel_x = 4 + pixel_x = 4; + pixel_y = 2 }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -78769,6 +78701,7 @@ /area/station/engineering/atmos/distribution) "tdb" = ( /obj/structure/bookcase, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "black" @@ -79940,15 +79873,30 @@ }, /area/station/science/toxins/launch) "tIU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /obj/structure/cable/yellow{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -80397,8 +80345,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 8; + icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -80735,6 +80683,17 @@ name = "Security Junction"; sort_type_txt = "8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/station/security/brig) "ugL" = ( @@ -80760,6 +80719,9 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "uhf" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -81149,8 +81111,11 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/stamp/hos, -/obj/effect/spawner/lootdrop/officetoys, +/obj/machinery/computer/med_data/laptop{ + dir = 4; + pixel_y = 3; + pixel_x = 2 + }, /turf/simulated/floor/wood, /area/station/command/office/hos) "usD" = ( @@ -82377,7 +82342,7 @@ /obj/machinery/door/window/classic/normal{ name = "Court Cell" }, -/obj/machinery/light/small/directional/west, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -83461,6 +83426,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -83639,14 +83615,20 @@ }, /area/station/medical/reception) "vzd" = ( -/obj/machinery/light/directional/south, -/obj/machinery/suit_storage_unit/cmo/sec_storage/secure, -/obj/effect/turf_decal/delivery/blue, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkblue" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/area/station/medical/storage) +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel, +/area/station/security/brig) "vzi" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -83725,7 +83707,6 @@ dir = 8 }, /obj/machinery/light_switch/east, -/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -83861,9 +83842,15 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "vHA" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel, -/area/station/public/dorms) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/atmos) "vHD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -83981,15 +83968,13 @@ /area/station/security/range) "vKy" = ( /obj/structure/table/wood, -/obj/machinery/computer/med_data/laptop{ - dir = 1; - pixel_y = 3 - }, +/obj/effect/spawner/lootdrop/officetoys, /obj/item/radio/intercom/directional/east, /obj/item/radio/intercom/department/security{ pixel_x = 34; dir = 8 }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood, /area/station/command/office/hos) "vKz" = ( @@ -84163,12 +84148,6 @@ /area/station/science/research) "vRv" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/machinery/door_control/shutter/north{ - id = "kitchen_counter"; - name = "Kitchen Counter Shutters"; - pixel_x = -6; - req_access_txt = "28" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -84318,7 +84297,7 @@ }, /area/station/science/xenobiology) "vVr" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -84389,17 +84368,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/security/brig) "vWq" = ( @@ -84597,9 +84567,11 @@ }, /area/station/medical/surgery/observation) "wcU" = ( -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel, -/area/station/security/permabrig) +/obj/effect/light_emitter/colored{ + light_color = "#FFFFFF" + }, +/turf/simulated/floor/engine, +/area/holodeck/alphadeck) "wdi" = ( /obj/machinery/camera{ c_tag = "Security - Office - Port - West"; @@ -85253,11 +85225,15 @@ }, /area/station/engineering/atmos) "wuH" = ( -/obj/item/radio/intercom/directional/north, /obj/machinery/camera{ c_tag = "Arcade"; dir = 6 }, +/obj/machinery/power/apc/directional/north, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "wuT" = ( @@ -85993,13 +85969,6 @@ /obj/machinery/power/apc/directional/north, /turf/simulated/floor/wood, /area/station/service/theatre) -"wQo" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/simulated/floor/plasteel, -/area/station/engineering/atmos) "wQr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -86245,15 +86214,6 @@ icon_state = "whiteblue" }, /area/station/medical/reception) -"wXe" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/security/main) "wXi" = ( /obj/structure/chair/stool{ dir = 1 @@ -86440,7 +86400,6 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 10 }, -/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/security/permabrig) @@ -86570,7 +86529,6 @@ /area/station/medical/virology) "xdb" = ( /obj/structure/rack, -/obj/machinery/light/directional/west, /obj/item/shield/riot{ pixel_y = 3 }, @@ -86578,6 +86536,7 @@ /obj/item/shield/riot{ pixel_y = -3 }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -87012,20 +86971,24 @@ /area/station/science/research) "xoI" = ( /obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/power/apc/directional/east, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/plasteel, /area/station/security/brig) @@ -87473,23 +87436,14 @@ }, /area/station/engineering/equipmentstorage) "xAz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/sign/poster/random{ + pixel_y = -32 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "greenblue" }, -/turf/simulated/floor/plasteel, -/area/station/security/brig) +/area/station/service/hydroponics) "xAI" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -88805,7 +88759,6 @@ /area/station/hallway/primary/fore) "ydH" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/light/directional/east, /obj/item/id_skin/donut, /turf/simulated/floor/plasteel{ dir = 9; @@ -105286,7 +105239,7 @@ bZP aaa aaa reS -wjw +kri reS aaa aaa @@ -108361,7 +108314,7 @@ cvS dzD rif cCK -vzd +irW cmv cGw lQQ @@ -110061,7 +110014,7 @@ sSO vbV eCJ whu -hYL +vSm udK udK smH @@ -110580,9 +110533,9 @@ ggD kxh eju eJM +cjf jOp jOp -aZu nbK qbU iLw @@ -110832,7 +110785,7 @@ adi opZ vrB sNR -wcU +adi udK udK vWd @@ -111870,12 +111823,12 @@ kbN kbN kbN kbN -teN +fxV kkP ttb gKl taf -hpp +uZy tfl tfl tfl @@ -112451,7 +112404,7 @@ cNi bRQ bVb bUN -byY +bQd bQd bMS caL @@ -113479,7 +113432,7 @@ bMS bMS bMS bYw -bKU +bYw bYw bMS caD @@ -114714,7 +114667,7 @@ kvA aze jTy aUJ -oRt +apP iQK fJd mmK @@ -114775,7 +114728,7 @@ vyL ubT tqh rXj -dMo +vGz aWQ iEk kWT @@ -114972,7 +114925,7 @@ aHO keN aHO bLu -avB +aZu eKW wyP axY @@ -115221,7 +115174,7 @@ abW abq tsn kzg -fxV +fae fae dZp xBX @@ -116000,7 +115953,7 @@ arV uBY aHO fGA -cjQ +bJM aqu sDN xHy @@ -116256,7 +116209,7 @@ apk pts iao ljV -gdb +bLu aFz aqu dZL @@ -116786,7 +116739,7 @@ aNt aNt aNt aNt -aNt +hYL aNt aUq bks @@ -117027,7 +116980,7 @@ aHO aHO aHO aHO -irb +apP avB aqu hEP @@ -117281,12 +117234,12 @@ apP liR aCu maC -apP uYf apP -xAz -ugy apP +wRx +ugy +uYf apP apP mLA @@ -117529,7 +117482,7 @@ aqd aSm alm wRx -oSi +bAx oSi oSi oSi @@ -117797,7 +117750,7 @@ uFZ rHM avk eey -avk +vzd vWl xoI wGr @@ -119831,7 +119784,7 @@ laH aaa sRw tcD -wXe +vtO qaA aeb aBF @@ -120090,8 +120043,8 @@ apO fJr hwP qaq +gdb vNV -kri pzQ iOo dKy @@ -120344,7 +120297,7 @@ aaa laH abq apO -jSU +apO apO exm apO @@ -122434,10 +122387,10 @@ uUq aTh ajg bgj -tay +aVH dNV wSh -aVH +tay avv awZ aQC @@ -123455,7 +123408,7 @@ amM aiY aGJ akk -hWk +akk aiY vrw vnj @@ -123768,7 +123721,7 @@ cde ces ces ces -cll +xAz cte cYm cmB @@ -124282,7 +124235,7 @@ byL ces ces cdD -cjf +chm cte rwT cmB @@ -124774,7 +124727,7 @@ bsm bsm bsm bsm -bAx +bEv ylN bau bvz @@ -125255,9 +125208,9 @@ aJB awR azZ awR -awR -aCW lak +aCW +awR qpw aGQ aJF @@ -125550,7 +125503,7 @@ kMy bAv jll bAv -bJM +bHO tco bOy nic @@ -125768,14 +125721,14 @@ aCe oQz aRt lqY -aAH +oQz fpR aCY oQz aUE aGS bJR -vHA +aJE aSd aMw aBI @@ -127812,10 +127765,10 @@ oWE air air air +wcU air air -air -air +wcU air air air @@ -131212,7 +131165,7 @@ uQn oje aAG mmB -mmB +hpp mmB aAG uTp @@ -133006,7 +132959,7 @@ bqT hNv iBc oBh -wQo +etE etB etB hbU @@ -133523,7 +133476,7 @@ mmD cfK lSg gDu -cfK +vHA cfK lSg gDu diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index b9466e6e69ba..f38b0b50342c 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -2256,9 +2256,8 @@ /turf/simulated/wall, /area/station/hallway/secondary/entry) "apk" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/machinery/ai_status_display, -/turf/simulated/floor/plating, +/obj/machinery/status_display, +/turf/simulated/wall, /area/station/hallway/secondary/entry) "apl" = ( /obj/structure/filingcabinet, @@ -8521,12 +8520,9 @@ }, /area/station/hallway/primary/fore) "aKu" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 - }, -/obj/machinery/newscaster/directional/east, -/turf/simulated/floor/wood/parquet, -/area/station/service/library) +/obj/machinery/light/directional/north, +/turf/simulated/floor/bluegrid, +/area/station/turret_protected/ai_upload) "aKw" = ( /obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/oak, @@ -10022,11 +10018,15 @@ }, /area/station/hallway/primary/fore) "aRK" = ( -/obj/effect/light_emitter/colored{ - light_color = "#FFFFFF" +/obj/effect/turf_decal/delivery, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/engine, -/area/holodeck/alphadeck) +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel/white, +/area/station/science/xenobiology) "aRL" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/effect/mapping_helpers/damaged_window, @@ -12723,12 +12723,22 @@ /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bdO" = ( -/obj/machinery/light/directional/east, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteblue" + icon_state = "neutralfull" }, -/area/station/medical/medbay2) +/area/station/hallway/primary/fore) "bdP" = ( /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -13115,8 +13125,13 @@ }, /area/station/service/kitchen) "bfp" = ( -/turf/simulated/floor/engine, -/area/holodeck/alphadeck) +/obj/item/kirbyplants, +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/station/hallway/secondary/entry) "bfq" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -13381,9 +13396,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/public/locker) "bgw" = ( -/obj/machinery/light/directional/north, -/turf/simulated/floor/bluegrid, -/area/station/turret_protected/ai_upload) +/obj/machinery/alarm/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "yellow" + }, +/area/station/engineering/break_room) "bgx" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -13762,13 +13780,17 @@ /turf/simulated/floor/carpet/orange, /area/station/service/bar/atrium) "bhL" = ( -/obj/item/kirbyplants, -/obj/machinery/light/small/directional/south, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" +/obj/effect/landmark/start/cyborg, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/area/station/hallway/secondary/entry) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/science/robotics/chargebay) "bhN" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -22504,16 +22526,18 @@ /turf/simulated/wall, /area/station/public/storage/tools) "bOD" = ( +/obj/structure/disposalpipe/segment, /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/effect/landmark/lightsout, -/obj/machinery/hologram/holopad, -/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -23150,9 +23174,14 @@ /turf/simulated/wall, /area/station/engineering/control) "bQs" = ( -/obj/machinery/light/small/directional/south, -/turf/simulated/floor/plasteel, -/area/station/science/research) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/fore) "bQt" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -23859,10 +23888,9 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bSM" = ( -/obj/machinery/ai_status_display, -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/station/hallway/secondary/entry) +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel, +/area/station/science/research) "bSN" = ( /obj/machinery/smartfridge/secure/circuits/aiupload/highrisk, /turf/simulated/floor/bluegrid, @@ -29407,15 +29435,12 @@ /turf/simulated/floor/carpet, /area/station/command/office/hop) "cnp" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/item/radio/intercom/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" }, -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel/white, -/area/station/science/xenobiology) +/area/station/hallway/primary/central/sw) "cnt" = ( /obj/item/kirbyplants, /obj/machinery/light_switch/south, @@ -32955,17 +32980,13 @@ }, /area/station/public/fitness) "cCb" = ( -/turf/simulated/floor/engine{ - name = "Holodeck Projector Floor" - }, +/turf/simulated/floor/engine, /area/holodeck/alphadeck) "cCc" = ( /obj/machinery/camera{ c_tag = "Holodeck Fore" }, -/turf/simulated/floor/engine{ - name = "Holodeck Projector Floor" - }, +/turf/simulated/floor/engine, /area/holodeck/alphadeck) "cCd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -35317,12 +35338,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "cNj" = ( -/obj/item/radio/intercom/directional/west, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/station/hallway/primary/central/sw) +/obj/machinery/light/directional/south, +/turf/simulated/floor/bluegrid, +/area/station/turret_protected/ai_upload) "cNk" = ( /obj/machinery/shieldwallgen, /obj/effect/turf_decal/stripes/line{ @@ -35603,9 +35621,7 @@ c_tag = "Holodeck Aft"; dir = 1 }, -/turf/simulated/floor/engine{ - name = "Holodeck Projector Floor" - }, +/turf/simulated/floor/engine, /area/holodeck/alphadeck) "cOx" = ( /obj/machinery/atmospherics/binary/valve, @@ -37655,10 +37671,8 @@ /area/station/hallway/secondary/entry) "cWy" = ( /obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/station/hallway/secondary/bridge) +/turf/simulated/floor/plasteel/white, +/area/station/science/research) "cWz" = ( /obj/machinery/hologram/holopad, /obj/effect/turf_decal/delivery/hollow, @@ -39813,12 +39827,11 @@ /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "dia" = ( -/obj/item/kirbyplants, -/obj/machinery/light/small/directional/south, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" +/obj/effect/light_emitter/colored{ + light_color = "#FFFFFF" }, -/area/station/hallway/secondary/entry) +/turf/simulated/floor/engine, +/area/holodeck/alphadeck) "die" = ( /obj/structure/table/reinforced, /obj/item/aicard, @@ -40626,9 +40639,11 @@ /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) "dmf" = ( -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel/white, -/area/station/science/robotics/chargebay) +/obj/machinery/light/directional/east, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, +/area/station/science/research) "dmg" = ( /turf/simulated/floor/greengrid, /area/station/science/robotics/chargebay) @@ -41141,14 +41156,9 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "doT" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 - }, -/obj/machinery/atmospherics/portable/scrubber, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/small/directional/south, -/turf/simulated/floor/plasteel/dark, -/area/station/public/locker) +/turf/simulated/floor/plasteel/white, +/area/station/science/robotics/chargebay) "doU" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/delivery/hollow, @@ -46232,6 +46242,13 @@ /obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) +"dRu" = ( +/obj/machinery/light/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue" + }, +/area/station/medical/medbay2) "dRv" = ( /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) @@ -46535,12 +46552,16 @@ }, /area/station/hallway/secondary/exit) "dSC" = ( -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/area/station/science/research) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/science/robotics/chargebay) "dSD" = ( /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) @@ -54770,10 +54791,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/control) -"gbf" = ( -/obj/machinery/light/directional/south, -/turf/simulated/floor/bluegrid, -/area/station/turret_protected/ai_upload) "gbi" = ( /turf/simulated/wall, /area/station/medical/medbay2) @@ -59308,6 +59325,12 @@ icon_state = "purple" }, /area/station/maintenance/fsmaint) +"hBk" = ( +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/hallway/secondary/bridge) "hBu" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -68063,7 +68086,10 @@ /area/station/supply/office) "kiB" = ( /obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel/white, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/station/science/research) "kiP" = ( /obj/effect/spawner/lootdrop/maintenance, @@ -77625,22 +77651,10 @@ /turf/simulated/floor/grass/no_creep, /area/station/hallway/secondary/exit) "non" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/primary/fore) +/obj/machinery/ai_status_display, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry) "now" = ( /obj/structure/chair, /obj/effect/decal/cleanable/glass, @@ -78491,22 +78505,14 @@ }, /area/station/maintenance/medmaint) "nBr" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 }, -/area/station/hallway/primary/fore) +/obj/machinery/atmospherics/portable/scrubber, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel/dark, +/area/station/public/locker) "nBt" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -79697,14 +79703,20 @@ /turf/simulated/floor/carpet, /area/station/security/detective) "nPZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/station/hallway/primary/fore) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/turf/simulated/floor/plasteel/dark, +/area/station/hallway/primary/central/north) "nQa" = ( /obj/machinery/alarm/directional/south, /obj/structure/table, @@ -82338,6 +82350,13 @@ icon_state = "cmo" }, /area/station/medical/break_room) +"oJk" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/machinery/newscaster/directional/east, +/turf/simulated/floor/wood/parquet, +/area/station/service/library) "oJn" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable{ @@ -91842,10 +91861,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) -"rGu" = ( -/obj/machinery/status_display, -/turf/simulated/wall, -/area/station/hallway/secondary/entry) "rGQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -94540,16 +94555,12 @@ /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "szi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/item/kirbyplants, +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" }, -/turf/simulated/floor/plasteel, -/area/station/science/robotics/chargebay) +/area/station/hallway/secondary/entry) "szx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -97668,13 +97679,6 @@ /obj/effect/mapping_helpers/airlock/access/any/science/research, /turf/simulated/floor/plasteel/white, /area/station/science/explab) -"twY" = ( -/obj/machinery/alarm/directional/west, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "yellow" - }, -/area/station/engineering/break_room) "txc" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -98805,18 +98809,6 @@ /obj/machinery/light/small/directional/south, /turf/simulated/floor/wood, /area/station/command/office/hos) -"tSg" = ( -/obj/effect/landmark/start/cyborg, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/science/robotics/chargebay) "tSn" = ( /obj/structure/cable{ d1 = 1; @@ -102451,19 +102443,19 @@ /area/station/security/processing) "uXv" = ( /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/lightsout, +/obj/machinery/hologram/holopad, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/obj/machinery/light/small/directional/north, -/turf/simulated/floor/plasteel/dark, -/area/station/hallway/primary/central/north) +/area/station/hallway/primary/fore) "uXC" = ( /obj/structure/table/wood, /obj/item/folder/blue{ @@ -107610,6 +107602,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit/maintenance) +"wIK" = ( +/obj/effect/spawner/window/reinforced/grilled, +/obj/machinery/ai_status_display, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry) "wIL" = ( /obj/effect/turf_decal/delivery/partial{ dir = 4 @@ -112523,12 +112520,6 @@ icon_state = "vault" }, /area/station/engineering/ai_transit_tube) -"yir" = ( -/obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/research) "yiO" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -137502,7 +137493,7 @@ cRQ cTs cUV cWC -cnp +aRK dmq cZn sOx @@ -137720,7 +137711,7 @@ bGK bID byl taB -twY +bgw jkP bSm xtv @@ -141375,7 +141366,7 @@ cRd cZt hHk kuI -bQs +bSM dkI hMD jeJ @@ -141883,7 +141874,7 @@ dsu cSt lUm iWz -yir +dmf cSt cSt cZt @@ -143675,7 +143666,7 @@ odU ddi dau xgf -kiB +cWy dFm kOs kOs @@ -144159,7 +144150,7 @@ nrS qPJ cnl kXs -aKu +oJk oUB wYJ dSX @@ -144676,7 +144667,7 @@ oUR oUR coE bwm -cNj +cnp bwm bwm muZ @@ -146237,7 +146228,7 @@ ogM xme sjV cMm -dSC +kiB cKI cUZ cWz @@ -147020,9 +147011,9 @@ ddC dfo dim doU -dmf +doT aeh -dmf +doT doU dqj dqp @@ -147276,8 +147267,8 @@ dca ddj dfo din -tSg -szi +bhL +dSC eeP dnx doV @@ -148466,7 +148457,7 @@ asY awh uSu gaQ -bhL +bfp aES aCP aAD @@ -148977,7 +148968,7 @@ aqV arO aqV auH -apk +wIK avc lmo axh @@ -149026,11 +149017,11 @@ bEe bFG bHq bOT -bgw +aKu bMX fBC bMX -gbf +cNj bOT aaa bOZ @@ -149503,25 +149494,25 @@ vMg uFI guk vMg -bOD +uXv qvT qvT qvT nsL oir -non +bdO ima xCn aTj beb -nBr +bOD ima kdH kNg kNg qsm cUT -nBr +bOD jja kNg kNg @@ -149754,7 +149745,7 @@ lxo ayy aBU aEF -nPZ +bQs aEF aEF cyT @@ -149766,12 +149757,12 @@ aEF aEF aRH aJc -nPZ +bQs aEF bgx aoZ rCA -nPZ +bQs aEF aEF wgV @@ -149999,13 +149990,13 @@ acC ant rJt aoA -rGu +apk aqe asE arO asE atF -bSM +non avg kIL axk @@ -150054,11 +150045,11 @@ bEi bFK bHu bOT -bgw +aKu bMX oWg bMX -gbf +cNj bOT aaa bQI @@ -150522,7 +150513,7 @@ asZ axi ayy hSK -dia +szi aHT tsl mRc @@ -152129,7 +152120,7 @@ pJb cnA cht cqj -cWy +hBk csV cuX cCX @@ -154667,7 +154658,7 @@ bbe bbe bbe cGk -uXv +nPZ cGk oWb oWb @@ -158062,7 +158053,7 @@ wQQ rbM yff dtz -bdO +dRu toO dtz qvp @@ -159079,7 +159070,7 @@ cyN jez aWn fxS -doT +nBr ixf hhF hhF @@ -162157,10 +162148,10 @@ wpW cCc cCb cCb -aRK -bfp -bfp -aRK +dia +cCb +cCb +dia cCb cCb cOw