From c84170247c9c22900c89d239314c81852f2e9be3 Mon Sep 17 00:00:00 2001 From: Aylong <69762909+AyIong@users.noreply.github.com> Date: Sun, 10 Mar 2024 14:43:20 +0200 Subject: [PATCH] Tweak: Re-Lightning (#1065) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Убрано излишнее освещение станций, выключены настольные лампы по-умолчанию, слегка уменьшена сила освещения обычных ламп, и слегка увеличена оная при найтшифте, плюс сам свет слегка отдаёт теплом в обычном режиме. У ГСБ поддуры заменены на шаттеры ## Почему это хорошо для игры Эстетика? Меня заебало то что каждый ебучий уголок станции хорошо освещён, а всё потому что на каждую комнатку, было выделено по 4 ебаные лампы, а то и больше! В итоге, количество ламп подрезал, силу света подрезал, сделал теплее, выглядит КРАСИВЕЕ и темнее, с блюмом так вообще будет шикардос я думаю ## Изображения изменений
Кибериада (До) | Без найтшифта | С найтшифтом | | - | - | | ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/acc242ce-e72c-4847-a582-b577d1fc22b5) | ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/ab1bc03c-02b0-4920-b051-4ea9a1bb2002) |
Кибериада (После) | Без найтшифта | С найтшифтом | | - | - | | ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/f13c2a5c-8de2-4582-b604-7b4672963388) | ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/c048cf9b-e360-4637-9e59-8ff0cbb769e2) |
Керберос (До) | Без найтшифта | С найтшифтом | | - | - | | ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/adb86a1a-f05e-442f-aea6-c82cc41cb4f2) | ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/b308788c-3e12-458d-8263-5a489b9c8103) |
Керберос (После) | Без найтшифта | С найтшифтом | | - | - | | ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/b459e9d3-4dbe-4aea-a312-7cdd9ae3f66b) | ![image](https://github.com/ss220club/Paradise-SS220/assets/69762909/b617789e-c12a-4a47-aec4-82963309e6b1) |
На Цереброне особо ничего не изменилось ## Changelog :cl: tweak: ЦК ахуело и не выхуело от количества ламп на станциях, и от того что каждый уголок освещён лучше чем Чёрный Квадрат Малевича в Лувре, поэтому приняло стратегические решения: 1. Скручены лишние лампы, это заодно понизит энергопотребление станций. 2. Переностройка ламп, они теперь не такие яркие, вы можете увидеть ТЕНЬ! 3. Замена ламп на более тёплые, в стандартном режиме будут отдавать теплом, слегка. 4. В найтшифт режиме они теперь слегка сильнее светят. В целом всё должно смотреться эстетичнее и приятнее глазу. tweak: Кибериада: В спальне ГСБ, бронированные шаттеры были заменены на обычные. /:cl: --- .../map_files220/MetaStation/MetaStation.dmm | 889 +++++---- .../RandomZLevels/blackmarketpackers.dmm | 6 +- .../map_files220/RandomZLevels/blackmesa.dmm | 8 +- _maps/map_files220/RandomZLevels/caves.dmm | 9 +- .../RandomZLevels/gate_lizard.dmm | 7 +- _maps/map_files220/cyberiad/cyberiad.dmm | 1289 +++++++------ _maps/map_files220/delta/delta.dmm | 1653 +++++++++-------- .../aesthetics/lights/code/lights.dm | 6 + modular_ss220/maps220/code/Areas/station.dm | 4 + 9 files changed, 2013 insertions(+), 1858 deletions(-) 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/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm index 30a8eb20d17c..b0c38fbdc97c 100644 --- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm @@ -293,8 +293,7 @@ /obj/item/reagent_containers/drinks/bottle/patron, /obj/item/flashlight/lamp/green{ pixel_x = -5; - pixel_y = 12; - on = 0 + pixel_y = 12 }, /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/oak, @@ -1224,8 +1223,7 @@ "dJ" = ( /obj/item/flashlight/lamp/bananalamp{ pixel_x = -6; - pixel_y = 10; - on = 0 + pixel_y = 10 }, /obj/structure/alien/weeds, /obj/item/paperplane{ diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm index 0daab42322a5..08bcd7344a11 100644 --- a/_maps/map_files220/RandomZLevels/blackmesa.dmm +++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm @@ -11465,9 +11465,7 @@ /area/awaymission/black_mesa/entrance_lobby) "oao" = ( /obj/structure/table, -/obj/item/flashlight/lamp{ - on = 0 - }, +/obj/item/flashlight/lamp, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_lobby) "oaH" = ( @@ -16780,9 +16778,7 @@ /area/awaymission/black_mesa/xen/freeman_hallway) "uEY" = ( /obj/structure/table, -/obj/item/flashlight/lamp{ - on = 0 - }, +/obj/item/flashlight/lamp, /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/hecu_zone_test_chambers) "uFe" = ( diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index 39ea701dcd53..f0b133611ab1 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -558,7 +558,6 @@ "ct" = ( /obj/structure/table, /obj/item/flashlight/lamp{ - on = 0; pixel_y = 10; pixel_x = -5 }, @@ -877,9 +876,7 @@ pixel_x = 5; pixel_y = 8 }, -/obj/item/flashlight/lamp{ - on = 0 - }, +/obj/item/flashlight/lamp, /obj/effect/turf_decal/siding/wood, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/wood/oak, @@ -5655,9 +5652,7 @@ /area/awaymission/caves) "CP" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp{ - on = 0 - }, +/obj/item/flashlight/lamp, /turf/simulated/floor/wood/lavaland_air{ icon_state = "wood-broken" }, diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm index 4755a594d948..329ee91cde0c 100644 --- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm +++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm @@ -2012,8 +2012,7 @@ /obj/structure/table/glass, /obj/item/flashlight/lamp/green{ pixel_x = 10; - pixel_y = -6; - on = 0 + pixel_y = -6 }, /obj/item/paper_bin{ pixel_x = 6; @@ -6220,9 +6219,7 @@ /area/awaymission/jungle_planet/inside) "icJ" = ( /obj/structure/table, -/obj/item/flashlight/lamp{ - on = 0 - }, +/obj/item/flashlight/lamp, /obj/item/flash, /obj/machinery/firealarm{ name = "north fire alarm"; diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index 1ddd1c661b72..d86c787fbf02 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -125,7 +125,6 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, -/obj/machinery/light/directional/north, /obj/item/radio/intercom/department/security{ pixel_y = 22 }, @@ -259,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; @@ -388,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" }, @@ -539,6 +538,7 @@ pixel_x = 10 }, /obj/machinery/light_switch/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -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" }, @@ -755,13 +752,19 @@ /area/station/security/main) "aeC" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/drinks/mug/hos, +/obj/item/reagent_containers/drinks/mug/hos{ + pixel_x = 8; + pixel_y = 16 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/item/lighter/zippo/hos, +/obj/item/lighter/zippo/hos{ + pixel_x = -4; + pixel_y = 19 + }, /obj/effect/spawner/lootdrop/officetoys, /turf/simulated/floor/carpet, /area/station/command/office/hos) @@ -1000,14 +1003,22 @@ /area/station/security/main) "afM" = ( /obj/structure/table/wood, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/item/pen/multi{ + pixel_x = 8; + pixel_y = 4 + }, /obj/item/flashlight/lamp/green{ - on = 0; - pixel_x = -3; - pixel_y = 8 + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/stamp/hos{ + pixel_x = -6; + pixel_y = -4 }, -/obj/item/stamp/hos, -/obj/item/paper_bin/nanotrasen, -/obj/item/pen/multi, /turf/simulated/floor/carpet, /area/station/command/office/hos) "afO" = ( @@ -1305,6 +1316,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1919,7 +1931,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/light/directional/east, /obj/item/clothing/suit/armor/riot/sec{ pixel_x = 3; pixel_y = 3 @@ -2119,7 +2130,6 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "ale" = ( -/obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -2626,7 +2636,6 @@ /obj/machinery/recharger{ pixel_y = 2 }, -/obj/machinery/light/directional/north, /obj/machinery/camera{ c_tag = "Brig Warden's Office" }, @@ -2658,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" @@ -3108,7 +3118,7 @@ department = "Internal Affairs Office" }, /obj/item/radio/intercom/directional/west, -/obj/machinery/light/directional/north, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "aob" = ( @@ -3339,10 +3349,10 @@ /turf/simulated/floor/plasteel, /area/station/security/main) "aoS" = ( -/obj/machinery/light/directional/east, /obj/machinery/computer/card/minor/hos{ dir = 8 }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -3364,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; @@ -3380,6 +3389,7 @@ id = "Cell 3"; pixel_y = 28 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -3635,7 +3645,6 @@ }, /area/station/security/main) "apI" = ( -/obj/machinery/light/directional/south, /obj/item/flag/sec, /turf/simulated/floor/plasteel{ icon_state = "darkredfull" @@ -4571,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" @@ -4595,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; @@ -4693,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" @@ -4998,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" @@ -5009,7 +5018,6 @@ c_tag = "Brig Prisoner Processing West"; dir = 4 }, -/obj/machinery/light/directional/west, /obj/machinery/requests_console{ department = "Security"; departmentType = 5; @@ -5043,6 +5051,7 @@ id = "Processing"; req_one_access_txt = "63" }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/security/processing) "auX" = ( @@ -5611,7 +5620,6 @@ name = "Internal Affairs Requests Console"; pixel_x = -30 }, -/obj/machinery/light/directional/west, /obj/machinery/papershredder, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) @@ -5739,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 }, @@ -5751,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" }, @@ -5879,6 +5887,7 @@ pixel_y = 7 }, /obj/item/pen, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -5896,7 +5905,6 @@ /area/station/security/processing) "axU" = ( /obj/machinery/alarm/directional/east, -/obj/machinery/light/directional/east, /obj/structure/table, /obj/item/restraints/handcuffs, /obj/item/taperecorder, @@ -6141,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, @@ -6159,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" }, @@ -6252,6 +6260,7 @@ d2 = 4; icon_state = "0-4" }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -6517,6 +6526,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -6524,20 +6534,15 @@ /area/station/security/lobby) "azG" = ( /obj/machinery/atmospherics/portable/canister/oxygen, -/obj/machinery/light/small/directional/west, /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 @@ -7063,8 +7068,10 @@ /area/station/maintenance/abandonedbar) "aBi" = ( /obj/structure/table/reinforced, -/obj/item/taperecorder, -/obj/item/flashlight/lamp, +/obj/item/taperecorder{ + pixel_y = 4; + pixel_x = -6 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7089,6 +7096,7 @@ /obj/machinery/power/apc/directional/west, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7098,6 +7106,7 @@ dir = 8 }, /obj/machinery/alarm/directional/east, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -7298,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" = ( @@ -7319,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" = ( @@ -7389,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 }, @@ -7408,6 +7416,7 @@ c_tag = "Brig Cell 4"; dir = 1 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -7498,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" = ( @@ -7605,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" }, @@ -7748,7 +7757,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/auxsolarport) "aDv" = ( -/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -8324,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" = ( @@ -8387,7 +8395,6 @@ pixel_x = -16 }, /obj/item/flashlight/lamp/green{ - on = 0; pixel_y = 8 }, /obj/item/id_skin/donut, @@ -8853,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) @@ -9048,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" @@ -9198,7 +9205,6 @@ "aIn" = ( /obj/structure/dresser, /obj/machinery/firealarm/directional/east, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -9208,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, @@ -9344,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; @@ -9542,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" = ( @@ -9576,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" = ( @@ -9804,7 +9810,6 @@ /area/station/service/barber) "aKG" = ( /obj/machinery/newscaster/directional/east, -/obj/machinery/light/directional/east, /obj/machinery/hologram/holopad, /obj/structure/cable{ d1 = 1; @@ -9850,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) @@ -10547,7 +10551,8 @@ /area/station/maintenance/fore) "aNJ" = ( /obj/structure/statue/themis{ - pixel_x = -4 + pixel_x = -4; + pixel_y = 8 }, /obj/structure/window/reinforced{ dir = 4 @@ -10562,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 @@ -10605,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{ @@ -10640,11 +10650,6 @@ /area/station/engineering/supermatter_room) "aOm" = ( /obj/structure/chair/wood, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/effect/landmark/start/assistant, /turf/simulated/floor/carpet, /area/station/public/mrchangs) @@ -11057,7 +11062,6 @@ }, /area/station/public/sleep) "aPN" = ( -/obj/machinery/light/directional/north, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -11205,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, @@ -11242,6 +11236,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -11266,7 +11261,6 @@ /area/station/public/dorms) "aQr" = ( /obj/machinery/status_display/directional/north, -/obj/machinery/light/directional/north, /obj/structure/table, /obj/item/stack/tape_roll, /obj/structure/disposalpipe/segment{ @@ -11350,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" @@ -11450,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 }, @@ -11498,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" }, @@ -11519,7 +11513,6 @@ /area/space/nearstation) "aQV" = ( /obj/structure/table/glass, -/obj/machinery/light/directional/north, /obj/machinery/computer/mob_healer_terminal{ pixel_y = 30 }, @@ -11710,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" = ( @@ -11942,9 +11935,8 @@ /area/station/hallway/secondary/entry) "aSY" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 +/obj/item/flashlight/lamp/green/off{ + pixel_y = 6 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -12162,8 +12154,6 @@ /turf/simulated/floor/plating, /area/station/medical/reception) "aTN" = ( -/obj/machinery/light/directional/west, -/obj/machinery/ai_status_display/west, /obj/machinery/papershredder, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -12525,7 +12515,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "aUV" = ( -/obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -12792,7 +12781,6 @@ /area/station/security/checkpoint/secondary) "aWd" = ( /obj/structure/closet/secure_closet/security, -/obj/machinery/light/directional/north, /obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ dir = 9; @@ -12838,9 +12826,8 @@ /obj/structure/table, /obj/machinery/firealarm/directional/north, /obj/item/wirecutters, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 +/obj/item/screwdriver{ + pixel_y = 10 }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -12854,38 +12841,59 @@ /area/station/public/storage/tools) "aWm" = ( /obj/structure/table, -/obj/machinery/camera{ - c_tag = "Primary Tool Storage" - }, /obj/machinery/requests_console{ department = "Tool Storage"; name = "Tool Storage Requests Console"; pixel_y = 30 }, /obj/item/assembly/igniter{ - pixel_x = -8; - pixel_y = -4 + pixel_x = -8 }, -/obj/item/assembly/igniter, /obj/item/screwdriver{ - pixel_y = 16 + pixel_y = 10 + }, +/obj/item/assembly/igniter{ + pixel_x = 6 }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aWn" = ( /obj/structure/table, /obj/machinery/alarm/directional/north, -/obj/item/t_scanner, +/obj/item/flashlight{ + pixel_x = -6; + pixel_y = 12 + }, +/obj/item/t_scanner{ + pixel_y = 4; + pixel_x = 8 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -6; + pixel_y = -1 + }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aWo" = ( /obj/structure/table, /obj/item/radio/intercom/directional/north, -/obj/item/assembly/signaler, -/obj/item/assembly/signaler, -/obj/item/multitool, /obj/item/multitool{ - pixel_x = 4 + pixel_x = -12; + pixel_y = 2 + }, +/obj/item/multitool{ + pixel_y = 2 + }, +/obj/machinery/camera{ + c_tag = "Primary Tool Storage" + }, +/obj/item/assembly/signaler{ + pixel_x = 12; + pixel_y = 10 + }, +/obj/item/assembly/signaler{ + pixel_x = 12; + pixel_y = 3 }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -12900,14 +12908,25 @@ "aWq" = ( /obj/structure/table, /obj/machinery/light_switch/north, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, +/obj/machinery/cell_charger{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/stock_parts/cell/high{ + pixel_y = 4; + pixel_x = 2 + }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aWr" = ( /obj/structure/table, /obj/machinery/status_display/directional/north, -/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 10 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 2 + }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aWs" = ( @@ -12959,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" @@ -13030,7 +13053,6 @@ "aWI" = ( /obj/structure/table/glass, /obj/item/storage/box/cups, -/obj/machinery/light/directional/north, /obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel{ dir = 1; @@ -13568,7 +13590,7 @@ /area/station/medical/reception) "aYr" = ( /obj/machinery/washing_machine, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -13701,7 +13723,6 @@ }, /area/station/service/chapel) "aYI" = ( -/obj/machinery/light/directional/east, /obj/machinery/computer/cryopod{ dir = 8; pixel_x = 30 @@ -13823,18 +13844,19 @@ /obj/structure/table, /obj/machinery/light/directional/west, /obj/item/stack/cable_coil{ - pixel_x = 2; - pixel_y = -2 + pixel_y = 6 }, /obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 + pixel_y = 1 }, -/obj/item/screwdriver{ - pixel_y = 16 +/obj/item/stack/tape_roll{ + pixel_y = -12; + pixel_x = 4 + }, +/obj/item/stack/tape_roll{ + pixel_y = -12; + pixel_x = -6 }, -/obj/item/stack/tape_roll, -/obj/item/stack/tape_roll, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aZf" = ( @@ -13910,7 +13932,14 @@ "aZr" = ( /obj/structure/table, /obj/machinery/light/directional/east, -/obj/item/storage/toolbox/mechanical, +/obj/item/weldingtool{ + pixel_y = 4; + pixel_x = -2 + }, +/obj/item/crowbar{ + pixel_x = 2; + pixel_y = -4 + }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "aZs" = ( @@ -14116,7 +14145,6 @@ pixel_y = -3 }, /obj/effect/turf_decal/delivery/blue/hollow, -/obj/machinery/light/directional/north, /obj/item/clothing/shoes/magboots{ pixel_x = -3; pixel_y = -3 @@ -14125,6 +14153,7 @@ pixel_x = 2; pixel_y = 2 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -14344,7 +14373,12 @@ /area/station/public/dorms) "bbj" = ( /obj/structure/table, -/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical{ + pixel_y = 8 + }, +/obj/item/analyzer{ + pixel_y = -8 + }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bbk" = ( @@ -14376,11 +14410,15 @@ /area/station/public/dorms) "bbp" = ( /obj/structure/table, -/obj/item/weldingtool, -/obj/item/crowbar, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, +/obj/item/stack/packageWrap{ + pixel_y = 12 + }, +/obj/item/stack/packageWrap{ + pixel_y = 8 + }, +/obj/item/stack/packageWrap{ + pixel_y = 4 + }, /obj/item/stack/packageWrap, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) @@ -14544,7 +14582,7 @@ "bbZ" = ( /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ - dir = 4; + dir = 1; icon_state = "neutralcorner" }, /area/station/public/dorms) @@ -14763,13 +14801,13 @@ /obj/machinery/camera{ c_tag = "Arrivals Lounge" }, -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bcL" = ( @@ -14832,12 +14870,9 @@ /area/station/service/chapel) "bcT" = ( /obj/structure/table, -/obj/item/crowbar, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 +/obj/item/storage/firstaid/regular{ + pixel_y = 2 }, -/obj/item/clothing/gloves/color/fyellow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bcW" = ( @@ -14876,8 +14911,12 @@ /area/station/public/dorms) "bdb" = ( /obj/structure/table, -/obj/item/wrench, -/obj/item/analyzer, +/obj/item/wrench{ + pixel_y = 4 + }, +/obj/item/crowbar{ + pixel_y = 2 + }, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bdd" = ( @@ -14891,9 +14930,12 @@ /area/station/public/storage/tools) "bdg" = ( /obj/structure/table, -/obj/item/storage/belt/utility, -/obj/item/storage/firstaid/regular, /obj/machinery/newscaster/directional/south, +/obj/item/storage/belt/utility{ + pixel_y = 8; + pixel_x = -14 + }, +/obj/item/clothing/gloves/color/fyellow, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bdh" = ( @@ -15060,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; @@ -15470,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" @@ -15663,6 +15705,7 @@ "bgf" = ( /obj/structure/table/wood, /obj/item/candle, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -16065,7 +16108,6 @@ pixel_y = 2 }, /obj/item/vending_refill/cola, -/obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -16306,7 +16348,6 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/machinery/light/directional/north, /obj/effect/turf_decal/delivery/white/hollow, /obj/effect/turf_decal/delivery/white/hollow, /turf/simulated/floor/plasteel{ @@ -16700,6 +16741,7 @@ /obj/structure/sign/electricshock{ pixel_y = -32 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -16725,6 +16767,7 @@ }, /obj/item/pen, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/public/storage/office) "bkW" = ( @@ -17151,7 +17194,6 @@ }, /area/station/service/chapel) "bmK" = ( -/obj/machinery/light/directional/east, /obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -17176,11 +17218,12 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bmT" = ( -/obj/machinery/light/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, @@ -17509,7 +17552,6 @@ pixel_y = 4 }, /obj/item/storage/box/ids, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/command/bridge) "bnV" = ( @@ -17584,7 +17626,6 @@ /obj/item/assembly/timer, /obj/item/assembly/signaler, /obj/item/assembly/signaler, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/command/bridge) "bol" = ( @@ -17655,7 +17696,6 @@ /area/station/service/hydroponics) "boD" = ( /obj/structure/closet/crate/can, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -17709,6 +17749,11 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "boU" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/carpet, /area/station/public/mrchangs) "boV" = ( @@ -17916,9 +17961,9 @@ /turf/simulated/floor/carpet, /area/station/service/chapel) "bpQ" = ( -/obj/machinery/light/directional/west, /obj/machinery/status_display/directional/west, /obj/machinery/economy/vending/chinese, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/carpet, /area/station/public/mrchangs) "bpT" = ( @@ -17956,11 +18001,11 @@ "bqc" = ( /obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood/oak, /area/station/service/library) "bqd" = ( /obj/structure/table/wood, -/obj/machinery/light/small/directional/east, /obj/machinery/light_switch/east, /obj/machinery/computer/library, /turf/simulated/floor/wood/oak, @@ -18448,6 +18493,7 @@ /obj/structure/sign/electricshock{ pixel_y = 32 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "blue" @@ -18498,15 +18544,13 @@ }, /area/station/command/bridge) "bsx" = ( -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/cryopod, +/obj/machinery/light/directional/east, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitegreencorner" }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/entry) +/area/station/public/sleep) "bsy" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, @@ -18599,9 +18643,7 @@ /obj/structure/sign/electricshock{ pixel_y = 32 }, -/obj/machinery/camera{ - c_tag = "Bridge East Entrance" - }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "blue" @@ -18623,7 +18665,6 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "bsP" = ( -/obj/machinery/light/directional/north, /obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) @@ -18924,6 +18965,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -19214,11 +19256,12 @@ /turf/simulated/floor/plating, /area/station/command/bridge) "bwh" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ + dir = 4; icon_state = "blue" }, -/area/station/hallway/primary/central/ne) +/area/station/hallway/primary/central/se) "bwi" = ( /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -19421,7 +19464,6 @@ dir = 5; id = "packageSort1" }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plating, /area/station/supply/office) "bxf" = ( @@ -19573,6 +19615,7 @@ /obj/structure/closet/fireaxecabinet{ pixel_y = -32 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -19696,6 +19739,7 @@ /area/station/science/rnd) "bxY" = ( /obj/machinery/newscaster/security_unit/south, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -19840,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" @@ -19876,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 @@ -20125,6 +20162,10 @@ /area/station/hallway/primary/starboard/west) "bAl" = ( /obj/machinery/alarm/directional/west, +/obj/machinery/camera{ + c_tag = "Central Hallway East"; + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -20144,6 +20185,7 @@ /area/station/service/kitchen) "bAp" = ( /obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) "bAq" = ( @@ -20169,7 +20211,6 @@ }, /area/station/hallway/primary/starboard/west) "bAy" = ( -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -20307,7 +20348,6 @@ /area/station/supply/office) "bBp" = ( /obj/structure/table, -/obj/machinery/light/directional/east, /obj/machinery/recharger, /turf/simulated/floor/plasteel{ dir = 4; @@ -20315,10 +20355,10 @@ }, /area/station/supply/office) "bBq" = ( -/obj/machinery/economy/atm/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -20366,11 +20406,8 @@ /turf/simulated/wall/r_wall, /area/station/command/teleporter) "bBF" = ( -/obj/machinery/camera{ - c_tag = "Central Hallway East"; - dir = 4 - }, /obj/machinery/status_display/directional/west, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -20501,13 +20538,14 @@ /area/station/command/bridge) "bCE" = ( /obj/structure/filingcabinet/filingcabinet, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" }, /area/station/supply/office) "bCF" = ( -/obj/machinery/alarm/directional/west, +/obj/machinery/economy/atm/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -20553,6 +20591,7 @@ c_tag = "Library South"; dir = 1 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/wood/oak, /area/station/service/library) "bCR" = ( @@ -20638,7 +20677,6 @@ /obj/item/reagent_containers/dropper{ pixel_y = 11 }, -/obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel{ dir = 9; @@ -21147,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" = ( @@ -21187,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" = ( @@ -21210,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, @@ -21422,7 +21461,6 @@ /turf/simulated/floor/plasteel, /area/station/science/storage) "bGq" = ( -/obj/machinery/light/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -22161,7 +22199,6 @@ pixel_x = 3; pixel_y = 5 }, -/obj/machinery/light/directional/north, /obj/machinery/button/windowtint/west{ id = "rnd" }, @@ -22290,6 +22327,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -22418,12 +22456,15 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "bKI" = ( -/obj/machinery/light/directional/west, +/obj/effect/landmark/start/dealer, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "brown" + icon_state = "browncorner" }, -/area/station/supply/office) +/area/station/hallway/primary/central/sw) "bKJ" = ( /turf/simulated/wall, /area/station/command/office/hop) @@ -22732,7 +22773,6 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "bMJ" = ( -/obj/machinery/light/directional/west, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; @@ -22740,12 +22780,11 @@ }, /area/station/hallway/primary/central/sw) "bMT" = ( -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "bluecorner" + dir = 4; + icon_state = "whiteblue" }, -/area/station/hallway/primary/central/se) +/area/station/medical/surgery/primary) "bMW" = ( /obj/machinery/light/directional/west, /obj/structure/cable{ @@ -22945,7 +22984,6 @@ }, /area/station/hallway/secondary/exit) "bNx" = ( -/obj/machinery/light/directional/south, /obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; @@ -23084,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" = ( @@ -23165,6 +23204,7 @@ /obj/effect/turf_decal{ dir = 8 }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bOj" = ( @@ -23374,7 +23414,6 @@ dir = 8 }, /obj/machinery/alarm/directional/east, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellow" @@ -23627,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, @@ -23932,11 +23971,10 @@ }, /area/station/science/robotics) "bRU" = ( -/obj/machinery/light/directional/west, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/science/robotics/chargebay) +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel, +/area/station/command/office/hop) "bRW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -24106,7 +24144,11 @@ pixel_y = 6 }, /obj/item/hand_labeler{ - pixel_x = -16; + pixel_x = -18; + pixel_y = 10 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = -12; pixel_y = 4 }, /turf/simulated/floor/plasteel{ @@ -25070,7 +25112,6 @@ pixel_x = 2; pixel_y = -2 }, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -25122,7 +25163,6 @@ /turf/simulated/wall, /area/station/maintenance/storage) "bWU" = ( -/obj/machinery/light/directional/south, /obj/machinery/economy/merch, /turf/simulated/floor/plasteel, /area/station/supply/office) @@ -25255,7 +25295,10 @@ dir = 1 }, /obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/light/directional/south, +/obj/machinery/camera{ + c_tag = "Medbay Cryogenics"; + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -25497,11 +25540,8 @@ /turf/simulated/wall, /area/station/supply/qm) "bYO" = ( -/obj/machinery/camera{ - c_tag = "Cargo Bay Entrance"; - dir = 4 - }, /obj/machinery/economy/atm/west, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -25820,7 +25860,6 @@ /turf/simulated/wall, /area/station/supply/miningdock) "can" = ( -/obj/machinery/light/directional/west, /obj/machinery/camera{ c_tag = "Medbay Lobby"; dir = 4 @@ -26085,6 +26124,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -26126,10 +26166,17 @@ /area/station/medical/storage) "caW" = ( /obj/structure/table/glass, -/obj/item/storage/fancy/vials, +/obj/item/storage/fancy/vials{ + pixel_x = -2; + pixel_y = 2 + }, /obj/machinery/camera{ c_tag = "Virology Workspace" }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 8; + pixel_y = 12 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -26195,7 +26242,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/light/directional/west, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -26923,12 +26969,12 @@ }, /area/station/hallway/primary/central/sw) "cdX" = ( -/obj/machinery/light/directional/north, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "bluecorner" + dir = 8; + icon_state = "browncorner" }, -/area/station/hallway/primary/central/south) +/area/station/hallway/primary/central/nw) "cdY" = ( /obj/structure/sign/securearea{ pixel_y = 32 @@ -27066,12 +27112,12 @@ }, /area/station/hallway/primary/central/south) "ceD" = ( -/obj/machinery/light/directional/north, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "bluecorner" +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "CMO_Bed" }, -/area/station/hallway/primary/central/south) +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/station/command/office/cmo) "ceE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -28083,10 +28129,7 @@ /area/station/command/bridge) "cjm" = ( /obj/item/radio/intercom/directional/south, -/obj/machinery/camera{ - c_tag = "Central Primary Hallway Psychiatrist Office"; - dir = 1 - }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -28129,7 +28172,7 @@ }, /area/station/medical/medbay) "cjw" = ( -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -28421,7 +28464,10 @@ }, /area/station/command/office/cmo) "ckF" = ( -/obj/machinery/light/directional/south, +/obj/machinery/camera{ + c_tag = "Central Primary Hallway Psychiatrist Office"; + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -28675,7 +28721,6 @@ /area/station/maintenance/apmaint) "clw" = ( /obj/machinery/atmospherics/portable/canister/carbon_dioxide, -/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/station/science/storage) "clA" = ( @@ -28985,7 +29030,6 @@ /area/station/command/office/cmo) "cmv" = ( /obj/machinery/keycard_auth/south, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -29570,7 +29614,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -29648,6 +29691,7 @@ network = list("Research","SS13"); pixel_x = 22 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -30643,6 +30687,7 @@ /area/station/science/server/coldroom) "ctE" = ( /obj/item/lighter/random, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "purple" @@ -30942,11 +30987,7 @@ }, /area/station/medical/cryo) "cuA" = ( -/obj/machinery/camera{ - c_tag = "Chief Medical Officer's Quarters"; - dir = 1; - network = list("Medical","SS13") - }, +/obj/machinery/ai_status_display/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" @@ -31408,7 +31449,6 @@ }, /area/station/science/genetics) "cwr" = ( -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -31950,10 +31990,9 @@ "cyC" = ( /obj/structure/table/glass, /obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 14 + pixel_x = -6; + pixel_y = 4 }, -/obj/item/storage/box/disks, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -32535,9 +32574,15 @@ /area/station/medical/medbay2) "cAD" = ( /obj/structure/table/glass, -/obj/item/storage/box/syringes, +/obj/item/storage/box/syringes{ + pixel_y = 2; + pixel_x = -8 + }, /obj/machinery/newscaster/directional/south, -/obj/item/book/manual/wiki/sop_science, +/obj/item/book/manual/wiki/sop_science{ + pixel_x = 6; + pixel_y = 2 + }, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" }, @@ -33174,14 +33219,20 @@ /area/station/science/misc_lab) "cDv" = ( /obj/structure/table/glass, -/obj/item/storage/box/beakers, -/obj/item/reagent_containers/spray/cleaner, +/obj/item/storage/box/beakers{ + pixel_x = 8; + pixel_y = 2 + }, /obj/machinery/camera{ c_tag = "Research Genetics"; dir = 1; network = list("SS13","Research") }, /obj/machinery/firealarm/directional/south, +/obj/item/storage/box/disks{ + pixel_x = -8; + pixel_y = 2 + }, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" }, @@ -33245,7 +33296,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/light/small/directional/south, +/obj/machinery/camera{ + c_tag = "Gravity Generator Foyer"; + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -33583,12 +33637,9 @@ }, /area/station/supply/miningdock) "cEV" = ( -/obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" - }, -/area/station/security/permabrig) +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/central/sw) "cFb" = ( /obj/structure/chair/office/light{ dir = 1 @@ -33744,7 +33795,7 @@ dir = 1 }, /obj/machinery/atmospherics/meter, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral2) "cFT" = ( @@ -33977,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) @@ -34015,7 +34065,6 @@ toner = 0 }, /obj/machinery/firealarm/directional/west, -/obj/machinery/light/directional/west, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/public/storage/office) @@ -34327,7 +34376,6 @@ name = "Prison Intercom (General)"; pixel_x = 22 }, -/obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -37730,7 +37778,6 @@ /turf/space, /area/space/nearstation) "cTo" = ( -/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -39149,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 @@ -39450,7 +39490,6 @@ "cZt" = ( /obj/structure/rack, /obj/item/storage/box/syringes, -/obj/machinery/light/directional/north, /obj/structure/window/reinforced{ dir = 4 }, @@ -41081,8 +41120,9 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/door/poddoor{ - id_tag = "hos_secure_doors" +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "hos_secure_doors"; + dir = 1 }, /turf/simulated/floor/plating, /area/station/command/office/hos) @@ -41536,6 +41576,7 @@ /obj/item/reagent_containers/drinks/drinkingglass/shotglass{ pixel_x = 10 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/beach/sand, /area/station/hallway/secondary/exit) "dgC" = ( @@ -41547,8 +41588,8 @@ "dgH" = ( /obj/structure/table/wood, /obj/item/reagent_containers/drinks/mug, -/obj/machinery/power/apc/directional/south, -/obj/structure/cable, +/obj/machinery/light/small/directional/south, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/wood/oak, /area/station/public/mrchangs) "dgI" = ( @@ -41690,13 +41731,13 @@ /turf/simulated/floor/wood/oak, /area/station/public/mrchangs) "dhq" = ( -/obj/machinery/light/directional/south, -/obj/item/radio/intercom/directional/south, /obj/structure/chair/wood{ dir = 8 }, /obj/machinery/light_switch/east, /obj/effect/landmark/start/artist, +/obj/machinery/power/apc/directional/south, +/obj/structure/cable, /turf/simulated/floor/wood/oak, /area/station/public/mrchangs) "dhv" = ( @@ -42457,9 +42498,11 @@ }, /area/station/hallway/primary/central/ne) "dkn" = ( -/obj/machinery/light/directional/north, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/central/ne) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whiteblue" + }, +/area/station/medical/surgery/secondary) "dkr" = ( /obj/effect/spawner/window/reinforced/plasma/grilled, /turf/simulated/floor/plating, @@ -43451,7 +43494,6 @@ }, /area/station/service/library) "dnN" = ( -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "stairs-l" }, @@ -43902,6 +43944,7 @@ dir = 4 }, /obj/item/radio/intercom/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -45911,6 +45954,7 @@ /obj/structure/table/glass, /obj/item/soap/nanotrasen, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -46174,11 +46218,25 @@ }, /area/station/engineering/equipmentstorage) "dVG" = ( -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "CMO_Bed" }, -/area/station/science/hallway) +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/station/command/office/cmo) "dVQ" = ( /obj/structure/chair/stool, /obj/effect/landmark/start/scientist, @@ -47162,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{ @@ -47843,7 +47897,6 @@ /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "eyg" = ( -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "bluecorner" @@ -48166,7 +48219,6 @@ /turf/simulated/floor/carpet/orange, /area/station/maintenance/fsmaint) "eFV" = ( -/obj/machinery/light/directional/east, /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain) "eFY" = ( @@ -48982,7 +49034,8 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) "eVK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/camera{ + c_tag = "Cargo Bay Entrance"; dir = 4 }, /turf/simulated/floor/plasteel{ @@ -49017,7 +49070,7 @@ id = "hos_room" }, /obj/structure/cable, -/obj/machinery/door/poddoor{ +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "hos_secure_doors" }, /turf/simulated/floor/plating, @@ -49924,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; @@ -52306,7 +52354,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/door/poddoor{ +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "hos_secure_doors" }, /turf/simulated/floor/plating, @@ -53502,6 +53550,14 @@ pixel_y = 14 }, /obj/item/radio/intercom/directional/east, +/obj/machinery/camera{ + c_tag = "Chief Medical Officer's Quarters"; + network = list("Medical","SS13") + }, +/obj/machinery/button/windowtint/north{ + pixel_x = -8; + id = "CMO_Bed" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -54271,10 +54327,15 @@ /area/station/medical/patients_rooms) "gRB" = ( /obj/structure/table/wood, +/obj/effect/decal/cleanable/dust, /obj/item/flashlight/lantern{ - on = 1 + anchored = 1; + layer = 5; + light_color = "#FF9F40"; + on = 1; + pixel_x = -1; + pixel_y = 10 }, -/obj/effect/decal/cleanable/dust, /turf/simulated/floor/carpet/black, /area/station/maintenance/fsmaint) "gRE" = ( @@ -54352,6 +54413,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "purple" @@ -55106,7 +55168,6 @@ "hgT" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ - on = 0; pixel_x = -4; pixel_y = 10 }, @@ -55420,14 +55481,11 @@ /area/station/security/permabrig) "hlq" = ( /obj/machinery/alarm/directional/south, -/obj/machinery/camera{ - c_tag = "Medbay Cryogenics"; - dir = 1 - }, /obj/machinery/atmospherics/unary/thermomachine/freezer/on{ dir = 1; name = "Temperature control unit" }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -55556,18 +55614,16 @@ /obj/item/reagent_containers/dropper{ pixel_y = -4 }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -8; - pixel_y = 12 - }, /obj/item/reagent_containers/syringe/antiviral{ - pixel_y = 4 + pixel_y = 10; + pixel_x = -5 }, /obj/item/reagent_containers/dropper/precision{ pixel_x = 4; pixel_y = 4 }, /obj/structure/reagent_dispensers/virusfood/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -55911,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" }, @@ -56604,8 +56664,6 @@ "hFX" = ( /obj/structure/bed, /obj/item/bedsheet/cmo, -/obj/machinery/light/directional/east, -/obj/machinery/status_display/directional/east, /obj/effect/landmark/start/chief_medical_officer, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56864,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) @@ -57337,7 +57389,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -57407,6 +57459,7 @@ /area/station/service/kitchen) "hUC" = ( /obj/machinery/computer/arcade, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/wood/oak, /area/station/security/permabrig) "hUP" = ( @@ -57559,7 +57612,6 @@ /area/station/hallway/primary/aft) "hXp" = ( /obj/effect/turf_decal/siding/wood, -/obj/machinery/light/directional/south, /obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood/fancy/cherry, /area/station/service/bar/atrium) @@ -58083,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, @@ -58217,7 +58264,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -58254,9 +58301,18 @@ /area/station/maintenance/asmaint) "ind" = ( /obj/structure/table/glass, -/obj/item/hand_labeler, -/obj/item/roller, +/obj/item/hand_labeler{ + pixel_x = 4; + pixel_y = 10 + }, +/obj/item/roller{ + pixel_y = 6 + }, /obj/machinery/alarm/directional/south, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -10; + pixel_y = 12 + }, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" }, @@ -58680,6 +58736,14 @@ }, /turf/simulated/floor/plating, /area/station/science/xenobiology) +"iwe" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort1" + }, +/obj/machinery/light/small/directional/north, +/turf/simulated/floor/plating, +/area/station/supply/office) "iwn" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ autolink_id = "secmaint_vent"; @@ -59017,7 +59081,6 @@ "iDz" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/power/apc/important/south, -/obj/machinery/light/directional/south, /obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 10; @@ -59478,21 +59541,8 @@ /area/station/maintenance/aft) "iLP" = ( /obj/machinery/light/directional/south, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/station/public/dorms) +/turf/simulated/floor/plasteel, +/area/station/supply/office) "iMe" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -60436,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" @@ -60597,7 +60647,6 @@ }, /area/station/engineering/smes) "jgY" = ( -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; @@ -60633,7 +60682,6 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "jiC" = ( -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "rampbottom" }, @@ -61047,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" }, @@ -61251,7 +61303,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/light/directional/east, /obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Bar East"; @@ -61512,7 +61563,7 @@ /turf/simulated/floor/carpet, /area/station/medical/psych) "jAz" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -61651,6 +61702,7 @@ "jCu" = ( /obj/machinery/economy/vending/scidrobe, /obj/item/radio/intercom/directional/south, +/obj/machinery/light/nightshifted/south, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -62232,12 +62284,12 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "jQi" = ( -/obj/machinery/light/directional/east, /obj/machinery/icemachine{ dir = 8; pixel_x = -1; pixel_y = -3 }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -62250,7 +62302,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/door/poddoor{ +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "hos_secure_doors" }, /turf/simulated/floor/plating, @@ -62565,6 +62617,7 @@ /obj/item/stock_parts/cell/high{ pixel_x = 2 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -64243,7 +64296,6 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -65153,7 +65205,6 @@ }, /area/station/public/toilet) "kTA" = ( -/obj/machinery/light/directional/south, /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -66220,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{ @@ -67110,6 +67160,7 @@ "lGY" = ( /obj/machinery/atmospherics/portable/canister/sleeping_agent, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel, /area/station/science/storage) "lHm" = ( @@ -67250,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 @@ -67659,9 +67711,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "lQS" = ( @@ -68079,17 +68129,17 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "lXF" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/carpet, /area/station/public/mrchangs) "lXG" = ( @@ -68456,7 +68506,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /obj/structure/sign/deathsposal{ pixel_y = 32 }, @@ -70141,8 +70191,9 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/door/poddoor{ - id_tag = "hos_secure_doors" +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "hos_secure_doors"; + dir = 1 }, /turf/simulated/floor/plating, /area/station/command/office/hos) @@ -71082,6 +71133,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood/fancy/oak, /area/station/command/meeting_room) "nci" = ( @@ -71467,7 +71519,7 @@ pixel_y = 5 }, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/command/office/hop) "niW" = ( @@ -73441,7 +73493,6 @@ /turf/simulated/floor/wood/oak, /area/station/service/library) "nVq" = ( -/obj/machinery/light/directional/east, /obj/structure/table, /obj/item/cultivator, /obj/item/shovel/spade, @@ -73450,6 +73501,7 @@ dir = 8 }, /obj/machinery/firealarm/directional/east, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "hydrofloor" }, @@ -73510,7 +73562,6 @@ "nWW" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ - on = 0; pixel_x = -3; pixel_y = 8 }, @@ -74816,10 +74867,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "otL" = ( -/obj/machinery/keycard_auth/west, /obj/machinery/computer/security/mining{ dir = 4 }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "otW" = ( @@ -75160,6 +75211,12 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"oBb" = ( +/obj/machinery/economy/vending/wallmed/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "cmo" + }, +/area/station/security/permabrig) "oBq" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -75263,6 +75320,7 @@ dir = 4 }, /obj/machinery/alarm/directional/north, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -75842,6 +75900,24 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) +"oMr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue" + }, +/area/station/medical/medbay2) "oMN" = ( /obj/structure/table, /obj/item/clothing/glasses/welding, @@ -76083,7 +76159,6 @@ }, /area/station/maintenance/fsmaint) "oRn" = ( -/obj/machinery/light/directional/east, /obj/machinery/economy/atm/east, /turf/simulated/floor/plasteel{ dir = 4; @@ -76308,6 +76383,7 @@ pixel_x = -6; pixel_y = 2 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -76434,9 +76510,6 @@ /turf/simulated/floor/wood/oak, /area/station/security/permabrig) "oWo" = ( -/obj/machinery/camera{ - c_tag = "Gravity Generator Foyer" - }, /obj/structure/closet/radiation, /obj/structure/sign/radiation/rad_area{ dir = 1; @@ -76445,6 +76518,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -76485,7 +76559,6 @@ /obj/item/clothing/shoes/orange, /obj/item/clothing/shoes/orange, /obj/effect/decal/cleanable/dirt, -/obj/machinery/economy/vending/wallmed/directional/west, /obj/item/crowbar/large, /obj/item/clothing/under/misc/pj/red, /obj/item/clothing/under/misc/pj/red, @@ -76495,6 +76568,7 @@ /obj/item/clothing/shoes/sandal/white, /obj/item/clothing/shoes/sandal/white, /obj/item/clothing/shoes/sandal/white, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -76619,6 +76693,7 @@ dir = 1; pixel_y = 5 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -76717,6 +76792,7 @@ dir = 8 }, /obj/item/radio/intercom/directional/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellow" @@ -76845,7 +76921,6 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "pfm" = ( -/obj/machinery/light/directional/south, /mob/living/simple_animal/hostile/retaliate/carp/koi{ name = "Лупа" }, @@ -77483,6 +77558,10 @@ }, /turf/simulated/floor/plating, /area/station/service/hydroponics) +"poy" = ( +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/exit) "poC" = ( /obj/structure/closet/secure_closet/research_reagents, /obj/structure/sign/poster/contraband/random/east, @@ -77956,7 +78035,9 @@ }, /area/station/engineering/supermatter_room) "pwU" = ( -/obj/effect/landmark/battle_mob_point, +/obj/effect/light_emitter/colored{ + light_color = "#FFFFFF" + }, /turf/simulated/floor/engine, /area/holodeck/alphadeck) "pxv" = ( @@ -77993,7 +78074,6 @@ /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) "pxG" = ( -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -78347,7 +78427,6 @@ pixel_y = 7 }, /obj/item/pen, -/obj/machinery/light/directional/south, /obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ dir = 6; @@ -78561,7 +78640,6 @@ department = "Captain's Office"; pixel_y = 4 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/carpet/royalblue, /area/station/command/office/captain) "pKv" = ( @@ -78824,6 +78902,7 @@ }, /area/station/science/xenobiology) "pPr" = ( +/obj/machinery/status_display/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkblue" @@ -80069,6 +80148,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/supply/office) "qnK" = ( @@ -80576,6 +80656,7 @@ network = list("Research","SS13"); pixel_y = -22 }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/station/science/storage) "qws" = ( @@ -80611,10 +80692,8 @@ /area/station/hallway/secondary/entry) "qwU" = ( /obj/structure/chair/sofa/corp, -/obj/machinery/camera{ - c_tag = "Bridge Lounge Zone Center" - }, /obj/effect/landmark/start/vip, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet/green, /area/station/command/bridge) "qwV" = ( @@ -80727,7 +80806,6 @@ "qzn" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/delivery/green/hollow, -/obj/machinery/light/directional/west, /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -81270,7 +81348,6 @@ /obj/item/storage/firstaid/toxin{ pixel_y = 2 }, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -81887,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) @@ -81929,7 +82005,6 @@ /turf/simulated/floor/plating, /area/station/engineering/secure_storage) "qRS" = ( -/obj/machinery/light/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 8 }, @@ -82227,7 +82302,10 @@ /area/station/maintenance/fpmaint2) "qXR" = ( /obj/structure/table, -/obj/machinery/kitchen_machine/microwave, +/obj/machinery/kitchen_machine/microwave{ + pixel_y = 6 + }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -82281,14 +82359,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "qYK" = ( -/obj/machinery/light/directional/south, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/station/science/xenobiology) +/area/station/hallway/primary/central/sw) "qYO" = ( /obj/structure/falsewall, /turf/simulated/floor/plating, @@ -82800,12 +82881,15 @@ }, /area/station/science/xenobiology) "rjP" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp{ - pixel_y = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/carpet, -/area/station/public/vacant_office) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry) "rjY" = ( /obj/structure/table/wood, /obj/item/paicard, @@ -82974,7 +83058,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rnu" = ( -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; @@ -83383,7 +83466,6 @@ /obj/structure/sign/electricshock{ pixel_x = -32 }, -/obj/machinery/light/directional/west, /obj/machinery/atmospherics/portable/scrubber/huge/stationary, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -83546,6 +83628,7 @@ dir = 4 }, /obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -83701,6 +83784,7 @@ /obj/structure/chair/sofa/bench{ dir = 4 }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "rFC" = ( @@ -83867,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" }, @@ -84065,6 +84150,9 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, +/obj/machinery/keycard_auth/east{ + pixel_y = -12 + }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "rNv" = ( @@ -85197,6 +85285,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -85484,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{ @@ -85682,7 +85768,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "ssf" = ( -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -85991,10 +86076,11 @@ }, /area/station/medical/sleeper) "sxh" = ( -/obj/effect/turf_decal/delivery/hollow, /obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel, -/area/station/command/office/hop) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/science/robotics/chargebay) "sxn" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -86592,6 +86678,16 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/oak, /area/station/maintenance/abandonedbar) +"sFX" = ( +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "CMO_Bed" + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/station/command/office/cmo) "sGi" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -87063,9 +87159,8 @@ /area/station/maintenance/fsmaint) "sQe" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 +/obj/item/flashlight/lamp/green/off{ + pixel_y = 6 }, /obj/machinery/newscaster/directional/east, /turf/simulated/floor/plasteel{ @@ -87346,7 +87441,6 @@ /obj/item/clothing/glasses/hud/health{ pixel_y = 6 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -87620,6 +87714,7 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/machinery/light_switch/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -87855,16 +87950,21 @@ /area/station/medical/medbay) "tfz" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/turf_decal/siding/wood{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light/directional/east, -/turf/simulated/floor/wood/fancy/oak, -/area/station/command/meeting_room) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/public/dorms) "tfH" = ( /obj/structure/cable{ d1 = 1; @@ -88120,7 +88220,6 @@ pixel_x = -6; req_one_access_txt = "28" }, -/obj/machinery/light/directional/south, /obj/machinery/processor, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -88261,7 +88360,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/wood/fancy/oak, /area/station/command/meeting_room) "tlj" = ( @@ -88421,7 +88519,6 @@ /turf/simulated/floor/beach/sand, /area/station/hallway/secondary/exit) "tnR" = ( -/obj/machinery/light/directional/south, /mob/living/simple_animal/hostile/retaliate/carp/koi{ name = "Пупа" }, @@ -88630,7 +88727,6 @@ pixel_y = 3 }, /obj/item/gun/syringe, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -88800,6 +88896,9 @@ "twH" = ( /obj/structure/chair/sofa/corp/right, /obj/effect/landmark/start/vip, +/obj/machinery/camera{ + c_tag = "Bridge Lounge Zone Center" + }, /turf/simulated/floor/carpet/green, /area/station/command/bridge) "twL" = ( @@ -89108,6 +89207,15 @@ icon_state = "dark" }, /area/station/maintenance/apmaint) +"tDC" = ( +/obj/machinery/camera{ + c_tag = "Bridge East Entrance"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "blue" + }, +/area/station/hallway/primary/central/ne) "tDS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -89144,8 +89252,9 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/door/poddoor{ - id_tag = "hos_secure_doors" +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "hos_secure_doors"; + dir = 1 }, /turf/simulated/floor/plating, /area/station/command/office/hos) @@ -89184,6 +89293,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel, /area/station/supply/storage) "tGg" = ( @@ -89243,9 +89353,9 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/light/directional/east, /obj/item/clothing/mask/balaclava, /obj/effect/turf_decal/delivery/red, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -90158,6 +90268,7 @@ /obj/item/storage/fancy/egg_box, /obj/item/reagent_containers/condiment/flour, /obj/item/reagent_containers/condiment/rice, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -91314,6 +91425,7 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "browncorner" @@ -91417,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" @@ -91638,6 +91750,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, @@ -91645,6 +91758,7 @@ "uwP" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/turf_decal/siding/wood, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood/fancy/oak, /area/station/command/meeting_room) "uwU" = ( @@ -91870,6 +91984,12 @@ icon_state = "floorgrime" }, /area/station/command/teleporter) +"uAX" = ( +/obj/machinery/light/directional/west, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/service/chapel) "uBf" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -93371,7 +93491,6 @@ }, /area/station/service/kitchen) "veF" = ( -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "rampbottom" @@ -94172,7 +94291,6 @@ "vuN" = ( /obj/structure/closet/firecloset, /obj/machinery/firealarm/directional/south, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "purple" @@ -94507,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{ @@ -94800,7 +94928,6 @@ /area/station/maintenance/asmaint2) "vFk" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "vFw" = ( @@ -95835,6 +95962,7 @@ "vYv" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain) "vYx" = ( @@ -96356,7 +96484,6 @@ /area/station/maintenance/aft) "wkM" = ( /obj/machinery/photocopier, -/obj/machinery/light/directional/west, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) "wkQ" = ( @@ -96950,7 +97077,6 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "wve" = ( -/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -96966,6 +97092,7 @@ /obj/structure/sign/poster/official/fruit_bowl{ pixel_y = 32 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -98628,7 +98755,6 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/command/office/captain) "xdJ" = ( -/obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -98783,7 +98909,6 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "xfi" = ( -/obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -98793,6 +98918,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -99142,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" = ( @@ -99294,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" = ( @@ -100161,6 +100280,7 @@ /obj/item/pickaxe{ pixel_x = 5 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "xHs" = ( @@ -100235,6 +100355,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/wood/fancy/cherry, /area/station/service/bar/atrium) "xIi" = ( @@ -100269,7 +100390,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "xIm" = ( -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -100572,13 +100692,18 @@ /area/station/security/permabrig) "xMI" = ( /obj/structure/table/wood, -/obj/item/flashlight/lantern{ - on = 1 - }, /obj/effect/decal/cleanable/dust, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, +/obj/item/flashlight/lantern{ + anchored = 1; + layer = 5; + light_color = "#FF9F40"; + on = 1; + pixel_x = -1; + pixel_y = 10 + }, /turf/simulated/floor/carpet/black, /area/station/maintenance/fsmaint) "xMK" = ( @@ -101254,7 +101379,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "xXO" = ( -/obj/machinery/light/directional/south, /obj/structure/table, /obj/item/storage/belt/utility, /obj/item/storage/toolbox/mechanical, @@ -101279,11 +101403,6 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "xYi" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -101460,13 +101579,15 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "ybE" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/delivery/green/hollow, +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "purplecorner" }, -/area/station/service/hydroponics) +/area/station/hallway/secondary/exit) "ybL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -115807,7 +115928,7 @@ bpF bqr rjY btG -rjP +btB sAq rrL bqr @@ -116574,7 +116695,7 @@ aMs aMs aMs brn -bgB +rjP bqr bvb btA @@ -117088,7 +117209,7 @@ blh blh blh brp -bsx +bgB bqr bqr bqr @@ -120392,7 +120513,7 @@ xhW exh hjX pty -uVr +oBb rAe luh lEA @@ -122247,7 +122368,7 @@ bKz ojT ozC ojs -vAZ +ojs vsR ojs ojs @@ -122961,7 +123082,7 @@ fRp anf ado oUV -cEV +hDl sgt lKq avo @@ -124035,9 +124156,9 @@ cho bxb bzB bBj -bCu -bDR bKz +bDR +bCu bKQ bxb bJi @@ -124299,7 +124420,7 @@ bxb bxb bzJ bNM -bQj +bBn xgn bBn bBn @@ -124574,7 +124695,7 @@ cfm gAk unR uXM -sou +cno cam ldf cPj @@ -125066,7 +125187,7 @@ bBn lWU bIG bJE -bKI +hTA odl qXB bNW @@ -125317,7 +125438,7 @@ buj vfW sTU blQ -bxd +iwe bDN bBn lWU @@ -125333,7 +125454,7 @@ bHi bUU bUU itH -bBn +iLP bzJ cao iis @@ -126557,7 +126678,7 @@ afV wyJ iwJ akY -arA +anT okB anT ars @@ -126567,7 +126688,7 @@ ave wHW anT ayG -azH +anT ago aDJ aqI @@ -126597,7 +126718,7 @@ pBf bgS dnN beu -bun +cdX bun bun gzl @@ -126621,7 +126742,7 @@ bOw bOw bYO eVK -shB +bKI shB bOw bTk @@ -126878,7 +126999,7 @@ tkD tkD tkD lQL -tkD +qYK cfh bNx cgQ @@ -127645,9 +127766,9 @@ lSv kHi kHi kHi -sxh kHi kHi +bRU bKJ cdT eJL @@ -127908,7 +128029,7 @@ upp upp cdS gFt -bTy +cEV cgQ cvm gzN @@ -128917,7 +129038,7 @@ vQV jSf bCw qsV -tfz +siC siC rxV dqh @@ -128934,7 +129055,7 @@ wAF iMZ pNG upp -cdX +cey vVF ciM cgW @@ -130682,8 +130803,8 @@ avd azP aFy lpi -aCZ aDm +aCZ aFy aFF aFF @@ -130692,7 +130813,7 @@ aFF aFF aSN aNK -aSN +azH hHt aRF sDk @@ -130728,7 +130849,7 @@ xec rYG fGr fGr -fGr +bQj bmc nzd pZP @@ -130939,7 +131060,7 @@ nAN azJ qCv aCo -qCv +emr xpv prM qCv @@ -131203,16 +131324,16 @@ aFF aHT aIO uWw -aHT +aQS aNc aHT aNT -aQS +aHT aHT aSc aFF lnL -tae +aIO tae aZx bev @@ -131242,7 +131363,7 @@ rRU trg fGr fGr -fGr +sou bmc nzd rQs @@ -132235,10 +132356,10 @@ aLP oCG aPM aTC -aWz +aPM aYs aLP -bbZ +aRx kGo bgT biT @@ -132760,7 +132881,7 @@ lXF boU dhq aDN -dkn +bhq thq bwj bmi @@ -132817,7 +132938,7 @@ cvx cvx cNP uZx -uZx +cOi uZx cOi cOi @@ -133046,7 +133167,7 @@ aDk xmZ qNN bBB -ceD +cew ktq cdN cgS @@ -133517,7 +133638,7 @@ gVt axe aTm aLP -aQd +bsx aQd aQd aQd @@ -133526,9 +133647,9 @@ aLP vEL ugX aPm -aRx -sqc buU +sqc +bmT aRx uxn gEd @@ -134286,16 +134407,16 @@ oJZ rtU aGG axe -aTm -aOI -aQn +vAZ +aOb +hpQ aPm aTF aTF aTF aTF aPm -iLP +sUe aUQ uCJ eri @@ -134311,7 +134432,7 @@ aaa bmi bsK iPZ -bwi +tDC rys sBT gGO @@ -134521,7 +134642,7 @@ oHE veR pLI anA -aqX +arD uAG akY kVw @@ -134544,8 +134665,8 @@ aIi aJq axe hLk -ijf -hpQ +aOI +aWz aSM aTE aWC @@ -134568,7 +134689,7 @@ bmi bmi bsK iPZ -bwh +bwi rys rys rys @@ -134776,7 +134897,7 @@ alG pOw aoJ hRm -lqm +aoR anA arC eHI @@ -134809,7 +134930,7 @@ aWE aZv bce bbv -sUe +tfz aUQ jsn qSD @@ -134832,7 +134953,7 @@ bAl bBF bCY bEw -bMT +bFU nis bFU bOz @@ -135357,7 +135478,7 @@ bFO kxL bFO eyg -bXB +bwh bXB bXB bWi @@ -135794,7 +135915,7 @@ pSs anA cHW anA -cYl +acx acB idn adp @@ -136115,7 +136236,7 @@ tai aVu cMK bzq -bAk +bDa ogI aTS fYx @@ -136599,7 +136720,7 @@ aFI aFI aFI aKK -aOb +aKK aFI aDv uAT @@ -136629,7 +136750,7 @@ dJg ofw bAk bzq -bDa +bAk ogI aTU bDf @@ -136826,13 +136947,13 @@ aqG aqG aqG aih +aih akJ oGm -oGm amT aHq -aHq apQ +aih aqG agV aiX @@ -136865,7 +136986,7 @@ aWM aWM bbo bda -emr +mGQ aOI aYO aUS @@ -138400,7 +138521,7 @@ aKO aMJ aOg aFI -aZs +bbZ aZD aVp iBD @@ -138710,7 +138831,7 @@ cot bYc cjB ure -jCb +dkn gqr ghU joe @@ -139224,7 +139345,7 @@ cot hZz bSH clc -pNL +bMT slC coe cpw @@ -141017,17 +141138,17 @@ bWt wRB cnY cnY -cjz +cnY cGL chx bQB ckB -cjz +cnY cnM +cjz cnY cnY cnY -cjz cnY bWF cGL @@ -141283,7 +141404,7 @@ avO cmq avO avO -avO +oMr avO cuv dXp @@ -141512,7 +141633,7 @@ xcG beb bAp bzq -bDa +bAk bEp aYr bDn @@ -141539,9 +141660,9 @@ rcs uBn chr chr -chr -chr -chr +sFX +dVG +ceD chr cQk cQk @@ -142017,8 +142138,8 @@ beb beb rKD aSQ -tab exm +tab bef qzn bmA @@ -143816,10 +143937,10 @@ beb ukr fTD qIy +bef jJJ bef bef -ybE pVw nAE pou @@ -145377,7 +145498,7 @@ bRj bTW bUN bVA -bRU +bSJ bGr cLh ccF @@ -145680,7 +145801,7 @@ uVL vzg jXI ial -qYK +ddF uBf sUZ gyS @@ -146660,7 +146781,7 @@ qrJ bSJ bSJ bSJ -bSJ +sxh bSJ azq bGr @@ -148699,16 +148820,16 @@ krD bld blw bmI -bmT buz +uAX vWt iPF boJ bjD aYP -bwv +xmi uKG -dMJ +cfy bIa bIa jnE @@ -149223,7 +149344,7 @@ aYQ bwv uKG cfy -gLu +rKV bGL bPD bKi @@ -149504,7 +149625,7 @@ dsy cKT nXo cbq -cEs +cbq wsm cyI ctI @@ -150009,10 +150130,10 @@ uMa awK ctI wci -cgq +keJ ggx spl -keJ +cgq ufq spl spl @@ -150251,7 +150372,7 @@ aYQ bwv aAR cXh -gLu +rKV bGD bIy bKj @@ -150503,7 +150624,7 @@ buA bqg boJ boJ -bzl +bcD aYP bFB aAR @@ -150521,7 +150642,7 @@ bts bTe uMa awK -dVG +spl cbj cbj azG @@ -152566,7 +152687,7 @@ oNu cXj uuo iSv -bNv +ybE bNv boD ciY @@ -155140,7 +155261,7 @@ dYR vvK iIB bmm -bmm +poy bEF xKa aLe @@ -160297,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 496ec0a007b9..f38b0b50342c 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -435,17 +435,17 @@ /area/station/legal/lawoffice) "aeh" = ( /obj/effect/turf_decal/delivery, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel/white, /area/station/science/robotics/chargebay) "aes" = ( @@ -466,28 +466,28 @@ /turf/space, /area/space/nearstation) "aey" = ( -/obj/machinery/light/small/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/simulated/floor/plating, +/obj/structure/closet/emcloset, +/turf/simulated/floor/catwalk, /area/station/hallway/secondary/entry) "aez" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/catwalk, /area/station/hallway/secondary/entry) "aeA" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/catwalk, /area/station/hallway/secondary/entry) "aeC" = ( /obj/machinery/light/small/directional/north, -/turf/simulated/floor/plating, +/turf/simulated/floor/catwalk, /area/station/hallway/secondary/entry) "aeI" = ( /obj/machinery/door/firedoor, @@ -521,7 +521,7 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/entry) "aeN" = ( -/turf/simulated/floor/plating, +/turf/simulated/floor/catwalk, /area/station/hallway/secondary/entry) "aeO" = ( /obj/machinery/door/firedoor, @@ -595,7 +595,7 @@ "aff" = ( /obj/structure/closet/emcloset, /obj/item/radio/intercom/directional/west, -/turf/simulated/floor/plating, +/turf/simulated/floor/catwalk, /area/station/hallway/secondary/entry) "afg" = ( /turf/simulated/wall/r_wall, @@ -1353,6 +1353,11 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry) +"akW" = ( +/obj/structure/bookcase, +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor/carpet, +/area/station/service/library) "akY" = ( /obj/machinery/status_display{ name = "Дисплей статуса" @@ -1524,7 +1529,6 @@ /area/station/medical/surgery/primary) "alX" = ( /obj/machinery/economy/vending/lawdrobe, -/obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -2252,9 +2256,7 @@ /turf/simulated/wall, /area/station/hallway/secondary/entry) "apk" = ( -/obj/machinery/status_display{ - name = "Дисплей статуса" - }, +/obj/machinery/status_display, /turf/simulated/wall, /area/station/hallway/secondary/entry) "apl" = ( @@ -2355,6 +2357,7 @@ "apz" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -2495,7 +2498,9 @@ /area/station/legal/courtroom) "aqa" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, +/obj/item/flashlight/lamp{ + pixel_y = 4 + }, /obj/machinery/camera{ c_tag = "Arrivals Lobby" }, @@ -3197,7 +3202,6 @@ id = "cargodisposals_output"; name = "Output Belt" }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "arW" = ( @@ -3215,6 +3219,7 @@ id = "cargodisposals_output"; name = "Output Belt" }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "arY" = ( @@ -3228,7 +3233,6 @@ /area/station/maintenance/disposal/west) "asa" = ( /obj/machinery/economy/vending/cargodrobe, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -3236,6 +3240,7 @@ /area/station/maintenance/disposal/west) "asb" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -3476,8 +3481,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /obj/structure/cable{ d1 = 4; @@ -3497,9 +3502,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3575,7 +3578,6 @@ }, /area/station/security/main) "asS" = ( -/obj/machinery/light/small/directional/north, /obj/machinery/mass_driver{ dir = 4; id_tag = "trash" @@ -3848,6 +3850,7 @@ "atD" = ( /obj/item/kirbyplants, /obj/machinery/newscaster/directional/south, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/grimy, /area/station/hallway/secondary/entry) "atE" = ( @@ -4009,8 +4012,8 @@ "aud" = ( /obj/structure/closet/secure_closet/warden, /obj/item/megaphone, -/obj/machinery/light/directional/east, /obj/item/radio/intercom/directional/east, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkred" @@ -4248,6 +4251,7 @@ /obj/structure/sign/poster/official/obey{ pixel_y = 32 }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -4260,7 +4264,6 @@ /area/station/maintenance/disposal/east) "avc" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -4298,7 +4301,6 @@ /area/station/hallway/secondary/entry) "avg" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -4438,6 +4440,7 @@ /area/station/maintenance/disposal/east) "avv" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -4457,12 +4460,13 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "avC" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/closet/secure_closet/personal, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/small/directional/west, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/area/station/public/fitness) "avE" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -4540,9 +4544,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel/goonplaque, /area/station/hallway/secondary/entry) "awq" = ( /obj/machinery/door/airlock/maintenance, @@ -4943,16 +4945,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Disposals"; - dir = 1 - }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/station/maintenance/disposal/east) "axC" = ( -/obj/item/radio/intercom/directional/east, +/obj/machinery/computer/guestpass{ + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -4977,7 +4978,6 @@ /area/station/maintenance/disposal/east) "axE" = ( /obj/machinery/power/apc/directional/south, -/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d2 = 8; @@ -5227,8 +5227,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" @@ -5393,9 +5393,9 @@ pixel_y = 4 }, /obj/item/food/snacks/baguette, -/obj/item/flashlight/lamp/green{ - pixel_x = 6; - pixel_y = 16 +/obj/item/flashlight/lamp/green/off{ + pixel_x = 8; + pixel_y = -6 }, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) @@ -5462,7 +5462,7 @@ /area/station/command/office/cmo) "azx" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/directional/north, +/obj/machinery/newscaster/directional/north, /obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ dir = 9; @@ -5487,6 +5487,7 @@ req_one_access_txt = "19"; pixel_x = 6 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -5516,7 +5517,6 @@ suffix = "#4" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/supply/storage) "azD" = ( @@ -5883,11 +5883,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/plating, /area/station/supply/qm) "aAO" = ( @@ -6083,9 +6078,9 @@ /turf/simulated/floor/plasteel, /area/station/supply/qm) "aBH" = ( -/obj/item/flashlight/lamp/green{ - pixel_x = 6; - pixel_y = 16 +/obj/item/flashlight/lamp/green/off{ + pixel_y = 4; + pixel_x = -16 }, /obj/item/paper_bin{ pixel_y = 4; @@ -6096,7 +6091,6 @@ pixel_x = 6 }, /obj/structure/table/wood, -/obj/item/book/manual/wiki/sop_supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" @@ -6421,7 +6415,6 @@ /area/station/maintenance/fsmaint) "aCL" = ( /obj/machinery/economy/vending/hydrodrobe, -/obj/machinery/light/directional/west, /obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ dir = 9; @@ -6719,7 +6712,10 @@ /obj/machinery/conveyor/southeast/ccw{ id = "QMLoad" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, /area/station/supply/storage) "aDZ" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ @@ -6878,21 +6874,22 @@ /area/station/service/theatre) "aEB" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp/bananalamp{ - layer = 3.1; - pixel_x = 6; - pixel_y = 16 - }, /obj/item/food/snacks/grown/banana{ - pixel_x = 6 + pixel_y = 4; + pixel_x = -6 }, /obj/item/food/snacks/grown/banana{ - pixel_y = 4 + pixel_x = -6 }, /obj/item/food/snacks/grown/banana{ + pixel_y = -4; pixel_x = -6 }, -/obj/item/food/snacks/pie, +/obj/item/flashlight/lamp/bananalamp{ + layer = 3.4; + pixel_x = 6; + pixel_y = 14 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -6952,6 +6949,7 @@ /obj/item/destTagger{ pixel_x = -4 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -6978,6 +6976,14 @@ /area/station/supply/qm) "aEL" = ( /obj/structure/dresser, +/obj/item/toy/figure/crew/qm{ + pixel_y = 14 + }, +/obj/machinery/button/windowtint/north{ + id = "qmroom"; + req_one_access_txt = "19"; + pixel_x = -8 + }, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "aEM" = ( @@ -6993,9 +6999,14 @@ /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "aEN" = ( -/obj/item/storage/secure/briefcase, /obj/structure/table/wood, /obj/item/radio/intercom/directional/south, +/obj/item/book/manual/wiki/sop_supply{ + pixel_x = 12; + pixel_y = 4 + }, +/obj/item/storage/secure/briefcase, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "aEO" = ( @@ -7234,10 +7245,10 @@ }, /area/station/hallway/primary/fore) "aFD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -7365,7 +7376,6 @@ /area/station/engineering/controlroom) "aGd" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small/directional/south, /obj/structure/extinguisher_cabinet/directional/west, /obj/item/tank/internals/plasma, /obj/effect/turf_decal/delivery/hollow, @@ -7738,15 +7748,15 @@ /turf/simulated/wall, /area/station/supply/qm) "aHU" = ( -/obj/machinery/alarm/directional/west, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/chair/wood/wings{ + dir = 1; + pixel_y = 8 }, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "aHX" = ( /obj/structure/closet/l3closet/janitor, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -7805,10 +7815,8 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "aId" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -7864,9 +7872,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "aIi" = ( @@ -7967,7 +7972,7 @@ "aIw" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/oxygen, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/turbine) @@ -8125,7 +8130,10 @@ pixel_x = -4; pixel_y = 5 }, -/obj/item/folder, +/obj/item/destTagger{ + pixel_x = 12; + pixel_y = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -8164,7 +8172,6 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Cargo Delivery Office"; dir = 1 @@ -8288,7 +8295,6 @@ /area/station/engineering/controlroom) "aJG" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small/directional/south, /obj/item/multitool, /obj/item/multitool{ pixel_x = 4; @@ -8514,19 +8520,9 @@ }, /area/station/hallway/primary/fore) "aKu" = ( -/obj/machinery/hologram/holopad, -/obj/effect/landmark/lightsout, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/primary/fore) +/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, @@ -8873,6 +8869,7 @@ "aLZ" = ( /obj/structure/filingcabinet/chestdrawer, /obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -9650,9 +9647,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/light/small/directional/north, /obj/structure/table/reinforced, /obj/item/wrench, /obj/item/crowbar, @@ -9736,7 +9731,8 @@ /turf/simulated/floor/wood/oak, /area/station/service/theatre) "aPW" = ( -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/carpet, /area/station/service/theatre) "aQb" = ( @@ -10015,18 +10011,22 @@ "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/effect/turf_decal/delivery, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/area/station/hallway/primary/fore) +/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, @@ -10077,7 +10077,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -10115,7 +10114,6 @@ /obj/structure/closet/secure_closet/miner, /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "purple" @@ -10380,7 +10378,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/goonplaque, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, /area/station/hallway/primary/fore) "aTp" = ( /obj/item/kirbyplants, @@ -10451,7 +10451,6 @@ }, /area/station/supply/miningdock) "aTB" = ( -/obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/siding/white{ dir = 8 @@ -11180,7 +11179,6 @@ /obj/machinery/camera{ c_tag = "Animal Garden" }, -/obj/machinery/light/directional/north, /turf/simulated/floor/grass, /area/station/service/hydroponics) "aXg" = ( @@ -12033,10 +12031,13 @@ }, /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, /turf/simulated/floor/plasteel{ dir = 1; @@ -12050,7 +12051,6 @@ /obj/item/pen/red, /obj/item/screwdriver/cargo, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -12095,6 +12095,7 @@ /obj/item/eftpos{ pixel_x = -6 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -12103,6 +12104,7 @@ "bba" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -12125,7 +12127,6 @@ /area/station/supply/office) "bbd" = ( /obj/structure/table/reinforced, -/obj/machinery/light/directional/east, /obj/item/stamp/granted{ pixel_x = 3; pixel_y = -4 @@ -12171,9 +12172,8 @@ /area/station/supply/miningdock) "bbk" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp{ - pixel_y = 10 - }, +/obj/item/flashlight/lamp, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "bbl" = ( @@ -12235,9 +12235,6 @@ /turf/space, /area/station/engineering/atmos) "bbM" = ( -/obj/machinery/light/small{ - dir = 8 - }, /obj/machinery/camera{ c_tag = "Atmospherics West"; dir = 4; @@ -12360,7 +12357,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" + icon_state = "redfull" }, /area/station/service/kitchen) "bci" = ( @@ -12396,7 +12393,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" + icon_state = "redfull" }, /area/station/service/kitchen) "bco" = ( @@ -12525,7 +12522,6 @@ /obj/effect/turf_decal/delivery/hollow, /obj/structure/closet/secure_closet/personal, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -12548,7 +12544,6 @@ /obj/effect/turf_decal/delivery/hollow, /obj/structure/closet/secure_closet/personal, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -12563,10 +12558,7 @@ "bcM" = ( /obj/machinery/computer/supplycomp/public, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/directional/east, -/obj/machinery/camera{ - c_tag = "Supply Lobby" - }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -12686,10 +12678,9 @@ /turf/simulated/floor/plasteel, /area/station/service/kitchen) "bdy" = ( -/obj/machinery/light/directional/south, /obj/machinery/economy/vending/dinnerware, /turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" + icon_state = "redfull" }, /area/station/service/kitchen) "bdG" = ( @@ -12732,11 +12723,22 @@ /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "bdO" = ( -/obj/machinery/power/apc/engineering/east, -/obj/structure/cable, -/obj/machinery/light/directional/east, -/turf/simulated/floor/wood/oak, -/area/station/service/bar/atrium) +/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) "bdP" = ( /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -13050,7 +13052,6 @@ }, /area/station/engineering/atmos) "beR" = ( -/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 }, @@ -13124,13 +13125,13 @@ }, /area/station/service/kitchen) "bfp" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, +/obj/item/kirbyplants, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 8; icon_state = "neutralcorner" }, -/area/station/hallway/primary/fore) +/area/station/hallway/secondary/entry) "bfq" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -13395,20 +13396,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/public/locker) "bgw" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ - icon_state = "neutralfull" + dir = 8; + icon_state = "yellow" }, -/area/station/hallway/primary/fore) +/area/station/engineering/break_room) "bgx" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -13523,6 +13516,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "purple" }, @@ -13786,15 +13780,17 @@ /turf/simulated/floor/carpet/orange, /area/station/service/bar/atrium) "bhL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/landmark/start/cyborg, /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, -/area/station/engineering/control) +/area/station/science/robotics/chargebay) "bhN" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -14172,6 +14168,7 @@ /obj/machinery/camera{ c_tag = "Hydroponics Backroom" }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "greenblue" @@ -14182,9 +14179,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "bjh" = ( @@ -14659,6 +14654,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" = ( @@ -14681,7 +14677,6 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/hand_labeler, -/obj/machinery/light/directional/west, /obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; @@ -14758,7 +14753,6 @@ }, /obj/item/storage/toolbox/emergency, /obj/machinery/firealarm/directional/west, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -15210,7 +15204,6 @@ }, /area/station/hallway/primary/starboard) "bnA" = ( -/obj/machinery/light/directional/south, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -15973,7 +15966,6 @@ }, /area/station/medical/break_room) "bqI" = ( -/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "bqK" = ( @@ -17381,6 +17373,7 @@ /obj/item/restraints/handcuffs, /obj/item/flash, /obj/machinery/ai_status_display/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxq" = ( @@ -17416,6 +17409,7 @@ id = "bridge blast north"; name = "North Bridge Blast Door Control" }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxu" = ( @@ -17639,7 +17633,6 @@ /area/station/engineering/hardsuitstorage) "byu" = ( /obj/item/kirbyplants, -/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -17797,7 +17790,6 @@ /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, /obj/item/radio/intercom/directional/west, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byS" = ( @@ -17829,7 +17821,6 @@ "byY" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom/directional/east, -/obj/machinery/light/directional/east, /obj/item/flash, /obj/item/storage/box/ids, /obj/item/storage/box/PDAs{ @@ -18109,6 +18100,7 @@ /area/station/engineering/tech_storage) "bAm" = ( /obj/machinery/firealarm/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/station/security/detective) "bAp" = ( @@ -18284,6 +18276,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/light_switch/south, /turf/simulated/floor/plasteel/white, /area/station/science/explab) "bBr" = ( @@ -18507,16 +18500,15 @@ /area/station/public/storage/tools) "bCg" = ( /obj/structure/table/reinforced, -/obj/machinery/light/directional/north, /obj/item/assembly/igniter, /obj/item/assembly/igniter, /obj/item/assembly/igniter, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "bCn" = ( -/obj/machinery/light/directional/north, /obj/machinery/door_control/shutter/north{ id = "bridge blast west"; name = "West Bridge Blast Door Control"; @@ -18620,7 +18612,6 @@ }, /area/station/command/bridge) "bCy" = ( -/obj/machinery/light/directional/north, /obj/machinery/door_control/shutter/north{ id = "bridge blast east"; name = "East Bridge Blast Door Control"; @@ -19710,9 +19701,9 @@ /area/station/command/bridge) "bFF" = ( /obj/structure/rack, -/obj/machinery/light/small/directional/south, /obj/item/aicard, /obj/item/storage/secure/briefcase, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkblue" @@ -19756,11 +19747,11 @@ /obj/structure/rack, /obj/item/storage/toolbox/emergency, /obj/item/wrench, -/obj/machinery/light/small/directional/south, /obj/item/storage/toolbox/mechanical{ pixel_y = -3 }, /obj/item/multitool/command, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" @@ -20773,7 +20764,6 @@ /area/station/command/meeting_room) "bJa" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/south, /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -20864,17 +20854,17 @@ }, /area/station/security/permabrig) "bJm" = ( -/obj/machinery/light/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJn" = ( -/obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bJo" = ( @@ -21509,8 +21499,8 @@ id = "toilet2" }, /obj/structure/sign/poster/official/random/south, -/obj/machinery/light/small/directional/west, /obj/effect/landmark/start/assistant, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/service/theatre) "bLl" = ( @@ -21614,7 +21604,7 @@ /area/station/security/prison/cell_block/A) "bLF" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/nightshifted/east, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/medical/patients_rooms) "bLK" = ( @@ -22055,7 +22045,6 @@ /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bNh" = ( -/obj/machinery/light/directional/east, /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -22397,9 +22386,11 @@ }, /area/station/command/office/ce) "bOe" = ( -/obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel/dark, -/area/station/command/office/ce) +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/station/command/bridge) "bOf" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, @@ -22442,7 +22433,6 @@ "bOn" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave{ - pixel_x = -3; pixel_y = 6 }, /obj/machinery/light_switch/west, @@ -22509,7 +22499,7 @@ /area/station/engineering/tech_storage) "bOx" = ( /obj/structure/table/reinforced, -/obj/machinery/light/directional/south, +/obj/machinery/light/directional/west, /obj/item/assembly/timer, /obj/item/assembly/timer, /obj/item/multitool, @@ -22536,12 +22526,22 @@ /turf/simulated/wall, /area/station/public/storage/tools) "bOD" = ( -/obj/machinery/light/directional/west, +/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{ - dir = 1; - icon_state = "neutralcorner" + icon_state = "neutralfull" }, -/area/station/hallway/primary/central/nw) +/area/station/hallway/primary/fore) "bOE" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -22720,7 +22720,7 @@ /area/station/legal/lawoffice) "bPf" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/nightshifted/west, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteblue" @@ -23006,7 +23006,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, @@ -23164,7 +23163,6 @@ }, /area/station/engineering/break_room) "bQq" = ( -/obj/machinery/light/small/directional/north, /obj/structure/closet/radiation, /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -23176,9 +23174,14 @@ /turf/simulated/wall, /area/station/engineering/control) "bQs" = ( -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/station/engineering/break_room) +/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; @@ -23319,8 +23322,9 @@ dir = 1; layer = 2.9 }, -/obj/item/flashlight/lamp/green, -/obj/machinery/light/directional/west, +/obj/item/flashlight/lamp/green/off{ + pixel_y = 6 + }, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bQP" = ( @@ -23400,6 +23404,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 6 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood/oak, /area/station/command/office/captain) "bQV" = ( @@ -23439,6 +23444,7 @@ "bQX" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/junglebush/large, +/obj/machinery/light/directional/west, /turf/simulated/floor/grass/no_creep, /area/station/public/locker) "bRa" = ( @@ -23753,6 +23759,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -23853,7 +23860,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) @@ -23882,9 +23888,9 @@ /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/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, @@ -24600,6 +24606,7 @@ /area/station/command/office/captain) "bUY" = ( /obj/item/radio/intercom/directional/south, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bUZ" = ( @@ -24610,11 +24617,11 @@ /turf/simulated/floor/carpet/black, /area/station/command/office/captain) "bVa" = ( -/obj/machinery/light/directional/west, /obj/effect/landmark/start/captain, /obj/structure/toilet/material/captain{ dir = 4 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/white, /area/station/command/office/captain/bedroom) "bVb" = ( @@ -25028,8 +25035,8 @@ /area/station/engineering/break_room) "bWy" = ( /obj/machinery/status_display/directional/east, -/obj/machinery/alarm/directional/south, /obj/item/kirbyplants, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "yellow" @@ -25083,7 +25090,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; @@ -25545,12 +25551,22 @@ /turf/simulated/wall, /area/station/legal/courtroom) "bYI" = ( -/obj/effect/spawner/window/reinforced/polarized/grilled{ - id = "qm" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/station/supply/qm) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Disposals"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "brown" + }, +/area/station/maintenance/disposal/east) "bYJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -25838,10 +25854,20 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "bZJ" = ( -/obj/structure/chair/comfy/brown, -/obj/machinery/light/directional/west, -/turf/simulated/floor/wood/parquet, -/area/station/service/library) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/directional/north, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "bZK" = ( /obj/structure/chair/comfy/beige{ dir = 1 @@ -25856,7 +25882,9 @@ /area/station/service/library) "bZO" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, +/obj/item/flashlight/lamp{ + pixel_y = 2 + }, /obj/item/radio/intercom/directional/west, /obj/structure/sign/poster/official/random/south, /turf/simulated/floor/wood/parquet/tile, @@ -26090,7 +26118,6 @@ }, /obj/item/book/manual/wiki/sop_legal, /obj/item/book/manual/wiki/sop_command, -/obj/machinery/light/directional/north, /obj/effect/turf_decal/siding/wood{ dir = 5 }, @@ -26405,6 +26432,7 @@ /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood/parquet, /area/station/service/library) "cbH" = ( @@ -26478,7 +26506,9 @@ /turf/simulated/floor/carpet, /area/station/command/office/hop) "cbW" = ( -/obj/machinery/keycard_auth/west, +/obj/machinery/keycard_auth/west{ + pixel_y = 4 + }, /obj/machinery/button/windowtint/north{ dir = 4; id = "NT"; @@ -26505,10 +26535,6 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/paper_bin/nanotrasen, -/obj/item/flashlight/lamp/green{ - pixel_x = -5; - pixel_y = 12 - }, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "cbY" = ( @@ -26985,7 +27011,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, @@ -27018,6 +27043,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/item/flashlight/lamp/green/off{ + pixel_x = -16; + pixel_y = 6 + }, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "cdK" = ( @@ -27192,6 +27221,11 @@ }, /obj/item/clothing/mask/cigarette/cigar/cohiba, /obj/item/lighter/zippo/engraved{ + pixel_x = -5; + pixel_y = 16 + }, +/obj/item/flashlight/lamp/green{ + pixel_y = -10; pixel_x = -5 }, /turf/simulated/floor/carpet/royalblack, @@ -27252,7 +27286,6 @@ /obj/item/folder/yellow, /obj/item/gps, /obj/item/gps, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "ceF" = ( @@ -27538,7 +27571,6 @@ /turf/simulated/floor/carpet, /area/station/service/library) "cfB" = ( -/obj/machinery/light/small/directional/south, /obj/structure/closet/radiation, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -27582,7 +27614,6 @@ /turf/simulated/floor/wood/oak, /area/station/command/office/ntrep) "cfM" = ( -/obj/machinery/light/directional/west, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -27625,7 +27656,6 @@ /turf/simulated/floor/plasteel, /area/station/command/office/captain/bedroom) "cfX" = ( -/obj/machinery/light/directional/east, /obj/structure/chair/comfy/brown{ dir = 8 }, @@ -27871,6 +27901,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" = ( @@ -28749,6 +28780,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/engine, /area/station/science/explab/chamber) "cjX" = ( @@ -28813,7 +28845,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 @@ -29084,6 +29115,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -29137,6 +29169,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" = ( @@ -29397,15 +29430,17 @@ /turf/simulated/floor/carpet, /area/station/service/library) "cno" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green, /obj/item/radio/intercom/directional/west, -/turf/simulated/floor/carpet, -/area/station/command/office/hop) -"cnp" = ( /obj/structure/closet/secure_closet/hop, /turf/simulated/floor/carpet, /area/station/command/office/hop) +"cnp" = ( +/obj/item/radio/intercom/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/central/sw) "cnt" = ( /obj/item/kirbyplants, /obj/machinery/light_switch/south, @@ -29460,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 @@ -30415,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 @@ -30457,7 +30490,6 @@ /area/station/medical/chemistry) "crW" = ( /obj/structure/railing, -/obj/machinery/light/directional/west, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -30475,7 +30507,7 @@ /turf/simulated/floor/plating, /area/station/public/vacant_store) "csa" = ( -/obj/machinery/door/airlock/security/glass, +/obj/machinery/door/airlock/security, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -30904,9 +30936,11 @@ /turf/simulated/floor/wood/parquet, /area/station/service/library) "ctV" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/structure/closet/secure_closet/hydroponics, /obj/machinery/light/directional/south, -/turf/simulated/floor/carpet/royalblack, -/area/station/legal/magistrate) +/turf/simulated/floor/plasteel/dark, +/area/station/service/hydroponics) "ctX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass, @@ -31229,7 +31263,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/virology_maint) "cvo" = ( -/obj/effect/decal/cleanable/cobweb, /obj/machinery/light/small/directional/west, /turf/simulated/floor/carpet, /area/station/service/library) @@ -31261,10 +31294,10 @@ /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "cvz" = ( -/obj/item/kirbyplants, -/obj/machinery/light/directional/north, +/obj/item/flag/sec, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel/dark, -/area/station/ai_monitored/storage/eva) +/area/station/security/range) "cvB" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -31366,9 +31399,7 @@ /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, +/turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "cwd" = ( /obj/effect/decal/cleanable/dirt, @@ -31430,8 +31461,8 @@ /area/station/maintenance/port2) "cws" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm/directional/north, /obj/structure/chair/office, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -31652,7 +31683,6 @@ /obj/structure/closet/secure_closet/cargotech, /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -31845,6 +31875,7 @@ dir = 4; name = "RCD Storage" }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cyf" = ( @@ -31972,6 +32003,7 @@ /obj/machinery/gateway{ dir = 10 }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "vault" @@ -31981,6 +32013,7 @@ /obj/machinery/gateway{ dir = 6 }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "vault" @@ -32061,7 +32094,6 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -32563,7 +32595,6 @@ "cAv" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -32657,7 +32688,6 @@ /area/station/engineering/hardsuitstorage) "cAO" = ( /obj/structure/table/reinforced, -/obj/machinery/light/directional/north, /obj/item/reagent_containers/spray/cleaner{ pixel_y = 12; pixel_x = -8 @@ -32755,6 +32785,7 @@ name = "EVA Requests Console"; pixel_x = 32 }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "cBm" = ( @@ -32949,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{ @@ -33093,7 +33120,6 @@ /area/station/ai_monitored/storage/eva) "cCK" = ( /obj/structure/table/reinforced, -/obj/machinery/light/directional/south, /obj/item/storage/belt/utility, /obj/item/radio, /turf/simulated/floor/plasteel/dark, @@ -33116,7 +33142,6 @@ "cCN" = ( /obj/item/kirbyplants, /obj/machinery/firealarm/directional/south, -/obj/machinery/light/directional/south, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "cCO" = ( @@ -33139,7 +33164,6 @@ /area/station/science/robotics/showroom) "cCR" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/south, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "cCS" = ( @@ -33280,6 +33304,7 @@ /obj/machinery/economy/vending/suitdispenser, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) "cDs" = ( @@ -34153,7 +34178,6 @@ dir = 4 }, /obj/item/storage/box/zipties, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -34894,7 +34918,6 @@ /obj/structure/chair/stool{ dir = 4 }, -/obj/machinery/light/directional/north, /obj/effect/landmark/start/chemist, /turf/simulated/floor/engine, /area/station/medical/chemistry) @@ -35043,6 +35066,7 @@ "cLB" = ( /obj/structure/table, /obj/structure/bedsheetbin, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -35314,10 +35338,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "cNj" = ( -/obj/machinery/light/directional/north, -/obj/effect/decal/cleanable/blood/xeno, -/turf/simulated/floor/plasteel/dark, -/area/station/science/xenobiology) +/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{ @@ -35510,7 +35533,6 @@ /area/station/science/robotics) "cNT" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -35599,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, @@ -36631,7 +36651,11 @@ /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) "cSp" = ( -/obj/machinery/light/directional/south, +/obj/machinery/camera{ + c_tag = "Research Lobby"; + dir = 1; + network = list("Research","SS13") + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -36664,7 +36688,6 @@ /area/station/science/research) "cSv" = ( /obj/structure/table, -/obj/machinery/light/directional/south, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty{ pixel_x = -5; @@ -36743,6 +36766,7 @@ }, /obj/structure/bed, /obj/item/bedsheet/medical, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "Dark" }, @@ -36972,6 +36996,7 @@ name = "Slime Processor" }, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -37020,7 +37045,6 @@ /turf/simulated/floor/plasteel/white, /area/station/science/research) "cTV" = ( -/obj/machinery/light/directional/west, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = -32 }, @@ -37045,6 +37069,7 @@ /obj/item/bedsheet/medical{ dir = 1 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "Dark" }, @@ -37114,7 +37139,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/dormitory_maintenance) "cUI" = ( -/obj/machinery/light/directional/west, /obj/structure/sign/poster/official/walk{ pixel_x = -32 }, @@ -37232,7 +37256,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/science/research) "cVb" = ( @@ -37322,7 +37346,6 @@ "cVo" = ( /obj/machinery/power/apc/directional/east, /obj/structure/table/reinforced, -/obj/machinery/light/directional/east, /obj/item/folder/white, /obj/item/pen, /obj/effect/turf_decal/stripes/line, @@ -37421,6 +37444,7 @@ network = list("Research","SS13"); pixel_y = -22 }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "cVI" = ( @@ -37647,8 +37671,8 @@ /area/station/hallway/secondary/entry) "cWy" = ( /obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel/dark, -/area/station/science/xenobiology) +/turf/simulated/floor/plasteel/white, +/area/station/science/research) "cWz" = ( /obj/machinery/hologram/holopad, /obj/effect/turf_decal/delivery/hollow, @@ -37773,11 +37797,6 @@ /area/station/science/xenobiology) "cWL" = ( /obj/machinery/status_display/directional/south, -/obj/machinery/camera{ - c_tag = "Research Lobby"; - dir = 1; - network = list("Research","SS13") - }, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -37816,7 +37835,6 @@ "cWS" = ( /obj/machinery/ai_status_display/east, /obj/machinery/r_n_d/protolathe, -/obj/machinery/light/directional/east, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -37956,7 +37974,6 @@ }, /area/station/medical/sleeper) "cXr" = ( -/obj/machinery/light/directional/north, /obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; @@ -38079,7 +38096,7 @@ /area/station/science/xenobiology) "cYj" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel, /area/station/science/research) "cYl" = ( @@ -38891,10 +38908,13 @@ }, /area/station/security/evidence) "dcO" = ( -/obj/machinery/hydroponics/soil, -/obj/machinery/light/directional/north, -/turf/simulated/floor/grass, -/area/station/service/hydroponics) +/obj/item/kirbyplants, +/obj/machinery/light/small/directional/west, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, +/area/station/science/research) "dcQ" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -38976,7 +38996,6 @@ /obj/structure/table/reinforced, /obj/machinery/firealarm/directional/south, /obj/machinery/cell_charger, -/obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -39101,6 +39120,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -39133,7 +39153,6 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/light/directional/south, /obj/machinery/door_control/shutter/south{ id = "researchdesk2"; name = "Secondary Research Shutters"; @@ -39184,6 +39203,7 @@ /area/station/medical/surgery/secondary) "ddO" = ( /obj/machinery/economy/vending/medical, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -39807,15 +39827,11 @@ /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "dia" = ( -/obj/structure/closet, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkred" +/obj/effect/light_emitter/colored{ + light_color = "#FFFFFF" }, -/area/station/security/evidence) +/turf/simulated/floor/engine, +/area/holodeck/alphadeck) "die" = ( /obj/structure/table/reinforced, /obj/item/aicard, @@ -39851,19 +39867,26 @@ /area/station/maintenance/apmaint) "dim" = ( /obj/structure/table, -/obj/machinery/light/directional/west, /obj/item/radio/intercom/directional/north, /obj/machinery/alarm/directional/west, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light_switch/north{ + pixel_x = 12 + }, /turf/simulated/floor/plasteel/white, /area/station/science/robotics/chargebay) "din" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/power/apc/directional/north, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "dio" = ( @@ -39885,10 +39908,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "dit" = ( -/obj/machinery/light/directional/east, /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, @@ -40616,10 +40639,11 @@ /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) "dmf" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light_switch/west, -/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) @@ -40822,6 +40846,7 @@ /obj/effect/turf_decal/delivery, /obj/structure/table/reinforced, /obj/item/paicard, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -41082,7 +41107,6 @@ /obj/item/hand_labeler{ pixel_y = 2 }, -/obj/machinery/light/directional/west, /obj/item/storage/box/rxglasses{ pixel_y = 2; pixel_x = 16 @@ -41133,8 +41157,6 @@ /area/station/hallway/primary/aft) "doT" = ( /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/power/apc/directional/west, -/obj/structure/cable, /turf/simulated/floor/plasteel/white, /area/station/science/robotics/chargebay) "doU" = ( @@ -41250,7 +41272,6 @@ /area/station/science/xenobiology) "dpQ" = ( /obj/structure/table/reinforced, -/obj/machinery/light/directional/south, /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/delivery/hollow, /obj/item/radio/intercom/directional/west, @@ -41312,7 +41333,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) "dqc" = ( -/obj/machinery/light/directional/south, /obj/machinery/status_display/directional/east, /obj/machinery/computer/robotics{ dir = 8 @@ -41346,7 +41366,6 @@ /area/station/command/office/rd) "dqj" = ( /obj/structure/table, -/obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/west, /obj/item/stack/packageWrap, /obj/item/hand_labeler, @@ -41677,10 +41696,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "drF" = ( -/obj/machinery/light/directional/east, /obj/structure/reagent_dispensers/fueltank, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/delivery/hollow, @@ -41701,9 +41720,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/structure/chair/comfy/teal{ dir = 8 }, @@ -41902,7 +41919,6 @@ /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) "dsG" = ( -/obj/machinery/light/directional/east, /obj/structure/bed, /obj/item/bedsheet/rd, /obj/machinery/status_display/directional/east, @@ -41998,7 +42014,6 @@ /area/station/science/robotics) "dsM" = ( /obj/structure/rack, -/obj/machinery/light/directional/north, /obj/item/book/manual/wiki/robotics_cyborgs, /obj/item/book/manual/ripley_build_and_repair, /obj/item/storage/belt/utility/full, @@ -42044,7 +42059,6 @@ pixel_x = -4; pixel_y = 2 }, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteyellow" }, @@ -42092,6 +42106,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -42220,6 +42235,7 @@ "dtZ" = ( /obj/machinery/power/apc/directional/south, /obj/structure/cable, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -42548,6 +42564,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whiteyellow" @@ -43956,10 +43973,10 @@ /area/station/maintenance/apmaint) "dET" = ( /obj/structure/table/reinforced, -/obj/machinery/light/directional/west, /obj/item/crowbar{ pixel_y = 5 }, +/obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "blue" @@ -44260,7 +44277,7 @@ /obj/machinery/computer/card{ dir = 4 }, -/obj/machinery/alarm/directional/west, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "blue" @@ -44440,7 +44457,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/light/directional/west, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 10; @@ -44793,7 +44809,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dKe" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -44835,7 +44851,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "dKm" = ( -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/reinforced/tinted/grilled, /turf/simulated/floor/plating, /area/station/service/chapel) "dKn" = ( @@ -45068,7 +45084,6 @@ /obj/machinery/atmospherics/portable/canister/oxygen{ anchored = 1 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -45230,7 +45245,7 @@ /area/station/service/chapel/office) "dMS" = ( /obj/machinery/alarm/directional/east, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dMT" = ( @@ -45559,7 +45574,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dOV" = ( -/obj/machinery/light/directional/west, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "chapel" @@ -45580,7 +45595,7 @@ }, /area/station/service/chapel) "dOZ" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "chapel" @@ -45836,6 +45851,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dPF" = ( @@ -45937,7 +45953,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dQi" = ( -/obj/machinery/light/directional/east, /obj/machinery/camera{ c_tag = "Cremator"; dir = 8 @@ -46090,7 +46105,9 @@ /area/station/service/chapel) "dQX" = ( /obj/structure/table/wood, -/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern{ + pixel_y = 8 + }, /turf/simulated/floor/plasteel/grimy, /area/station/service/chapel) "dQY" = ( @@ -46225,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) @@ -46426,7 +46450,10 @@ /obj/structure/chair/wood{ dir = 4 }, -/obj/machinery/newscaster/directional/south, +/obj/item/radio/intercom/locked/confessional{ + dir = 1; + pixel_y = -22 + }, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "dSh" = ( @@ -46440,7 +46467,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "dSj" = ( -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) @@ -46526,11 +46552,16 @@ }, /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) +/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) "dSD" = ( /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) @@ -46718,7 +46749,9 @@ /area/station/maintenance/apmaint) "dTm" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, +/obj/item/flashlight/lamp{ + pixel_y = 2 + }, /obj/item/radio/intercom/directional/west, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -47227,6 +47260,7 @@ /obj/structure/chair/sofa/corp/right{ dir = 4 }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/carpet/purple, /area/station/hallway/secondary/exit) "dVc" = ( @@ -47439,17 +47473,14 @@ /turf/simulated/floor/plating, /area/station/engineering/control) "dWj" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/conveyor/west{ + dir = 1; + id = "cargodisposals_entrance"; + name = "Entrance Belt" }, -/turf/simulated/floor/plasteel, -/area/station/engineering/controlroom) +/obj/machinery/light/small/directional/west, +/turf/simulated/floor/plating, +/area/station/maintenance/disposal/west) "dWk" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -47544,7 +47575,6 @@ /area/station/science/xenobiology) "dWv" = ( /obj/structure/table, -/obj/machinery/light/directional/south, /obj/item/crowbar, /obj/item/wrench, /obj/item/clothing/mask/gas, @@ -47575,7 +47605,6 @@ /obj/structure/chair/sofa/corp/left{ dir = 4 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/carpet/purple, /area/station/hallway/secondary/exit) "dWC" = ( @@ -47661,7 +47690,6 @@ }, /area/station/bridge/checkpoint/south) "dXk" = ( -/obj/machinery/light/directional/west, /obj/machinery/ai_status_display/west, /obj/machinery/camera{ c_tag = "Research Director's Bedroom"; @@ -48182,6 +48210,7 @@ /obj/structure/cable, /obj/machinery/power/apc/directional/south, /obj/item/kirbyplants, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -48242,6 +48271,7 @@ "dZT" = ( /obj/effect/turf_decal/delivery, /obj/machinery/mineral/equipment_vendor, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -48609,6 +48639,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) "eeR" = ( @@ -49249,7 +49284,6 @@ pixel_y = 16 }, /obj/structure/flora/grass/jungle, -/obj/machinery/light/directional/east, /turf/simulated/floor/grass/no_creep, /area/station/public/pool) "epX" = ( @@ -49338,7 +49372,6 @@ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner" }, -/obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel{ dir = 10; @@ -49460,7 +49493,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "esH" = ( -/obj/machinery/light/directional/east, /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/glasses/science{ @@ -49962,6 +49994,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" = ( @@ -49979,7 +50012,7 @@ /obj/item/toy/figure/crew/chef, /obj/structure/sign/poster/official/random/south, /turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" + icon_state = "redfull" }, /area/station/service/kitchen) "ezU" = ( @@ -51523,7 +51556,6 @@ /obj/item/stack/rods, /obj/structure/table_frame, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, /obj/machinery/power/apc/worn_out/south, /obj/structure/cable{ d2 = 8; @@ -52042,12 +52074,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/medmaint) "fjW" = ( -/obj/machinery/light/directional/west, -/turf/simulated/floor/beach/away/water/deep/dense{ - density = 0; - water_overlay_image = null +/obj/structure/closet/secure_closet/cargotech, +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "brown" }, -/area/station/hallway/secondary/exit) +/area/station/maintenance/disposal/west) "fkv" = ( /obj/machinery/door/airlock/security/glass, /obj/effect/mapping_helpers/airlock/autoname, @@ -53080,6 +53114,22 @@ icon_state = "bluecorner" }, /area/station/hallway/primary/central/ne) +"fAL" = ( +/obj/effect/turf_decal/delivery/red/hollow, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/security_officer, +/obj/structure/sign/poster/official/random/west, +/obj/machinery/camera{ + c_tag = "Brig Briefing Room"; + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkred" + }, +/area/station/security/main) "fAW" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, @@ -53103,9 +53153,8 @@ /area/station/telecomms/chamber) "fBr" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/camera{ - c_tag = "Cargo Office" - }, +/obj/item/folder, +/obj/machinery/status_display/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -53208,7 +53257,7 @@ /area/station/medical/medbay) "fDy" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -53253,7 +53302,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" = ( @@ -53395,6 +53443,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "fGI" = ( @@ -53634,6 +53683,7 @@ "fLP" = ( /obj/structure/flora/ausbushes, /obj/structure/sign/poster/official/random/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/grass, /area/station/service/hydroponics) "fLZ" = ( @@ -54149,9 +54199,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/light/small{ - dir = 8 - }, /turf/simulated/floor/plasteel/dark, /area/station/security/execution) "fSN" = ( @@ -54368,9 +54415,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /obj/structure/chair/comfy/lime{ dir = 8 }, @@ -54512,6 +54557,7 @@ /obj/item/pen{ pixel_y = 6 }, +/obj/machinery/light/nightshifted/south, /turf/simulated/floor/carpet, /area/station/medical/psych) "fXQ" = ( @@ -54749,7 +54795,9 @@ /turf/simulated/wall, /area/station/medical/medbay2) "gbO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; @@ -54874,6 +54922,7 @@ /obj/structure/closet/secure_closet/miner, /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "purple" @@ -56035,7 +56084,6 @@ /area/station/science/break_room) "gxV" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/north, /obj/structure/sign/poster/official/random/north, /turf/simulated/floor/wood/parquet, /area/station/service/library) @@ -56058,11 +56106,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "gyp" = ( -/obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/supply/storage) "gyL" = ( @@ -56252,10 +56300,6 @@ pixel_x = -3; pixel_y = 3 }, -/obj/machinery/camera{ - c_tag = "Brig Secure Armory East"; - dir = 8 - }, /obj/item/storage/box/beanbag{ pixel_x = -3; pixel_y = 3 @@ -56263,6 +56307,7 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general{ dir = 8 }, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "gCs" = ( @@ -56722,7 +56767,6 @@ /obj/machinery/economy/vending/shoedispenser, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) "gKA" = ( @@ -56841,7 +56885,6 @@ /area/station/supply/abandoned_boxroom) "gMf" = ( /obj/machinery/papershredder, -/obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 4 }, @@ -57080,9 +57123,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/security/prison/cell_block/A) "gPT" = ( @@ -57121,10 +57162,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/flashlight/lamp/green{ - pixel_y = 14; - pixel_x = -5 - }, /obj/item/gavelhammer, /turf/simulated/floor/carpet/royalblack, /area/station/legal/magistrate) @@ -57353,6 +57390,7 @@ volume = 200 }, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) "gTS" = ( @@ -57452,7 +57490,6 @@ }, /area/station/public/toilet) "gVE" = ( -/obj/machinery/light/directional/north, /obj/machinery/economy/vending/chinese, /turf/simulated/floor/plasteel{ dir = 1; @@ -57503,11 +57540,6 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "gWl" = ( -/obj/machinery/camera{ - c_tag = "Theatre West"; - dir = 4; - pixel_y = -22 - }, /obj/machinery/light/directional/west, /turf/simulated/floor/wood/oak, /area/station/service/theatre) @@ -57529,11 +57561,20 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "gXb" = ( -/obj/machinery/status_display{ - name = "Дисплей статуса" +/obj/effect/turf_decal/arrows/black{ + dir = 4 }, -/turf/simulated/wall, -/area/station/service/barber) +/obj/effect/turf_decal/delivery/partial{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Supply Lobby" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/hallway/primary/fore) "gXh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, @@ -58218,7 +58259,6 @@ /obj/machinery/economy/vending/hatdispenser, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) "hig" = ( @@ -58760,8 +58800,8 @@ }, /area/station/security/brig) "hsA" = ( -/obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/line, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/supply/storage) "hsC" = ( @@ -59095,7 +59135,6 @@ /area/station/supply/storage) "hyS" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" @@ -59286,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, @@ -60307,7 +60352,6 @@ /area/station/maintenance/starboard2) "hPI" = ( /obj/machinery/economy/vending/medical, -/obj/machinery/light/nightshifted/east, /obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -60462,7 +60506,7 @@ /area/station/hallway/secondary/bridge) "hSW" = ( /obj/machinery/door/poddoor/shutters{ - dir = 2; + dir = 1; id_tag = "janitorshutters"; name = "Janitor Shutters" }, @@ -60612,9 +60656,7 @@ /turf/simulated/floor/plasteel/dark, /area/station/public/locker) "hVo" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -61084,7 +61126,7 @@ /area/station/service/theatre) "idr" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/west, +/obj/machinery/light/directional/south, /turf/simulated/floor/wood/parquet, /area/station/service/library) "idy" = ( @@ -61259,6 +61301,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/structure/closet/crate/freezer, /obj/machinery/alarm/directional/west, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -61453,6 +61496,7 @@ "ihT" = ( /obj/machinery/light/directional/north, /obj/machinery/light_switch/east, +/obj/structure/dresser, /turf/simulated/floor/carpet, /area/station/command/office/hop) "iie" = ( @@ -61465,8 +61509,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/dormitory_maintenance) "iig" = ( -/obj/machinery/light/directional/east, /obj/structure/table/wood, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61474,6 +61518,7 @@ "iiH" = ( /obj/structure/closet, /obj/item/id_skin/donut, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" @@ -61591,6 +61636,10 @@ icon_state = "brown" }, /area/station/supply/miningdock) +"ikZ" = ( +/obj/machinery/newscaster/directional/south, +/turf/simulated/floor/plasteel/dark, +/area/station/service/chapel) "ila" = ( /obj/effect/spawner/random_spawners/blood_maybe, /obj/effect/decal/cleanable/dirt, @@ -61712,7 +61761,6 @@ "imN" = ( /obj/structure/closet/crate/freezer/iv_storage, /obj/effect/turf_decal/delivery/blue/hollow, -/obj/machinery/light/directional/south, /obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -62117,9 +62165,7 @@ /area/station/hallway/primary/central/west) "irM" = ( /obj/structure/closet/secure_closet/brig, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonlockers) "irO" = ( @@ -62206,15 +62252,11 @@ /turf/simulated/wall, /area/station/maintenance/medmaint) "itv" = ( -/obj/machinery/camera{ - c_tag = "Chief Medical Officer's Quarters"; - dir = 1; - network = list("Medical","SS13") - }, /obj/machinery/computer/security/telescreen/entertainment/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/cyan, /area/station/command/office/cmo) "itA" = ( @@ -62420,7 +62462,6 @@ /area/station/science/toxins/mixing) "ivI" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/north, /obj/machinery/camera{ c_tag = "EVA West" }, @@ -62711,7 +62752,6 @@ /area/station/maintenance/dormitory_maintenance) "iBr" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/north, /obj/structure/extinguisher_cabinet/directional/north, /turf/simulated/floor/wood/parquet, /area/station/service/library) @@ -62763,10 +62803,12 @@ "iCb" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/item/clipboard, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 +/obj/item/clipboard{ + pixel_y = 3 + }, +/obj/item/flashlight/lamp/green/off{ + pixel_x = -14; + pixel_y = 4 }, /turf/simulated/floor/carpet, /area/station/service/library) @@ -62791,9 +62833,7 @@ dir = 2 }, /obj/effect/turf_decal/delivery/hollow, -/obj/machinery/computer/guestpass{ - pixel_y = 28 - }, +/obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -62815,6 +62855,7 @@ "iCY" = ( /obj/machinery/hydroponics/soil, /obj/structure/sign/poster/official/random/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/grass, /area/station/service/hydroponics) "iDa" = ( @@ -63878,7 +63919,6 @@ c_tag = "Expedition"; dir = 8 }, -/obj/machinery/light/directional/east, /obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -63922,7 +63962,6 @@ /obj/item/stack/cable_coil, /obj/item/airlock_electronics, /obj/item/airlock_electronics, -/obj/machinery/light/directional/south, /obj/effect/turf_decal/delivery/hollow, /obj/item/airlock_electronics, /obj/machinery/light_switch/south, @@ -63965,7 +64004,6 @@ /turf/simulated/floor/wood/parquet, /area/station/service/library) "iWz" = ( -/obj/machinery/light/directional/east, /obj/structure/sign/fire{ pixel_x = 32 }, @@ -64025,6 +64063,11 @@ }, /turf/simulated/floor/plating, /area/station/command/office/hos) +"iXl" = ( +/obj/structure/bookcase, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/carpet, +/area/station/service/library) "iXn" = ( /obj/structure/flora/ausbushes/palebush, /mob/living/simple_animal/cock/Clucky, @@ -64205,15 +64248,12 @@ }, /area/station/science/genetics) "jaJ" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/chair/office{ - dir = 1 +/obj/structure/bookcase{ + name = "Forbidden Knowledge" }, -/obj/machinery/light/directional/west, -/turf/simulated/floor/carpet/black, -/area/station/legal/courtroom) +/obj/machinery/light/directional/north, +/turf/simulated/floor/plasteel/grimy, +/area/station/service/library) "jaO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -64365,6 +64405,7 @@ /area/station/public/locker) "jeu" = ( /obj/machinery/firealarm/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -64520,7 +64561,6 @@ /obj/structure/closet/secure_closet/miner, /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "purple" @@ -64623,8 +64663,8 @@ /turf/simulated/floor/plasteel/freezer, /area/station/public/pool) "jhp" = ( -/obj/machinery/light/directional/south, /obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -64762,7 +64802,6 @@ dir = 8 }, /obj/item/radio/intercom/directional/east, -/obj/machinery/light/directional/south, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) "jiN" = ( @@ -64890,7 +64929,6 @@ "jjN" = ( /obj/machinery/recharge_station, /obj/machinery/ai_status_display/south, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, @@ -65265,7 +65303,6 @@ }, /area/station/security/storage) "jqb" = ( -/obj/machinery/light/directional/north, /obj/machinery/computer/scan_consolenew, /obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ @@ -65416,7 +65453,6 @@ pixel_y = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "brown" @@ -65552,6 +65588,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" @@ -65653,10 +65690,16 @@ /obj/machinery/light_switch/north{ pixel_x = -6 }, -/obj/machinery/button/windowtint/north{ - id = "qmroom"; - req_one_access_txt = "19"; - pixel_x = 6 +/obj/structure/table/wood, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/item/paper{ + pixel_y = 2 + }, +/obj/item/pen{ + pixel_y = 4; + pixel_x = -2 }, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) @@ -65843,7 +65886,6 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "jyT" = ( @@ -66118,6 +66160,7 @@ /area/station/service/bar/atrium) "jEo" = ( /obj/structure/chair/office, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -66658,6 +66701,7 @@ "jNg" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/closet/secure_closet/personal, +/obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -66947,6 +66991,7 @@ "jRP" = ( /obj/structure/flora/grass/brown, /obj/machinery/status_display/directional/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/grass/no_creep, /area/station/public/pool) "jRY" = ( @@ -66993,12 +67038,10 @@ /area/station/security/permabrig) "jSy" = ( /obj/structure/table, -/obj/item/flashlight/lamp{ - pixel_x = 6; +/obj/item/storage/fancy/donut_box{ pixel_y = 2 }, -/obj/item/storage/fancy/donut_box, -/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -67164,6 +67207,7 @@ /area/station/maintenance/starboard2) "jUH" = ( /obj/machinery/economy/vending/medical, +/obj/machinery/light/nightshifted/east, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -67251,6 +67295,7 @@ pixel_y = 6 }, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -67463,6 +67508,11 @@ /area/station/maintenance/fore) "kaM" = ( /obj/structure/sign/poster/official/random/west, +/obj/machinery/camera{ + c_tag = "Theatre West"; + dir = 4; + pixel_y = -22 + }, /turf/simulated/floor/wood/oak, /area/station/service/theatre) "kaN" = ( @@ -67486,7 +67536,6 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "kaP" = ( -/obj/machinery/light/directional/south, /obj/structure/table/wood, /obj/machinery/newscaster/directional/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -68036,14 +68085,12 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "kiB" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/table/reinforced, -/obj/item/tank/jetpack/carbondioxide, -/obj/machinery/light/directional/north, -/obj/item/gps/engineering, -/turf/simulated/floor/plasteel, -/area/station/engineering/hardsuitstorage) +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/station/science/research) "kiP" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, @@ -68410,6 +68457,7 @@ /area/station/command/bridge) "koI" = ( /obj/item/radio/intercom/directional/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/carpet/royalblack, /area/station/legal/courtroom) "kpp" = ( @@ -68790,7 +68838,6 @@ }, /area/station/public/sleep) "kwv" = ( -/obj/machinery/light/directional/west, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; @@ -69423,6 +69470,7 @@ pixel_y = 5 }, /obj/machinery/alarm/directional/west, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -69530,11 +69578,18 @@ /area/station/public/locker) "kHz" = ( /obj/machinery/door/poddoor/shutters{ - dir = 2; + dir = 1; id_tag = "janitorshutters"; name = "Janitor Shutters" }, /obj/machinery/door/firedoor, +/obj/machinery/door_control/shutter/north{ + id = "janitorshutters"; + name = "Janitor Shutters Control"; + req_access_txt = "26"; + pixel_y = 0; + pixel_x = 24 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" @@ -69777,6 +69832,7 @@ /area/station/engineering/atmos/control) "kMY" = ( /obj/machinery/photocopier, +/obj/machinery/light/directional/north, /turf/simulated/floor/wood/parquet, /area/station/service/library) "kNe" = ( @@ -69959,6 +70015,11 @@ /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, +/obj/machinery/camera{ + c_tag = "Engineering Storage"; + dir = 8; + network = list("Engineering","SS13") + }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "kPd" = ( @@ -70078,6 +70139,7 @@ c_tag = "Medbay Genetics"; network = list("Medbay","SS13") }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -70346,7 +70408,6 @@ "kWa" = ( /obj/structure/table, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light/directional/north, /obj/item/storage/toolbox/emergency{ pixel_y = 2 }, @@ -70459,6 +70520,7 @@ pixel_y = 4; pixel_x = 16 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteyellowfull" }, @@ -70576,14 +70638,10 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "laQ" = ( -/obj/machinery/camera{ - c_tag = "Engineering Storage"; - dir = 8; - network = list("Engineering","SS13") - }, /obj/structure/closet/secure_closet/engineering_electrical, /obj/effect/turf_decal/delivery, /obj/item/radio/intercom/directional/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "laV" = ( @@ -71013,7 +71071,6 @@ /obj/structure/chair{ dir = 4 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -71060,7 +71117,6 @@ /turf/simulated/floor/engine, /area/station/science/test_chamber) "liC" = ( -/obj/machinery/light/directional/south, /obj/machinery/economy/vending/snack, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ @@ -72265,7 +72321,6 @@ /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random/south, -/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "brown" @@ -72311,6 +72366,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel/white, /area/station/science/explab) "lCh" = ( @@ -72431,10 +72487,7 @@ }, /obj/effect/landmark/start/security_officer, /obj/item/radio/intercom/directional/west, -/obj/machinery/camera{ - c_tag = "Brig Briefing Room"; - dir = 4 - }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -72542,7 +72595,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, /area/station/supply/storage) "lGu" = ( /obj/effect/turf_decal/delivery, @@ -72566,7 +72622,6 @@ }, /area/station/medical/paramedic) "lHb" = ( -/obj/machinery/light/directional/south, /obj/machinery/button/windowtint/south{ id = "holdingcellprivacy"; name = "Temporary Holding Cell Window Tint Control"; @@ -72628,7 +72683,6 @@ pixel_y = 8 }, /obj/structure/table/reinforced, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel, /area/station/medical/virology/lab) "lHI" = ( @@ -72754,6 +72808,14 @@ icon_state = "neutral" }, /area/station/security/permabrig) +"lIZ" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/simulated/floor/wood/oak, +/area/station/command/meeting_room) "lJd" = ( /obj/structure/rack, /obj/effect/turf_decal/delivery/red/hollow, @@ -73105,12 +73167,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -73256,11 +73314,8 @@ "lQa" = ( /obj/machinery/sleeper, /obj/effect/turf_decal/delivery/blue/hollow, -/obj/machinery/camera{ - c_tag = "Medbay Treatment North"; - network = list("Medbay","SS13") - }, /obj/item/radio/intercom/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73290,7 +73345,6 @@ /obj/item/storage/box/cups{ pixel_y = 2 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -74095,8 +74149,8 @@ /area/station/maintenance/electrical) "mgx" = ( /obj/machinery/suit_storage_unit/cmo/sec_storage/secure, -/obj/machinery/light/directional/south, /obj/structure/sign/poster/official/random/south, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -74214,6 +74268,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -74286,7 +74341,6 @@ /obj/item/clothing/accessory/stethoscope{ pixel_y = 9 }, -/obj/machinery/light/directional/east, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard_medi"; name = "Quarantine Lockdown" @@ -74344,18 +74398,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" = ( @@ -74937,7 +74984,6 @@ /obj/machinery/reagentgrinder{ pixel_y = 9 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "mux" = ( @@ -74991,11 +75037,13 @@ "mvh" = ( /obj/structure/table, /obj/item/stack/packageWrap{ - pixel_y = -2 + pixel_y = 8 }, -/obj/item/hand_labeler, -/obj/item/destTagger{ - pixel_x = -4 +/obj/item/hand_labeler{ + pixel_x = 2 + }, +/obj/machinery/camera{ + c_tag = "Cargo Office" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -75894,6 +75942,7 @@ /obj/effect/turf_decal/siding/white{ dir = 10 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -75997,6 +76046,14 @@ }, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/starboard2) +"mQS" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/nightshifted/north, +/turf/simulated/floor/wood/oak, +/area/station/medical/psych) "mQT" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -76207,7 +76264,6 @@ }, /area/station/maintenance/fsmaint) "mSQ" = ( -/obj/machinery/light/directional/north, /obj/machinery/alarm/directional/north, /turf/simulated/floor/engine, /area/station/science/explab/chamber) @@ -76330,7 +76386,6 @@ /area/station/medical/reception) "mUr" = ( /obj/structure/table/wood, -/obj/machinery/light/directional/west, /obj/item/book/random, /obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/simulated/floor/carpet, @@ -76448,7 +76503,9 @@ /area/station/service/expedition) "mWa" = ( /obj/structure/table/wood, -/obj/item/flashlight/lamp, +/obj/item/flashlight/lamp{ + pixel_y = 2 + }, /turf/simulated/floor/wood/parquet/tile, /area/station/service/library) "mWM" = ( @@ -76544,7 +76601,7 @@ dir = 8 }, /mob/living/simple_animal/hostile/retaliate/goat/chef, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -77225,6 +77282,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" @@ -77243,9 +77303,7 @@ /turf/simulated/floor/carpet, /area/station/service/library) "njn" = ( -/obj/machinery/light/small{ - dir = 8 - }, +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 4 }, @@ -77457,7 +77515,6 @@ "nmA" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder, -/obj/machinery/light/directional/north, /turf/simulated/floor/engine, /area/station/science/misc_lab) "nmK" = ( @@ -77594,15 +77651,10 @@ /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 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/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, @@ -77855,7 +77907,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/service/glass, +/obj/machinery/door/airlock/service, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/any/service/janitor, @@ -78251,7 +78303,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -78453,15 +78505,14 @@ }, /area/station/maintenance/medmaint) "nBr" = ( -/obj/machinery/conveyor/south{ - id = "QMLoad" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 }, -/obj/machinery/light/directional/east, -/turf/simulated/floor/plating, -/area/station/supply/storage) +/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, @@ -78837,7 +78888,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/structure/closet/secure_closet/personal, /obj/effect/decal/cleanable/dirt, -/obj/machinery/alarm/directional/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" @@ -78922,6 +78973,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/light/directional/east, /turf/simulated/floor/wood/fancy/cherry, /area/station/legal/lawoffice) "nHh" = ( @@ -79560,7 +79612,6 @@ dir = 5 }, /obj/structure/dispenser/oxygen, -/obj/machinery/light/directional/east, /obj/machinery/status_display/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) @@ -79652,12 +79703,20 @@ /turf/simulated/floor/carpet, /area/station/security/detective) "nPZ" = ( -/obj/item/radio/intercom/directional/west, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/area/station/hallway/primary/central/west) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/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, @@ -80490,7 +80549,6 @@ /turf/space, /area/station/maintenance/starboardsolar) "odQ" = ( -/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -81515,8 +81573,10 @@ dir = 4 }, /obj/structure/sign/poster/official/random/north, -/obj/machinery/light/directional/east, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "brown" + }, /area/station/supply/storage) "otB" = ( /obj/effect/landmark/start/prisoner, @@ -81550,7 +81610,6 @@ /obj/machinery/economy/merch{ dir = 1 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -81704,7 +81763,6 @@ /obj/item/hand_labeler{ pixel_y = 2 }, -/obj/machinery/light/directional/east, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -82060,7 +82118,7 @@ }, /area/station/engineering/hardsuitstorage) "oEK" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredcorners" @@ -82106,7 +82164,6 @@ "oFv" = ( /obj/machinery/computer/arcade, /obj/machinery/newscaster/directional/east, -/obj/machinery/light/directional/east, /turf/simulated/floor/carpet, /area/station/service/bar/atrium) "oFF" = ( @@ -82293,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{ @@ -82365,7 +82429,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) @@ -82511,6 +82574,7 @@ /obj/effect/turf_decal/delivery/hollow, /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -83316,7 +83380,6 @@ "pam" = ( /obj/machinery/firealarm/directional/south, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "brown" @@ -83492,7 +83555,6 @@ /area/station/medical/sleeper) "pey" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -83648,7 +83710,7 @@ "pgH" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm/directional/south, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /obj/item/book/manual/wiki/security_space_law, /turf/simulated/floor/plasteel{ dir = 6; @@ -84437,7 +84499,6 @@ /area/station/security/checkpoint/south) "prD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -84561,7 +84622,6 @@ /obj/item/hand_labeler{ pixel_y = 6 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -84599,6 +84659,7 @@ "psD" = ( /obj/machinery/computer/HolodeckControl, /obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/public/fitness) "psF" = ( @@ -85981,7 +86042,10 @@ "pPW" = ( /obj/structure/table/reinforced, /obj/machinery/defibrillator_mount/loaded, -/obj/machinery/light/directional/north, +/obj/machinery/camera{ + c_tag = "Medbay Treatment North"; + network = list("Medbay","SS13") + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -86500,6 +86564,7 @@ name = "Hydroponics Requests Console"; pixel_y = 30 }, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) "pZs" = ( @@ -87055,6 +87120,7 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -87113,7 +87179,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/carpet, /area/station/service/library) "qjP" = ( @@ -87283,7 +87348,6 @@ "qnq" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "purple" @@ -87554,12 +87618,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -87966,7 +88026,6 @@ }, /area/station/hallway/primary/central/se) "qyr" = ( -/obj/machinery/light/directional/north, /obj/structure/table/glass, /obj/item/storage/box/beakers{ pixel_y = 4; @@ -88143,6 +88202,10 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general{ dir = 8 }, +/obj/machinery/camera{ + c_tag = "Brig Secure Armory East"; + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) "qCc" = ( @@ -88600,8 +88663,12 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "qHO" = ( -/obj/structure/bed, -/obj/item/bedsheet/hop, +/obj/structure/bed{ + dir = 1 + }, +/obj/item/bedsheet/hop{ + dir = 1 + }, /obj/machinery/newscaster/security_unit/west, /turf/simulated/floor/carpet, /area/station/command/office/hop) @@ -89607,7 +89674,6 @@ }, /area/station/security/storage) "qWr" = ( -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue" @@ -89648,10 +89714,9 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "qWV" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/structure/sign/poster/official/random/west, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -90078,7 +90143,7 @@ "rds" = ( /obj/structure/closet/firecloset, /obj/machinery/light/small/directional/north, -/turf/simulated/floor/plating, +/turf/simulated/floor/catwalk, /area/station/maintenance/dormitory_maintenance) "rdB" = ( /obj/structure/table/glass, @@ -90280,6 +90345,11 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) +"rfY" = ( +/obj/structure/bookcase/manuals/research_and_development, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/carpet, +/area/station/service/library) "rgg" = ( /obj/machinery/fishtank/wall, /turf/simulated/wall, @@ -90318,7 +90388,6 @@ }, /area/station/security/storage) "rgo" = ( -/obj/machinery/light/directional/east, /obj/structure/chair/comfy/brown{ dir = 8 }, @@ -90867,7 +90936,7 @@ }, /area/station/security/permabrig) "rrJ" = ( -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -91214,7 +91283,6 @@ "rwh" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm/directional/north, -/obj/machinery/light/directional/north, /obj/machinery/recharger, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -91761,9 +91829,7 @@ /area/station/maintenance/fore) "rFE" = ( /obj/structure/closet/secure_closet/brig, -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonlockers) "rFT" = ( @@ -91862,6 +91928,7 @@ }, /obj/machinery/economy/vending/wallmed/directional/north, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -92622,6 +92689,7 @@ /obj/machinery/door_control/bolt_control/north{ id = "pub_room" }, +/obj/machinery/light/directional/north, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) "rVa" = ( @@ -93121,6 +93189,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery/red/hollow, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/security/execution) "scH" = ( @@ -93131,7 +93200,6 @@ /obj/machinery/gateway{ dir = 4 }, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -94387,11 +94455,6 @@ /obj/item/reagent_containers/spray/cleaner, /obj/item/reagent_containers/spray/cleaner, /obj/item/key/janitor, -/obj/machinery/door_control/shutter/north{ - id = "janitorshutters"; - name = "Janitor Shutters Control"; - req_access_txt = "26" - }, /obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 5; @@ -94492,12 +94555,12 @@ /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{ + 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, @@ -94582,7 +94645,7 @@ "sAo" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "showroomfloor" + icon_state = "redfull" }, /area/station/service/kitchen) "sAs" = ( @@ -95014,9 +95077,11 @@ }, /area/station/command/office/rd) "sFo" = ( -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel/dark, -/area/station/public/fitness) +/obj/machinery/atmospherics/portable/canister/oxygen, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/light/small/directional/north, +/turf/simulated/floor/plasteel, +/area/station/engineering/atmos/control) "sFp" = ( /obj/structure/table, /obj/item/flashlight/lamp{ @@ -95196,11 +95261,8 @@ /turf/simulated/wall, /area/station/maintenance/old_kitchen) "sIA" = ( -/obj/structure/railing, -/obj/structure/chair/office, -/obj/machinery/light/directional/west, -/turf/simulated/floor/carpet/black, -/area/station/legal/courtroom) +/turf/simulated/floor/catwalk, +/area/station/maintenance/dormitory_maintenance) "sIQ" = ( /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ @@ -95916,7 +95978,6 @@ pixel_y = 3 }, /obj/machinery/firealarm/directional/north, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" @@ -96104,7 +96165,7 @@ /obj/item/storage/lockbox/spy_kit, /obj/item/storage/box/bodybags, /obj/item/flash, -/obj/machinery/light/directional/east, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/security/detective) "sYV" = ( @@ -96568,12 +96629,11 @@ }, /area/station/service/barber) "tgn" = ( -/obj/machinery/light/directional/east, -/turf/simulated/floor/beach/away/water/deep/dense{ - density = 0; - water_overlay_image = null +/obj/machinery/light/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "hydrofloor" }, -/area/station/hallway/secondary/exit) +/area/station/public/toilet) "tgq" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -97474,12 +97534,12 @@ /area/station/medical/virology/lab) "ttX" = ( /obj/structure/table/wood, -/obj/item/ashtray/bronze, /obj/item/clothing/mask/cigarette/cigar, /obj/item/lighter/zippo/engraved{ pixel_x = 8; pixel_y = 9 }, +/obj/item/ashtray/bronze, /turf/simulated/floor/carpet/orange, /area/station/supply/qm) "tuq" = ( @@ -97947,6 +98007,7 @@ pixel_y = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -98114,7 +98175,7 @@ }, /area/station/service/expedition) "tFP" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredcorners" @@ -98254,7 +98315,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/light/directional/west, /obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/public/locker) @@ -98485,7 +98545,9 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/machinery/newscaster/directional/north, +/obj/item/radio/intercom/locked/confessional{ + pixel_y = 22 + }, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) "tNT" = ( @@ -98681,6 +98743,7 @@ /obj/effect/turf_decal/siding/white{ dir = 9 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/public/pool) "tQK" = ( @@ -98739,11 +98802,11 @@ dir = 1 }, /obj/machinery/disposal, -/obj/machinery/light/directional/south, /obj/effect/turf_decal/delivery/hollow, /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/wood, /area/station/command/office/hos) "tSn" = ( @@ -98864,7 +98927,7 @@ pixel_x = 5; pixel_y = 5 }, -/obj/machinery/light_switch/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel/white, /area/station/science/explab) "tUU" = ( @@ -99700,6 +99763,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/item/food/snacks/pie{ + pixel_y = 16 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -99725,7 +99791,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; @@ -99822,7 +99887,7 @@ /obj/structure/rack, /obj/effect/turf_decal/delivery/red/hollow, /obj/machinery/alarm/directional/south, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkred" }, @@ -99895,7 +99960,7 @@ /area/station/science/research) "ukb" = ( /obj/structure/closet/emcloset, -/turf/simulated/floor/plating, +/turf/simulated/floor/catwalk, /area/station/maintenance/dormitory_maintenance) "ukk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -100500,6 +100565,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "uuE" = ( @@ -100535,7 +100601,7 @@ id = "toilet1" }, /obj/structure/sign/poster/official/random/north, -/obj/machinery/light/small/directional/west, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel, /area/station/service/theatre) "uvM" = ( @@ -101160,9 +101226,6 @@ /area/station/maintenance/fsmaint) "uIk" = ( /obj/machinery/alarm/directional/east, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -101796,6 +101859,7 @@ /area/station/command/teleporter) "uQx" = ( /obj/structure/beebox/unwrenched, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "uQB" = ( @@ -101907,7 +101971,6 @@ /area/station/legal/magistrate) "uRt" = ( /obj/machinery/status_display/directional/east, -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -101962,7 +102025,6 @@ pixel_x = -3; pixel_y = -3 }, -/obj/machinery/light/directional/east, /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general{ dir = 8 }, @@ -102380,9 +102442,20 @@ }, /area/station/security/processing) "uXv" = ( -/obj/machinery/firealarm/directional/east, -/turf/simulated/floor/wood/oak, -/area/station/service/bar/atrium) +/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, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/primary/fore) "uXC" = ( /obj/structure/table/wood, /obj/item/folder/blue{ @@ -102540,7 +102613,6 @@ /obj/machinery/door/window/classic/normal{ name = "Cryo Tank Storage" }, -/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" @@ -102619,7 +102691,9 @@ /area/station/science/toxins/mixing) "vbB" = ( /obj/structure/table/reinforced, -/obj/item/flashlight/lamp, +/obj/item/flashlight/lamp{ + pixel_y = 4 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" @@ -103337,7 +103411,7 @@ /obj/structure/closet/radiation, /obj/machinery/camera{ c_tag = "Medbay Suit Storage"; - dir = 1 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -103552,7 +103626,7 @@ /area/station/service/theatre) "vrM" = ( /obj/machinery/suit_storage_unit/security/secure, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkred" @@ -103729,7 +103803,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -104152,7 +104225,6 @@ /area/station/command/office/cmo) "vDT" = ( /obj/machinery/atmospherics/portable/canister/nitrogen, -/obj/machinery/light/directional/north, /obj/effect/turf_decal/delivery/hollow, /obj/structure/sign/poster/contraband/atmosia_independence{ pixel_y = 32 @@ -104653,7 +104725,6 @@ /turf/simulated/floor/engine, /area/station/engineering/controlroom) "vLh" = ( -/obj/machinery/newscaster/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -104834,7 +104905,7 @@ dir = 4 }, /obj/machinery/clonepod/biomass, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -104970,6 +105041,7 @@ /obj/structure/chair/sofa/corp/left{ dir = 8 }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/carpet/purple, /area/station/hallway/secondary/exit) "vQw" = ( @@ -105644,10 +105716,14 @@ /area/station/hallway/primary/fore) "wah" = ( /obj/item/radio/intercom/directional/south, -/obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/camera{ + c_tag = "Chief Medical Officer's Quarters"; + dir = 1; + network = list("Medical","SS13") + }, /turf/simulated/floor/carpet/cyan, /area/station/command/office/cmo) "wax" = ( @@ -106345,7 +106421,6 @@ }, /area/station/medical/virology/lab) "wny" = ( -/obj/machinery/light/directional/south, /obj/machinery/door_control/shutter/south{ id = "kitchenhall"; name = "Kitchen Hallway Shutters Control"; @@ -106714,6 +106789,7 @@ /obj/effect/turf_decal/siding/wood/end{ dir = 1 }, +/obj/machinery/light/small/directional/north, /turf/simulated/floor/wood/oak, /area/station/command/office/blueshield) "wuT" = ( @@ -106731,7 +106807,7 @@ /area/station/security/main) "wuX" = ( /obj/item/flag/sec, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/south, /turf/simulated/floor/plasteel/dark, /area/station/security/range) "wvh" = ( @@ -106911,7 +106987,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/ai_transit_tube) "wxg" = ( -/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/delivery/hollow, /obj/machinery/computer/security/engineering, /turf/simulated/floor/plasteel{ @@ -107148,6 +107223,7 @@ "wCj" = ( /obj/structure/table, /obj/machinery/recharger, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -107442,6 +107518,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/machinery/light/directional/west, /turf/simulated/floor/wood/fancy/oak, /area/station/legal/courtroom) "wHt" = ( @@ -107525,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 @@ -107628,6 +107710,7 @@ /obj/item/reagent_containers/glass/bucket{ pixel_x = 6 }, +/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "wKy" = ( @@ -107925,6 +108008,7 @@ "wRc" = ( /obj/machinery/chem_heater, /obj/item/radio/intercom/directional/east, +/obj/machinery/light/directional/east, /turf/simulated/floor/engine, /area/station/science/misc_lab) "wRk" = ( @@ -108472,7 +108556,6 @@ /turf/simulated/floor/wood, /area/station/command/office/hos) "wXE" = ( -/obj/machinery/light/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "green" @@ -108720,7 +108803,10 @@ }, /area/station/medical/virology) "xbU" = ( -/obj/structure/dresser, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green/off{ + pixel_y = 9 + }, /turf/simulated/floor/carpet, /area/station/command/office/hop) "xbW" = ( @@ -108997,7 +109083,6 @@ /area/station/security/permabrig) "xha" = ( /obj/structure/sign/poster/official/random/south, -/obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -109078,8 +109163,8 @@ /obj/effect/landmark/spawner/rev, /obj/machinery/light/small/directional/south, /obj/item/reagent_containers/drinks/coffee{ - pixel_y = 6; - pixel_x = 8; + pixel_y = 8; + pixel_x = 10; volume = 0 }, /turf/simulated/floor/plasteel{ @@ -110138,6 +110223,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" = ( @@ -110337,13 +110423,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -110932,7 +111016,6 @@ /area/station/science/toxins/launch) "xKE" = ( /obj/structure/closet/secure_closet/psychiatrist, -/obj/machinery/light/nightshifted/east, /turf/simulated/floor/carpet, /area/station/medical/psych) "xKL" = ( @@ -110972,6 +111055,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" }, @@ -111084,6 +111168,7 @@ icon_state = "0-2" }, /mob/living/simple_animal/mouse/rat, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) "xNC" = ( @@ -111297,7 +111382,7 @@ /obj/machinery/camera{ c_tag = "Departure Lounge Security Checkpoint West" }, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -112133,7 +112218,6 @@ "ydA" = ( /obj/structure/table/wood, /obj/item/storage/briefcase, -/obj/machinery/light/nightshifted/west, /obj/effect/turf_decal/siding/wood{ dir = 10 }, @@ -112147,6 +112231,7 @@ "yeb" = ( /obj/structure/dispenser/oxygen, /obj/effect/turf_decal/delivery/blue, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -112193,7 +112278,6 @@ /area/station/engineering/atmos) "yff" = ( /obj/item/kirbyplants, -/obj/machinery/light/directional/east, /obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plasteel{ dir = 5; @@ -112214,7 +112298,7 @@ }, /area/station/security/processing) "yfx" = ( -/obj/machinery/light/directional/west, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel{ icon_state = "darkredcorners" }, @@ -112417,6 +112501,7 @@ name = "Head of Security Requests Console"; pixel_x = 30 }, +/obj/machinery/light/directional/east, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) "yil" = ( @@ -134028,7 +134113,7 @@ bGz bIv bKh bUl -bOe +bUl bUl bRZ bUl @@ -135521,7 +135606,7 @@ pJf uoQ dFi auG -avC +avI fCZ axM ayM @@ -136090,7 +136175,7 @@ bWK bWK bYo bQr -bhL +bZx cbp mMt gTA @@ -136374,13 +136459,13 @@ dhG dhG cKg dmq -cNj +cNi cOI cKo cKo cKo cKo -cWy +cIM dmq cZm oTP @@ -137063,7 +137148,7 @@ pJf rwj dFi auG -dWj +che hZW axN ayM @@ -137112,7 +137197,7 @@ bGH bKr duC acn -bQs +byl bOn bQt lwE @@ -137368,8 +137453,8 @@ gsw iud cSk byl -bQs -bQs +byl +byl wCj bIA pAv @@ -137408,7 +137493,7 @@ cRQ cTs cUV cWC -slV +aRK dmq cZn sOx @@ -137626,7 +137711,7 @@ bGK bID byl taB -bQt +bgw jkP bSm xtv @@ -137868,7 +137953,7 @@ bja bkP bmM wkD -krP +sFo qDj krP lzl @@ -138931,7 +139016,7 @@ cpB cnb cuT nNM -kiB +vLS cwz udo oEJ @@ -140716,7 +140801,7 @@ bty oAE bWH bYk -bZJ +gWf cbF cdx cfq @@ -141270,7 +141355,7 @@ cIM cKr hYv cPn -cPn +dkV jji ujU hnH @@ -141281,7 +141366,7 @@ cRd cZt hHk kuI -sFK +bSM dkI hMD jeJ @@ -141463,7 +141548,7 @@ mEz dtp jDE qXy -vDX +ctV baF aDG pac @@ -141709,7 +141794,7 @@ aOx mTQ aor baF -dcO +aMW xwU nLp aYQ @@ -141789,7 +141874,7 @@ dsu cSt lUm iWz -cSt +dmf cSt cSt cZt @@ -142754,7 +142839,7 @@ bkT bkT tIf bkU -dSC +gnl baF aor vtw @@ -142983,7 +143068,7 @@ rwU rwU uTf rwU -gXb +rwU aPW oFY aOx @@ -143027,7 +143112,7 @@ bOA bIV bTZ oAE -bWH +bWG bYj bYj cbM @@ -143044,7 +143129,7 @@ ctM gmF ctM cvo -cwM +akW bYj jhj wLR @@ -143286,7 +143371,7 @@ keS dqy bWJ bYj -ebC +jaJ jJV qjM cfy @@ -143501,9 +143586,9 @@ wYw dBq dBq kaM -gWl -eGT qzy +eGT +gWl dRR mwK hpS @@ -143581,7 +143666,7 @@ odU ddi dau xgf -cMm +cWy dFm kOs kOs @@ -143782,7 +143867,7 @@ bxx bmU byw buR -dSC +gnl baF nFi azb @@ -144065,14 +144150,14 @@ nrS qPJ cnl kXs +oJk oUB -szi wYJ dSX wXP -fzJ +rfY fdG -cwM +iXl bYj fuJ olO @@ -144565,7 +144650,7 @@ eDP eDP bDR bDR -bOD +wdz liZ xTh pzY @@ -144579,10 +144664,10 @@ oUR xVw oUR oUR -nPZ +oUR coE bwm -bwm +cnp bwm bwm muZ @@ -144649,7 +144734,7 @@ dOW mNz dMj dOr -dRv +ikZ dJx dKm dIx @@ -145626,7 +145711,7 @@ bIG cIW cKw cMd -cND +dcO cPn cRd cSm @@ -145864,7 +145949,7 @@ bSE bSE ihT xYa -cnp +chi bSE kKU cvE @@ -146143,7 +146228,7 @@ ogM xme sjV cMm -cPn +kiB cKI cUZ cWz @@ -146598,7 +146683,7 @@ gRS gpy nBa bcv -nBa +gRS gRS gRS gRS @@ -146616,7 +146701,7 @@ bwf sHI gSh byU -bFy +bOe bHk bJc bKK @@ -146669,9 +146754,9 @@ cRg dfo dfo dfp -dfo +dfp nnL -dfo +dfp dfp dfo dqp @@ -146879,7 +146964,7 @@ kaN bKH bMQ bOF -bKN +lIZ ciB tpv bWT @@ -146926,7 +147011,7 @@ ddC dfo dim doU -dmf +doT aeh doT doU @@ -147182,8 +147267,8 @@ dca ddj dfo din -doV -dnx +bhL +dSC eeP dnx doV @@ -147411,7 +147496,7 @@ bSE lqv cvE csK -cvz +cEs cEr cEr cBk @@ -147899,7 +147984,7 @@ eXC mrg bwf aos -gSh +bZJ byU bFD bHk @@ -147982,7 +148067,7 @@ cWH wlS ppn wFd -fjW +puG cBB jrY tLw @@ -148372,7 +148457,7 @@ asY awh uSu gaQ -aoA +bfp aES aCP aAD @@ -148496,7 +148581,7 @@ dST oRA jfO oGz -tgn +puG cqg dNP wHt @@ -148654,11 +148739,11 @@ rWV aZc baT mkW -bdO +gRS gRS lsG gRS -uXv +gRS blk sKr xfy @@ -148883,7 +148968,7 @@ aqV arO aqV auH -apk +wIK avc lmo axh @@ -148911,11 +148996,11 @@ fBv nUC yed yed -yed +sKr kDv -yed +sKr kDv -yed +sKr yed bna xfy @@ -148932,11 +149017,11 @@ bEe bFG bHq bOT -bMX +aKu bMX fBC bMX -bMX +cNj bOT aaa bOZ @@ -149146,31 +149231,31 @@ dKB ayx byN bhO +aWq bhO bhO -bhO -bhO +bsi nME phe -aWq bhO -bsi +bhO +bhO aKt qul tYC -bhO +aWq bhO qWV dEH bhO -bhO +aWq bhO aZd baU -bfp -aWq +bsi bhO bhO +aWq bhO bhO jmX @@ -149403,31 +149488,31 @@ awm eQL bMa vMg -vMg +joe vMg vMg uFI guk vMg -joe +uXv +qvT qvT qvT -aKu nsL oir -ima +bdO ima xCn aTj beb -kNg +bOD ima kdH kNg -bgw +kNg qsm cUT -kNg +bOD jja kNg kNg @@ -149458,7 +149543,7 @@ cag ccb cdN cfK -ckt +bYv ciL ckv fas @@ -149660,9 +149745,9 @@ lxo ayy aBU aEF +bQs aEF aEF -aRK cyT aEF aFC @@ -149672,19 +149757,19 @@ aEF aEF aRH aJc +bQs aEF -aEF -non +bgx aoZ rCA -aEF +bQs aEF aEF wgV -bgx -aSe +aEF bhY bhY +aSe myf bhY foX @@ -149911,7 +149996,7 @@ asE arO asE atF -apj +non avg kIL axk @@ -149960,11 +150045,11 @@ bEi bFK bHu bOT -bMX +aKu bMX oWg bMX -bMX +cNj bOT aaa bQI @@ -150221,7 +150306,7 @@ mak bMX bOR bMY -bSM +bMY bOT aaa bQI @@ -150428,7 +150513,7 @@ asZ axi ayy hSK -aow +szi aHT tsl mRc @@ -150959,7 +151044,7 @@ aLZ wPI xeO aQh -aEP +ayA mvh aUU aNv @@ -150983,7 +151068,7 @@ lUd mrg bwf bAC -gSh +bZJ byU bFy bWX @@ -151460,7 +151545,7 @@ auu aHT vwA aAN -bYI +aHT aHT aBK aHT @@ -151737,8 +151822,8 @@ aNv dUy aNv bba -aJd -bcB +aGK +gXb bfu bcC bgE @@ -151818,7 +151903,7 @@ pnN nNu fpj dmi -jyv +mmK gBg bRb jyv @@ -152013,7 +152098,7 @@ bwf mbO emU bEm -bFy +bFQ bWX bJm lLM @@ -152035,7 +152120,7 @@ pJb cnA cht cqj -cvG +hBk csV cuX cCX @@ -152270,7 +152355,7 @@ bwf ipZ fNL byU -bFQ +bOe bWX bJn bJf @@ -152332,7 +152417,7 @@ sSr vzf oXd dmi -mmK +jyv gBg bRb jyv @@ -152738,7 +152823,7 @@ asd arV auw atM -auw +dWj auw jyP ayD @@ -152767,7 +152852,7 @@ bbe bbe bbe bbe -bbi +bbe bbi dWC bbi @@ -153023,7 +153108,7 @@ aVg aZn bbf bcD -bbi +bbe dZT bgK ikX @@ -153332,7 +153417,7 @@ tFt mVV cFa gfZ -bWM +cHL eAS cKX cMt @@ -153608,7 +153693,7 @@ cXj rlK dfy dfy -dgK +dfy dfy dfy duk @@ -153768,7 +153853,7 @@ nOu ppN jTe ppN -are +fjW ayD oYl aCJ @@ -153864,8 +153949,8 @@ cUe gzd tZu ioI -hap dpB +hap dpB ioK tAa @@ -154051,7 +154136,7 @@ uuY jNg nFK bcH -bbi +bbe bfB bgS bie @@ -154387,7 +154472,7 @@ dmr dmr iPy dmr -nHS +dmr vYR cKV rQi @@ -154543,7 +154628,7 @@ cxp ayD otu lFJ -nBr +lFJ lFJ aDY aEQ @@ -154572,9 +154657,9 @@ bbe bbe bbe bbe -dMH -nDu -dMH +cGk +nPZ +cGk oWb oWb oWb @@ -154852,7 +154937,7 @@ tYa mrW bYH fRQ -sIA +hNV heL cMF qwR @@ -154860,7 +154945,7 @@ wHc qwR cMF cvu -jaJ +hBy fRQ bYH jtV @@ -155607,7 +155692,7 @@ bAI btL aaa eNt -bwA +bxP vXI bYM ene @@ -155621,7 +155706,7 @@ iqA dAg uzO bXc -fjd +bYH fMj hNV nBA @@ -155633,7 +155718,7 @@ kmy urH hBy cax -fjd +bYH lNj qRY uXe @@ -155643,7 +155728,7 @@ cAe iRd cjy aFx -eXM +mQS vJb jri fXb @@ -156378,7 +156463,7 @@ btL btL aaa eNt -bxP +bwA bWr bYM gkg @@ -156405,7 +156490,7 @@ aKw coL udz bYH -pmI +lNj cux rKT aFx @@ -156957,7 +157042,7 @@ dpB dpB gUx dpB -hap +dpB ioI cKO rQi @@ -157106,7 +157191,7 @@ aus auC bsD xJG -yeH +bYI inQ vmw ayH @@ -157682,7 +157767,7 @@ caF eKO chJ cfZ -ctV +chG hTV fhF cmm @@ -157947,7 +158032,7 @@ vzy etA nfU kGm -lNj +pmI qRY uXe iLJ @@ -157968,7 +158053,7 @@ wQQ rbM yff dtz -dtz +dRu toO dtz qvp @@ -158178,8 +158263,8 @@ xUm rfd obC vGA -iXz oUa +iXz bbl bLp dDN @@ -158985,7 +159070,7 @@ cyN jez aWn fxS -xVX +nBr ixf hhF hhF @@ -159502,7 +159587,7 @@ cIb cGP csi cuy -cuy +avC cuy csi reo @@ -161562,7 +161647,7 @@ rfK cAu cxn iQt -fxe +csh cxn cxn cxn @@ -161763,7 +161848,7 @@ ygI eJl rpF iiH -dia +rpF fkB rbf oav @@ -162063,10 +162148,10 @@ wpW cCc cCb cCb +dia cCb cCb -cCb -cCb +dia cCb cCb cOw @@ -162076,7 +162161,7 @@ edQ ipy cxn iQt -vsc +tgn cxn cxn cxn @@ -163089,7 +163174,7 @@ dPi csi cuN cze -sFo +cze csi cyZ tvI @@ -164617,7 +164702,7 @@ edc lEP off iVy -wuX +cvz cKZ hpo fSZ @@ -166405,7 +166490,7 @@ ito abV lhQ aWB -bjR +fAL lDS bjR iBF @@ -166431,7 +166516,7 @@ wpW fTX wpW wpW -pfg +upU eVf cHa cAv @@ -166685,7 +166770,7 @@ abj aaa wpW rds -dPi +sIA ukb wpW pXo @@ -166945,7 +167030,7 @@ jyT sME jyT wpW -upU +pfg eqM dPi pNk diff --git a/modular_ss220/aesthetics/lights/code/lights.dm b/modular_ss220/aesthetics/lights/code/lights.dm index 1bd039f424c0..1f664a45f2d7 100644 --- a/modular_ss220/aesthetics/lights/code/lights.dm +++ b/modular_ss220/aesthetics/lights/code/lights.dm @@ -1,6 +1,9 @@ /obj/machinery/light icon = 'modular_ss220/aesthetics/lights/icons/lights.dmi' layer = ABOVE_MOB_LAYER + brightness_power = 0.7 + nightshift_light_power = 0.5 + brightness_color = "#FFF7F2" /obj/machinery/light/small icon = 'icons/obj/lighting.dmi' @@ -19,3 +22,6 @@ /obj/item/mounted/frame/light_fixture/small icon = 'icons/obj/lighting.dmi' + +/obj/item/flashlight/lamp + on = FALSE diff --git a/modular_ss220/maps220/code/Areas/station.dm b/modular_ss220/maps220/code/Areas/station.dm index fbe70086c984..dc18886218e2 100644 --- a/modular_ss220/maps220/code/Areas/station.dm +++ b/modular_ss220/maps220/code/Areas/station.dm @@ -191,3 +191,7 @@ /area/syndicate_mothership/cargo name = "\improper Syndicate Cargo" icon_state = "syndie-cargo" + +/* Misc */ +/area/holodeck + dynamic_lighting = DYNAMIC_LIGHTING_FORCED