From 0b7409e78a501731d48441af760d44c88c5075c6 Mon Sep 17 00:00:00 2001 From: Aylong Date: Sat, 9 Mar 2024 04:52:25 +0200 Subject: [PATCH] Delta WiP & Cyberiad --- _maps/map_files220/cyberiad/cyberiad.dmm | 392 +++++++++++------------ _maps/map_files220/delta/delta.dmm | 241 +++++++------- 2 files changed, 301 insertions(+), 332 deletions(-) diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index ca3f6e781d27..d86c787fbf02 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -258,7 +258,6 @@ }, /area/station/security/main) "acy" = ( -/obj/machinery/light/directional/north, /obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; @@ -387,6 +386,7 @@ "acW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -733,10 +733,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Brig Restroom"; - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -2639,7 +2636,6 @@ /obj/machinery/recharger{ pixel_y = 2 }, -/obj/machinery/light/directional/north, /obj/machinery/camera{ c_tag = "Brig Warden's Office" }, @@ -2671,6 +2667,7 @@ icon_state = "4-8" }, /obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" @@ -3377,7 +3374,6 @@ }, /area/station/security/prison/cell_block/A) "aoW" = ( -/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; @@ -3393,6 +3389,7 @@ id = "Cell 3"; pixel_y = 28 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -4583,8 +4580,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "atx" = ( -/obj/machinery/light/directional/south, /obj/machinery/newscaster/security_unit/south, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -4607,7 +4604,6 @@ }, /area/station/security/permabrig) "atC" = ( -/obj/machinery/light/directional/south, /obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/segment{ dir = 8; @@ -4705,6 +4701,7 @@ /area/station/security/range) "aua" = ( /obj/item/radio/intercom/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredcorners" @@ -5010,7 +5007,7 @@ /area/station/security/prison/cell_block/A) "auS" = ( /obj/machinery/light_switch/west, -/obj/machinery/light/directional/west, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -5021,7 +5018,6 @@ c_tag = "Brig Prisoner Processing West"; dir = 4 }, -/obj/machinery/light/directional/west, /obj/machinery/requests_console{ department = "Security"; departmentType = 5; @@ -5751,7 +5747,6 @@ }, /area/station/security/prison/cell_block/A) "axH" = ( -/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5763,6 +5758,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -5891,6 +5887,7 @@ pixel_y = 7 }, /obj/item/pen, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -6152,7 +6149,6 @@ }, /area/station/security/lobby) "ayM" = ( -/obj/machinery/light/directional/south, /obj/machinery/ai_status_display/south, /obj/item/reagent_containers/drinks/mug/sec, /obj/structure/table, @@ -6170,6 +6166,7 @@ /area/station/security/lobby) "ayP" = ( /obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -6263,6 +6260,7 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -6528,6 +6526,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -6538,16 +6537,12 @@ /turf/simulated/floor/plasteel, /area/station/science/storage) "azH" = ( -/obj/machinery/door_control/shutter/east{ - id = "brig_courtroom"; - name = "Brig Courtroom Shutter Control"; - req_one_access_txt = "2" - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkred" + dir = 8; + icon_state = "bluecorner" }, -/area/station/security/brig) +/area/station/hallway/primary/fore) "azI" = ( /obj/structure/window/reinforced{ dir = 4 @@ -7312,11 +7307,9 @@ /area/station/legal/lawoffice) "aCd" = ( /obj/structure/table/wood, -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Magistrate's Office"; - pixel_y = 4 - }, /obj/structure/sign/poster/official/random/north, +/obj/machinery/light/directional/north, +/obj/machinery/computer/secure_data/laptop, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/magistrate) "aCe" = ( @@ -7333,8 +7326,10 @@ /area/station/legal/magistrate) "aCg" = ( /obj/structure/table/wood, -/obj/machinery/light/directional/north, -/obj/machinery/computer/secure_data/laptop, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Magistrate's Office"; + pixel_y = 4 + }, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/magistrate) "aCh" = ( @@ -7403,7 +7398,6 @@ }, /area/station/security/prison/cell_block/A) "aCr" = ( -/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -7422,6 +7416,7 @@ c_tag = "Brig Cell 4"; dir = 1 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -7512,6 +7507,11 @@ name = "Brig Courtroom Shutters" }, /obj/effect/spawner/window/reinforced/grilled, +/obj/machinery/door_control/shutter/north{ + id = "brig_courtroom"; + name = "Brig Courtroom Shutter Control"; + req_one_access_txt = "2" + }, /turf/simulated/floor/plating, /area/station/security/brig) "aCL" = ( @@ -7619,12 +7619,7 @@ "aDb" = ( /obj/structure/table, /obj/item/camera, -/obj/machinery/door_control/shutter/north{ - id = "brig_courtroom"; - name = "Brig Courtroom Shutter Control"; - req_one_access_txt = "2" - }, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7762,7 +7757,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/auxsolarport) "aDv" = ( -/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8338,11 +8332,11 @@ /area/station/maintenance/fore) "aFt" = ( /obj/machinery/disposal, -/obj/machinery/light/directional/east, /obj/machinery/newscaster/security_unit/south, /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/magistrate) "aFw" = ( @@ -8866,7 +8860,6 @@ "aGZ" = ( /obj/structure/table, /obj/random/plushie, -/obj/machinery/light/small/directional/north, /obj/machinery/status_display/directional/north, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) @@ -9061,6 +9054,7 @@ /area/station/legal/courtroom) "aHH" = ( /obj/item/kirbyplants, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -9220,7 +9214,6 @@ /area/station/legal/lawoffice) "aIp" = ( /obj/structure/chair/comfy/black, -/obj/machinery/light/small/directional/west, /obj/machinery/alarm/directional/west, /obj/effect/landmark/start/assistant, /turf/simulated/floor/carpet/arcade, @@ -9356,7 +9349,6 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/magistrate) "aIO" = ( -/obj/machinery/firealarm/directional/east, /obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -9554,6 +9546,7 @@ "aJv" = ( /obj/machinery/gameboard, /obj/structure/sign/poster/contraband/random/west, +/obj/machinery/light/directional/west, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aJw" = ( @@ -9588,6 +9581,7 @@ "aJA" = ( /obj/structure/closet/lasertag/red, /obj/structure/sign/poster/official/random/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aJB" = ( @@ -9861,7 +9855,6 @@ /area/station/science/toxins/test) "aKO" = ( /obj/structure/closet/lasertag/blue, -/obj/machinery/light/directional/east, /obj/item/radio/intercom/directional/east, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) @@ -10574,8 +10567,6 @@ }, /area/station/legal/courtroom) "aNK" = ( -/obj/machinery/light/directional/west, -/obj/machinery/alarm/directional/west, /obj/machinery/camera{ c_tag = "Fore Primary Hallway South"; dir = 4 @@ -10617,10 +10608,17 @@ }, /area/station/service/barber) "aOb" = ( -/obj/machinery/light/directional/west, -/obj/machinery/economy/arcade/claw, -/turf/simulated/floor/carpet/arcade, -/area/station/public/arcade) +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "aOg" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -11211,16 +11209,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) -"aQn" = ( -/obj/item/radio/intercom/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/station/public/dorms) "aQo" = ( /obj/structure/chair, /obj/machinery/computer/security/telescreen/entertainment/directional/north, @@ -11248,7 +11236,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -11356,6 +11344,7 @@ /obj/effect/turf_decal/delivery/blue/partial{ dir = 8 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -11456,7 +11445,6 @@ /area/station/public/dorms) "aQG" = ( /obj/machinery/newscaster/directional/north, -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -11504,7 +11492,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "aQS" = ( -/obj/machinery/light/directional/east, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -11715,7 +11703,7 @@ /obj/structure/table, /obj/item/storage/box/cups, /obj/item/radio/intercom/directional/south, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/wood/fancy, /area/station/legal/courtroom) "aRO" = ( @@ -12990,20 +12978,24 @@ }, /area/station/command/vault) "aWz" = ( -/obj/machinery/light/directional/west, -/obj/machinery/cryopod{ +/obj/machinery/light/directional/north, +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitegreencorner" + dir = 1; + icon_state = "neutralcorner" }, -/area/station/public/sleep) +/area/station/public/dorms) "aWB" = ( /obj/structure/chair{ dir = 4 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -14590,7 +14582,7 @@ "bbZ" = ( /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ - dir = 4; + dir = 1; icon_state = "neutralcorner" }, /area/station/public/dorms) @@ -15110,7 +15102,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "bdF" = ( -/obj/machinery/light/directional/west, /obj/structure/sign/poster/official/random/west, /turf/simulated/floor/plasteel{ dir = 1; @@ -15520,6 +15511,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -15713,6 +15705,7 @@ "bgf" = ( /obj/structure/table/wood, /obj/item/candle, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -17202,7 +17195,6 @@ /area/station/service/chapel) "bmK" = ( /obj/machinery/alarm/directional/east, -/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -17226,11 +17218,12 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bmT" = ( -/obj/machinery/light/small/directional/west, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "neutralcorner" }, -/area/station/service/chapel) +/area/station/public/dorms) "bmU" = ( /obj/structure/table/wood, /obj/item/storage/fancy/candle_box/full, @@ -18972,6 +18965,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -19890,7 +19884,6 @@ }, /area/station/turret_protected/ai_upload) "byZ" = ( -/obj/machinery/light/directional/south, /obj/machinery/light_switch/south, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -19926,12 +19919,6 @@ /obj/machinery/smartfridge, /turf/simulated/floor/plating, /area/station/service/kitchen) -"bzl" = ( -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/service/chapel) "bzm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -21198,7 +21185,6 @@ /area/station/hallway/primary/starboard/east) "bFs" = ( /obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bFu" = ( @@ -21238,6 +21224,9 @@ /area/station/supply/office) "bFB" = ( /obj/structure/closet/walllocker/emerglocker/north, +/obj/machinery/camera{ + c_tag = "Starboard Primary Hallway 6" + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bFC" = ( @@ -21261,7 +21250,6 @@ }, /area/station/engineering/gravitygenerator) "bFH" = ( -/obj/machinery/light/directional/north, /obj/machinery/economy/vending/wallmed/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, @@ -23134,6 +23122,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/office) "bNN" = ( @@ -23179,7 +23168,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/supply/office) "bOb" = ( @@ -23216,6 +23204,7 @@ /obj/effect/turf_decal{ dir = 8 }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bOj" = ( @@ -23677,9 +23666,9 @@ }, /area/station/hallway/primary/central/sw) "bQj" = ( -/obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel, -/area/station/supply/office) +/obj/machinery/light/small/directional/west, +/turf/simulated/floor/transparent/glass, +/area/station/command/bridge) "bQq" = ( /obj/effect/spawner/random_spawners/grille_often, /turf/simulated/floor/plating, @@ -34039,7 +34028,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) @@ -39208,13 +39196,6 @@ /obj/structure/chair/stool, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"cYl" = ( -/obj/machinery/light/directional/north, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/station/security/main) "cYn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -43963,6 +43944,7 @@ dir = 4 }, /obj/item/radio/intercom/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -47238,25 +47220,21 @@ /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "emr" = ( -/obj/machinery/light/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ - d1 = 4; + d1 = 1; d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + icon_state = "1-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/area/station/public/dorms) +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/fore) "emy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/poddoor{ @@ -49999,11 +49977,6 @@ /area/station/security/interrogation) "fqq" = ( /obj/machinery/light/directional/east, -/obj/machinery/light_switch/east, -/obj/machinery/camera{ - c_tag = "Brig Cell Block A South"; - dir = 8 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -55994,6 +55967,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/camera{ + c_tag = "Brig Cell Block A South"; + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -56945,19 +56922,13 @@ }, /area/station/security/prisonlockers) "hLk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8" + icon_state = "4-8" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/plating, /area/station/maintenance/fore) @@ -58164,17 +58135,12 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "ijf" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/light/directional/west, +/turf/simulated/floor/plasteel/airless, +/area/station/science/toxins/test) "ijg" = ( /obj/item/trash/pistachios, /obj/effect/decal/cleanable/dirt, @@ -60520,7 +60486,7 @@ pixel_y = 36 }, /obj/structure/filingcabinet/security, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -61129,6 +61095,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/camera{ + c_tag = "Brig Restroom"; + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -66301,11 +66271,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "lqm" = ( -/obj/structure/table, -/obj/item/storage/fancy/donut_box, -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel, -/area/station/security/main) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/west, +/turf/simulated/floor/plasteel/airless, +/area/station/science/toxins/test) "lqw" = ( /obj/structure/morgue, /turf/simulated/floor/plasteel{ @@ -67332,7 +67301,8 @@ "lJX" = ( /obj/machinery/button/windowtint/east{ id = "holodeck"; - range = 9 + range = 9; + active = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -75350,6 +75320,7 @@ dir = 4 }, /obj/machinery/alarm/directional/north, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -78064,7 +78035,6 @@ }, /area/station/engineering/supermatter_room) "pwU" = ( -/obj/effect/landmark/battle_mob_point, /obj/effect/light_emitter/colored{ light_color = "#FFFFFF" }, @@ -81994,7 +81964,6 @@ dir = 8 }, /obj/effect/landmark/start/security_officer, -/obj/machinery/light/directional/south, /obj/machinery/light_switch/south, /turf/simulated/floor/plasteel, /area/station/security/main) @@ -83982,6 +83951,7 @@ "rJo" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -85315,6 +85285,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -85602,12 +85573,9 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "sou" = ( -/obj/machinery/light/directional/south, -/obj/structure/closet/secure_closet/miner, -/turf/simulated/floor/plasteel{ - icon_state = "brown" - }, -/area/station/supply/miningdock) +/obj/machinery/light/small/directional/east, +/turf/simulated/floor/transparent/glass, +/area/station/command/bridge) "soK" = ( /obj/structure/girder, /obj/structure/sign/securearea{ @@ -87746,6 +87714,7 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -91560,11 +91529,11 @@ /area/station/service/clown) "uuh" = ( /obj/machinery/disposal, -/obj/machinery/light/directional/south, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/light_switch/east, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -92016,12 +91985,11 @@ }, /area/station/command/teleporter) "uAX" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" + icon_state = "dark" }, -/area/station/public/dorms) +/area/station/service/chapel) "uBf" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -94657,12 +94625,22 @@ }, /area/station/engineering/supermatter_room) "vAZ" = ( -/obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel{ +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ dir = 4; - icon_state = "brown" + icon_state = "pipe-c" }, -/area/station/supply/storage) +/turf/simulated/floor/plating, +/area/station/maintenance/fore) "vBm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -98931,7 +98909,6 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "xfi" = ( -/obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -98941,6 +98918,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -99290,9 +99268,7 @@ /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "xmi" = ( -/obj/machinery/camera{ - c_tag = "Starboard Primary Hallway 6" - }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "xmj" = ( @@ -99442,18 +99418,13 @@ /area/station/maintenance/abandonedbar) "xpv" = ( /obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; - d2 = 8; - icon_state = "1-8" + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore) "xpP" = ( @@ -100309,6 +100280,7 @@ /obj/item/pickaxe{ pixel_x = 5 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "xHs" = ( @@ -122396,7 +122368,7 @@ bKz ojT ozC ojs -vAZ +ojs vsR ojs ojs @@ -124448,7 +124420,7 @@ bxb bxb bzJ bNM -bQj +bBn xgn bBn bBn @@ -124723,7 +124695,7 @@ cfm gAk unR uXM -sou +cno cam ldf cPj @@ -126716,7 +126688,7 @@ ave wHW anT ayG -azH +anT ago aDJ aqI @@ -130831,8 +130803,8 @@ avd azP aFy lpi -aCZ aDm +aCZ aFy aFF aFF @@ -130841,7 +130813,7 @@ aFF aFF aSN aNK -aSN +azH hHt aRF sDk @@ -130877,7 +130849,7 @@ xec rYG fGr fGr -fGr +bQj bmc nzd pZP @@ -131088,7 +131060,7 @@ nAN azJ qCv aCo -qCv +emr xpv prM qCv @@ -131352,16 +131324,16 @@ aFF aHT aIO uWw -aHT +aQS aNc aHT aNT -aQS +aHT aHT aSc aFF lnL -tae +aIO tae aZx bev @@ -131391,7 +131363,7 @@ rRU trg fGr fGr -fGr +sou bmc nzd rQs @@ -132384,10 +132356,10 @@ aLP oCG aPM aTC -aWz +aPM aYs aLP -bbZ +aRx kGo bgT biT @@ -133666,18 +133638,18 @@ gVt axe aTm aLP +bsx aQd aQd aQd -bsx aLP aLP vEL ugX aPm -uAX -sqc buU +sqc +bmT aRx uxn gEd @@ -134435,9 +134407,9 @@ oJZ rtU aGG axe -aTm -aOI -aQn +vAZ +aOb +hpQ aPm aTF aTF @@ -134670,7 +134642,7 @@ oHE veR pLI anA -aqX +arD uAG akY kVw @@ -134693,15 +134665,15 @@ aIi aJq axe hLk -ijf -hpQ +aOI +aWz aSM aTE aWC aZt bcc bbv -tfz +sUe aUQ aUQ lhf @@ -134925,7 +134897,7 @@ alG pOw aoJ hRm -lqm +aoR anA arC eHI @@ -134958,7 +134930,7 @@ aWE aZv bce bbv -sUe +tfz aUQ jsn qSD @@ -135943,7 +135915,7 @@ pSs anA cHW anA -cYl +acx acB idn adp @@ -136748,7 +136720,7 @@ aFI aFI aFI aKK -aOb +aKK aFI aDv uAT @@ -136975,13 +136947,13 @@ aqG aqG aqG aih +aih akJ oGm -oGm amT aHq -aHq apQ +aih aqG agV aiX @@ -137014,7 +136986,7 @@ aWM aWM bbo bda -emr +mGQ aOI aYO aUS @@ -138549,7 +138521,7 @@ aKO aMJ aOg aFI -aZs +bbZ aZD aVp iBD @@ -148848,16 +148820,16 @@ krD bld blw bmI -bmT buz +uAX vWt iPF boJ bjD aYP -bwv +xmi uKG -dMJ +cfy bIa bIa jnE @@ -149372,7 +149344,7 @@ aYQ bwv uKG cfy -gLu +rKV bGL bPD bKi @@ -150400,7 +150372,7 @@ aYQ bwv aAR cXh -gLu +rKV bGD bIy bKj @@ -150652,7 +150624,7 @@ buA bqg boJ boJ -bzl +bcD aYP bFB aAR @@ -160446,9 +160418,9 @@ cjZ cie cie ckb -cdK +lqm cjZ -udq +ijf ckb cie cie diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index e190409fc3e2..8d7ef30feee7 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -2256,10 +2256,9 @@ /turf/simulated/wall, /area/station/hallway/secondary/entry) "apk" = ( -/obj/machinery/status_display{ - name = "Дисплей статуса" - }, -/turf/simulated/wall, +/obj/effect/spawner/window/reinforced/grilled, +/obj/machinery/ai_status_display, +/turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "apl" = ( /obj/structure/filingcabinet, @@ -4266,7 +4265,6 @@ /area/station/maintenance/disposal/east) "avc" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -4304,7 +4302,6 @@ /area/station/hallway/secondary/entry) "avg" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -5233,8 +5230,8 @@ /area/station/supply/storage) "ayE" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light_switch/north, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -5493,6 +5490,7 @@ req_one_access_txt = "19"; pixel_x = 6 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -5522,7 +5520,6 @@ suffix = "#4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/supply/storage) "azD" = ( @@ -6955,6 +6952,7 @@ /obj/item/destTagger{ pixel_x = -4 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -7011,6 +7009,7 @@ pixel_y = 4 }, /obj/item/storage/secure/briefcase, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "aEO" = ( @@ -10025,18 +10024,19 @@ "aRH" = ( /obj/effect/turf_decal/arrows/black, /obj/effect/turf_decal/delivery/partial, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/station/hallway/primary/fore) "aRK" = ( -/obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" +/obj/structure/chair/comfy/brown{ + dir = 8 }, -/area/station/hallway/primary/fore) +/obj/machinery/newscaster/directional/east, +/turf/simulated/floor/wood/parquet, +/area/station/service/library) "aRL" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/effect/mapping_helpers/damaged_window, @@ -10379,6 +10379,15 @@ icon_state = "neutral" }, /area/station/maintenance/fsmaint) +"aTf" = ( +/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) "aTj" = ( /obj/structure/cable{ d1 = 1; @@ -12039,11 +12048,15 @@ }, /obj/item/kirbyplants, /obj/machinery/light/directional/east, +/obj/machinery/economy/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_x = 24 + }, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "baU" = ( -/obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -12564,6 +12577,7 @@ "bcM" = ( /obj/machinery/computer/supplycomp/public, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -12728,10 +12742,12 @@ /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bdO" = ( -/obj/machinery/power/apc/engineering/east, -/obj/structure/cable, -/turf/simulated/floor/wood/oak, -/area/station/service/bar/atrium) +/obj/item/radio/intercom/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/central/sw) "bdP" = ( /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -14653,6 +14669,7 @@ /area/station/service/kitchen) "blk" = ( /obj/item/kirbyplants, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/wood/oak, /area/station/service/bar/atrium) "blo" = ( @@ -15186,6 +15203,10 @@ /obj/effect/decal/cleanable/dust, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"bnm" = ( +/obj/machinery/light/directional/north, +/turf/simulated/floor/bluegrid, +/area/station/turret_protected/ai_upload) "bns" = ( /obj/structure/cable{ d1 = 2; @@ -15203,7 +15224,6 @@ }, /area/station/hallway/primary/starboard) "bnA" = ( -/obj/machinery/light/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -15966,7 +15986,6 @@ }, /area/station/medical/break_room) "bqI" = ( -/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "bqK" = ( @@ -19704,6 +19723,7 @@ /obj/structure/rack, /obj/item/aicard, /obj/item/storage/secure/briefcase, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkblue" @@ -19751,6 +19771,7 @@ pixel_y = -3 }, /obj/item/multitool/command, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" @@ -22526,12 +22547,10 @@ /turf/simulated/wall, /area/station/public/storage/tools) "bOD" = ( -/obj/machinery/light/directional/west, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/station/hallway/primary/central/nw) +/obj/machinery/ai_status_display, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/hallway/secondary/entry) "bOE" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -22996,7 +23015,6 @@ /area/station/public/storage/tools) "bPZ" = ( /obj/structure/table/reinforced, -/obj/machinery/light/directional/east, /obj/item/radio, /obj/item/radio, /obj/item/radio, @@ -23845,7 +23863,6 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bSI" = ( -/obj/machinery/light/directional/south, /obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/turret_protected/ai_upload) @@ -23874,9 +23891,11 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "bSM" = ( -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel/dark, -/area/station/turret_protected/ai_upload) +/obj/effect/light_emitter/colored{ + light_color = "#FFFFFF" + }, +/turf/simulated/floor/engine, +/area/holodeck/alphadeck) "bSN" = ( /obj/machinery/smartfridge/secure/circuits/aiupload/highrisk, /turf/simulated/floor/bluegrid, @@ -25076,7 +25095,6 @@ /turf/simulated/floor/plasteel, /area/station/command/office/ce) "bWJ" = ( -/obj/machinery/light/directional/south, /obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; @@ -26998,7 +27016,6 @@ /area/station/service/library) "cdH" = ( /obj/structure/table/wood, -/obj/machinery/light/directional/north, /obj/item/clipboard, /obj/item/toy/figure/crew/hop, /obj/item/megaphone, @@ -27890,6 +27907,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "chl" = ( @@ -28832,7 +28850,6 @@ }, /area/station/hallway/primary/central/se) "ckp" = ( -/obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -29156,6 +29173,7 @@ "cmd" = ( /obj/machinery/teleport/station, /obj/machinery/status_display/directional/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/plating, /area/station/command/teleporter) "cmf" = ( @@ -29421,13 +29439,8 @@ /turf/simulated/floor/carpet, /area/station/command/office/hop) "cnp" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" - }, -/area/station/hallway/primary/fore) +/turf/simulated/floor/engine, +/area/holodeck/alphadeck) "cnt" = ( /obj/item/kirbyplants, /obj/machinery/light_switch/south, @@ -29482,7 +29495,6 @@ }, /area/station/service/bar/atrium) "cnD" = ( -/obj/machinery/light/directional/south, /obj/machinery/alarm/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -30437,7 +30449,6 @@ /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "crO" = ( -/obj/machinery/light/directional/south, /obj/machinery/camera{ c_tag = "Central Ring Hallway Center"; dir = 1 @@ -46543,11 +46554,9 @@ }, /area/station/hallway/secondary/exit) "dSC" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/delivery/hollow, /obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel/dark, -/area/station/service/hydroponics) +/turf/simulated/floor/bluegrid, +/area/station/turret_protected/ai_upload) "dSD" = ( /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) @@ -49978,6 +49987,7 @@ /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/newscaster/directional/south, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "ezx" = ( @@ -53285,7 +53295,6 @@ "fEi" = ( /obj/effect/turf_decal/delivery, /obj/machinery/plantgenes, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "fEo" = ( @@ -65575,6 +65584,7 @@ "juJ" = ( /obj/machinery/economy/vending/cola, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -74254,6 +74264,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -74384,18 +74395,11 @@ }, /area/station/medical/medbay2) "mkW" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/railing{ dir = 1 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 24 - }, +/obj/machinery/power/apc/engineering/east, +/obj/structure/cable, /turf/simulated/floor/wood/oak, /area/station/service/bar/atrium) "mli" = ( @@ -77275,6 +77279,9 @@ /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch/north{ + pixel_x = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -77642,7 +77649,6 @@ /turf/simulated/floor/grass/no_creep, /area/station/hallway/secondary/exit) "non" = ( -/obj/machinery/light/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -78501,18 +78507,11 @@ }, /area/station/maintenance/medmaint) "nBr" = ( -/obj/machinery/conveyor/south{ - id = "QMLoad" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" + icon_state = "neutralcorner" }, -/area/station/supply/storage) +/area/station/hallway/secondary/bridge) "nBt" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -79703,12 +79702,9 @@ /turf/simulated/floor/carpet, /area/station/security/detective) "nPZ" = ( -/obj/item/radio/intercom/directional/west, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/station/hallway/primary/central/west) +/obj/machinery/status_display, +/turf/simulated/wall, +/area/station/hallway/secondary/entry) "nQa" = ( /obj/machinery/alarm/directional/south, /obj/structure/table, @@ -82414,7 +82410,6 @@ "oKl" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/directional/north, /obj/structure/sign/poster/official/random/north, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) @@ -82591,7 +82586,6 @@ }, /area/station/maintenance/starboard2) "oOd" = ( -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -84487,7 +84481,6 @@ /area/station/security/checkpoint/south) "prD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -84611,7 +84604,6 @@ /obj/item/hand_labeler{ pixel_y = 6 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -86551,6 +86543,7 @@ name = "Hydroponics Requests Console"; pixel_y = 30 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "pZs" = ( @@ -94548,12 +94541,13 @@ /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "szi" = ( -/obj/machinery/newscaster/directional/east, -/obj/structure/chair/comfy/brown{ - dir = 8 +/obj/item/kirbyplants, +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" }, -/turf/simulated/floor/wood/parquet, -/area/station/service/library) +/area/station/hallway/secondary/entry) "szx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -99783,7 +99777,6 @@ /area/station/hallway/secondary/exit/maintenance) "uhM" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /obj/machinery/photocopier/faxmachine/longrange{ pixel_y = 4; @@ -102437,9 +102430,12 @@ }, /area/station/security/processing) "uXv" = ( -/obj/machinery/firealarm/directional/east, -/turf/simulated/floor/wood/oak, -/area/station/service/bar/atrium) +/obj/item/kirbyplants, +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/hallway/secondary/entry) "uXC" = ( /obj/structure/table/wood, /obj/item/folder/blue{ @@ -104710,7 +104706,6 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "vLh" = ( -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -110197,6 +110192,7 @@ /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/delivery/hollow, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "xyV" = ( @@ -111030,6 +111026,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/structure/sign/poster/official/random/south, /obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -142813,7 +142810,7 @@ bkT bkT tIf bkU -dSC +gnl baF aor vtw @@ -143086,7 +143083,7 @@ bOA bIV bTZ oAE -bWH +bWG bYj bYj cbM @@ -143560,9 +143557,9 @@ wYw dBq dBq kaM -gWl -eGT qzy +eGT +gWl dRR mwK hpS @@ -143841,7 +143838,7 @@ bxx bmU byw buR -dSC +gnl baF nFi azb @@ -144124,8 +144121,8 @@ nrS qPJ cnl kXs +aRK oUB -szi wYJ dSX wXP @@ -144624,7 +144621,7 @@ eDP eDP bDR bDR -bOD +wdz liZ xTh pzY @@ -144638,10 +144635,10 @@ oUR xVw oUR oUR -nPZ +oUR coE bwm -bwm +bdO bwm bwm muZ @@ -148431,7 +148428,7 @@ asY awh uSu gaQ -aoA +szi aES aCP aAD @@ -148713,11 +148710,11 @@ rWV aZc baT mkW -bdO +gRS gRS lsG gRS -uXv +gRS blk sKr xfy @@ -148970,11 +148967,11 @@ fBv nUC yed yed -yed +sKr kDv -yed +sKr kDv -yed +sKr yed bna xfy @@ -148991,11 +148988,11 @@ bEe bFG bHq bOT -bMX +bnm bMX fBC bMX -bMX +dSC bOT aaa bOZ @@ -149208,12 +149205,12 @@ bhO bhO bhO bhO -bhO +bsi nME phe aWq bhO -bsi +bhO aKt qul tYC @@ -149721,7 +149718,7 @@ aBU aEF aEF aEF -aRK +aEF cyT aEF aFC @@ -149964,13 +149961,13 @@ acC ant rJt aoA -apk +nPZ aqe asE arO asE atF -apj +bOD avg kIL axk @@ -150019,11 +150016,11 @@ bEi bFK bHu bOT -bMX +bnm bMX oWg bMX -bMX +dSC bOT aaa bQI @@ -150280,7 +150277,7 @@ mak bMX bOR bMY -bSM +bMY bOT aaa bQI @@ -150487,7 +150484,7 @@ asZ axi ayy hSK -aow +uXv aHT tsl mRc @@ -152094,7 +152091,7 @@ pJb cnA cht cqj -cvG +nBr csV cuX cCX @@ -152569,7 +152566,7 @@ aZl bbd aGK bcM -cnp +stC stC jfR bjF @@ -154602,7 +154599,7 @@ cxp ayD otu lFJ -nBr +lFJ lFJ aDY aEQ @@ -159044,7 +159041,7 @@ cyN jez aWn fxS -xVX +aTf ixf hhF hhF @@ -162122,10 +162119,10 @@ wpW cCc cCb cCb -cCb -cCb -cCb -cCb +bSM +cnp +cnp +bSM cCb cCb cOw