From b3d80a0d3a67f724a166eed91ddff3a9bf7bdcc8 Mon Sep 17 00:00:00 2001 From: Perohai <53275479+Perohai@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:10:50 +0300 Subject: [PATCH] BoxStation fixes (#782) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request Исправил проблемы на кибериаде. -Добавил энзим повару -Исправил апц в инженерном отделе -Исправил доступ хопа -Исправил доступ склада меда ## Why It's Good For The Game Баги - плохо. ## Changelog :cl: fix: Cyberiad map /:cl: --- _maps/map_files/Cyberiad/Cyberiad.dmm | 499 +++++++++++++++++++------- 1 file changed, 360 insertions(+), 139 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index 965965aa4e47d..2fca18a79f815 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -213,7 +213,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, -/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/storage_shared) "adh" = ( @@ -399,16 +398,8 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) "afX" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 8; - pixel_y = 5 - }, /obj/machinery/light/small/directional/north, +/obj/machinery/photobooth, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "agd" = ( @@ -761,7 +752,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/table/glass, /obj/effect/turf_decal/stripes/line, -/obj/item/storage/box/monkeycubes, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/iron, /area/station/science/xenobiology) "akm" = ( @@ -1106,7 +1097,7 @@ /turf/open/floor/plating, /area/station/maintenance/ghetto/port) "aoT" = ( -/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/science/xenobiology) "aoV" = ( @@ -1223,7 +1214,8 @@ /area/station/maintenance/starboard/aft) "aqp" = ( /obj/machinery/computer/prisoner/management{ - dir = 4 + dir = 4; + req_access = list("lawyer") }, /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -3678,12 +3670,15 @@ /turf/open/floor/iron, /area/station/engineering/atmos/project) "aXx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, -/obj/structure/cable, +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/iron, -/area/station/engineering/storage_shared) +/area/station/science/xenobiology) "aXE" = ( /obj/structure/table/wood, /obj/item/clothing/under/costume/maid, @@ -6273,6 +6268,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"bIq" = ( +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "bIw" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -6792,6 +6799,20 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/security/prison/ghetto) +"bPr" = ( +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8 + }, +/obj/machinery/processor/slime, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "bPs" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/airless, @@ -6940,6 +6961,9 @@ /area/station/hallway/secondary/exit/departure_lounge) "bQI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "bQQ" = ( @@ -7004,6 +7028,9 @@ /obj/item/radio/intercom/directional/south, /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red, +/obj/machinery/computer/warrant{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/brig/entrance) "bRL" = ( @@ -7830,7 +7857,6 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "ccQ" = ( -/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/storage_shared) "ccU" = ( @@ -10598,10 +10624,8 @@ /turf/open/floor/iron/freezer, /area/station/maintenance/disposal) "cMA" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 4 - }, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron/white, /area/station/science/xenobiology) "cMB" = ( /obj/structure/disposalpipe/sorting/mail/flip{ @@ -10727,6 +10751,7 @@ /area/station/maintenance/starboard/aft) "cNW" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/photobooth/security, /turf/open/floor/iron, /area/station/security/processing) "cOf" = ( @@ -11774,8 +11799,7 @@ desc = "A cold, hard place for your final rest."; name = "Morgue Slab" }, -/obj/item/autopsy_scanner, -/obj/item/storage/toolbox/mechanical, +/obj/item/surgery_tray/full/morgue, /turf/open/floor/iron/dark, /area/station/medical/morgue) "cZW" = ( @@ -12046,7 +12070,15 @@ /obj/effect/turf_decal/tile/neutral/half{ dir = 8 }, -/turf/open/floor/iron/dark, +/obj/machinery/monkey_recycler, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron/white, /area/station/science/xenobiology) "dfo" = ( /obj/effect/turf_decal/stripes/box, @@ -14230,6 +14262,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "dHq" = ( @@ -14714,7 +14749,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/vending/wallmed/directional/north, /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/service/hydroponics) @@ -15919,7 +15953,9 @@ /turf/open/floor/wood, /area/station/service/library) "edP" = ( -/obj/machinery/computer/prisoner/management, +/obj/machinery/computer/prisoner/management{ + req_access = list("lawyer") + }, /obj/machinery/airalarm/directional/west, /obj/machinery/status_display/evac/directional/north, /turf/open/floor/wood/tile, @@ -16473,6 +16509,18 @@ "elT" = ( /turf/open/water/beach, /area/station/command/bridge) +"elW" = ( +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "elY" = ( /obj/structure/cable, /obj/machinery/power/tracker, @@ -16590,6 +16638,7 @@ name = "Brig Foyer Right Entrance" }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "enA" = ( @@ -16879,6 +16928,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) "eru" = ( @@ -18552,6 +18602,15 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/port) +"eQp" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "eQx" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, @@ -19093,6 +19152,13 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/ghetto/central/aft) +"eYA" = ( +/obj/item/storage/box/monkeycubes{ + pixel_x = -5; + pixel_y = 1 + }, +/turf/closed/wall/r_wall, +/area/station/maintenance/ghetto/aft) "eYB" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/purple{ @@ -20928,7 +20994,6 @@ id = "engi_storage" }, /obj/machinery/duct, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) "fyf" = ( @@ -22123,6 +22188,12 @@ }, /turf/open/floor/iron/smooth, /area/station/commons/toilet/restrooms) +"fNS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "fNU" = ( /obj/structure/broken_flooring/singular/directional/east, /obj/effect/decal/cleanable/dirt, @@ -23677,9 +23748,7 @@ name = "Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, +/obj/effect/mapping_helpers/airlock/unres, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -24925,7 +24994,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, -/obj/machinery/vending/wallmed/directional/east, /obj/machinery/light_switch/directional/east{ pixel_x = 23 }, @@ -25053,7 +25121,6 @@ /area/station/engineering/transit_tube) "gGd" = ( /obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/processor/slime, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -27056,6 +27123,21 @@ dir = 4 }, /area/station/commons/vacant_room/commissary) +"hgY" = ( +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "hhp" = ( /obj/structure/table, /obj/machinery/camera{ @@ -28895,6 +28977,9 @@ "hGn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "hGH" = ( @@ -29361,6 +29446,7 @@ /obj/machinery/door/firedoor, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/service/general, +/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/wood/parquet, /area/station/hallway/secondary/service) "hMT" = ( @@ -29970,11 +30056,12 @@ /turf/open/floor/wood, /area/station/commons/dorms) "hWd" = ( -/obj/structure/chair/office/light{ - dir = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, +/obj/structure/closet/firecloset, /turf/open/floor/iron, -/area/station/science/xenobiology) +/area/station/hallway/primary/starboard) "hWn" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -32657,6 +32744,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/iron/white, /area/station/science/research) "iHU" = ( @@ -34338,7 +34426,11 @@ /area/station/maintenance/aft) "jed" = ( /obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, /area/station/science/xenobiology) "jef" = ( /obj/machinery/vending/autodrobe, @@ -34489,9 +34581,7 @@ id = "hop"; name = "Privacy Shutters" }, -/obj/machinery/door/window/right/directional/west{ - req_access = list("hop") - }, +/obj/machinery/door/window/right/directional/west, /obj/machinery/door/window/right/directional/east{ req_access = list("hop") }, @@ -36583,6 +36673,7 @@ id_tag = "BrigRight"; name = "Brig Foyer Right Entrance" }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "jLz" = ( @@ -38525,7 +38616,7 @@ /area/station/engineering/break_room) "kmK" = ( /obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/processor/slime, +/obj/machinery/hydroponics/constructable, /turf/open/floor/iron, /area/station/science/xenobiology) "kmO" = ( @@ -38557,6 +38648,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/hallway) "knd" = ( @@ -40200,8 +40292,6 @@ "kFP" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/storage_shared) "kFX" = ( @@ -41168,6 +41258,12 @@ /obj/item/book/random, /turf/open/floor/wood, /area/station/service/library) +"kSS" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "kSX" = ( /obj/machinery/door/poddoor/shutters/window/preopen{ dir = 4; @@ -41290,6 +41386,10 @@ }, /turf/open/floor/wood, /area/station/command/meeting_room/council) +"kUl" = ( +/obj/machinery/smartfridge/organ, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "kUq" = ( /obj/structure/training_machine, /turf/open/floor/iron, @@ -41860,11 +41960,8 @@ dir = 8; network = list("SS13","Engineering") }, -/obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/apc, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/iron/dark, /area/station/engineering/dronefabricator) "lcq" = ( @@ -42114,6 +42211,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/floor, +/obj/machinery/smartfridge/extract/preloaded, /turf/open/floor/iron/white, /area/station/science/xenobiology) "lgQ" = ( @@ -43930,7 +44028,6 @@ /area/station/security/prison) "lFJ" = ( /obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/stripes/line, /obj/structure/table/glass, /obj/item/reagent_containers/cup/beaker/large{ @@ -45693,15 +45790,8 @@ /turf/open/floor/iron/dark/small, /area/station/maintenance/ghetto/central) "mcc" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/table/glass, -/obj/item/biopsy_tool{ - pixel_x = -10; - pixel_y = 3 - }, -/obj/structure/microscope{ - pixel_x = -1; - pixel_y = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /turf/open/floor/iron, /area/station/science/xenobiology) @@ -46914,6 +47004,12 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"mvu" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "mvv" = ( /obj/structure/closet/secure_closet/personal{ anchored = 1 @@ -48041,7 +48137,10 @@ /area/station/science/lab) "mKL" = ( /obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, /area/station/science/xenobiology) "mKN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50085,6 +50184,8 @@ /obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) "noj" = ( @@ -51961,6 +52062,11 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron/grimy, /area/station/maintenance/starboard/fore) +"nPk" = ( +/obj/effect/turf_decal/tile/purple, +/obj/structure/closet/emcloset, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "nPl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52049,9 +52155,15 @@ /turf/open/floor/iron/grimy, /area/station/security/prison/ghetto) "nQs" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/smartfridge/extract/preloaded, -/obj/effect/turf_decal/stripes/line, +/obj/structure/table/glass, +/obj/item/biopsy_tool{ + pixel_x = -10; + pixel_y = 3 + }, +/obj/structure/microscope{ + pixel_x = -1; + pixel_y = 4 + }, /turf/open/floor/iron, /area/station/science/xenobiology) "nQw" = ( @@ -52728,8 +52840,15 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "nZt" = ( -/obj/machinery/processor/slime, -/turf/open/floor/iron/dark, +/obj/machinery/smartfridge/extract/preloaded, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, /area/station/science/xenobiology) "nZD" = ( /obj/structure/table/wood, @@ -52941,6 +53060,18 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/maintenance/starboard/aft) +"ocm" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Xenobiology East"; + network = list("ss13","xeno","rd"); + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "ocp" = ( /obj/structure/filingcabinet/security, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -54400,6 +54531,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/warden) +"ovU" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) "ovZ" = ( /obj/machinery/atmospherics/components/tank/plasma, /obj/effect/decal/cleanable/dirt, @@ -55149,8 +55286,17 @@ /turf/open/floor/iron, /area/station/maintenance/department/electrical) "oFX" = ( -/obj/machinery/monkey_recycler, -/turf/open/floor/iron/dark, +/obj/machinery/light/small/directional/south, +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, /area/station/science/xenobiology) "oGf" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ @@ -55959,6 +56105,18 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/bridge) +"oSc" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) "oSf" = ( /obj/structure/closet/l3closet/janitor, /obj/machinery/light_switch/directional/north, @@ -56362,9 +56520,7 @@ /turf/open/floor/iron, /area/station/maintenance/port/aft) "oXt" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 8 - }, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/station/science/xenobiology) "oXI" = ( @@ -58244,6 +58400,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/smartfridge/petri/preloaded, /turf/open/floor/iron/white, /area/station/science/xenobiology) "pya" = ( @@ -58510,6 +58667,7 @@ /obj/machinery/light/directional/east, /obj/machinery/status_display/evac/directional/east, /obj/structure/table/reinforced, +/obj/item/storage/box/syringes, /turf/open/floor/iron/dark/textured_half{ dir = 1 }, @@ -59280,6 +59438,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) +"pLe" = ( +/obj/structure/closet/emcloset, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "pLh" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/two, @@ -59436,6 +59599,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/science/xenobiology) "pNn" = ( @@ -61398,16 +61564,10 @@ pixel_x = -6; pixel_y = 10 }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -6 - }, /obj/item/reagent_containers/spray/cleaner{ pixel_x = 6; pixel_y = 10 }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 6 - }, /turf/open/floor/iron/white, /area/station/medical/storage) "qph" = ( @@ -61736,8 +61896,12 @@ /turf/open/floor/iron, /area/station/commons/locker) "quH" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/dark, +/obj/structure/sink/directional/north, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, /area/station/science/xenobiology) "quL" = ( /obj/item/storage/box/monkeycubes{ @@ -67282,6 +67446,9 @@ pixel_y = 3 }, /obj/machinery/light/directional/north, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 5 + }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "rVa" = ( @@ -68244,7 +68411,10 @@ /obj/structure/railing{ dir = 4 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, /area/station/science/xenobiology) "shc" = ( /obj/effect/decal/cleanable/dirt, @@ -68783,6 +68953,11 @@ /obj/effect/landmark/start/depsec/medical, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/medical) +"snW" = ( +/obj/structure/closet/firecloset, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "soe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68828,11 +69003,9 @@ /turf/open/floor/wood, /area/station/commons/vacant_room/office) "sox" = ( -/obj/structure/closet/toolcloset, -/obj/item/clothing/gloves/color/yellow, -/obj/item/storage/belt/utility, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/vending/engivend, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) "soD" = ( @@ -71180,7 +71353,6 @@ /area/station/maintenance/ghetto/central) "sYI" = ( /obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/chem_master, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -71204,6 +71376,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) "sZl" = ( @@ -71247,9 +71420,12 @@ /turf/open/floor/iron/white, /area/station/medical/treatment_center) "sZB" = ( -/obj/item/kirbyplants/random, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/item/storage/belt/utility, +/obj/item/clothing/gloves/color/yellow, +/obj/structure/closet/toolcloset, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) "sZD" = ( @@ -72813,7 +72989,9 @@ pixel_y = -3 }, /obj/structure/table/reinforced, -/obj/machinery/door/window/right/directional/south, +/obj/machinery/door/window/right/directional/south{ + req_access = list("medical") + }, /turf/open/floor/iron/white, /area/station/medical/storage) "tuh" = ( @@ -73409,7 +73587,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "tCx" = ( -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, /area/station/science/xenobiology) "tCz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73916,7 +74097,7 @@ /turf/open/floor/wood/tile, /area/station/service/library/artgallery) "tJN" = ( -/obj/machinery/monkey_recycler, +/obj/structure/rack, /turf/open/floor/iron, /area/station/science/xenobiology) "tJP" = ( @@ -76041,6 +76222,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/third) +"umd" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) "umf" = ( /obj/effect/turf_decal/tile/green/fourcorners, /obj/structure/disposalpipe/segment, @@ -77719,8 +77911,17 @@ /turf/open/floor/iron/dark/textured_large, /area/station/maintenance/ghetto/port/greater) "uNF" = ( -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/structure/table/glass, +/turf/open/floor/iron/white, /area/station/science/xenobiology) "uNM" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -79170,9 +79371,13 @@ /turf/open/floor/carpet, /area/station/commons/vacant_room/office) "vjE" = ( -/obj/machinery/smartfridge/petri/preloaded, -/obj/structure/lattice/catwalk, -/turf/open/openspace, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, /area/station/science/xenobiology) "vjG" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ @@ -79555,10 +79760,10 @@ /turf/open/floor/glass/reinforced, /area/station/service/chapel/monastery) "vnE" = ( -/obj/structure/chair/office/light{ - dir = 8 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white, /area/station/science/xenobiology) "vnH" = ( /obj/effect/turf_decal/weather/dirt, @@ -81889,10 +82094,10 @@ /area/station/medical/pharmacy) "vSK" = ( /obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/smartfridge/extract/preloaded, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/chem_heater/withbuffer, /turf/open/floor/iron, /area/station/science/xenobiology) "vSP" = ( @@ -82050,8 +82255,15 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "vUI" = ( -/obj/machinery/vending/drugs, /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/item/book/manual/wiki/grenades, +/obj/item/book/manual/wiki/plumbing{ + pixel_x = 5 + }, +/obj/item/book/manual/wiki/chemistry{ + pixel_x = 8 + }, +/obj/structure/table, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "vVf" = ( @@ -82689,6 +82901,8 @@ /obj/machinery/camera{ c_tag = "Departure Lounge South-East" }, +/obj/structure/closet/emcloset, +/obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "wdk" = ( @@ -83179,6 +83393,9 @@ /obj/machinery/door/airlock/maintenance{ name = "Bar Maintenance" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "wje" = ( @@ -85136,7 +85353,9 @@ pixel_y = -3 }, /obj/structure/table/reinforced, -/obj/machinery/door/window/left/directional/south, +/obj/machinery/door/window/left/directional/south{ + req_access = list("medical") + }, /turf/open/floor/iron/white, /area/station/medical/storage) "wLD" = ( @@ -85850,10 +86069,10 @@ /turf/open/floor/iron, /area/station/commons/dorms) "wWx" = ( -/obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/security/brig/entrance) "wWy" = ( @@ -86856,6 +87075,7 @@ "xjP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) "xjR" = ( @@ -87522,6 +87742,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/iron/white, /area/station/science/research) "xtK" = ( @@ -134484,7 +134705,7 @@ fif doz doz oVL -etx +eYA uiT mrE aPQ @@ -136804,11 +137025,11 @@ etx etx etx etx -etx -etx -etx -deZ -deZ +aPQ +bPr +elW +bIq +hgY deZ aPQ aPQ @@ -137061,16 +137282,16 @@ etx wfp wfp wfp -wfp -wfp -etx +aPQ +ocm +cMA uNF -tCx -tCx -tCx +vnE +qIR +mvu sha sha -tCx +eQp aPQ xXv rQp @@ -137318,12 +137539,12 @@ bqL wfp loJ wfp -wfp -wfp -etx +aPQ +aXx +vjE +ydt +vjE quH -tCx -tCx aPQ aZA aZA @@ -137575,9 +137796,9 @@ etx wfp wfp wfp -wfp -wfp -etx +aPQ +umd +oSc nZt oFX jed @@ -137832,9 +138053,9 @@ etx etx etx etx -etx -etx -etx +aPQ +aPQ +aPQ aPQ aPQ aPQ @@ -181523,7 +181744,7 @@ pyd fjs kFP ccQ -aXx +fyD utw fur lcR @@ -199000,7 +199221,7 @@ aPQ aPQ aPQ xcZ -vjE +sWX taO mym tJN @@ -199207,7 +199428,7 @@ ckR ckR iur ckR -bMM +hWd htm htm htm @@ -199978,7 +200199,7 @@ pXZ ckR iur ckR -niF +nPk vlt iKc ruJ @@ -200029,7 +200250,7 @@ cuq cuq xcZ gdb -hWd +ydt mdW vSb sWX @@ -200287,7 +200508,7 @@ cuq xcZ vSK oXt -qIR +fNS pMG foW aEf @@ -200544,7 +200765,7 @@ cuq xcZ sYI aoT -qIR +kUl bQI tCI aEf @@ -200800,7 +201021,7 @@ cuq cuq xcZ pEu -ydt +aoT pxU hGn tHY @@ -201057,9 +201278,9 @@ cuq cuq xcZ iGe -ydt +aoT lgM -ydt +mcc lPV aEf cuq @@ -201314,9 +201535,9 @@ cuq cuq xcZ wwb -qIR +kSS dHo -ydt +ovU opW aEf cuq @@ -201573,7 +201794,7 @@ xcZ nMm bAW arb -mcc +ydt lFJ aEf cuq @@ -201830,7 +202051,7 @@ xcZ sWX dWG arb -cMA +ydt nQs aEf cuq @@ -202087,7 +202308,7 @@ xcZ sWX dWG xoI -vnE +ydt akg aEf cuq @@ -210005,7 +210226,7 @@ ifV iqS hqA mcT -eTa +snW dna dna tYD @@ -210519,7 +210740,7 @@ eTa eTa pJp eTa -eTa +pLe dna tYD tYD