From 77a8fd892adb29c2599732a27ee1ee6d06a05f67 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Sun, 9 Jun 2024 23:42:06 -0500 Subject: [PATCH 01/27] BoxStation Post-Merge Fixes 4 Adds another engine to the random engine pool. Adds more fire extinguishers around the map. Changes the layout of the atmospherics area slightly. Changes the layout of the engineering area slightly. Changes the layout of the medical area slightly. Changes the layout of the prison area slightly. Moves the ai sat and ordnance testing site further away from the map edge. Makes other miscellaneous additions, changes, and fixes. --- _maps/map_files/BoxStation/BoxStation.dmm | 7818 +++++++++-------- .../BoxStation/particle_accelerator.dmm | 35 +- .../RandomEngines/BoxStation/sm_teg.dmm | 3001 +++++++ .../RandomEngines/BoxStation/supermatter.dmm | 164 +- .../RandomEngines/BoxStation/teg.dmm | 47 +- .../code/random_rooms/engines/boxstation.dm | 12 +- 6 files changed, 7134 insertions(+), 3943 deletions(-) create mode 100644 _maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 0cb3dca7387ec4..87c2b2b013c4bf 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -15,8 +15,9 @@ /area/station/engineering/atmos/hfr_room) "aaB" = ( /obj/machinery/light/directional/north, -/obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/machinery/modular_computer/preset/engineering, /turf/open/floor/iron, /area/station/engineering/main) @@ -30,16 +31,11 @@ /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "aaT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/confetti, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/medical/cryo) "aaX" = ( /obj/structure/frame/machine, /turf/open/floor/plating, @@ -105,12 +101,12 @@ dir = 9 }, /obj/effect/turf_decal/bot, -/obj/structure/closet/secure_closet/security/sec, /obj/machinery/airalarm/directional/north, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/closet/secure_closet/security/sec, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "acf" = ( -/obj/machinery/light/directional/south, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/dark, @@ -433,25 +429,17 @@ /turf/open/floor/iron, /area/station/cargo/storage) "air" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/structure/railing{ + dir = 4 + }, +/turf/open/ballpit, +/area/station/security/bitden) "ait" = ( /turf/closed/wall, /area/station/security/medical) "aiw" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - layer = 3.1; - pixel_x = -2; - pixel_y = 2 - }, -/turf/open/floor/iron/kitchen, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, /area/station/security/prison/mess) "aiy" = ( /obj/effect/turf_decal/trimline/green/filled/line, @@ -463,12 +451,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "aiG" = ( +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/machinery/disposal/bin, -/obj/structure/cable, -/obj/machinery/light_switch/directional/south, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) "aiI" = ( @@ -666,7 +653,10 @@ /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "amL" = ( -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "amZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line, @@ -763,15 +753,9 @@ /area/station/command/heads_quarters/hop) "aoL" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + dir = 10 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/cable/layer1, +/obj/structure/sign/warning/vacuum/external/directional/south, /turf/open/floor/iron, /area/station/engineering/main) "aoX" = ( @@ -789,7 +773,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -1154,14 +1137,9 @@ /turf/open/floor/iron/white, /area/station/science/lab) "auk" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/structure/chair, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/cargo/storage) +/obj/machinery/vending/sustenance, +/turf/open/floor/iron/dark, +/area/station/security/prison/mess) "auu" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, @@ -1370,6 +1348,15 @@ "ayi" = ( /turf/open/floor/carpet, /area/station/service/library) +"ayn" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/reagent_dispensers/plumbed{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "ayq" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 @@ -1512,8 +1499,13 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "aBA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/confetti, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "aBC" = ( @@ -1539,7 +1531,7 @@ /obj/machinery/light/small/directional/west, /obj/machinery/firealarm/directional/west, /obj/machinery/airalarm/directional/north, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /turf/open/floor/iron/cafeteria{ dir = 8 }, @@ -1607,10 +1599,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/station/medical/cryo) "aDP" = ( @@ -1722,12 +1713,10 @@ /turf/open/floor/iron/textured, /area/station/engineering/storage_shared) "aGa" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/autoname/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/structure/closet/crate, +/turf/open/floor/iron/dark/side{ + dir = 6 }, -/turf/open/floor/iron/dark, /area/station/security/prison/safe) "aGd" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -1737,6 +1726,9 @@ dir = 4 }, /obj/machinery/firealarm/directional/south, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8 + }, /turf/open/floor/iron/dark, /area/station/security/office) "aGj" = ( @@ -1777,6 +1769,7 @@ /area/station/maintenance/starboard/fore) "aGU" = ( /obj/item/radio/intercom/prison/directional/south, +/obj/structure/punching_bag, /turf/open/floor/iron/dark, /area/station/security/prison/workout) "aHm" = ( @@ -1811,14 +1804,14 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "aHW" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/turf_decal/tile/blue/full, /obj/effect/turf_decal/delivery, /obj/structure/sign/poster/contraband/lizard/directional/west, /obj/machinery/door/window/right/directional/north{ name = "Medical Delivieries"; req_access = list("medical") }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_large, /area/station/medical/storage) "aIe" = ( /obj/effect/turf_decal/tile/red/fourcorners, @@ -2028,8 +2021,9 @@ id = "qm_privacy"; name = "Privacy Shutters Control" }, -/obj/structure/closet/secure_closet/quartermaster, /obj/machinery/light/small/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/closet/secure_closet/quartermaster, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) "aKQ" = ( @@ -2288,6 +2282,7 @@ name = "security camera" }, /obj/machinery/airalarm/directional/east, +/obj/machinery/newscaster/directional/north, /obj/structure/filingcabinet/security, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) @@ -2448,7 +2443,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/light/small/directional/north, /obj/machinery/camera/autoname/directional/north, /obj/machinery/duct, /turf/open/floor/iron, @@ -2864,6 +2858,12 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron, /area/station/engineering/storage) +"aYt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "aYu" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -3028,13 +3028,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) -"bbm" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/department/engine/atmos) "bbw" = ( /obj/structure/chair/comfy/beige{ dir = 1 @@ -3128,19 +3121,9 @@ /turf/open/space, /area/station/solars/starboard/fore) "bdb" = ( -/obj/machinery/light/dim/directional/west, -/obj/machinery/light/neon_lining{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/landmark/start/prisoner, -/turf/open/floor/carpet/black, -/area/station/security/bitden) +/obj/machinery/oven/range, +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) "bde" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -3153,7 +3136,7 @@ /turf/open/floor/iron/white, /area/station/medical/patients_rooms/room_a) "bdf" = ( -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/light/directional/west, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/security/prison/workout) @@ -3253,12 +3236,23 @@ /turf/open/floor/iron, /area/station/engineering/storage) "bfn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/box, -/obj/machinery/holopad, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/prison/workout) +/obj/machinery/light/directional/west, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/cooking_to_serve_man, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/rice{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/sugar{ + pixel_x = -6 + }, +/obj/item/storage/fancy/egg_box, +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) "bfx" = ( /obj/structure/sign/poster/random/directional/north, /obj/effect/spawner/random/trash/moisture_trap, @@ -3362,7 +3356,7 @@ "bhf" = ( /obj/structure/cable, /obj/machinery/duct, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/station/security/prison) "bhj" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -3547,7 +3541,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ dir = 9 }, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "blh" = ( @@ -3726,6 +3719,11 @@ "bnl" = ( /turf/closed/wall, /area/station/maintenance/port) +"bnn" = ( +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/prison/mess) "bnz" = ( /obj/machinery/light/small/directional/south, /obj/effect/spawner/random/structure/crate, @@ -3798,7 +3796,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, -/obj/structure/table, /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -3879,7 +3876,7 @@ name = "Labor Camp Shuttle Airlock"; shuttledocked = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/textured_large, /area/station/security/processing) "bpr" = ( @@ -3897,7 +3894,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "bpE" = ( -/obj/machinery/light/directional/west, +/obj/machinery/light/small/directional/west, /obj/item/radio/intercom/prison/directional/west, /turf/open/floor/iron/dark, /area/station/security/prison) @@ -3963,10 +3960,15 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "bqH" = ( -/obj/item/ammo_casing/shotgun/improvised, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/brig) "bqK" = ( /obj/docking_port/stationary/laborcamp_home{ dir = 8 @@ -3981,10 +3983,14 @@ /turf/open/floor/iron/dark/side, /area/station/cargo/miningoffice) "brd" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark, +/turf/open/floor/glass/reinforced, /area/station/commons/fitness/recreation) +"brw" = ( +/obj/structure/cable, +/obj/structure/table/wood, +/turf/open/floor/iron/dark, +/area/station/command/meeting_room) "brx" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4067,8 +4073,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "bsq" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/item/stack/ore/slag, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "bsx" = ( @@ -4117,7 +4123,7 @@ /area/station/commons/fitness) "btg" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/stack/ducts/fifty, /obj/item/stack/ducts/fifty, /obj/item/construction/plumbing, @@ -4194,9 +4200,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "btS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "btZ" = ( @@ -4301,14 +4305,11 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) "bvJ" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/camera/autoname/directional/west{ - dir = 10 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/obj/structure/liquid_pump, -/obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/area/station/engineering/atmos/storage) "bvL" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/directional/north, @@ -4612,12 +4613,9 @@ /turf/open/floor/plating, /area/station/maintenance/port) "bBQ" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/airalarm/directional/east, -/obj/item/radio/intercom/directional/north, -/obj/machinery/computer/atmos_alert{ - dir = 8 - }, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/machinery/computer/atmos_alert, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "bBR" = ( @@ -4771,10 +4769,9 @@ /area/station/hallway/secondary/entry) "bDR" = ( /obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 + dir = 1 }, -/obj/structure/closet/secure_closet/security/med, -/obj/item/radio/intercom/directional/north, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "bDS" = ( @@ -4861,7 +4858,7 @@ }, /obj/machinery/status_display/evac/directional/north, /obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -4875,10 +4872,12 @@ /area/station/maintenance/department/science) "bGd" = ( /obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/closet/secure_closet/freezer/meat, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "bGl" = ( +/obj/structure/mirror/directional/east, /obj/structure/sink/kitchen/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -4960,7 +4959,7 @@ "bGY" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "bHc" = ( /obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ @@ -5062,7 +5061,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "bIu" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, @@ -5278,29 +5276,14 @@ "bLy" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/science) -"bLz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/atmos/glass{ - name = "Distribution Loop" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/atmos/pumproom) "bLO" = ( -/obj/structure/cable, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8 + }, /obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, /obj/item/kirbyplants/random, -/obj/machinery/firealarm/directional/south, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) "bLR" = ( @@ -5479,6 +5462,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/table, /obj/item/paper_bin, /obj/item/folder/yellow, @@ -5568,7 +5552,7 @@ dir = 1 }, /obj/machinery/washing_machine, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "bQL" = ( /obj/effect/turf_decal/siding/thinplating{ @@ -5637,6 +5621,10 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) +"bSb" = ( +/obj/structure/sink/kitchen/directional/south, +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) "bSc" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -5684,7 +5672,6 @@ /obj/effect/turf_decal/trimline/red/corner{ dir = 4 }, -/obj/item/radio/intercom/directional/south, /obj/structure/table, /obj/item/restraints/handcuffs, /obj/item/restraints/handcuffs{ @@ -5724,6 +5711,13 @@ }, /turf/open/floor/plating, /area/station/security/brig/entrance) +"bTx" = ( +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "bTK" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/engine/vacuum, @@ -6026,7 +6020,7 @@ name = "Isolation Cell"; id_tag = "iso_cell_hall_bolt" }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/duct, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark/textured, @@ -6122,7 +6116,7 @@ /area/station/command/meeting_room) "caj" = ( /obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/gloves/latex, @@ -6361,10 +6355,9 @@ /turf/open/floor/plating, /area/station/maintenance/port) "ceb" = ( -/obj/structure/filingcabinet, -/obj/item/folder/documents, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/bot_white/right, +/obj/structure/closet/crate/silvercrate, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "cee" = ( @@ -6398,12 +6391,10 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "cet" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/security/prison/garden) "cev" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6569,9 +6560,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "chs" = ( -/obj/structure/table, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "chv" = ( /obj/effect/decal/cleanable/dirt, @@ -6631,10 +6622,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ name = "Prison Showers" }, -/obj/machinery/duct, /turf/open/floor/iron/dark/textured, /area/station/security/prison/shower) "cid" = ( @@ -6659,7 +6651,7 @@ /area/station/maintenance/disposal) "cit" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/clothing/suit/apron/surgical{ pixel_x = -4; pixel_y = 5 @@ -6696,10 +6688,10 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, +/obj/machinery/status_display/evac/directional/south, /obj/machinery/computer/department_orders/security{ dir = 1 }, -/obj/structure/noticeboard/directional/south, /turf/open/floor/iron/dark, /area/station/security/office) "ciO" = ( @@ -6841,7 +6833,7 @@ /obj/machinery/light/small/directional/east, /obj/machinery/camera/autoname/directional/east, /obj/machinery/vending/clothing, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "clh" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, @@ -6960,14 +6952,19 @@ name = "Genetics Shutters Control"; req_access = list("genetics") }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/paper_bin, /obj/effect/spawner/random/bureaucracy/folder, /obj/effect/spawner/random/bureaucracy/pen, /turf/open/floor/iron/white, /area/station/science/genetics) "cnG" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/light_switch/directional/south, /obj/structure/closet/crate/trashcart/laundry, +/obj/effect/spawner/random/contraband/prison, /obj/item/clothing/under/rank/prisoner, /obj/item/clothing/under/rank/prisoner, /obj/item/clothing/under/rank/prisoner, @@ -6976,9 +6973,7 @@ /obj/item/clothing/shoes/sneakers/orange, /obj/item/clothing/shoes/sneakers/orange, /obj/item/clothing/shoes/sneakers/orange, -/obj/effect/spawner/random/contraband/prison, -/obj/machinery/light_switch/directional/south, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "cnH" = ( /obj/structure/table/wood, @@ -7134,11 +7129,9 @@ /turf/open/floor/wood, /area/station/service/library/lounge) "cru" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/chair/stool/directional/north, +/obj/structure/punching_bag, /turf/open/floor/iron/dark, -/area/station/security/prison/mess) +/area/station/security/prison/workout) "crI" = ( /obj/effect/spawner/random/structure/table, /obj/effect/spawner/random/bureaucracy/pen, @@ -7229,7 +7222,7 @@ /area/station/engineering/atmos/pumproom) "ctF" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/regular, /turf/open/floor/iron/white, /area/station/medical/office) @@ -7449,14 +7442,7 @@ /area/space/nearstation) "cxW" = ( /obj/structure/table/wood, -/obj/item/storage/box/matches{ - pixel_x = 4 - }, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/reagent_containers/cup/glass/flask/gold{ - pixel_x = 6; - pixel_y = 14 - }, +/obj/item/flashlight/lamp/green, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) "cxY" = ( @@ -7609,7 +7595,7 @@ dir = 1 }, /obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "cBe" = ( /obj/machinery/light/directional/south, @@ -7666,12 +7652,21 @@ /area/station/engineering/atmos) "cCr" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 8 }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/table, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "cCv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7684,15 +7679,16 @@ /turf/open/floor/iron/dark, /area/station/science/research/abandoned) "cCF" = ( -/obj/structure/plasticflaps/opaque, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; location = "Security" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, +/obj/structure/plasticflaps/opaque, +/turf/open/floor/iron/dark/smooth_large, /area/station/maintenance/department/security/brig) "cCP" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -7718,42 +7714,15 @@ /turf/closed/wall/r_wall, /area/station/maintenance/department/science/xenobiology) "cDA" = ( -/obj/machinery/light/small/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Medical - Cryogenics"; - name = "medical camera"; - network = list("ss13","medbay") - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone, -/obj/item/storage/pill_bottle/mannitol, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe/epinephrine, -/obj/item/wrench/medical, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/engine, /area/station/medical/cryo) "cDC" = ( /obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/paper_bin{ pixel_x = -4; pixel_y = 4 @@ -7881,11 +7850,17 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark/side{ dir = 6 }, /area/station/engineering/storage_shared) +"cFf" = ( +/obj/structure/cable, +/obj/structure/chair/wood, +/turf/open/floor/wood, +/area/station/security/prison/rec) "cFj" = ( /obj/structure/closet, /obj/item/instrument/piano_synth, @@ -7902,6 +7877,7 @@ }, /obj/structure/closet/secure_closet/engineering_personal, /obj/machinery/camera/autoname/directional/north, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -7979,7 +7955,7 @@ /turf/open/floor/iron, /area/station/science/ordnance) "cGM" = ( -/obj/machinery/light/directional/west, +/obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/security/prison/rec) "cGR" = ( @@ -8023,11 +7999,16 @@ /turf/open/floor/iron, /area/station/tcommsat/computer) "cIv" = ( -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Prison Garden" + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/garden) "cID" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 1 @@ -8085,13 +8066,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/confetti, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/obj/structure/cable/layer1, +/turf/open/floor/iron/textured, +/area/station/engineering/main) "cJB" = ( /obj/effect/spawner/random/structure/table_or_rack, /obj/effect/spawner/random/maintenance/two, @@ -8226,13 +8213,13 @@ /obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "cLs" = ( /turf/closed/wall, /area/station/cargo/lobby) "cLR" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -8299,9 +8286,12 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine) "cMy" = ( -/obj/structure/lattice/catwalk, -/turf/open/space, -/area/space/nearstation) +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/storage) "cMA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/mess, @@ -8452,7 +8442,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "cPo" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron, @@ -8735,15 +8724,10 @@ /turf/open/floor/iron/dark/textured, /area/station/security/processing) "cSQ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/item/wrench, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "cSY" = ( /obj/machinery/light/directional/west, /turf/open/floor/grass, @@ -8803,9 +8787,10 @@ /turf/open/floor/iron/dark/textured, /area/station/service/kitchen) "cTG" = ( -/obj/structure/cable, +/obj/machinery/light/directional/north, /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/camera/autoname/directional/north, +/obj/structure/cable, +/obj/machinery/modular_computer/preset/civilian, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "cTJ" = ( @@ -8840,6 +8825,14 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"cTW" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/line, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "cUe" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -9264,12 +9257,9 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "daR" = ( -/obj/machinery/light/directional/south, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/effect/mapping_helpers/apc/cell_5k, -/turf/open/floor/iron/dark, -/area/station/security/prison/safe) +/obj/machinery/firealarm/directional/east, +/turf/open/floor/carpet/black, +/area/station/security/bitden) "daT" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark/side, @@ -9352,9 +9342,9 @@ /area/station/maintenance/starboard/fore) "ddr" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/airalarm/directional/south, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "ddu" = ( @@ -9695,9 +9685,9 @@ /turf/open/floor/wood, /area/station/service/bar/backroom) "dim" = ( -/obj/machinery/computer/bank_machine, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/bot_white/left, +/obj/structure/closet/crate/goldcrate, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "dio" = ( @@ -9759,17 +9749,12 @@ /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) "diY" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/airlock/security/glass{ - name = "Armory" +/obj/machinery/light/small/directional/east, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/iron/dark/side{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/security/armory, -/turf/open/floor/iron/dark/textured, -/area/station/ai_monitored/security/armory) +/area/station/security/prison) "djl" = ( /obj/machinery/camera/directional/south{ c_tag = "Command - Secure Eva Storage"; @@ -9876,6 +9861,7 @@ dir = 5 }, /obj/machinery/light/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table, /obj/item/stack/cable_coil, /turf/open/floor/iron/dark/side{ @@ -10135,19 +10121,31 @@ /turf/open/floor/iron/white, /area/station/medical/break_room) "dpo" = ( -/obj/machinery/camera/autoname/directional/north, -/obj/structure/table, -/obj/item/book/manual/wiki/cooking_to_serve_man, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/rice, -/obj/item/reagent_containers/condiment/sugar{ - pixel_x = -5 - }, -/obj/item/storage/fancy/egg_box, +/obj/structure/closet/crate, +/obj/effect/spawner/random/contraband/prison, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/item/knife/plastic, +/obj/item/knife/plastic, +/obj/item/knife/plastic, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "dpu" = ( @@ -10316,7 +10314,6 @@ /area/station/maintenance/starboard/aft) "dsn" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/chair{ dir = 4 }, @@ -10329,6 +10326,7 @@ /area/station/science/lab) "dsE" = ( /obj/effect/turf_decal/box, +/obj/structure/cable, /obj/machinery/holopad, /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark/smooth_large, @@ -10364,9 +10362,13 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "dtm" = ( -/obj/machinery/suit_storage_unit/atmos, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Atmospherics, Northwest"; + name = "engineering camera" + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "dtT" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -10423,7 +10425,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "dvd" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /obj/item/radio/intercom/prison/directional/east, /turf/open/floor/iron/dark, /area/station/security/prison) @@ -10487,7 +10489,11 @@ /area/station/hallway/secondary/entry) "dwz" = ( /obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Interrogation"; + name = "security camera"; + network = list("ss13","interrogation") + }, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -10945,6 +10951,7 @@ /area/station/science/ordnance/storage) "dEE" = ( /obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/status_display/evac/directional/south, /obj/structure/chair{ dir = 4 }, @@ -10966,7 +10973,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "dEL" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/weldingtool/mini{ pixel_y = 8; pixel_x = -4 @@ -10990,8 +10997,9 @@ /turf/open/floor/iron/dark, /area/station/command/meeting_room) "dFp" = ( -/obj/structure/table/wood, -/obj/item/storage/dice, +/obj/structure/chair/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/station/security/prison/rec) "dFq" = ( @@ -11039,9 +11047,10 @@ /turf/open/floor/engine/co2, /area/station/engineering/atmos) "dFW" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "dGg" = ( @@ -11126,7 +11135,7 @@ "dHz" = ( /obj/effect/turf_decal/stripes/end, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/wrench/medical, /obj/item/storage/pill_bottle/epinephrine{ pixel_x = 8; @@ -11443,7 +11452,7 @@ /turf/open/floor/carpet/green, /area/station/commons/locker) "dNt" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/south, /turf/open/floor/wood, /area/station/security/prison/rec) "dNu" = ( @@ -11600,6 +11609,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/rnd/production/circuit_imprinter, /turf/open/floor/iron/dark/side{ dir = 1 @@ -11681,15 +11691,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "dRb" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/machinery/medical_kiosk, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "dRd" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11704,14 +11708,16 @@ /turf/open/floor/wood, /area/station/service/library) "dRH" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 10 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/duct, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "dRJ" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/structure/rack, @@ -12093,7 +12099,7 @@ /area/station/engineering/gravity_generator) "dYS" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = 3 @@ -12191,7 +12197,7 @@ /area/station/security/prison/safe) "eac" = ( /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "eae" = ( @@ -12392,15 +12398,15 @@ /turf/open/floor/wood, /area/station/service/lawoffice) "ecX" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/blue/corner{ - dir = 8 +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 }, -/obj/structure/table/glass, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) +/turf/open/space/basic, +/area/space/nearstation) "edc" = ( /obj/item/storage/pill_bottle, /turf/open/floor/plating, @@ -12464,6 +12470,10 @@ /obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"eeC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/wood, +/area/station/security/prison/rec) "eeM" = ( /obj/machinery/button/door/directional/south{ id = "dorm_6"; @@ -12515,7 +12525,6 @@ /turf/open/floor/plating, /area/station/engineering/atmos) "efB" = ( -/obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/east, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12531,7 +12540,7 @@ /obj/effect/turf_decal/trimline/blue/filled/end{ dir = 1 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/regular{ pixel_x = 3; pixel_y = 6 @@ -12670,22 +12679,11 @@ /turf/open/floor/wood, /area/station/security/prison/rec) "ejy" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/machinery/door/airlock/atmos{ - name = "Turbine Access" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/effect/landmark/navigate_destination/incinerator, -/turf/open/floor/iron/textured, -/area/station/maintenance/department/engine/atmos) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/garbage, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "ejE" = ( /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, @@ -12767,36 +12765,33 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, +/obj/machinery/newscaster/directional/south, /obj/machinery/computer/security{ dir = 1 }, -/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, /area/station/security/office) "elU" = ( /obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/structure/fireaxecabinet/directional/north, -/turf/open/floor/iron/dark, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "emc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/carpet/black, +/obj/structure/cable, +/obj/machinery/netpod, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/security/bitden) "emd" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/trunk{ +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/components/tank/air{ dir = 8 }, -/obj/machinery/disposal/bin, -/turf/open/floor/iron/dark, -/area/station/medical/medbay/central) +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "emg" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/dark/side{ @@ -12913,17 +12908,13 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "enB" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners{ +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/green/line{ dir = 1 }, -/obj/machinery/button/door/directional/north{ - id = "kitchen_sec_shutters"; - name = "Kitchen Shutters Control"; - req_access = list("kitchen") - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/port) "enD" = ( /obj/machinery/airalarm/directional/west, /obj/item/kirbyplants/random, @@ -12931,7 +12922,6 @@ /area/station/service/chapel/funeral) "enE" = ( /obj/machinery/light/directional/east, -/obj/effect/decal/cleanable/dirt, /obj/machinery/computer/atmos_control/nocontrol/incinerator{ dir = 8 }, @@ -12983,7 +12973,6 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "eoJ" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 }, @@ -13046,7 +13035,6 @@ codes_txt = "delivery;dir=4"; location = "QM #5" }, -/obj/structure/sign/poster/random/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -13116,21 +13104,23 @@ }, /area/station/commons/dorms) "erd" = ( -/obj/structure/railing{ +/obj/machinery/camera/autoname/directional/east, +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/ballpit, -/area/station/security/bitden) -"eri" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ +/turf/open/floor/iron/dark/side{ dir = 4 }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 +/area/station/security/prison/safe) +"eri" = ( +/obj/structure/cable, +/obj/structure/chair{ + dir = 4 }, -/obj/effect/spawner/random/vending/colavend, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/obj/effect/landmark/start/security_officer, +/turf/open/floor/iron/dark, +/area/station/security/office) "erA" = ( /obj/effect/turf_decal/bot, /obj/structure/window/reinforced/spawner/directional/north, @@ -13224,9 +13214,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 5 - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "etg" = ( @@ -13425,7 +13412,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 }, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/station/medical/break_room) "ewB" = ( @@ -13461,11 +13448,6 @@ }, /turf/open/floor/engine, /area/station/science/explab) -"ewZ" = ( -/obj/machinery/power/floodlight, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/atmos) "exf" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/effect/turf_decal/stripes/line{ @@ -13500,10 +13482,6 @@ name = "Warehouse Door Control"; req_access = list("cargo") }, -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -13756,7 +13734,7 @@ /obj/item/clothing/shoes/sneakers/black, /obj/item/clothing/shoes/sneakers/black, /obj/item/clothing/shoes/sneakers/black, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "eBF" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning{ @@ -13814,14 +13792,13 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) "eCJ" = ( -/obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 5 - }, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/kitchen, -/area/station/security/prison/mess) +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/iron/large, +/area/station/security/prison/work) "eCO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/table, @@ -13848,7 +13825,7 @@ /area/station/science/xenobiology/hallway) "eDk" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/paper_bin, /obj/item/folder/white, /obj/item/pen, @@ -13990,7 +13967,7 @@ }, /obj/structure/plasticflaps/opaque, /obj/machinery/duct, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/maintenance/central) "eGI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14099,7 +14076,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 }, /turf/open/floor/engine, @@ -14127,10 +14104,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "eJA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/chair/wood, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/security/prison/garden) "eJD" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/flowers_br/style_random, @@ -14142,7 +14118,7 @@ }, /obj/machinery/airalarm/directional/east, /obj/machinery/washing_machine, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "eKm" = ( /obj/machinery/atmospherics/miner/oxygen, @@ -14162,7 +14138,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, -/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/engineering/storage) "eKA" = ( @@ -14209,7 +14184,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/light/small/directional/west, /obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/regular{ pixel_x = 6; pixel_y = 6 @@ -14281,10 +14256,10 @@ /turf/open/floor/iron/dark/textured, /area/station/security/evidence) "eMc" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/tile/purple/full, /obj/effect/turf_decal/delivery, /obj/machinery/duct, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/science/breakroom) "eMh" = ( /obj/effect/turf_decal/trimline/brown/filled/warning{ @@ -14441,7 +14416,8 @@ /area/station/maintenance/department/cargo) "ePf" = ( /obj/item/storage/secure/safe/directional/east, -/obj/item/kirbyplants/random, +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "ePr" = ( @@ -14449,10 +14425,9 @@ /turf/open/floor/iron/white/textured, /area/station/science/auxlab) "ePv" = ( -/obj/machinery/grill, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/kitchen, -/area/station/security/prison/mess) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/prison/rec) "ePw" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -14719,20 +14694,12 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) "eUa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light_switch/directional/north, /obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ - dir = 8 + dir = 4 }, -/turf/open/floor/iron, +/obj/structure/cable, +/turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "eUr" = ( /obj/effect/spawner/random/engineering/tracking_beacon, @@ -14960,7 +14927,6 @@ /area/station/security/checkpoint/medical) "eXJ" = ( /obj/structure/cable, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible/layer2, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -15004,13 +14970,10 @@ /turf/open/floor/iron/dark, /area/station/security/prison/visit) "eYZ" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/table/wood, -/obj/item/razor{ - pixel_x = -8; - pixel_y = 4 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/flashlight/lamp/green, +/obj/machinery/duct, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) "eZf" = ( @@ -15033,13 +14996,13 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "eZC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/obj/machinery/light/directional/south, -/obj/structure/closet/secure_closet/atmospherics, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/office) +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/station/engineering/atmos) "eZG" = ( /turf/closed/wall/r_wall, /area/station/engineering/gravity_generator) @@ -15098,12 +15061,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -15111,6 +15068,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"fbw" = ( +/obj/structure/table, +/obj/item/toy/figure/qm, +/turf/open/floor/wood, +/area/station/command/heads_quarters/qm) "fbx" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/corner{ @@ -15149,11 +15111,10 @@ }, /area/station/command/gateway) "fch" = ( -/obj/structure/table, -/obj/item/shovel/spade, -/obj/item/plant_analyzer, -/obj/item/cultivator, -/obj/item/reagent_containers/cup/watering_can, +/obj/machinery/light/directional/south, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/machinery/biogenerator, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "fck" = ( @@ -15228,6 +15189,10 @@ /obj/structure/grille, /turf/open/space, /area/space/nearstation) +"fdz" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) "fdC" = ( /obj/structure/sign/departments/aisat/directional/south, /obj/machinery/camera/directional/south{ @@ -15363,6 +15328,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark/side{ dir = 8 @@ -15510,6 +15476,10 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -15554,6 +15524,12 @@ /obj/machinery/status_display/ai/directional/west, /turf/open/floor/carpet, /area/station/service/chapel) +"fiU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "fjo" = ( /obj/machinery/light/small/directional/south, /obj/structure/sign/poster/official/random/directional/south, @@ -15809,7 +15785,7 @@ }, /obj/machinery/newscaster/directional/west, /obj/machinery/washing_machine, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "fnK" = ( /obj/structure/disposalpipe/segment{ @@ -16165,7 +16141,7 @@ location = "Engineering" }, /obj/structure/plasticflaps/opaque, -/turf/open/floor/iron, +/turf/open/floor/iron/large, /area/station/maintenance/port/aft) "fvn" = ( /obj/machinery/airalarm/directional/north, @@ -16235,7 +16211,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "fwt" = ( /obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ @@ -16388,10 +16364,11 @@ /obj/effect/turf_decal/trimline/dark_red/filled/warning{ dir = 4 }, +/obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "fzi" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ +/obj/machinery/atmospherics/components/binary/pump/off{ dir = 8; name = "Mix to Filter" }, @@ -16435,7 +16412,7 @@ /area/station/science/research) "fAa" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical{ pixel_y = 8 @@ -16762,15 +16739,10 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine) "fHo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/duct, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/space_heater, /turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/area/station/maintenance/department/medical) "fHz" = ( /obj/structure/sign/warning/vacuum/directional/north, /obj/structure/table, @@ -16886,7 +16858,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "fIV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/wood, /turf/open/floor/wood, /area/station/security/prison/rec) "fIX" = ( @@ -16926,7 +16898,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/dark, /area/station/security/office) "fJl" = ( @@ -17108,9 +17079,12 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) "fMv" = ( -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/prison/workout) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/carpet/black, +/area/station/security/bitden) "fMx" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -17170,7 +17144,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "fOn" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 10 @@ -17255,13 +17228,16 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "fPL" = ( -/obj/machinery/light_switch/directional/east, +/obj/machinery/light_switch/directional/east{ + pixel_y = -10 + }, /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 }, /obj/structure/table, /obj/machinery/recharger, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "fPN" = ( @@ -17694,8 +17670,8 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 8 }, -/obj/machinery/airalarm/directional/east, /obj/machinery/light/directional/east, +/obj/machinery/status_display/evac/directional/east, /obj/structure/chair{ dir = 8 }, @@ -17751,6 +17727,7 @@ /obj/item/screwdriver{ pixel_y = 10 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) "fXZ" = ( @@ -17787,7 +17764,7 @@ "fYh" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/airalarm/directional/east, -/obj/machinery/medical_kiosk, +/obj/structure/sink/directional/west, /turf/open/floor/iron/dark, /area/station/medical/exam_room) "fYj" = ( @@ -17841,14 +17818,9 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "fZy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "med_lockdown"; - name = "Medbay Emergency Lockdown Shutters"; - dir = 1 - }, -/turf/open/floor/plating, -/area/station/medical/paramedic) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/carpet/black, +/area/station/security/bitden) "fZB" = ( /turf/open/floor/wood, /area/station/service/bar) @@ -17991,6 +17963,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/white, /area/station/science/lab) "gbM" = ( @@ -18040,10 +18013,11 @@ /turf/closed/wall/r_wall, /area/station/engineering/storage/tech) "gcH" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/effect/turf_decal/bot, +/obj/item/radio/intercom/directional/west, +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/atmos) "gdg" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/machinery/camera/autoname/directional/south, @@ -18150,16 +18124,16 @@ dir = 8 }, /obj/machinery/camera/autoname/directional/east, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "gfF" = ( -/obj/structure/closet/secure_closet/freezer/meat{ - req_access = null +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" }, /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "gfI" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, @@ -18492,10 +18466,15 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "gmC" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/pump, +/obj/structure/table, +/obj/item/t_scanner{ + pixel_x = -6 + }, +/obj/item/multitool{ + pixel_x = 6 + }, /turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/area/station/engineering/atmos/office) "gmD" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ @@ -18557,13 +18536,15 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, +/obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/south, /obj/machinery/button/flasher{ id = "holding_flash"; name = "Holding Cell Flasher"; pixel_y = -26; - req_access = list("security") + req_access = list("security"); + pixel_x = -8 }, -/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/security/brig) "goc" = ( @@ -18635,23 +18616,24 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "goP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "goR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/holopad, -/obj/machinery/duct, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/machinery/camera/directional/east{ + c_tag = "Security - Prison Workshop"; + network = list("ss13","prison") + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/work) "gpi" = ( /obj/machinery/light/directional/north, /obj/machinery/button/door/directional/north{ @@ -18735,7 +18717,7 @@ }, /obj/machinery/light/directional/west, /obj/machinery/airalarm/directional/west, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/computer/records/medical/laptop, /turf/open/floor/iron/white, /area/station/science/genetics) @@ -18784,6 +18766,9 @@ /area/station/hallway/primary/fore) "grz" = ( /obj/machinery/camera/autoname/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/security/prison) "grB" = ( @@ -18859,11 +18844,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/disposal) -"gsl" = ( -/obj/item/stack/ore/slag, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) "gsz" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -19067,7 +19047,6 @@ /area/station/command/meeting_room) "gvo" = ( /obj/effect/turf_decal/trimline/red/filled/line, -/obj/item/radio/intercom/directional/south, /obj/machinery/computer/security{ dir = 1 }, @@ -19086,7 +19065,7 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/status_display/ai/directional/south, /obj/machinery/computer/records/security{ dir = 1 }, @@ -19107,6 +19086,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "gvR" = ( +/obj/structure/window/reinforced/spawner/directional/south, /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks{ dir = 1 @@ -19151,15 +19131,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light_switch/directional/west{ + pixel_y = -10 + }, /obj/structure/plaque/static_plaque/atmos{ pixel_y = -32 }, -/obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/closet/secure_closet/atmospherics, -/turf/open/floor/iron/dark, +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/office) "gwY" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, @@ -19526,10 +19506,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "gBR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "gBW" = ( @@ -19670,7 +19649,6 @@ "gEs" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/confetti, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "gEt" = ( @@ -19798,6 +19776,10 @@ /obj/structure/table/glass, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"gGV" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) "gGX" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -20028,15 +20010,11 @@ /turf/open/floor/iron/dark/textured, /area/station/maintenance/starboard/aft) "gJK" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 +/obj/machinery/space_heater, +/turf/open/floor/iron/dark/side{ + dir = 9 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark, -/area/station/security/prison/garden) +/area/station/security/prison) "gJM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -20070,7 +20048,6 @@ /turf/open/floor/iron/white, /area/station/science/genetics) "gKj" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, @@ -20336,15 +20313,13 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "gNS" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/item/stack/sheet/cardboard{ + amount = 14 }, -/obj/machinery/camera/directional/east{ - c_tag = "Security - Prison Workshop"; - network = list("ss13","prison") +/obj/item/stack/package_wrap, +/turf/open/floor/iron/dark/side{ + dir = 6 }, -/turf/open/floor/iron/dark, /area/station/security/prison/work) "gNX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -20432,7 +20407,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/status_display/evac/directional/west, /obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/wrench/medical, /obj/item/wrench/medical{ pixel_x = 4; @@ -20582,12 +20557,12 @@ /turf/open/floor/iron/dark/telecomms, /area/station/science/server) "gRf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) "gRk" = ( /obj/structure/table/wood, /obj/item/phone{ @@ -20637,7 +20612,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/chair/wood, +/obj/machinery/holopad, /turf/open/floor/wood, /area/station/security/prison/rec) "gRZ" = ( @@ -20709,9 +20684,15 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "gSB" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/cell_10k, /obj/machinery/quantum_server, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/dark, /area/station/security/bitden) "gSE" = ( /turf/open/floor/carpet/purple, @@ -20783,6 +20764,8 @@ /area/station/science/xenobiology) "gUl" = ( /obj/machinery/light_switch/directional/south, +/obj/machinery/camera/autoname/directional/south, +/obj/structure/punching_bag, /turf/open/floor/iron/dark, /area/station/security/prison/workout) "gUp" = ( @@ -20877,6 +20860,12 @@ /obj/effect/turf_decal/bot_white/left, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +"gWz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/safe) "gWE" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate, @@ -20984,7 +20973,7 @@ /area/station/engineering/atmos) "gYF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/bot_white, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -20993,9 +20982,13 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "gYH" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/prison) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/table/wood, +/obj/item/storage/dice, +/turf/open/floor/wood, +/area/station/security/prison/rec) "gYL" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -21066,7 +21059,7 @@ dir = 10 }, /obj/machinery/firealarm/directional/west, -/obj/structure/table/glass, +/obj/structure/table, /obj/item/hatchet, /obj/item/cultivator, /obj/item/crowbar/red, @@ -21389,9 +21382,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "hfI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -21418,12 +21408,15 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "hgf" = ( -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 8 + }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/dark, -/area/station/engineering/atmos/storage) +/area/station/hallway/primary/central) "hgg" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -21445,7 +21438,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/upgraded, /obj/machinery/light/directional/south, @@ -21606,7 +21599,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "hjZ" = ( -/turf/open/floor/iron, +/turf/open/floor/glass/reinforced, /area/station/security/prison/workout) "hkf" = ( /turf/open/floor/iron/dark/side{ @@ -21693,12 +21686,13 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "hlp" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 6 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 }, -/obj/structure/cable/layer1, -/turf/open/floor/iron, -/area/station/engineering/main) +/obj/structure/table/reinforced, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "hlu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21784,6 +21778,12 @@ }, /turf/open/floor/stone, /area/station/science/xenobiology) +"hml" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/camera/autoname/directional/south, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) "hmq" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -21792,15 +21792,16 @@ /turf/open/floor/iron/white, /area/station/science/circuits) "hmF" = ( -/obj/machinery/computer/order_console/bitrunning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark/textured, -/area/station/security/bitden) +/obj/item/radio/intercom/prison/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/security/prison) +"hmP" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/white, +/area/station/hallway/secondary/exit/departure_lounge) "hnr" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22001,10 +22002,10 @@ dir = 8 }, /obj/item/radio/intercom/directional/south, -/obj/machinery/light_switch/directional/west, /obj/structure/closet{ name = "Evidence Closet" }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/station/security/evidence) "hqM" = ( @@ -22301,18 +22302,22 @@ dir = 1 }, /obj/structure/table, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -3 - }, /obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 3 + pixel_x = -9; + pixel_y = 9 + }, +/obj/machinery/reagentgrinder{ + pixel_y = 8 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -9 }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "hvm" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/box/beakers, /obj/item/reagent_containers/cup/beaker/large, /obj/item/reagent_containers/dropper, @@ -22320,6 +22325,7 @@ /area/station/medical/pharmacy) "hvs" = ( /obj/machinery/airalarm/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/station/security/prison/workout) "hvz" = ( @@ -22347,7 +22353,7 @@ /area/station/ai_monitored/turret_protected/aisat_interior) "hvU" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/fax{ fax_name = "Medical Office"; name = "Medical Office Fax Machine" @@ -22388,7 +22394,7 @@ }, /obj/machinery/airalarm/directional/east, /obj/machinery/light/small/directional/east, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/iron/white, /area/station/medical/surgery) @@ -22452,7 +22458,7 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "hxv" = ( @@ -22755,6 +22761,11 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig/entrance) +"hDv" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) "hDE" = ( /obj/structure/tank_dispenser, /turf/open/floor/iron/white, @@ -22815,7 +22826,7 @@ "hEk" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/door/window/left/directional/east{ name = "Miscellaneous Medical Supplies"; req_access = list("medical") @@ -22897,8 +22908,10 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "hFr" = ( -/obj/machinery/griddle, -/obj/effect/turf_decal/bot, +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 5 + }, /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "hFF" = ( @@ -23113,6 +23126,13 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/storage) +"hJa" = ( +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "hJb" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/table/glass, @@ -23173,7 +23193,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, -/obj/machinery/light/small/directional/west, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -23182,6 +23201,7 @@ /obj/structure/cable, /obj/machinery/airalarm/directional/north, /obj/machinery/vending/mechcomp, +/obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron, /area/station/engineering/main) "hKA" = ( @@ -23224,7 +23244,9 @@ /obj/item/reagent_containers/cup/bottle/ammonia, /obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, /area/station/security/prison) "hLt" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -23789,6 +23811,7 @@ c_tag = "Arrivals - Bay 1, Lower Hallway"; name = "arrivals camera" }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "hUt" = ( @@ -23825,11 +23848,16 @@ dir = 4 }, /obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/brig) "hVl" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ +/obj/machinery/light/small/directional/south, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /turf/open/floor/engine, @@ -23902,7 +23930,6 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "hXt" = ( @@ -24185,12 +24212,10 @@ /turf/open/floor/iron/white, /area/station/maintenance/department/science) "iej" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/holopad, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain) "ieE" = ( @@ -24209,7 +24234,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/obj/machinery/defibrillator_mount/directional/south, /turf/open/floor/iron/white, /area/station/medical/exam_room) "ieP" = ( @@ -24221,20 +24245,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) -"ifb" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 8 - }, -/obj/structure/chair/sofa/corp{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) "ifj" = ( /obj/machinery/light/neon_lining{ dir = 4 @@ -24283,6 +24293,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) @@ -24307,11 +24318,12 @@ }, /area/station/service/theater) "ihg" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/trimline/blue/line{ +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/blue/corner{ dir = 1 }, -/obj/structure/closet/emcloset, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "ihh" = ( @@ -24347,11 +24359,11 @@ /turf/open/floor/plating, /area/station/service/hydroponics) "iiC" = ( -/obj/machinery/cryopod/prison{ - dir = 8 +/obj/structure/closet/secure_closet/freezer/kitchen{ + req_access = null }, -/turf/open/floor/iron/dark, -/area/station/security/prison/safe) +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) "iiE" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -24443,7 +24455,6 @@ /turf/open/floor/engine/plasma, /area/station/engineering/atmos) "ijG" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, /obj/effect/landmark/event_spawn, /turf/open/floor/iron, @@ -24775,12 +24786,10 @@ /turf/open/floor/plating, /area/station/engineering/atmos) "ioi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "iol" = ( @@ -24824,13 +24833,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "ipb" = ( -/obj/effect/turf_decal/box, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/holopad, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/prison/garden) +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/security/prison) "ipd" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/machinery/light/small/directional/west, @@ -24933,7 +24940,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/roller{ pixel_y = 6 }, @@ -24986,13 +24993,12 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "iqP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "iqQ" = ( @@ -25002,7 +25008,7 @@ /area/station/service/chapel/funeral) "iqR" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/book/manual/wiki/infections{ pixel_x = 5; pixel_y = 3 @@ -25057,6 +25063,15 @@ dir = 8 }, /area/station/engineering/storage/tech) +"irp" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/cryopod/prison{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/safe) "irt" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -25118,6 +25133,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"itd" = ( +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/iron/large, +/area/station/security/prison/safe) "itm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25318,8 +25341,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "iuQ" = ( -/obj/machinery/computer/atmos_alert, /obj/item/radio/intercom/directional/north, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/computer/atmos_alert, /turf/open/floor/iron, /area/station/engineering/main) "iuR" = ( @@ -25443,6 +25467,7 @@ "ivS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/plating, /area/station/maintenance/department/engine) "iwa" = ( @@ -25584,13 +25609,12 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engine/atmos) "iye" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/engineering/transit_tube) +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/atmos/office) "iym" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/line{ @@ -25671,8 +25695,7 @@ /turf/open/floor/grass, /area/station/hallway/primary/central) "izU" = ( -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron, +/turf/open/floor/glass/reinforced, /area/station/engineering/main) "iAb" = ( /obj/effect/turf_decal/bot, @@ -25723,6 +25746,10 @@ }, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) +"iBi" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "iBl" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 @@ -25743,7 +25770,9 @@ /obj/structure/reagent_dispensers/plumbed{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, /area/station/security/prison) "iBz" = ( /obj/machinery/light/small/directional/west, @@ -25878,17 +25907,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) -"iEZ" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) "iFb" = ( /obj/machinery/light/small/directional/east, /obj/structure/sign/warning/rad_shelter/directional/east, @@ -25901,10 +25919,12 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "iFo" = ( -/obj/item/kirbyplants/random, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/station/medical/cryo) "iFw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26041,6 +26061,11 @@ }, /turf/open/floor/iron/dark, /area/station/security/evidence) +"iHb" = ( +/obj/effect/turf_decal/box, +/obj/machinery/holopad, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/prison/garden) "iHe" = ( /obj/machinery/light/small/directional/south, /obj/machinery/camera/autoname/directional/south, @@ -26085,15 +26110,6 @@ /obj/effect/landmark/start/cyborg, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/satellite) -"iId" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) "iIh" = ( /turf/closed/wall/r_wall, /area/station/security/checkpoint/supply) @@ -26108,7 +26124,7 @@ /area/station/hallway/primary/fore) "iIn" = ( /obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/gloves/latex, @@ -26168,7 +26184,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 }, -/obj/machinery/defibrillator_mount/directional/south, /turf/open/floor/iron/white, /area/station/medical/exam_room) "iJc" = ( @@ -26275,10 +26290,15 @@ /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "iKJ" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/maintenance/department/engine/atmos) +/area/station/engineering/storage) "iKL" = ( /obj/effect/turf_decal/trimline/brown/line{ dir = 8 @@ -26290,15 +26310,18 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "iKO" = ( -/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/turf/open/floor/iron/dark, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "iKY" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/glasses/hud/health, /turf/open/floor/iron/white, @@ -26667,10 +26690,15 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "iQE" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) +/area/station/engineering/storage) "iQM" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -26728,26 +26756,10 @@ }, /area/station/commons/fitness/recreation) "iRv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/layer1, -/turf/open/floor/iron/textured, -/area/station/engineering/storage) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "iRy" = ( /obj/effect/spawner/random/structure/chair_flipped{ dir = 1 @@ -26795,16 +26807,15 @@ /turf/open/floor/wood, /area/station/commons/vacant_room/office) "iSM" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 }, -/obj/machinery/light/directional/south, -/obj/vehicle/ridden/wheelchair{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/line{ + dir = 8 }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) +/obj/structure/sign/departments/medbay/alt/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "iTg" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/chair, @@ -26961,18 +26972,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "iWL" = ( -/obj/machinery/light/directional/south, /obj/structure/noticeboard/directional/south, +/obj/machinery/light/directional/south, /obj/machinery/computer/slot_machine, /turf/open/floor/iron/dark, /area/station/command/meeting_room) -"iWX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "iXg" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/binary/pump/on/layer2{ @@ -27110,6 +27114,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"iYP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/security/prison/garden) "iYW" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, @@ -27562,15 +27570,12 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "jhR" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/dark_red/arrow_cw{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/shower) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/station/security/prison/rec) "jic" = ( /obj/effect/decal/cleanable/cobweb, /obj/item/radio/intercom/directional/west, @@ -27589,9 +27594,8 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "jiu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 }, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain) @@ -27687,17 +27691,11 @@ /area/station/maintenance/port/aft) "jkt" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/line{ dir = 8 }, -/obj/structure/chair/sofa/corp/right{ - dir = 8 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/white/textured, +/area/station/medical/chemistry) "jkz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -27807,15 +27805,10 @@ }, /area/station/cargo/office) "jlO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable/layer1, -/turf/open/floor/iron, -/area/station/engineering/storage) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "jlX" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -27835,9 +27828,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/line, -/obj/structure/chair/sofa/corp/right{ - dir = 8 - }, +/obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "jmh" = ( @@ -27926,8 +27917,11 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "joc" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/machinery/washing_machine, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "joj" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -28190,7 +28184,31 @@ dir = 9 }, /obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe/epinephrine, +/obj/item/wrench/medical, /turf/open/floor/engine, /area/station/medical/cryo) "juH" = ( @@ -28355,11 +28373,10 @@ /turf/open/floor/iron/white, /area/station/maintenance/department/science) "jxd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/dark_red/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "jxl" = ( @@ -28373,7 +28390,7 @@ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science{ pixel_x = 2; @@ -28439,7 +28456,6 @@ /area/station/ai_monitored/turret_protected/ai_upload) "jyb" = ( /obj/item/radio/intercom/directional/east, -/obj/machinery/light/small/directional/east, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) @@ -28508,15 +28524,15 @@ /turf/open/floor/iron/dark/corner, /area/station/commons/storage/primary) "jzw" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/red/line{ +/obj/effect/turf_decal/trimline/blue/line{ dir = 8 }, -/obj/effect/spawner/random/vending/snackvend, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "jzQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28611,7 +28627,9 @@ /area/station/tcommsat/server) "jBF" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 5 + }, /obj/machinery/meter, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -28649,6 +28667,7 @@ dir = 1 }, /obj/machinery/light/directional/south, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "jCy" = ( @@ -28724,7 +28743,9 @@ /turf/open/floor/iron, /area/station/maintenance/port/fore) "jDD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "jDX" = ( @@ -28765,8 +28786,7 @@ "jEI" = ( /obj/structure/table, /obj/item/kitchen/fork/plastic, -/obj/machinery/firealarm/directional/west, -/obj/machinery/light/small/directional/west, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/security/prison/mess) "jEW" = ( @@ -28780,14 +28800,14 @@ /turf/open/floor/iron/dark, /area/station/security/processing) "jEY" = ( -/obj/effect/turf_decal/box, -/obj/machinery/holopad, +/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, -/turf/open/floor/iron/dark/smooth_large, +/obj/effect/mapping_helpers/apc/cell_5k, +/turf/open/floor/iron/dark/side, /area/station/security/prison/safe) "jFb" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/roller{ pixel_y = 6 }, @@ -28815,10 +28835,11 @@ dir = 8 }, /obj/structure/cable, +/obj/item/radio/intercom/directional/south, +/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/computer/security{ dir = 4 }, -/obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "jFo" = ( @@ -28833,7 +28854,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/crowbar/red, /obj/item/reagent_containers/cup/beaker{ pixel_x = 8; @@ -28879,7 +28900,6 @@ /turf/open/floor/iron, /area/station/engineering/main) "jGm" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/atmospheric_technician, /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 10 @@ -28894,13 +28914,14 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "jGt" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/structure/sign/warning/rad_shelter/directional/east, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, -/area/station/security/prison) +/area/station/security/interrogation) "jGx" = ( /obj/machinery/plumbing/ooze_sucker{ mapping_id = "4"; @@ -28941,12 +28962,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "jHa" = ( -/obj/structure/closet/crate/trashcart/laundry, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, -/obj/item/clothing/shoes/sneakers/orange, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/machinery/firealarm/directional/south, +/obj/structure/closet/crate/trashcart/laundry, /obj/item/clothing/under/rank/prisoner/skirt{ pixel_x = 9; pixel_y = 5 @@ -28963,7 +28983,11 @@ pixel_x = 9; pixel_y = 5 }, -/turf/open/floor/iron/dark, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/obj/item/clothing/shoes/sneakers/orange, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "jHh" = ( /obj/structure/lattice, @@ -28990,9 +29014,6 @@ /obj/effect/turf_decal/trimline/green/line{ dir = 1 }, -/obj/machinery/camera/directional/south{ - c_tag = "Port Hallway Center" - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -29077,11 +29098,13 @@ /turf/open/floor/iron/large, /area/station/commons/dorms) "jJq" = ( +/obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, -/turf/open/floor/iron/white, +/obj/machinery/holopad, +/turf/open/floor/iron/white/smooth_large, /area/station/science/genetics/cloning) "jJr" = ( /obj/structure/closet/emcloset/anchored, @@ -29160,6 +29183,7 @@ "jKn" = ( /obj/machinery/camera/autoname/directional/south, /obj/machinery/light/small/directional/south, +/obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, @@ -29271,19 +29295,6 @@ }, /turf/open/floor/plating, /area/station/ai_monitored/security/armory) -"jLI" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 4 - }, -/obj/machinery/light_switch/directional/west, -/obj/structure/chair/sofa/corp{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "jLL" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -29331,11 +29342,6 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"jMb" = ( -/obj/machinery/light/small/directional/east, -/obj/structure/cable/layer1, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) "jMj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29366,8 +29372,12 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "jMT" = ( -/obj/item/stack/ore/slag, -/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) @@ -29454,6 +29464,7 @@ dir = 8 }, /obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -29554,10 +29565,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Armory" }, -/obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) @@ -30178,6 +30190,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark/side, /area/station/commons/locker) +"kcr" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/security/prison/work) +"kcM" = ( +/obj/structure/cable, +/turf/open/floor/carpet/black, +/area/station/security/bitden) "kde" = ( /obj/machinery/light/small/directional/south, /obj/structure/closet/emcloset, @@ -30191,6 +30213,7 @@ /area/station/commons/fitness) "kdy" = ( /obj/machinery/light/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/wood, /area/station/service/library/private) "kdH" = ( @@ -30223,6 +30246,10 @@ /obj/structure/sign/departments/maint/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"ked" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "keg" = ( /obj/structure/flora/grass/jungle/a/style_random, /turf/open/floor/grass, @@ -30237,6 +30264,7 @@ /area/station/hallway/primary/starboard) "ken" = ( /obj/machinery/light_switch/directional/east, +/obj/structure/extinguisher_cabinet/directional/south, /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, /area/station/maintenance/disposal) @@ -30523,6 +30551,14 @@ }, /turf/open/floor/iron/dark, /area/station/medical/exam_room) +"kix" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "kiC" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/structure/closet/secure_closet/security/sec, @@ -30683,6 +30719,7 @@ /area/station/command/bridge) "kle" = ( /obj/machinery/firealarm/directional/west, +/obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "klm" = ( @@ -30695,13 +30732,15 @@ /turf/open/floor/iron/white, /area/station/science/research) "klo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Atmospherics Pumping Room"; + name = "engineering camera" + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 }, -/obj/machinery/light/small/directional/west, -/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark, -/area/station/engineering/atmos/storage) +/area/station/engineering/atmos/pumproom) "klr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/chair_maintenance{ @@ -30991,11 +31030,12 @@ /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) "kqp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/carpet/black, +/area/station/security/bitden) "kqr" = ( /obj/item/radio/intercom/directional/east, /obj/machinery/button/door/directional/south{ @@ -31093,7 +31133,7 @@ dir = 1 }, /obj/structure/cable, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "ksl" = ( /obj/effect/turf_decal/tile/blue/fourcorners, @@ -31125,12 +31165,14 @@ /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "ksZ" = ( -/obj/structure/chair/wood{ - dir = 8 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/machinery/griddle, +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) +"ktq" = ( +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/grill, +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) "ktt" = ( /obj/machinery/light/directional/west, /obj/structure/table, @@ -31172,7 +31214,7 @@ "kuC" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "kuJ" = ( /obj/machinery/newscaster/directional/west, @@ -31228,10 +31270,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "kvL" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/plating, -/area/station/engineering/atmos/storage) +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "kvW" = ( /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, @@ -31350,13 +31391,7 @@ /turf/open/floor/iron/dark, /area/station/security/holding_cell) "kxu" = ( -/obj/machinery/light_switch/directional/south, -/obj/structure/table, -/obj/item/shovel/spade, -/obj/item/plant_analyzer, -/obj/item/cultivator, -/obj/item/reagent_containers/cup/watering_can, -/obj/machinery/firealarm/directional/west, +/obj/machinery/composters, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "kxC" = ( @@ -31473,13 +31508,12 @@ /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/rd) "kzh" = ( -/obj/machinery/computer/quantum_console, -/obj/machinery/light/neon_lining{ - dir = 8 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 }, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark/textured, +/obj/item/radio/intercom/prison/directional/south, +/obj/machinery/byteforge, +/turf/open/floor/iron/dark, /area/station/security/bitden) "kzi" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -31688,6 +31722,7 @@ /area/station/maintenance/starboard/aft) "kDx" = ( /obj/machinery/firealarm/directional/east, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/side{ dir = 6 }, @@ -31720,9 +31755,7 @@ name = "medical camera"; network = list("ss13","medbay") }, -/obj/machinery/computer/records/security{ - dir = 1 - }, +/obj/structure/closet/secure_closet/security/med, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "kEt" = ( @@ -31763,13 +31796,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "kFf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, -/obj/machinery/atmospherics/components/tank/air{ - dir = 4 - }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "kFk" = ( @@ -31816,10 +31844,9 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "kFK" = ( -/obj/effect/turf_decal/stripes/line, +/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, -/mob/living/basic/mouse/brown/tom, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side, /area/station/security/prison/work) "kFM" = ( /obj/machinery/navbeacon{ @@ -31897,16 +31924,15 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "kHL" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Atmospherics Pumping Room"; - name = "engineering camera" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) +/obj/machinery/door/firedoor, +/turf/open/floor/iron/textured, +/area/station/engineering/main) "kHP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, @@ -31918,8 +31944,14 @@ /turf/open/floor/engine, /area/station/science/explab) "kIl" = ( -/obj/machinery/light_switch/directional/south, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8 + }, /obj/machinery/camera/autoname/directional/south, +/obj/machinery/firealarm/directional/south, +/obj/structure/chair/wood{ + dir = 8 + }, /turf/open/floor/wood, /area/station/security/prison/rec) "kIn" = ( @@ -32066,18 +32098,19 @@ /obj/effect/turf_decal/trimline/red/line{ dir = 1 }, -/obj/machinery/light_switch/directional/south, /obj/machinery/light/directional/south, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/station/security/office) "kKw" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/turf_decal/tile/yellow/full, /obj/effect/turf_decal/delivery, +/obj/machinery/light/small/directional/west, /obj/machinery/door/window/left/directional/south{ name = "Engineering Deliveries"; req_access = list("engineering") }, -/turf/open/floor/iron, +/turf/open/floor/iron/large, /area/station/engineering/storage) "kKH" = ( /obj/effect/turf_decal/stripes/end, @@ -32176,10 +32209,12 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "kMH" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/captain/private) "kMR" = ( /obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, @@ -32228,7 +32263,7 @@ dir = 4 }, /obj/machinery/newscaster/directional/south, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/structure/chair{ dir = 1 }, @@ -32317,11 +32352,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) -"kOk" = ( -/obj/structure/cable, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron/dark, -/area/station/security/prison) "kOo" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ dir = 1 @@ -32383,9 +32413,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "kPo" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32490,7 +32517,6 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "kQK" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -32562,6 +32588,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/station/medical/morgue) "kRu" = ( @@ -32573,9 +32600,7 @@ "kRw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, +/obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/machinery/duct, /turf/open/floor/carpet/royalblue, @@ -32604,7 +32629,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/box, -/turf/open/floor/iron, +/turf/open/floor/iron/large, /area/station/tcommsat/computer) "kSL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32861,7 +32886,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/table/glass, +/obj/structure/table, /obj/item/food/grown/wheat, /obj/item/food/grown/watermelon, /obj/item/food/grown/watermelon, @@ -32922,11 +32947,10 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "kWN" = ( -/obj/machinery/computer/cryopod/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/side{ + dir = 10 }, -/turf/open/floor/iron/dark, /area/station/security/prison/safe) "kWT" = ( /obj/effect/spawner/random/trash/moisture_trap, @@ -32953,13 +32977,13 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) "kXf" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/turf_decal/tile/yellow/full, /obj/effect/turf_decal/delivery, /obj/machinery/door/window/left/directional/north{ name = "Atmospherics Deliveries"; req_access = list("atmospherics") }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/break_room) "kXq" = ( /obj/effect/turf_decal/stripes/end{ @@ -32976,18 +33000,16 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "kXH" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "kXK" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/seed_extractor, -/obj/machinery/camera/autoname/directional/south, -/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/item/shovel/spade, +/obj/item/plant_analyzer, +/obj/item/cultivator, +/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "kXL" = ( @@ -33069,9 +33091,9 @@ /turf/open/floor/wood, /area/station/service/library/private) "kYW" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, +/obj/structure/table, +/obj/item/storage/belt/utility, +/obj/item/clothing/mask/breath, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "kZe" = ( @@ -33115,7 +33137,6 @@ /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) "kZS" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -33285,6 +33306,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "ldX" = ( @@ -33295,6 +33317,26 @@ dir = 4 }, /area/station/commons/fitness) +"lea" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen_sec_shutters"; + name = "Kitchen Shutters"; + dir = 1 + }, +/obj/structure/desk_bell{ + pixel_y = 2; + pixel_x = -6 + }, +/turf/open/floor/iron/dark/textured, +/area/station/service/kitchen) "lej" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -33321,8 +33363,8 @@ /obj/machinery/camera/autoname/directional/south, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, -/obj/structure/chair/comfy/brown{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 }, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) @@ -33436,20 +33478,15 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ name = "Cleaning Closet" }, -/obj/machinery/duct, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/textured, /area/station/security/prison) "lfo" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/structure/cable/layer1, /turf/open/floor/iron, /area/station/engineering/main) @@ -33475,19 +33512,14 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "lfI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/item/grown/bananapeel, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 +/obj/machinery/light_switch/directional/north{ + pixel_x = -8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/department/engine/atmos) +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/bot, +/obj/structure/liquid_pump, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/atmos) "lfT" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/light/directional/south, @@ -33620,13 +33652,20 @@ /turf/open/floor/iron/textured, /area/station/ai_monitored/command/storage/eva) "liD" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/grunge{ + name = "Bitrunner Den" }, +/obj/effect/landmark/navigate_destination/common/bitrunner, /turf/open/floor/iron/dark/textured, /area/station/security/bitden) "liE" = ( @@ -33643,13 +33682,20 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "liN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "engineering"; + name = "Engineering Blast Door" }, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/storage) "liQ" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating, @@ -33819,20 +33865,21 @@ /turf/open/floor/plating, /area/station/security/detectives_office) "lng" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/blue/corner{ - dir = 1 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/structure/disposalpipe/trunk{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/disposaloutlet{ - dir = 1 +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/fullgrass/style_random, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "med_lockdown"; + name = "Medbay Emergency Lockdown Shutters"; + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) +/turf/open/floor/grass, +/area/station/medical/medbay/central) "lnm" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -33978,13 +34025,20 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) "lpn" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/spawner/random/structure/steam_vent, -/turf/open/floor/plating, +/obj/machinery/door/airlock/atmos{ + name = "Turbine Access" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/landmark/navigate_destination/incinerator, +/turf/open/floor/iron/textured, /area/station/maintenance/department/engine/atmos) "lpR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -34066,8 +34120,8 @@ /area/station/maintenance/starboard/aft) "lrp" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/light/small/directional/south, /obj/machinery/camera/autoname/directional/south, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/engineering/main) "lrv" = ( @@ -34091,6 +34145,7 @@ c_tag = "Command - EVA Storage North"; name = "motion-sensitive command camera" }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/space_heater, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) @@ -34102,25 +34157,16 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) "lsx" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/effect/turf_decal/box, +/obj/machinery/light/small/directional/west, +/obj/structure/closet/crate, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/obj/structure/closet/crate/hydroponics, -/obj/item/botanical_lexicon, -/obj/item/seeds/tree, -/obj/effect/spawner/random/contraband/prison, -/obj/item/seeds/pumpkin, -/obj/item/seeds/wheat, -/obj/item/seeds/ambrosia, -/obj/item/seeds/grass, -/obj/item/seeds/carrot, -/obj/item/seeds/tomato, -/obj/item/seeds/potato, -/obj/item/seeds/garlic, -/obj/item/seeds/onion, -/obj/item/paper/guides/jobs/hydroponics, -/turf/open/floor/iron/dark, -/area/station/security/prison/garden) +/area/station/security/prison/work) "lsC" = ( /obj/structure/chair/wood{ dir = 4 @@ -34177,7 +34223,10 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "ltj" = ( -/obj/structure/sink/kitchen/directional/east, +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_y = 9 + }, /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "ltp" = ( @@ -34345,9 +34394,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "lvl" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/prison/workout) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/carpet/black, +/area/station/security/bitden) "lvp" = ( /obj/machinery/duct, /obj/effect/turf_decal/stripes/line{ @@ -34620,8 +34671,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, -/obj/machinery/light/directional/east, -/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/table, /obj/item/stack/sheet/iron/fifty{ pixel_y = 5; @@ -34658,13 +34707,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "lBB" = ( -/obj/machinery/light/small/directional/south, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/effect/mapping_helpers/apc/cell_5k, /obj/item/storage/bag/trash, /obj/item/storage/bag/trash, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/side, /area/station/security/prison) "lBC" = ( /obj/structure/weightmachine/stacklifter, @@ -34746,10 +34794,13 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "lCo" = ( -/obj/machinery/oven/range, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/kitchen, -/area/station/security/prison/mess) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/work) "lCs" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -34757,7 +34808,6 @@ /obj/effect/turf_decal/trimline/blue/corner{ dir = 4 }, -/obj/machinery/light/directional/south, /obj/structure/bed/roller, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) @@ -34958,16 +35008,10 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "lGd" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/structure/sign/departments/engineering/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Engineering - Atmospherics Incinerator Access"; - name = "engineering camera" - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/area/station/engineering/atmos/pumproom) "lGp" = ( /obj/effect/spawner/random/structure/furniture_parts, /turf/open/floor/plating, @@ -35034,11 +35078,10 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "lGW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/structure/chair/comfy/black, +/obj/effect/landmark/start/station_engineer, +/turf/open/floor/iron, +/area/station/engineering/break_room) "lHd" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/closed/wall/r_wall, @@ -35086,13 +35129,15 @@ /turf/open/floor/iron, /area/station/science/ordnance) "lIt" = ( -/obj/effect/turf_decal/box, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/holopad, /obj/machinery/duct, -/turf/open/floor/iron/dark/smooth_large, +/obj/machinery/holopad, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "lIF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35108,7 +35153,7 @@ /obj/machinery/light_switch/directional/north{ pixel_x = 8 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/roller{ pixel_y = 6 }, @@ -35118,13 +35163,9 @@ /turf/open/floor/iron/white, /area/station/science/genetics) "lIO" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/trimline/red/filled/corner, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/station/security/bitden) +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/safe) "lIQ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ @@ -35175,14 +35216,12 @@ /turf/open/floor/iron/dark, /area/station/command/meeting_room) "lJD" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/decal/cleanable/ash, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/obj/structure/sign/poster/official/random/directional/north, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "lJH" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -35212,9 +35251,9 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "lKe" = ( -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "lKk" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -35541,7 +35580,7 @@ location = "Medbay" }, /obj/structure/plasticflaps/opaque, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/smooth_large, /area/station/maintenance/department/medical) "lOJ" = ( /obj/structure/window/reinforced/spawner/directional/south, @@ -35697,6 +35736,7 @@ /obj/machinery/camera/autoname/directional/south, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark/side, /area/station/engineering/storage_shared) "lTk" = ( @@ -35796,8 +35836,8 @@ /turf/open/floor/iron/dark/side, /area/station/service/janitor) "lVd" = ( -/obj/structure/cable, -/obj/structure/chair/stool/directional/north, +/obj/machinery/light/directional/east, +/obj/structure/table, /turf/open/floor/iron/dark, /area/station/security/prison/mess) "lVh" = ( @@ -35841,6 +35881,9 @@ dir = 6 }, /obj/machinery/firealarm/directional/east, +/obj/machinery/light_switch/directional/east{ + pixel_y = -10 + }, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "lWA" = ( @@ -35987,8 +36030,12 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "lZs" = ( -/turf/closed/wall, -/area/station/security/office) +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/computer/records/security{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "lZu" = ( /obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/random/directional/south, @@ -36016,7 +36063,6 @@ /turf/open/space/basic, /area/space) "lZA" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -36140,17 +36186,21 @@ /turf/open/floor/plating/reinforced, /area/station/maintenance/department/science) "maP" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/line{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/chair{ +/obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) +/obj/structure/flora/grass/jungle/b/style_random, +/obj/structure/flora/bush/grassy/style_random, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "med_lockdown"; + name = "Medbay Emergency Lockdown Shutters"; + dir = 8 + }, +/turf/open/floor/grass, +/area/station/medical/medbay/central) "maX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36166,11 +36216,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"mbp" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/status_display/ai/directional/south, -/turf/open/floor/iron/dark/side, -/area/station/engineering/storage_shared) "mbx" = ( /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) @@ -36284,16 +36329,13 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "mcU" = ( -/obj/machinery/shower/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/soap/homemade, -/obj/effect/turf_decal/trimline/dark_red/arrow_cw{ +/obj/machinery/camera/autoname/directional/east, +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole/bookmanagement{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/shower) +/turf/open/floor/wood, +/area/station/security/prison/rec) "mcY" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -36349,8 +36391,11 @@ /turf/open/floor/iron, /area/station/maintenance/disposal) "mei" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/structure/cable, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "mej" = ( /obj/machinery/camera/autoname/directional/south, @@ -36476,10 +36521,8 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_y = 8 - }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "mhD" = ( @@ -36547,12 +36590,13 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "miM" = ( +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/light/small/directional/west, /obj/machinery/button/door/directional/west{ id = "external_engine_storage"; name = "External Engine Storage Control"; req_access = list("engineering") }, -/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "miU" = ( @@ -36566,6 +36610,11 @@ /obj/effect/spawner/random/trash/bin, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"mjk" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/station/maintenance/department/science) "mjw" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -36825,7 +36874,7 @@ dir = 10 }, /obj/machinery/light/directional/south, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/fancy/cigarettes{ pixel_x = 2 }, @@ -36934,10 +36983,13 @@ /turf/open/space, /area/space/nearstation) "mpo" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/decal/cleanable/ash, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "engineering"; + name = "Engineering Blast Door" + }, /turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/area/station/engineering/main) "mpw" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -37237,15 +37289,8 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/transit_tube) "mtq" = ( -/obj/effect/decal/cleanable/oil/slippery, -/obj/machinery/door/airlock/grunge{ - name = "Bitrunner Den" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/showroomfloor, -/area/station/security/bitden) +/turf/closed/wall/r_wall, +/area/station/security/prison/shower) "mtH" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ dir = 5 @@ -37383,15 +37428,10 @@ /obj/effect/spawner/random/contraband/prison, /obj/effect/spawner/random/trash/garbage, /obj/effect/spawner/random/trash/garbage, -/turf/open/floor/plating, -/area/station/security/prison) -"mvN" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 9 +/turf/open/floor/iron/dark/side{ + dir = 6 }, -/obj/effect/turf_decal/trimline/blue/corner, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/area/station/security/prison) "mvS" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -37427,7 +37467,6 @@ /turf/open/floor/iron, /area/station/command/gateway) "mwK" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mwQ" = ( @@ -37508,7 +37547,7 @@ /area/station/cargo/miningoffice) "mxy" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty{ pixel_x = 3; @@ -37572,7 +37611,7 @@ dir = 8 }, /obj/machinery/light_switch/directional/west, -/obj/structure/table/glass, +/obj/structure/table, /obj/item/cultivator, /obj/item/hatchet, /obj/item/crowbar/red, @@ -37691,8 +37730,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/processor, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -37760,15 +37797,22 @@ "mDv" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/engine) +"mDP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "mDR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "mEc" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/storage) +/obj/effect/turf_decal/bot, +/obj/machinery/space_heater, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/atmos) "mEf" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 @@ -37889,7 +37933,6 @@ /area/station/hallway/primary/starboard) "mHm" = ( /obj/effect/turf_decal/tile/yellow, -/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -37902,7 +37945,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/table/glass, +/obj/structure/table, /obj/item/clothing/glasses/hud/health, /obj/item/toy/figure/cmo{ pixel_y = 8; @@ -38105,9 +38148,6 @@ /area/station/command/bridge) "mLW" = ( /obj/machinery/airalarm/directional/south, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/bed/dogbed/renault, -/mob/living/basic/pet/fox/renault, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "mMm" = ( @@ -38210,14 +38250,11 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mNF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ +/obj/effect/turf_decal/trimline/dark_red/corner{ dir = 1 }, -/obj/effect/landmark/generic_maintenance_landmark, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mNW" = ( @@ -38319,13 +38356,19 @@ /obj/machinery/firealarm/directional/north{ pixel_x = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/flask/gold{ + pixel_x = 6; + pixel_y = 14 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 +/obj/item/storage/box/matches{ + pixel_x = 4 }, -/obj/machinery/duct, +/obj/item/razor{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/clothing/mask/cigarette/cigar, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) "mPg" = ( @@ -38371,11 +38414,9 @@ /turf/open/floor/iron/white, /area/station/maintenance/department/science) "mQx" = ( -/obj/machinery/light_switch/directional/east, -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo" +/obj/structure/closet/secure_closet/freezer/meat{ + req_access = null }, -/obj/effect/turf_decal/bot, /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "mQA" = ( @@ -38468,11 +38509,12 @@ /turf/open/floor/iron/dark/textured, /area/station/maintenance/starboard/aft) "mRG" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/west, -/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/area/station/engineering/atmos/storage) "mRL" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood/corner{ @@ -38481,7 +38523,6 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "mRM" = ( @@ -38682,6 +38723,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) @@ -38829,7 +38871,7 @@ /area/station/construction/mining/aux_base) "mXS" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark/side, /area/station/engineering/storage_shared) @@ -39050,9 +39092,9 @@ }, /area/station/cargo/miningoffice) "ncG" = ( -/obj/machinery/light/small/directional/south, -/obj/machinery/composters, -/obj/effect/turf_decal/bot, +/obj/machinery/camera/autoname/directional/south, +/obj/machinery/airalarm/directional/south, +/obj/machinery/seed_extractor, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "ndh" = ( @@ -39084,12 +39126,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "ndm" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/structure/tank_holder/oxygen/yellow, -/turf/open/floor/iron, -/area/station/engineering/main) +/obj/item/soap/deluxe, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/captain/private) "ndr" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/structure/chair/sofa/bench{ @@ -39113,7 +39152,7 @@ dir = 9 }, /obj/machinery/airalarm/directional/north, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/pill_bottle/mutadone{ pixel_x = 8; pixel_y = 12 @@ -39413,7 +39452,7 @@ /area/station/medical/medbay/lobby) "nir" = ( /obj/effect/spawner/random/structure/table_or_rack, -/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance/two, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -39627,7 +39666,6 @@ /turf/open/floor/plating, /area/station/medical/pharmacy) "nli" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -39838,6 +39876,7 @@ /area/station/maintenance/port/fore) "noQ" = ( /obj/machinery/duct, +/obj/structure/window/reinforced/spawner/directional/south, /obj/structure/table/reinforced, /obj/machinery/chem_dispenser/drinks/beer{ dir = 1 @@ -39873,6 +39912,7 @@ "nqm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -39884,11 +39924,10 @@ /turf/open/floor/iron/dark, /area/station/security/prison) "nqE" = ( +/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/graffiti, -/obj/effect/decal/cleanable/confetti, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard/aft) "nqG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, @@ -39903,11 +39942,7 @@ "nrd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/small/directional/north, /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/engine) @@ -39932,16 +39967,13 @@ /turf/open/floor/stone, /area/station/smithing) "nrr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/obj/item/clothing/mask/gas/clown_hat, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/obj/effect/turf_decal/trimline/red/line, +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "nrz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -39951,7 +39983,7 @@ "nrA" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/item/radio/intercom/directional/south, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/reagentgrinder{ pixel_y = 8 }, @@ -40035,13 +40067,15 @@ /turf/open/floor/iron, /area/station/engineering/main) "nsw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/dark_red/arrow_cw, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/shower) +/obj/machinery/door/poddoor/shutters{ + id = "bitrunner_den"; + name = "Bitrunner Den Shutters"; + dir = 8 + }, +/turf/open/floor/plating, +/area/station/security/bitden) "nsA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40410,16 +40444,16 @@ /turf/open/floor/wood, /area/station/commons/vacant_room/office) "nyT" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ dir = 5 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "nyU" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/box/beakers, /obj/item/storage/box/syringes{ pixel_x = 4; @@ -40525,10 +40559,11 @@ /turf/open/floor/wood, /area/station/service/library/private) "nAK" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/bot, +/obj/machinery/airalarm/directional/east, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "nAM" = ( /obj/machinery/firealarm/directional/north, @@ -40647,8 +40682,8 @@ /area/station/hallway/primary/port) "nCa" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil/slippery, -/turf/open/floor/iron, +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "nCp" = ( /obj/effect/turf_decal/box, @@ -40673,6 +40708,14 @@ dir = 1 }, /area/station/commons/fitness) +"nCK" = ( +/obj/machinery/camera/autoname/directional/east, +/obj/machinery/light_switch/directional/east, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/station/security/bitden) "nCY" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/airalarm/directional/south, @@ -40754,11 +40797,12 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "nEx" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "nEI" = ( /obj/effect/spawner/random/trash/hobo_squat, /turf/open/floor/plating, @@ -40787,6 +40831,11 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron/dark, /area/station/security/brig) +"nFo" = ( +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark/side, +/area/station/cargo/storage) "nFw" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -40833,23 +40882,23 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/escape) "nGg" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, +/turf/open/floor/glass/reinforced, /area/station/commons/fitness/recreation) "nGl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/chair/wood, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/security/prison/mess) "nGn" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/port/fore) "nGp" = ( -/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/structure/cable, -/turf/open/floor/iron/dark, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "nGs" = ( /obj/machinery/duct, @@ -40889,7 +40938,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/roller{ pixel_y = 6 }, @@ -40936,7 +40985,6 @@ /turf/open/floor/carpet/red, /area/station/commons/dorms) "nIb" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/west{ c_tag = "Engineering - Atmospherics Incinerator"; name = "engineering camera" @@ -40985,9 +41033,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"nIA" = ( -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/captain/private) "nIC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -41125,16 +41170,11 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/turret_protected/ai) "nKe" = ( -/obj/machinery/light/dim/directional/east, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/stripes/end{ - dir = 4 +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/side{ + dir = 5 }, -/obj/effect/landmark/start/prisoner, -/turf/open/floor/carpet/black, -/area/station/security/bitden) +/area/station/security/prison/work) "nKf" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/light/small/directional/south, @@ -41147,10 +41187,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "nKo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/security/prison/workout) +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/prison) "nKr" = ( /turf/closed/wall, /area/station/solars/starboard/fore) @@ -41230,11 +41269,6 @@ /obj/structure/particle_accelerator/particle_emitter/left, /turf/open/floor/plating/airless, /area/space/nearstation) -"nLS" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/item/grown/bananapeel, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) "nMm" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -41465,10 +41499,13 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "nPx" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/cable, /obj/structure/table, /obj/structure/bedsheetbin, -/obj/structure/cable, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "nPz" = ( /obj/structure/flora/bush/large/style_random, @@ -41487,10 +41524,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "nPI" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron/dark, +/turf/open/floor/glass/reinforced, /area/station/commons/fitness/recreation) "nPL" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, @@ -41638,7 +41673,7 @@ /area/station/ai_monitored/turret_protected/ai) "nTB" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/wine, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -8; pixel_y = 8 @@ -41663,17 +41698,6 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/service) -"nUs" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/blue/corner{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "nUv" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -41781,11 +41805,8 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "nWh" = ( +/obj/machinery/duct, /obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/soup_pot{ - pixel_x = 4; - pixel_y = 8 - }, /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "nWp" = ( @@ -42048,32 +42069,7 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "oaa" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/random/contraband/prison, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/spoon/plastic, -/obj/item/kitchen/spoon/plastic, -/obj/item/kitchen/spoon/plastic, -/obj/item/knife/plastic, -/obj/item/knife/plastic, -/obj/item/knife/plastic, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/machinery/light/directional/south, +/obj/machinery/light_switch/directional/south, /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "oak" = ( @@ -42125,9 +42121,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "oaK" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "oaN" = ( @@ -42147,7 +42142,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/light/directional/east, /obj/item/wrench, /obj/item/clothing/gloves/latex, @@ -42235,6 +42230,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, +/obj/machinery/light/small/directional/east, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/station/medical/storage) @@ -42266,12 +42262,28 @@ /obj/item/storage/book/bible, /turf/open/floor/carpet, /area/station/service/chapel) +"ocC" = ( +/obj/item/radio/intercom/prison/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/prison/mess) "ocD" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners{ +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen_sec_shutters"; + name = "Kitchen Shutters"; dir = 1 }, -/obj/structure/cable, -/turf/open/floor/iron/kitchen, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 10 + }, +/turf/open/floor/iron/dark/textured, /area/station/service/kitchen) "oda" = ( /obj/effect/turf_decal/tile/purple/fourcorners, @@ -42389,13 +42401,13 @@ /area/station/service/library) "oga" = ( /obj/machinery/firealarm/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel/office) "ogd" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/blood/old, -/obj/item/gun/ballistic/rifle/boltaction/pipegun, /obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -42434,7 +42446,6 @@ dir = 5 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "ogK" = ( @@ -42474,6 +42485,14 @@ /obj/effect/spawner/random/food_or_drink/snack, /turf/open/floor/carpet/cyan, /area/station/medical/break_room) +"ogX" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "ogY" = ( /turf/closed/wall, /area/station/cargo/sorting) @@ -42761,15 +42780,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "olH" = ( -/obj/machinery/computer/atmos_control/nocontrol/master{ - dir = 8 - }, -/obj/machinery/requests_console/directional/east{ - assistance_requestable = 1; - department = "Atmospherics"; - name = "Atmospherics Requests Console"; - supplies_requestable = 1 - }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/computer/station_alert, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "olQ" = ( @@ -42947,6 +42959,11 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"ooM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/punching_bag, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "ooP" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -42975,7 +42992,6 @@ pixel_x = 4; pixel_y = 4 }, -/obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/station/maintenance/department/medical) "opa" = ( @@ -42983,11 +42999,11 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "ope" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "opr" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -43024,11 +43040,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "opP" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/firealarm/directional/west, -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/atmos/office) "opU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -43045,10 +43062,8 @@ /turf/open/floor/iron/dark/textured, /area/station/service/bar) "oqf" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 10 - }, -/obj/item/kirbyplants/random, +/obj/machinery/light/small/directional/east, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "oqp" = ( @@ -43189,6 +43204,7 @@ /turf/open/floor/carpet/red, /area/station/commons/dorms) "otg" = ( +/obj/structure/cable, /obj/structure/chair/comfy/black{ dir = 8 }, @@ -43237,7 +43253,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, -/obj/machinery/airalarm/directional/south, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -43514,7 +43529,8 @@ c_tag = "Command - Gateway"; name = "command camera" }, -/obj/structure/table/reinforced, +/obj/structure/rack, +/obj/item/extinguisher, /turf/open/floor/iron, /area/station/command/gateway) "oym" = ( @@ -43799,13 +43815,10 @@ /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "oCq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "oCv" = ( /obj/effect/spawner/structure/window/reinforced, @@ -44033,6 +44046,18 @@ dir = 1 }, /area/station/engineering/break_room) +"oHP" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/light/small/directional/west, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/cook, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "oIb" = ( /turf/closed/wall, /area/space/nearstation) @@ -44186,16 +44211,18 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "oKA" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/machinery/light/small/directional/west, -/obj/item/radio/intercom/prison/directional/west, /obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark, +/obj/item/radio/intercom/prison/directional/west, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "oKE" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/atmos) @@ -44227,7 +44254,7 @@ dir = 4 }, /obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/box/beakers, /obj/item/reagent_containers/cup/beaker/large, /obj/item/reagent_containers/dropper, @@ -44444,6 +44471,7 @@ /turf/closed/wall, /area/station/commons/toilet/restrooms) "oOl" = ( +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood, /area/station/service/bar/backroom) @@ -44471,7 +44499,9 @@ "oOX" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "oPd" = ( @@ -44527,9 +44557,9 @@ "oPP" = ( /obj/structure/table/reinforced, /obj/item/storage/bag/tray, -/obj/item/kitchen/rollingpin{ - pixel_y = -4; - pixel_x = 4 +/obj/item/reagent_containers/cup/soup_pot{ + pixel_x = 4; + pixel_y = 8 }, /obj/item/reagent_containers/cup/soup_pot{ pixel_x = -4; @@ -44542,6 +44572,13 @@ /obj/machinery/computer/aifixer, /turf/open/floor/iron/dark, /area/station/command/bridge) +"oQc" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "oQl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44770,7 +44807,7 @@ receive_ore_updates = 1; assistance_requestable = 1 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/dropper, /obj/item/stack/sheet/mineral/plasma, @@ -44914,8 +44951,7 @@ /area/station/commons/toilet/restrooms) "oWE" = ( /obj/machinery/camera/autoname/directional/north, -/obj/machinery/light/small/directional/east, -/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "oWG" = ( @@ -45073,21 +45109,20 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "oZh" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen_sec_shutters"; - name = "Kitchen Shutters"; - dir = 4 +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 1 }, -/turf/open/floor/plating, -/area/station/service/kitchen) +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "oZv" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) "oZP" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/computer/records/medical/laptop, /turf/open/floor/iron/cafeteria{ dir = 8 @@ -45142,12 +45177,12 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "paw" = ( -/obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement{ +/obj/machinery/light/small/directional/east, +/obj/structure/rack, +/turf/open/floor/iron/dark/side{ dir = 4 }, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/area/station/security/prison/safe) "paH" = ( /obj/effect/spawner/random/structure/table, /obj/effect/spawner/random/clothing/gloves, @@ -45163,10 +45198,9 @@ /area/station/medical/virology) "paK" = ( /obj/effect/turf_decal/bot, -/obj/machinery/light/directional/west, /obj/structure/sign/warning/no_smoking/directional/west, /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "paO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45360,7 +45394,7 @@ /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, /obj/machinery/camera/autoname/directional/west, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/box/monkeycubes, /turf/open/floor/iron/white, /area/station/science/genetics) @@ -45481,8 +45515,11 @@ dir = 6 }, /obj/machinery/light/small/directional/east, +/obj/machinery/light_switch/directional/east{ + pixel_y = -10 + }, +/obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/firealarm/directional/east, -/obj/machinery/light_switch/directional/south, /turf/open/floor/iron/dark, /area/station/science/breakroom) "pin" = ( @@ -45497,12 +45534,22 @@ dir = 1 }, /obj/structure/sign/poster/official/random/directional/south, +/obj/machinery/light/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, /obj/structure/bed/roller, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"piC" = ( +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/holopad, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/genetics) "piD" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -45564,6 +45611,11 @@ dir = 1 }, /obj/machinery/airalarm/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Medical - Cryogenics"; + name = "medical camera"; + network = list("ss13","medbay") + }, /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /turf/open/floor/engine, @@ -45785,10 +45837,10 @@ /turf/open/floor/carpet/red, /area/station/security/detectives_office) "pnU" = ( -/obj/effect/turf_decal/trimline/neutral/filled/warning{ +/obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 }, -/obj/effect/turf_decal/trimline/neutral/warning{ +/obj/effect/turf_decal/trimline/red/warning{ dir = 8 }, /obj/structure/disposalpipe/segment{ @@ -45903,13 +45955,15 @@ /turf/closed/wall/r_wall, /area/station/engineering/storage_shared) "ppS" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/dark_red/filled/line{ dir = 8 }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "ppU" = ( @@ -45928,7 +45982,7 @@ /obj/machinery/light_switch/directional/south{ pixel_x = 8 }, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "pqo" = ( /obj/effect/turf_decal/bot, @@ -45963,11 +46017,20 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "prb" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners{ +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen_sec_shutters"; + name = "Kitchen Shutters"; dir = 1 }, -/obj/structure/table, -/turf/open/floor/iron/kitchen, +/turf/open/floor/iron/dark/textured, /area/station/service/kitchen) "prc" = ( /obj/machinery/light/directional/north, @@ -46028,8 +46091,8 @@ /obj/machinery/door/airlock/grunge{ name = "Morgue" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/medical/morgue, /obj/machinery/duct, /turf/open/floor/iron/dark/textured, /area/station/medical/morgue) @@ -46399,7 +46462,7 @@ dir = 1 }, /obj/machinery/duct, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/item/book/manual/wiki/medicine, @@ -46513,9 +46576,6 @@ req_access = list("command"); pixel_x = -7 }, -/obj/structure/extinguisher_cabinet/directional/north{ - pixel_x = 5 - }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "pyA" = ( @@ -46695,14 +46755,18 @@ "pBC" = ( /obj/structure/table/reinforced, /obj/item/storage/bag/tray, -/obj/item/kitchen/rollingpin{ - pixel_y = -4; - pixel_x = -5 - }, /obj/item/kitchen/rollingpin{ pixel_y = -4; pixel_x = 4 }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 4 + }, /turf/open/floor/iron/kitchen, /area/station/security/prison/mess) "pBK" = ( @@ -46798,13 +46862,6 @@ /obj/structure/flora/bush/jungle/a/style_random, /turf/open/floor/grass, /area/station/hallway/primary/central) -"pDB" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/structure/cable/layer1, -/turf/open/floor/iron, -/area/station/engineering/main) "pDC" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47060,7 +47117,6 @@ /area/station/hallway/secondary/exit/departure_lounge) "pHW" = ( /obj/structure/cable, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron, @@ -47163,9 +47219,11 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "pKc" = ( -/obj/structure/reagent_dispensers/plumbed, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, -/area/station/maintenance/department/engine) +/area/station/maintenance/department/engine/atmos) "pKj" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/structure/table/reinforced, @@ -47174,12 +47232,12 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "pKq" = ( +/obj/effect/turf_decal/box, +/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/chair/office, -/obj/effect/landmark/start/depsec/medical, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/medical) "pKw" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, @@ -47205,13 +47263,9 @@ }, /area/station/service/chapel) "pKQ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "pKS" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/cable, @@ -47383,7 +47437,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/line, -/obj/machinery/status_display/evac/directional/north, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/station/security/office) "pOj" = ( @@ -47400,15 +47454,8 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct, -/obj/structure/table/glass, -/obj/item/roller{ - pixel_y = 6 - }, -/obj/item/roller{ - pixel_y = 12 - }, +/obj/machinery/medical_kiosk, /turf/open/floor/iron/dark, /area/station/medical/exam_room) "pOt" = ( @@ -47479,14 +47526,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "pOH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light_switch/directional/north, -/obj/item/radio/intercom/prison/directional/east, -/obj/structure/closet/crate, -/obj/item/stack/license_plates/empty/fifty, -/obj/item/stack/license_plates/empty/fifty, -/obj/item/stack/license_plates/empty/fifty, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, /area/station/security/prison/work) "pPq" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -47632,6 +47674,11 @@ /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"pSV" = ( +/obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "pSW" = ( /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) @@ -47694,6 +47741,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/security/brig) "pTV" = ( @@ -47806,6 +47854,7 @@ dir = 1 }, /obj/structure/sign/warning/no_smoking/directional/north, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/engineering/main) "pWC" = ( @@ -48248,6 +48297,7 @@ /obj/machinery/atmospherics/components/binary/pump/on{ name = "Waste In" }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "qet" = ( @@ -48280,7 +48330,6 @@ "qfv" = ( /obj/machinery/light/small/directional/east, /obj/structure/sign/poster/official/random/directional/east, -/obj/effect/decal/cleanable/dirt, /obj/structure/rack, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) @@ -48326,6 +48375,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/genetics/cloning) "qgA" = ( @@ -48375,7 +48425,6 @@ /turf/open/floor/iron/dark, /area/station/security/execution) "qgZ" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -48521,8 +48570,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "qkC" = ( -/obj/effect/spawner/random/structure/closet_maintenance, +/obj/machinery/airalarm/directional/south, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "qlb" = ( @@ -48656,10 +48706,15 @@ /turf/closed/wall, /area/station/service/library) "qnN" = ( -/obj/structure/cable, -/obj/machinery/light/floor/has_bulb, +/obj/machinery/light/directional/south, +/obj/item/radio/intercom/prison/directional/south, +/obj/structure/table, +/obj/item/shovel/spade, +/obj/item/plant_analyzer, +/obj/item/cultivator, +/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron/dark, -/area/station/security/prison/mess) +/area/station/security/prison/garden) "qnR" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -48814,9 +48869,9 @@ /turf/open/floor/engine, /area/station/science/ordnance/storage) "qqd" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "qqi" = ( /obj/effect/spawner/random/structure/table_or_rack, /obj/item/clothing/suit/apron/chef, @@ -48995,7 +49050,12 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/south, -/obj/machinery/newscaster/directional/south, +/obj/machinery/requests_console/directional/south{ + department = "Security"; + name = "Security Requests Console"; + anon_tips_receiver = 1; + assistance_requestable = 1 + }, /obj/machinery/modular_computer/preset/cargochat/security{ dir = 1 }, @@ -49072,10 +49132,13 @@ }, /turf/open/floor/wood, /area/station/service/library/lounge) -"quP" = ( -/obj/structure/reagent_dispensers/plumbed, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +"quN" = ( +/obj/machinery/light/directional/west, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/security/prison/rec) "quQ" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/particle_accelerator/particle_emitter/center, @@ -49190,6 +49253,16 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"qvY" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Port Hallway Center" + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/port) "qwd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49274,7 +49347,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil{ pixel_y = 7; @@ -49398,6 +49471,7 @@ dir = 10 }, /obj/item/radio/intercom/directional/west, +/obj/structure/extinguisher_cabinet/directional/south, /obj/structure/table, /turf/open/floor/iron/white, /area/station/science/explab) @@ -49418,7 +49492,6 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 4 }, -/obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "qAk" = ( @@ -49428,6 +49501,7 @@ "qAo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/side, /area/station/security/prison/workout) "qAy" = ( @@ -49448,7 +49522,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, -/obj/machinery/status_display/evac/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/filingcabinet, /turf/open/floor/iron/white, /area/station/science/lab) @@ -49488,6 +49562,7 @@ /turf/open/floor/iron/checker, /area/station/science/lab) "qBU" = ( +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -49607,7 +49682,7 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) "qEC" = ( -/obj/machinery/firealarm/directional/east, +/obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/security/prison/workout) "qEI" = ( @@ -49682,7 +49757,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/reagentgrinder{ pixel_y = 8 }, @@ -49727,17 +49802,13 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/machinery/newscaster/directional/north, +/obj/item/radio/intercom/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "qHa" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 10 - }, -/obj/structure/sign/warning/vacuum/external/directional/south, -/obj/structure/tank_holder/oxygen/yellow, -/turf/open/floor/iron, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "qHo" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -49758,7 +49829,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "qHq" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49792,7 +49862,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/sign/poster/official/random/directional/west, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/station/engineering/main) "qIB" = ( @@ -49832,6 +49902,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/closet/secure_closet/hydroponics, /turf/open/floor/iron/dark/side{ dir = 4 @@ -49861,6 +49932,7 @@ dir = 8 }, /obj/machinery/camera/autoname/directional/west, +/obj/machinery/status_display/ai/directional/west, /obj/structure/table, /obj/machinery/fax{ fax_name = "RaD"; @@ -49902,7 +49974,9 @@ /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "qKy" = ( -/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "qKG" = ( @@ -49981,8 +50055,8 @@ /area/station/security/processing) "qLR" = ( /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/burnt_floor, -/obj/item/grown/bananapeel, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "qMh" = ( @@ -50111,7 +50185,7 @@ "qOG" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "qOH" = ( /turf/closed/wall, @@ -50310,15 +50384,20 @@ }, /area/station/cargo/lobby) "qQV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 +/obj/machinery/button/door/directional/east{ + id = "atmos"; + name = "Atmospherics Lockdown"; + req_access = list("atmospherics"); + pixel_y = 6 + }, +/obj/machinery/button/door/directional/east{ + id = "atmos_rad_shutters"; + name = "Atmospherics Radiation Shutters Control"; + req_access = list("atmospherics"); + pixel_y = -6 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, /turf/open/floor/iron/dark, -/area/station/engineering/atmos/storage) +/area/station/engineering/atmos/office) "qRc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50469,7 +50548,6 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "qUB" = ( @@ -50499,7 +50577,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "qUS" = ( /obj/effect/turf_decal/stripes/line{ @@ -50554,7 +50632,7 @@ /area/station/hallway/secondary/exit/departure_lounge) "qWb" = ( /obj/structure/chair/comfy/black{ - dir = 4 + dir = 1 }, /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, @@ -50631,7 +50709,7 @@ /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/light/small/directional/west, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/iron/white, /area/station/medical/surgery) @@ -50712,7 +50790,9 @@ "qZo" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "qZu" = ( @@ -50735,7 +50815,7 @@ "qZC" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "qZF" = ( /obj/structure/flora/bush/fullgrass/style_random, @@ -50814,15 +50894,15 @@ }, /turf/open/floor/iron/dark/side, /area/station/cargo/storage) +"rbe" = ( +/obj/machinery/light/directional/east, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/station/security/prison/rec) "rbf" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/machinery/processor{ - pixel_y = 6 - }, -/turf/open/floor/iron/kitchen, -/area/station/security/prison/mess) +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/prison/garden) "rbo" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -50831,8 +50911,9 @@ /turf/open/floor/engine/telecomms, /area/station/tcommsat/server) "rbv" = ( -/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/iron/dark, @@ -50848,7 +50929,7 @@ dir = 10 }, /obj/item/radio/intercom/directional/west, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/reagentgrinder{ pixel_y = 8 }, @@ -50863,7 +50944,6 @@ /turf/open/floor/plastic, /area/station/security/prison/safe) "rcc" = ( -/obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -50887,6 +50967,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, +/obj/machinery/defibrillator_mount/directional/east, /obj/machinery/stasis, /turf/open/floor/iron/dark, /area/station/medical/exam_room) @@ -50954,12 +51035,14 @@ /turf/open/floor/iron/dark, /area/station/security/prison) "rdr" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/mapping_helpers/apc/cell_10k, -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/structure/cable, -/turf/open/floor/carpet/black, -/area/station/security/bitden) +/obj/machinery/computer/cryopod/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/safe) "rdt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50983,7 +51066,6 @@ /area/station/commons/dorms) "rdQ" = ( /obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "ref" = ( @@ -51045,8 +51127,9 @@ /turf/closed/wall, /area/station/medical/virology) "rfB" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "rfS" = ( @@ -51097,8 +51180,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/mob_spawn/corpse/human/charredskeleton, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "rgi" = ( @@ -51287,8 +51369,11 @@ /turf/open/floor/iron/dark/side, /area/station/service/theater) "riF" = ( +/obj/machinery/firealarm/directional/north, /obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, /area/station/security/prison) "rjd" = ( /obj/structure/filingcabinet/chestdrawer, @@ -51343,6 +51428,7 @@ /turf/open/floor/iron, /area/station/cargo/warehouse) "rky" = ( +/obj/effect/turf_decal/tile/dark_blue/full, /obj/effect/turf_decal/delivery, /obj/machinery/light/small/directional/west, /obj/machinery/duct, @@ -51350,7 +51436,7 @@ name = "Bridge Delivery"; req_access = list("command") }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/command/meeting_room) "rkB" = ( /turf/closed/wall, @@ -51360,7 +51446,6 @@ dir = 4 }, /obj/machinery/airalarm/directional/east, -/obj/machinery/light/small/directional/east, /obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/iron/white, /area/station/medical/storage) @@ -51470,10 +51555,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/port) -"rms" = ( -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating/airless, -/area/space/nearstation) "rmx" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 @@ -51740,6 +51821,13 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/atmos) +"rpJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "rpP" = ( /obj/machinery/camera/autoname/directional/north, /obj/structure/sign/warning/biohazard/directional/north, @@ -51762,7 +51850,7 @@ }, /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/washing_machine, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "rqm" = ( /obj/effect/turf_decal/stripes/line{ @@ -52097,12 +52185,10 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "rwN" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/camera/autoname/directional/west, -/obj/machinery/space_heater, -/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/light/small/directional/west, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/area/station/maintenance/starboard/aft) "rwR" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/firealarm/directional/west{ @@ -52278,15 +52364,12 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "rzs" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/structure/chair, -/turf/open/floor/iron/dark/side{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/area/station/cargo/storage) +/turf/open/floor/iron/dark, +/area/station/security/detectives_office) "rzG" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ dir = 4 @@ -52360,6 +52443,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, /area/station/security/prison/rec) +"rAH" = ( +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/security/prison) "rAO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52395,6 +52485,7 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, +/obj/machinery/status_display/evac/directional/south, /obj/machinery/smartfridge/chemistry/preloaded, /turf/open/floor/iron/dark, /area/station/medical/chemistry) @@ -52424,13 +52515,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "rBk" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_y = 9 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/kitchen, -/area/station/security/prison/mess) +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/prison) "rBF" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -52467,12 +52554,8 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/line, -/obj/machinery/requests_console/directional/north{ - anon_tips_receiver = 1; - assistance_requestable = 1; - department = "Security"; - name = "Security Requests Console" - }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/office) "rCj" = ( @@ -52494,7 +52577,9 @@ "rCE" = ( /obj/effect/turf_decal/bot, /obj/machinery/plate_press, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, /area/station/security/prison/work) "rCH" = ( /obj/structure/extinguisher_cabinet/directional/east, @@ -52502,7 +52587,6 @@ /obj/machinery/light_switch/directional/north{ pixel_x = -8 }, -/obj/effect/decal/cleanable/dirt, /obj/item/kirbyplants/photosynthetic, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) @@ -52524,7 +52608,7 @@ /area/station/engineering/transit_tube) "rCZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white/right, +/obj/effect/turf_decal/bot_white, /obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -52571,6 +52655,8 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, +/obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/closet/radiation, /obj/item/crowbar/large, /turf/open/floor/iron, @@ -52729,9 +52815,6 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/north, /obj/machinery/light/directional/north, /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain) "rFk" = ( @@ -52929,10 +53012,11 @@ /area/station/science/ordnance/testlab) "rIv" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 }, -/obj/effect/turf_decal/trimline/blue/corner, -/obj/structure/window/reinforced/spawner/directional/north, /obj/machinery/camera/directional/west{ c_tag = "Medical - Central, West"; name = "medical camera"; @@ -52940,7 +53024,6 @@ dir = 10 }, /obj/machinery/airalarm/directional/west, -/obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "rIC" = ( @@ -53048,7 +53131,6 @@ /area/station/science/xenobiology) "rKd" = ( /obj/item/cigbutt, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/spawner/random/engineering/tracking_beacon, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -53056,6 +53138,13 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"rKe" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/detectives_office) "rKU" = ( /obj/effect/spawner/random/structure/table_or_rack, /obj/effect/spawner/random/maintenance, @@ -53093,7 +53182,6 @@ /turf/open/floor/iron, /area/station/cargo/storage) "rLH" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/layer_manifold/pink/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -53149,16 +53237,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "rMN" = ( -/obj/machinery/light_switch/directional/west, -/obj/structure/table, -/obj/item/storage/belt/utility, -/obj/item/t_scanner{ - pixel_x = -6 - }, -/obj/item/multitool{ - pixel_x = 6 - }, -/obj/item/clothing/mask/breath, +/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) @@ -53168,6 +53247,10 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron, /area/station/engineering/main) +"rMT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/side, +/area/station/commons/fitness/recreation) "rMV" = ( /obj/effect/decal/cleanable/blood/old, /obj/item/clothing/mask/gas, @@ -53303,7 +53386,6 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "rPK" = ( -/obj/machinery/light/small/directional/west, /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/station/command/meeting_room) @@ -53465,9 +53547,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, -/obj/machinery/modular_computer/preset/id{ - dir = 4 - }, /obj/machinery/camera/directional/west{ c_tag = "Security - Arrivals Checkpoint"; name = "security camera" @@ -53478,6 +53557,13 @@ req_access = list("security") }, /obj/machinery/light/small/directional/west, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "rTf" = ( @@ -53682,7 +53768,7 @@ /turf/open/floor/iron/dark/textured_large, /area/station/maintenance/department/security) "rWe" = ( -/obj/effect/spawner/random/structure/chair_maintenance, +/obj/structure/chair, /turf/open/floor/plating/airless, /area/space/nearstation) "rWp" = ( @@ -53919,6 +54005,10 @@ dir = 8 }, /area/station/command/gateway) +"sat" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) "say" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -54103,25 +54193,6 @@ /obj/machinery/ore_silo, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) -"sep" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/flora/grass/jungle/b/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "med_lockdown"; - name = "Medbay Emergency Lockdown Shutters"; - dir = 8 - }, -/turf/open/floor/grass, -/area/station/medical/medbay/central) "set" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -54167,6 +54238,8 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "seN" = ( +/obj/machinery/light/directional/north, +/obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/command/meeting_room) @@ -54269,7 +54342,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, /area/station/security/prison/work) "shu" = ( /obj/effect/turf_decal/stripes/line{ @@ -54367,9 +54442,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "sjs" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/prison) +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/work) "sjw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54386,6 +54461,7 @@ /area/station/service/library) "sjF" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, /turf/open/floor/iron, /area/station/maintenance/port/fore) "sjV" = ( @@ -54555,6 +54631,7 @@ dir = 1 }, /obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, @@ -54586,9 +54663,10 @@ }, /area/station/commons/locker) "snd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark, +/obj/structure/rack, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, /area/station/security/prison/safe) "snh" = ( /obj/machinery/camera/directional/north{ @@ -54695,12 +54773,10 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "son" = ( -/obj/machinery/light/directional/west, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/effect/mapping_helpers/apc/cell_10k, -/obj/effect/mapping_helpers/apc/full_charge, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/bot, +/obj/machinery/airalarm/directional/west, +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "sos" = ( /obj/structure/cable, @@ -54874,14 +54950,20 @@ /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "stB" = ( -/obj/machinery/firealarm/directional/south, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/table, +/obj/machinery/button/door/directional/east{ + id = "bitrunner_den"; + name = "Bitrunner Den Shutters Control" + }, +/turf/open/floor/iron/dark, +/area/station/security/bitden) "stD" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/line, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) @@ -55429,8 +55511,7 @@ /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) "sDk" = ( -/obj/machinery/shower/directional/north, -/obj/item/soap/deluxe, +/obj/machinery/shower/directional/east, /obj/item/bikehorn/rubberducky, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/captain/private) @@ -55460,6 +55541,13 @@ "sDz" = ( /turf/closed/wall, /area/station/commons/locker) +"sDC" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot_white/right, +/obj/structure/filingcabinet, +/obj/item/folder/documents, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "sEf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55532,10 +55620,15 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "sFp" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/structure/cable, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) "sFv" = ( @@ -55569,7 +55662,6 @@ }, /area/station/service/theater) "sGk" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -55580,6 +55672,12 @@ /obj/structure/sign/poster/random/directional/east, /turf/open/floor/iron, /area/station/cargo/warehouse) +"sGT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/wood, +/obj/item/storage/photo_album/prison, +/turf/open/floor/wood, +/area/station/security/prison/rec) "sHl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55713,7 +55811,6 @@ /turf/open/floor/iron/white/textured, /area/station/medical/medbay/aft) "sKd" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/electrolyzer, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -55784,15 +55881,13 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "sLa" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/light/directional/south, -/obj/structure/cable, -/obj/item/stack/sheet/cardboard{ - amount = 14 +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 }, -/obj/item/stack/package_wrap, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, -/area/station/security/prison/work) +/area/station/hallway/secondary/entry) "sLg" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55807,10 +55902,6 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Justice Chamber Airlock"; - name = "security camera" - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/engine, /area/station/security/execution) @@ -55839,13 +55930,13 @@ /turf/open/floor/wood, /area/station/service/library/lounge) "sLA" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/machinery/light/small/directional/south, +/obj/machinery/light_switch/directional/south{ + pixel_x = 8 + }, +/obj/machinery/firealarm/directional/south, /obj/machinery/vending/hydroseeds{ slogan_delay = 700 }, -/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "sLG" = ( @@ -55905,19 +55996,13 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "sMI" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Prison Garden" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark/textured, -/area/station/security/prison/garden) +/turf/open/floor/carpet/black, +/area/station/security/bitden) "sMN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain) "sMO" = ( @@ -55978,6 +56063,13 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) "sNK" = ( @@ -55998,10 +56090,20 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "sOa" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/item/radio/intercom/prison/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/prison) +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = -8 + }, +/obj/effect/turf_decal/box, +/obj/structure/closet/crate, +/obj/effect/spawner/random/contraband/prison, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison/work) "sOh" = ( /turf/open/floor/iron, /area/station/maintenance/starboard/aft) @@ -56233,20 +56335,20 @@ /turf/open/floor/engine/telecomms, /area/station/tcommsat/server) "sSP" = ( -/obj/structure/chair/comfy/black{ - dir = 8 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ + dir = 4 }, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/iron, -/area/station/engineering/break_room) +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "sTi" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/tile/purple/full, /obj/effect/turf_decal/delivery, /obj/machinery/light/small/directional/west, /obj/machinery/camera/autoname/directional/west{ dir = 10 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/science/breakroom) "sTD" = ( /obj/effect/turf_decal/delivery, @@ -56720,7 +56822,7 @@ }, /obj/effect/turf_decal/box, /obj/machinery/holopad, -/turf/open/floor/iron/large, +/turf/open/floor/iron/white/smooth_large, /area/station/science/explab) "sZC" = ( /obj/structure/disposalpipe/segment{ @@ -56752,9 +56854,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/security/brig) "sZR" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/tile/purple/full, /obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/science/breakroom) "sZV" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ @@ -56844,7 +56946,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/light/small/directional/east, /obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/regular{ pixel_x = 6; pixel_y = 6 @@ -57077,15 +57179,20 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/turret_protected/ai) "teM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 }, -/obj/structure/closet/secure_closet/atmospherics, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/office) +/obj/machinery/light_switch/directional/west{ + pixel_y = 3 + }, +/obj/machinery/firealarm/directional/west{ + pixel_y = -6 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "teQ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -57178,17 +57285,10 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"thk" = ( -/obj/structure/chair/sofa/corp/left{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "thA" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1 }, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "thD" = ( @@ -57234,7 +57334,7 @@ /obj/machinery/door/airlock/security/glass{ name = "Labor Shuttle Dock" }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/textured, /area/station/security/processing) "tja" = ( @@ -57315,7 +57415,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, -/obj/structure/table/glass, +/obj/structure/table, /obj/item/reagent_containers/spray/plantbgone, /obj/item/reagent_containers/spray/pestspray{ pixel_x = 3; @@ -57450,7 +57550,6 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/south, /obj/structure/closet/firecloset, /obj/machinery/camera/directional/south{ c_tag = "Central Hallway Southeast"; @@ -57711,7 +57810,7 @@ /turf/open/floor/iron/dark, /area/station/security/holding_cell) "tqT" = ( -/obj/machinery/duct, +/obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/engine) "trg" = ( @@ -58107,6 +58206,7 @@ /turf/open/floor/plating, /area/station/commons/locker) "twi" = ( +/obj/effect/turf_decal/tile/red/full, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ dir = 4 @@ -58115,7 +58215,7 @@ name = "Security Delivery"; req_access = list("security") }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/security/office) "twj" = ( /obj/effect/spawner/structure/window/reinforced, @@ -58203,6 +58303,10 @@ "txI" = ( /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) +"txW" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "tyq" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -58249,13 +58353,22 @@ /turf/open/floor/iron/white, /area/station/hallway/secondary/exit/departure_lounge) "tyX" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark/textured, -/area/station/security/bitden) +/obj/structure/closet/crate/hydroponics, +/obj/item/botanical_lexicon, +/obj/item/seeds/tree, +/obj/effect/spawner/random/contraband/prison, +/obj/item/seeds/pumpkin, +/obj/item/seeds/wheat, +/obj/item/seeds/ambrosia, +/obj/item/seeds/grass, +/obj/item/seeds/carrot, +/obj/item/seeds/tomato, +/obj/item/seeds/potato, +/obj/item/seeds/garlic, +/obj/item/seeds/onion, +/obj/item/paper/guides/jobs/hydroponics, +/turf/open/floor/iron/dark, +/area/station/security/prison/garden) "tzc" = ( /obj/effect/spawner/random/engineering/tank, /turf/open/floor/plating, @@ -58272,7 +58385,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/box/monkeycubes, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -58496,13 +58609,23 @@ }, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"tDV" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +"tDF" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/medical/exam_room) +"tDO" = ( +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/security/prison/work) +/area/station/ai_monitored/command/nuke_storage) +"tDV" = ( +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/prison) "tEg" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/meter, @@ -58695,10 +58818,9 @@ /turf/open/floor/iron/white, /area/station/medical/patients_rooms/room_a) "tHM" = ( -/obj/structure/chair/stool/directional/north, -/obj/structure/cable, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, -/area/station/security/prison/mess) +/area/station/security/prison/workout) "tIp" = ( /obj/structure/flora/rock/pile/jungle/style_random, /mob/living/carbon/human/species/monkey, @@ -58896,7 +59018,7 @@ "tLN" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/regular{ pixel_x = 3; pixel_y = 6 @@ -59107,7 +59229,7 @@ /obj/machinery/door/airlock/security/glass{ name = "Visitation" }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/textured, /area/station/security/prison/visit) "tQa" = ( @@ -59119,6 +59241,7 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) "tQl" = ( @@ -59232,18 +59355,18 @@ /area/station/science/robotics/lab) "tRM" = ( /obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Atmospherics, Northwest"; - name = "engineering camera" - }, +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, /obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "tRU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, /area/station/security/prison/safe) "tRW" = ( /obj/effect/spawner/random/structure/table, @@ -59311,11 +59434,10 @@ /turf/open/floor/iron/white, /area/station/science/research) "tTs" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "tTx" = ( @@ -59504,6 +59626,7 @@ }, /obj/effect/turf_decal/trimline/red/line, /obj/machinery/camera/autoname/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table, /obj/item/storage/briefcase/lawyer, /turf/open/floor/iron/dark, @@ -59612,24 +59735,19 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "tZl" = ( -/obj/structure/table/wood, -/obj/item/storage/photo_album/prison, +/obj/structure/chair/wood{ + dir = 8 + }, /turf/open/floor/wood, /area/station/security/prison/rec) "tZr" = ( /turf/closed/wall, /area/station/smithing) "tZH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, -/obj/structure/cable/layer1, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/storage) "tZU" = ( @@ -59716,9 +59834,13 @@ }, /area/station/commons/fitness/recreation) "uch" = ( -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/station/engineering/atmos) "uck" = ( /obj/machinery/corral_corner{ mapping_id = "3" @@ -59747,15 +59869,9 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "ucG" = ( -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light_switch/directional/north{ - pixel_x = -8 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/area/station/engineering/atmos/pumproom) "ucJ" = ( /turf/closed/wall, /area/station/maintenance/disposal) @@ -59822,6 +59938,7 @@ dir = 9 }, /obj/machinery/airalarm/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/computer/security/labor{ dir = 4 }, @@ -59887,6 +60004,7 @@ /area/station/maintenance/starboard/aft) "ueL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/station/security/detectives_office) "ufg" = ( @@ -59920,18 +60038,9 @@ /turf/closed/wall/r_wall, /area/station/engineering/break_room) "ufu" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/customs/auxiliary) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/paramedic) "ufy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60009,7 +60118,7 @@ name = "Isolation Cell"; id_tag = "iso_cell_hall_bolt" }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/duct, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -60100,7 +60209,7 @@ "uhv" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/reagent_containers/spray/cleaner, /obj/item/reagent_containers/spray/cleaner, /obj/item/clothing/neck/stethoscope, @@ -60192,7 +60301,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/paper_bin{ pixel_x = -4; pixel_y = 4 @@ -60459,7 +60568,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "ula" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -60682,7 +60790,9 @@ /area/station/maintenance/department/science) "uoF" = ( /obj/machinery/space_heater, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, /area/station/security/prison) "uoH" = ( /obj/structure/fans/tiny, @@ -60746,12 +60856,18 @@ }, /area/station/service/hydroponics/garden) "urb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/light_switch/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/effect/turf_decal/stripes/end{ + dir = 1 }, +/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "ure" = ( @@ -60939,12 +61055,13 @@ /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "utV" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/light/directional/south, +/obj/structure/sign/warning/no_smoking/directional/south, /obj/structure/table/optable{ desc = "A cold, hard place for your final rest."; name = "Morgue Slab" }, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/medical/morgue) "uuh" = ( @@ -61137,7 +61254,9 @@ /obj/structure/reagent_dispensers/plumbed{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, /area/station/security/prison) "uxM" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -61154,7 +61273,7 @@ "uyh" = ( /obj/structure/cable, /obj/structure/chair/office/light{ - dir = 4 + dir = 1 }, /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron/dark, @@ -61278,6 +61397,12 @@ "uBC" = ( /turf/open/floor/iron, /area/station/cargo/lobby) +"uBD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/prison/work) "uBE" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -61352,10 +61477,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "uCB" = ( -/obj/machinery/light/small/directional/north, +/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, +/obj/machinery/duct, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/captain/private) "uDj" = ( @@ -61470,9 +61596,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "uGA" = ( -/obj/machinery/airalarm/directional/north, /obj/machinery/light/small/directional/north, -/obj/structure/reagent_dispensers/plumbed, /turf/open/floor/plating, /area/station/maintenance/department/engine) "uGF" = ( @@ -61760,7 +61884,6 @@ department = "Security"; name = "Security Requests Console" }, -/obj/structure/filingcabinet/chestdrawer, /obj/machinery/button/door/directional/north{ id = "medbay_foyer"; name = "Medbay Doors Control"; @@ -61778,6 +61901,7 @@ /obj/machinery/light_switch/directional/north{ pixel_y = 34 }, +/obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "uKL" = ( @@ -61853,21 +61977,7 @@ /turf/open/floor/iron/dark, /area/station/medical/chemistry) "uLI" = ( -/obj/machinery/button/door/directional/east{ - id = "atmos"; - name = "Atmospherics Lockdown"; - req_access = list("atmospherics"); - pixel_y = 6 - }, -/obj/machinery/modular_computer/preset/civilian{ - dir = 8 - }, -/obj/machinery/button/door/directional/east{ - id = "atmos_rad_shutters"; - name = "Atmospherics Radiation Shutters Control"; - req_access = list("atmospherics"); - pixel_y = -6 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "uLJ" = ( @@ -61907,9 +62017,15 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "uLT" = ( -/obj/item/wrench, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/blue/corner, +/obj/structure/chair/sofa/corp/left{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "uLZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61920,6 +62036,11 @@ /obj/structure/cable/layer1, /turf/open/floor/iron, /area/station/engineering/engine_smes) +"uMg" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/processor, +/turf/open/floor/iron/kitchen, +/area/station/security/prison/mess) "uMj" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 1 @@ -62031,7 +62152,7 @@ /area/station/ai_monitored/turret_protected/ai_upload) "uNS" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/book/manual/wiki/chemistry{ pixel_x = -4; pixel_y = 4 @@ -62053,7 +62174,6 @@ /turf/open/floor/carpet/red, /area/station/security/detectives_office) "uOj" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump{ name = "Fuel Pipe to Incinerator" }, @@ -62078,6 +62198,7 @@ }, /obj/structure/cable, /obj/machinery/duct, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/white, /area/station/science/research) "uPa" = ( @@ -62153,7 +62274,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/regular{ pixel_x = 6; pixel_y = 6 @@ -62170,24 +62291,27 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "uQv" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination/common/bitrunner, -/turf/open/floor/carpet/black, -/area/station/security/bitden) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/bed/dogbed{ + name = "Tom's Bed" + }, +/mob/living/basic/mouse/brown/tom, +/turf/open/floor/iron/dark, +/area/station/security/prison/work) "uQP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/service/hydroponics) "uQQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/machinery/light/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) "uRe" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/closet/radiation, @@ -62291,9 +62415,20 @@ /turf/open/floor/iron, /area/station/engineering/storage/tech) "uTo" = ( -/obj/machinery/suit_storage_unit/atmos, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/atmos/glass{ + name = "Distribution Loop" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos/pumproom) "uTq" = ( /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, @@ -62490,7 +62625,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/structure/extinguisher_cabinet/directional/south, /obj/item/paper_bin{ pixel_x = -7 @@ -62641,7 +62776,6 @@ /area/station/engineering/break_room) "uYe" = ( /obj/effect/landmark/blobstart, -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, @@ -62749,6 +62883,9 @@ }, /obj/machinery/firealarm/directional/west, /obj/structure/closet/secure_closet/evidence, +/obj/machinery/light_switch/directional/west{ + pixel_y = 10 + }, /turf/open/floor/iron/dark, /area/station/security/evidence) "val" = ( @@ -62801,6 +62938,7 @@ }, /obj/item/watertank, /obj/effect/spawner/random/food_or_drink/seed, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -62839,8 +62977,8 @@ /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) "vbz" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/effect/turf_decal/trimline/red/line{ +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/effect/turf_decal/trimline/neutral/line{ dir = 1 }, /obj/machinery/camera/autoname/directional/south, @@ -62940,23 +63078,16 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "vcI" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 }, -/obj/structure/window/reinforced{ +/obj/effect/turf_decal/trimline/blue/corner{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/chair/sofa/corp/right{ dir = 4 }, -/obj/structure/flora/grass/jungle/b/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "med_lockdown"; - name = "Medbay Emergency Lockdown Shutters"; - dir = 8 - }, -/turf/open/floor/grass, +/turf/open/floor/iron/white, /area/station/medical/medbay/central) "vcL" = ( /obj/machinery/airalarm/directional/east, @@ -62970,6 +63101,13 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/checker, /area/station/maintenance/port/fore) +"vde" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/plate_press, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison/work) "vdf" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -63325,7 +63463,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) "vjx" = ( -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/regular{ pixel_x = 3; pixel_y = 6 @@ -63342,7 +63480,6 @@ mapping_id = "main_turbine" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "vjV" = ( @@ -63566,8 +63703,12 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "vnp" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/sign/departments/engineering/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - Atmospherics Incinerator Access"; + name = "engineering camera" + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) @@ -63665,6 +63806,12 @@ }, /turf/open/floor/iron/dark, /area/station/command/meeting_room) +"voY" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot_white/left, +/obj/machinery/computer/bank_machine, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "vpb" = ( /obj/effect/turf_decal/trimline/neutral/line, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -63947,9 +64094,11 @@ }, /area/station/service/janitor) "vtJ" = ( -/obj/machinery/light/directional/north, -/turf/open/floor/circuit, -/area/station/ai_monitored/command/nuke_storage) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "vtP" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -63957,7 +64106,6 @@ /area/station/maintenance/port/fore) "vtT" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, -/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, @@ -63990,7 +64138,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "vuY" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 6 }, @@ -64107,12 +64254,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "vxg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "vxs" = ( @@ -64559,7 +64704,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, -/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/bookcase/manuals/engineering, /turf/open/floor/iron/dark/side{ dir = 6 @@ -64604,15 +64748,12 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "vFQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/layer1, -/turf/open/floor/iron, -/area/station/engineering/storage) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/office, +/obj/effect/landmark/start/depsec/medical, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "vFV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -64703,7 +64844,7 @@ name = "Labor Camp Shuttle Airlock"; req_access = list("brig") }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/textured_large, /area/station/security/processing) "vHc" = ( @@ -64753,7 +64894,7 @@ /area/station/engineering/storage) "vHU" = ( /obj/effect/spawner/random/structure/table_or_rack, -/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance/two, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) @@ -64776,16 +64917,10 @@ /turf/open/floor/iron/dark/textured, /area/station/security/execution) "vIP" = ( -/obj/machinery/light/neon_lining{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet/black, -/area/station/security/bitden) +/obj/machinery/firealarm/directional/west, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/prison/mess) "vIQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/duct, @@ -64825,12 +64960,21 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"vJU" = ( +/obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "vJW" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "vJZ" = ( /obj/effect/turf_decal/stripes/line{ @@ -64937,7 +65081,7 @@ /area/station/tcommsat/computer) "vLV" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/box/gloves, /turf/open/floor/iron/white, /area/station/medical/surgery) @@ -65023,19 +65167,23 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, -/obj/structure/chair{ - dir = 4 +/obj/machinery/button/door/directional/west{ + id = "kitchen_sec_shutters"; + name = "Kitchen Shutters Control"; + pixel_y = 10; + req_access = list("kitchen") }, -/obj/effect/landmark/start/cook, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "vNF" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, /turf/open/floor/stone, /area/station/smithing) "vOj" = ( @@ -65164,7 +65312,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/shower/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -65232,10 +65380,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "vQE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ + dir = 4 }, -/obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "vQV" = ( @@ -65343,10 +65490,9 @@ /area/station/commons/dorms) "vSj" = ( /obj/effect/turf_decal/stripes/line{ - dir = 9 + dir = 1 }, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, -/obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "vSo" = ( @@ -65463,12 +65609,14 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/science/robotics/mechbay) "vTT" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/maintenance/department/engine/atmos) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/starboard/aft) "vTX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -65534,17 +65682,16 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "vUY" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/carpet, +/area/station/hallway/secondary/entry) "vVm" = ( /obj/machinery/cryopod/prison{ dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, /area/station/security/prison/safe) "vVN" = ( /obj/effect/turf_decal/tile/green/half/contrasted, @@ -65610,6 +65757,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"vXf" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/security/prison/safe) "vXz" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -65678,7 +65831,7 @@ "vYZ" = ( /obj/effect/turf_decal/trimline/blue/filled/end, /obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/station/medical/break_room) "vZb" = ( @@ -65917,10 +66070,7 @@ dir = 4 }, /obj/machinery/light/directional/east, -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/landmark/start/cargo_technician, +/obj/structure/sign/poster/random/directional/east, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -65934,10 +66084,12 @@ /turf/open/floor/plating, /area/station/commons/vacant_room/office) "wcZ" = ( -/obj/machinery/light/small/broken/directional/south, -/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/small/directional/west, /turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +/area/station/maintenance/starboard/aft) "wdv" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -65954,7 +66106,7 @@ dir = 6 }, /obj/item/radio/intercom/directional/east, -/obj/structure/table/glass, +/obj/structure/table, /obj/item/storage/bag/plants/portaseeder, /obj/item/storage/bag/plants/portaseeder, /turf/open/floor/iron/dark/side{ @@ -66091,11 +66243,14 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "wgv" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/checker, /area/station/security/prison/shower) "wgw" = ( /obj/machinery/smartfridge, @@ -66127,11 +66282,10 @@ /turf/open/floor/plating, /area/station/maintenance/port) "wgZ" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/west, -/obj/structure/liquid_pump, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) "whb" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/table/glass, @@ -66149,15 +66303,14 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "whr" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 }, -/obj/effect/turf_decal/trimline/green/line{ +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark/side{ dir = 8 }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) +/area/station/cargo/storage) "whv" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -66178,7 +66331,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "whM" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump/on{ name = "Incinerator Output Pump"; target_pressure = 4500 @@ -66274,7 +66426,7 @@ }, /obj/structure/plasticflaps/opaque, /obj/machinery/duct, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/maintenance/department/science) "wjv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66520,7 +66672,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 }, -/obj/structure/table/glass, +/obj/structure/table, /turf/open/floor/iron/dark/side{ dir = 10 }, @@ -66554,12 +66706,11 @@ /turf/open/floor/iron, /area/station/cargo/sorting) "woE" = ( -/obj/machinery/newscaster/directional/east, -/obj/machinery/computer/station_alert{ +/obj/structure/reagent_dispensers/plumbed{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/office) +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "wpo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -66591,7 +66742,6 @@ dir = 9 }, /obj/structure/closet/l3closet/scientist, -/obj/item/extinguisher, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) "wqm" = ( @@ -66729,16 +66879,12 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "wsn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/west, -/obj/structure/closet/crate, -/obj/effect/spawner/random/contraband/prison, -/obj/item/stack/license_plates/empty/fifty, -/obj/item/stack/license_plates/empty/fifty, -/obj/item/stack/license_plates/empty/fifty, -/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/light/small/directional/north, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/computer/order_console/bitrunning, /turf/open/floor/iron/dark, -/area/station/security/prison/work) +/area/station/security/bitden) "wsq" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -66818,7 +66964,6 @@ pixel_x = 8; pixel_y = 8 }, -/obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "wtF" = ( @@ -66911,11 +67056,13 @@ }, /area/station/service/hydroponics) "wvb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/security/prison) +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/textured, +/area/station/medical/exam_room) "wvd" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -67166,7 +67313,6 @@ name = "medical camera"; network = list("ss13","medbay") }, -/obj/machinery/light/small/directional/south, /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/storage) @@ -67271,13 +67417,16 @@ /turf/open/floor/iron/checker, /area/station/science/lab) "wBY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/requests_console/directional/east{ + assistance_requestable = 1; + department = "Atmospherics"; + name = "Atmospherics Requests Console"; + supplies_requestable = 1 }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/tank_dispenser, +/obj/machinery/newscaster/directional/north, +/obj/machinery/computer/atmos_control/nocontrol/master, /turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/area/station/engineering/atmos/office) "wCb" = ( /obj/effect/spawner/random/engineering/tool, /obj/effect/decal/cleanable/dirt, @@ -67310,7 +67459,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/structure/sign/warning/no_smoking/directional/east, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -67342,7 +67490,7 @@ id = "engineering"; name = "Engineering Blast Door" }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/maintenance/department/medical) "wCX" = ( /obj/effect/turf_decal/stripes/line, @@ -67440,12 +67588,12 @@ "wEK" = ( /obj/machinery/light/small/directional/west, /obj/machinery/airalarm/directional/west, -/obj/effect/decal/cleanable/dirt, /obj/machinery/recharge_station, /obj/effect/landmark/start/cyborg, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "wFc" = ( +/obj/machinery/light/small/directional/west, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/command/meeting_room) @@ -67476,9 +67624,11 @@ /area/station/engineering/atmos) "wFI" = ( /obj/effect/turf_decal/stripes/line{ - dir = 5 + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ + dir = 6 }, -/obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "wFZ" = ( @@ -67534,7 +67684,6 @@ }, /obj/machinery/light/directional/south, /obj/machinery/newscaster/directional/south, -/obj/structure/table, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "wGm" = ( @@ -67559,17 +67708,10 @@ /turf/open/floor/iron, /area/station/engineering/storage_shared) "wGs" = ( -/obj/machinery/light/neon_lining{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/carpet/black, -/area/station/security/bitden) +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/security/prison/rec) "wGw" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/effect/turf_decal/stripes/line{ @@ -67594,13 +67736,14 @@ /turf/open/floor/iron/dark/side, /area/station/service/hydroponics) "wGI" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/kitchen, -/area/station/security/prison/mess) +/obj/machinery/shower/directional/south, +/obj/item/soap/homemade, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/shower) "wGN" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "wGQ" = ( /obj/structure/table, @@ -67620,6 +67763,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/teleporter) +"wHt" = ( +/obj/machinery/light/directional/west, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/station/security/prison/rec) "wHD" = ( /obj/machinery/light/small/directional/west, /obj/machinery/button/door/directional/west{ @@ -67732,10 +67880,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "wJm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, +/obj/structure/cable, +/obj/machinery/power/floodlight, +/turf/open/floor/plating, /area/station/engineering/atmos) "wJr" = ( /obj/effect/turf_decal/stripes/corner{ @@ -67783,16 +67930,7 @@ /area/station/maintenance/department/medical) "wKi" = ( /obj/machinery/nuclearbomb/selfdestruct, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, +/obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "wKr" = ( @@ -67876,7 +68014,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "wLK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "wLQ" = ( @@ -67963,8 +68100,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Cryo" +/obj/machinery/door/airlock/public/glass{ + name = "Prison Cryogenic Lounge" }, /obj/structure/cable, /turf/open/floor/iron/dark/textured, @@ -68028,7 +68165,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 }, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "wOd" = ( @@ -68052,8 +68188,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "wOy" = ( +/obj/structure/cable, /obj/effect/spawner/random/vending/snackvend, -/obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/security/prison/mess) "wOC" = ( @@ -68061,6 +68197,7 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "wOD" = ( +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 }, @@ -68099,7 +68236,7 @@ /area/station/security/execution) "wOS" = ( /obj/effect/spawner/random/structure/table, -/obj/effect/spawner/random/maintenance/three, +/obj/effect/spawner/random/maintenance, /turf/open/floor/wood, /area/station/maintenance/port/fore) "wPA" = ( @@ -68128,9 +68265,14 @@ /turf/open/floor/carpet/green, /area/station/commons/locker) "wPP" = ( -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/item/radio/intercom/directional/north, +/obj/structure/table/reinforced, +/obj/machinery/recharger, /turf/open/floor/iron/dark, -/area/station/engineering/transit_tube) +/area/station/security/checkpoint/medical) "wPR" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -68144,7 +68286,7 @@ id = "perma_lockdown"; name = "Lockdown Blast Door" }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "perma-entrance" }, @@ -68178,6 +68320,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ name = "Prison Showers" }, @@ -68441,10 +68584,9 @@ }, /area/station/hallway/secondary/service) "wWi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/camera/autoname/directional/west{ + dir = 10 }, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "wWt" = ( @@ -68490,17 +68632,10 @@ /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) "wWU" = ( -/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, -/obj/machinery/space_heater, +/obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"wWZ" = ( -/obj/machinery/biogenerator, -/obj/item/radio/intercom/prison/directional/south, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/security/prison/garden) "wXi" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -68745,9 +68880,12 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, -/obj/machinery/light_switch/directional/south, +/obj/machinery/light_switch/directional/east{ + pixel_y = -10 + }, /obj/machinery/firealarm/directional/east, /obj/machinery/module_duplicator, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/science/circuits) "xcb" = ( @@ -68966,8 +69104,14 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "xfT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = 8 + }, +/obj/structure/closet/crate, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, /area/station/security/prison/safe) "xfW" = ( /obj/structure/disposalpipe/segment, @@ -69010,7 +69154,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/station/engineering/storage) "xgu" = ( @@ -69036,11 +69182,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/science) "xgB" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/west, -/obj/machinery/space_heater, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/area/station/engineering/atmos/storage) "xgR" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /turf/open/floor/engine, @@ -69052,11 +69196,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/station/medical/cryo) "xgX" = ( /obj/machinery/light/directional/north, -/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/station/security/prison) "xgY" = ( @@ -69066,6 +69210,14 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"xhf" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/sign/warning/rad_shelter/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "xhg" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -69104,7 +69256,6 @@ /area/station/service/lawoffice) "xhI" = ( /obj/structure/cable, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -69625,6 +69776,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "xsi" = ( @@ -69700,7 +69852,8 @@ /turf/closed/wall/r_wall, /area/station/security/prison/rec) "xtc" = ( -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/light/directional/east, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/station/security/prison/workout) "xtn" = ( @@ -69722,7 +69875,6 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 4 }, -/obj/machinery/light/directional/west, /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) @@ -69781,6 +69933,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/light/directional/east, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/station/engineering/main) "xuu" = ( @@ -70150,19 +70304,14 @@ /turf/open/floor/plating, /area/station/maintenance/department/science) "xzN" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 8 - }, -/obj/structure/sign/departments/medbay/alt/directional/east, -/obj/structure/chair/sofa/corp/left{ +/obj/effect/turf_decal/trimline/red/line{ dir = 8 }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "xzX" = ( /obj/structure/chair{ dir = 8 @@ -70223,9 +70372,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/service/hydroponics) +"xAT" = ( +/obj/machinery/light/directional/east, +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/security/prison/rec) "xBk" = ( -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/structure/tank_dispenser, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "xBB" = ( /obj/effect/turf_decal/stripes/line, @@ -70305,6 +70467,7 @@ /area/station/hallway/primary/aft) "xCo" = ( /obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, @@ -70361,7 +70524,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "xDM" = ( -/obj/machinery/light/directional/west, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/security/prison) "xEe" = ( @@ -70720,16 +70883,12 @@ /turf/open/floor/iron/dark, /area/station/security/prison) "xKR" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark, +/turf/open/floor/glass/reinforced, /area/station/commons/fitness/recreation) "xKS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/item/toy/basketball, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron, +/turf/open/floor/glass/reinforced, /area/station/security/prison/workout) "xKT" = ( /obj/effect/turf_decal/tile/neutral/anticorner{ @@ -70741,7 +70900,10 @@ /area/station/engineering/gravity_generator) "xLc" = ( /obj/machinery/camera/autoname/directional/north, -/obj/machinery/light_switch/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = 8 + }, +/obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, @@ -70930,11 +71092,14 @@ /turf/open/floor/iron/cafeteria, /area/station/maintenance/starboard/aft) "xOK" = ( -/obj/machinery/vending/sustenance, -/obj/machinery/camera/autoname/directional/south, -/obj/item/radio/intercom/prison/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/prison/mess) +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/checker, +/area/station/commons/dorms/laundry) "xOV" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -70985,7 +71150,7 @@ /area/station/hallway/primary/central) "xRd" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/fax{ fax_name = "Chief Medical Officer's Office"; name = "Chief Medical Officer's Fax Machine" @@ -71155,7 +71320,7 @@ dir = 1 }, /obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "xTb" = ( /obj/effect/turf_decal/stripes/line{ @@ -71216,15 +71381,12 @@ /turf/open/floor/wood, /area/station/security/prison/safe) "xUa" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/office) +/turf/closed/wall, +/area/station/maintenance/department/engine) "xUd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/bot, +/obj/structure/liquid_pump, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) "xUs" = ( /obj/structure/closet/secure_closet/freezer/kitchen{ @@ -71249,7 +71411,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "xUG" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, /obj/machinery/light/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -71307,7 +71468,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/cafeteria, +/turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "xVF" = ( /obj/effect/spawner/random/structure/chair_maintenance{ @@ -71570,11 +71731,17 @@ }, /area/station/commons/fitness/recreation) "xZo" = ( -/obj/machinery/byteforge, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark/textured, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/computer/quantum_console{ + dir = 1 + }, +/turf/open/floor/iron/dark, /area/station/security/bitden) "xZp" = ( +/obj/machinery/airalarm/directional/south, /obj/structure/closet/secure_closet/captains, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) @@ -71653,7 +71820,7 @@ }, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/regular{ pixel_x = 6; pixel_y = 6 @@ -71684,6 +71851,7 @@ /obj/machinery/light_switch/directional/south{ pixel_x = 8 }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/closet/secure_closet/medical1, /turf/open/floor/iron/white, /area/station/medical/office) @@ -71707,6 +71875,7 @@ dir = 8 }, /obj/machinery/light/directional/west, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -71722,15 +71891,10 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "ybm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/dark_red/arrow_cw{ - dir = 10 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/prison/shower) +/obj/machinery/airalarm/directional/south, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/station/security/prison/rec) "ybw" = ( /obj/machinery/status_display/evac/directional/south, /obj/effect/decal/cleanable/dirt, @@ -71872,8 +72036,6 @@ /obj/machinery/door/window/left/directional/west{ name = "Fitness Ring" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "ydu" = ( @@ -71933,15 +72095,13 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/maintenance/department/security) "yeq" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/cable/layer1, -/turf/open/floor/iron, -/area/station/engineering/main) +/obj/effect/turf_decal/trimline/red/line, +/obj/machinery/medical_kiosk, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "yeu" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -72337,7 +72497,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/light/small/directional/north, /obj/machinery/duct, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -72397,7 +72556,6 @@ dir = 8 }, /obj/machinery/light/directional/east, -/obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -77985,6 +78143,27 @@ ksa ksa ksa ksa +noh +noh +noh +noh +noh +noh +noh +noh +noh +ksa +noh +noh +noh +noh +noh +ksa +ksa +ksa +ksa +ksa +ksa ksa ksa ksa @@ -77995,11 +78174,6 @@ ksa ksa ksa ksa -noh -noh -noh -noh -noh ksa ksa ksa @@ -78016,89 +78190,73 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -"} -(23,1,1) = {" +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +"} +(23,1,1) = {" ksa ksa ksa @@ -78244,11 +78402,11 @@ ksa ksa ksa ksa +uoo ksa +uoo ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -81061,7 +81219,7 @@ uiu uho ksa uho -kXx +sLa xxP feq cRp @@ -82035,7 +82193,7 @@ cfv xmK pun pdz -ndl +vRw qnR cUh jUb @@ -82612,7 +82770,7 @@ wCn cRp cRp eGm -gTH +whr gTH xtQ hzK @@ -83609,7 +83767,7 @@ wbe xxP sNf nEU -ufu +ams bEV lCf xNd @@ -83856,7 +84014,7 @@ iHO iHO qVi fPN -qem +vUY qem qem qem @@ -84667,7 +84825,7 @@ suW boe wAR qhu -auk +sTE jTs tEB tEB @@ -85155,7 +85313,7 @@ hBe wjA anh dOn -whr +gNn fhd ufq bnl @@ -85690,12 +85848,12 @@ fUs jEi bnl qJD -pHx +fbw qqU xeM aKM qhu -auk +sTE jTs ggp iZd @@ -85846,7 +86004,7 @@ ksa ksa ksa ksa -ksa +sQS ksa ksa ksa @@ -85861,9 +86019,9 @@ ksa xXP ksa ksa -xXP -xXP -xXP +fEP +fEP +fEP xXP ksa ksa @@ -85952,7 +86110,7 @@ tMU tMU qhu qhu -rzs +sTE jTs sdf gJY @@ -86107,7 +86265,7 @@ ksa ksa ksa ksa -ksa +uoo ksa ksa ksa @@ -86211,7 +86369,7 @@ epO ffH jga jTs -fEr +nFo gJY uoo uoo @@ -86358,15 +86516,15 @@ ksa ksa ksa ksa +uoo +fEP +fEP +fEP +uoo ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo +uoo +uoo ksa ksa ksa @@ -86613,15 +86771,15 @@ ksa ksa ksa ksa +uoo ksa ksa ksa +uoo ksa ksa ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -86870,15 +87028,15 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo +uoo +uoo +uoo +uoo +uoo +uoo +uoo +uoo ksa ksa ksa @@ -86986,7 +87144,7 @@ rCj lRD lRD lRD -uoo +ksa uoo ksa ksa @@ -87127,15 +87285,15 @@ ksa ksa ksa ksa +uoo ksa ksa ksa ksa ksa +uoo ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -87152,7 +87310,7 @@ xXP ksa ksa ksa -xXP +fEP ksa ksa ksa @@ -87186,7 +87344,7 @@ aIp drQ qUQ ksb -qUQ +xOK lej eDT juk @@ -87388,9 +87546,9 @@ ksa ksa ksa ksa -ksa -ksa -ksa +uoo +uoo +uoo ksa ksa ksa @@ -87404,12 +87562,12 @@ xXP xXP ksa ksa -xXP -xXP -xXP +fEP +fEP +fEP ksa xXP -xXP +fEP xXP xXP ksa @@ -87647,7 +87805,7 @@ ksa ksa ksa ksa -ksa +uoo ksa ksa ksa @@ -87666,7 +87824,7 @@ xXP ksa ksa ksa -xXP +fEP ksa ksa ksa @@ -87891,7 +88049,9 @@ ksa ksa ksa ksa +uoo ksa +sQS ksa ksa ksa @@ -87902,6 +88062,7 @@ ksa ksa ksa ksa +uoo ksa ksa ksa @@ -87909,14 +88070,11 @@ ksa ksa ksa ksa -ksa -ksa -ksa -xXP -xXP -xXP xXP xXP +fEP +fEP +fEP ksa ksa ksa @@ -88145,8 +88303,10 @@ ksa ksa ksa ksa +uoo ksa ksa +uoo ksa ksa ksa @@ -88162,15 +88322,13 @@ ksa ksa ksa ksa +uoo ksa ksa ksa ksa ksa -ksa -ksa -ksa -ksa +uoo ksa ksa xXP @@ -88402,11 +88560,14 @@ ksa ksa ksa ksa +uoo ksa ksa +uoo ksa ksa ksa +uoo ksa ksa ksa @@ -88416,18 +88577,15 @@ ksa ksa ksa ksa +uoo ksa +uoo ksa +uoo ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -88656,9 +88814,17 @@ ksa ksa ksa ksa +uoo +uoo +fEP +fEP +fEP +uoo +uoo ksa ksa ksa +uoo ksa ksa ksa @@ -88668,19 +88834,11 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo +uoo +uoo +uoo +uoo ksa ksa ksa @@ -88774,7 +88932,7 @@ fUs bOO bnl vqK -oUG +iBi nOw sGm wnQ @@ -88910,14 +89068,20 @@ ksa ksa ksa ksa +sQS ksa ksa ksa ksa ksa +uoo ksa ksa +uoo ksa +uoo +uoo +uoo ksa ksa ksa @@ -88927,17 +89091,11 @@ ksa ksa ksa ksa +uoo ksa +uoo ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -89171,13 +89329,18 @@ ksa ksa ksa ksa +uoo ksa +uoo ksa ksa +uoo ksa ksa ksa +uoo ksa +uoo ksa ksa ksa @@ -89187,12 +89350,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -89424,27 +89582,24 @@ ksa ksa ksa ksa +uoo ksa +fEP ksa +uoo ksa +uoo ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo +uoo +uoo +uoo +uoo +fEP +fEP +fEP +uoo +uoo ksa ksa ksa @@ -89473,6 +89628,9 @@ ksa ksa ksa ksa +ksa +ksa +ksa nGn pBu qRD @@ -89681,24 +89839,21 @@ ksa ksa ksa ksa +uoo +uoo +fEP +uoo +uoo +uoo +uoo ksa ksa ksa ksa +uoo ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -89728,6 +89883,9 @@ fEP ksa ksa ksa +ksa +ksa +ksa xXP xXP nGn @@ -89940,26 +90098,23 @@ ksa ksa ksa ksa +fEP ksa ksa ksa +uoo ksa ksa +fEP +fEP +fEP ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo +fEP +fEP +fEP +uoo ksa fEP fEP @@ -89980,11 +90135,14 @@ giM giM giM giM -ksa +xXP +fEP +fEP +fEP +fEP fEP fEP fEP -xXP xXP ksa nGn @@ -90197,24 +90355,21 @@ ksa ksa ksa ksa +uoo +uoo ksa ksa +uoo ksa ksa ksa ksa +uoo ksa ksa +uoo ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -90242,6 +90397,9 @@ xXP ksa xXP ksa +xXP +ksa +ksa ksa ksa fPN @@ -90454,6 +90612,7 @@ ksa ksa ksa ksa +uoo ksa ksa ksa @@ -90462,16 +90621,12 @@ ksa ksa ksa ksa +uoo ksa ksa +uoo ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -90490,14 +90645,17 @@ wZx wZx wZx wZx +xgX +mRx qgq -kOk -qgq ybj ybj ybj ybj ybj +ybj +ybj +ksa ksa ksa ksa @@ -90729,9 +90887,6 @@ ksa ksa ksa ksa -ksa -ksa -ksa fEP ksa wZx @@ -90749,13 +90904,16 @@ nxD bXU oWq mRx -qgq +kxd cbB +gJK uoF iBo +ayn hLe ybj ksa +ksa xXP xXP nGn @@ -90768,8 +90926,8 @@ iHO xVj hbX xRO -pvu -bEF +ooM +rMT oOX rdQ xXh @@ -90812,7 +90970,7 @@ rRm qXR pWG wEt -ocD +wEt vkX xVa xLc @@ -90971,10 +91129,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -91005,15 +91160,18 @@ gbn aSP bXU xAx -jou +ipb rDd lfm +rAH +bhf bhf bhf lBB ybj xXP -xXP +fEP +fEP ksa nGn dQh @@ -91046,7 +91204,7 @@ kxo szb szb szb -kxo +fPN fPN fPN fPN @@ -91226,12 +91384,9 @@ ksa ksa ksa ksa -ksa -ksa -ksa uoo ksa -ksa +uoo ksa ksa ksa @@ -91262,16 +91417,19 @@ cnP vzd bXU qgq -jou +ipb qgq cbB riF +diY +uxF uxF mvF ybj ksa ksa ksa +ksa fPN fPN fPN @@ -91303,17 +91461,17 @@ xXP ksa ksa ksa -ksa fPN fhe noO oSr pWi hqv +rpJ uRq sXl uRq -uRq +vtJ vcC vcC vcC @@ -91325,7 +91483,7 @@ nvt rRm olQ mPm -wEt +ogX rRm rRm xVa @@ -91480,17 +91638,14 @@ ksa ksa ksa ksa -ksa -ksa -ksa +sQS ksa uoo -ksa uoo -ksa -ksa -ksa -ksa +uoo +fEP +uoo +uoo ksa ksa fEP @@ -91519,16 +91674,19 @@ ujZ bXU bXU fTm -jou +ipb vCn cbB cbB cbB cbB +cbB +cbB ybj ksa ksa ksa +ksa xXP ksa ksa @@ -91560,7 +91718,6 @@ xXP ksa ksa ksa -ksa fPN fPN fPN @@ -91570,8 +91727,9 @@ nZL nZL nZL nZL -nZL -nZL +vtP +vtP +vtP nZL nZL nZL @@ -91738,17 +91896,14 @@ ksa ksa ksa ksa -sQS ksa -uoo -uoo -uoo -uoo -uoo -uoo ksa ksa ksa +fEP +ksa +xXP +xXP ksa fEP ksa @@ -91776,16 +91931,19 @@ xJb xuA utG qgq -jou +ipb xKq bXU -xfT -kWN +vXf vVm +rdr +irp +kWN wZx ksa ksa ksa +ksa xXP xXP xXP @@ -91819,7 +91977,6 @@ ksa ksa ksa ksa -ksa xXP nGn iYK @@ -91828,6 +91985,7 @@ ksa xXP ksa xXP +ksa xXP ksa xXP @@ -91998,13 +92156,10 @@ ksa ksa ksa ksa +xXP +fEP ksa ksa -uoo -ksa -xXP -xXP -xXP xXP ksa fEP @@ -92037,13 +92192,16 @@ tvX lMT wMO tRU +gWz +itd +lIO jEY -daR wZx xXP xXP xXP xXP +xXP ksa ksa nGn @@ -92076,7 +92234,6 @@ ksa ksa ksa ksa -ksa xXP nGn eGT @@ -92088,6 +92245,7 @@ poG poG poG poG +poG bVI kpr rWZ @@ -92256,11 +92414,8 @@ ksa ksa ksa ksa -xXP -uoo -ksa +fEP ksa -xXP ksa ksa ksa @@ -92285,7 +92440,7 @@ qgq flr xJb qgq -jGt +xhf xJb knr utG @@ -92293,9 +92448,11 @@ qgq jou qgq bXU +xfT +paw +erd snd aGa -iiC wZx ksa ksa @@ -92303,6 +92460,7 @@ ksa ksa ksa ksa +ksa fPN nGn nGn @@ -92333,13 +92491,13 @@ ksa ksa ksa ksa -ksa xXP nGn eGT vtP ksa poG +voY dim rCZ waa @@ -92349,7 +92507,7 @@ ksa kpr rWZ pjD -erS +enB rRm puT mPm @@ -92511,14 +92669,11 @@ ksa ksa ksa ksa -ksa -ksa -ksa uoo -ksa -ksa -ksa -ksa +uoo +fEP +uoo +uoo ksa ksa fEP @@ -92553,6 +92708,8 @@ dOS dOS dOS dOS +dOS +dOS oxa ksa ksa @@ -92562,6 +92719,7 @@ ksa ksa ksa ksa +ksa xXP ksa nGn @@ -92591,12 +92749,12 @@ nGn nGn nGn nGn -nGn fPN eGT vtP xXP poG +fiU ujY dTW dTW @@ -92606,11 +92764,11 @@ dBd kpr fZK pjD -erS +qvY rRm tnN mPm -prb +wEt rRm oLg oLg @@ -92766,17 +92924,14 @@ ksa ksa ksa ksa -ksa -ksa -ksa -uoo -uoo uoo uoo uoo ksa +uoo ksa -ksa +uoo +uoo ksa fEP ksa @@ -92807,10 +92962,13 @@ qgq jou mVH dOS -wsn -tDV +sOa +lsx +lCo +vde rCE oxa +ksa lws lws lws @@ -92848,13 +93006,13 @@ qpx qpx qpx qpx -qpx puy aIy vtP sMr poG -vtJ +oQc +ujY wKi vbl ekx @@ -92865,9 +93023,9 @@ qLz pjD dYc rRm -oZh +rRm iFB -oZh +rRm rRm lkq vLL @@ -93025,14 +93183,11 @@ ksa ksa ksa ksa +uoo ksa ksa ksa -uoo ksa -uoo -uoo -uoo ksa ksa fEP @@ -93060,13 +93215,16 @@ bXU hcq xTT bXU -sOa +hmF jou lMT eGa shm +uBD +eCJ +sjs kFK -sLa +oxa pSA nIG nIG @@ -93076,7 +93234,7 @@ xXP fdt ksa ksa -ksa +xXP ksa nGn fBi @@ -93105,12 +93263,12 @@ nGn nGn nGn nGn -nGn fPN spv vtP xXP poG +tDO ujY xlo xlo @@ -93121,10 +93279,10 @@ kpr rWZ pjD jHm -rRm +lea vNB mPm -wEt +oHP qCL fZB tLj @@ -93286,10 +93444,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -93321,9 +93476,12 @@ fTm jou qgq dOS +nKe pOH +goR +kcr gNS -rCE +uQv pSA lZR evu @@ -93333,7 +93491,7 @@ ksa fdt ksa ksa -ksa +xXP ksa fPN fPN @@ -93361,13 +93519,13 @@ ksa ksa ksa ksa -ksa xXP nGn spv vtP ksa poG +sDC ceb gYF lUM @@ -93378,7 +93536,7 @@ kpr rWZ pjD erS -rRm +prb apt rIX sUl @@ -93543,28 +93701,25 @@ ksa ksa ksa ksa +uoo ksa ksa +fEP ksa +uoo ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa fEP uoo wZx -bXU -bXU -bXU +wZx +wZx +wZx bXU bXU bXU @@ -93581,6 +93736,9 @@ dOS dOS dOS dOS +dOS +dOS +dOS pSA aZn bxZ @@ -93590,7 +93748,7 @@ xXP fdt ksa ksa -ksa +xXP ksa fPN kCF @@ -93618,7 +93776,6 @@ ksa ksa ksa ksa -ksa xXP nGn spv @@ -93630,13 +93787,14 @@ poG poG poG poG +poG bVI kpr rWZ pjD erS -rRm -enB +ocD +wEt mPm wEt qCL @@ -93800,24 +93958,24 @@ ksa ksa ksa ksa +uoo ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +fEP +uoo +uoo +uoo +uoo +uoo +uoo +uoo uoo ksa -ksa +fEP ksa uoo ksa ksa -fEP -ksa aeM joc oKA @@ -93827,14 +93985,14 @@ cnG cCf qgq bpE -qgq -qgq -gYH -vUA +hJa qgq jou qgq +qgq +xDM umL +xUO rDO qgq qgq @@ -93847,7 +94005,7 @@ ksa fdt ksa ksa -ksa +xXP ksa nGn wfE @@ -93875,7 +94033,6 @@ ksa ksa ksa ksa -ksa xXP nGn iHO @@ -93884,6 +94041,7 @@ ksa xXP ksa xXP +ksa xXP ksa xXP @@ -94057,23 +94215,23 @@ ksa ksa ksa ksa +fEP ksa ksa +fEP ksa +uoo ksa ksa ksa ksa uoo -uoo -uoo ksa -uoo ksa +fEP +uoo uoo uoo -ksa -fEP uoo aeM nPx @@ -94087,13 +94245,13 @@ jou jou jou jou -jou -jou -jou lMT lMT lMT lMT +ptH +lMT +lMT dOa pSA jbA @@ -94104,8 +94262,8 @@ xXP fdt ksa ksa -ksa -ksa +xXP +xXP nGn gtP bCK @@ -94133,15 +94291,15 @@ ksa ksa ksa ksa -ksa fPN iHO nZL nZL nZL nZL -nZL -nZL +vtP +vtP +vtP nZL nZL nZL @@ -94311,7 +94469,15 @@ ksa ksa ksa ksa +uoo +uoo +uoo +fEP +uoo +uoo +uoo ksa +uoo ksa ksa ksa @@ -94319,18 +94485,10 @@ ksa ksa ksa ksa +fEP ksa ksa -ksa -ksa -uoo -uoo uoo -uoo -fEP -fEP -fEP -fEP ksa aeM joc @@ -94341,14 +94499,14 @@ jHa cCf qgq qgq +rBk qgq -wvb qgq qgq grz -sjs qgq qgq +xUO qgq lMT mVH @@ -94361,7 +94519,7 @@ ksa ksa ksa ksa -ksa +xXP ksa nGn vxJ @@ -94390,7 +94548,6 @@ ksa ksa ksa ksa -ksa fPN cCv nEW @@ -94398,6 +94555,7 @@ iHO iHO iHO iHO +spv xgY iHO iHO @@ -94571,25 +94729,25 @@ ksa ksa ksa ksa +fEP ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa uoo ksa ksa fEP -kFk -kFk -kFk -kFk -kFk +fEP +fEP +fEP +fEP +fEP +uoo +uoo +uoo +uoo +mtq cCf cCf chZ @@ -94603,10 +94761,10 @@ xSs xSs xSs mWi -mWi eZP eZP -qgq +mWi +fTm lMT qgq pSA @@ -94618,7 +94776,7 @@ ksa ksa ksa ksa -ksa +xXP ksa fPN kCF @@ -94647,7 +94805,7 @@ ksa xXP hHw hHw -hHw +nZL nZL nZL nZL @@ -94828,6 +94986,7 @@ ksa ksa ksa ksa +uoo ksa ksa ksa @@ -94835,18 +94994,17 @@ ksa ksa ksa ksa +fEP ksa +uoo ksa ksa +uoo ksa ksa +uoo ksa -fEP -kFk -apg -bdb -hmF -mDi +mtq mKE vyJ mEQ @@ -94855,13 +95013,13 @@ vez cCf ovc urW -urW +tHM urW urW urW bdf urW -urW +cru eZP qgq lMT @@ -94986,7 +95144,7 @@ hxe cUr xba swJ -oPA +cMy aFt gRr oPA @@ -95089,28 +95247,28 @@ ksa ksa ksa ksa -ksa -ksa -ksa uoo ksa ksa ksa -ksa -ksa fEP +uoo +uoo kFk -apg -wGs -rdr -mDi +nsw +nsw +nsw +kFk +uoo +uoo +mtq cCf lBH mEQ pXY cCf cCf -fMv +urW urW cbn aee @@ -95118,8 +95276,8 @@ exG aee gCs urW -lvl -mWi +urW +eZP qgq lMT qgq @@ -95244,7 +95402,7 @@ lmm xsi rlK xgs -jlO +oPA oPA oPA oPA @@ -95340,30 +95498,30 @@ ksa ksa ksa ksa -ksa -ksa -ksa sQS ksa -uoo +fEP ksa ksa ksa uoo ksa uoo -uoo -ksa ksa fEP +ksa +kFk kFk apg -vIP -uQv +emc +apg +kFk +kFk +ksa mtq -mcU -jhR -ybm +mKE +vyJ +mEQ vyJ vez cCf @@ -95500,8 +95658,8 @@ nwz kHk xba vHT -oPA -vFQ +iKJ +oLh oLh oLh oLh @@ -95599,10 +95757,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -uoo +fEP uoo uoo ksa @@ -95610,17 +95765,20 @@ uoo uoo uoo ksa -ksa -ksa fEP +uoo kFk +air +sMI +kcM +sMI kzh -emc -tyX -mDi +kFk +uoo +mtq cCf nCu -nsw +mEQ xCo cCf cCf @@ -95757,7 +95915,7 @@ mcG orM xba aTB -oPA +iQE tZH aYs rDD @@ -95854,12 +96012,9 @@ ksa ksa ksa ksa -ksa -ksa -ksa -uoo uoo uoo +fEP ksa uoo uoo @@ -95867,26 +96022,29 @@ uoo ksa ksa ksa -ksa -fEP fEP +ksa kFk +wsn +fZy +kqp +fMv gSB -lIO -liD -mDi -mKE +kFk +ksa +mtq +wGI vyJ mEQ xhp xhp wQk omI -bfn +lKu nqm -nKo +hjZ xKS -nKo +hjZ qAo lKu lKu @@ -96014,11 +96172,11 @@ xba xba xba iya -sZY -iRv -sZY -sZY +liN +iya cHh +cHh +sZY sZY cHh cHh @@ -96111,27 +96269,27 @@ ksa ksa ksa ksa -ksa -ksa -ksa uoo ksa -uoo +fEP ksa ksa ksa uoo ksa ksa -ksa fEP fEP -ksa +uoo kFk +stB +nCK +lvl +daR xZo -nKe -erd -mDi +kFk +uoo +mtq cCf lBH mEQ @@ -96273,9 +96431,9 @@ fxk tHx sNp aoL -ndm -qHa fxk +qHa +rjW rjW miM fxk @@ -96374,21 +96532,21 @@ ksa ksa ksa ksa -ksa -ksa -ksa uoo ksa ksa -ksa fEP ksa ksa kFk mDi mDi +liD mDi mDi +kFk +ksa +mtq mKE vyJ mEQ @@ -96527,13 +96685,13 @@ lkR jhE jhE fxk -bGX -yeq +gRf +adw lfo -pDB -hlp vJc -jMb +tSE +tSE +tSE tSE huJ lwj @@ -96634,25 +96792,25 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa fEP uoo xta xta -paw -plz -plz -cCf +wrA +sdP +unQ +sdP +wrA +xta +xta +mtq cCf cCf chZ cCf cCf cCf -fMv +urW urW bdq xeX @@ -96660,11 +96818,11 @@ aqa xeX fTx urW -lvl -mWi +urW +eZP qgq lMT -kxd +qgq pSA qgX jac @@ -96784,13 +96942,13 @@ rFn jhE jhE fxk -lYL +uQQ adw -fiA -fxk -fxk +hDv fxk fxk +mpo +mpo fxk fxk iCE @@ -96891,23 +97049,23 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa fEP ksa nnG -cet +quN sdP -jcC -air +sdP +unQ +sdP +dNt vhu xOf xOf +wHt +sdP tvc cGM -wrA +fme vhu dqx urW @@ -96917,11 +97075,11 @@ urW urW qEC urW -urW +cru eZP -aBX -odC -aBX +qgq +lMT +qgq pSA pSA pSA @@ -97041,9 +97199,9 @@ rFn lOo lOo fxk -bGX +lYL adw -ihh +wgZ ksa ksa ksa @@ -97145,11 +97303,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +fEP ksa ksa fEP @@ -97157,13 +97311,17 @@ ksa nnG fme sdP -fIV +eeC +unQ +sdP sdP oUY sdP sdP +sdP +sdP tvc -kqp +sdP kIl vhu eZP @@ -97173,12 +97331,12 @@ xSs xSs xSs mWi -mWi eZP eZP -qgq +mWi +fTm vCp -kxd +kpW cqR wbK jsQ @@ -97400,13 +97558,9 @@ ksa ksa ksa ksa +fEP ksa -ksa -ksa -uoo -ksa -ksa -ksa +fEP ksa ksa fEP @@ -97414,23 +97568,27 @@ ksa nnG diI sdP -eJA -dFp +fIV +gYH jAm bJn sdP +dFp +dFp +sdP +jcC tvc sdP sdP -nnG +ePv qgq qgq qgq qgq qgq rDO +tDV qgq -xDM qgq xUO rDO @@ -97518,7 +97676,7 @@ wuH qdE pIA bzW -dCP +oZh eNs ksa uoo @@ -97555,7 +97713,7 @@ rFn mih lOo fxk -bGX +nZg qRc ihh ksa @@ -97654,29 +97812,29 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa uoo -ksa uoo -ksa -ksa -ksa -ksa +uoo +fEP +uoo +fEP +uoo ksa fEP uoo xta -cIv +wGs oMi -gRM +cFf wjv urm epW unQ -goR +jhR +jhR +unQ +gRM +tvc tvc tvc hrT @@ -97812,7 +97970,7 @@ fxk fxk fxk fxk -nZg +lJD qRc ihh ksa @@ -97912,15 +98070,11 @@ ksa ksa ksa ksa -uoo -uoo -uoo -uoo -uoo -uoo -uoo ksa ksa +fEP +ksa +fEP ksa ksa fEP @@ -97928,15 +98082,19 @@ ksa nnG qbz sdP -nGl -tZl +fIV +sGT ejw bJn sdP +tZl +tZl sdP +qTG tvc sdP -nnG +sdP +ePv qgq dvd qgq @@ -97944,7 +98102,7 @@ nqD jou qgq qgq -qgq +nKo knr xUO qgq @@ -97964,7 +98122,7 @@ tcY wLb oeC ndQ -pCA +jGt tcY cXi fsm @@ -98071,7 +98229,7 @@ jGl ceX bGX qRc -fiA +ihh ksa ksa ksa @@ -98171,11 +98329,7 @@ ksa ksa ksa ksa -ksa -uoo -ksa -uoo -ksa +fEP ksa ksa ksa @@ -98183,30 +98337,34 @@ ksa fEP ksa nnG -fme +wBu sdP +rAB vSE sdP +sdP ngA sdP sdP -rAB +sdP +sdP tvc -stB +sdP +vhu vhu ajn ajn ajn -ajn +fSs uCk sli -fSs +ajn ajn ajn ajn fvn vCp -kpW +kxd cqR uKf uKf @@ -98328,7 +98486,7 @@ kNJ ceX bGX qRc -ihh +fiA ksa ksa ksa @@ -98429,10 +98587,6 @@ ksa ksa ksa ksa -uoo -ksa -ksa -ksa ksa ksa ksa @@ -98440,24 +98594,28 @@ ksa fEP ksa nnG -ksZ +xAT sdP -qTG -air +sdP +sdP +sdP +dNt vhu seS seS -dNt +rbe +sdP tvc -iFo +ybm vhu hFr +bfn ltj -rbf gvR +dxW gEt dxW -wzI +vIP jEI qQq rhW @@ -98526,7 +98684,7 @@ uiA eJD lOJ arQ -skJ +fVn voV cbY dEQ @@ -98585,7 +98743,7 @@ wMs ceX bGX qRc -ihh +wgZ ksa ksa ksa @@ -98683,11 +98841,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -98698,9 +98852,12 @@ fEP uoo xta xta -wBu plz plz +mcU +plz +plz +tFK oER oER oER @@ -98708,10 +98865,11 @@ oER dix oER oER -ePv +bSb lhg lhg noQ +nGl gEt rHR dxW @@ -98720,7 +98878,7 @@ jbP rhW qgq lMT -qgq +kxd kml vXY aTv @@ -98781,8 +98939,8 @@ bFw rkX ftk ssT -lOJ -arQ +ftk +kew seN rbv dsE @@ -98840,9 +98998,9 @@ dXL fxk fxk fxk -bGX -qRc -ihh +kHL +cJu +kHL ksa ksa ksa @@ -98940,13 +99098,9 @@ ksa ksa ksa ksa +uoo ksa -ksa -ksa -ksa -ksa -ksa -ksa +fEP ksa ksa ksa @@ -98958,18 +99112,22 @@ xta xta xta xta +xta +xta tFK piY piY vQY +rbf dZe kxu oER -lCo +bdb tLo tLo -pBC -cru +nWh +dxW +wAd dxW wzI qDj @@ -99040,9 +99198,9 @@ eaf baq lOJ arQ -skJ +fVn dRd -cbY +brw vaO baC myJ @@ -99195,22 +99353,20 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa uoo -ksa -ksa -ksa -ksa uoo +uoo +uoo +fEP ksa +uoo +uoo ksa fEP fEP ksa +ksa +ksa uoo ksa uoo @@ -99219,12 +99375,14 @@ tFK scR yaX ipY +eJA dZe fch oER -eCJ -tLo +ksZ tLo +fdz +ajn aiw vdj fuS @@ -99270,9 +99428,9 @@ bMX inF hjG iKf +rKe ueL -ueL -ueL +rzs fPN dwJ nZL @@ -99297,7 +99455,7 @@ eBj fsd lOJ arQ -fVn +skJ hEZ otg otO @@ -99453,14 +99611,10 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa uoo ksa -uoo ksa +fEP ksa uoo ksa @@ -99471,23 +99625,27 @@ fEP fEP fEP fEP +fEP +fEP uoo rHA piY piY xWj +sJm iwL ncG oER -rBk +ktq tLo tLo -nWh -cru +pBC +qQq +wAd dxW wzI qDj -tHM +qQq rhW giM giM @@ -99610,9 +99768,9 @@ nst ody ceX pVi -pxw -pxw -pxw +izU +izU +izU ihh ksa ksa @@ -99713,14 +99871,12 @@ ksa ksa ksa uoo -uoo -uoo +fEP uoo uoo ksa -uoo -uoo -uoo +ksa +ksa ksa ksa ksa @@ -99733,19 +99889,21 @@ rHA nDq nDq mRL +cet iwL -kXK -oER -dpo +sJm +wgw +tLo tLo tLo urV +qQq wAd wxY dxW dxW -fuS -gJM +ocC +rhW ksa xXP ksa @@ -99867,9 +100025,9 @@ nst nst rBb jkU -pxw izU -pxw +izU +izU ihh ksa ksa @@ -99967,20 +100125,18 @@ ksa ksa ksa ksa -ksa -ksa sQS +ksa uoo ksa ksa uoo ksa uoo -ksa -ksa -ksa -ksa -ksa +uoo +uoo +uoo +uoo ksa ksa ksa @@ -99990,19 +100146,21 @@ rHA mfE mfE xWj -ipb -wWZ -oER -xUs +iHb +vTX +sJm +cIv tLo +gGV tLo ogz -lVd +qQq +fuS dxW wzI -qDj +lVd qQq -gJM +rhW ksa xXP ksa @@ -100124,9 +100282,9 @@ pxw ivM ceX jqs -pxw -pxw -pxw +izU +izU +izU ihh ksa ksa @@ -100230,14 +100388,12 @@ ksa ksa ksa uoo -uoo -uoo -uoo -ksa ksa ksa ksa +uoo ksa +uoo ksa ksa ksa @@ -100246,17 +100402,19 @@ ksa rHA yaX yaX -gJK +pHz +iYP vTX sLA oER -gfF +tLo tLo tLo phd +qQq fuS dxW -dKa +rhW rhW rhW rhW @@ -100375,7 +100533,7 @@ nPq xba xba xba -qpi +enU qpi qpi enU @@ -100486,17 +100644,15 @@ ksa ksa ksa ksa -uoo -ksa ksa -uoo ksa ksa ksa uoo ksa -ksa -ksa +uoo +uoo +uoo ksa fEP uoo @@ -100504,17 +100660,19 @@ rHA mfE mfE xWj -bMw sJm -wgw -tLo +bMw +kXK +oER +gfF tLo tLo oPP -qnN +qQq +fuS dxW -xOK rhW +ksa uoo ksa ksa @@ -100749,30 +100907,30 @@ ksa ksa ksa ksa -uoo -uoo -uoo -uoo ksa ksa +uoo +ksa fEP ksa tFK scR yaX pHz -bMw sJm -sMI +bMw +qnN +oER +uMg tLo tLo -wGI tLo -fuS dxW -wOy +fuS +bnn rhW uoo +uoo xXP uoo xXP @@ -101008,8 +101166,6 @@ ksa ksa ksa ksa -ksa -uoo uoo ksa fEP @@ -101017,22 +101173,24 @@ ksa tFK mfE mfE -lsx +xWj +tyX lEa wtv oER mQx +tLo oaa rhW -gJM -gJM -gJM -rhW +auk +wOy +dKa rhW -uoo ksa uoo ksa +fEP +ksa xXP vFa krQ @@ -101265,8 +101423,6 @@ ksa ksa ksa ksa -ksa -ksa uoo ksa fEP @@ -101274,21 +101430,23 @@ uoo tFK tFK tFK +tFK rHA rHA rHA tFK +iiC +tLo +tLo rhW +gJM +gJM +gJM rhW -rhW -ksa -uoo -ksa -uoo ksa xXP ksa -uoo +fEP ksa xXP jLu @@ -101518,19 +101676,13 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa uoo -ksa -fEP -ksa +uoo +uoo +uoo uoo ksa -ksa +fEP ksa uoo ksa @@ -101539,13 +101691,19 @@ ksa ksa uoo ksa +rhW +xUs +sat +dpo +rhW +ksa uoo ksa uoo ksa xXP ksa -uoo +fEP ksa xXP jLu @@ -101558,7 +101716,7 @@ dAx iuI lZV jZp -diY +jRr pbc skd jNZ @@ -101777,16 +101935,10 @@ ksa ksa ksa ksa +uoo ksa ksa ksa -ksa -ksa -ksa -fEP -fEP -fEP -fEP fEP fEP fEP @@ -101795,14 +101947,20 @@ fEP fEP fEP fEP +uoo +rhW +rhW +rhW +rhW +rhW +uoo fEP fEP fEP fEP fEP xXP -xXP -fEP +uoo xXP xXP jLu @@ -102029,10 +102187,12 @@ ksa ksa ksa ksa +uoo ksa ksa ksa ksa +uoo ksa ksa ksa @@ -102043,17 +102203,15 @@ ksa ksa ksa ksa +fEP ksa +uoo ksa +uoo ksa +uoo ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +fEP ksa ksa ksa @@ -102286,6 +102444,7 @@ ksa ksa ksa ksa +fEP ksa ksa ksa @@ -102297,20 +102456,19 @@ ksa ksa ksa ksa -uoo -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa ksa ksa ksa ksa +fEP +fEP +fEP +fEP +fEP +fEP +fEP +fEP +fEP ksa ksa ksa @@ -102541,6 +102699,11 @@ ksa ksa ksa ksa +uoo +uoo +fEP +uoo +uoo ksa ksa ksa @@ -102552,17 +102715,12 @@ ksa ksa ksa ksa +fEP ksa ksa ksa ksa ksa -uoo -uoo -uoo -ksa -ksa -ksa ksa ksa ksa @@ -102658,7 +102816,7 @@ pdB lDX iqN mwc -bSC +kix rRZ miL miL @@ -102694,9 +102852,9 @@ xWM lSO ppP aSx -pxw -pxw -pxw +izU +izU +izU ihh ksa ksa @@ -102800,6 +102958,7 @@ ksa ksa ksa ksa +fEP ksa ksa ksa @@ -102812,17 +102971,16 @@ ksa ksa ksa ksa -ksa -uoo uoo +fEP +ksa +ksa +ksa +ksa ksa -uoo ksa ksa ksa -uoo -uoo -uoo ksa ksa ksa @@ -102937,9 +103095,9 @@ ufs kDd iGG uxl -qWb -qWb -qWb +lGW +kfB +wYA qWb mpY vHf @@ -102951,9 +103109,9 @@ icT pQc vHf ohm -pxw izU -pxw +izU +izU ihh ksa ksa @@ -103056,33 +103214,33 @@ ksa ksa ksa ksa +uoo +uoo +uoo +uoo ksa +uoo ksa ksa ksa +uoo +uoo +uoo ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -uoo -ksa +fEP uoo uoo +ksa uoo ksa +fEP ksa ksa ksa ksa +uoo ksa ksa fEP @@ -103194,10 +103352,10 @@ ufs oHO iGG uxl -kfB +lGW sAQ xrY -wYA +qWb mpY vHf iNx @@ -103208,9 +103366,9 @@ oyN pQc vHf ohm -pxw -pxw -pxw +izU +izU +izU ihh ksa ksa @@ -103316,6 +103474,13 @@ ksa ksa ksa ksa +uoo +uoo +uoo +uoo +uoo +uoo +uoo ksa ksa ksa @@ -103323,22 +103488,15 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -uoo uoo +ksa uoo uoo -ksa +fEP uoo uoo ksa ksa -ksa uoo ksa ksa @@ -103451,10 +103609,10 @@ ufs fpp iGG uxl -sSP -sSP -sSP -sSP +nZu +iGG +iGG +iGG jmo ppP cFF @@ -103571,12 +103729,15 @@ ksa ksa ksa ksa +sQS ksa +uoo ksa +uoo ksa +uoo ksa -ksa -ksa +uoo ksa ksa ksa @@ -103588,10 +103749,7 @@ uoo uoo uoo ksa -ksa -uoo -ksa -ksa +fEP ksa ksa ksa @@ -103669,8 +103827,8 @@ tdz sMN apE hDP +dFA jiu -atm mMm fIH evr @@ -103708,7 +103866,7 @@ ufs dPP iGG uxl -nZu +iGG iGG iGG iGG @@ -103719,16 +103877,16 @@ sWy nsn xWM xWM -mbp -ppP +pQc +aFZ ykT lWA gAJ cUV -lrp +hml mDv -pKc -tqT +bCy +bCy iiE bCy mDv @@ -103830,13 +103988,11 @@ ksa ksa ksa ksa +uoo ksa +uoo ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -103844,6 +104000,8 @@ ksa ksa ksa uoo +uoo +fEP ksa ksa uoo @@ -103852,7 +104010,7 @@ ksa ksa ksa ksa -uoo +fEP ksa ksa ksa @@ -103932,8 +104090,8 @@ gQO wPH eNn hDl -emv nPf +emv nPf hDl utO @@ -103985,7 +104143,7 @@ oyS fBU mDv uGA -tqT +bCy iiE bCy mDv @@ -104089,6 +104247,7 @@ ksa ksa ksa ksa +uoo ksa ksa ksa @@ -104096,20 +104255,19 @@ ksa ksa ksa ksa -uoo ksa ksa -uoo -uoo +ksa +fEP +ksa +ksa uoo ksa ksa ksa ksa ksa -uoo -uoo -uoo +fEP ksa ksa ksa @@ -104189,8 +104347,8 @@ lHm evr mLW hDl +ndm bMS -mXX sDk hDl oNH @@ -104242,7 +104400,7 @@ cMx mDv mDv ujV -tqT +bCy iiE rTf mDv @@ -104346,8 +104504,7 @@ ksa ksa ksa ksa -ksa -ksa +uoo ksa ksa ksa @@ -104358,15 +104515,16 @@ ksa ksa ksa uoo -ksa +fEP +uoo ksa ksa ksa ksa ksa uoo -ksa uoo +fEP ksa ksa ksa @@ -104382,12 +104540,12 @@ xSA xSA mrP mrP -lZs -lZs +pEr +pEr rCh -dTK -dTK -dTK +eri +eri +eri mAr lLk prj @@ -104447,8 +104605,8 @@ evr evr hDl uCB +kMH mXX -nIA nPf ehP tDk @@ -104477,7 +104635,7 @@ gIv uJk mLH kYW -kYW +gmC lLJ rMN cGB @@ -104486,12 +104644,12 @@ jaf qOG paK tRM -bGY -cCr -pfo +dtm +mEc +gkZ son xBk -chs +gcH mDv bMM pXp @@ -104509,15 +104667,15 @@ wXR wXR wXR wXR -cSQ +wXR ivS -ksa +maz ksa uoo ksa uoo ksa -ksa +uoo ksa ksa ksa @@ -104603,6 +104761,7 @@ ksa ksa ksa ksa +uoo ksa ksa ksa @@ -104612,18 +104771,17 @@ ksa ksa ksa ksa -sQS ksa +uoo ksa ksa +uoo ksa ksa ksa uoo -uoo -uoo -ksa ksa +uoo ksa ksa ksa @@ -104652,7 +104810,7 @@ mkR tWx oYp bvp -jUm +bqH hUW pTK vfV @@ -104733,48 +104891,48 @@ qGP hdi gvo mLH +olH wLK wLK -wLK -xUa +pKQ cGB -eZC +opP jaf elU kuC qZC bGY -wBY +mEc +gkZ pfo bXv pfo -chs -mDv -mDv -mDv -mDv -mDv -mDv -mDv -mDv -sXO -mDv -mDv -mDv -mDv -mDv -mDv -mDv mDv +tqT +bCy +bCy +bCy +xUa +woE +bCy +bCy +woE +xUa +bCy +bCy +bCy +bCy +bCy +qqd nrd mDv -uoo -uoo -uoo -uoo -uoo -uoo -ksa +fgv +kiv +kiv +kiv +kiv +kiv +maz ksa ksa ksa @@ -104869,17 +105027,17 @@ ksa ksa ksa ksa -ksa -ksa -uoo -uoo -ksa +sQS ksa ksa ksa ksa uoo ksa +fEP +fEP +fEP +ksa ksa ksa ksa @@ -104911,7 +105069,7 @@ tWx wYE tWx tWx -tWx +byk rMm iGO wCx @@ -104995,43 +105153,43 @@ uyh uCv pBp cGB -teM -jaf -ucG +cGB +xlW +fop ioi -vQE +rEO +wiC +wiC +iXg +uoX +nyT btS -ope -pfo -bXv -pfo -qqd -bvJ -wgZ -rfB -opP -mRG -gmC -xgB -rwN -wJm -pfo -rhD -pfo -pfo -pfo -rhD -pfo +mDv +mDv +mDv +mDv +mDv +mDv +mDv +sXO +sXO +mDv +mDv +mDv +mDv +mDv +mDv +mDv mDv hfI mDv gzZ +fAE gzZ gzZ gzZ gzZ -uoo -ksa +tXu ksa ksa ksa @@ -105128,18 +105286,18 @@ ksa ksa ksa ksa -uoo -ksa -ksa -ksa -ksa -sQS ksa +fEP +uoo +uoo +uoo +uoo ksa +uoo ksa ksa ksa -cMy +rxc xXP xXP xXP @@ -105167,8 +105325,8 @@ uML ntM bvp nRm -byk hqW +byk oYp ttO bTe @@ -105212,9 +105370,9 @@ cOn fgC pkv iMN -tXM -xOV mzq +xOV +tXM rZB mzq cOn @@ -105248,51 +105406,51 @@ gCT gCT gCT bBQ -olH -woE +wLK +wLK uLI cGB -cGB -xlW -fop -rEO -wiC -iXg -nEx -nEx -uoX -nyT -vUY -wWi -wWi -wWi -wWi -wWi -wWi -wWi +iye +jaf +lfI +eZC +bXv +uch +chs +gkZ +vQE +sSP +pfo wWi -ope +rhD +pfo +pfo +pfo +rhD pfo pfo pfo pfo +pSV +kvL pfo pfo +rhD pfo gzZ kPo wCX uWo +mRG uWo -klo -juH +bTx +lKe fAE -uoo -uoo -uoo -ksa -ksa -ksa +fgv +kiv +kiv +kiv +maz ksa ksa ksa @@ -105386,13 +105544,13 @@ ksa ksa ksa ksa +fEP ksa ksa ksa ksa ksa -ksa -ksa +uoo ksa ksa ksa @@ -105502,32 +105660,32 @@ wov rRZ cDS clk -fDD -rRZ -oqK -oqK -oqK -oqK -ycz -oqK -oqK +fHo +gCT +wBY +qQV +wLK +dRb +cGB +opP +jaf xUd oCq -lGW -nAK bXv -pfo +nAK +chs +gkZ fwd cLo -pfo -pfo -pfo -pfo -pfo -pfo -pfo -pfo bXv +bXv +bXv +bXv +bXv +bXv +bXv +bXv +pfo pfo pfo pfo @@ -105537,19 +105695,19 @@ pfo pfo pfo mdp -qQV +dFW goP -iqP +vxg iqP vxg +bvJ uWJ gzZ fAE gzZ wIO ksa -ksa -ksa +tXu ksa ksa ksa @@ -105643,9 +105801,9 @@ ksa ksa ksa ksa +fEP ksa -ksa -ksa +sQS ksa ksa ksa @@ -105681,9 +105839,9 @@ wbq hqK kfT veX -rTx iNM rTx +rTx fWD ayq hDp @@ -105736,12 +105894,12 @@ wXi uDj wXi tjP -dRH -hjB -hjB -hjB -bzW -hjB +wXi +wXi +hgf +bqA +iSM +wXi ihg pvL fni @@ -105760,21 +105918,21 @@ lrc fDD fDD kvD -rRZ -huo -leq -qvX -tgG -cTJ -wWU +gCT oqK -dtm -uTo +oqK +oqK +oqK +ycz +oqK +oqK +wzX +llH uTo -liN -uQQ -yjP -tnM +llH +wzX +llH +rfB toD yjP bAX @@ -105783,7 +105941,6 @@ yjP yjP yjP yjP -yjP tJu yjP yjP @@ -105792,21 +105949,22 @@ yjP yjP yjP yjP +yjP wwQ bmT dFW -mEc -mEc -gBR -gBR +dFW +dFW +dFW +dFW +esU esU tsd xHf lyC bem bem -bem -bem +ecX bem bem bem @@ -105925,7 +106083,7 @@ mrP mrP mrP pEr -lZs +pEr pNZ xzX xzX @@ -105938,12 +106096,12 @@ spo gdg cmI cmI -cmI dfS cmI cmI cmI cmI +cmI rAA tvh xTF @@ -105993,11 +106151,11 @@ oBH nlh nlh oBH -ecX -jkt -ifb -xzN -bqA +bXc +hbj +rFk +qUS +rFk maP lng pvL @@ -106018,19 +106176,19 @@ wko fDD ijZ rRZ -qvX -leq +huo +wWU eoL tgG cTJ -xdz +pKc oqK -wzX -wzX -wzX -llH -bLz -llH +crl +ucG +eVB +klo +txW +lGd qKy dgR pfo @@ -106040,8 +106198,8 @@ qUp qUp qUp pfo +cSQ pfo -bXv pfo pfo pfo @@ -106055,25 +106213,25 @@ kwk cgm jDD dsn +gBR cgm -hgf +xgB gzZ fAE gzZ iCE ksa +tXu ksa ksa ksa ksa +aVH ksa ksa ksa ksa ksa -ksa -aVH -ksa aVH tet pTV @@ -106195,8 +106353,8 @@ siR adT cmI nZo -kVn jWA +kVn vPr eVT iJp @@ -106250,12 +106408,12 @@ xCA ugN mup fOV -bXc -hbj -rFk -rFk -qUS -sep +uLT +fGH +teM +hih +uQm +mPL vcI pvL pvL @@ -106285,7 +106443,7 @@ gAM hRt ssL qep -kHL +ked thA ryX lMb @@ -106297,7 +106455,6 @@ ccW qNN ccW spG -pfo bXv pfo pfo @@ -106306,6 +106463,7 @@ pfo pfo pfo pfo +pfo gZC bmT swp @@ -106314,22 +106472,22 @@ iLs qMO jyb oqf -kvL -kiv -kiv -kiv -kiv -kiv -maz +juH +fAE +uoo +uoo +uoo +uoo +tXu ksa ksa ksa ksa +aVH ksa ksa ksa ksa -aVH ksa byC ujk @@ -106507,13 +106665,13 @@ tcR hYl xHH qPx -mvN -mPL -jLI -fGH -hih -nUs -emd +uSJ +kCL +jOI +oqN +kCL +kCL +wuj rIv wja jLf @@ -106541,9 +106699,9 @@ leq oqK hrH ltg -hzA +eVB fzi -dlI +bHc bHT xHp yjc @@ -106554,9 +106712,9 @@ pfo pfo ulR rxo +wJm +pfo pfo -ewZ -uLT pfo pfo pfo @@ -106582,11 +106740,11 @@ ksa ksa ksa ksa +aVH ksa ksa ksa ksa -aVH ksa ksa uoo @@ -106765,16 +106923,16 @@ lOP oKW ylB haD -kCL -jOI -kCL -oqN -wuj -dtT -rMK -kCL +ghk +vdQ +mbF +eVV +eVV +eVV +eVV +eVV +eVV eVV -kCL eYU dqg omR @@ -106798,7 +106956,7 @@ goI uhz xbz iln -bHc +dlI fpV ble euK @@ -106829,7 +106987,7 @@ rim yjP gwY yjP -rim +vJU yjP wwQ pfo @@ -106839,11 +106997,11 @@ ksa ksa ksa ksa +aVH ksa ksa ksa ksa -aVH ksa ksa uoo @@ -107022,15 +107180,15 @@ nUK tlq oBH haD -ghk -vdQ -vdQ -mbF -eVV -eVV -eVV -eVV -eVV +oqN +hGZ +kUf +xzN +xzN +xzN +nzR +oQv +mXb eVV eYU dqg @@ -107056,7 +107214,7 @@ oqK kQX uXP geR -eVB +hzA wNL ctz wZv @@ -107096,11 +107254,11 @@ ksa ksa ksa ksa +aVH ksa ksa ksa ksa -aVH ksa ksa fdt @@ -107280,14 +107438,14 @@ uKj xyc oSg hQe -hGZ -kUf -dRb -jzw -eri -nzR -oQv -mXb +wRl +ltG +mvA +mvA +mvA +ltG +nrr +kCL eVV eYU mxn @@ -107353,11 +107511,11 @@ ksa ksa ksa ksa +aVH ksa ksa ksa ksa -aVH ksa ksa ksa @@ -107537,14 +107695,14 @@ uVQ oBH haD oqN -wRl +oTy ltG -mvA -mvA -mvA +wPP +vFB +hlp ltG -dXR -gGL +yeq +kCL nOF emN noJ @@ -107610,11 +107768,11 @@ ksa ksa ksa ksa +aVH ksa ksa ksa ksa -aVH ksa ksa ksa @@ -107795,13 +107953,13 @@ oBH kpt oqN oTy -ltG +twj bDR -vFB -iEZ -ltG +kbA +fYL +xzb jmd -thk +kCL nOF fOz mxn @@ -107867,11 +108025,11 @@ aJU ksa ksa ksa +aVH ksa ksa ksa ksa -aVH ksa ksa ksa @@ -108052,10 +108210,10 @@ rjQ haD oqN oTy -twj +ltG xsf -kbA -fYL +vFQ +eva xzb ybl fbU @@ -108124,13 +108282,13 @@ ksa ksa ksa ksa +aVH +uoo +fdt ksa ksa ksa ksa -aVH -uoo -fdt ksa ksa ksa @@ -108312,7 +108470,7 @@ vpY eXy aUS pKq -eva +lZs xzb dXR gGL @@ -108379,10 +108537,6 @@ kiv xiW uoo uoo -fdt -uoo -fdt -uoo uoo uoo aVH @@ -108423,6 +108577,10 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa "} (141,1,1) = {" ksa @@ -108515,7 +108673,7 @@ qZk bLy eJp psO -gOA +mjk bLy nSh vME @@ -108638,13 +108796,13 @@ ksa ksa ksa ksa +aVH ksa +fdt ksa ksa ksa -aVH ksa -fdt ksa ksa ksa @@ -108895,13 +109053,13 @@ ksa ksa ksa ksa +aVH ksa +fdt ksa ksa ksa -aVH ksa -fdt ksa ksa ksa @@ -109152,13 +109310,13 @@ ksa ksa ksa ksa +aVH +uoo +fdt ksa ksa ksa ksa -aVH -uoo -fdt ksa ksa ksa @@ -109409,13 +109567,13 @@ ksa ksa ksa ksa +aVH ksa +fdt ksa ksa ksa -aVH ksa -fdt ksa ksa ksa @@ -109666,13 +109824,13 @@ ksa ksa ksa ksa +aVH ksa +fdt ksa ksa ksa -aVH ksa -fdt ksa ksa ksa @@ -109717,6 +109875,17 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa uoo ljY qpF @@ -109757,240 +109926,229 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -aVH -mjz -mjz -mjz -mjz -mjz -mjz -mjz -aVH -ksa -ksa -icx -cQt -tqj -gAx -bLy -iea -psO -whv -bLy -ewM -wLR -wnl -wnl -wnl -wnl -wnl -dUx -fXF -hBp -oRb -dUx -rAY -nCp -fcm -vOB -btZ -bZt -min -cst -hVF -dJe -emk -qGq -mJB -hXt -iDt -hXt -hXt -mJB -eRV -gyN -nVy -bUT -wxL -kjv -qOH -yja -guA -rOg -fNe -rOg -rOg -rOg -gPu -bJZ -haD -oqN -rZH -xXd -xXd -xXd -xXd -xXd -xXd -xXd -xXd -xXd -diy -xXd -rRZ -rRZ -rRZ -rRZ -qLB -rRZ -rRZ -rRZ -rRZ -fDD -gCT -gCT -oqK -oqK -oqK -oqK -lrg -oqK -xXP -xXP -xXP -xXP -xXP -xXP -xXP -xXP -xXP -xXP -xXP -xXP -xXP -xXP -uoo -xXP -uoo -uoo -uoo -gkZ -hGk -gkZ -fgv -kiv -kiv -kiv -kiv -kiv -kiv -kiv -kiv -kiv -kiv -kiv -kiv -kiv -xiW -uoo -uoo -uoo -uoo -fdt -uoo -fdt -uoo -uoo -uoo -aVH -ksa -fdt -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -"} -(147,1,1) = {" -ksa -ksa -ksa -ksa -ksa -ksa -uoo -uoo -wRN -cXW -wRN -uoo -uoo -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +aVH +mjz +mjz +mjz +mjz +mjz +mjz +mjz +aVH +ksa +ksa +icx +cQt +tqj +gAx +bLy +iea +psO +whv +bLy +ewM +wLR +wnl +wnl +wnl +wnl +wnl +dUx +fXF +hBp +oRb +dUx +rAY +nCp +fcm +vOB +btZ +bZt +min +cst +hVF +dJe +emk +qGq +mJB +hXt +iDt +hXt +hXt +mJB +eRV +gyN +nVy +bUT +wxL +kjv +qOH +yja +guA +rOg +fNe +rOg +rOg +rOg +gPu +bJZ +haD +oqN +rZH +xXd +xXd +xXd +xXd +xXd +xXd +xXd +xXd +xXd +diy +xXd +rRZ +rRZ +rRZ +rRZ +qLB +rRZ +rRZ +rRZ +rRZ +fDD +gCT +gCT +oqK +oqK +oqK +oqK +lrg +oqK +xXP +xXP +xXP +xXP +xXP +xXP +xXP +xXP +xXP +xXP +xXP +xXP +xXP +xXP +uoo +xXP +uoo +uoo +uoo +gkZ +hGk +gkZ +fgv +kiv +kiv +kiv +kiv +kiv +kiv +kiv +kiv +kiv +kiv +kiv +kiv +kiv +xiW +uoo +uoo +uoo +uoo +uoo +uoo +aVH +ksa +fdt +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +"} +(147,1,1) = {" +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +uoo +uoo +wRN +cXW +wRN +uoo +uoo ksa ksa ksa @@ -110085,7 +110243,7 @@ aBj mEf cev cev -cev +piC cev cev hXt @@ -110173,6 +110331,20 @@ ksa ksa ksa ksa +uoo +ksa +ksa +ksa +ksa +ksa +ksa +aVH +uoo +fdt +ksa +ksa +ksa +ksa ksa ksa ksa @@ -110184,9 +110356,6 @@ ksa ksa ksa ksa -aVH -uoo -fdt ksa ksa ksa @@ -110196,17 +110365,6 @@ ksa ksa ksa ksa -fdt -fdt -fdt -fdt -oIb -wxU -oIb -fdt -fdt -fdt -fdt ksa ksa ksa @@ -110229,15 +110387,6 @@ ksa ksa ksa ksa -uoo -uoo -cXW -wRN -bkH -wRN -cXW -uoo -uoo ksa ksa ksa @@ -110249,6 +110398,15 @@ ksa ksa ksa ksa +uoo +uoo +cXW +wRN +bkH +wRN +cXW +uoo +uoo ksa ksa ksa @@ -110309,7 +110467,7 @@ ksa ksa xXP ksa -ksa +xXP ksa mZc mZc @@ -110414,7 +110572,7 @@ qkC cQT pKS cPo -iWX +fqV nIb bIu sKd @@ -110430,40 +110588,47 @@ ksa ksa ksa ksa +uoo ksa ksa ksa ksa ksa ksa +aVH ksa ksa ksa ksa ksa -aVH ksa ksa ksa ksa ksa ksa +fdt +fdt +fdt +fdt +oIb +wxU +oIb +fdt +fdt +fdt +fdt +ksa +ksa ksa ksa ksa ksa ksa -fdt ksa -uoo ksa -uoo -xpD -uoo ksa -uoo ksa -fdt ksa ksa ksa @@ -110472,6 +110637,12 @@ ksa ksa ksa ksa +"} +(149,1,1) = {" +ksa +ksa +ksa +ksa ksa ksa ksa @@ -110479,8 +110650,6 @@ ksa ksa ksa ksa -"} -(149,1,1) = {" ksa ksa ksa @@ -110553,17 +110722,6 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa bZv bZv bZv @@ -110606,7 +110764,7 @@ ikD eWv xSh fsE -neW +cTW wxL lbf qOH @@ -110658,20 +110816,20 @@ qQH rpz knY cEm -aaT -leq +cEm +kaL fim -aBA -nqE -aBA +kaL +kaL +kaL fim -leq -leq +kaL +rgf ddr oqK xTe fza -iWX +fqV vuY mNy whM @@ -110687,11 +110845,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -110736,12 +110890,27 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa "} (150,1,1) = {" ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa uoo cXW cXW @@ -110808,17 +110977,6 @@ uoo uoo uoo uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo bZv dwc bZv @@ -110915,15 +111073,15 @@ btB eCO tgG gEs -cJu -aBA +leq +leq tgG leq -aBA +tTs tRz tgG cTa -leq +aBA vnp oqK aTl @@ -110944,11 +111102,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -110993,22 +111147,16 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa "} (151,1,1) = {" ksa ksa ksa ksa -qpF -wRN -qsk -rqm -byi -fvW -byi -wND -rHQ -kKH ksa ksa ksa @@ -111020,6 +111168,16 @@ ksa ksa ksa ksa +qpF +wRN +qsk +rqm +byi +fvW +byi +wND +rHQ +kKH ksa ksa ksa @@ -111146,7 +111304,7 @@ jFb xGb utD qVb -iSM +hjU kpB pIJ oTZ @@ -111176,13 +111334,13 @@ fbm tgG tgG tgG -gvd +cCr tgG tgG sZo jMT -lGd -oqK +itU +lpn urb mNF uYe @@ -111201,11 +111359,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -111250,12 +111404,27 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa "} (152,1,1) = {" ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa uoo cXW cXW @@ -111322,17 +111491,6 @@ uoo uoo uoo uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo -uoo bZv dwc voo @@ -111427,26 +111585,26 @@ sxJ uit rbW oqK -iKJ -vTT -lfI -lJD -tTs -tTs -tTs -tTs -lpn +tRz +leq +leq +leq +tRz +leq tTs -iId -itU -ejy +nCa +tgG +twN +leq +nEx +oqK eUa jxd rKd hOc -iQE -iQE -kMH +hOc +hOc +hOc txI qps txI @@ -111458,11 +111616,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -111507,23 +111661,16 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa "} (153,1,1) = {" ksa ksa ksa ksa -uoo -byC -wRN -cXW -pgT -jCb -tTg -cXW -wRN -wIO -uoo ksa ksa ksa @@ -111535,6 +111682,17 @@ ksa ksa ksa ksa +uoo +byC +wRN +cXW +pgT +jCb +tTg +cXW +wRN +wIO +uoo ksa ksa ksa @@ -111684,16 +111842,16 @@ lYg mGb iIn oqK -wGN -nCa -uch -gRf -nLS -sZo bsq -uch -sZo -gsl +nCa +leq +tTs +tTs +tTs +tTs +leq +wGN +leq leq kXH oqK @@ -111715,11 +111873,7 @@ uoo ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -111753,7 +111907,11 @@ ksa ksa fdt fdt -fdt +ksa +ksa +ksa +ksa +ksa ksa ksa ksa @@ -111771,15 +111929,6 @@ ksa ksa ksa ksa -uoo -uoo -cXW -wRN -soB -wRN -cXW -uoo -uoo ksa ksa ksa @@ -111791,6 +111940,15 @@ ksa ksa ksa ksa +uoo +uoo +cXW +wRN +soB +wRN +cXW +uoo +uoo ksa ksa ksa @@ -111945,10 +112103,10 @@ eac qLR eac rgf -mpo -sZo +leq +nCa bsq -uch +tRz tgG nir vHU @@ -111972,11 +112130,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -112009,7 +112163,6 @@ fJK fJK ksa ksa -ksa fdt ksa ksa @@ -112021,6 +112174,11 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa "} (155,1,1) = {" ksa @@ -112029,13 +112187,6 @@ ksa ksa ksa ksa -uoo -uoo -wRN -cXW -wRN -uoo -uoo ksa ksa ksa @@ -112047,6 +112198,13 @@ ksa ksa ksa ksa +uoo +uoo +wRN +cXW +wRN +uoo +uoo ksa ksa ksa @@ -112178,7 +112336,7 @@ bPv nwB seJ loQ -rrD +jzw rrD uCp gfA @@ -112198,11 +112356,11 @@ onj iJR wbn oqK -bbm -uch -mpo -nrr -wcZ +tgG +tgG +tgG +iyc +tgG tgG tgG oqK @@ -112229,11 +112387,7 @@ uoo ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -112266,7 +112420,6 @@ fJK fJK uoo uoo -uoo fdt ksa ksa @@ -112278,6 +112431,11 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa "} (156,1,1) = {" ksa @@ -112287,11 +112445,6 @@ ksa ksa ksa ksa -uoo -jnp -qpF -jnp -uoo ksa ksa ksa @@ -112303,6 +112456,11 @@ ksa ksa ksa ksa +uoo +jnp +qpF +jnp +uoo ksa ksa ksa @@ -112454,13 +112612,13 @@ rfz hoJ hoJ hoJ -oqK -tgG -tgG -tgG -iyc -tgG -tgG +khD +wcZ +ope +nBE +vTT +aRH +rwN uUC khD cpE @@ -112486,11 +112644,7 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -112523,7 +112677,6 @@ fJK fJK fJK ksa -ksa fdt ksa ksa @@ -112535,6 +112688,11 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa "} (157,1,1) = {" ksa @@ -112722,7 +112880,7 @@ jnb khD fSM rCW -wPP +agx mtc tQa tWN @@ -112751,10 +112909,6 @@ uoo uoo fex uoo -uoo -uoo -fex -uoo xEe cpH gOE @@ -112780,7 +112934,6 @@ nRj fJK fJK uoo -uoo oIb ksa ksa @@ -112792,6 +112945,11 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa "} (158,1,1) = {" ksa @@ -112941,11 +113099,11 @@ vTy aTh nvX iIZ -eav +wvb cDA -iGf +iFo hVl -fZy +ufn nHi ocj kNv @@ -112978,7 +113136,7 @@ jui aNM uer oxn -iye +bZG bZG psE qvp @@ -113008,10 +113166,6 @@ vyP vyP tKm vyP -vyP -vyP -tKm -vyP oVm qWf qsF @@ -113037,7 +113191,6 @@ teE fJK fJK iDN -xpD wxU ksa ksa @@ -113049,6 +113202,11 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa "} (159,1,1) = {" ksa @@ -113202,7 +113360,7 @@ eav pkf iGf qNM -fZy +ufu fgI vvV buz @@ -113227,7 +113385,7 @@ hoJ hoJ khD wFI -sdE +jlO nBE gnj aRH @@ -113265,10 +113423,6 @@ uoo uoo nfc uoo -uoo -uoo -nfc -uoo dCt kPa mlb @@ -113294,7 +113448,6 @@ ivj fJK fJK uoo -uoo oIb ksa ksa @@ -113306,6 +113459,11 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa "} (160,1,1) = {" ksa @@ -113452,14 +113610,14 @@ cuE xMR bNL xFY -xFY +tDF enf ieL -eav +wvb sOp iGf tNo -fZy +ufu ubz vvV buz @@ -113483,12 +113641,12 @@ vtr lNp hBi khD +emd +sdE nBE -nBE -nBE -lYp -nBE -nBE +gnj +aRH +nqE yfn khD rCH @@ -113521,10 +113679,6 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa uoo wcH wcH @@ -113551,7 +113705,6 @@ fJK fJK fJK ksa -ksa fdt ksa ksa @@ -113563,6 +113716,11 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa "} (161,1,1) = {" ksa @@ -113715,8 +113873,8 @@ tUG eav aDA gmD -tNo -fZy +aaT +ufn iqm oKM bYf @@ -113740,15 +113898,15 @@ evv jkd evv khD -lld -jOx -jOx -ins -gcH +nBE +nBE +nBE +lYp +nBE nBE cbj khD -khD +xhQ xhQ xhQ xhQ @@ -113778,10 +113936,6 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa uoo uoo byC @@ -113808,7 +113962,6 @@ fJK fJK uoo uoo -uoo fdt ksa ksa @@ -113820,6 +113973,11 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa "} (162,1,1) = {" ksa @@ -113997,17 +114155,17 @@ khD khD khD khD -quP -czU +nep +mhc kIt ins lwL nBE jJr -jOx nBE -rms -lKe +xpD +xpD +xpD xpD xpD xpD @@ -114038,10 +114196,6 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa uoo ksa pbE @@ -114065,7 +114219,6 @@ fJK fJK ksa ksa -ksa fdt ksa ksa @@ -114077,6 +114230,11 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa "} (163,1,1) = {" ksa @@ -114158,7 +114316,7 @@ rIN ohk wtF xsC -xsC +mDP gKk hIe bIc @@ -114254,16 +114412,16 @@ grF rHt byX nBE -mhc -qrH +iRv +tpC mhc ins syI iuo aAF -jOx mst -rms +xpD +xpD xpD xpD xpD @@ -114295,10 +114453,6 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa uoo uoo pbE @@ -114323,7 +114477,11 @@ ksa ksa fdt fdt -fdt +ksa +ksa +ksa +ksa +ksa ksa ksa ksa @@ -114512,14 +114670,14 @@ kJA kJA tzV kJA -pKQ -pKQ -fHo -tpC +kJA +kJA +prY +ejy nBE nBE -cbj nBE +dUm tDa tDa tDa @@ -114552,10 +114710,6 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa uoo ksa pbE @@ -114591,38 +114745,12 @@ ksa ksa ksa ksa -"} -(165,1,1) = {" -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa ksa ksa ksa ksa +"} +(165,1,1) = {" ksa ksa ksa @@ -114638,155 +114766,8 @@ ksa ksa ksa ksa -fEP ksa ksa -fHY -feX -feX -cDv -cDv -cDv -cDv -cDv -cDv -cDv -cDv -fSG -cDv -cDv -nBS -dYt -kEN -tVD -vTL -lvp -tVD -uRW -dYt -vmu -nBS -tVD -lmK -dYt -vmu -wtF -gpi -wPA -rph -xTL -bIc -iuF -wtF -ksa -ksa -vyg -gOA -psO -vcn -gOA -bLy -xmm -cOH -nJK -oRg -sMk -sMk -sMk -caF -sMk -sMk -sMk -sMk -sMk -oRg -nJK -nJK -iMo -oym -ijM -wSN -iBE -iaT -wim -wfM -wfM -wfM -rGT -rGT -vTP -dKl -dKl -nVA -bOJ -wxL -pUp -nBE -rHt -mhc -ydO -grF -nBE -mhc -mhc -grF -nBE -lPf -jVd -hpY -nBE -byX -nep -woy -mhc -tpC -nBE -rHt -lRi -tpC -vLk -nep -mhc -tpC -nBE -grF -mhc -mhc -grF -rHt -xcO -dbl -dbl -tpC -mhc -vLk -mhc -nBE -grF -mhc -tpC -mhc -grF -nBE -jLa -dbl -grF -tnQ -mhc -nBE -utT -nVa -say -nVa -nVa -nVa -nVa -mnl -dUm -dEL -nuA -uoo -vRc ksa ksa ksa @@ -114813,6 +114794,179 @@ ksa ksa ksa ksa +ksa +ksa +fEP +ksa +ksa +fHY +feX +feX +cDv +cDv +cDv +cDv +cDv +cDv +cDv +cDv +fSG +cDv +cDv +nBS +dYt +kEN +tVD +vTL +lvp +tVD +uRW +dYt +vmu +nBS +tVD +lmK +dYt +vmu +wtF +gpi +wPA +rph +xTL +bIc +iuF +wtF +ksa +ksa +vyg +gOA +psO +vcn +gOA +bLy +xmm +cOH +nJK +oRg +sMk +sMk +sMk +caF +sMk +sMk +sMk +sMk +sMk +oRg +nJK +nJK +iMo +oym +ijM +wSN +iBE +iaT +wim +wfM +wfM +wfM +rGT +rGT +vTP +dKl +dKl +nVA +bOJ +wxL +pUp +nBE +rHt +mhc +ydO +grF +nBE +mhc +mhc +grF +nBE +lPf +jVd +hpY +nBE +byX +nep +woy +mhc +tpC +nBE +rHt +lRi +tpC +vLk +nep +mhc +tpC +nBE +grF +mhc +mhc +grF +rHt +xcO +dbl +dbl +tpC +mhc +vLk +mhc +nBE +grF +mhc +tpC +mhc +grF +nBE +jLa +dbl +grF +ndM +mhc +nBE +utT +jkt +say +nVa +nVa +nVa +nVa +mnl +dUm +dEL +nuA +uoo +vRc +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa uoo uoo uoo @@ -114848,6 +115002,10 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa "} (166,1,1) = {" ksa @@ -115028,7 +115186,7 @@ nBE nBE nBE nBE -tnQ +ndM rHt nBE qtQ @@ -115066,10 +115224,6 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa uoo ksa ksa @@ -115105,6 +115259,10 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa "} (167,1,1) = {" ksa @@ -115285,7 +115443,7 @@ cnX mhc mhc nBE -tnQ +ndM tfN nBE mjA @@ -115323,10 +115481,6 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa fdt fdt fdt @@ -115362,6 +115516,10 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa "} (168,1,1) = {" ksa @@ -115589,21 +115747,21 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa +fdt +fdt +fdt +fdt +oIb +wxU +oIb +fdt +fdt +fdt fdt ksa -uoo ksa -uoo -xpD -uoo ksa -uoo ksa -fdt ksa ksa ksa @@ -115799,7 +115957,7 @@ cnX mhc mhc nBE -ndM +tnQ mhc cbj ivt @@ -115850,17 +116008,17 @@ ksa ksa ksa ksa -fdt -fdt -fdt -fdt -oIb -wxU -oIb -fdt -fdt -fdt -fdt +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa ksa ksa ksa @@ -116056,7 +116214,7 @@ nBE nBE nBE nBE -ndM +tnQ mhc tEm wGg @@ -116313,7 +116471,7 @@ dbl rQv rQv nBE -ndM +tnQ mhc tEm etn @@ -116569,8 +116727,8 @@ dqt czU czU czU -tbo -ndM +dRH +tnQ mhc tEm etn @@ -117242,7 +117400,7 @@ rHD mhS wtF gAj -gAj +aYt auF auW pGP @@ -118794,7 +118952,7 @@ ksa ksa jxy doA -bqH +iLB qIN jxy fXd @@ -120836,7 +120994,7 @@ oAN ksa uoo uoo -aVH +uoo uoo uoo uoo @@ -123553,7 +123711,7 @@ ksa ksa ksa ksa -ksa +sQS ksa ksa ksa @@ -123979,7 +124137,7 @@ tGK csE dLL kLr -fDB +hmP vvM mzn vvM @@ -124582,7 +124740,7 @@ ksa ksa ksa ksa -sQS +ksa ksa ksa ksa @@ -126113,7 +126271,7 @@ ksa ksa ksa ksa -ksa +sQS ksa ksa ksa @@ -132309,7 +132467,7 @@ ksa ksa ksa ksa -sQS +ksa ksa ksa ksa diff --git a/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm b/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm index b692448e494f1a..fa4326f24246a7 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm @@ -48,7 +48,7 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "dV" = ( -/turf/open/floor/plating/airless, +/turf/open/floor/plating, /area/station/maintenance/department/engine) "fX" = ( /obj/effect/turf_decal/stripes/line, @@ -192,6 +192,11 @@ /obj/item/stack/cable_coil, /turf/open/floor/plating, /area/station/engineering/main) +"lg" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "lC" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -221,7 +226,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light/small/directional/north, /obj/machinery/button/door/directional/north{ id = "particle_accelerator"; name = "Particle Accelerator Shutters Control"; @@ -283,8 +287,9 @@ /turf/open/floor/iron, /area/station/engineering/main) "rU" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/main) "sM" = ( @@ -469,6 +474,11 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"BY" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron, +/area/station/engineering/main) "Cp" = ( /obj/structure/table, /obj/machinery/camera/directional/north{ @@ -540,6 +550,7 @@ name = "Engine Storage Control"; req_access = list("engineering") }, +/obj/machinery/camera/autoname/directional/west, /obj/structure/tank_holder/oxygen/yellow, /turf/open/floor/plating, /area/station/engineering/main) @@ -702,7 +713,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /obj/structure/sign/warning/vacuum/external/directional/north, /turf/open/floor/plating, /area/station/engineering/main) @@ -716,6 +727,7 @@ /obj/effect/turf_decal/stripes/end{ dir = 4 }, +/obj/machinery/camera/autoname/directional/east, /obj/structure/tank_holder/oxygen/yellow, /turf/open/floor/plating, /area/station/engineering/main) @@ -741,6 +753,11 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"SS" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron, +/area/station/engineering/main) "TF" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1005,7 +1022,7 @@ PG oN GK hq -rU +lg PG GW GW @@ -1085,13 +1102,13 @@ wX El "} (11,1,1) = {" -Fz +BY mE iV bj PG PV -PG +Cq Zp Zp Zp @@ -1477,13 +1494,13 @@ wX El "} (25,1,1) = {" -Fz +SS mE TF SB PG PV -PG +Cq Zp Zp Zp diff --git a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm new file mode 100644 index 00000000000000..6ce7de59352a84 --- /dev/null +++ b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm @@ -0,0 +1,3001 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aU" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"bg" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"bi" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"bC" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"bQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/main) +"bX" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"ce" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron, +/area/station/engineering/main) +"ci" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"cV" = ( +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"db" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"dp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"dL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"dX" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/east, +/obj/structure/tank_holder/oxygen/yellow, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"eq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ev" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/main) +"eG" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/item/folder/yellow, +/turf/open/floor/iron, +/area/station/engineering/main) +"eI" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 6 + }, +/turf/open/space/basic, +/area/space/nearstation) +"eL" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Filter to Waste"; + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"eT" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 10 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"eU" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "eng_burn"; + name = "Burn Chamber Radiation Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"fw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Filter to Waste"; + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"fy" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"fX" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"gf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"gm" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"gu" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) +"gQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emitter_room"; + name = "Emitter Room Shutters"; + dir = 8 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"gW" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"hD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/emitter/welded{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"hG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"hQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/violet/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"hT" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"hU" = ( +/obj/structure/table, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - SMES, Engine"; + name = "engineering camera" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"in" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"io" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"it" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"iC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"iR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"iV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ja" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"jc" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/main) +"jz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/main) +"jO" = ( +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"jQ" = ( +/obj/structure/girder/reinforced, +/obj/structure/grille, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"jY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/main) +"kc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/main) +"kg" = ( +/obj/machinery/atmospherics/components/binary/circulator{ + dir = 4 + }, +/turf/open/floor/circuit/green, +/area/station/engineering/supermatter/room) +"kn" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"kv" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"ky" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"kN" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"kV" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine SMES Room" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"lb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"lf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"li" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/engine_access, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"ll" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"lm" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west, +/obj/structure/tank_holder/oxygen/yellow, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"lE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/main) +"lJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"lS" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ + dir = 10 + }, +/turf/open/space/basic, +/area/space/nearstation) +"mg" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/obj/structure/sign/delamination_counter/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"mw" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"mB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"mF" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine SMES Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"mL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"mO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/meson/engine{ + pixel_x = -4; + pixel_y = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"mR" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"nr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"nT" = ( +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"of" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"og" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/meson/engine, +/obj/item/clothing/glasses/meson/engine{ + pixel_x = 4; + pixel_y = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ot" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "eng_burn"; + name = "Burn Chamber Radiation Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"oA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"oB" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Engine Room"; + name = "engineering camera"; + dir = 9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"oO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"oV" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) +"oZ" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/room) +"pN" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/bridge_pipe/pink/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"qa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"qm" = ( +/obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, +/obj/structure/table, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"rf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"rg" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/main) +"rj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering - Engine Room, East"; + name = "engineering camera" + }, +/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ru" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"ry" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"rB" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"rJ" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/table, +/obj/item/storage/toolbox/electrical, +/turf/open/floor/iron, +/area/station/engineering/main) +"sg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emitter_room"; + name = "Emitter Room Shutters"; + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"sm" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 9 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "eng_burn"; + name = "Burn Chamber Radiation Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"sn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"sr" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"su" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"sA" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"sC" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"sG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"sW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"tb" = ( +/obj/structure/cable/layer1, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"tw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"tx" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) +"tK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"tU" = ( +/turf/template_noop, +/area/template_noop) +"tV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"uh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"uz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"uI" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"uU" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Mix to SM Loop" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"uW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/main) +"vj" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"vn" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/pink/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"vp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"vD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"vG" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"vR" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"wC" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) +"wG" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space/basic, +/area/space/nearstation) +"wQ" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"wR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"xj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/closet/radiation, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"xs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"xu" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"xw" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/space/basic, +/area/space/nearstation) +"xB" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"xD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"xQ" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) +"xR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 5 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"yg" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/turf/open/space/basic, +/area/space/nearstation) +"yi" = ( +/obj/structure/cable/layer1, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"yo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"yx" = ( +/obj/effect/turf_decal/delivery/red, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"yR" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) +"zd" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"zf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "emitter_room"; + name = "Emitter Room Shutters Control"; + req_access = list("engineering") + }, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Particle Accelerator Chamber"; + name = "engineering camera" + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"zj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"zR" = ( +/obj/effect/turf_decal/stripes/red/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"Ae" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"Aj" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"Am" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2, +/turf/open/space/basic, +/area/space/nearstation) +"As" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/main) +"AA" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/table, +/obj/item/crowbar/red, +/turf/open/floor/iron, +/area/station/engineering/main) +"AB" = ( +/obj/machinery/igniter{ + id = "teg_burn_igniter" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"AH" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/main) +"AU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Bc" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"Bq" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/co2, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Bs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"Bx" = ( +/obj/structure/cable/multilayer/connected, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"BA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"BE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"BJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Engine Room, West"; + name = "engineering camera" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Ca" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"Cw" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4; + name = "Plasma Release" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Dj" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"Dq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6 + }, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"DL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/poddoor{ + id = "sm_vent"; + name = "Supermatter Vent" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"DP" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"DQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"DV" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/button/door/directional/south{ + id = "sm_vent"; + name = "Supermatter Vent Control"; + req_access = list("engineering") + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Ee" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/main) +"Ef" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"Eo" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) +"Eu" = ( +/obj/structure/cable, +/obj/machinery/power/thermoelectric_generator, +/turf/open/floor/circuit/green, +/area/station/engineering/supermatter/room) +"Ev" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance{ + name = "Engineering Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"Ew" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"EY" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Fr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"FF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "SM Loop" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"FJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/button/door/directional/east{ + id = "eng_burn"; + name = "Burn Chamber Radiation Shutters Control"; + req_access = list("engineering"); + pixel_y = 6 + }, +/obj/machinery/button/door/directional/east{ + id = "burn_vent"; + name = "Burn Chamber Vent Control"; + req_access = list("engineering"); + pixel_y = -6 + }, +/obj/machinery/button/ignition{ + id = "teg_burn_igniter"; + pixel_x = 36; + pixel_y = -6; + name = "Burn Chamber Ignition Switch" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"FY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"FZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 10 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Ga" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Gd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Gg" = ( +/obj/effect/turf_decal/delivery/red, +/obj/structure/cable/multilayer/connected, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"Gj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"Gk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"Gm" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"Gn" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"Go" = ( +/obj/structure/cable/multilayer/connected, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"GE" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/cable/layer1, +/turf/open/floor/iron, +/area/station/engineering/main) +"Hi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Hj" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"HG" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"HK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"HL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/main) +"HM" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/station/engineering/main) +"HY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"Ic" = ( +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"Ij" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + name = "Cold Loop to Space"; + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"In" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Burn to Hot Loop" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Io" = ( +/obj/machinery/atmospherics/components/trinary/mixer/flipped{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Iu" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"IB" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "eng_burn"; + name = "Burn Chamber Radiation Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"ID" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) +"IW" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Jc" = ( +/turf/open/floor/plating, +/area/station/engineering/main) +"Jn" = ( +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4; + name = "Oxygen Release" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Jq" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron, +/area/station/engineering/main) +"Jr" = ( +/obj/structure/table, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"Ju" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Kg" = ( +/obj/machinery/atmospherics/components/binary/pump, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Kp" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"KB" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"KF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"KS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Hot Loop to Waste" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Ln" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"LC" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Mk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Mt" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/sign/warning/directional/south, +/obj/machinery/button/door/directional/east{ + id = "emitter_room"; + name = "Emitter Room Shutters Control"; + req_access = list("engineering") + }, +/obj/structure/closet/radiation, +/turf/open/floor/iron, +/area/station/engineering/main) +"Mw" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"ML" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"MM" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, +/turf/open/space/basic, +/area/space/nearstation) +"MO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Ni" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Np" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"NA" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space/basic, +/area/space/nearstation) +"NQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) +"NW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emitter_room"; + name = "Emitter Room Shutters" + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"NZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6 + }, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Oc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/emitter/welded{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"Og" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 10 + }, +/turf/open/space/basic, +/area/space/nearstation) +"Ol" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) +"OL" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ON" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) +"Pa" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) +"Pb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"PC" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"PM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/poddoor{ + id = "burn_vent"; + name = "Burn Chamber Vent" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"Qy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/structure/closet/radiation, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Rn" = ( +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"Rw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Rx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/pink/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"Rz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 5 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"RD" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/engine) +"RM" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) +"RP" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"RR" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) +"Sb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 10 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"Sr" = ( +/obj/structure/foamedmetal, +/turf/open/floor/plating/airless, +/area/space/nearstation) +"SE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/closet/radiation, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"SX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"Td" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible, +/turf/open/space/basic, +/area/space/nearstation) +"Tm" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Tv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump/layer2, +/obj/machinery/atmospherics/components/binary/pump/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Tw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"TI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"TM" = ( +/obj/machinery/atmospherics/components/binary/circulator/cold{ + dir = 8 + }, +/turf/open/floor/circuit/green, +/area/station/engineering/supermatter/room) +"TQ" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/main) +"TS" = ( +/obj/machinery/atmospherics/components/unary/heat_exchanger{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"TX" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"Ud" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) +"Uf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Uo" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Ur" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/heat_exchanger{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Us" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + name = "Waste Release"; + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Ux" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/engineering/main) +"UC" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4, +/turf/open/space/basic, +/area/space/nearstation) +"US" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"UW" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Engine Room"; + name = "engineering camera" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"UX" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Vf" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter) +"Vg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/engineering/main) +"Vr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Vu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/closet/radiation, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Vv" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) +"Vy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 1 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"VG" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"VL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + name = "Space to Cold Loop"; + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"VM" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"VQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Wc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Wn" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) +"Wr" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/sign/warning/directional/south, +/obj/machinery/button/door/directional/west{ + id = "emitter_room"; + name = "Emitter Room Shutters Control"; + req_access = list("engineering") + }, +/obj/structure/closet/radiation, +/turf/open/floor/iron, +/area/station/engineering/main) +"WB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"WR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"WT" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Xb" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) +"Xf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"XF" = ( +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"XG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"XM" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"Yh" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer4{ + dir = 10 + }, +/turf/open/space/basic, +/area/space/nearstation) +"Yo" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/closet/radiation, +/turf/open/floor/iron, +/area/station/engineering/main) +"Yq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) +"Yr" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Yt" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Yy" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"YE" = ( +/obj/structure/reflector/box/anchored, +/turf/open/floor/plating, +/area/station/engineering/main) +"YR" = ( +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) +"YV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"YW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Zl" = ( +/obj/machinery/atmospherics/components/binary/pump, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Zo" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ZK" = ( +/obj/machinery/atmospherics/components/trinary/filter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ZV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"ZX" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) + +(1,1,1) = {" +TQ +Bc +Bc +Bc +Bc +TQ +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +ON +tU +tU +"} +(2,1,1) = {" +mF +Gj +Yq +Hj +DP +TQ +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +ON +tU +tU +"} +(3,1,1) = {" +TQ +Ic +yi +Bc +jO +TQ +vj +vj +xw +wG +NA +wG +NA +wG +NA +wG +NA +wG +yR +Td +UC +UC +UC +ID +tU +tU +"} +(4,1,1) = {" +TQ +Jr +yi +TX +in +kc +tU +vj +yg +wG +NA +wG +NA +wG +NA +wG +NA +wG +oV +vj +tU +tU +tU +Wn +tU +tU +"} +(5,1,1) = {" +TQ +qm +yi +Rn +Bx +kc +vj +vj +ON +vj +ON +vj +ON +vj +ON +vj +ON +vj +gu +vj +vj +vj +vj +Wn +tU +tU +"} +(6,1,1) = {" +TQ +hU +BA +uI +bC +kc +tU +vj +xw +wG +NA +wG +NA +wG +NA +wG +NA +wG +xQ +vj +tU +tU +tU +Wn +tU +tU +"} +(7,1,1) = {" +TQ +Bc +BA +Bc +jO +TQ +vj +vj +yg +wG +NA +wG +NA +wG +NA +wG +NA +wG +yR +Td +Am +Am +Am +Og +tx +ON +"} +(8,1,1) = {" +TQ +Bc +BA +Hj +su +TQ +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +Mw +tU +vj +Xb +tU +"} +(9,1,1) = {" +TQ +Bc +BA +Bc +TQ +TQ +TQ +oZ +oZ +oZ +oZ +sr +sr +oZ +sr +sr +oZ +sr +sr +oZ +oZ +bX +oZ +oZ +Xb +tU +"} +(10,1,1) = {" +TQ +kc +kV +kc +TQ +lm +TQ +mO +sn +Dq +xj +tw +VQ +tK +fw +Rw +BJ +YW +YW +rf +tw +Us +Vr +oZ +Xb +tU +"} +(11,1,1) = {" +ce +Ux +GE +RM +TQ +ky +ev +TI +xu +UX +zd +UX +Yr +UX +UX +XG +Io +tV +eq +Kp +UX +Yr +kn +sr +Xb +tU +"} +(12,1,1) = {" +As +As +GE +wQ +Ca +dL +Ol +tb +XF +aU +aU +vR +qa +Ga +eL +sA +hQ +Tm +Ga +Ga +Ga +DQ +kn +sr +Xb +tU +"} +(13,1,1) = {" +As +As +AH +Vv +ev +lb +TQ +oB +UX +UX +aU +UX +Yr +UX +Tm +fX +EY +DQ +gW +ci +ci +PC +Xf +oZ +Xb +tU +"} +(14,1,1) = {" +AA +rJ +AH +Mt +TQ +XM +TQ +Vu +US +UX +aU +UX +qa +dp +vD +ZX +mw +UX +LC +fy +fy +sW +fy +fy +Xb +tU +"} +(15,1,1) = {" +TQ +TQ +gQ +TQ +TQ +TQ +TQ +TQ +db +nT +aU +iV +Bq +vn +ZK +ZK +ZK +YV +DV +fy +ll +Bs +li +fy +Xb +tU +"} +(16,1,1) = {" +TQ +ru +Ee +HL +uW +hD +uz +ev +lJ +ry +Zl +vp +UX +Yr +UX +UX +UX +UX +mg +fy +HY +mB +xR +fy +Xb +tU +"} +(17,1,1) = {" +NW +ja +lE +Jc +Jc +Jc +HM +ev +Hi +Gd +Pb +FF +Ni +hG +sG +it +SX +it +iR +fy +Ln +xB +Gn +fy +Xb +tU +"} +(18,1,1) = {" +TQ +zf +lE +YE +Jc +YE +HM +ev +YR +Dj +yx +Yy +HG +VG +HG +HG +Gg +Gm +Gm +Vf +kv +Aj +zR +DL +Xb +tU +"} +(19,1,1) = {" +NW +ja +lE +Jc +Jc +Jc +HM +ev +Wc +ZV +KF +FY +Tw +KS +BE +uh +WB +uh +Fr +fy +Ae +Ef +Pa +fy +Xb +tU +"} +(20,1,1) = {" +TQ +mL +jz +Oc +bQ +jY +Vg +ev +TI +uU +aU +FZ +zj +pN +ci +Iu +YV +YV +hT +fy +Sb +Rx +Ud +fy +Xb +tU +"} +(21,1,1) = {" +TQ +TQ +sg +TQ +TQ +TQ +TQ +TQ +oO +Yr +aU +UX +TS +eT +kg +Rz +UX +UX +Zo +Ew +HK +sm +io +oZ +Xb +tU +"} +(22,1,1) = {" +Yo +eG +jc +Wr +TQ +Np +TQ +SE +IW +Yr +Go +xu +Ur +VM +Eu +In +UX +UX +UX +Jn +Cw +IB +AB +PM +Xb +tU +"} +(23,1,1) = {" +As +As +jc +Vv +ev +lb +TQ +UW +UX +wR +Uf +UX +Vy +Yt +TM +Mk +WR +Kg +rB +gf +OL +eU +ML +oZ +Xb +tU +"} +(24,1,1) = {" +As +As +rg +mR +bg +Gk +gm +xD +Ga +DQ +Uf +vR +RP +vG +tw +bi +Ga +Ga +WT +Ga +Uo +ot +nr +oZ +Xb +tU +"} +(25,1,1) = {" +Jq +Ux +rg +sC +TQ +ky +ev +TI +UX +UX +Ju +UX +KB +UX +UX +UX +UX +UX +xs +UX +kn +IB +AB +PM +Xb +tU +"} +(26,1,1) = {" +RD +kN +Ev +NQ +RD +dX +TQ +og +lf +NZ +Qy +MO +VL +oA +AU +iC +rj +Tv +Ij +yo +FJ +IB +io +oZ +Xb +tU +"} +(27,1,1) = {" +tU +tU +tU +tU +RD +RD +RD +oZ +oZ +oZ +oZ +sr +of +oZ +sr +sr +oZ +sr +of +oZ +oZ +oZ +oZ +oZ +Xb +tU +"} +(28,1,1) = {" +tU +tU +tU +tU +tU +cV +RD +Sr +Sr +Sr +jQ +vj +Yh +UC +UC +UC +Eo +vj +lS +eI +MM +MM +MM +MM +RR +tU +"} +(29,1,1) = {" +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +tU +Yh +UC +UC +wC +tU +tU +tU +tU +tU +tU +"} diff --git a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm index 40b4603562afd0..c38731826107ba 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm @@ -13,14 +13,18 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "aU" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Emitter Room" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/firedoor, -/turf/open/floor/engine, +/obj/machinery/door/airlock/engineering/glass{ + name = "Emitter Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron/dark/textured, /area/station/engineering/supermatter/room) "aW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, @@ -82,7 +86,6 @@ }, /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/engine_access, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/station/engineering/supermatter) "cs" = ( @@ -118,8 +121,6 @@ /obj/machinery/atmospherics/components/binary/pump{ name = "Gas to Chamber" }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, /turf/open/floor/engine, /area/station/engineering/supermatter) "dC" = ( @@ -154,11 +155,8 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine) "eo" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark, +/obj/machinery/light/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/supermatter/room) "ez" = ( /obj/structure/reflector/box/anchored{ @@ -254,7 +252,7 @@ "hr" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "hA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -283,7 +281,14 @@ "ik" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/supermatter/room) +"iy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/engine, /area/station/engineering/supermatter/room) "iF" = ( /obj/structure/lattice/catwalk, @@ -314,7 +319,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "jC" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -442,7 +447,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ou" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/main) @@ -462,7 +467,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; name = "Supermatter Chamber" @@ -503,9 +507,9 @@ /area/station/engineering/supermatter/room) "pW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/delivery/red, /obj/structure/cable, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "qh" = ( /obj/machinery/door/airlock/engineering/glass{ @@ -520,8 +524,7 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/supermatter/room) "qm" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/supermatter/room) "qt" = ( /obj/effect/turf_decal/stripes/line{ @@ -533,9 +536,9 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "rr" = ( -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/delivery/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "rs" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -552,7 +555,6 @@ c_tag = "Engineering Emitter Room Starboard"; network = list("ss13","engine") }, -/obj/machinery/light/small/directional/east, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "rF" = ( @@ -575,8 +577,7 @@ dir = 1; name = "External Gas to Loop" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "tU" = ( /obj/effect/turf_decal/stripes/line{ @@ -618,7 +619,7 @@ /area/station/engineering/supermatter/room) "uQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/supermatter/room) "uV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -648,7 +649,7 @@ /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/machinery/meter, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "wE" = ( /obj/item/radio/intercom/directional/east, @@ -706,7 +707,7 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "zE" = ( /obj/structure/cable, @@ -716,9 +717,9 @@ /area/station/engineering/supermatter/room) "zN" = ( /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 1 }, -/obj/machinery/light/small/directional/east, +/obj/machinery/light/small/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "zV" = ( @@ -766,14 +767,18 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "AV" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Emitter Room" +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/firedoor, -/turf/open/floor/engine, +/obj/machinery/door/airlock/engineering/glass{ + name = "Emitter Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron/dark/textured, /area/station/engineering/supermatter/room) "Br" = ( /obj/effect/turf_decal/stripes/line{ @@ -804,6 +809,10 @@ /obj/structure/cable/multilayer/connected, /turf/open/floor/plating, /area/station/engineering/supermatter) +"BG" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "BJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -835,7 +844,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light/small/directional/west, /obj/machinery/firealarm/directional/west, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -922,7 +930,7 @@ /area/space/nearstation) "Fu" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/structure/sign/warning/radiation/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, @@ -966,7 +974,6 @@ id = "engsm"; name = "Radiation Chamber Shutters" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/engineering/supermatter) "GP" = ( @@ -981,17 +988,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"Hs" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "HF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/engineering/supermatter) +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "HQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1000,6 +1006,7 @@ c_tag = "Engineering Supermatter Starboard"; network = list("ss13","engine") }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "HS" = ( @@ -1023,8 +1030,6 @@ id = "engsm"; name = "Radiation Chamber Shutters" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, /turf/open/floor/plating, /area/station/engineering/supermatter) "Iz" = ( @@ -1059,11 +1064,11 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "IK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/engine, /area/station/engineering/supermatter) "IV" = ( +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/table, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -1109,6 +1114,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "Lj" = ( +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/table, /obj/item/stack/sheet/iron/fifty{ pixel_y = 6 @@ -1176,7 +1182,7 @@ "NA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/supermatter/room) "NW" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -1274,6 +1280,7 @@ /area/space/nearstation) "QB" = ( /obj/machinery/airalarm/directional/west, +/obj/machinery/light/directional/west, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "QL" = ( @@ -1363,7 +1370,6 @@ c_tag = "Engineering Emitter Room Port"; network = list("ss13","engine") }, -/obj/machinery/light/small/directional/west, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "TH" = ( @@ -1389,8 +1395,8 @@ /area/station/engineering/supermatter/room) "TP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "Un" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1409,6 +1415,10 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/space/basic, /area/space/nearstation) +"UU" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "Vb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1417,16 +1427,20 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "Ve" = ( -/turf/open/floor/plating, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Vi" = ( -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /obj/machinery/firealarm/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "Vr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/supermatter/room) "VC" = ( /obj/structure/rack, @@ -1477,7 +1491,7 @@ "XP" = ( /obj/machinery/meter, /obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/item/radio/intercom/directional/south, /turf/open/floor/engine, @@ -1516,7 +1530,7 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "YZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, @@ -1571,7 +1585,7 @@ Mu bM MB gO -ou +HF GP Kd TK @@ -1824,7 +1838,7 @@ lr BJ Lm CF -Lm +iy pC bz gB @@ -1848,7 +1862,7 @@ Kd "} (12,1,1) = {" BL -Su +zN oc wQ wQ @@ -1921,7 +1935,7 @@ AV NA NA uQ -Ve +qm qm BL Kd @@ -1978,7 +1992,7 @@ Vi MV MV MV -MV +BG BL xP Kl @@ -2090,7 +2104,7 @@ Vi MV MV MV -MV +BG BL xP Kl @@ -2134,7 +2148,7 @@ Dp tw zA HS -HF +Ik mO Ik HS @@ -2145,8 +2159,8 @@ aU ik ik Vr -Ve qm +eo BL Kd Kl @@ -2184,7 +2198,7 @@ xP "} (24,1,1) = {" BL -Su +zN uV rs JK @@ -2200,7 +2214,7 @@ MZ BL Lj rz -MV +Hs wE iZ BL @@ -2215,7 +2229,7 @@ BL vH pU QL -zN +gu HQ Vb TH @@ -2273,7 +2287,7 @@ xP xP xP MT -xv +UU aW aW aW @@ -2303,8 +2317,8 @@ xP eb xv OZ -eo -oh +OZ +Ve oh gF mI diff --git a/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm index fe25c1ee752cd8..738ce35f441f04 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm @@ -30,6 +30,7 @@ /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) "bc" = ( +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -117,13 +118,6 @@ /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) -"eE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "eK" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -144,7 +138,7 @@ /turf/open/space/basic, /area/space/nearstation) "fq" = ( -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) @@ -209,12 +203,12 @@ /turf/open/space/basic, /area/space/nearstation) "gZ" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/main) "hg" = ( -/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) @@ -261,11 +255,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) -"iP" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/space_heater, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "ja" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -535,8 +524,7 @@ /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) "sX" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) "tp" = ( @@ -658,6 +646,7 @@ /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) "vW" = ( +/obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, @@ -727,6 +716,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) +"xS" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "yc" = ( /obj/structure/table, /obj/machinery/camera/directional/north{ @@ -847,11 +842,6 @@ /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) -"Dj" = ( -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "Dk" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 @@ -1072,6 +1062,7 @@ /area/station/engineering/main) "LQ" = ( /obj/structure/sign/warning/no_smoking/directional/east, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/station/engineering/atmospherics_engine) "LZ" = ( @@ -1471,7 +1462,7 @@ Hk iy zy nw -gZ +xS Wg dh dh @@ -1836,8 +1827,8 @@ dX lp bp dU -iP -sX +MH +QE hg YB lb @@ -1922,7 +1913,7 @@ vP EF vs vs -eE +vs vD vX aa @@ -2005,7 +1996,7 @@ CH bp dU MH -Dj +QE hg DS lb @@ -2207,7 +2198,7 @@ LQ uv fr Uz -lb +sX Vv aC ff diff --git a/monkestation/code/random_rooms/engines/boxstation.dm b/monkestation/code/random_rooms/engines/boxstation.dm index cb1e0e3efe9afb..a62661e1c878e3 100644 --- a/monkestation/code/random_rooms/engines/boxstation.dm +++ b/monkestation/code/random_rooms/engines/boxstation.dm @@ -26,5 +26,15 @@ centerspawner = FALSE template_height = 26 template_width = 29 - weight = 4 // Should probably be rarer than the other two engines. + weight = 8 + station_name = "Box Station" + +/datum/map_template/random_room/random_engines/box_sm_teg + name = "Box SM TEG Engine" + room_id = "box_sm_teg" + mappath = "_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm" + centerspawner = FALSE + template_height = 26 + template_width = 29 + weight = 6 station_name = "Box Station" From d84be0d115983bc0da096e3a2bb7725e08e61102 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Mon, 10 Jun 2024 00:01:55 -0500 Subject: [PATCH 02/27] Fix 1 Duplicate power cable. Don't know how that got there. --- _maps/map_files/BoxStation/BoxStation.dmm | 39 +++++++++++------------ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 87c2b2b013c4bf..52e241d0931869 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -3986,11 +3986,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/glass/reinforced, /area/station/commons/fitness/recreation) -"brw" = ( -/obj/structure/cable, -/obj/structure/table/wood, -/turf/open/floor/iron/dark, -/area/station/command/meeting_room) "brx" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22556,9 +22551,10 @@ /turf/open/floor/plating/airless, /area/station/ai_monitored/turret_protected/aisat/atmos) "hzA" = ( -/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/structure/table/wood, /turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) +/area/station/command/meeting_room) "hzK" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -29924,6 +29920,10 @@ }, /turf/open/floor/plating, /area/station/engineering/break_room) +"jWU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "jXh" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 1 @@ -30246,10 +30246,6 @@ /obj/structure/sign/departments/maint/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"ked" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) "keg" = ( /obj/structure/flora/grass/jungle/a/style_random, /turf/open/floor/grass, @@ -38441,6 +38437,10 @@ dir = 8 }, /area/station/engineering/storage/tech) +"mQP" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "mQR" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning, /obj/effect/turf_decal/trimline/neutral/warning{ @@ -48375,7 +48375,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, -/obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/genetics/cloning) "qgA" = ( @@ -51427,6 +51426,10 @@ /obj/effect/spawner/random/engineering/material_cheap, /turf/open/floor/iron, /area/station/cargo/warehouse) +"rkw" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "rky" = ( /obj/effect/turf_decal/tile/dark_blue/full, /obj/effect/turf_decal/delivery, @@ -58303,10 +58306,6 @@ "txI" = ( /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"txW" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) "tyq" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -99200,7 +99199,7 @@ lOJ arQ fVn dRd -brw +hzA vaO baC myJ @@ -106187,7 +106186,7 @@ crl ucG eVB klo -txW +rkw lGd qKy dgR @@ -106443,7 +106442,7 @@ gAM hRt ssL qep -ked +jWU thA ryX lMb @@ -107214,7 +107213,7 @@ oqK kQX uXP geR -hzA +mQP wNL ctz wZv From 3dc7857d187ac17338c76fc67d02a22882f4a3b2 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Mon, 10 Jun 2024 00:21:22 -0500 Subject: [PATCH 03/27] Fix 2 Fixed some more cables. --- _maps/map_files/BoxStation/BoxStation.dmm | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 52e241d0931869..ca8f08dc3be51f 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -7368,6 +7368,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"cwH" = ( +/obj/structure/cable, +/obj/structure/table/wood, +/turf/open/floor/iron/dark, +/area/station/command/meeting_room) "cwK" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/line{ @@ -8071,7 +8076,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/layer1, /turf/open/floor/iron/textured, /area/station/engineering/main) "cJB" = ( @@ -22551,10 +22555,9 @@ /turf/open/floor/plating/airless, /area/station/ai_monitored/turret_protected/aisat/atmos) "hzA" = ( -/obj/structure/cable, -/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/dark, -/area/station/command/meeting_room) +/area/station/engineering/atmos/pumproom) "hzK" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -29920,10 +29923,6 @@ }, /turf/open/floor/plating, /area/station/engineering/break_room) -"jWU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) "jXh" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 1 @@ -35228,6 +35227,10 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"lJI" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "lJK" = ( /obj/machinery/light/small/directional/west, /obj/structure/table_frame, @@ -38437,10 +38440,6 @@ dir = 8 }, /area/station/engineering/storage/tech) -"mQP" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) "mQR" = ( /obj/effect/turf_decal/trimline/neutral/filled/warning, /obj/effect/turf_decal/trimline/neutral/warning{ @@ -45143,6 +45142,7 @@ color = "#7fb3d5"; dir = 4 }, +/obj/structure/cable, /turf/open/floor/carpet/cyan, /area/station/ai_monitored/turret_protected/ai_upload) "oZX" = ( @@ -51426,10 +51426,6 @@ /obj/effect/spawner/random/engineering/material_cheap, /turf/open/floor/iron, /area/station/cargo/warehouse) -"rkw" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) "rky" = ( /obj/effect/turf_decal/tile/dark_blue/full, /obj/effect/turf_decal/delivery, @@ -71409,6 +71405,10 @@ /obj/structure/sign/departments/maint/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"xUC" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "xUG" = ( /obj/effect/turf_decal/stripes/corner, /obj/machinery/light/directional/west, @@ -99199,7 +99199,7 @@ lOJ arQ fVn dRd -hzA +cwH vaO baC myJ @@ -106186,7 +106186,7 @@ crl ucG eVB klo -rkw +xUC lGd qKy dgR @@ -106442,7 +106442,7 @@ gAM hRt ssL qep -jWU +hzA thA ryX lMb @@ -107213,7 +107213,7 @@ oqK kQX uXP geR -mQP +lJI wNL ctz wZv From 84db46463560e8cb9e1774929783db88e9ed7d82 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Mon, 10 Jun 2024 08:55:53 -0500 Subject: [PATCH 04/27] Fix 3 Small change to make the tests run again. --- _maps/map_files/BoxStation/BoxStation.dmm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index ca8f08dc3be51f..4d949aed5a6ec8 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -33,6 +33,7 @@ "aaT" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/south, +/obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/station/medical/cryo) @@ -17762,8 +17763,8 @@ /area/station/hallway/secondary/service) "fYh" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/airalarm/directional/east, /obj/structure/sink/directional/west, +/obj/machinery/defibrillator_mount/directional/east, /turf/open/floor/iron/dark, /area/station/medical/exam_room) "fYj" = ( @@ -45610,7 +45611,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/airalarm/directional/north, /obj/machinery/camera/directional/north{ c_tag = "Medical - Cryogenics"; name = "medical camera"; @@ -50966,7 +50966,6 @@ /obj/effect/turf_decal/stripes/end{ dir = 8 }, -/obj/machinery/defibrillator_mount/directional/east, /obj/machinery/stasis, /turf/open/floor/iron/dark, /area/station/medical/exam_room) @@ -59484,11 +59483,11 @@ /area/station/command/meeting_room) "tUG" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/light/directional/south, /obj/machinery/computer/operating{ dir = 8 }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/station/medical/exam_room) "tUH" = ( @@ -65715,6 +65714,7 @@ /area/station/ai_monitored/security/armory) "vVQ" = ( /obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/medical/exam_room) "vVY" = ( @@ -68570,6 +68570,7 @@ "wWf" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/sink/directional/east, +/obj/machinery/defibrillator_mount/directional/west, /turf/open/floor/iron/dark, /area/station/medical/exam_room) "wWh" = ( @@ -112581,7 +112582,7 @@ wIx eav dgy dgy -dgy +eav dgy dgy eav From f47cacecf4af5f7662a766817b8f08d2477e0b02 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Wed, 12 Jun 2024 04:13:39 -0500 Subject: [PATCH 05/27] Fix 4 I thought I fixed this earlier. --- _maps/map_files/BoxStation/BoxStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 4d949aed5a6ec8..a4defaeef2f2f2 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -101254,7 +101254,7 @@ lOJ snq kjH cYh -cYh +nkf keT jit xgm From 93b14dff292403978fba40a58e6de4cb168dc547 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Fri, 14 Jun 2024 00:00:00 -0500 Subject: [PATCH 06/27] Fix 5 Makes changes to fix conflicts with PR 2017. Includes the PTL fix from PR 2263. --- _maps/map_files/BoxStation/BoxStation.dmm | 268 ++++++++++++++++------ 1 file changed, 198 insertions(+), 70 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index a4defaeef2f2f2..5a34a5d961f06e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -474,7 +474,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, -/obj/structure/cable, +/obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/engineering{ @@ -1087,7 +1087,7 @@ /area/station/engineering/atmos) "atW" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/firealarm/directional/south, +/obj/machinery/station_map/engineering/directional/south, /obj/structure/table/wood, /obj/item/newspaper{ pixel_x = -5 @@ -1889,6 +1889,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 5 }, +/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "aJq" = ( @@ -2375,13 +2376,13 @@ /area/station/maintenance/starboard/aft) "aRJ" = ( /obj/effect/turf_decal/trimline/purple/filled/line, +/obj/machinery/light/directional/south, /obj/machinery/button/door/directional/south{ id = "robotics_pub_shutters"; name = "Robotics Privacy Shutters Control"; pixel_x = 6; req_access = list("robotics") }, -/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/science/robotics/lab) "aRM" = ( @@ -4219,6 +4220,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/line, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/chair{ dir = 8 }, @@ -4404,9 +4406,10 @@ /turf/open/floor/iron, /area/station/maintenance/department/electrical) "bxE" = ( -/obj/machinery/light_switch/directional/east, -/turf/open/floor/iron/dark, -/area/station/service/chapel) +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "bxK" = ( /obj/machinery/computer/security/telescreen/vault{ pixel_y = 30 @@ -5185,6 +5188,12 @@ /obj/structure/railing, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"bKe" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "bKm" = ( /obj/effect/turf_decal/tile/neutral/anticorner{ dir = 1 @@ -5753,6 +5762,10 @@ dir = 1 }, /area/station/commons/locker) +"bUq" = ( +/obj/structure/ghost_critter_spawn, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "bUF" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -6080,7 +6093,7 @@ /area/station/engineering/transit_tube) "bZK" = ( /obj/machinery/light/directional/west, -/obj/item/radio/intercom/directional/west, +/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -7079,7 +7092,7 @@ /area/station/hallway/primary/fore) "cpO" = ( /obj/machinery/light/directional/south, -/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/white, /area/station/maintenance/department/science) "cpX" = ( @@ -8830,7 +8843,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "cUe" = ( @@ -10299,6 +10312,15 @@ dir = 8 }, /area/station/cargo/miningoffice) +"dsc" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/machinery/station_map/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "dsd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10870,6 +10892,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "dCT" = ( @@ -11361,6 +11384,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 }, +/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "dMb" = ( @@ -15427,6 +15451,7 @@ dir = 8 }, /obj/machinery/light/small/directional/east, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "fhe" = ( @@ -15535,6 +15560,11 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron/dark/side, /area/station/commons/fitness) +"fjv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "fjx" = ( /obj/item/radio/intercom/directional/north, /turf/open/floor/wood, @@ -15805,11 +15835,11 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, -/obj/machinery/status_display/evac/directional/west, /obj/machinery/light/directional/west, /obj/effect/turf_decal/trimline/red/line{ dir = 4 }, +/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "fop" = ( @@ -18290,7 +18320,6 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/structure/cable, /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) @@ -19018,7 +19047,6 @@ "gvb" = ( /obj/machinery/light/small/directional/west, /obj/machinery/camera/autoname/directional/west, -/obj/item/radio/intercom/directional/west, /turf/open/floor/carpet, /area/station/service/library) "gvc" = ( @@ -20441,7 +20469,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "gPd" = ( @@ -21058,7 +21085,12 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 }, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/west{ + pixel_y = -6 + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = 3 + }, /obj/structure/table, /obj/item/hatchet, /obj/item/cultivator, @@ -21475,6 +21507,10 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"hhJ" = ( +/obj/item/radio/intercom/directional/west, +/turf/open/floor/carpet, +/area/station/service/library) "hhK" = ( /turf/open/floor/iron/dark/side{ dir = 9 @@ -21798,7 +21834,7 @@ /area/station/security/prison) "hmP" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/extinguisher_cabinet/directional/east, /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/hallway/secondary/exit/departure_lounge) @@ -22891,6 +22927,16 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/hallway/secondary/exit/departure_lounge) +"hEV" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 8 + }, +/obj/machinery/station_map/engineering/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "hEZ" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -24293,7 +24339,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/station_map/engineering/directional/north, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) @@ -24704,7 +24750,6 @@ /area/station/maintenance/starboard/aft) "imH" = ( /obj/effect/turf_decal/tile/red/half/contrasted, -/obj/structure/cable, /obj/machinery/firealarm/directional/south, /obj/machinery/light_switch/directional/south{ pixel_x = -8 @@ -25427,6 +25472,7 @@ "ivl" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/camera/autoname/directional/south, +/obj/structure/extinguisher_cabinet/directional/south, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) @@ -26600,7 +26646,7 @@ /area/station/security/detectives_office) "iOC" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/cable, +/obj/structure/cable/multilayer/connected, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -26656,6 +26702,11 @@ dir = 8 }, /area/station/service/hydroponics) +"iOZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "iPu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26972,7 +27023,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "iWL" = ( -/obj/structure/noticeboard/directional/south, +/obj/machinery/status_display/ai/directional/south, /obj/machinery/light/directional/south, /obj/machinery/computer/slot_machine, /turf/open/floor/iron/dark, @@ -27480,10 +27531,11 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 }, +/obj/machinery/light/directional/east, +/obj/machinery/station_map/engineering/directional/east, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "jgV" = ( @@ -27747,7 +27799,7 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/structure/sign/poster/official/random/directional/north, +/obj/machinery/station_map/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "jkU" = ( @@ -28667,7 +28719,7 @@ dir = 1 }, /obj/machinery/light/directional/south, -/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "jCy" = ( @@ -28834,12 +28886,11 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, -/obj/structure/cable, /obj/item/radio/intercom/directional/south, -/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/computer/security{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "jFo" = ( @@ -29304,10 +29355,10 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/atmos) "jLQ" = ( -/obj/machinery/duct, -/obj/machinery/status_display/ai/directional/west, -/turf/open/floor/iron/dark, -/area/station/command/meeting_room) +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/plating, +/area/station/maintenance/port) "jLR" = ( /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 10 @@ -30958,6 +31009,7 @@ /turf/open/floor/iron/white, /area/station/science/circuits) "kpn" = ( +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/table, /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/white, @@ -32695,6 +32747,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/chair{ dir = 4 }, @@ -33464,7 +33517,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/station_map/engineering/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) @@ -34726,6 +34779,7 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/south, +/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "lBO" = ( @@ -37610,7 +37664,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, -/obj/machinery/light_switch/directional/west, /obj/structure/table, /obj/item/cultivator, /obj/item/hatchet, @@ -37800,7 +37853,7 @@ "mDP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron/white, /area/station/science/xenobiology) "mDR" = ( @@ -37872,6 +37925,7 @@ dir = 4 }, /obj/machinery/light/directional/west, +/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/aft) "mFi" = ( @@ -38045,7 +38099,10 @@ /area/station/maintenance/department/medical) "mJa" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/light_switch/directional/south, +/obj/machinery/light_switch/directional/south{ + pixel_x = 8 + }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/wood, /area/station/commons/locker) "mJo" = ( @@ -39352,7 +39409,6 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/obj/structure/cable, /obj/machinery/requests_console/directional/north{ anon_tips_receiver = 1; assistance_requestable = 1; @@ -39934,7 +39990,7 @@ /area/station/medical/virology) "nqN" = ( /obj/effect/turf_decal/stripes/line, -/obj/structure/cable, +/obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -41765,6 +41821,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/science/research) +"nVu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/iron/checker, +/area/station/maintenance/port/fore) "nVy" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron/dark, @@ -42952,7 +43013,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/item/kirbyplants/random, /obj/machinery/camera/directional/south{ c_tag = "Central Hallway South"; name = "hallway camera" @@ -42978,7 +43038,6 @@ /area/station/security/prison/safe) "ooT" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, /obj/structure/table, /obj/effect/spawner/random/food_or_drink/booze{ pixel_x = -8; @@ -43020,6 +43079,16 @@ }, /turf/open/floor/iron/dark/textured, /area/station/commons/fitness/recreation) +"opE" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "opG" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/flowers_br/style_random, @@ -44007,6 +44076,15 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/textured, /area/station/science/ordnance/office) +"oHa" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/status_display/evac/directional/south, +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/security_assistant, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "oHb" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -46242,7 +46320,7 @@ /area/station/maintenance/department/medical) "ptq" = ( /obj/machinery/light/directional/east, -/obj/machinery/status_display/evac/directional/east, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -47403,6 +47481,7 @@ }, /obj/effect/turf_decal/trimline/neutral/line, /obj/machinery/light/small/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "pND" = ( @@ -48429,6 +48508,7 @@ /area/station/maintenance/disposal/incinerator) "qha" = ( /obj/machinery/camera/autoname/directional/east, +/obj/machinery/station_map/engineering/directional/east, /turf/open/floor/carpet, /area/station/service/library) "qhp" = ( @@ -52516,6 +52596,14 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/station/security/prison) +"rBn" = ( +/obj/effect/turf_decal/trimline/purple/line, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "rBF" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -52751,6 +52839,7 @@ /turf/open/floor/iron, /area/station/cargo/storage) "rEE" = ( +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/chair/wood{ dir = 4 }, @@ -53262,11 +53351,7 @@ /area/station/engineering/atmos) "rNx" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "robotics_garage_shutters"; - name = "Robotics Shutters"; - dir = 4 - }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/science/robotics/mechbay) "rNA" = ( @@ -53384,7 +53469,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "rPK" = ( -/obj/machinery/status_display/evac/directional/west, +/obj/structure/noticeboard/directional/west, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "rPQ" = ( @@ -54237,6 +54322,7 @@ /area/station/medical/medbay/aft) "seN" = ( /obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, @@ -54961,7 +55047,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/line, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/station_map/engineering/directional/north, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) @@ -57548,11 +57634,11 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 1 }, -/obj/structure/closet/firecloset, /obj/machinery/camera/directional/south{ c_tag = "Central Hallway Southeast"; name = "hallway camera" }, +/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "tmR" = ( @@ -60865,7 +60951,7 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "ure" = ( -/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/station_map/engineering/directional/east, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/service/chapel) @@ -61281,6 +61367,11 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"uyC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "uyP" = ( /obj/structure/lattice, /obj/structure/sign/warning/secure_area/directional/south, @@ -62976,6 +63067,7 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/south, +/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/dark, /area/station/security/office) "vbB" = ( @@ -64828,6 +64920,7 @@ dir = 1 }, /obj/machinery/light/small/directional/south, +/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/dark, /area/station/security/brig) "vHb" = ( @@ -66394,6 +66487,12 @@ /obj/item/mop, /turf/open/floor/iron/dark/side, /area/station/service/janitor) +"wiT" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "wja" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -68418,6 +68517,16 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"wSs" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, +/obj/machinery/station_map/engineering/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "wSt" = ( /obj/effect/spawner/random/structure/table_or_rack, /obj/effect/spawner/random/clothing/costume, @@ -68557,6 +68666,7 @@ "wVm" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/light/directional/south, +/obj/machinery/station_map/engineering/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -69008,6 +69118,14 @@ /obj/structure/sign/departments/cargo/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"xdV" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/obj/machinery/station_map/engineering/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) "xew" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -69682,6 +69800,16 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/security/brig/entrance) +"xqN" = ( +/obj/machinery/light_switch/directional/north, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/service/chapel) +"xqQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) "xqS" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -78907,7 +79035,7 @@ ksa ksa uho oDl -dNu +bUq lcU kfl mpz @@ -80693,7 +80821,7 @@ qyd bLR aHU pRn -naL +dsc uho ksa ksa @@ -82251,7 +82379,7 @@ jxF jgM lTP cRp -xMz +xqQ rdt iQW cRp @@ -83495,7 +83623,7 @@ fPN fPN fPN fPN -wfE +iOZ rSo iHO spv @@ -85006,7 +85134,7 @@ dPU wOS qYY fPN -wfE +iOZ iHO nsB fPN @@ -85322,7 +85450,7 @@ rFC plt tei bnl -cLZ +jLQ tTR cLZ uKO @@ -91179,7 +91307,7 @@ wfE vKc eJq iHO -vXb +bKe fPN tvs rtE @@ -92738,7 +92866,7 @@ nGn nGn fhe ydN -edD +nVu dUu rSo iBz @@ -96652,7 +96780,7 @@ mTk wEB cfP rrq -nwz +uyC tcw mhD wEB @@ -97660,7 +97788,7 @@ cOn qdE adP qdE -qdE +hEV foE jwc iOJ @@ -98174,7 +98302,7 @@ rPK eTd wFc gvi -jLQ +baC rky eGw sNP @@ -98888,7 +99016,7 @@ rUm vpG twl qQg -jTa +oHa ait ait ait @@ -100266,7 +100394,7 @@ kag hpM ckA mEZ -tAf +opE uWr tAf bkB @@ -102246,7 +102374,7 @@ xqM bTq mUT xpb -vvy +xdV orb ukt kAo @@ -103296,7 +103424,7 @@ wEA wxP mZc fTi -wEA +fjv kAV mZc qMU @@ -105370,7 +105498,7 @@ cOn fgC pkv iMN -mzq +wSs xOV tXM rZB @@ -106911,7 +107039,7 @@ cEO qeZ cHJ wxL -czJ +lbf oBH qFT sgM @@ -107166,7 +107294,7 @@ jLn tvV vSo tOJ -cHJ +rBn wxL lbf oBH @@ -110766,7 +110894,7 @@ xSh fsE cTW wxL -lbf +czJ qOH nle rzV @@ -115651,7 +115779,7 @@ eWw qkx waq nBE -mhc +bxE mhc sZi tFb @@ -117709,7 +117837,7 @@ lTH qnE kbE gvb -ayi +hhJ sjy ccp iRe @@ -118721,7 +118849,7 @@ sfC sfC sfC sfC -knz +xqN gIG bPd bPd @@ -118980,7 +119108,7 @@ cSx sms wSC qWj -bxE +bPd bPd bPd lIF @@ -122081,7 +122209,7 @@ mbx bms vdT nBE -jwC +wiT mhc jLa nBE From 585af084ee53198fb4c58870726b1ea86eb493ea Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Tue, 18 Jun 2024 02:05:08 -0500 Subject: [PATCH 07/27] Fix 6 HoP area stuff. --- _maps/map_files/BoxStation/BoxStation.dmm | 101 ++++++++++++++-------- 1 file changed, 67 insertions(+), 34 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 5a34a5d961f06e..e5c792329cd39f 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1,8 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aav" = ( -/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/effect/turf_decal/bot_white, +/obj/machinery/light/small/directional/south, +/obj/machinery/ticket_machine/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "aaA" = ( @@ -2940,6 +2941,7 @@ /obj/structure/table, /obj/machinery/recharger, /obj/machinery/light/directional/south, +/obj/item/paper/fluff/ids_for_dummies, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "baq" = ( @@ -3008,7 +3010,6 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "bbc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/chair{ dir = 8 }, @@ -15642,7 +15643,9 @@ /turf/closed/wall, /area/station/security/courtroom) "fli" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hop) "flo" = ( @@ -15862,6 +15865,9 @@ dir = 8 }, /obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "foK" = ( @@ -18752,7 +18758,7 @@ /area/station/science/genetics) "gqq" = ( /obj/structure/sign/poster/official/ian/directional/north, -/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/photocopier, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "gqF" = ( @@ -22541,7 +22547,6 @@ /turf/open/floor/iron/white, /area/station/science/auxlab) "hxV" = ( -/obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 }, @@ -23304,14 +23309,13 @@ /turf/open/floor/iron/dark, /area/station/science/server) "hLv" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners, +/obj/effect/turf_decal/delivery/white, +/obj/machinery/light/small/directional/north, /obj/machinery/camera/directional/north{ c_tag = "Central Hallway, West - HoP Line"; name = "hallway camera" }, -/obj/effect/turf_decal/tile/dark_blue/fourcorners, -/obj/effect/turf_decal/delivery/white, -/obj/machinery/light/small/directional/north, -/obj/machinery/ticket_machine/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "hLB" = ( @@ -26657,9 +26661,6 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "iOJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 }, @@ -31331,7 +31332,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/line, -/obj/machinery/newscaster/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) @@ -34570,9 +34570,6 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "lyp" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/machinery/camera/directional/south{ c_tag = "Command - Head of Personnel's Office"; name = "command camera" @@ -34863,6 +34860,7 @@ /area/station/medical/medbay/aft) "lCu" = ( /obj/machinery/light/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/command/bridge) "lCw" = ( @@ -37345,6 +37343,14 @@ "mtq" = ( /turf/closed/wall/r_wall, /area/station/security/prison/shower) +"mtr" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "mtH" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ dir = 5 @@ -38236,11 +38242,11 @@ name = "Queue Shutters Control"; req_access = list("hop") }, -/obj/machinery/light_switch/directional/north{ - pixel_x = -4; +/obj/machinery/pdapainter, +/obj/machinery/button/ticket_machine{ + pixel_x = -6; pixel_y = 34 }, -/obj/machinery/pdapainter, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "mMI" = ( @@ -44251,7 +44257,7 @@ /area/station/maintenance/department/science) "oJX" = ( /obj/structure/table, -/obj/item/folder/blue, +/obj/item/papercutter, /obj/item/hand_labeler, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hop) @@ -46052,6 +46058,13 @@ dir = 1 }, /area/station/tcommsat/computer) +"pqi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/mapping_helpers/ianbirthday, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hop) "pql" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -46640,6 +46653,14 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"pyg" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "pyq" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -50758,7 +50779,7 @@ }, /area/station/hallway/secondary/service) "qXl" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/hallway/primary/central) "qXm" = ( @@ -55640,13 +55661,18 @@ /turf/open/floor/iron, /area/station/service/janitor) "sEm" = ( -/obj/machinery/newscaster/directional/north, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 1 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/light_switch/directional/east{ + pixel_y = -4 }, -/obj/effect/turf_decal/trimline/dark_blue/line, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) +/obj/machinery/firealarm/directional/east{ + pixel_y = 6 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "sEr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58413,6 +58439,7 @@ "tyF" = ( /obj/structure/table, /obj/item/paper_bin, +/obj/item/folder/blue, /obj/item/pen, /obj/item/stamp/hop, /turf/open/floor/carpet/royalblue, @@ -66704,6 +66731,9 @@ pixel_y = 9; dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "wmF" = ( @@ -71232,6 +71262,9 @@ dir = 4 }, /obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "xPw" = ( @@ -97274,11 +97307,11 @@ cOn vui vui vui +pcU vui vui vui vui -pcU qAf eON vui @@ -98830,7 +98863,7 @@ kMW tcJ lCn lFc -tpU +mtr bzW niG sRZ @@ -99595,7 +99628,7 @@ sOV lFc itm tzm -umX +pqi lwx fli bbc @@ -99851,12 +99884,12 @@ pIF khd pTF jmn -fdI +pyg fdI aoB hte fdI -fdI +sEm rXH cWi aMw @@ -104484,7 +104517,7 @@ kZM xNS xNS oNk -oKy +mtr mwc ygO blC @@ -104998,7 +105031,7 @@ emZ fqj fqj oNk -sEm +oKy mwc phj blC From 59c06a96dddd64caf39ec3c29eb53462a99a2356 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Tue, 18 Jun 2024 02:55:59 -0500 Subject: [PATCH 08/27] Fix 7 Miscellaneous stuff. --- _maps/map_files/BoxStation/BoxStation.dmm | 219 ++++++++++++---------- 1 file changed, 120 insertions(+), 99 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index e5c792329cd39f..357bf4a7b53ff2 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -691,6 +691,19 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"anF" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/light_switch/directional/east{ + pixel_y = -4 + }, +/obj/machinery/firealarm/directional/east{ + pixel_y = 6 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "anM" = ( /obj/effect/spawner/random/structure/table, /obj/item/reagent_containers/condiment/saltshaker{ @@ -1029,6 +1042,10 @@ /obj/structure/filingcabinet, /turf/open/floor/iron/dark, /area/station/security/office) +"asD" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "asE" = ( /obj/machinery/computer/records/security, /turf/open/floor/wood, @@ -5365,7 +5382,7 @@ /area/station/maintenance/department/engine) "bMS" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 }, /obj/machinery/duct, /turf/open/floor/iron/showroomfloor, @@ -26219,6 +26236,14 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"iID" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "iIF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/decal/cleanable/oil, @@ -26595,15 +26620,13 @@ /turf/open/floor/iron/checker, /area/station/science/lab) "iNY" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=Security"; - location = "EVA2" - }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/fore) +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "iNZ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer2, /obj/machinery/door/airlock/research/glass{ @@ -32134,11 +32157,8 @@ /turf/open/floor/iron, /area/station/commons/storage/primary) "kKi" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, +/obj/structure/mirror/directional/east, +/obj/structure/sink/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/captain/private) "kKm" = ( @@ -32257,12 +32277,15 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "kMH" = ( -/obj/machinery/duct, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Security"; + location = "EVA2" }, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/captain/private) +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "kMR" = ( /obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, @@ -35261,6 +35284,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "lJD" = ( @@ -37343,14 +37367,6 @@ "mtq" = ( /turf/closed/wall/r_wall, /area/station/security/prison/shower) -"mtr" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/line, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) "mtH" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ dir = 5 @@ -38019,6 +38035,10 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/iron, /area/station/construction) +"mHH" = ( +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/station/security/detectives_office) "mHO" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -39189,7 +39209,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "ndm" = ( -/obj/item/soap/deluxe, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/captain/private) "ndr" = ( @@ -46058,13 +46079,6 @@ dir = 1 }, /area/station/tcommsat/computer) -"pqi" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/effect/mapping_helpers/ianbirthday, -/turf/open/floor/carpet/royalblue, -/area/station/command/heads_quarters/hop) "pql" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -46653,14 +46667,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"pyg" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "pyq" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -48058,6 +48064,19 @@ "pXY" = ( /turf/open/floor/iron/showroomfloor, /area/station/security/prison/shower) +"pYh" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "pYv" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/item/kirbyplants/random, @@ -48402,12 +48421,12 @@ /area/station/engineering/atmos/pumproom) "qet" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=EVA2"; - location = "Dorm" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Lockers"; + location = "EVA" + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "qeZ" = ( @@ -48997,6 +49016,10 @@ /obj/structure/railing{ dir = 8 }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=AIE"; + location = "AftH" + }, /turf/open/floor/iron, /area/station/hallway/primary/aft) "qqz" = ( @@ -52526,6 +52549,11 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"rAt" = ( +/obj/machinery/duct, +/obj/item/soap/deluxe, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/captain/private) "rAA" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 5 @@ -55661,18 +55689,15 @@ /turf/open/floor/iron, /area/station/service/janitor) "sEm" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/light_switch/directional/east{ - pixel_y = -4 - }, -/obj/machinery/firealarm/directional/east{ - pixel_y = 6 +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=EVA2"; + location = "Dorm" }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "sEr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61590,9 +61615,6 @@ /area/station/engineering/atmos/office) "uCB" = ( /obj/machinery/light/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/machinery/duct, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/captain/private) @@ -64405,10 +64427,13 @@ /turf/open/floor/plating, /area/station/engineering/atmos/hfr_room) "vyt" = ( -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/captain/private) +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "vyC" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/booze, @@ -66407,16 +66432,8 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "whh" = ( -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=Lockers"; - location = "EVA" - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line, -/obj/effect/turf_decal/trimline/dark_blue/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/captain/private) "whr" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -71262,9 +71279,6 @@ dir = 4 }, /obj/machinery/firealarm/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "xPw" = ( @@ -71798,6 +71812,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"xXt" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/mapping_helpers/ianbirthday, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/hop) "xXB" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/light, @@ -71903,6 +71924,7 @@ /area/station/security/bitden) "xZp" = ( /obj/machinery/airalarm/directional/south, +/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/closet/secure_closet/captains, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) @@ -71925,16 +71947,15 @@ /turf/open/floor/iron/dark, /area/station/commons/vacant_room/office) "xZK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=EVA"; location = "Security" }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line, -/obj/effect/turf_decal/trimline/dark_blue/line{ - dir = 1 - }, /turf/open/floor/iron/dark, -/area/station/hallway/primary/central) +/area/station/hallway/primary/fore) "xZO" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -97550,7 +97571,6 @@ wql uRK jFo hux -gbD sRs gbD gbD @@ -97560,6 +97580,7 @@ gbD gbD gbD gbD +gbD qgn gbD nTS @@ -98863,7 +98884,7 @@ kMW tcJ lCn lFc -mtr +vyt bzW niG sRZ @@ -99628,7 +99649,7 @@ sOV lFc itm tzm -pqi +xXt lwx fli bbc @@ -99884,12 +99905,12 @@ pIF khd pTF jmn -pyg +iNY fdI aoB hte fdI -sEm +anF rXH cWi aMw @@ -100098,7 +100119,7 @@ vvy lmX asE eUO -tbg +mHH xle tFs hjG @@ -101405,8 +101426,8 @@ pRz mpW hjB hjB -gbD -whh +qet +cjW hNM udd ftk @@ -101635,8 +101656,8 @@ lFp lFp lFp xfg -uan -iNY +xZK +xpb grj xpb xpb @@ -101919,8 +101940,8 @@ pRz mpW hjB hjB -gbD -xZK +kMH +cjW eIw mMQ ftk @@ -103177,7 +103198,7 @@ nlr fkD htc lig -xpb +uan vvy iXS qJv @@ -104517,7 +104538,7 @@ kZM xNS xNS oNk -mtr +vyt mwc ygO blC @@ -104763,11 +104784,11 @@ evr fIH qqD evr -evr +asD hDl uCB -kMH mXX +rAt nPf ehP tDk @@ -105023,15 +105044,15 @@ ivi wou hDl kKi -vyt eWq +whh hDl tYE emZ fqj fqj oNk -oKy +iID mwc phj blC @@ -105532,12 +105553,12 @@ fgC pkv iMN wSs -xOV +pYh tXM rZB mzq cOn -mzq +xOV qdL mPK mzq @@ -105774,8 +105795,8 @@ tJZ fAQ tZr bve +sEm gbD -qet gbD gbD gbD From 719ecedd16064a4a70657095039e0536677823d9 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Wed, 19 Jun 2024 02:17:51 -0500 Subject: [PATCH 09/27] Fix 8 Some more fixes for stuff I missed.. --- _maps/map_files/BoxStation/BoxStation.dmm | 2664 ++++++++--------- .../RandomEngines/BoxStation/empty.dmm | 4 +- .../BoxStation/particle_accelerator.dmm | 10 +- .../RandomEngines/BoxStation/sm_teg.dmm | 9 +- .../RandomEngines/BoxStation/supermatter.dmm | 14 +- .../RandomEngines/BoxStation/teg.dmm | 2 +- 6 files changed, 1338 insertions(+), 1365 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 357bf4a7b53ff2..3a84aa8f8d388c 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1547,7 +1547,6 @@ /area/station/service/hydroponics) "aBM" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/light/small/directional/west, /obj/machinery/firealarm/directional/west, /obj/machinery/airalarm/directional/north, /obj/structure/table/reinforced/rglass, @@ -2145,9 +2144,7 @@ /area/station/service/chapel/funeral) "aMX" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south{ - dir = 5 - }, +/obj/machinery/camera/autoname/directional/south, /obj/machinery/duct, /turf/open/floor/carpet/red, /area/station/security/prison/safe) @@ -2169,8 +2166,8 @@ /turf/open/floor/wood, /area/station/security/detectives_office) "aNz" = ( -/obj/machinery/light/directional/west, -/obj/machinery/field/generator, +/obj/machinery/light/small/directional/south, +/obj/machinery/power/rad_collector, /turf/open/floor/plating, /area/station/engineering/main) "aNK" = ( @@ -2190,9 +2187,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) "aNT" = ( -/obj/machinery/camera/autoname/directional/east{ - dir = 6 - }, +/obj/machinery/camera/autoname/directional/east, /obj/machinery/light/small/directional/east, /turf/open/floor/grass, /area/station/hallway/primary/central) @@ -2532,9 +2527,7 @@ /area/station/maintenance/port) "aSP" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south{ - dir = 5 - }, +/obj/machinery/camera/autoname/directional/south, /obj/machinery/duct, /turf/open/floor/carpet/blue, /area/station/security/prison/safe) @@ -2869,15 +2862,15 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "aYs" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/machinery/disposal/bin, +/obj/machinery/duct, /turf/open/floor/iron, -/area/station/engineering/storage) +/area/station/engineering/break_room) "aYt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4108,13 +4101,13 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "bsK" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 }, -/turf/open/floor/plating, -/area/station/engineering/atmos/office) +/obj/machinery/firealarm/directional/west, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/engineering/storage) "bsR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4185,25 +4178,14 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "btH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/door/airlock/engineering{ - name = "Main SMES Room" +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +/obj/structure/table, +/turf/open/floor/iron/dark/side{ + dir = 1 }, -/obj/structure/cable/layer1, -/turf/open/floor/iron/textured, -/area/station/engineering/engine_smes) +/area/station/engineering/break_room) "btK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5781,9 +5763,9 @@ }, /area/station/commons/locker) "bUq" = ( -/obj/structure/ghost_critter_spawn, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) +/obj/structure/cable, +/turf/open/floor/circuit, +/area/station/ai_monitored/command/nuke_storage) "bUF" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -6384,6 +6366,8 @@ "ceb" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/bot_white/right, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, /obj/structure/closet/crate/silvercrate, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) @@ -7460,7 +7444,6 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 }, -/obj/machinery/light/small/directional/west, /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 @@ -7987,9 +7970,10 @@ /turf/open/floor/iron, /area/station/science/ordnance) "cGM" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood, -/area/station/security/prison/rec) +/obj/machinery/light/small/directional/south, +/obj/machinery/power/energy_accumulator/grounding_rod, +/turf/open/floor/plating, +/area/station/engineering/main) "cGR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset/full, @@ -8224,16 +8208,10 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "cLc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" - }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/ghost_critter_spawn, /turf/open/floor/plating, -/area/station/engineering/atmos/office) +/area/station/maintenance/starboard/fore) "cLl" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -9718,6 +9696,7 @@ "dim" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/bot_white/left, +/obj/machinery/airalarm/directional/west, /obj/structure/closet/crate/goldcrate, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) @@ -10307,7 +10286,6 @@ /obj/machinery/modular_computer/preset/id{ dir = 4 }, -/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "drQ" = ( @@ -11733,7 +11711,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "dRb" = ( -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "dRd" = ( @@ -12306,15 +12284,17 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "eaC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/cable/layer1, +/obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ name = "Main SMES Room" }, @@ -12322,7 +12302,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/structure/cable/layer1, /turf/open/floor/iron/textured, /area/station/engineering/engine_smes) "eaE" = ( @@ -13352,7 +13331,11 @@ /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) "euP" = ( -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Science - Ordnance Launcher"; + name = "science camera"; + network = list("ss13","rd") + }, /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen/ordnance{ dir = 4 @@ -14784,10 +14767,15 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "eUO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/station/security/detectives_office) +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 8 + }, +/obj/machinery/station_map/engineering/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "eUW" = ( /turf/open/floor/wood, /area/station/service/chapel/funeral) @@ -16167,6 +16155,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -16407,12 +16398,15 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "fyZ" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/station/engineering/engine_smes) +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) "fza" = ( /obj/effect/turf_decal/trimline/dark_red/filled/warning{ dir = 4 @@ -16930,6 +16924,7 @@ /obj/effect/landmark/navigate_destination/det, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/security/detectives_office) "fJd" = ( @@ -17985,9 +17980,7 @@ pixel_x = 8; pixel_y = 10 }, -/obj/machinery/camera/autoname/directional/east{ - dir = 6 - }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "gbh" = ( @@ -19182,10 +19175,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/machinery/firealarm/directional/west, -/obj/machinery/light_switch/directional/west{ - pixel_y = -10 - }, /obj/structure/plaque/static_plaque/atmos{ pixel_y = -32 }, @@ -19536,23 +19525,9 @@ /turf/open/floor/iron/textured, /area/station/engineering/main) "gBL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/atmos{ - name = "Atmospherics Office" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" +/obj/machinery/firealarm/directional/west, +/obj/machinery/light_switch/directional/west{ + pixel_y = -10 }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) @@ -21024,8 +20999,6 @@ "gYF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/bot_white, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, @@ -22084,7 +22057,6 @@ }, /obj/machinery/disposal/bin, /obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "hqW" = ( @@ -23040,13 +23012,10 @@ /turf/open/floor/engine/n2, /area/station/engineering/atmos) "hGH" = ( -/obj/structure/sign/warning/electric_shock/directional/west, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron, -/area/station/engineering/storage) +/obj/machinery/light/small/directional/north, +/obj/machinery/power/port_gen/pacman/super, +/turf/open/floor/plating, +/area/station/engineering/main) "hGS" = ( /obj/machinery/light/small/directional/east, /obj/structure/closet/firecloset/full, @@ -25751,9 +25720,7 @@ }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, -/obj/machinery/camera/autoname/directional/north{ - dir = 9 - }, +/obj/machinery/camera/autoname/directional/north, /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) @@ -28966,7 +28933,6 @@ c_tag = "Engineering - Equipment Storage"; name = "engineering camera" }, -/obj/structure/sign/warning/electric_shock/directional/west, /turf/open/floor/iron, /area/station/engineering/storage) "jGl" = ( @@ -29303,8 +29269,8 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "jKB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/stripes/end{ + dir = 1 }, /obj/machinery/light/small/directional/north, /turf/open/floor/iron, @@ -29903,11 +29869,7 @@ /turf/open/floor/iron, /area/station/cargo/warehouse) "jVQ" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Science - Ordnance Launch Access"; - name = "science camera"; - network = list("ss13","rd") - }, +/obj/machinery/camera/autoname/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, @@ -31988,6 +31950,8 @@ "kHk" = ( /obj/structure/sign/warning/secure_area/directional/south, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/table, +/obj/effect/spawner/random/engineering/toolbox, /turf/open/floor/plating, /area/station/maintenance/port/aft) "kHw" = ( @@ -32015,11 +31979,12 @@ /turf/open/floor/engine, /area/station/science/explab) "kIl" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/camera/autoname/directional/south, +/obj/machinery/firealarm/directional/south, /obj/machinery/light_switch/directional/south{ pixel_x = -8 }, -/obj/machinery/camera/autoname/directional/south, -/obj/machinery/firealarm/directional/south, /obj/structure/chair/wood{ dir = 8 }, @@ -34828,6 +34793,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "lCa" = ( @@ -35494,10 +35460,10 @@ /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/atmos) "lLJ" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "lLK" = ( @@ -36250,7 +36216,6 @@ dir = 1 }, /obj/machinery/light/small/directional/north, -/obj/machinery/status_display/evac/directional/north, /obj/structure/table, /obj/item/phone, /turf/open/floor/iron/dark/side{ @@ -36400,10 +36365,14 @@ /turf/open/floor/engine, /area/station/science/ordnance/storage) "mcG" = ( -/obj/effect/spawner/random/structure/table, -/obj/item/clothing/mask/gas, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/structure/closet/radiation, +/obj/item/crowbar/large, +/turf/open/floor/iron, +/area/station/engineering/storage) "mcU" = ( /obj/machinery/camera/autoname/directional/east, /obj/structure/table/wood, @@ -36625,10 +36594,11 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "mih" = ( -/obj/machinery/light/directional/east, -/obj/machinery/power/energy_accumulator/tesla_coil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/table, +/obj/item/clothing/mask/gas, /turf/open/floor/plating, -/area/station/engineering/main) +/area/station/maintenance/port/aft) "min" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -36667,7 +36637,6 @@ /area/station/maintenance/department/medical) "miM" = ( /obj/machinery/camera/autoname/directional/west, -/obj/machinery/light/small/directional/west, /obj/machinery/button/door/directional/west{ id = "external_engine_storage"; name = "External Engine Storage Control"; @@ -36676,9 +36645,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/main) "miU" = ( -/obj/machinery/camera/autoname/directional/south{ - dir = 5 - }, +/obj/machinery/camera/autoname/directional/south, /turf/open/floor/grass, /area/station/hallway/primary/central) "miX" = ( @@ -37599,7 +37566,6 @@ id = "med_lockdown"; name = "Medical Lockdown" }, -/obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "mxu" = ( @@ -38778,6 +38744,7 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/north, +/obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/station/engineering/main) "mVa" = ( @@ -38815,15 +38782,10 @@ /turf/open/floor/iron/dark, /area/station/security/prison) "mVT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron, -/area/station/engineering/engine_smes) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "mVX" = ( /obj/effect/turf_decal/trimline/neutral/filled/end{ dir = 8 @@ -39094,9 +39056,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 }, -/obj/machinery/camera/autoname/directional/east{ - dir = 6 - }, +/obj/machinery/camera/autoname/directional/east, /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) @@ -39376,9 +39336,7 @@ /turf/open/floor/wood, /area/station/maintenance/starboard/fore) "nfw" = ( -/obj/machinery/camera/autoname/directional/west{ - dir = 10 - }, +/obj/machinery/camera/autoname/directional/west, /obj/machinery/light/small/directional/west, /turf/open/floor/grass, /area/station/hallway/primary/central) @@ -44682,6 +44640,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/computer/bank_machine, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "oQl" = ( @@ -45263,9 +45222,16 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "pan" = ( -/obj/machinery/power/port_gen/pacman/super, -/turf/open/floor/plating, -/area/station/engineering/main) +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/iron, +/area/station/engineering/storage) "pap" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, /obj/machinery/light/directional/west, @@ -45585,6 +45551,7 @@ /area/station/engineering/storage) "phW" = ( /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/small/directional/east, /obj/machinery/requests_console/directional/east{ department = "Chief Medical Officer's Desk"; name = "Chief Medical Officer's Requests Console"; @@ -46876,9 +46843,7 @@ /area/station/security/prison/mess) "pBK" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south{ - dir = 5 - }, +/obj/machinery/camera/autoname/directional/south, /obj/machinery/duct, /turf/open/floor/carpet/purple, /area/station/security/prison/safe) @@ -47177,7 +47142,10 @@ /area/station/command/heads_quarters/qm) "pHy" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 5 + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/iron/dark/side{ dir = 5 @@ -48958,7 +48926,11 @@ "qpB" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/west, -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Science - Auxiliary Lab"; + name = "science camera"; + network = list("ss13","rd") + }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/white, /area/station/science/auxlab) @@ -49930,9 +49902,26 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "qHa" = ( -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/cable/layer1, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Main SMES Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/iron/textured, +/area/station/engineering/engine_smes) "qHo" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -51893,7 +51882,6 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "rpu" = ( -/obj/item/radio/intercom/directional/south, /obj/structure/bed, /obj/item/bedsheet/red, /obj/effect/landmark/start/detective, @@ -52744,7 +52732,6 @@ "rCZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/bot_white, -/obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, @@ -52787,15 +52774,10 @@ /turf/open/floor/circuit, /area/station/maintenance/department/electrical) "rDD" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/closet/radiation, -/obj/item/crowbar/large, -/turf/open/floor/iron, -/area/station/engineering/storage) +/obj/machinery/light/floor/has_bulb, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/main) "rDG" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/trimline/dark_blue/warning{ @@ -53373,8 +53355,12 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "rMN" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "rMS" = ( @@ -53760,16 +53746,10 @@ /turf/open/floor/iron/dark, /area/station/security/processing) "rTF" = ( -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/station/engineering/break_room) +/obj/machinery/light/small/directional/north, +/obj/machinery/field/generator, +/turf/open/floor/plating, +/area/station/engineering/main) "rTK" = ( /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/cmo) @@ -55657,7 +55637,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, -/obj/machinery/camera/directional/east, +/obj/machinery/camera/autoname/directional/east, /obj/structure/table, /obj/machinery/recharger, /turf/open/floor/iron/showroomfloor, @@ -56046,6 +56026,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/port/aft) "sLn" = ( @@ -56080,11 +56061,12 @@ /area/station/service/library) "sLK" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/cable, +/obj/structure/sign/flag/nanotrasen/directional/south, +/obj/machinery/light/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/flag/nanotrasen/directional/south, +/obj/structure/cable, /turf/open/floor/iron/cafeteria{ dir = 8 }, @@ -56480,9 +56462,7 @@ /obj/effect/turf_decal/tile/purple/full, /obj/effect/turf_decal/delivery, /obj/machinery/light/small/directional/west, -/obj/machinery/camera/autoname/directional/west{ - dir = 10 - }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark/smooth_large, /area/station/science/breakroom) "sTD" = ( @@ -59255,6 +59235,7 @@ "tNO" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/camera/autoname/directional/south, +/obj/machinery/light/small/directional/south, /turf/open/floor/carpet/red, /area/station/security/detectives_office) "tNQ" = ( @@ -59935,19 +59916,11 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "uaO" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, -/obj/effect/mapping_helpers/airlock/unres, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "ubp" = ( /obj/structure/table, /turf/open/floor/iron/dark, @@ -60639,13 +60612,15 @@ /turf/open/floor/iron/white, /area/station/science/research) "ukW" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/light/small/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -61064,7 +61039,7 @@ "urJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random/trash/garbage, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/port/aft) "urV" = ( @@ -61609,10 +61584,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"uCv" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/office) "uCB" = ( /obj/machinery/light/directional/north, /obj/machinery/duct, @@ -62111,7 +62082,27 @@ /turf/open/floor/iron/dark, /area/station/medical/chemistry) "uLI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/poddoor/preopen{ + id = "atmos"; + name = "Atmospherics Blast Door" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "uLJ" = ( @@ -62300,7 +62291,6 @@ /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) "uOf" = ( -/obj/machinery/light/small/directional/south, /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/folder/red, @@ -62903,6 +62893,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/machinery/status_display/evac/directional/north, /obj/machinery/computer/atmos_alert, /turf/open/floor/iron/dark/side{ dir = 1 @@ -63055,9 +63046,7 @@ /area/station/cargo/storage) "vaR" = ( /obj/effect/turf_decal/tile/green, -/obj/machinery/camera/autoname/directional/north{ - dir = 9 - }, +/obj/machinery/camera/autoname/directional/north, /obj/structure/table, /obj/item/reagent_containers/spray/plantbgone{ pixel_y = 3 @@ -63155,7 +63144,7 @@ /obj/machinery/light_switch/directional/south{ pixel_x = -8 }, -/obj/machinery/camera/directional/south, +/obj/machinery/camera/autoname/directional/south, /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron, /area/station/science/ordnance) @@ -63879,15 +63868,14 @@ /turf/open/floor/wood, /area/station/smithing) "vom" = ( -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/south{ +/obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/growing/tray, -/turf/open/floor/iron/dark/side, -/area/station/service/hydroponics) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/break_room) "voo" = ( /turf/closed/wall, /area/station/science/ordnance/testlab) @@ -63944,7 +63932,7 @@ "voY" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/bot_white/left, -/obj/machinery/computer/bank_machine, +/obj/structure/filingcabinet, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "vpb" = ( @@ -65700,12 +65688,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/sink/directional/west, /turf/open/floor/iron/dark/side{ dir = 4 @@ -68737,11 +68719,14 @@ }, /area/station/hallway/secondary/service) "wWi" = ( -/obj/machinery/camera/autoname/directional/west{ - dir = 10 +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/engineering/break_room) "wWt" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -69241,6 +69226,7 @@ "xft" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/structure/chair/office/light{ dir = 1 }, @@ -69947,7 +69933,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/machinery/light/directional/north, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "xsi" = ( @@ -71014,7 +71000,7 @@ dir = 4 }, /obj/structure/sign/poster/official/random/directional/west, -/obj/machinery/light/directional/west, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "xJK" = ( @@ -71089,10 +71075,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "xLn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/turf_decal/stripes/end, /obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/engineering/engine_smes) "xLy" = ( @@ -71790,9 +71775,7 @@ /area/station/maintenance/starboard/aft) "xXc" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/camera/autoname/directional/south{ - dir = 5 - }, +/obj/machinery/camera/autoname/directional/south, /obj/machinery/duct, /turf/open/floor/carpet/orange, /area/station/security/prison/safe) @@ -72074,7 +72057,6 @@ /area/station/medical/medbay/central) "ybm" = ( /obj/machinery/airalarm/directional/south, -/obj/machinery/light/small/directional/east, /turf/open/floor/wood, /area/station/security/prison/rec) "ybw" = ( @@ -76240,7 +76222,7 @@ ksa ksa ksa ksa -sQS +ksa ksa ksa ksa @@ -76754,7 +76736,7 @@ ksa nLE ksa ksa -ksa +sQS ksa ksa ksa @@ -76771,7 +76753,7 @@ ksa ksa ksa nLE -sQS +ksa ksa ksa ksa @@ -77540,7 +77522,7 @@ ksa ksa ksa ksa -ksa +sQS ksa ksa ksa @@ -79089,7 +79071,7 @@ ksa ksa uho oDl -bUq +dNu lcU kfl mpz @@ -82383,7 +82365,7 @@ iGw qnR qnR ndl -qnR +eUO qnR qnR qnR @@ -87368,7 +87350,7 @@ saV ksa uoo ksa -nAS +ksa ksa ksa ksa @@ -87882,7 +87864,7 @@ saV uoo uZR ksa -ksa +nAS ksa ksa ksa @@ -88585,7 +88567,7 @@ juc kgn kgn nJa -vom +tJE pEY gtA wuS @@ -92025,17 +92007,17 @@ ksa ksa ksa ksa +uoo ksa ksa ksa ksa +uoo ksa ksa ksa ksa -ksa -ksa -ksa +uoo ksa ksa ksa @@ -92279,23 +92261,23 @@ ksa ksa ksa ksa -ksa -ksa -ksa -uoo -ksa -ksa -ksa -ksa -uoo -ksa -ksa -ksa -ksa -uoo -ksa -ksa -ksa +fdt +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +fdt ksa ksa ksa @@ -92536,23 +92518,23 @@ ksa ksa ksa ksa -fdt -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -fdt +uoo +ksa +ksa +uoo +ksa +ksa +ksa +ksa +uoo +ksa +ksa +ksa +ksa +uoo +ksa +ksa +uoo ksa ksa ksa @@ -92785,28 +92767,28 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa uoo ksa -ksa uoo ksa +uoo ksa ksa ksa uoo ksa ksa -ksa -ksa -uoo +fOA +fOA +fOA +fOA +fOA +fOA +fOA +fOA +fOA +fOA +fOA ksa ksa uoo @@ -93041,35 +93023,35 @@ ksa ksa ksa ksa -ksa -uoo -ksa -uoo -ksa -uoo -ksa -ksa -ksa +fdt +niB +niB +niB +niB +niB +niB +fdt uoo -ksa -ksa -fOA -fOA -fOA -fOA -fOA -fOA +fdt fOA fOA fOA +xpD +xpD +xpD +xpD +mmy +xpD +xpD +xpD +xpD fOA fOA -ksa -ksa uoo -ksa -ksa -ksa +niB +uoo +uoo +fdt ksa ksa ksa @@ -93298,35 +93280,35 @@ ksa ksa ksa ksa -fdt -niB -niB -niB -niB -niB -niB -fdt +ksa +uoo +ksa +uoo +ksa +uoo +ksa +ksa +ksa uoo -fdt -fOA -fOA -fOA xpD xpD xpD xpD -mmy +aHT +aHT +aHT +aHT +aHT +aHT +aHT xpD xpD xpD xpD -fOA -fOA uoo +ksa +ksa niB -uoo -uoo -fdt ksa ksa ksa @@ -93451,7 +93433,7 @@ vtP xXP poG tDO -ujY +bUq xlo xlo niA @@ -93552,35 +93534,35 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa uoo -ksa uoo -ksa uoo -ksa -ksa -ksa uoo -xpD -xpD +fOA +fOA +fOA +fOA +fOA +fOA +uoo +uoo +uoo xpD xpD aHT aHT aHT +xpD +xpD +lwj +xpD +xpD aHT aHT aHT -aHT -xpD -xpD xpD xpD -uoo +fOA ksa ksa niB @@ -93810,38 +93792,38 @@ ksa ksa ksa uoo -uoo -uoo -uoo -fOA -fOA -fOA -fOA -fOA +ksa +ksa +ksa fOA -uoo -uoo -uoo -xpD -xpD +eTq +jVU +lwj +aHT +aHT +aHT +aHT +aHT aHT aHT aHT xpD +qEw +xpD xpD lwj xpD xpD +qEw +xpD aHT aHT -aHT -xpD xpD fOA -ksa -ksa +fOA +uoo niB -ksa +uoo ksa ksa ksa @@ -94039,17 +94021,17 @@ vIQ tzr tsh wEB -hcx -hcx xba -fyZ -jdA -mVT +xba +xba vcG -ksa -ksa -ksa -ksa +qHa +vcG +vcG +cHh +cHh +igm +igm ksa ksa ksa @@ -94071,34 +94053,34 @@ ksa ksa ksa fOA -eTq -jVU -lwj -aHT -aHT -aHT -aHT -aHT -aHT +rHT +xpD +xpD aHT +uoo +uoo +uoo +xpD +xpD aHT xpD -qEw xpD +wnr xpD -lwj +tdR +lMK +tdR xpD +wnr xpD -qEw xpD aHT -aHT +xpD xpD fOA -fOA -uoo +ksa niB -uoo +ksa ksa ksa ksa @@ -94297,16 +94279,16 @@ hBG vIQ xba xba -xba -xba -vcG -btH -vcG -vcG -cHh +gct +eKr +bsK +tGq +jFP +rEf +hjP cHh -ksa -ksa +rcy +igm ksa ksa ksa @@ -94328,29 +94310,29 @@ ksa ksa ksa fOA -rHT +cLY xpD xpD aHT uoo -uoo -uoo -xpD +ksa +ksa xpD aHT +aHT +qEw +cVu +oEK xpD +itV +cuo +sHw xpD -wnr -xpD -tdR -lMK -tdR -xpD -wnr -xpD -xpD +oEK +cVu +qEw +aHT aHT -xpD xpD fOA ksa @@ -94554,14 +94536,21 @@ nwz nwz fvk kKw -gct -eKr -hGH -tGq -jFP -rEf -hjP +cjI +oPA +oPA +kZD +oPA +etg +ugC cHh +cHh +cHh +igm +igm +cHh +iCE +rxc ksa ksa ksa @@ -94571,42 +94560,35 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +fdt +fdt +noh +fdt +fdt uoo -ksa -ksa -ksa fOA -cLY +aHT +aHT +aHT +aHT xpD xpD -aHT uoo -ksa -ksa xpD aHT -aHT -qEw -cVu -oEK xpD -itV -cuo -sHw xpD -oEK -cVu -qEw -aHT +xpD +xpD +ald +xpD +uoo +xpD +ald +xpD +xpD +xpD +xpD aHT xpD fOA @@ -94811,21 +94793,21 @@ nwz hHs xba xba -cjI -oPA +fGD oPA +bff kZD +oAT oPA -etg -ugC -cHh -cHh -cHh +dgz igm +pht igm -cHh -iCE -rxc +ksa +ksa +ksa +ksa +ksa ksa ksa ksa @@ -94836,32 +94818,32 @@ ksa ksa ksa fdt -fdt -noh -fdt -fdt -uoo -fOA -aHT -aHT -aHT -aHT -xpD -xpD +ksa uoo +ksa +ksa +ksa xpD aHT +uwr +auf +cIL +nLK xpD +ksa xpD +aHT xpD xpD -ald +qEw +itV xpD uoo +uoo +uoo xpD -ald -xpD -xpD +sHw +qEw xpD xpD aHT @@ -95068,22 +95050,21 @@ yhg wEB wEB xba -fGD +swJ +cMy +aFt +gRr oPA -bff -kZD -oAT oPA -dgz -igm -pht -igm -ksa -ksa -ksa +oEN +kTz +kUm +gEQ +gMb ksa ksa ksa +koF ksa ksa ksa @@ -95092,41 +95073,42 @@ ksa ksa ksa ksa -fdt ksa +noh uoo -ksa -ksa -ksa -xpD +lwj +lwj +lwj +lwj +lwj aHT -uwr -auf -cIL -nLK +qgR +gAk +dfL +quQ xpD -ksa +uoo xpD aHT -xpD -xpD -qEw -itV -xpD +lwj +lwj +iDA +cuo uoo uoo +eZM uoo -xpD -sHw -qEw -xpD -xpD +uoo +cuo +iDA +lwj +lwj aHT -xpD +mOO fOA -ksa +uoo niB -ksa +uoo ksa ksa ksa @@ -95319,27 +95301,25 @@ nwz nwz tuu wEB -thf +vrf kPv nwz hxe cUr xba -swJ -cMy -aFt -gRr +rlK +xgs oPA oPA -oEN -kTz -kUm -gEQ -gMb +oPA +oPA +jpU +igm +cAy +igm ksa ksa ksa -koF ksa ksa ksa @@ -95349,41 +95329,43 @@ ksa ksa ksa ksa -noh -uoo -lwj -lwj -lwj -lwj +ksa +ksa +fdt +ksa lwj +ksa +ksa +ksa +xpD aHT -qgR -gAk -dfL -quQ +cxK +aFL +mMt +cOJ xpD -uoo +ksa xpD aHT -lwj -lwj -iDA -cuo -uoo +xpD +xpD +qEw +sHw +xpD uoo -eZM uoo uoo -cuo -iDA -lwj -lwj +xpD +itV +qEw +xpD +xpD aHT -mOO +xpD fOA -uoo +ksa niB -uoo +ksa ksa ksa ksa @@ -95579,24 +95561,24 @@ ulW sLl lmm cVw -itL lmm +itL xsi -rlK -xgs -oPA -oPA -oPA -oPA -jpU +vHT +iKJ +oLh +oLh +oLh +oLh +fRr +cHh +cHh +cHh igm -cAy igm -ksa -ksa -ksa -ksa -ksa +cHh +iCE +rxc ksa ksa ksa @@ -95609,30 +95591,30 @@ ksa fdt ksa lwj -ksa -ksa -ksa -xpD +uoo +uoo +uoo +fOA +aHT +aHT +aHT aHT -cxK -aFL -mMt -cOJ xpD -ksa +xpD +uoo xpD aHT xpD xpD -qEw -sHw xpD -uoo -uoo +xpD +ald +xpD uoo xpD -itV -qEw +ald +xpD +xpD xpD xpD aHT @@ -95831,29 +95813,29 @@ aZB wEB wEB wRe -nwz +cuU wEB urJ -nwz -nwz -nwz +mVT +cuU +mih kHk xba -vHT -iKJ -oLh -oLh -oLh -oLh -fRr -cHh -cHh +aTB +iQE +tZH +pan +mcG +lAU +eWs cHh +rcy igm -igm -cHh -iCE -rxc +ksa +ksa +ksa +ksa +ksa ksa ksa ksa @@ -95866,32 +95848,32 @@ ksa fdt ksa lwj -uoo -uoo -uoo +ksa +ksa +ksa fOA -aHT -aHT -aHT -aHT -xpD +apJ xpD -uoo xpD aHT -xpD -xpD -xpD -xpD -ald -xpD uoo +ksa +ksa xpD -ald -xpD -xpD +aHT +aHT +qEw +cVu +oEK xpD +sHw +cuo +itV xpD +oEK +cVu +qEw +aHT aHT xpD fOA @@ -96088,69 +96070,69 @@ nwz ekU wEB wRe -cuU -wEB -okg -okg -cuU -mcG -orM xba -aTB -iQE -tZH -aYs -rDD -lAU -eWs +xba +xba +xba +xba +xba +xba +xba +iya +liN +iya cHh -rcy cHh -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +sZY +cHh +cHh +igm +igm +uoo +uoo +uoo +uoo fdt -ksa +fdt +fdt +fdt +fdt +fdt +fdt +fdt +fdt +fdt +fdt +uoo lwj ksa ksa ksa fOA -apJ +rHT xpD xpD aHT uoo -ksa -ksa +uoo +uoo +xpD xpD aHT -aHT -qEw -cVu -oEK xpD -sHw -cuo -itV xpD -oEK -cVu -qEw -aHT +wGD +xpD +tdR +lMK +tdR +xpD +wGD +xpD +xpD aHT xpD +xpD fOA ksa niB @@ -96346,72 +96328,72 @@ dwB wEB wRe xba -xba -xba -xba -xba -xba -xba -xba -iya -liN -iya -cHh -cHh -sZY -sZY -cHh -cHh -cHh +djD +djD +mdZ +jhE +jhE +jhE +fxk +tHx +sNp +aoL +fxk +rjW +rjW +miM +fxk +wIO +ksa +ksa uoo +ksa +ksa +ksa uoo +ksa uoo +ksa +ksa +ksa uoo -fdt -fdt -fdt -fdt -fdt -fdt -fdt -fdt -fdt -fdt -fdt +ksa uoo +ksa +ksa lwj ksa ksa ksa fOA -rHT -xpD -xpD +cnu +jVU +lwj +aHT +aHT +aHT +aHT +aHT +aHT aHT -uoo -uoo -uoo -xpD -xpD aHT xpD +qEw xpD -wGD xpD -tdR -lMK -tdR +lwj xpD -wGD xpD +qEw xpD aHT -xpD +aHT xpD fOA -ksa +fOA +uoo niB -ksa +uoo ksa ksa ksa @@ -96603,72 +96585,72 @@ jgH wEB wRe xba +rTF +djD djD -aNz -mdZ -rFn jhE jhE +aNz fxk -tHx -sNp -aoL -fxk -qHa -rjW -rjW -miM -fxk -wIO -ksa +gRf +adw +lfo +vJc +tSE +rDD +tSE +huJ +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj +lwj uoo -ksa -ksa -ksa uoo -ksa uoo -ksa -ksa -ksa +fOA +fOA +fOA +fOA +fOA +fOA uoo -ksa uoo -ksa -ksa -lwj -ksa -ksa -ksa -fOA -cnu -jVU -lwj -aHT -aHT -aHT -aHT -aHT +uoo +xpD +xpD aHT aHT aHT xpD -qEw -xpD xpD lwj xpD xpD -qEw -xpD +aHT aHT aHT xpD +xpD fOA -fOA -uoo +ksa +ksa niB -uoo +ksa ksa ksa ksa @@ -96860,68 +96842,68 @@ xba xba auG xba -djD -djD -djD +rFn +rFn +rFn +rFn +gDq lkR -jhE -jhE fxk -gRf +bGX adw -lfo -vJc -tSE -tSE -tSE -tSE -huJ -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj -lwj +ihh +fxk +rjW +rjW +rjW +fxk +iCE +ksa +ksa uoo +ksa +ksa +ksa +ksa uoo +ksa +ksa +aVH +ksa +ksa uoo -fOA -fOA -fOA -fOA -fOA -fOA +ksa +ksa +ksa +aVH +ksa +ksa +ksa uoo +ksa uoo +ksa +uoo +ksa +ksa +ksa uoo xpD xpD +xpD +xpD +aHT aHT aHT aHT -xpD -xpD -lwj -xpD -xpD aHT aHT aHT xpD xpD -fOA +xpD +xpD +uoo ksa ksa niB @@ -97121,8 +97103,8 @@ dbG btl btl rFn -jhE -jhE +rFn +rFn fxk uQQ adw @@ -97130,58 +97112,58 @@ hDv fxk fxk mpo -mpo fxk fxk -iCE -ksa -uoo -ksa ksa ksa ksa uoo ksa ksa -aVH ksa ksa uoo ksa ksa -ksa aVH ksa ksa -ksa uoo ksa -uoo ksa -uoo ksa +aVH ksa ksa +fdt +niB +niB +niB +niB +niB +niB +fdt uoo +fdt +fOA +fOA +fOA xpD xpD xpD xpD -aHT -aHT -aHT -aHT -aHT -aHT -aHT +qpg xpD xpD xpD xpD +fOA +fOA uoo -ksa -ksa niB +uoo +uoo +fdt ksa ksa ksa @@ -97246,7 +97228,7 @@ xOf wHt sdP tvc -cGM +sdP fme vhu dqx @@ -97410,35 +97392,35 @@ ksa ksa ksa vub -fdt -niB -niB -niB -niB -niB -niB -fdt +ksa uoo -fdt +ksa +uoo +ksa +uoo +ksa +ksa +ksa +uoo +ksa +ksa fOA fOA fOA -xpD -xpD -xpD -xpD -qpg -xpD -xpD -xpD -xpD fOA fOA +fOA +fOA +fOA +fOA +fOA +fOA +ksa +ksa uoo -niB -uoo -uoo -fdt +ksa +ksa +ksa ksa ksa ksa @@ -97631,12 +97613,12 @@ uEU xba afJ xba -kVD +hGH jvA -pan -uAg -mwn +rFn +rFn mwn +cGM fxk mUZ adw @@ -97668,28 +97650,28 @@ ksa ksa ksa ksa -uoo +ksa +ksa +ksa +ksa +ksa +ksa +ksa ksa uoo ksa +ksa uoo ksa ksa ksa +ksa uoo ksa ksa -fOA -fOA -fOA -fOA -fOA -fOA -fOA -fOA -fOA -fOA -fOA +ksa +ksa +uoo ksa ksa uoo @@ -97888,11 +97870,11 @@ lYr xba afJ xba -gDq -rFn +kVD rFn rFn -mih +uAg +lOo lOo fxk nZg @@ -97933,29 +97915,44 @@ ksa ksa ksa ksa -uoo +fdt +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +niB +fdt +ksa ksa ksa -uoo ksa ksa ksa ksa -uoo ksa ksa ksa ksa -uoo ksa ksa -uoo ksa ksa ksa ksa ksa ksa +"} +(99,1,1) = {" ksa ksa ksa @@ -97969,8 +97966,177 @@ ksa ksa ksa ksa -"} -(99,1,1) = {" +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +uoo +uoo +uoo +fEP +uoo +fEP +uoo +ksa +fEP +uoo +xta +wGs +oMi +cFf +wjv +urm +epW +unQ +jhR +jhR +unQ +gRM +tvc +tvc +tvc +hrT +jou +jou +jou +jou +jou +lMT +lMT +lMT +lMT +ptH +lMT +wqY +lMT +wGh +qQg +qQg +opK +qQg +qQg +wGh +nUQ +hwr +jcf +xBB +pCA +aHm +scL +pCA +tcY +fyc +fsm +xnG +yfL +ksp +xvF +dzU +ium +mUT +qOl +xxI +dIW +jic +uYJ +ePQ +xIo +ecF +fPN +aXq +kHw +bZl +ciW +fPN +dwJ +nZL +rUf +hkn +rDG +gJU +oCA +srQ +wvg +xqW +xuu +cvS +qXN +gbD +hjB +cjW +tnt +fEX +fEX +tgq +nvj +wJK +kew +kew +kew +kew +kew +kew +kew +siE +hxY +rxT +hxY +siE +nPC +qXl +qXl +qXl +qXl +wsc +eNs +cWX +bzW +dvS +eNs +ksa +nxf +nxf +gcD +nxf +nxf +ksa +xXP +ksa +saV +gAH +nwz +nwz +nwz +xYn +xba +uYf +ujm +gPV +uFw +uFw +rSc +jBv +sWq +prs +xba +afJ +xba +fxk +pLU +pLU +fxk +fxk +fxk +fxk +lJD +qRc +ihh ksa ksa ksa @@ -97994,176 +98160,6 @@ ksa ksa ksa ksa -uoo -uoo -uoo -fEP -uoo -fEP -uoo -ksa -fEP -uoo -xta -wGs -oMi -cFf -wjv -urm -epW -unQ -jhR -jhR -unQ -gRM -tvc -tvc -tvc -hrT -jou -jou -jou -jou -jou -lMT -lMT -lMT -lMT -ptH -lMT -wqY -lMT -wGh -qQg -qQg -opK -qQg -qQg -wGh -nUQ -hwr -jcf -xBB -pCA -aHm -scL -pCA -tcY -fyc -fsm -xnG -yfL -ksp -xvF -dzU -ium -mUT -qOl -xxI -dIW -jic -uYJ -ePQ -xIo -ecF -fPN -aXq -kHw -bZl -ciW -fPN -dwJ -nZL -rUf -hkn -rDG -gJU -oCA -srQ -wvg -xqW -xuu -cvS -qXN -gbD -hjB -cjW -tnt -fEX -fEX -tgq -nvj -wJK -kew -kew -kew -kew -kew -kew -kew -siE -hxY -rxT -hxY -siE -nPC -qXl -qXl -qXl -qXl -wsc -eNs -cWX -bzW -dvS -eNs -ksa -nxf -nxf -gcD -nxf -nxf -ksa -xXP -ksa -saV -gAH -nwz -nwz -nwz -xYn -xba -uYf -ujm -gPV -uFw -uFw -rSc -jBv -sWq -prs -xba -afJ -xba -fxk -pLU -pLU -fxk -fxk -fxk -fxk -lJD -qRc -ihh -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa ksa ksa ksa @@ -98179,34 +98175,20 @@ ksa ksa ksa ksa +uoo ksa ksa ksa ksa +uoo ksa ksa ksa ksa +uoo ksa ksa ksa -fdt -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -niB -fdt ksa ksa ksa @@ -98450,17 +98432,17 @@ ksa ksa ksa ksa -uoo ksa ksa ksa ksa -uoo ksa ksa ksa ksa -uoo +ksa +ksa +ksa ksa ksa ksa @@ -99086,7 +99068,7 @@ xvF dzU ium mUT -xpb +uan xxI wpo guX @@ -99862,7 +99844,7 @@ vvy lmX wGT xft -eUO +rdk rdk kxi nzX @@ -100118,7 +100100,7 @@ xpb vvy lmX asE -eUO +rdk mHH xle tFs @@ -100375,7 +100357,7 @@ xpb vvy hjG fUX -eUO +rdk tbg sDl tNO @@ -100631,8 +100613,8 @@ blR xpb lBZ fJb -eUO -eUO +rdk +rdk qid qiC iOl @@ -101408,7 +101390,7 @@ jFF jFF ebp rpB -jFF +fyZ jFF jFF bhj @@ -101922,7 +101904,7 @@ jUa gXO xNW xNW -fLA +xNW muG dHx qou @@ -102428,7 +102410,7 @@ xqM bTq mUT xpb -xdV +pPM orb ukt kAo @@ -102685,7 +102667,7 @@ poj lFp gZb xpb -pPM +xdV fld aQG lZS @@ -103777,10 +103759,10 @@ shv rRZ iyt gCT -vZS -nbI -cfN -rTF +btH +iGG +iGG +saa mpY ior ior @@ -104034,9 +104016,9 @@ bFj rRZ iGj gCT -gCT -gCT -gCT +vZS +nbI +cfN pHy otD kXf @@ -104047,8 +104029,8 @@ lTv ufs dPP iGG -uxl -iGG +aYs +vom iGG iGG iGG @@ -104290,9 +104272,9 @@ cIP gwS rRZ iyt -paH -ulQ -paH +gCT +gCT +gCT gCT vCq gCT @@ -104306,7 +104288,7 @@ gJq bFK vTs ukW -msH +wWi qnm jMs vFe @@ -104547,9 +104529,9 @@ vhb wlw rRZ iyt -fDD -mnx -fDD +paH +ulQ +paH rRZ fDD lJK @@ -104559,11 +104541,11 @@ xtS jnS iBl mLH -bsK -bsK -cLc tYU -gBL +tYU +tYU +uLI +tYU tYU jaf jaf @@ -104807,7 +104789,7 @@ iyt bqv rPJ rPJ -uaO +rPJ rPJ eRs fDD @@ -104820,7 +104802,7 @@ kYW gmC lLJ rMN -cGB +gBL gwW jaf qOG @@ -105075,9 +105057,9 @@ gvo mLH olH wLK -wLK pKQ cGB +uaO opP jaf elU @@ -105332,10 +105314,10 @@ uYB mLH cTG uyh -uCv pBp cGB cGB +cGB xlW fop ioi @@ -105590,7 +105572,7 @@ gCT bBQ wLK wLK -uLI +wLK cGB iye jaf @@ -105603,7 +105585,7 @@ gkZ vQE sSP pfo -wWi +kvL rhD pfo pfo @@ -115817,7 +115799,7 @@ iLB jxy kWT grB -iLB +cLc dWS dWS dWS @@ -116182,7 +116164,7 @@ ksa ksa ksa ksa -ksa +sQS ksa ksa ksa @@ -120042,253 +120024,245 @@ ksa ksa ksa ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -"} -(185,1,1) = {" -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -fEP -fEP -fEP -ksa -uoo -ksa -ksa -uoo -ksa -ksa -uoo -ksa -ksa -uoo -ksa -fEP -fEP -fEP -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -fEP -xXP -xWh -iRy -ruh -iLB -jxy -vMC -daY -nZa -gRa -daY -jxy -wpZ -iLB -jyf -gOs -tKX -iLB -oed -jxy -ffx -iLB -sKY -jxy -iqQ -pgh -pgh -pgh -pgh -pgh -pgh -vKu -lIF -lIF -lIF -lIF -lIF -lIF -lIF -flM -oOy -wxL -xFr -qYz -fEJ -cJi -ayi -uaC -ayi -ayi -nMn -ccp -jJz -bQk -cdl -gji -bxx -rhE -nmY -nBE -dbl -mhc -grF -nBE -byX -lRi -grF -nBE -fsH -lPf -nep -woy -lPf -lnu -usg -nep -hpY -hpY -mhc -wsv -mhc -wMo -mBa -lrm -vpn -nBE -sAY -mhc -mhc -nBE -nBE -xSv -nBE -nBE -kIt -nBE -nBE -pyZ -nBE -nBE -jwC -nep -xcO -nBE -xXP -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa -ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +"} +(185,1,1) = {" +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +fEP +fEP +fEP +ksa +uoo +ksa +ksa +uoo +ksa +ksa +uoo +ksa +ksa +uoo +ksa +fEP +fEP +fEP +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +fEP +xXP +xWh +iRy +ruh +iLB +jxy +vMC +daY +nZa +gRa +daY +jxy +wpZ +iLB +jyf +gOs +tKX +iLB +oed +jxy +ffx +iLB +sKY +jxy +iqQ +pgh +pgh +pgh +pgh +pgh +pgh +vKu +lIF +lIF +lIF +lIF +lIF +lIF +lIF +flM +oOy +wxL +xFr +qYz +fEJ +cJi +ayi +uaC +ayi +ayi +nMn +ccp +jJz +bQk +cdl +gji +bxx +rhE +nmY +nBE +dbl +mhc +grF +nBE +byX +lRi +grF +nBE +fsH +lPf +nep +woy +lPf +lnu +usg +nep +hpY +hpY +mhc +wsv +mhc +wMo +mBa +lrm +vpn +nBE +sAY +mhc +mhc +nBE +nBE +xSv +nBE +nBE +kIt +nBE +nBE +pyZ +nBE +nBE +jwC +nep +xcO +nBE +xXP +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa sQS ksa ksa @@ -120328,6 +120302,14 @@ ksa ksa ksa ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa +ksa "} (186,1,1) = {" ksa @@ -123117,7 +123099,7 @@ muB xXP noh ksa -ksa +sQS ksa ksa ksa @@ -123893,7 +123875,7 @@ ksa ksa ksa ksa -sQS +ksa ksa ksa ksa @@ -125572,7 +125554,7 @@ ksa ksa ksa ksa -ksa +nAS ksa ksa ksa @@ -125928,7 +125910,7 @@ ksa ksa ksa ksa -ksa +sQS ksa ksa ksa @@ -126185,7 +126167,7 @@ ksa ksa ksa ksa -sQS +ksa ksa ksa ksa @@ -126453,7 +126435,7 @@ ksa ksa ksa ksa -sQS +ksa ksa ksa ksa @@ -128144,7 +128126,7 @@ ksa ksa ksa ksa -nAS +ksa ksa ksa ksa diff --git a/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm b/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm index 31f0358d300b40..b661e83685951c 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/empty.dmm @@ -3,7 +3,7 @@ /turf/open/floor/iron, /area/station/engineering/main) "b" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/main) "c" = ( @@ -174,7 +174,7 @@ R B B B -B +R R f A diff --git a/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm b/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm index fa4326f24246a7..cc3f8e6dcf9785 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm @@ -20,9 +20,8 @@ /area/station/engineering/main) "cp" = ( /obj/machinery/camera/emp_proof/directional/north{ - c_tag = "Engineering - Station Particle Accelerator, Northeast"; - name = "engineering camera"; - dir = 9 + c_tag = "Engineering - Station Particle Accelerator, Northwest"; + name = "engineering camera" }, /turf/open/floor/plating/airless, /area/space/nearstation) @@ -815,8 +814,7 @@ "ZW" = ( /obj/machinery/camera/emp_proof/directional/south{ name = "engineering camera"; - c_tag = "Engineering - Station Particle Accelerator, Southeast"; - dir = 5 + c_tag = "Engineering - Station Particle Accelerator, Southwest" }, /turf/open/floor/plating/airless, /area/space/nearstation) @@ -826,7 +824,7 @@ PG oN oN oN -oN +PG PG GW GW diff --git a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm index 6ce7de59352a84..44b1f67295cd51 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm @@ -569,9 +569,8 @@ /area/station/engineering/supermatter/room) "oB" = ( /obj/machinery/camera/directional/north{ - c_tag = "Engineering - Engine Room"; - name = "engineering camera"; - dir = 9 + c_tag = "Engineering - Engine Room, Northwest"; + name = "engineering camera" }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -1923,7 +1922,7 @@ /area/station/engineering/supermatter/room) "UW" = ( /obj/machinery/camera/directional/north{ - c_tag = "Engineering - Engine Room"; + c_tag = "Engineering - Engine Room, Northeast"; name = "engineering camera" }, /obj/effect/turf_decal/stripes/line{ @@ -2192,7 +2191,7 @@ TQ Bc Bc Bc -Bc +TQ TQ tU tU diff --git a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm index c38731826107ba..c55e4bffb98398 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm @@ -154,10 +154,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"eo" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/supermatter/room) "ez" = ( /obj/structure/reflector/box/anchored{ dir = 1 @@ -198,8 +194,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /obj/machinery/camera/directional/south{ c_tag = "Engineering Supermatter Fore"; - network = list("ss13","engine"); - pixel_x = 23 + network = list("ss13","engine") }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -696,8 +691,7 @@ "ze" = ( /obj/machinery/camera/directional/north{ c_tag = "Engineering Supermatter Chamber"; - network = list("engine"); - dir = 9 + network = list("engine") }, /turf/open/floor/engine, /area/station/engineering/supermatter) @@ -1557,7 +1551,7 @@ GP oO oO oO -oO +GP GP xP hE @@ -2160,7 +2154,7 @@ ik ik Vr qm -eo +qm BL Kd Kl diff --git a/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm index 738ce35f441f04..83fc13fa9abe29 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm @@ -1434,7 +1434,7 @@ Wg cp cp cp -cp +Wg Wg ml ml From b41aabcf4735623b5238162b606fdd5c89ad9342 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Sun, 23 Jun 2024 18:42:21 -0500 Subject: [PATCH 10/27] Fix 9 Removes access requirements from the south facing window door at the wardens desk. --- _maps/map_files/BoxStation/BoxStation.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 3a84aa8f8d388c..75c141b49f4f3c 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -7356,8 +7356,7 @@ /obj/structure/table/reinforced, /obj/structure/cable, /obj/machinery/door/window/left/directional/south{ - name = "Reception Desk"; - req_access = list("security") + name = "Reception Desk" }, /obj/machinery/door/window/brigdoor/left/directional/north{ name = "Reception Desk"; From ec4cfee5f8a9d9d559ef70f44fa0516012f839cb Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Mon, 24 Jun 2024 19:00:50 -0500 Subject: [PATCH 11/27] Fix 10 Adds more paco ammo to the armory. Changes a majority of maintenance tables to be non-randomized, this should mostly get rid of the weird table smoothing issues. Fixes conflicts from PR 2262. Fixes the ai satellite power cables being disconnected. Moves the round start corpses. Replaces all of the chairs in the prison with plastic ones. Restores the main smes area to having 4 units instead of 6. --- _maps/map_files/BoxStation/BoxStation.dmm | 1149 +++++++++-------- .../RandomEngines/BoxStation/sm_teg.dmm | 2 +- .../RandomEngines/BoxStation/supermatter.dmm | 5 +- 3 files changed, 609 insertions(+), 547 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 75c141b49f4f3c..6d2cec582f6be0 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -151,7 +151,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "acW" = ( -/obj/structure/chair/stool/directional/south, +/obj/structure/chair/plastic, /turf/open/floor/iron/dark, /area/station/security/prison/visit) "acX" = ( @@ -271,7 +271,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/barricade/wooden, /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) "afl" = ( @@ -831,6 +830,14 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron/white, /area/station/science/research) +"apY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "aqa" = ( /obj/structure/hoop{ dir = 8 @@ -1282,7 +1289,9 @@ /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) "awX" = ( -/obj/structure/chair/stool/directional/west, +/obj/structure/chair/plastic{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/security/prison) "axc" = ( @@ -1308,8 +1317,6 @@ "axx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/decal/cleanable/blood/splatter, -/obj/item/restraints/handcuffs/cable/zipties/used, /turf/open/floor/iron/dark, /area/station/commons/vacant_room/commissary) "axF" = ( @@ -1636,7 +1643,7 @@ "aDS" = ( /obj/machinery/washing_machine, /obj/machinery/light/small/directional/east, -/obj/effect/decal/cleanable/blood/gibs/old, +/obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "aEc" = ( @@ -2283,7 +2290,7 @@ /area/station/hallway/secondary/entry) "aPy" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/structure/chair_maintenance{ +/obj/structure/chair{ dir = 4 }, /turf/open/floor/iron/cafeteria, @@ -2317,37 +2324,19 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/structure/closet/crate/secure/gear{ - req_access = list("brig"); - name = "Blue Shift Uniform Crate" - }, -/obj/item/clothing/under/rank/security/officer/blueshirt, -/obj/item/clothing/under/rank/security/officer/blueshirt, -/obj/item/clothing/under/rank/security/officer/blueshirt, -/obj/item/clothing/under/rank/security/officer/blueshirt, -/obj/item/clothing/under/rank/security/officer/blueshirt, -/obj/item/clothing/suit/armor/vest/blueshirt, -/obj/item/clothing/suit/armor/vest/blueshirt, -/obj/item/clothing/suit/armor/vest/blueshirt, -/obj/item/clothing/suit/armor/vest/blueshirt, -/obj/item/clothing/suit/armor/vest/blueshirt, -/obj/item/clothing/head/helmet/blueshirt, -/obj/item/clothing/head/helmet/blueshirt, -/obj/item/clothing/head/helmet/blueshirt, -/obj/item/clothing/head/helmet/blueshirt, -/obj/item/clothing/head/helmet/blueshirt, /obj/effect/turf_decal/bot_white{ color = "#1d5cdf" }, +/obj/structure/closet/crate/secure/gear/blueshirt, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "aQC" = ( -/obj/effect/spawner/random/maintenance/three, +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ - dir = 4 + dir = 10 }, /turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/area/station/maintenance/starboard/aft) "aQG" = ( /obj/effect/spawner/structure/window, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2563,7 +2552,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "aTv" = ( -/obj/structure/chair/stool/directional/south, +/obj/structure/chair/plastic, /obj/machinery/flasher/directional/west{ id = "visitation_prisoner_flash" }, @@ -3860,7 +3849,7 @@ /area/station/engineering/atmos/hfr_room) "boP" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/table, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/booze, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) @@ -3946,10 +3935,11 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "bqd" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/decal/cleanable/blood/gibs/old, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/area/station/maintenance/department/cargo) "bqv" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4119,7 +4109,7 @@ /area/station/maintenance/port) "bsX" = ( /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/stack/rods/ten, /obj/item/assembly/prox_sensor, /turf/open/floor/plating, @@ -4220,11 +4210,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/line, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, +/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "buR" = ( @@ -4298,7 +4284,7 @@ dir = 6 }, /obj/structure/reagent_dispensers/wall/peppertank/directional/south, -/obj/structure/closet/secure_closet/security/science, +/obj/structure/closet/secure_closet/security/science/blueshirt, /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) @@ -4751,7 +4737,7 @@ }, /obj/machinery/airalarm/directional/west, /obj/structure/table, -/obj/item/storage/box/donkpockets/donkpocketberry, +/obj/effect/spawner/random/food_or_drink/donkpockets, /turf/open/floor/iron/dark, /area/station/science/breakroom) "bDJ" = ( @@ -4809,7 +4795,6 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "bFj" = ( -/obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/structure/chair{ dir = 1 @@ -5101,7 +5086,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "bJn" = ( -/obj/structure/chair/wood{ +/obj/structure/chair/plastic{ dir = 1 }, /turf/open/floor/wood, @@ -5171,7 +5156,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "bJW" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/engineering/material_cheap, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -5376,7 +5361,7 @@ /turf/open/floor/wood, /area/station/security/detectives_office) "bNe" = ( -/obj/structure/chair/stool/directional/south, +/obj/structure/chair/plastic, /turf/open/floor/iron/dark, /area/station/security/prison) "bNi" = ( @@ -5430,6 +5415,7 @@ /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) "bOg" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/internals, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen, @@ -5606,8 +5592,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/structure/cable, -/obj/machinery/duct, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "bRx" = ( @@ -5702,7 +5686,7 @@ /area/station/service/chapel/funeral) "bTm" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -5869,6 +5853,7 @@ "bWR" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/flowers_pp/style_random, +/obj/effect/mob_spawn/corpse/human/skeleton, /turf/open/floor/grass, /area/station/command/bridge) "bXc" = ( @@ -6089,6 +6074,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "bZK" = ( @@ -6125,20 +6111,21 @@ /area/station/command/meeting_room) "caj" = ( /obj/effect/turf_decal/trimline/green/filled/line, +/obj/item/storage/box/syringes{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/firealarm/directional/south, /obj/structure/table/reinforced/rglass, /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/gloves/latex, /obj/item/storage/box/beakers, +/obj/item/storage/box/tube, /obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/storage/box/vials{ - pixel_y = 4; - pixel_x = -2 - }, -/obj/machinery/firealarm/directional/south, /obj/item/storage/box/monkeycubes/mousecubes, /obj/item/storage/box/monkeycubes/mousecubes{ pixel_x = 6; @@ -6345,7 +6332,6 @@ "cdE" = ( /obj/machinery/light/small/directional/north, /obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "cdI" = ( @@ -6551,7 +6537,7 @@ /area/station/hallway/primary/starboard) "cgX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) @@ -6708,7 +6694,7 @@ "ciO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/table, -/obj/item/wirecutters, +/obj/effect/spawner/random/engineering/tool, /turf/open/floor/plating, /area/station/maintenance/port/aft) "ciR" = ( @@ -6832,7 +6818,6 @@ /area/station/commons/vacant_room/office) "clf" = ( /obj/effect/decal/cleanable/oil, -/obj/structure/barricade/wooden, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "clg" = ( @@ -7037,7 +7022,7 @@ /area/station/security/processing) "cox" = ( /obj/machinery/airalarm/directional/west, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance/five, /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) @@ -7144,7 +7129,7 @@ /turf/open/floor/iron/dark, /area/station/security/prison/workout) "crI" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/bureaucracy/pen, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -7708,7 +7693,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/duct, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "cDu" = ( @@ -7757,6 +7741,8 @@ /obj/machinery/newscaster/directional/south, /obj/item/clothing/glasses/science, /obj/item/extrapolator, +/obj/item/device/antibody_scanner, +/obj/item/device/antibody_scanner, /turf/open/floor/iron/white, /area/station/medical/virology) "cDF" = ( @@ -7872,7 +7858,7 @@ /area/station/engineering/storage_shared) "cFf" = ( /obj/structure/cable, -/obj/structure/chair/wood, +/obj/structure/chair/plastic, /turf/open/floor/wood, /area/station/security/prison/rec) "cFj" = ( @@ -8459,7 +8445,7 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/security/lockers) "cPI" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/storage/box/matches, /obj/effect/spawner/random/entertainment/cigarette_pack, /turf/open/floor/plating, @@ -9301,12 +9287,10 @@ /turf/open/floor/iron/dark, /area/station/commons/storage/primary) "dbS" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/obj/structure/railing{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, +/obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "dbW" = ( @@ -9748,7 +9732,7 @@ /area/station/maintenance/department/science) "diI" = ( /obj/structure/cable, -/obj/structure/chair/wood{ +/obj/structure/chair/plastic{ dir = 8 }, /turf/open/floor/wood, @@ -10372,7 +10356,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, -/obj/structure/bonfire, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "dsX" = ( @@ -10516,7 +10500,7 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "dwB" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/assembly/igniter, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -10584,6 +10568,7 @@ /obj/effect/mapping_helpers/airlock/welded, /obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/iron/textured, /area/station/maintenance/starboard/aft) "dxP" = ( @@ -10792,13 +10777,9 @@ }, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, -/obj/effect/mapping_helpers/airlock/welded, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 4 - }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "dBA" = ( @@ -11015,7 +10996,7 @@ /turf/open/floor/iron/dark, /area/station/command/meeting_room) "dFp" = ( -/obj/structure/chair/wood{ +/obj/structure/chair/plastic{ dir = 4 }, /turf/open/floor/wood, @@ -11180,10 +11161,19 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) "dIu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/restraints/handcuffs/cable/zipties/used, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Chemistry Factory" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/obj/effect/landmark/navigate_destination/chemfactory, +/obj/machinery/duct, +/turf/open/floor/iron/white/textured, +/area/station/medical/chemistry) "dIE" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/structure/disposalpipe/junction/flip{ @@ -11642,8 +11632,10 @@ /area/station/science/ordnance/storage) "dPU" = ( /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random/structure/crate, /obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/structure/chair_flipped{ + dir = 4 + }, /turf/open/floor/wood, /area/station/maintenance/port/fore) "dQg" = ( @@ -12764,7 +12756,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "ekU" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/assembly/timer, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -13063,7 +13055,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/chair/wood{ +/obj/structure/chair/plastic{ dir = 1 }, /turf/open/floor/wood, @@ -13158,7 +13150,7 @@ /turf/open/floor/eighties/red, /area/station/service/theater) "erQ" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/paper_bin, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -13174,18 +13166,7 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "esk" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Factory" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, -/obj/effect/landmark/navigate_destination/chemfactory, -/obj/machinery/duct, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "esr" = ( @@ -13242,9 +13223,10 @@ /turf/open/floor/iron, /area/station/engineering/storage) "etn" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "etp" = ( @@ -13818,7 +13800,6 @@ "eCJ" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/holopad, /turf/open/floor/iron/large, @@ -14492,6 +14473,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) +"eQk" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "eQm" = ( /obj/effect/turf_decal/box, /obj/structure/disposalpipe/segment, @@ -15117,7 +15103,7 @@ /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) "fbT" = ( -/obj/effect/spawner/random/structure/table_or_rack, +/obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/wood, /area/station/maintenance/starboard/aft) @@ -15258,8 +15244,9 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "fei" = ( -/obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "fep" = ( @@ -15295,7 +15282,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/greenglow, +/obj/effect/spawner/random/trash/mess, /turf/open/floor/iron/dark, /area/station/commons/vacant_room/commissary) "feW" = ( @@ -15855,11 +15842,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"foq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "foE" = ( /obj/machinery/camera/autoname/directional/east, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -16214,9 +16196,9 @@ /turf/closed/wall/r_wall, /area/station/command/heads_quarters/qm) "fvV" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/wirecutters, +/obj/effect/spawner/random/engineering/tool, /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) "fvW" = ( @@ -16508,7 +16490,6 @@ "fBh" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/light/small/directional/east, -/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "fBi" = ( @@ -16904,7 +16885,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "fIV" = ( -/obj/structure/chair/wood, +/obj/structure/chair/plastic, /turf/open/floor/wood, /area/station/security/prison/rec) "fIX" = ( @@ -17401,7 +17382,7 @@ /turf/open/floor/iron, /area/station/engineering/storage) "fRx" = ( -/obj/effect/decal/cleanable/blood/old, +/obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "fRT" = ( @@ -17421,8 +17402,7 @@ /area/station/maintenance/starboard/aft) "fRW" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/mess, -/obj/effect/landmark/blobstart, +/obj/structure/barricade/wooden, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "fSg" = ( @@ -17666,7 +17646,7 @@ /area/station/ai_monitored/turret_protected/ai) "fVU" = ( /obj/machinery/light/small/broken/directional/north, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/stock_parts/manipulator, /obj/item/stock_parts/manipulator, /obj/item/stock_parts/manipulator, @@ -18098,7 +18078,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "gdx" = ( -/obj/machinery/light/small/directional/north, +/obj/machinery/light/small/built/directional/north, /obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -18671,8 +18651,8 @@ network = list("ss13","prison") }, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 +/obj/structure/chair/plastic{ + dir = 1 }, /turf/open/floor/iron/dark/side{ dir = 4 @@ -19215,9 +19195,10 @@ /turf/open/floor/iron/dark, /area/station/security/execution) "gxx" = ( -/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, /turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/area/station/maintenance/department/cargo) "gxH" = ( /turf/closed/wall, /area/station/science/breakroom) @@ -19528,6 +19509,7 @@ /obj/machinery/light_switch/directional/west{ pixel_y = -10 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "gBR" = ( @@ -19609,8 +19591,8 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, -/obj/structure/closet/crate/freezer, /obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, @@ -19822,7 +19804,7 @@ /area/station/maintenance/solars/starboard/aft) "gHc" = ( /obj/machinery/newscaster/directional/west, -/obj/effect/spawner/random/structure/table, +/obj/structure/table/wood, /obj/effect/spawner/random/food_or_drink/snack, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) @@ -19865,6 +19847,11 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) +"gHK" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "gHO" = ( /obj/machinery/shower/directional/north, /obj/effect/landmark/start/hangover, @@ -20055,7 +20042,7 @@ /obj/effect/turf_decal/delivery/red, /obj/machinery/status_display/evac/directional/west, /obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/iron/textured, +/turf/open/floor/iron/large, /area/station/ai_monitored/command/storage/eva) "gJY" = ( /turf/closed/wall, @@ -20821,10 +20808,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/eighties/red, /area/station/service/theater) -"gVo" = ( -/obj/effect/spawner/random/trash/food_packaging, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "gVB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21060,6 +21043,13 @@ /obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/open/floor/iron/dark/textured, /area/station/service/chapel/office) +"gZd" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/engineering/main) "gZw" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -21263,13 +21253,15 @@ /area/station/hallway/secondary/service) "hdl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/structure/chair_flipped{ +/obj/structure/chair{ dir = 4 }, /turf/open/floor/iron/cafeteria, /area/station/maintenance/starboard/aft) "hdm" = ( -/obj/structure/chair/stool/directional/north, +/obj/structure/chair/plastic{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/security/prison) "hdC" = ( @@ -21981,7 +21973,9 @@ /area/station/security/office) "hpB" = ( /obj/structure/cable, -/obj/structure/chair/stool/directional/west, +/obj/structure/chair/plastic{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/security/prison) "hpC" = ( @@ -21998,10 +21992,11 @@ /turf/closed/wall, /area/station/construction) "hpU" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, +/obj/machinery/light/small/directional/north, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/rack, +/obj/effect/spawner/random/engineering/toolbox, +/turf/open/floor/iron, /area/station/maintenance/starboard/aft) "hpW" = ( /obj/structure/sink/directional/west, @@ -22291,13 +22286,11 @@ /turf/open/floor/iron/dark, /area/station/security/brig/entrance) "huH" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/obj/machinery/light/directional/south, -/obj/structure/railing{ - dir = 4 - }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "huJ" = ( @@ -23461,11 +23454,10 @@ /turf/open/floor/iron/dark, /area/station/command/teleporter) "hNJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/mob_spawn/corpse/human/assistant, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/structure/table, +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "hNM" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/effect/turf_decal/plaque{ @@ -23648,7 +23640,7 @@ /area/station/engineering/storage/tech) "hQP" = ( /obj/structure/sign/poster/random/directional/east, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/entertainment/drugs, /obj/effect/spawner/random/entertainment/lighter, /turf/open/floor/iron/showroomfloor, @@ -23681,7 +23673,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "hRA" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -24085,7 +24077,7 @@ /obj/effect/turf_decal/delivery/red, /obj/structure/cable, /obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/iron/textured, +/turf/open/floor/iron/large, /area/station/ai_monitored/command/storage/eva) "iac" = ( /obj/structure/table, @@ -24169,12 +24161,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"icr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/mob_spawn/corpse/human/damaged, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "icu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -24328,7 +24314,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line, -/obj/machinery/station_map/engineering/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) @@ -24840,7 +24826,7 @@ /area/station/hallway/secondary/exit/departure_lounge) "ioq" = ( /obj/machinery/light/small/directional/north, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science) @@ -25987,15 +25973,10 @@ /turf/open/floor/iron/dark/textured, /area/station/service/kitchen) "iFK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 9 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/station/maintenance/starboard/fore) +/obj/effect/spawner/random/maintenance/two, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "iFL" = ( /obj/machinery/requests_console/directional/south{ department = "Bar"; @@ -26157,20 +26138,21 @@ /area/station/hallway/primary/fore) "iIn" = ( /obj/effect/turf_decal/trimline/green/filled/line, +/obj/item/storage/box/syringes{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/newscaster/directional/south, /obj/structure/table/reinforced/rglass, /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/gloves/latex, /obj/item/storage/box/beakers, +/obj/item/storage/box/tube, /obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/storage/box/vials{ - pixel_y = 4; - pixel_x = -2 - }, -/obj/machinery/newscaster/directional/south, /obj/item/storage/box/monkeycubes/mousecubes, /obj/item/storage/box/monkeycubes/mousecubes{ pixel_x = 6; @@ -27207,8 +27189,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/mess, -/turf/open/floor/plating, +/obj/machinery/light/floor, +/turf/open/floor/iron, /area/station/maintenance/starboard/aft) "iZM" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning, @@ -27318,8 +27300,7 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "jbY" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/engineering/material_cheap, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) @@ -27456,18 +27437,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "jet" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, -/obj/effect/mapping_helpers/airlock/welded, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "jeu" = ( /obj/structure/sign/warning/radiation/directional/east, /obj/effect/decal/cleanable/dirt, @@ -28259,7 +28231,7 @@ /area/station/engineering/atmos/storage) "juU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/structure/chair_maintenance{ +/obj/structure/chair{ dir = 8 }, /turf/open/floor/iron/cafeteria, @@ -29457,7 +29429,7 @@ /area/station/commons/vacant_room/office) "jOi" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/chair_maintenance{ +/obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/plating, @@ -30645,8 +30617,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/decal/cleanable/blood/tracks, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/mess, /turf/open/floor/wood, /area/station/maintenance/starboard/fore) "kjD" = ( @@ -31375,6 +31347,7 @@ }, /obj/effect/turf_decal/box/corners, /obj/structure/closet/secure_closet/chemical, +/obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/medical/chemistry) "kwV" = ( @@ -31636,6 +31609,10 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"kBv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/textured, +/area/station/medical/chemistry) "kBA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -31934,6 +31911,11 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/cargo/miningoffice) +"kGX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "kHg" = ( /obj/effect/spawner/random/trash/garbage, /turf/open/floor/wood, @@ -31949,7 +31931,7 @@ "kHk" = ( /obj/structure/sign/warning/secure_area/directional/south, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/engineering/toolbox, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -31984,7 +31966,7 @@ /obj/machinery/light_switch/directional/south{ pixel_x = -8 }, -/obj/structure/chair/wood{ +/obj/structure/chair/plastic{ dir = 8 }, /turf/open/floor/wood, @@ -32734,11 +32716,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/landmark/start/assistant, +/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "kUa" = ( @@ -33278,6 +33256,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/maintenance/department/science) +"lcE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "lcI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33574,11 +33559,11 @@ /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) "lhd" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, +/obj/structure/table, +/obj/effect/spawner/random/clothing/gloves, +/obj/effect/spawner/random/clothing/gloves, /turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/area/station/maintenance/department/medical) "lhg" = ( /obj/machinery/duct, /turf/open/floor/iron/kitchen, @@ -33685,7 +33670,7 @@ /obj/machinery/light/directional/east, /obj/structure/sign/warning/electric_shock/directional/east, /obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/iron/textured, +/turf/open/floor/iron/large, /area/station/ai_monitored/command/storage/eva) "liD" = ( /obj/effect/turf_decal/stripes/line{ @@ -33972,7 +33957,7 @@ /turf/open/floor/iron/recharge_floor, /area/station/cargo/warehouse) "loe" = ( -/obj/structure/table/glass, +/obj/structure/table, /obj/item/hemostat, /obj/item/stock_parts/manipulator, /obj/effect/spawner/random/trash/garbage, @@ -34193,12 +34178,9 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) "lsx" = ( -/obj/effect/turf_decal/box, /obj/machinery/light/small/directional/west, -/obj/structure/closet/crate, -/obj/item/stack/license_plates/empty/fifty, -/obj/item/stack/license_plates/empty/fifty, -/obj/item/stack/license_plates/empty/fifty, +/obj/effect/turf_decal/bot, +/obj/machinery/plate_press, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -34669,6 +34651,11 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"lzy" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "lzT" = ( /turf/open/floor/plating, /area/station/maintenance/department/electrical) @@ -34829,8 +34816,8 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "lCo" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/structure/chair/plastic{ + dir = 1 }, /turf/open/floor/iron/dark/side{ dir = 8 @@ -35462,7 +35449,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, -/obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "lLK" = ( @@ -35691,7 +35677,7 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "lQw" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron, /area/station/maintenance/disposal) @@ -35709,7 +35695,6 @@ dir = 8; name = "Plasma Outlet Pump" }, -/obj/machinery/camera/autoname/directional/east, /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -36047,6 +36032,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/machinery/status_display/ai/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/engineering/main) @@ -36594,7 +36580,7 @@ /area/station/science/xenobiology) "mih" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/clothing/mask/gas, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -36677,20 +36663,11 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/light_switch/directional/north{ - pixel_x = -8 - }, /obj/machinery/button/door/directional/north{ - pixel_x = 6; id = "chem_factory_shutters"; req_access = list("pharmacy") }, -/obj/structure/cable, -/obj/machinery/camera/directional/north{ - c_tag = "Medical - Chemistry Factory"; - name = "medical camera"; - network = list("ss13","medbay") - }, +/obj/machinery/light/directional/north, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "mjC" = ( @@ -36917,12 +36894,10 @@ }, /obj/machinery/light/directional/south, /obj/structure/table/reinforced/rglass, -/obj/item/storage/fancy/cigarettes{ - pixel_x = 2 - }, -/obj/item/lighter{ - pixel_x = -7; - pixel_y = 6 +/obj/effect/spawner/random/entertainment/cigarette_pack, +/obj/effect/spawner/random/entertainment/lighter{ + pixel_x = 8; + pixel_y = 4 }, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) @@ -37404,7 +37379,7 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "muO" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/poster/random_official, /obj/item/poster/random_official{ pixel_y = 7 @@ -37435,7 +37410,7 @@ /area/station/maintenance/department/science) "mvh" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/maintenance/two, +/obj/structure/barricade/wooden, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "mvk" = ( @@ -37922,7 +37897,7 @@ "mFK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/station/maintenance/starboard/aft) "mFR" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -38512,9 +38487,13 @@ /turf/open/floor/plating, /area/station/commons/dorms/laundry) "mRi" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/construction) "mRp" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -38743,7 +38722,6 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/north, -/obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, /area/station/engineering/main) "mVa" = ( @@ -38859,7 +38837,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "mXe" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/taperecorder, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -39405,7 +39383,7 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) "ngX" = ( -/obj/structure/table/glass, +/obj/structure/table, /obj/item/restraints/handcuffs/cable/zipties, /obj/item/reagent_containers/blood/random, /turf/open/floor/iron/white, @@ -39890,7 +39868,7 @@ /area/station/medical/break_room) "noM" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/chair_flipped{ +/obj/structure/chair{ dir = 8 }, /turf/open/floor/plating, @@ -40087,6 +40065,16 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/primary/central) +"nsi" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/light/directional/south, +/obj/structure/table/reinforced/rglass, +/obj/item/stack/ducts/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/construction/plumbing, +/obj/item/plunger, +/turf/open/floor/iron/white/textured, +/area/station/medical/chemistry) "nsk" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" @@ -40132,9 +40120,11 @@ /area/station/maintenance/port/fore) "nta" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/food_packaging, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, /turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/area/station/maintenance/starboard/aft) "ntc" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/closed/wall/r_wall, @@ -40198,7 +40188,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "nue" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) @@ -40751,7 +40741,7 @@ "nCK" = ( /obj/machinery/camera/autoname/directional/east, /obj/machinery/light_switch/directional/east, -/obj/structure/chair{ +/obj/structure/chair/plastic{ dir = 1 }, /turf/open/floor/carpet/black, @@ -40802,6 +40792,23 @@ pixel_y = -3 }, /obj/item/ammo_box/magazine/m35/rubber, +/obj/item/ammo_box/magazine/m35/rubber{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/ammo_box/magazine/m35/rubber{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/ammo_box/magazine/m35/rubber{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/ammo_box/magazine/m35/rubber{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/ammo_box/magazine/m35/rubber, /obj/item/ammo_box/magazine/m35/rubber{ pixel_x = 3; pixel_y = 3 @@ -40814,7 +40821,7 @@ /area/station/ai_monitored/security/armory) "nDw" = ( /obj/effect/mapping_helpers/burnt_floor, -/obj/effect/decal/cleanable/greenglow, +/obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "nDy" = ( @@ -40845,6 +40852,7 @@ /area/station/maintenance/department/engine/atmos) "nEI" = ( /obj/effect/spawner/random/trash/hobo_squat, +/obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/plating, /area/station/maintenance/port/fore) "nEU" = ( @@ -41210,7 +41218,11 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/turret_protected/ai) "nKe" = ( -/obj/item/kirbyplants/random, +/obj/effect/turf_decal/box, +/obj/structure/closet/crate, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, +/obj/item/stack/license_plates/empty/fifty, /turf/open/floor/iron/dark/side{ dir = 5 }, @@ -41223,7 +41235,8 @@ /area/station/command/bridge) "nKn" = ( /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/airalarm/directional/south, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "nKo" = ( @@ -42020,9 +42033,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) "nZd" = ( @@ -42219,7 +42229,7 @@ "oaZ" = ( /obj/machinery/camera/autoname/directional/north, /obj/machinery/newscaster/directional/north, -/obj/structure/table/wood, +/obj/effect/spawner/random/structure/table, /turf/open/floor/iron/dark, /area/station/commons/vacant_room/commissary) "obc" = ( @@ -42451,11 +42461,10 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "ogd" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/mob_spawn/corpse/human/assistant, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) "ogg" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -43216,7 +43225,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/security/brig) "orM" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/engineering/toolbox, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -43431,7 +43440,7 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "ovO" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/reagent_containers/pill/maintenance, /obj/item/reagent_containers/pill/maintenance{ pixel_y = 8; @@ -43528,14 +43537,14 @@ /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) "oxn" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "oxt" = ( @@ -43885,7 +43894,7 @@ "oCA" = ( /obj/effect/turf_decal/delivery/red, /obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/iron/textured, +/turf/open/floor/iron/large, /area/station/ai_monitored/command/storage/eva) "oCE" = ( /obj/effect/spawner/structure/window/reinforced, @@ -45037,9 +45046,6 @@ "oXb" = ( /obj/structure/cable, /obj/machinery/light/directional/east, -/obj/machinery/power/terminal{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "oXi" = ( @@ -45289,7 +45295,7 @@ /area/station/security/warden) "pbf" = ( /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/entertainment/drugs, /obj/item/poster/random_contraband, /turf/open/floor/iron/showroomfloor, @@ -45652,7 +45658,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "pjs" = ( -/obj/effect/spawner/random/structure/table_or_rack, +/obj/structure/rack, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) @@ -45754,8 +45760,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "plH" = ( -/obj/machinery/light/small/built/directional/south, -/obj/structure/chair{ +/obj/structure/chair/wood{ dir = 1 }, /turf/open/floor/carpet/green, @@ -46240,14 +46245,15 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/structure/transit_tube/station/dispenser/reverse/flipped{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ dir = 9 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/transit_tube/station/dispenser/reverse/flipped{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/transit_tube) "psF" = ( @@ -46675,7 +46681,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/food_packaging, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/station/maintenance/starboard/aft) "pyZ" = ( /obj/effect/turf_decal/stripes/line{ @@ -46805,7 +46811,7 @@ /area/station/maintenance/port/aft) "pBc" = ( /obj/effect/spawner/random/structure/table, -/obj/item/storage/box/donkpockets/donkpocketpizza, +/obj/effect/spawner/random/food_or_drink/donkpockets, /obj/item/knife/kitchen, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) @@ -47028,11 +47034,16 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"pEQ" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "pEY" = ( /turf/closed/wall, /area/station/service/hydroponics) "pFJ" = ( -/obj/effect/spawner/random/structure/chair_maintenance{ +/obj/structure/chair/wood{ dir = 1 }, /obj/effect/decal/cleanable/dirt, @@ -47063,6 +47074,7 @@ /turf/open/floor/engine, /area/station/medical/cryo) "pGM" = ( +/obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/wood, /area/station/maintenance/port/fore) "pGN" = ( @@ -47599,6 +47611,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "pOH" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/plate_press, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -47998,6 +48012,11 @@ dir = 4 }, /area/station/commons/fitness/recreation) +"pXi" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "pXp" = ( /obj/machinery/light/small/directional/west, /obj/structure/cable, @@ -48217,7 +48236,7 @@ /area/station/maintenance/starboard/fore) "qbz" = ( /obj/structure/cable, -/obj/structure/chair/wood{ +/obj/structure/chair/plastic{ dir = 4 }, /turf/open/floor/wood, @@ -48269,7 +48288,7 @@ /area/station/science/research) "qdj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "qdk" = ( @@ -48754,11 +48773,8 @@ /turf/open/floor/plating, /area/station/maintenance/department/science) "qmY" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) "qnm" = ( @@ -49002,7 +49018,7 @@ /area/station/maintenance/port/aft) "qqC" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/structure/table_or_rack, +/obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/wood, /area/station/maintenance/starboard/aft) @@ -49168,11 +49184,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "qtQ" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/structure/cable, -/obj/structure/sink/kitchen/directional/south, +/obj/machinery/duct, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "qtW" = ( @@ -49228,7 +49243,7 @@ /area/station/service/library/lounge) "quN" = ( /obj/machinery/light/directional/west, -/obj/structure/chair/wood{ +/obj/structure/chair/plastic{ dir = 4 }, /turf/open/floor/wood, @@ -49293,6 +49308,7 @@ /obj/structure/window/reinforced/fulltile, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/transit_tube) "qvz" = ( @@ -49333,14 +49349,18 @@ /turf/open/floor/iron/vaporwave, /area/station/command/heads_quarters/rd) "qvM" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/machinery/camera/directional/north{ + c_tag = "Medical - Chemistry Factory"; + name = "medical camera"; + network = list("ss13","medbay") + }, +/obj/item/radio/intercom/directional/north, /obj/structure/disposalpipe/segment{ - dir = 5 + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "qvX" = ( @@ -50020,7 +50040,6 @@ }, /area/station/service/hydroponics) "qIN" = ( -/obj/effect/decal/cleanable/blood/gibs/up, /obj/machinery/light/small/built/directional/south, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -50215,7 +50234,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/effect/landmark/start/hangover, +/obj/effect/landmark/start/assistant, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "qMY" = ( @@ -50454,13 +50473,16 @@ /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "qQp" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/light/small/directional/east, +/obj/machinery/camera/autoname/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "qQq" = ( -/obj/structure/chair/stool/directional/north, +/obj/structure/chair/plastic{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/security/prison/mess) "qQz" = ( @@ -51229,6 +51251,18 @@ /obj/structure/cable, /turf/open/floor/carpet/green, /area/station/commons/locker) +"rff" = ( +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/white/textured, +/area/station/medical/chemistry) "rfl" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -51575,7 +51609,7 @@ /area/station/science/auxlab) "rkK" = ( /obj/machinery/light/small/directional/east, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/lightreplacer, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -52052,10 +52086,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "rsR" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/duct, -/turf/open/floor/iron/white/textured, -/area/station/medical/chemistry) +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/effect/spawner/random/engineering/toolbox, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "rtd" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -52260,7 +52295,7 @@ /area/station/engineering/atmos) "rwq" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) @@ -52509,11 +52544,12 @@ /turf/open/floor/iron/white, /area/station/medical/office) "rAk" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ dir = 4 }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) "rAl" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -52697,8 +52733,7 @@ /turf/open/floor/iron/dark, /area/station/science/server) "rCE" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/plate_press, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/side{ dir = 10 }, @@ -53213,7 +53248,7 @@ /turf/open/floor/engine/telecomms, /area/station/tcommsat/server) "rJz" = ( -/obj/effect/spawner/random/structure/chair_maintenance{ +/obj/structure/chair{ dir = 8 }, /turf/open/floor/iron/cafeteria, @@ -53373,9 +53408,10 @@ /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) "rMV" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/obj/item/clothing/mask/gas, -/turf/open/floor/plating, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/iron, /area/station/maintenance/starboard/aft) "rNd" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ @@ -54245,6 +54281,12 @@ }, /turf/open/floor/iron/textured, /area/station/security/interrogation) +"scQ" = ( +/obj/machinery/light/built/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/food_packaging, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "scR" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/siding/wood{ @@ -54483,6 +54525,7 @@ /obj/machinery/camera/autoname/directional/east, /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/leavy/style_random, +/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled, /turf/open/floor/grass, /area/station/command/bridge) "shF" = ( @@ -54520,6 +54563,12 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +"siB" = ( +/obj/machinery/light/built/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "siE" = ( /turf/closed/wall/r_wall, /area/station/maintenance/central) @@ -54555,6 +54604,9 @@ /area/station/hallway/primary/starboard) "sjs" = ( /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/prison/work) "sjw" = ( @@ -54573,7 +54625,7 @@ /area/station/service/library) "sjF" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, /area/station/maintenance/port/fore) "sjV" = ( @@ -54731,10 +54783,10 @@ /turf/open/floor/iron/dark/textured, /area/station/security/processing) "smr" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/blobstart, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/cargo) "sms" = ( /turf/closed/wall, /area/station/service/chapel/funeral) @@ -55003,7 +55055,7 @@ /obj/effect/turf_decal/delivery/red, /obj/machinery/light/directional/west, /obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/iron/textured, +/turf/open/floor/iron/large, /area/station/ai_monitored/command/storage/eva) "srS" = ( /obj/structure/flora/bush/fullgrass/style_random, @@ -55075,7 +55127,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/line, -/obj/machinery/station_map/engineering/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) @@ -55969,7 +56021,6 @@ /area/station/medical/break_room) "sKs" = ( /obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) "sKy" = ( @@ -56546,6 +56597,10 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"sUY" = ( +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "sVg" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/light/small/directional/south, @@ -56631,7 +56686,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "sWl" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/entertainment/toy_figure, /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, @@ -57039,10 +57094,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/food_packaging, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/turf/open/floor/iron/white/textured, +/area/station/medical/chemistry) "tbo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -57345,7 +57398,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "tfN" = ( -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, /obj/machinery/button/door/directional/south{ id = "chem_factory_shutters"; @@ -58112,7 +58165,7 @@ /obj/structure/window/reinforced/tinted{ dir = 4 }, -/obj/item/kirbyplants/dead, +/obj/item/kirbyplants/random/dead, /turf/open/floor/iron/vaporwave, /area/station/command/heads_quarters/rd) "ttD" = ( @@ -58428,7 +58481,6 @@ "tyt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, -/obj/item/restraints/handcuffs/cable/zipties/used, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "tyC" = ( @@ -58521,8 +58573,8 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hop) "tzr" = ( -/obj/effect/spawner/random/structure/table, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets, /turf/open/floor/plating, /area/station/maintenance/port/aft) "tzs" = ( @@ -58598,14 +58650,6 @@ /obj/machinery/vending/drugs, /turf/open/floor/iron/white, /area/station/medical/storage) -"tAr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/wood, -/area/station/maintenance/starboard/fore) "tAK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -58649,6 +58693,23 @@ pixel_x = -3 }, /obj/item/ammo_box/magazine/m35, +/obj/item/ammo_box/magazine/m35{ + pixel_y = 3; + pixel_x = 3 + }, +/obj/item/ammo_box/magazine/m35{ + pixel_y = 6; + pixel_x = 6 + }, +/obj/item/ammo_box/magazine/m35{ + pixel_y = -6; + pixel_x = -6 + }, +/obj/item/ammo_box/magazine/m35{ + pixel_y = -3; + pixel_x = -3 + }, +/obj/item/ammo_box/magazine/m35, /obj/item/ammo_box/magazine/m35{ pixel_y = 3; pixel_x = 3 @@ -58875,7 +58936,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/effect/landmark/start/assistant, +/obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "tGK" = ( @@ -59238,10 +59299,21 @@ /turf/open/floor/carpet/red, /area/station/security/detectives_office) "tNQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Chemistry Factory" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/turf/open/floor/iron/white/textured, +/area/station/medical/chemistry) "tOb" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -59317,13 +59389,14 @@ /turf/open/floor/plating/reinforced, /area/station/maintenance/department/science/xenobiology) "tPw" = ( -/obj/structure/table/wood/poker, -/obj/effect/spawner/random/entertainment/money{ - pixel_y = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/effect/spawner/random/entertainment/money, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/carpet/green, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/iron/textured, /area/station/maintenance/starboard/aft) "tPP" = ( /obj/structure/cable, @@ -59481,7 +59554,7 @@ }, /area/station/security/prison/safe) "tRW" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) @@ -59847,7 +59920,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "tZl" = ( -/obj/structure/chair/wood{ +/obj/structure/chair/plastic{ dir = 8 }, /turf/open/floor/wood, @@ -60025,10 +60098,11 @@ /area/station/medical/virology) "udl" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/table, -/obj/item/screwdriver, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/effect/decal/cleanable/blood/tracks{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/maintenance/starboard/aft) "udm" = ( /obj/machinery/camera/directional/west{ c_tag = "Engineering - Atmospherics, External HFR Room, West"; @@ -60430,6 +60504,8 @@ }, /obj/item/clothing/glasses/science, /obj/item/extrapolator, +/obj/item/device/antibody_scanner, +/obj/item/device/antibody_scanner, /turf/open/floor/iron/white, /area/station/medical/virology) "uiu" = ( @@ -60545,18 +60621,12 @@ /turf/open/floor/carpet/cyan, /area/station/medical/break_room) "ukk" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Factory" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "ukt" = ( @@ -60712,7 +60782,7 @@ /area/station/engineering/engine_smes) "ulQ" = ( /obj/machinery/light/small/broken/directional/west, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/clothing/gloves, /turf/open/floor/plating, /area/station/maintenance/department/medical) @@ -61037,7 +61107,7 @@ /area/station/maintenance/starboard/aft) "urJ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/north, +/obj/machinery/light/small/built/directional/north, /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -61154,10 +61224,11 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 }, -/obj/machinery/light/directional/north, -/obj/item/radio/intercom/directional/west, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, +/obj/machinery/light_switch/directional/north{ + pixel_x = -8 + }, +/obj/machinery/firealarm/directional/north, +/obj/structure/sink/kitchen/directional/east, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "utV" = ( @@ -61429,7 +61500,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/construction) @@ -61510,8 +61580,10 @@ /area/station/cargo/lobby) "uBD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/prison/work) "uBE" = ( @@ -61696,8 +61768,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "uGk" = ( -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron, /area/station/maintenance/starboard/aft) "uGA" = ( /obj/machinery/light/small/directional/north, @@ -62431,7 +62504,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, -/obj/machinery/light/directional/north, /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/engineering/main) @@ -62952,7 +63024,7 @@ /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) "uZf" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/reagent_containers/condiment/sugar, /obj/item/reagent_containers/condiment/enzyme, /obj/item/kitchen/rollingpin, @@ -63225,8 +63297,6 @@ /turf/open/floor/iron/checker, /area/station/maintenance/port/fore) "vde" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/plate_press, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -63565,12 +63635,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/maintenance/starboard/aft) "vjj" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/machinery/light/small/built/directional/south, +/turf/open/floor/carpet/green, +/area/station/maintenance/starboard/aft) "vjs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/hobo_squat, @@ -63666,7 +63733,7 @@ /obj/effect/turf_decal/delivery/red, /obj/machinery/status_display/ai/directional/east, /obj/machinery/suit_storage_unit/standard_unit, -/turf/open/floor/iron/textured, +/turf/open/floor/iron/large, /area/station/ai_monitored/command/storage/eva) "vkj" = ( /obj/structure/table/wood/fancy/black, @@ -63951,6 +64018,7 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, +/obj/machinery/light/directional/east, /obj/machinery/smartfridge/chemistry/preloaded, /turf/open/floor/iron/dark, /area/station/medical/chemistry) @@ -64127,13 +64195,10 @@ /turf/open/floor/iron/white, /area/station/medical/break_room) "vrW" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 }, /obj/effect/turf_decal/delivery, -/obj/machinery/light/directional/north, -/obj/machinery/firealarm/directional/north, -/obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/disposalpipe/trunk{ dir = 8 @@ -64716,7 +64781,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "vDm" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /turf/open/floor/plating, /area/station/maintenance/department/medical) "vDr" = ( @@ -65044,7 +65109,7 @@ /area/station/security/execution) "vIP" = ( /obj/machinery/firealarm/directional/west, -/obj/structure/chair/stool/directional/south, +/obj/structure/chair/plastic, /turf/open/floor/iron/dark, /area/station/security/prison/mess) "vIQ" = ( @@ -65419,7 +65484,7 @@ /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) "vPL" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/entertainment/coin, /turf/open/floor/plating, /area/station/maintenance/department/cargo) @@ -66216,7 +66281,7 @@ /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "wdB" = ( -/obj/effect/decal/cleanable/blood/old, +/obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "wdR" = ( @@ -67421,7 +67486,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "wzI" = ( -/obj/structure/chair/stool/directional/south, +/obj/structure/chair/plastic, /turf/open/floor/iron/dark, /area/station/security/prison/mess) "wzK" = ( @@ -68358,7 +68423,14 @@ /area/station/security/execution) "wOS" = ( /obj/effect/spawner/random/structure/table, -/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/food_or_drink/booze{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/effect/spawner/random/food_or_drink/booze{ + pixel_x = 4; + pixel_y = 6 + }, /turf/open/floor/wood, /area/station/maintenance/port/fore) "wPA" = ( @@ -68631,9 +68703,6 @@ "wTD" = ( /obj/structure/cable, /obj/machinery/light/directional/west, -/obj/machinery/power/terminal{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "wTM" = ( @@ -69314,12 +69383,11 @@ /area/station/medical/morgue) "xgx" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/chair{ - dir = 4 +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 }, /turf/open/floor/plating, -/area/station/maintenance/port/aft) +/area/station/maintenance/starboard/aft) "xgz" = ( /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, @@ -69448,7 +69516,6 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "xih" = ( @@ -69885,7 +69952,7 @@ /turf/open/floor/iron, /area/station/commons/dorms) "xrL" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/item/reagent_containers/pill/maintenance, /obj/item/reagent_containers/pill/maintenance{ pixel_y = 8; @@ -70338,10 +70405,11 @@ }, /area/station/service/hydroponics) "xyv" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/chair_maintenance{ dir = 4 }, -/obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "xyw" = ( @@ -70530,7 +70598,7 @@ /area/station/service/hydroponics) "xAT" = ( /obj/machinery/light/directional/east, -/obj/structure/chair/wood{ +/obj/structure/chair/plastic{ dir = 8 }, /turf/open/floor/wood, @@ -70630,14 +70698,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/prison/shower) "xCt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, -/obj/effect/mapping_helpers/airlock/unres, -/turf/open/floor/iron/textured, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) "xCA" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -71242,7 +71305,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron/cafeteria, /area/station/maintenance/starboard/aft) @@ -71600,7 +71663,7 @@ /turf/closed/wall, /area/station/service/kitchen/coldroom) "xVi" = ( -/obj/structure/table, +/obj/effect/spawner/random/structure/table, /obj/item/camera, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) @@ -72634,7 +72697,7 @@ /turf/open/floor/iron/dark, /area/station/security/office) "ykx" = ( -/obj/structure/table/glass, +/obj/structure/table, /obj/structure/bedsheetbin, /turf/open/floor/iron/white, /area/station/maintenance/port/fore) @@ -79344,11 +79407,11 @@ wZF wZF wZF cRp +gxx xMz -mRi -oAX +smr tyt -hNJ +oAX cRp ryp ucJ @@ -81656,7 +81719,7 @@ wJA wJA xfW qVf -wJA +bqd cWF wJA jdV @@ -84139,7 +84202,7 @@ ksa fEP ksa nGn -rMn +pEQ iaB lLW iHO @@ -84253,7 +84316,7 @@ xXP ksa ksa ksa -xXP +noh ksa ksa ksa @@ -84396,7 +84459,7 @@ ksa fEP ksa nGn -rMn +pEQ wfE mlj iHO @@ -84510,7 +84573,7 @@ xXP xXP xXP xXP -xXP +noh ksa ksa ksa @@ -84767,7 +84830,7 @@ xXP ksa ksa ksa -xXP +noh ksa ksa ksa @@ -86298,9 +86361,9 @@ xtD cRp cRp cRp -ksa -ksa -ksa +noh +noh +noh amD ycy xSu @@ -86556,7 +86619,7 @@ xMz tRg hsC ksa -ksa +xXP ksa amD xVH @@ -87070,7 +87133,7 @@ cRl tQD hsC ksa -ksa +xXP ksa xba xba @@ -87327,7 +87390,7 @@ cRl xIX cRp ksa -ksa +xXP ksa wEB oWd @@ -88115,7 +88178,7 @@ saV wEB ycx nwz -jgH +pXi saV ksa uoo @@ -88251,8 +88314,8 @@ ksa uoo uoo fPN -lBu -lBu +eQk +eQk wfE iHO qPR @@ -92478,7 +92541,7 @@ ksa vcG nlj nfa -nfa +jet nfa spr gIR @@ -92992,7 +93055,7 @@ ksa vcG nlj nfa -nfa +jet nfa spr fBY @@ -93236,8 +93299,8 @@ nwz cfP wEB hIb -jgH -jgH +pXi +pXi wEB eyp tcw @@ -93748,8 +93811,8 @@ wEB vAP wEB ciO -xgx -udl +ghA +ciO wEB bzx nwz @@ -94005,7 +94068,7 @@ wEB wEB wEB cuU -icr +nwz pAY wEB vac @@ -94261,11 +94324,11 @@ tcw tcw eub wEB +ghA nwz -dIu nwz jwW -ghA +nwz nwz nwz jwW @@ -94776,7 +94839,7 @@ nwz cuU wEB wGe -ghA +nwz cuU wEB orM @@ -94787,7 +94850,7 @@ nwz tuu wEB pbG -tNQ +feW nwz hHs xba @@ -96580,7 +96643,7 @@ hKf cfP eUB bsX -jgH +pXi wEB wRe xba @@ -96591,7 +96654,7 @@ jhE jhE aNz fxk -gRf +gZd adw lfo vJc @@ -96848,7 +96911,7 @@ rFn gDq lkR fxk -bGX +gRf adw ihh fxk @@ -98623,9 +98686,9 @@ xXP ksa saV vrf -pHd +nwz qmY -nPl +pHd sZC xba uFw @@ -98880,9 +98943,9 @@ sRZ hpM wEB wEB -ijn wEB wEB +ijn wEB xba ajT @@ -99137,9 +99200,9 @@ sRZ dOM xRi uze +mRi +uze olX -vLf -kag dBU jWy xxB @@ -103454,7 +103517,7 @@ sPR kAV rKU mZc -xzK +lzy wEA wxP mZc @@ -104528,9 +104591,9 @@ vhb wlw rRZ iyt -paH +lhd ulQ -paH +lhd rRZ fDD lJK @@ -114319,8 +114382,8 @@ khD khD khD nep -mhc kIt +mhc ins lwL nBE @@ -114577,7 +114640,7 @@ byX nBE iRv tpC -mhc +woy ins syI iuo @@ -115349,9 +115412,9 @@ nBE nBE nBE nBE -ndM -rHt -nBE +tnQ +sUY +dIu qtQ hTn hTn @@ -115606,12 +115669,12 @@ cnX mhc mhc nBE -ndM +tnQ tfN nBE mjA ffz -hTn +ffz ffz ksM uBL @@ -115864,10 +115927,10 @@ woy bIt nBE tnQ -lhd -esk +mhc +tEm bRg -rsR +fUU cCP cuK qGs @@ -116122,7 +116185,7 @@ mhc nBE tnQ mhc -cbj +tEm ivt ffz ffz @@ -116130,8 +116193,8 @@ ffz qGs qGs kzi -btg -tDa +nsi +dUm xpD nuA uoo @@ -116635,8 +116698,8 @@ rQv rQv nBE tnQ -mhc -tEm +kGX +nBE etn ffz ffz @@ -116869,13 +116932,13 @@ raC vLk sZi nBE -sAN +fei kJo fbT nBE qqC ipp -sAN +fei nBE dPO nBE @@ -116892,12 +116955,12 @@ czU czU dRH tnQ -mhc -tEm -etn -ffz -ffz -ffz +apY +tNQ +rff +tbn +tbn +qdj ffz ffz ffz @@ -117150,11 +117213,11 @@ aAL nBE ndM mhc -cbj -etn -ffz -ffz +nBE +ukk ffz +kBv +qdj ffz aLO uiS @@ -117387,7 +117450,7 @@ qqC mhc fbT nBE -sAN +fei nQN fbT nBE @@ -117406,13 +117469,13 @@ tOb nBE nBE ecg -hpU -ukk +jOx +nBE qvM -qdj -qdj -qdj ffz +kBv +qdj +esk nKn nBE nBE @@ -117573,9 +117636,9 @@ ksa ksa xWh iRy -gxx +fXj iLB -jet +gXK enc ulm ulm @@ -117663,7 +117726,7 @@ woy mhc nBE ndM -fei +mhc nBE vrW dbS @@ -117830,7 +117893,7 @@ xXP xXP xWh iLB -rAk +fXj iLB jxy vmC @@ -118087,7 +118150,7 @@ ksa ksa jxy tzc -aQC +fXj bAh jxy nft @@ -118413,7 +118476,7 @@ sAY nBE aAL mhc -jOi +lcE hdl aPy mhc @@ -118600,9 +118663,9 @@ ksa ksa ksa jxy -bqd -vjj -nta +aOz +aOz +iLB jxy uZf iLB @@ -118858,8 +118921,8 @@ xXP xXP jxy cdE -ogd -smr +doA +fXj jxy cye jSC @@ -118944,7 +119007,7 @@ hpY hpY nBE mhc -uGk +ftr mhc nBE owt @@ -119458,7 +119521,7 @@ ulf nBE nBE iYW -rMV +ftr mhc nBE ruW @@ -119688,24 +119751,24 @@ dbl mhc byX nBE -grF +nep lRi dbl nBE hpY baP hpY -mhc +fRW mFK -tbn +obV pyW xuN mhc dVZ -mhc +iFK nBE xpF -aRH +xCt xWS gHc pFJ @@ -119889,9 +119952,9 @@ ruh muy mGu kod -iFK +mGu kjC -tAr +kod muy ruh ruh @@ -119947,8 +120010,8 @@ mhc tbo mhc lRi -dbl -nBE +mhc +tPw woy via miz @@ -119960,8 +120023,8 @@ woy mhc mvh mhc -nBE -mTR +wsv +mhc wMo wMo wMo @@ -120204,7 +120267,7 @@ grF nBE byX lRi -grF +nep nBE fsH lPf @@ -120215,18 +120278,18 @@ lnu usg nep hpY -hpY -mhc -wsv +uGk mhc +nBE +mTR wMo mBa lrm -vpn +vjj nBE -sAY -mhc +hpU mhc +rsR nBE nBE xSv @@ -120472,13 +120535,13 @@ gNh nBE nBE tZd -foq +nta hpY nBE jOi wMo mBa -tPw +tlA plH nBE jbY @@ -120716,7 +120779,7 @@ byX mhc dbl nBE -grF +nxW lRi byX nBE @@ -120724,12 +120787,12 @@ woy hpY mhc nBE -hpY +lPf gNh hpY nBE aly -hpY +rAk mhc nBE boP @@ -120975,9 +121038,9 @@ dbl nBE dbl lRi -mhc -xCt -nep +xcO +nBE +siB aly mhc tZd @@ -120986,8 +121049,8 @@ dsV hpY tZd mhc -hpY -mhc +rAk +scQ khD khD khD @@ -121232,7 +121295,7 @@ dbl nBE dbl lRi -grF +dbl nBE mhc aly @@ -121240,10 +121303,10 @@ tZd nBE fsH gNh -hpY +lPf nBE lPf -usg +nta mhc khD fft @@ -121500,7 +121563,7 @@ gNh nBE nBE pRe -mhc +nta mhc khD hpY @@ -121746,7 +121809,7 @@ tpC nBE dbl lRi -nxW +nep nBE tZd usg @@ -121755,15 +121818,15 @@ nep iGh hbb dHd -mhc -gVo woy -mhc -dxH +jOx +xgx +aQC +khD dsf xVV yjI -hpY +rMV khD wtN wzz @@ -122003,24 +122066,24 @@ wQO fkT wQO fRU -xcO -nBE +mhc +tPw tZd fRW woy usg -hpY -obV +miz +iZD fsH hpY tto via -mhc -khD -hpY -hpY -sZi -tZd +xgx +dxH +ogd +ogd +gHK +udl khD cQj kIt @@ -122269,10 +122332,10 @@ xuN iIF gNh lpR -woy +fRW hpY itK -mhc +woy khD bOg cwb @@ -122292,7 +122355,7 @@ nBE nBE nxW pRd -wfI +hNJ nBE ksa ksa diff --git a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm index 44b1f67295cd51..e6feab2f7e56c7 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm @@ -450,7 +450,7 @@ "mg" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/directional/south, -/obj/structure/sign/delamination_counter/directional/south, +/obj/machinery/incident_display/delam/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "mw" = ( diff --git a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm index 04a9840bd09c61..061779d1595e1d 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm @@ -948,7 +948,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/incident_display/delam/directional/north, /turf/open/floor/engine, @@ -1950,7 +1949,7 @@ ze EI YV HS -jQ +FP Zg Gq cs @@ -1978,7 +1977,7 @@ ak CM ak HS -FP +QX vt Ya BL From 9da38f85a48a0f59f80cf171388d404bcc263e1a Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Wed, 26 Jun 2024 14:44:17 -0500 Subject: [PATCH 12/27] Fix 11 Changes the Forging Lab. Miscellaneous stuff. No changes were needed for PR 1817. --- _maps/map_files/BoxStation/BoxStation.dmm | 367 +++++++++++++--------- 1 file changed, 223 insertions(+), 144 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 510571a9fe1472..59a4020e103cbd 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -505,16 +505,14 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "ajR" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) "ajT" = ( @@ -773,9 +771,8 @@ /turf/open/floor/iron, /area/station/engineering/main) "aoX" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall, -/area/station/maintenance/department/science) +/turf/open/floor/wood, +/area/station/smithing) "apg" = ( /obj/machinery/netpod, /turf/open/floor/catwalk_floor/iron_dark, @@ -2867,9 +2864,8 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "aYu" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/stone, /area/station/smithing) "aYE" = ( @@ -6025,6 +6021,11 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark/textured, /area/station/security/prison/safe) +"bZa" = ( +/obj/machinery/light/directional/west, +/obj/machinery/electroplater, +/turf/open/floor/wood, +/area/station/smithing) "bZl" = ( /obj/machinery/light/small/directional/west, /obj/structure/frame/computer{ @@ -6964,7 +6965,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/light_switch/directional/south, /obj/structure/closet/crate/trashcart/laundry, /obj/effect/spawner/random/contraband/prison, /obj/item/clothing/under/rank/prisoner, @@ -12731,13 +12731,13 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "ekn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) "ekx" = ( @@ -13124,9 +13124,6 @@ "erd" = ( /obj/machinery/camera/autoname/directional/east, /obj/machinery/airalarm/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -13446,7 +13443,6 @@ dir = 8 }, /obj/machinery/camera/autoname/directional/west, -/obj/machinery/airalarm/directional/west, /obj/structure/chair/office/light{ dir = 1 }, @@ -15997,12 +15993,12 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "fqJ" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, +/obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, -/obj/item/radio/intercom/directional/west, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) "fqQ" = ( @@ -16484,9 +16480,8 @@ /area/station/ai_monitored/turret_protected/aisat/foyer) "fAQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, +/obj/effect/decal/cleanable/oil/streak, +/obj/structure/table, /turf/open/floor/stone, /area/station/smithing) "fBd" = ( @@ -16842,14 +16837,14 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/foyer) "fIt" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) "fIw" = ( @@ -19052,11 +19047,10 @@ /turf/open/floor/carpet, /area/station/service/library) "gvc" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/turf/open/floor/stone, -/area/station/smithing) +/obj/machinery/light/small/directional/east, +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "gvd" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -20876,8 +20870,10 @@ /area/station/ai_monitored/command/nuke_storage) "gWz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/prison/safe) "gWE" = ( @@ -25162,7 +25158,6 @@ "itd" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/holopad, /turf/open/floor/iron/large, @@ -25722,6 +25717,12 @@ "izU" = ( /turf/open/floor/glass/reinforced, /area/station/engineering/main) +"izX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/obj/structure/table, +/turf/open/floor/stone, +/area/station/smithing) "iAb" = ( /obj/effect/turf_decal/bot, /turf/open/floor/engine, @@ -27452,11 +27453,11 @@ /turf/open/floor/iron/white, /area/station/maintenance/department/science) "jeL" = ( -/obj/effect/decal/cleanable/oil, /obj/effect/turf_decal/siding/wood{ dir = 1 }, /obj/effect/turf_decal/siding/wood, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) "jfI" = ( @@ -27710,6 +27711,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"jki" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, +/turf/open/floor/stone, +/area/station/smithing) "jkt" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -28985,6 +28991,9 @@ dir = 1 }, /obj/machinery/firealarm/directional/south, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8 + }, /obj/structure/closet/crate/trashcart/laundry, /obj/item/clothing/under/rank/prisoner/skirt{ pixel_x = 9; @@ -29478,6 +29487,11 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"jPc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/material_analyzer, +/turf/open/floor/stone, +/area/station/smithing) "jPm" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 @@ -29516,11 +29530,18 @@ /obj/machinery/button/door/directional/west{ id = "prison_release"; name = "Labor Camp Shuttle Lockdown"; - req_access = list("brig") + req_access = list("security"); + pixel_y = 6 }, /obj/machinery/computer/shuttle/labor{ dir = 4 }, +/obj/machinery/button/door/directional/west{ + id = "labor_dock_bolt"; + name = "Labor Camp Shuttle Dock Airlock Control"; + req_access = list("security"); + pixel_y = -6 + }, /turf/open/floor/iron/dark, /area/station/security/processing) "jQb" = ( @@ -31349,6 +31370,18 @@ }, /turf/open/floor/iron/dark/textured, /area/station/service/library/printer) +"kwK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/airlock/maintenance{ + name = "Forging Lab Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "kwT" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -32313,6 +32346,11 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) +"kNA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/box, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "kNH" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -33583,13 +33621,13 @@ /obj/machinery/button/door/directional/north{ id = "iso_cell_hall_vent"; name = "Isolation Cell Hall Vent Control"; - req_access = list("brig"); + req_access = list("security"); pixel_x = 6 }, /obj/machinery/button/door/directional/north{ id = "iso_cell_hall_bolt"; name = "Isolation Cell Hall Bolt Control"; - req_access = list("brig"); + req_access = list("security"); normaldoorcontrol = 1; specialfunctions = 4; pixel_x = -6 @@ -35197,6 +35235,9 @@ /area/station/science/genetics) "lIO" = ( /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/prison/safe) "lIQ" = ( @@ -39331,8 +39372,11 @@ /turf/open/floor/grass, /area/station/hallway/primary/central) "nfz" = ( +/obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/stone, /area/station/smithing) "nfR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible/layer4, @@ -39995,6 +40039,8 @@ dir = 1 }, /obj/effect/turf_decal/siding/wood, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, /turf/open/floor/stone, /area/station/smithing) "nrr" = ( @@ -41450,9 +41496,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) "nNQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/table/reinforced, +/obj/item/stack/sheet/mineral/coal/five, /turf/open/floor/wood, /area/station/smithing) "nNV" = ( @@ -41617,10 +41664,13 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "nQD" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/spawner/random/structure/closet_maintenance, -/turf/open/floor/plating, -/area/station/maintenance/department/science) +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, +/area/station/smithing) "nQM" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -42729,7 +42779,8 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "ojr" = ( -/obj/machinery/material_analyzer, +/obj/machinery/light/directional/east, +/obj/machinery/electroplater, /turf/open/floor/wood, /area/station/smithing) "oju" = ( @@ -42885,6 +42936,12 @@ /obj/structure/sink/directional/east, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"omu" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "omw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43918,10 +43975,10 @@ /turf/open/floor/carpet/red, /area/station/security/courtroom) "oCJ" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/table/wood, +/obj/structure/cable, +/obj/structure/reagent_forge, /turf/open/floor/wood, /area/station/smithing) "oDg" = ( @@ -44219,10 +44276,9 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "oJt" = ( -/obj/machinery/electroplater, -/obj/machinery/light/small/directional/north, -/turf/open/floor/wood, -/area/station/smithing) +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "oJz" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, @@ -46081,9 +46137,8 @@ /area/station/engineering/main) "pqq" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, /obj/machinery/arc_forge, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/smithing) "pqw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46618,12 +46673,10 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "pxU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) "pxY" = ( @@ -47490,7 +47543,7 @@ /obj/structure/cable, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ - name = "Blacksmithing" + name = "Forging Lab" }, /obj/effect/mapping_helpers/airlock/access/any/science/general, /obj/effect/mapping_helpers/airlock/access/any/supply/general, @@ -49152,6 +49205,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"qsx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "qsF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -49654,14 +49712,15 @@ }, /area/station/hallway/secondary/exit/departure_lounge) "qBy" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch/directional/south{ pixel_x = 8 }, +/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/machinery/firealarm/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil, /turf/open/floor/stone, /area/station/smithing) "qBz" = ( @@ -51175,9 +51234,6 @@ /area/station/security/prison) "rdr" = ( /obj/machinery/computer/cryopod/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -51383,6 +51439,12 @@ }, /turf/open/floor/wood, /area/station/commons/locker) +"rgE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/molten_object/large, +/obj/structure/cable, +/turf/open/floor/stone, +/area/station/smithing) "rgH" = ( /obj/structure/cable, /turf/open/floor/iron/white, @@ -54777,7 +54839,14 @@ /obj/machinery/button/door/directional/south{ id = "prison_release"; name = "Labor Camp Shuttle Lockdown"; - req_access = list("brig") + req_access = list("security"); + pixel_x = 6 + }, +/obj/machinery/button/door/directional/south{ + id = "labor_dock_bolt"; + name = "Labor Camp Shuttle Dock Airlock Control"; + req_access = list("security"); + pixel_x = -6 }, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ @@ -54785,8 +54854,10 @@ name = "Prisoner Processing Blast Door" }, /obj/machinery/door/airlock/security/glass{ - name = "Labor Shuttle Dock" + name = "Labor Camp Shuttle Dock"; + id_tag = "labor_dock_bolt" }, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/iron/dark/textured, /area/station/security/processing) "smr" = ( @@ -55920,11 +55991,13 @@ /area/station/hallway/primary/central) "sIW" = ( /obj/effect/turf_decal/siding/wood{ - dir = 5 + dir = 1 }, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/stone, /area/station/smithing) "sJi" = ( @@ -57506,7 +57579,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ - name = "Labor Shuttle Dock" + name = "Labor Camp Shuttle Dock" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/textured, @@ -58469,9 +58542,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 }, -/obj/machinery/light_switch/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/light/directional/east, +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /turf/open/floor/iron/dark, /area/station/science/server) "txI" = ( @@ -58571,6 +58644,9 @@ dir = 6 }, /obj/machinery/firealarm/directional/east, +/obj/machinery/light_switch/directional/east{ + pixel_y = -10 + }, /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 1 }, @@ -58930,9 +59006,9 @@ /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "tGC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/reinforced, +/obj/item/forging/billow, /turf/open/floor/wood, /area/station/smithing) "tGD" = ( @@ -59099,8 +59175,9 @@ /area/station/hallway/primary/starboard) "tJZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/molten_object/large, -/turf/open/floor/wood, +/obj/structure/cable, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/stone, /area/station/smithing) "tKm" = ( /obj/structure/lattice/catwalk, @@ -60552,8 +60629,7 @@ /area/station/cargo/lobby) "uiX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/directional/east, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/smithing) "ujk" = ( /turf/closed/wall/r_wall, @@ -64267,6 +64343,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/service) +"vtd" = ( +/obj/structure/sign/departments/restroom/directional/west, +/turf/open/floor/wood, +/area/station/security/prison/rec) "vtr" = ( /obj/structure/bed{ dir = 4 @@ -65171,6 +65251,7 @@ dir = 1 }, /obj/machinery/light/small/directional/east, +/obj/structure/sign/departments/restroom/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -65381,9 +65462,7 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/south, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, /turf/open/floor/stone, /area/station/smithing) "vOj" = ( @@ -68013,9 +68092,9 @@ /turf/open/floor/grass, /area/station/ai_monitored/security/armory) "wIn" = ( -/obj/effect/spawner/random/trash/box, -/turf/open/floor/plating, -/area/station/maintenance/department/science) +/obj/structure/table, +/turf/open/floor/wood, +/area/station/smithing) "wIr" = ( /obj/structure/chair/pew/left{ dir = 1 @@ -97299,7 +97378,7 @@ xOf wHt sdP tvc -sdP +vtd fme vhu dqx @@ -102493,7 +102572,7 @@ ogk kAV pME mZc -wEA +vWa oxz aTS kAV @@ -103522,7 +103601,7 @@ oxz wEA mZc pME -sPR +wEA kAV rKU mZc @@ -103779,12 +103858,12 @@ epF mZc mZc mZc +xoI mZc mZc mZc mZc mZc -xoI mZc mZc mZc @@ -104030,20 +104109,20 @@ oCG oCG jmQ mZc -rSy -mZc +oJt +qsx oxz -wEA -sPR +aXc mZc vro -lTB -aOY -mZc -pME wEA +ncd +aOY mZc +pkR +bZa voi +wIn tBy fIt fqJ @@ -104288,19 +104367,19 @@ pwp xzm mZc mZc -mZc +aXc jDy wEA -wEA mZc +rKU cMA wEA -wEA -mZc -klX -wEA +iJc mZc -oJt +aoX +aoX +aoX +aoX nrl tGC pxU @@ -104545,19 +104624,19 @@ pwp tef xkV mZc -rKU +sPR oxz -kAV -ogk -gsz -wEA -ncd wEA gsz wEA wEA +cTL +wEA +kwK +aoX +aoX +aoX aoX -ojr jeL oCJ ekn @@ -104802,20 +104881,20 @@ bsg fQq dEE mZc -pME +rKU oxz -wEA -wEA -mZc -wEA -wEA lTB mZc -kNk +ncd +ogk wEA +omu mZc -oJt -nrl +aoX +aoX +aoX +aoX +jeL nNQ qBy tZr @@ -105059,19 +105138,19 @@ nlD gzy ces mZc -rKU +ogk oxz -wEA -rKU +aXc mZc -ncd -wEA pME -mZc -nQD +kNA wEA +pME mZc +pkR +ojr voi +wIn sIW ajR vNF @@ -105326,12 +105405,12 @@ xoI mZc mZc mZc -xoI -mZc mZc -pkR +tZr +tZr +nQD aYu -gvc +uiX tZr hus gbD @@ -105581,13 +105660,13 @@ mZc rKU wEA sPR +pME +kNk mZc -sPR -wEA -wIn -mZc -nfz +uiX pqq +jki +aYu fAQ tZr tGD @@ -105838,14 +105917,14 @@ gsz wEA wEA wEA -gsz -wEA wEA wEA mZc -nfz +uiX +uiX +rgE tJZ -fAQ +jPc tZr bve sEm @@ -106094,15 +106173,15 @@ wEA mZc sPR wEA -wEA -mZc -rKU -iJc -pME +ogk +gvc +klX mZc +uiX +uiX nfz uiX -fAQ +izX tZr dIF fHA @@ -106355,8 +106434,8 @@ mZc mZc mZc bLy -bLy -bLy +gGh +gGh gGh gGh gGh From a47ee8edfaaad732e7c8aa01235d2729637269b8 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Wed, 26 Jun 2024 16:15:32 -0500 Subject: [PATCH 13/27] Fix 12 Changes an area in the prison to go along with PR 2421. Changes some floors. --- _maps/map_files/BoxStation/BoxStation.dmm | 101 +++++++++++++++------- 1 file changed, 71 insertions(+), 30 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 59a4020e103cbd..62b0b956057918 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8551,9 +8551,7 @@ }, /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_half{ - dir = 4 - }, +/turf/open/floor/iron/dark/smooth_half, /area/station/command/gateway) "cQM" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -9179,7 +9177,7 @@ name = "Isolation Cell Hall Vent" }, /turf/open/floor/plating, -/area/station/security/prison) +/area/station/security/prison/safe) "cZu" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -15104,6 +15102,14 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) +"fbF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/service/chapel) "fbT" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/two, @@ -15760,6 +15766,9 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) +"fmX" = ( +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/chapel) "fmZ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 @@ -20054,6 +20063,13 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) +"gKh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/security/prison/safe) "gKi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -23793,9 +23809,7 @@ }, /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark/smooth_half{ - dir = 4 - }, +/turf/open/floor/iron/dark/smooth_half, /area/station/command/gateway) "hTn" = ( /obj/machinery/duct, @@ -36291,7 +36305,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/service/chapel) "mbx" = ( /turf/open/floor/iron/dark, @@ -40055,7 +40069,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/service/chapel) "nrA" = ( /obj/effect/turf_decal/trimline/green/filled/line, @@ -43272,9 +43286,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/dark/smooth_half{ - dir = 4 - }, +/turf/open/floor/iron/dark/smooth_half, /area/station/command/gateway) "orz" = ( /obj/effect/turf_decal/trimline/dark_red/corner{ @@ -47902,6 +47914,11 @@ "pTV" = ( /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"pUl" = ( +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/station/service/chapel) "pUp" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/neutral/line{ @@ -51231,7 +51248,7 @@ /obj/machinery/duct, /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, -/area/station/security/prison) +/area/station/security/prison/safe) "rdr" = ( /obj/machinery/computer/cryopod/directional/west, /turf/open/floor/iron/dark/side{ @@ -59148,6 +59165,12 @@ /obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/iron/dark/textured, /area/station/service/chapel/office) +"tJI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_corner, +/area/station/service/chapel) "tJM" = ( /obj/structure/flora/bush/jungle/c/style_random, /turf/open/floor/grass, @@ -60386,7 +60409,7 @@ dir = 1 }, /turf/open/floor/iron/dark/textured, -/area/station/security/prison) +/area/station/security/prison/safe) "ugy" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/camera/autoname/directional/south, @@ -65418,6 +65441,11 @@ /obj/machinery/holopad, /turf/open/floor/iron/large, /area/station/cargo/sorting) +"vNg" = ( +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/station/service/chapel) "vNq" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/wood, @@ -67691,6 +67719,11 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/checker, /area/station/science/lab) +"wBV" = ( +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/service/chapel) "wBY" = ( /obj/machinery/requests_console/directional/east{ assistance_requestable = 1; @@ -71257,6 +71290,14 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron/dark, /area/station/commons/storage/primary) +"xMv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/station/service/chapel) "xMz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -92229,7 +92270,7 @@ wZx cZs cZs cZs -ybj +wZx mRx ihP xJb @@ -92483,9 +92524,9 @@ cYs eLo dot bYZ -jou +gKh rdn -jou +gKh ugn jou aco @@ -92743,7 +92784,7 @@ wZx cZs cZs cZs -ybj +wZx lhk hXf xJb @@ -120322,11 +120363,11 @@ pgh pgh vKu lIF -lIF -lIF -lIF -lIF -lIF +tJI +fbF +fbF +fbF +xMv lIF flM oOy @@ -120579,11 +120620,11 @@ eUW eUW xYi gHr -bPd +fmX mbo vzy nrz -bPd +fmX wZI pmV qcA @@ -120836,11 +120877,11 @@ eUW eUW fDG bPd -bPd -bPd -bPd -bPd -bPd +pUl +wBV +wBV +wBV +vNg bPd qFf tJS From 4ebfeb97cd02c8f2286917449fbfc79fa170a746 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Thu, 27 Jun 2024 22:48:25 -0500 Subject: [PATCH 14/27] Fix 13 Miscellaneous things. --- _maps/map_files/BoxStation/BoxStation.dmm | 2003 +++++++++++++-------- 1 file changed, 1222 insertions(+), 781 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 62b0b956057918..9eb41558261d3e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -95,6 +95,7 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "abT" = ( +/obj/effect/turf_decal/siding/wood, /obj/machinery/computer/records/security, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) @@ -452,7 +453,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "aiG" = ( -/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/airalarm/directional/east, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -689,16 +694,19 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "anF" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/light_switch/directional/east{ - pixel_y = -4 +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 }, /obj/machinery/firealarm/directional/east{ pixel_y = 6 }, +/obj/machinery/light_switch/directional/east{ + pixel_y = -4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "anM" = ( @@ -756,6 +764,9 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "aoB" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/machinery/airalarm/directional/east, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -868,7 +879,8 @@ /area/station/ai_monitored/turret_protected/aisat/foyer) "aqj" = ( /obj/machinery/light/directional/west, -/obj/structure/chair/comfy/beige, +/obj/structure/chair/comfy/brown, +/obj/effect/landmark/start/hangover, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) "aqA" = ( @@ -1108,6 +1120,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "atW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/machinery/light/small/directional/south, /obj/machinery/station_map/engineering/directional/south, /obj/structure/table/wood, @@ -2195,6 +2210,10 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/grass, /area/station/hallway/primary/central) +"aNX" = ( +/obj/effect/turf_decal/vg_decals/atmos/mix, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) "aOj" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 4 @@ -2209,6 +2228,7 @@ dir = 10 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/medical) @@ -2933,9 +2953,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "aZW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/directional/south, /obj/structure/table, /obj/machinery/recharger, -/obj/machinery/light/directional/south, /obj/item/paper/fluff/ids_for_dummies, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) @@ -2995,12 +3018,12 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "baU" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/camera/directional/west{ c_tag = "Bridge - Port"; name = "command camera" }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/advanced, /turf/open/floor/iron/dark, /area/station/command/bridge) @@ -3027,7 +3050,7 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) "bbw" = ( -/obj/structure/chair/comfy/beige{ +/obj/structure/chair/comfy/brown{ dir = 1 }, /obj/effect/landmark/start/assistant, @@ -3376,8 +3399,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "bhB" = ( -/obj/machinery/light_switch/directional/east, /obj/machinery/firealarm/directional/south, +/obj/machinery/light_switch/directional/south{ + pixel_x = 8 + }, /obj/machinery/pdapainter/research, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/rd) @@ -3803,12 +3828,13 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "bok" = ( +/obj/effect/turf_decal/siding/wood/corner, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/machinery/duct, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) @@ -4167,6 +4193,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/item/radio/intercom/directional/north, /obj/structure/table, /turf/open/floor/iron/dark/side{ dir = 1 @@ -4393,6 +4420,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "bxK" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/light/directional/north, /obj/machinery/computer/security/telescreen/vault{ pixel_y = 30 }, @@ -4400,7 +4429,6 @@ dir = 4 }, /obj/machinery/disposal/bin, -/obj/machinery/light/directional/north, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "bxO" = ( @@ -4689,10 +4717,10 @@ }, /obj/machinery/requests_console/directional/north{ department = "Circuits Lab"; - name = "Circuits Lab Requests Console"; - receive_ore_updates = 1; - supplies_requestable = 1 + name = "Circuits Lab Requests Console" }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/structure/table, /obj/item/storage/toolbox/electrical{ pixel_y = 10; @@ -4972,6 +5000,7 @@ }, /obj/machinery/firealarm/directional/north, /obj/structure/table/glass, +/obj/item/storage/medkit/regular, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "bHL" = ( @@ -5145,7 +5174,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/machinery/airalarm/directional/east, +/obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/break_room) @@ -5269,11 +5298,14 @@ /turf/closed/wall/r_wall, /area/station/maintenance/department/science) "bLO" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/firealarm/directional/south, /obj/machinery/light_switch/directional/south{ pixel_x = -8 }, -/obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, /obj/item/kirbyplants/random, /turf/open/floor/wood, @@ -5490,6 +5522,11 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/break_room) +"bPp" = ( +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/station/service/chapel) "bPv" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -5639,6 +5676,13 @@ /obj/structure/sign/warning/pods/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"bSr" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "bSC" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/line{ @@ -6200,7 +6244,7 @@ /turf/open/floor/carpet/blue, /area/station/commons/dorms) "cbY" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/blue, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "cbZ" = ( @@ -6337,10 +6381,17 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "cdE" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/mapping_helpers/broken_floor, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/area/station/maintenance/department/medical) "cdI" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, @@ -6516,9 +6567,13 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "cgs" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, +/obj/machinery/airalarm/directional/west, /obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/directional/west{ + c_tag = "Science - Old Exploration Dock"; + name = "science camera"; + network = list("ss13","rd") + }, /turf/open/floor/iron/dark, /area/station/science/research/abandoned) "cgC" = ( @@ -6843,12 +6898,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/effect/turf_decal/caution/stand_clear, /obj/machinery/camera/autoname/directional/east, -/obj/machinery/door/poddoor/preopen{ - id = "bridge_blast_doors"; - name = "Bridge Access Blast Door" - }, /turf/open/floor/iron/dark, /area/station/command/bridge) "clk" = ( @@ -7181,16 +7231,11 @@ /obj/effect/turf_decal/tile/red/fourcorners, /obj/structure/rack, /obj/item/gun/ballistic/shotgun/riot{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/gun/ballistic/shotgun/riot{ - pixel_x = 3; - pixel_y = 2 + pixel_y = -4 }, +/obj/item/gun/ballistic/shotgun/riot, /obj/item/gun/ballistic/shotgun/riot{ - pixel_x = 3; - pixel_y = -1 + pixel_y = 4 }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) @@ -7376,7 +7421,7 @@ /area/station/hallway/primary/central) "cwH" = ( /obj/structure/cable, -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/blue, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "cwK" = ( @@ -8304,6 +8349,10 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron/dark, /area/station/service/chapel/office) +"cML" = ( +/obj/effect/turf_decal/vg_decals/atmos/oxygen, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) "cMT" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -8542,6 +8591,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/medical) "cQA" = ( @@ -8633,22 +8684,18 @@ /turf/closed/wall, /area/station/maintenance/department/cargo) "cRq" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/obj/machinery/oven/range, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/turf/open/floor/iron/dark/smooth_half, +/area/station/service/chapel) "cRQ" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, /obj/machinery/camera/directional/north{ c_tag = "Commons - Vacant Office, North"; name = "commons camera" }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /turf/open/floor/wood, /area/station/commons/vacant_room/office) "cSm" = ( @@ -9089,9 +9136,9 @@ }, /obj/machinery/requests_console/directional/north{ department = "Cargo Bay"; - name = "Cargo Bay Requests Console"; - supplies_requestable = 1 + name = "Cargo Bay Requests Console" }, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/machinery/vending/wardrobe/cargo_wardrobe, /turf/open/floor/iron/dark/side{ dir = 1 @@ -9478,10 +9525,10 @@ }, /obj/machinery/requests_console/directional/north{ department = "Robotics"; - name = "Robotics Requests Console"; - receive_ore_updates = 1; - supplies_requestable = 1 + name = "Robotics Requests Console" }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -9675,10 +9722,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "dhZ" = ( -/obj/structure/table/wood, -/obj/machinery/reagentgrinder{ - pixel_y = 8 - }, +/obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood, /area/station/service/bar/backroom) "dim" = ( @@ -9957,7 +10001,6 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "dnn" = ( -/obj/structure/extinguisher_cabinet/directional/west, /obj/structure/closet/secure_closet/psychology, /obj/item/toy/plush/moth{ name = "Dr. Moff" @@ -10051,9 +10094,10 @@ /turf/open/floor/plastic, /area/station/security/prison/safe) "doA" = ( -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/structure/cable, +/obj/structure/sign/warning/rad_shelter/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/prison) "doH" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -10555,10 +10599,16 @@ /area/station/hallway/secondary/entry) "dxA" = ( /obj/structure/toilet{ - dir = 4 + dir = 8 }, -/obj/machinery/light/small/directional/east, +/obj/machinery/light/small/directional/west, /obj/effect/landmark/start/medical_doctor, +/obj/machinery/button/door/directional/west{ + id = "med_break_toilet"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/break_room) "dxH" = ( @@ -10662,7 +10712,7 @@ "dzP" = ( /obj/effect/turf_decal/tile/purple/fourcorners, /obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /turf/open/floor/iron/dark, /area/station/command/bridge) "dzR" = ( @@ -10824,8 +10874,8 @@ /turf/open/floor/engine, /area/station/medical/cryo) "dCd" = ( -/obj/machinery/camera/autoname/directional/west, /obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/camera/autoname/directional/west, /obj/structure/table/reinforced, /obj/item/storage/fancy/cigarettes/cigars{ pixel_y = 14 @@ -10997,7 +11047,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/blue, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "dFp" = ( @@ -11029,10 +11079,10 @@ /area/station/hallway/primary/central) "dFC" = ( /obj/effect/turf_decal/delivery, -/obj/structure/cable, /obj/machinery/light/small/directional/south, -/obj/machinery/status_display/evac/directional/south, /obj/machinery/camera/autoname/directional/south, +/obj/machinery/newscaster/directional/south, +/obj/structure/cable, /turf/open/floor/iron/large, /area/station/engineering/gravity_generator) "dFP" = ( @@ -11058,10 +11108,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "dGg" = ( -/obj/structure/chair/sofa/right/brown{ - dir = 8 - }, -/turf/open/floor/carpet/blue, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, /area/station/medical/psychology) "dGu" = ( /obj/effect/decal/cleanable/dirt, @@ -11367,6 +11415,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/sign/warning/vacuum/external/directional/south, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "dLL" = ( @@ -11710,7 +11759,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) "dRd" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/spawner/random/bureaucracy/folder, /turf/open/floor/iron/dark, @@ -11941,6 +11990,12 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"dUR" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "dVe" = ( /obj/effect/turf_decal/delivery/white, /obj/machinery/light/directional/north, @@ -12318,12 +12373,18 @@ /area/station/service/hydroponics) "eaS" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/light/directional/east, /obj/structure/table/reinforced, /obj/item/folder/yellow{ pixel_y = 4 }, -/obj/item/multitool, -/obj/machinery/light/directional/east, +/obj/item/multitool{ + pixel_x = 6 + }, +/obj/item/extinguisher{ + pixel_x = -6; + pixel_y = 8 + }, /turf/open/floor/iron/dark, /area/station/command/bridge) "eaV" = ( @@ -12424,9 +12485,13 @@ /turf/open/space/basic, /area/space/nearstation) "edc" = ( -/obj/item/storage/pill_bottle, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/hallway/secondary/exit/departure_lounge) "edD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/checker, @@ -12468,6 +12533,7 @@ dir = 9 }, /obj/effect/turf_decal/trimline/neutral/corner, +/obj/machinery/camera/autoname/directional/west, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) @@ -12632,6 +12698,7 @@ /area/station/engineering/break_room) "ehP" = ( /obj/structure/sign/warning/secure_area/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/command/teleporter) "eia" = ( @@ -12787,6 +12854,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) +"elS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_corner, +/area/station/service/chapel) "elU" = ( /obj/effect/turf_decal/bot, /obj/structure/fireaxecabinet/directional/north, @@ -12958,6 +13031,7 @@ /area/station/security/prison/visit) "eoo" = ( /obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/station/security/prison/visit) "eot" = ( @@ -12995,6 +13069,7 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "eoL" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) @@ -13313,11 +13388,6 @@ /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) "euP" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Science - Ordnance Launcher"; - name = "science camera"; - network = list("ss13","rd") - }, /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen/ordnance{ dir = 4 @@ -13420,6 +13490,7 @@ dir = 10 }, /obj/machinery/light/small/directional/south, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/white, /area/station/medical/break_room) "ewB" = ( @@ -13716,7 +13787,6 @@ "eBn" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/closet/secure_closet/bar, /turf/open/floor/wood, /area/station/service/bar/backroom) "eBw" = ( @@ -14047,11 +14117,10 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "eIJ" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/light_switch/directional/north, -/obj/machinery/suit_storage_unit/engine, -/turf/open/floor/iron, -/area/station/engineering/main) +/obj/machinery/status_display/evac/directional/east, +/obj/structure/filingcabinet, +/turf/open/floor/iron/dark, +/area/station/security/prison/visit) "eIP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -14088,7 +14157,6 @@ /area/station/medical/cryo) "eJp" = ( /obj/machinery/light/directional/west, -/obj/machinery/status_display/evac/directional/north, /obj/structure/chair{ dir = 4 }, @@ -14408,7 +14476,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "ePa" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/item/assembly/timer, /turf/open/floor/iron/dark, @@ -14951,8 +15019,8 @@ /turf/open/floor/plating, /area/station/maintenance/port) "eYm" = ( -/obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/light/directional/west, /obj/machinery/status_display/evac/directional/west, /obj/structure/table/reinforced, /obj/item/pinpointer/nuke, @@ -15102,14 +15170,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/cargo) -"fbF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_half{ - dir = 8 - }, -/area/station/service/chapel) "fbT" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/two, @@ -15186,6 +15246,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/department/medical) "fdb" = ( @@ -15231,6 +15292,9 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) "fdI" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15681,7 +15745,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "flJ" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/black, /obj/item/storage/photo_album/chapel, /obj/item/camera, /turf/open/floor/iron/dark, @@ -15692,10 +15756,11 @@ }, /obj/effect/turf_decal/trimline/red/corner, /obj/structure/table, -/obj/item/gun/energy/laser/practice, /obj/item/gun/energy/laser/practice{ - pixel_x = 2; - pixel_y = 5 + pixel_y = 6 + }, +/obj/item/gun/energy/laser/practice{ + pixel_y = -3 }, /turf/open/floor/iron/dark, /area/station/security/office) @@ -15766,20 +15831,17 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) -"fmX" = ( -/turf/open/floor/iron/dark/smooth_half, -/area/station/service/chapel) "fmZ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 }, /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/machinery/requests_console/directional/east{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Security"; name = "Security Requests Console" }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /obj/structure/closet/secure_closet/security/cargo, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) @@ -15854,7 +15916,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "foE" = ( -/obj/machinery/camera/autoname/directional/east, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 }, @@ -16413,6 +16474,19 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) +"fzz" = ( +/obj/structure/table/wood, +/obj/item/paper_bin/carbon{ + pixel_y = 4 + }, +/obj/effect/spawner/random/bureaucracy/folder{ + pixel_y = 6 + }, +/obj/item/pen{ + pixel_y = 6 + }, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) "fzB" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 8 @@ -16574,6 +16648,9 @@ /turf/open/floor/wood/large, /area/station/security/prison/safe) "fDA" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16602,8 +16679,9 @@ /turf/open/floor/iron/dark/textured, /area/station/service/chapel/funeral) "fDQ" = ( -/obj/structure/closet/firecloset{ - anchored = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/plumbed{ + dir = 8 }, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) @@ -16846,10 +16924,11 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/foyer) "fIt" = ( -/obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/airalarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, @@ -17100,6 +17179,7 @@ /area/station/command/meeting_room) "fMq" = ( /obj/effect/turf_decal/bot, +/obj/machinery/status_display/ai/directional/south, /obj/structure/cable, /obj/machinery/power/terminal{ dir = 8 @@ -17140,7 +17220,7 @@ c_tag = "Service - Chapel Office, Backroom"; name = "service camera" }, -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/black, /obj/item/clothing/under/misc/burial, /obj/item/clothing/under/misc/burial, /obj/item/clothing/under/misc/burial, @@ -17274,8 +17354,13 @@ dir = 6 }, /obj/structure/table, -/obj/machinery/recharger, +/obj/machinery/recharger{ + pixel_x = 5 + }, /obj/machinery/firealarm/directional/east, +/obj/machinery/recharger{ + pixel_x = -5 + }, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "fPN" = ( @@ -17470,9 +17555,9 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/liquid_barrier, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/structure/liquid_barrier, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "fSM" = ( @@ -17483,6 +17568,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "fSW" = ( +/obj/effect/turf_decal/siding/wood, /obj/machinery/modular_computer/preset/id, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) @@ -17717,6 +17803,7 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "fWY" = ( +/obj/machinery/camera/autoname/directional/west, /obj/structure/chair/sofa/right/maroon{ dir = 4 }, @@ -17955,20 +18042,12 @@ /obj/structure/table, /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/machinery/recharger{ - pixel_x = -7 + pixel_x = -5 }, /obj/machinery/airalarm/directional/east, /obj/machinery/light/directional/north, /obj/machinery/recharger{ - pixel_x = 7 - }, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -3; - pixel_y = -5 - }, -/obj/item/clothing/glasses/sunglasses{ - pixel_x = 8; - pixel_y = 10 + pixel_x = 5 }, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/showroomfloor, @@ -18138,6 +18217,7 @@ dir = 8 }, /obj/machinery/light/small/directional/east, +/obj/machinery/camera/autoname/directional/east, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /obj/effect/mapping_helpers/apc/cell_5k, @@ -18153,16 +18233,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "gfA" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 8 - }, -/obj/machinery/camera/autoname/directional/east, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/wood, +/area/station/security/prison/rec) "gfF" = ( /obj/machinery/chem_master/condimaster{ name = "CondiMaster Neo" @@ -18501,6 +18574,7 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "gmC" = ( +/obj/machinery/newscaster/directional/west, /obj/structure/table, /obj/item/t_scanner{ pixel_x = -6 @@ -18757,6 +18831,7 @@ /turf/open/floor/iron/white, /area/station/science/genetics) "gqq" = ( +/obj/effect/turf_decal/siding/wood, /obj/structure/sign/poster/official/ian/directional/north, /obj/machinery/photocopier, /turf/open/floor/wood, @@ -18768,6 +18843,14 @@ /obj/structure/closet/secure_closet/warden, /obj/item/clothing/mask/gas/sechailer, /obj/item/key/security, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -5 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 8; + pixel_y = 10 + }, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "gqK" = ( @@ -18900,12 +18983,12 @@ /area/station/engineering/atmos) "gsI" = ( /obj/machinery/requests_console/directional/south{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Bridge"; - name = "Bridge Requests Console"; - can_send_announcements = 1 + name = "Bridge Requests Console" }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/command/meeting_room) @@ -19198,10 +19281,13 @@ dir = 10 }, /obj/machinery/firealarm/directional/south, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8 + }, +/obj/item/radio/intercom/directional/west, /obj/structure/chair{ dir = 4 }, -/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/security/execution) "gxx" = ( @@ -19216,21 +19302,25 @@ /obj/effect/turf_decal/tile/red/fourcorners, /obj/structure/rack, /obj/item/clothing/suit/armor/bulletproof{ - pixel_x = -3; + pixel_x = 6; pixel_y = 3 }, -/obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/suit/armor/bulletproof{ - pixel_x = 3; + pixel_x = 6 + }, +/obj/item/clothing/suit/armor/bulletproof{ + pixel_x = 6; pixel_y = -3 }, /obj/item/clothing/head/helmet/alt{ - pixel_x = -3; + pixel_x = -6; pixel_y = 3 }, -/obj/item/clothing/head/helmet/alt, /obj/item/clothing/head/helmet/alt{ - pixel_x = 3; + pixel_x = -6 + }, +/obj/item/clothing/head/helmet/alt{ + pixel_x = -6; pixel_y = -3 }, /turf/open/floor/iron/dark, @@ -19394,8 +19484,9 @@ /area/station/engineering/break_room) "gzP" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/duct, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/medical) "gzQ" = ( @@ -19410,7 +19501,6 @@ "gzT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/holopad, /turf/open/floor/wood, /area/station/medical/psychology) "gzX" = ( @@ -19470,7 +19560,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "gAI" = ( -/obj/structure/chair/comfy/beige{ +/obj/structure/chair/comfy/brown{ dir = 4 }, /obj/effect/landmark/start/assistant, @@ -19494,6 +19584,9 @@ /turf/closed/wall/r_wall, /area/station/maintenance/department/engine/atmos) "gAX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/machinery/light/small/directional/north, /turf/open/floor/wood, /area/station/commons/locker) @@ -19828,6 +19921,11 @@ }, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) +"gHu" = ( +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/service/chapel) "gHv" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 @@ -19851,10 +19949,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "bridge_blast_doors"; - name = "Bridge Access Blast Door" - }, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) "gHK" = ( @@ -20063,13 +20157,6 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"gKh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/duct, -/turf/open/floor/iron/dark, -/area/station/security/prison/safe) "gKi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -20135,7 +20222,7 @@ /turf/open/floor/iron/white, /area/station/science/research) "gLh" = ( -/turf/open/floor/iron, +/turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/exit/departure_lounge) "gLp" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, @@ -20517,6 +20604,7 @@ }, /obj/item/radio/intercom/directional/west, /obj/structure/chair, +/obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -21854,6 +21942,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "hnu" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/item/storage/secure/safe/hos{ pixel_x = 35 }, @@ -22060,8 +22151,10 @@ /area/station/science/xenobiology) "hqN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, /area/station/hallway/secondary/exit/departure_lounge) "hqV" = ( /obj/effect/turf_decal/delivery, @@ -22222,11 +22315,14 @@ /turf/open/floor/plating, /area/station/security/brig/entrance) "hte" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/sign/flag/nanotrasen/directional/east, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/sign/flag/nanotrasen/directional/east, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "hts" = ( @@ -22253,6 +22349,7 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance) "huo" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) @@ -22564,13 +22661,13 @@ /turf/open/floor/plating, /area/station/engineering/atmos) "hyb" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/all_access, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 1 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "hyd" = ( @@ -23385,15 +23482,11 @@ /turf/open/floor/iron, /area/station/command/gateway) "hMB" = ( -/obj/machinery/requests_console/directional/west{ - department = "Chapel"; - name = "Chapel Requests Console"; - assistance_requestable = 1 - }, /obj/structure/chair/comfy/brown{ dir = 4 }, /obj/effect/landmark/start/chaplain, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/service/chapel/office) "hMD" = ( @@ -23700,12 +23793,9 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, -/obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_x = -7 - }, -/obj/machinery/recharger{ - pixel_x = 7 +/obj/machinery/camera/directional/east{ + c_tag = "Security - Armory, East"; + name = "security camera" }, /obj/machinery/button/door/directional/east{ id = "armory_side_access"; @@ -23713,9 +23803,11 @@ req_access = list("armory"); pixel_y = -6 }, -/obj/machinery/camera/directional/east{ - c_tag = "Security - Armory, East"; - name = "security camera" +/obj/machinery/button/door/directional/east{ + id = "armory_desk"; + name = "Armory Desk Shutters Control"; + req_access = list("armory"); + pixel_y = 6 }, /obj/machinery/button/door/directional/east{ id = "armory_window_shutters"; @@ -23724,11 +23816,13 @@ pixel_y = 6; pixel_x = 38 }, -/obj/machinery/button/door/directional/east{ - id = "armory_desk"; - name = "Armory Desk Shutters Control"; - req_access = list("armory"); - pixel_y = 6 +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_x = -9 + }, +/obj/machinery/recharger, +/obj/machinery/recharger{ + pixel_x = 9 }, /obj/item/toy/figure/warden{ pixel_y = 14 @@ -23872,6 +23966,10 @@ "hUQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "bridge_blast_doors"; + name = "Bridge Access Blast Door" + }, /turf/open/floor/plating, /area/station/command/bridge) "hUS" = ( @@ -24186,8 +24284,8 @@ /area/station/command/heads_quarters/hos) "icv" = ( /obj/effect/turf_decal/bot, +/obj/machinery/status_display/evac/directional/south, /obj/machinery/power/port_gen/pacman/pre_loaded, -/obj/machinery/newscaster/directional/south, /turf/open/floor/iron/large, /area/station/engineering/gravity_generator) "icx" = ( @@ -24397,6 +24495,7 @@ /turf/open/floor/plating, /area/station/service/hydroponics) "iiC" = ( +/obj/machinery/camera/autoname/directional/north, /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null }, @@ -24514,8 +24613,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "ijZ" = ( -/obj/effect/spawner/random/structure/table, -/obj/effect/spawner/random/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/firecloset{ + anchored = 1 + }, /turf/open/floor/plating, /area/station/maintenance/department/medical) "ika" = ( @@ -24589,7 +24690,7 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/machinery/griddle, +/obj/machinery/oven/range, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "ikX" = ( @@ -24690,14 +24791,14 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, +/obj/machinery/light/small/directional/east, /obj/machinery/requests_console/directional/east{ - assistance_requestable = 1; department = "Engineering"; - name = "Engineering Requests Console"; - supplies_requestable = 1 + name = "Engineering Requests Console" }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/structure/table, -/obj/machinery/light/small/directional/east, /obj/item/stack/ducts/fifty, /obj/item/stack/ducts/fifty, /obj/item/construction/plumbing/engineering, @@ -24905,10 +25006,15 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "ipC" = ( +/obj/machinery/firealarm/directional/east{ + pixel_y = 6 + }, +/obj/machinery/light_switch/directional/east{ + pixel_y = -4 + }, /obj/structure/chair{ dir = 8 }, -/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -24929,11 +25035,13 @@ /area/station/maintenance/starboard/fore) "ipH" = ( /obj/machinery/light/small/directional/east, -/obj/structure/filingcabinet, /obj/machinery/requests_console/directional/east{ department = "Law Office"; name = "Law Office Requests Console" }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/structure/filingcabinet, /turf/open/floor/wood, /area/station/service/lawoffice) "ipL" = ( @@ -25177,10 +25285,11 @@ /turf/open/floor/iron/large, /area/station/security/prison/safe) "itm" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/siding/wood, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /obj/structure/table, /obj/machinery/fax{ @@ -25252,6 +25361,15 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark/side, /area/station/commons/dorms) +"itS" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "itU" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, @@ -25581,11 +25699,14 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "ixc" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /obj/structure/disposalpipe/junction{ dir = 1 }, /obj/structure/chair/wood, -/turf/open/floor/carpet/royalblue, +/turf/open/floor/wood, /area/station/command/heads_quarters/captain) "ixw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25651,6 +25772,15 @@ /obj/structure/closet/secure_closet/atmospherics, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/office) +"iyk" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "iym" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/line{ @@ -26001,9 +26131,9 @@ "iFL" = ( /obj/machinery/requests_console/directional/south{ department = "Bar"; - name = "Bar Requests Console"; - supplies_requestable = 1 + name = "Bar Requests Console" }, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/structure/table, /obj/item/book/manual/wiki/barman_recipes{ pixel_y = 4 @@ -26073,7 +26203,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "iGG" = ( @@ -26589,11 +26718,14 @@ /turf/open/floor/iron/checker, /area/station/science/lab) "iNY" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "iNZ" = ( @@ -26924,8 +27056,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/structure/cable, /obj/machinery/airalarm/directional/west, +/obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/gravity_generator) "iVh" = ( @@ -27224,7 +27356,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, -/obj/machinery/light/directional/east, +/obj/machinery/light/small/directional/east, /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/security/execution) @@ -27449,6 +27581,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"jee" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "jef" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -27464,6 +27606,7 @@ "jeu" = ( /obj/structure/sign/warning/radiation/directional/east, /obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/white, /area/station/maintenance/department/science) "jeL" = ( @@ -27523,8 +27666,10 @@ /area/station/hallway/secondary/entry) "jgV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /turf/open/floor/wood, /area/station/medical/psychology) "jgW" = ( @@ -27549,11 +27694,9 @@ /area/station/command/heads_quarters/cmo) "jhf" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/research/abandoned) +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "jhj" = ( /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, @@ -27566,11 +27709,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/liquid_barrier, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/structure/liquid_barrier, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "jhq" = ( @@ -27633,7 +27779,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/carpet/royalblue, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, /area/station/command/heads_quarters/captain) "jiy" = ( /obj/machinery/light/small/directional/north, @@ -27735,6 +27884,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) "jkz" = ( @@ -27876,6 +28026,9 @@ /turf/closed/wall, /area/station/service/hydroponics/garden) "jmn" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -27954,7 +28107,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 1 }, -/obj/structure/sign/poster/official/help_others/directional/south, +/obj/machinery/station_map/engineering/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "joc" = ( @@ -28029,6 +28182,13 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, /area/station/engineering/storage) +"jqp" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/obj/machinery/griddle, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "jqs" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -28073,19 +28233,36 @@ dir = 5 }, /obj/structure/table/reinforced, -/obj/item/storage/box/flashbangs{ - pixel_x = -3; - pixel_y = -3 +/obj/item/clothing/mask/gas/sechailer{ + pixel_y = -6; + pixel_x = -6 }, -/obj/item/storage/box/flashes, -/obj/item/storage/box/teargas{ - pixel_x = 3; - pixel_y = 3 +/obj/item/clothing/mask/gas/sechailer{ + pixel_y = -6; + pixel_x = 6 }, -/obj/item/storage/box/handcuffs{ - pixel_y = 5; +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -6 + }, +/obj/item/clothing/mask/gas/sechailer{ pixel_x = 6 }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_y = 6; + pixel_x = -6 + }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_y = 6; + pixel_x = 6 + }, +/obj/item/flashlight/seclite{ + pixel_y = -6 + }, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite{ + pixel_y = 6 + }, +/obj/item/clothing/head/helmet/toggleable/justice, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "jsa" = ( @@ -28420,6 +28597,14 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"jxh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/station/service/chapel) "jxl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/structure/lattice, @@ -28684,6 +28869,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/duct, /obj/machinery/door/airlock/maintenance{ name = "Medical Break Room Maintenance" }, @@ -29492,6 +29679,9 @@ /turf/open/floor/iron/white, /area/station/maintenance/port/fore) "jOV" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/machinery/keycard_auth/directional/east, /obj/structure/bed/dogbed/lia, /mob/living/basic/carp/pet/lia, @@ -29872,7 +30062,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "jVE" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/black, /obj/item/flashlight/lamp, /turf/open/floor/iron/dark, /area/station/service/chapel/office) @@ -30128,8 +30318,9 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "jZI" = ( +/obj/effect/turf_decal/siding/wood, /obj/item/radio/intercom/directional/west, -/turf/open/floor/carpet/blue, +/turf/open/floor/wood, /area/station/medical/psychology) "jZY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30266,6 +30457,10 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/wood, /area/station/service/library/private) +"kdC" = ( +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "kdH" = ( /obj/structure/cable, /turf/open/floor/engine, @@ -30555,7 +30750,7 @@ /area/station/science/research) "kie" = ( /obj/machinery/airalarm/directional/south, -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/black, /obj/item/book/granter/action/spell/smoke/lesser{ name = "mysterious old book of cloud-chasing" }, @@ -30607,6 +30802,7 @@ /area/station/hallway/primary/central) "kiC" = ( /obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/newscaster/directional/west, /obj/structure/closet/secure_closet/security/sec, /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) @@ -30778,10 +30974,6 @@ /turf/open/floor/iron/white, /area/station/science/research) "klo" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Atmospherics Pumping Room"; - name = "engineering camera" - }, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 }, @@ -30809,15 +31001,7 @@ /area/space) "klQ" = ( /obj/effect/turf_decal/tile/red/fourcorners, -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/item/storage/box/firingpins, -/obj/item/storage/box/firingpins{ - pixel_y = 3; - pixel_x = 3 - }, -/obj/item/gun/energy/temperature/security, -/obj/item/gun/energy/ionrifle, +/obj/machinery/ammo_workbench, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "klX" = ( @@ -30907,11 +31091,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/liquid_barrier, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/science/xenobio, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/liquid_barrier, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "knX" = ( @@ -31047,7 +31231,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "kpP" = ( -/obj/item/radio/intercom/directional/west, +/obj/machinery/requests_console/directional/west{ + department = "Chapel"; + name = "Chapel Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron/dark, /area/station/service/chapel/office) "kpW" = ( @@ -31169,10 +31357,10 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "krY" = ( -/obj/machinery/light/small/built/directional/east, -/obj/effect/spawner/random/structure/closet_maintenance, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) "ksa" = ( /turf/open/space/basic, /area/space) @@ -31881,8 +32069,8 @@ dir = 8 }, /obj/machinery/light/small/directional/west, -/obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, /obj/effect/mapping_helpers/apc/cell_5k, /turf/open/floor/iron, /area/station/engineering/gravity_generator) @@ -31923,6 +32111,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "kFQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/machinery/light/directional/east, /obj/structure/sign/flag/nanotrasen/directional/east, /obj/machinery/suit_storage_unit/hos, @@ -32063,20 +32254,24 @@ /obj/structure/window/reinforced/spawner/directional/north, /obj/item/clothing/suit/armor/vest/alt/sec{ pixel_y = 3; - pixel_x = -3 + pixel_x = 6 + }, +/obj/item/clothing/suit/armor/vest/alt/sec{ + pixel_x = 6 }, -/obj/item/clothing/suit/armor/vest/alt/sec, /obj/item/clothing/suit/armor/vest/alt/sec{ pixel_y = -3; - pixel_x = 3 + pixel_x = 6 }, /obj/item/clothing/head/helmet/sec{ - pixel_x = -3; + pixel_x = -6; pixel_y = 3 }, -/obj/item/clothing/head/helmet/sec, /obj/item/clothing/head/helmet/sec{ - pixel_x = 3; + pixel_x = -6 + }, +/obj/item/clothing/head/helmet/sec{ + pixel_x = -6; pixel_y = -3 }, /turf/open/floor/iron/dark, @@ -32203,7 +32398,7 @@ }, /area/station/engineering/break_room) "kLf" = ( -/obj/effect/spawner/random/structure/table, +/obj/structure/table, /obj/effect/spawner/random/maintenance/three, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -32246,9 +32441,6 @@ /turf/open/floor/plating, /area/station/maintenance/port) "kMh" = ( -/obj/structure/chair/sofa/left/brown{ - dir = 8 - }, /turf/open/floor/carpet/blue, /area/station/medical/psychology) "kMC" = ( @@ -32266,11 +32458,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, -/obj/machinery/requests_console/directional/south{ - department = "Kitchen"; - name = "Kitchen Requests Console"; - supplies_requestable = 1 - }, /obj/structure/table, /obj/machinery/microwave{ pixel_y = 6 @@ -32293,6 +32480,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "kMW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/machinery/newscaster/directional/west, /obj/machinery/vending/cart, /turf/open/floor/wood, @@ -32378,7 +32568,11 @@ pixel_x = 24 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/duct, +/obj/structure/liquid_barrier, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ autoclose = 0; @@ -32387,14 +32581,10 @@ name = "Xenobiology Lab External Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/liquid_barrier, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/iron/white/textured, /area/station/science/xenobiology/hallway) "kNJ" = ( @@ -32628,19 +32818,18 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/poddoor/preopen{ - id = "bridge_blast_doors"; - name = "Bridge Access Blast Door" - }, /turf/open/floor/iron/dark, /area/station/command/bridge) "kQX" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Atmospherics Pumping Room"; + name = "engineering camera" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ dir = 1 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "kRc" = ( @@ -33796,6 +33985,9 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "ljt" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/structure/cable, /obj/machinery/computer/accounting{ dir = 4 @@ -33904,10 +34096,6 @@ }, /obj/structure/sign/warning/doors/directional/west, /obj/machinery/light/small/directional/west, -/obj/machinery/door/poddoor/preopen{ - id = "bridge_blast_doors"; - name = "Bridge Access Blast Door" - }, /turf/open/floor/iron/dark, /area/station/command/bridge) "lme" = ( @@ -34031,6 +34219,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/commons/fitness) +"los" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/security/prison/safe) "lou" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34078,10 +34273,11 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "loR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/holopad, -/turf/open/floor/iron/large, +/turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/exit/departure_lounge) "lpc" = ( /obj/structure/chair/office, @@ -34520,9 +34716,11 @@ /turf/open/floor/iron/dark, /area/station/security/office) "lwa" = ( -/obj/effect/spawner/random/structure/tank_holder, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) +/obj/structure/chair/sofa/right/brown{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) "lwj" = ( /obj/structure/cable/layer1, /turf/open/floor/plating/airless, @@ -34559,6 +34757,7 @@ /area/station/command/heads_quarters/hop) "lwy" = ( /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/break_room) "lwL" = ( @@ -34601,6 +34800,9 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "lyp" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /obj/machinery/camera/directional/south{ c_tag = "Command - Head of Personnel's Office"; name = "command camera" @@ -34621,25 +34823,29 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = 3; +/obj/item/storage/box/flashbangs{ + pixel_x = -6; pixel_y = -3 }, -/obj/item/flashlight/seclite{ - pixel_x = -3; - pixel_y = -3 +/obj/item/storage/box/flashes{ + pixel_x = -6 }, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite{ - pixel_x = 3; - pixel_y = 3 +/obj/item/storage/box/teargas{ + pixel_y = 3; + pixel_x = -6 }, -/obj/item/clothing/head/helmet/toggleable/justice, +/obj/item/storage/box/handcuffs{ + pixel_y = -3; + pixel_x = 6 + }, +/obj/item/storage/box/firingpins{ + pixel_x = 6 + }, +/obj/item/storage/box/firingpins{ + pixel_y = 3; + pixel_x = 6 + }, +/obj/item/disk/ammo_workbench/advanced, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "lyC" = ( @@ -34682,6 +34888,13 @@ /area/station/service/library/private) "lyT" = ( /obj/item/radio/intercom/directional/north, +/obj/structure/closet/secure_closet{ + req_access = list("bar"); + name = "Gun Locker" + }, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/beanbag, +/obj/item/gun/ballistic/shotgun/doublebarrel, /turf/open/floor/wood, /area/station/service/bar/backroom) "lyV" = ( @@ -34868,6 +35081,9 @@ /turf/open/floor/wood, /area/station/security/detectives_office) "lCn" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, /obj/item/radio/intercom{ dir = 8; pixel_x = -28 @@ -35076,6 +35292,13 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/central) +"lFE" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) "lFJ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -35301,7 +35524,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "lJD" = ( @@ -36001,9 +36223,7 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "lWL" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, +/obj/structure/chair/comfy/brown, /obj/effect/landmark/start/psychologist, /turf/open/floor/carpet/blue, /area/station/medical/psychology) @@ -36167,9 +36387,10 @@ /turf/open/floor/iron, /area/station/engineering/main) "lZJ" = ( -/obj/structure/chair/comfy/beige{ +/obj/structure/chair/comfy/brown{ dir = 1 }, +/obj/effect/landmark/start/hangover, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) "lZP" = ( @@ -36293,12 +36514,12 @@ /turf/open/floor/grass, /area/station/medical/medbay/central) "maX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/wood, /area/station/commons/vacant_room/office) "mbo" = ( @@ -36601,6 +36822,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "mhf" = ( +/obj/effect/turf_decal/siding/wood, /obj/structure/cable, /obj/machinery/computer/security/hos, /turf/open/floor/wood, @@ -36793,6 +37015,9 @@ pixel_x = 10; pixel_y = 6 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) "mky" = ( @@ -37089,7 +37314,7 @@ /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) "mpP" = ( -/obj/structure/chair/office/light{ +/obj/structure/chair/office{ dir = 1 }, /obj/effect/landmark/start/virologist, @@ -37345,9 +37570,16 @@ /turf/open/floor/iron/white, /area/station/security/medical) "mta" = ( -/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, /obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/machinery/newscaster/directional/north, /obj/structure/table/wood, +/obj/item/toy/figure/hos{ + pixel_x = -9; + pixel_y = 7 + }, /obj/item/storage/box/seccarts{ pixel_x = 4; pixel_y = 6 @@ -37358,10 +37590,6 @@ /obj/item/taperecorder{ pixel_x = 4 }, -/obj/item/toy/figure/hos{ - pixel_x = -9; - pixel_y = 7 - }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) "mtc" = ( @@ -38044,6 +38272,7 @@ /turf/open/floor/iron, /area/station/construction) "mHH" = ( +/obj/effect/turf_decal/siding/wood/corner, /obj/machinery/holopad, /turf/open/floor/wood, /area/station/security/detectives_office) @@ -38132,11 +38361,14 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "mJa" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/south, /obj/machinery/light_switch/directional/south{ pixel_x = 8 }, -/obj/machinery/firealarm/directional/south, /turf/open/floor/wood, /area/station/commons/locker) "mJo" = ( @@ -38253,10 +38485,12 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "mMv" = ( -/obj/machinery/button/flasher{ - id = "hopflash"; - pixel_x = 6; - pixel_y = 34 +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/button/door/directional/north{ + pixel_x = -6; + id = "hop_queue"; + name = "Queue Shutters Control"; + req_access = list("hop") }, /obj/machinery/button/door/directional/north{ pixel_x = 6; @@ -38264,17 +38498,16 @@ name = "Privacy Shutters Control"; req_access = list("hop") }, -/obj/machinery/button/door/directional/north{ - pixel_x = -6; - id = "hop_queue"; - name = "Queue Shutters Control"; - req_access = list("hop") - }, -/obj/machinery/pdapainter, /obj/machinery/button/ticket_machine{ pixel_x = -6; pixel_y = 34 }, +/obj/machinery/button/flasher{ + id = "hopflash"; + pixel_x = 6; + pixel_y = 34 + }, +/obj/machinery/pdapainter, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "mMI" = ( @@ -38500,6 +38733,7 @@ /area/station/medical/medbay/central) "mQo" = ( /obj/machinery/camera/autoname/directional/north, +/obj/machinery/status_display/evac/directional/north, /obj/structure/table, /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/white, @@ -38695,11 +38929,11 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, -/obj/machinery/requests_console/auto_name/directional/north{ +/obj/machinery/requests_console/directional/north{ department = "Virology"; - name = "Pathology Requests Console"; - receive_ore_updates = 1 + name = "Pathology Requests Console" }, +/obj/effect/mapping_helpers/requests_console/ore_update, /obj/machinery/computer/records/pathology, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -38789,6 +39023,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/machinery/light/small/directional/north, /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/station/engineering/main) @@ -39347,6 +39582,8 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/break_room) "nfq" = ( @@ -39364,9 +39601,9 @@ }, /obj/machinery/requests_console/directional/north{ department = "Mining"; - name = "Mining Requests Console"; - supplies_requestable = 1 + name = "Mining Requests Console" }, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/structure/table, /obj/machinery/microwave{ pixel_y = 6 @@ -39460,10 +39697,10 @@ /turf/open/floor/iron/white, /area/station/maintenance/port/fore) "nha" = ( +/obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/commons/vacant_room/office) "nhn" = ( @@ -39492,6 +39729,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/checker, /area/station/science/lab) +"nhv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/white, +/area/station/maintenance/department/science) "nhL" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -39675,14 +39919,18 @@ }, /obj/structure/table/reinforced, /obj/item/soap/nanotrasen, +/obj/item/storage/box/trackimp{ + pixel_x = -9; + pixel_y = 9 + }, /obj/item/storage/box/hug{ - pixel_x = 5; - pixel_y = 7 + pixel_y = 9 }, -/obj/item/toy/plush/carpplushie{ - name = "Jeff"; - desc = "An adorable stuffed toy that resembles a space carp. The warden was given Jeff to soothe rampant anger issues" +/obj/item/storage/box/chemimp{ + pixel_x = 9; + pixel_y = 9 }, +/obj/item/storage/lockbox/loyalty, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "nkv" = ( @@ -40377,19 +40625,10 @@ /turf/open/floor/iron/dark/textured_large, /area/station/hallway/secondary/entry) "nwj" = ( -/obj/machinery/light/directional/south, -/obj/structure/table/wood, -/obj/item/paper_bin/carbon{ - pixel_y = 4 - }, -/obj/effect/spawner/random/bureaucracy/folder{ - pixel_y = 6 - }, -/obj/effect/spawner/random/bureaucracy/pen{ - pixel_y = 6 +/turf/open/floor/iron/dark/corner{ + dir = 8 }, -/turf/open/floor/carpet/blue, -/area/station/medical/psychology) +/area/station/hallway/secondary/exit/departure_lounge) "nwu" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -40680,7 +40919,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, -/obj/structure/noticeboard/directional/north, +/obj/machinery/station_map/engineering/directional/north, /turf/open/floor/iron/white, /area/station/science/research) "nAR" = ( @@ -40805,6 +41044,7 @@ /turf/open/floor/plating, /area/station/maintenance/central) "nCB" = ( +/obj/machinery/camera/autoname/directional/north, /obj/structure/chair/sofa/middle/maroon, /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark/side{ @@ -41374,9 +41614,13 @@ }, /area/station/hallway/secondary/service) "nLl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/medical) "nLC" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -42022,6 +42266,10 @@ dir = 1 }, /obj/effect/landmark/navigate_destination/bridge, +/obj/machinery/door/poddoor/preopen{ + id = "bridge_blast_doors"; + name = "Bridge Access Blast Door" + }, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) "nXA" = ( @@ -42253,8 +42501,13 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "oaK" = ( -/obj/machinery/firealarm/directional/east, +/obj/machinery/firealarm/directional/east{ + pixel_y = 6 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/east{ + pixel_y = -4 + }, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "oaN" = ( @@ -42419,7 +42672,7 @@ /area/station/service/kitchen) "oda" = ( /obj/effect/turf_decal/tile/purple/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/structure/window/reinforced/spawner/directional/west, /obj/item/experi_scanner, /turf/open/floor/iron/dark, @@ -42432,8 +42685,13 @@ /area/station/commons/dorms) "ody" = ( /obj/effect/turf_decal/bot, -/obj/machinery/firealarm/directional/west, +/obj/machinery/firealarm/directional/west{ + pixel_y = 5 + }, /obj/machinery/portable_atmospherics/pump, +/obj/machinery/light_switch/directional/west{ + pixel_y = -6 + }, /turf/open/floor/iron, /area/station/engineering/main) "odC" = ( @@ -42476,6 +42734,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/break_room) "oeH" = ( @@ -42593,9 +42852,9 @@ }, /obj/machinery/requests_console/directional/west{ department = "Hydroponics"; - name = "Hydroponics Requests Console"; - supplies_requestable = 1 + name = "Hydroponics Requests Console" }, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/structure/closet/crate/hydroponics, /obj/item/wirecutters, /obj/item/wrench, @@ -42635,13 +42894,6 @@ /area/station/maintenance/department/science) "oha" = ( /obj/structure/table/glass, -/obj/item/crowbar/red, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = -8 - }, -/obj/item/clothing/mask/breath{ - pixel_x = 4 - }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "ohf" = ( @@ -42775,6 +43027,9 @@ /turf/open/floor/iron, /area/station/engineering/storage_shared) "oiO" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/structure/cable, /turf/open/floor/wood, /area/station/commons/locker) @@ -43523,11 +43778,7 @@ /area/station/service/chapel/office) "ovO" = ( /obj/structure/table, -/obj/item/reagent_containers/pill/maintenance, -/obj/item/reagent_containers/pill/maintenance{ - pixel_y = 8; - pixel_x = -7 - }, +/obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/department/medical) "ovS" = ( @@ -43727,11 +43978,11 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, -/obj/machinery/airalarm/directional/east, -/obj/effect/mapping_helpers/airalarm/mixingchamber_access, /turf/open/floor/iron/dark, /area/station/science/ordnance/burnchamber) "oyN" = ( @@ -43772,14 +44023,9 @@ }, /obj/machinery/firealarm/directional/south, /obj/structure/table/wood, -/obj/item/stack/sheet/iron/fifty{ - pixel_y = 5; - pixel_x = -4 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_y = 5 +/obj/machinery/reagentgrinder{ + pixel_y = 8 }, -/obj/item/stack/cable_coil, /turf/open/floor/wood, /area/station/service/bar/backroom) "ozZ" = ( @@ -44035,15 +44281,20 @@ /area/station/engineering/atmos/pumproom) "oDW" = ( /obj/effect/turf_decal/tile/red/fourcorners, -/obj/structure/table/reinforced, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -3; +/obj/structure/rack, +/obj/item/gun/grenadelauncher{ + pixel_y = 9 + }, +/obj/item/grenade/barrier{ + pixel_x = -6; pixel_y = 3 }, -/obj/item/clothing/mask/gas/sechailer, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = 3; - pixel_y = -3 +/obj/item/grenade/barrier{ + pixel_y = 3 + }, +/obj/item/grenade/barrier{ + pixel_x = 6; + pixel_y = 3 }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) @@ -44151,6 +44402,15 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/textured, /area/station/science/ordnance/office) +"oGl" = ( +/obj/structure/lattice, +/obj/machinery/camera/directional/south{ + c_tag = "AI Sat - External, Northeast"; + network = list("minisat"); + start_active = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) "oHa" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/status_display/evac/directional/south, @@ -44212,8 +44472,12 @@ /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "oIb" = ( -/turf/closed/wall, -/area/space/nearstation) +/obj/machinery/light/directional/south, +/obj/structure/chair/sofa/middle/brown{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) "oIc" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 @@ -44340,9 +44604,9 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/machinery/requests_console/directional/south{ department = "Service Hall"; - name = "Service Hall Requests Console"; - supplies_requestable = 1 + name = "Service Hall Requests Console" }, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/machinery/computer/department_orders/service{ dir = 1 }, @@ -44624,7 +44888,10 @@ /area/station/commons/toilet/restrooms) "oOl" = ( /obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/reagent_dispensers/beerkeg, +/obj/machinery/chem_master/condimaster{ + desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; + name = "HoochMaster Deluxe" + }, /turf/open/floor/wood, /area/station/service/bar/backroom) "oOy" = ( @@ -44953,6 +45220,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/machinery/light/directional/north, /obj/machinery/requests_console/directional/north{ department = "Pharmacy"; name = "Pharmacy Requests Console"; @@ -44960,6 +45228,9 @@ receive_ore_updates = 1; assistance_requestable = 1 }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/structure/table/reinforced/rglass, /obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/dropper, @@ -44968,8 +45239,6 @@ pixel_x = -6; pixel_y = 6 }, -/obj/item/toy/figure/chemist, -/obj/machinery/light/directional/north, /turf/open/floor/iron/white, /area/station/medical/pharmacy) "oTX" = ( @@ -45127,6 +45396,7 @@ "oXb" = ( /obj/structure/cable, /obj/machinery/light/directional/east, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "oXi" = ( @@ -45169,6 +45439,11 @@ }, /obj/item/radio/intercom/directional/west, /obj/structure/table/reinforced, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Ordnance Launcher"; + name = "science camera"; + network = list("ss13","rd") + }, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "oYl" = ( @@ -45193,13 +45468,13 @@ /area/station/security/brig) "oYs" = ( /obj/effect/turf_decal/trimline/brown/filled/line, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/requests_console/directional/south{ department = "Cargo Bay"; - name = "Cargo Bay Requests Console"; - supplies_requestable = 1 + name = "Cargo Bay Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/autolathe, /turf/open/floor/iron/dark/side, @@ -45574,6 +45849,7 @@ /area/station/command/meeting_room) "pgv" = ( /obj/machinery/light/small/directional/east, +/obj/machinery/newscaster/directional/east, /obj/machinery/vending/wardrobe/atmos_wardrobe, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) @@ -45640,11 +45916,11 @@ /obj/machinery/light/small/directional/east, /obj/machinery/requests_console/directional/east{ department = "Chief Medical Officer's Desk"; - name = "Chief Medical Officer's Requests Console"; - anon_tips_receiver = 1; - assistance_requestable = 1; - can_send_announcements = 1 + name = "Chief Medical Officer's Requests Console" }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -46032,11 +46308,11 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/structure/cable, +/obj/structure/liquid_barrier, /obj/machinery/door/airlock/hatch{ name = "Cytology Pen" }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, /turf/open/floor/engine, /area/station/science/xenobiology) "poG" = ( @@ -46048,10 +46324,10 @@ }, /obj/machinery/requests_console/directional/west{ department = "Science"; - name = "Science Requests Console"; - receive_ore_updates = 1; - supplies_requestable = 1 + name = "Science Requests Console" }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/machinery/vending/coffee, /turf/open/floor/iron/dark, /area/station/science/breakroom) @@ -46064,6 +46340,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"ppi" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/commons/locker) "ppj" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 5 @@ -47207,12 +47489,12 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, +/obj/structure/liquid_barrier, /obj/machinery/door/airlock/research/glass{ name = "Kill Chamber"; normalspeed = 0 }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/liquid_barrier, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) "pHr" = ( @@ -47286,7 +47568,7 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "pHX" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/black, /obj/item/storage/fancy/candle_box{ pixel_y = 5 }, @@ -47382,6 +47664,10 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) +"pJW" = ( +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/carpet, +/area/station/hallway/secondary/entry) "pKc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/west, @@ -47665,19 +47951,19 @@ /turf/open/floor/iron, /area/station/cargo/storage) "pOC" = ( -/obj/item/radio/intercom/directional/west, -/obj/machinery/button/door/directional/north{ +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/button/door/directional/west{ id = "hos_privacy"; name = "Privacy Shutters Control"; - pixel_x = -24 + req_access = list("security") }, /obj/machinery/requests_console/directional/north{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Head of Security's Desk"; - name = "Head of Security Requests Console"; - can_send_announcements = 1 + name = "Head of Security Requests Console" }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /obj/structure/table/wood, /obj/machinery/fax{ fax_name = "Head of Security's Office"; @@ -47914,11 +48200,6 @@ "pTV" = ( /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) -"pUl" = ( -/turf/open/floor/iron/dark/smooth_corner{ - dir = 8 - }, -/area/station/service/chapel) "pUp" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/neutral/line{ @@ -47955,6 +48236,7 @@ dir = 1 }, /obj/machinery/light/small/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/medical/break_room) @@ -48514,13 +48796,15 @@ /turf/closed/wall, /area/station/medical/surgery) "qfo" = ( +/obj/effect/turf_decal/siding/wood, /obj/structure/cable, -/turf/open/floor/carpet/royalblue, +/turf/open/floor/wood, /area/station/command/heads_quarters/captain) "qfv" = ( /obj/machinery/light/small/directional/east, /obj/structure/sign/poster/official/random/directional/east, /obj/structure/rack, +/obj/item/crowbar/red, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "qgd" = ( @@ -48622,6 +48906,10 @@ /obj/machinery/station_map/engineering/directional/east, /turf/open/floor/carpet, /area/station/service/library) +"qhj" = ( +/obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "qhp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48661,6 +48949,7 @@ /turf/open/floor/iron/dark, /area/station/command/teleporter) "qid" = ( +/obj/effect/turf_decal/siding/wood, /obj/structure/chair/wood, /turf/open/floor/wood, /area/station/security/detectives_office) @@ -48878,11 +49167,11 @@ }, /obj/machinery/requests_console/directional/north{ department = "Chief Engineer's Desk"; - name = "Chief Engineer's Requests Console"; - assistance_requestable = 1; - supplies_requestable = 1; - can_send_announcements = 1 + name = "Chief Engineer's Requests Console" }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, @@ -49018,11 +49307,6 @@ "qpB" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Science - Auxiliary Lab"; - name = "science camera"; - network = list("ss13","rd") - }, /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/white, /area/station/science/auxlab) @@ -49244,10 +49528,10 @@ /obj/machinery/camera/autoname/directional/south, /obj/machinery/requests_console/directional/south{ department = "Security"; - name = "Security Requests Console"; - anon_tips_receiver = 1; - assistance_requestable = 1 + name = "Security Requests Console" }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /obj/machinery/modular_computer/preset/cargochat/security{ dir = 1 }, @@ -49688,6 +49972,7 @@ /obj/effect/turf_decal/trimline/blue/line{ dir = 4 }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "qAk" = ( @@ -49780,18 +50065,19 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, +/obj/machinery/light/small/directional/north, /obj/machinery/requests_console/directional/north{ - anon_tips_receiver = 1; department = "Engineering"; name = "Engineering Requests Console" }, -/obj/machinery/light/small/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron, /area/station/engineering/main) "qCD" = ( @@ -49958,6 +50244,10 @@ /obj/machinery/reagentgrinder{ pixel_y = 8 }, +/obj/item/toy/figure/chemist{ + pixel_x = -10; + pixel_y = 8 + }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) "qGq" = ( @@ -50123,10 +50413,11 @@ }, /area/station/service/hydroponics) "qIN" = ( -/obj/machinery/light/small/built/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/machinery/status_display/ai/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "qJc" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -50404,10 +50695,13 @@ /turf/closed/wall, /area/station/medical/office) "qOQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, @@ -50595,6 +50889,7 @@ dir = 1 }, /obj/structure/chair, +/obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -50971,6 +51266,12 @@ /obj/machinery/vending/games, /turf/open/floor/wood, /area/station/service/library/lounge) +"qYQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "qYS" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, @@ -51129,7 +51430,7 @@ "rbv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/blue, /obj/item/paper_bin, /obj/item/pen, /turf/open/floor/iron/dark, @@ -51209,7 +51510,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "rcG" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/black, /turf/open/floor/iron/dark, /area/station/service/chapel/office) "rcJ" = ( @@ -51351,6 +51652,7 @@ /turf/closed/wall, /area/station/medical/virology) "rfB" = ( +/obj/machinery/camera/autoname/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 }, @@ -51804,12 +52106,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "bridge_blast_doors"; - name = "Bridge Access Blast Door" - }, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) +"rmJ" = ( +/obj/effect/turf_decal/vg_decals/atmos/nitrogen, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) "rmM" = ( /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 9 @@ -51955,6 +52257,9 @@ /turf/open/floor/engine, /area/station/engineering/engine_smes) "roS" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/machinery/light/small/directional/north, /obj/machinery/vending/cigarette, /turf/open/floor/wood, @@ -52200,6 +52505,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "rtz" = ( +/obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/break_room) "rtE" = ( @@ -52450,6 +52757,7 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, +/obj/machinery/light/small/directional/east, /obj/structure/table, /turf/open/floor/iron/dark, /area/station/security/execution) @@ -52767,11 +53075,11 @@ dir = 1 }, /obj/machinery/requests_console/directional/north{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Security"; name = "Security Requests Console" }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /obj/machinery/computer/records/security, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) @@ -52838,6 +53146,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "rCT" = ( @@ -53050,10 +53361,11 @@ }, /area/station/commons/locker) "rFd" = ( -/obj/machinery/computer/security/telescreen/entertainment/directional/north, /obj/machinery/light/directional/north, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/obj/effect/turf_decal/siding/wood, /obj/structure/cable, -/turf/open/floor/carpet/royalblue, +/turf/open/floor/wood, /area/station/command/heads_quarters/captain) "rFk" = ( /turf/closed/wall, @@ -53405,11 +53717,12 @@ /turf/open/floor/iron/dark/textured, /area/station/maintenance/starboard/aft) "rLe" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/science/research/abandoned) "rLs" = ( @@ -53430,6 +53743,9 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "rLP" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/structure/chair/office{ dir = 8 }, @@ -53655,12 +53971,15 @@ /turf/open/floor/iron, /area/station/construction) "rQs" = ( -/obj/machinery/newscaster/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/machinery/light/small/directional/west, /obj/machinery/camera/directional/west{ c_tag = "Security - Head of Security Room"; name = "security camera" }, +/obj/item/radio/intercom/directional/west, /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = -3; @@ -53903,12 +54222,15 @@ /area/station/command/heads_quarters/captain) "rTV" = ( /obj/machinery/requests_console/directional/south{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Head of Personnel's Desk"; - name = "Head of Personnel's Requests Console"; - can_send_announcements = 1 + name = "Head of Personnel's Requests Console" }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "rUf" = ( @@ -53971,6 +54293,16 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"rVm" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/line{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "rVw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54146,9 +54478,9 @@ /area/station/security/warden) "rZw" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/effect/turf_decal/box/red, /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/mixingchamber_access, -/obj/effect/turf_decal/box/red, /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron/dark, /area/station/science/ordnance/freezerchamber) @@ -54292,6 +54624,11 @@ /area/station/ai_monitored/turret_protected/ai_upload) "sbB" = ( /obj/item/radio/intercom/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Auxiliary Lab"; + name = "science camera"; + network = list("ss13","rd") + }, /obj/machinery/suit_storage_unit/standard_unit, /turf/open/floor/iron/white/textured, /area/station/science/auxlab) @@ -54546,7 +54883,6 @@ dir = 9 }, /obj/structure/cable, -/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron, /area/station/engineering/gravity_generator) "sgJ" = ( @@ -54568,9 +54904,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "sgY" = ( -/obj/effect/decal/cleanable/vomit/old, -/obj/effect/mob_spawn/corpse/human/assistant, /obj/structure/sign/poster/random/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/medical) "shc" = ( @@ -54986,7 +55322,6 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -55055,6 +55390,9 @@ /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) "soW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -55122,7 +55460,7 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "sqZ" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/black, /obj/item/paper_bin, /obj/effect/spawner/random/bureaucracy/folder{ pixel_y = 2 @@ -55251,13 +55589,13 @@ dir = 1 }, /obj/machinery/requests_console/directional/east{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Research Lab"; - name = "Research Requests Console"; - receive_ore_updates = 1; - can_send_announcements = 1 + name = "Research Requests Console" }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/ore_update, /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/upgraded, @@ -55341,16 +55679,20 @@ }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/poddoor/preopen{ + id = "bridge_blast_doors"; + name = "Bridge Access Blast Door" + }, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) "suW" = ( /obj/machinery/requests_console/directional/west{ - assistance_requestable = 1; department = "Quartermaster's Desk"; - name = "Quartermaster's Desk Requests Console"; - supplies_requestable = 1; - can_send_announcements = 1 + name = "Quartermaster's Desk Requests Console" }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/structure/table, /obj/machinery/fax{ fax_name = "Quartermaster's Office"; @@ -55423,16 +55765,16 @@ }, /area/station/commons/fitness) "svV" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/directional/west, +/obj/structure/table/reinforced/rglass, /obj/item/folder/white{ pixel_x = 4; - pixel_y = -3 + pixel_y = -4 }, /obj/item/restraints/handcuffs{ pixel_y = 3 }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/station/command/bridge) "svX" = ( @@ -55471,6 +55813,7 @@ dir = 1 }, /obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, /obj/machinery/space_heater, /turf/open/floor/iron, /area/station/engineering/storage) @@ -55724,10 +56067,6 @@ }, /obj/structure/sign/warning/doors/directional/east, /obj/machinery/light/small/directional/east, -/obj/machinery/door/poddoor/preopen{ - id = "bridge_blast_doors"; - name = "Bridge Access Blast Door" - }, /turf/open/floor/iron/dark, /area/station/command/bridge) "sCj" = ( @@ -55785,7 +56124,10 @@ }, /obj/machinery/camera/autoname/directional/east, /obj/structure/table, -/obj/machinery/recharger, +/obj/item/toy/plush/carpplushie{ + name = "Jeff"; + desc = "An adorable stuffed toy that resembles a space carp. The warden was given Jeff to soothe rampant anger issues" + }, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "sDr" = ( @@ -55807,6 +56149,16 @@ /obj/item/folder/documents, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +"sDN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "sEf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55957,6 +56309,7 @@ "sHG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/science/research/abandoned) @@ -56079,15 +56432,13 @@ /area/station/maintenance/disposal/incinerator) "sKg" = ( /obj/effect/turf_decal/tile/red/fourcorners, -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/item/storage/box/trackimp{ - pixel_x = -3 +/obj/structure/rack, +/obj/item/gun/energy/ionrifle{ + pixel_y = 3 }, -/obj/item/storage/box/chemimp{ - pixel_x = 6 +/obj/item/gun/energy/temperature/security{ + pixel_y = -3 }, -/obj/item/storage/lockbox/loyalty, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "sKj" = ( @@ -56263,11 +56614,12 @@ /turf/open/floor/carpet/black, /area/station/security/bitden) "sMN" = ( +/obj/effect/turf_decal/siding/wood, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/carpet/royalblue, +/turf/open/floor/wood, /area/station/command/heads_quarters/captain) "sMO" = ( /obj/machinery/computer/message_monitor{ @@ -57239,6 +57591,7 @@ dir = 1 }, /obj/structure/sign/warning/vacuum/external/directional/north, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "tbG" = ( @@ -57313,6 +57666,9 @@ /turf/open/floor/wood, /area/station/service/library/lounge) "tcJ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/machinery/keycard_auth{ pixel_x = -24 }, @@ -57480,6 +57836,10 @@ dir = 8 }, /area/station/commons/fitness/recreation) +"tfo" = ( +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/grass, +/area/station/science/genetics) "tfF" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -58080,6 +58440,9 @@ "trg" = ( /obj/machinery/light/small/directional/north, /obj/structure/dresser, +/obj/structure/plaque/static_plaque/golden/captain{ + pixel_x = -32 + }, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) "trh" = ( @@ -58214,23 +58577,34 @@ /obj/structure/rack, /obj/structure/window/reinforced/spawner/directional/south, /obj/item/clothing/suit/armor/riot{ - pixel_x = -3; + pixel_x = 6; pixel_y = 3 }, -/obj/item/clothing/suit/armor/riot, /obj/item/clothing/suit/armor/riot{ - pixel_x = 3; + pixel_x = 6 + }, +/obj/item/clothing/suit/armor/riot{ + pixel_x = 6; pixel_y = -3 }, /obj/item/shield/riot{ - pixel_x = -3; + pixel_x = -6; pixel_y = 3 }, -/obj/item/shield/riot, /obj/item/shield/riot{ - pixel_x = 3; + pixel_x = -6 + }, +/obj/item/shield/riot{ + pixel_x = -6; pixel_y = -3 }, +/obj/item/clothing/head/helmet/toggleable/riot, +/obj/item/clothing/head/helmet/toggleable/riot{ + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/toggleable/riot{ + pixel_y = 6 + }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "ttl" = ( @@ -58873,12 +59247,10 @@ "tDk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/command/teleporter) "tDF" = ( @@ -58966,6 +59338,9 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "tFs" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/machinery/firealarm/directional/south, /turf/open/floor/wood, /area/station/security/detectives_office) @@ -59119,6 +59494,10 @@ "tIU" = ( /turf/open/floor/iron/dark/smooth_large, /area/station/maintenance/department/security) +"tJc" = ( +/obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) "tJd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59165,12 +59544,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/open/floor/iron/dark/textured, /area/station/service/chapel/office) -"tJI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_corner, -/area/station/service/chapel) "tJM" = ( /obj/structure/flora/bush/jungle/c/style_random, /turf/open/floor/grass, @@ -59565,14 +59938,14 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "tQH" = ( +/obj/machinery/camera/autoname/directional/west, /obj/machinery/requests_console/directional/west{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Captain's Desk"; - name = "Captain's Requests Console"; - can_send_announcements = 1 + name = "Captain's Requests Console" }, -/obj/machinery/camera/autoname/directional/west, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/folder/blue, @@ -59776,7 +60149,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, -/obj/machinery/light_switch/directional/east, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/command/meeting_room) "tUG" = ( @@ -60018,7 +60391,7 @@ dir = 8 }, /obj/machinery/light/directional/east, -/obj/machinery/status_display/evac/directional/east, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/aft) "tZi" = ( @@ -60467,11 +60840,11 @@ /area/station/medical/pharmacy) "ugZ" = ( /obj/machinery/requests_console/directional/east{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Telecomms Admin"; name = "Telecomms Requests Console" }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -60586,6 +60959,11 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 }, +/obj/machinery/requests_console/directional/west{ + department = "Virology"; + name = "Pathology Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, /obj/structure/table/reinforced/rglass, /obj/item/paper_bin{ pixel_x = -4; @@ -60601,14 +60979,9 @@ }, /obj/item/reagent_containers/syringe/antiviral, /obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/spray/cleaner, /obj/item/hand_labeler, +/obj/item/reagent_containers/spray/cleaner, /obj/item/radio/headset/headset_med, -/obj/machinery/requests_console/auto_name/directional/west{ - department = "Virology"; - name = "Pathology Requests Console"; - receive_ore_updates = 1 - }, /obj/item/clothing/glasses/science, /obj/item/extrapolator, /obj/item/device/antibody_scanner, @@ -60997,6 +61370,12 @@ dir = 4 }, /area/station/hallway/secondary/exit/departure_lounge) +"umU" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) "umX" = ( /obj/effect/mapping_helpers/iannewyear, /turf/open/floor/carpet/royalblue, @@ -61368,8 +61747,14 @@ /area/station/ai_monitored/command/storage/eva) "uum" = ( /obj/effect/turf_decal/tile/red/fourcorners, -/obj/machinery/vending/wardrobe/sec_wardrobe, /obj/machinery/camera/autoname/directional/west, +/obj/machinery/requests_console/directional/west{ + department = "Theatre"; + name = "Theater Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/machinery/vending/wardrobe/sec_wardrobe, /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) "uut" = ( @@ -61496,6 +61881,8 @@ "uwx" = ( /obj/effect/turf_decal/box, /obj/machinery/holopad, +/obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/iron/white/smooth_large, /area/station/medical/break_room) "uwJ" = ( @@ -61665,11 +62052,6 @@ /area/station/science/xenobiology) "uBk" = ( /obj/item/radio/intercom/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Science - Old Exploration Dock"; - name = "science camera"; - network = list("ss13","rd") - }, /obj/structure/chair/office/light{ dir = 4 }, @@ -61714,6 +62096,11 @@ }, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) +"uBT" = ( +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/station/hallway/secondary/exit/departure_lounge) "uBX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61832,6 +62219,14 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/office) +"uFl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/hallway/secondary/exit/departure_lounge) "uFo" = ( /obj/effect/spawner/random/entertainment/coin, /turf/open/floor/plating, @@ -62029,6 +62424,10 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"uIO" = ( +/obj/structure/table/wood, +/turf/open/floor/carpet/blue, +/area/station/medical/psychology) "uIQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -62036,11 +62435,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/liquid_barrier, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "uJk" = ( @@ -62098,6 +62497,12 @@ /area/station/hallway/primary/central) "uJI" = ( /obj/structure/rack, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = -8 + }, +/obj/item/clothing/mask/breath{ + pixel_x = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "uJP" = ( @@ -62163,28 +62568,11 @@ dir = 5 }, /obj/machinery/requests_console/directional/east{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Security"; name = "Security Requests Console" }, -/obj/machinery/button/door/directional/north{ - id = "medbay_foyer"; - name = "Medbay Doors Control"; - req_access = list("medical"); - desc = "A remote control switch for the medbay foyer."; - normaldoorcontrol = 1; - pixel_x = -6 - }, -/obj/machinery/button/door/directional/north{ - name = "Security Post Shutters Control"; - req_access = list("security"); - pixel_x = 6; - id = "medical_security_post" - }, -/obj/machinery/light_switch/directional/north{ - pixel_y = 34 - }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) @@ -62304,9 +62692,9 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/requests_console/directional/south{ department = "Genetics"; - name = "Genetics Requests console"; - supplies_requestable = 1 + name = "Genetics Requests console" }, +/obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron/white, /area/station/science/genetics) "uLS" = ( @@ -62316,8 +62704,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/duct, -/obj/structure/window/reinforced/spawner/directional/south, /obj/structure/disposalpipe/segment, +/obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/command/bridge) "uLT" = ( @@ -62771,6 +63159,9 @@ /turf/open/floor/iron/dark, /area/station/medical/paramedic) "uUq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) @@ -62988,7 +63379,8 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 4 }, -/obj/machinery/status_display/ai/directional/west, +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/aft) "uWB" = ( @@ -63106,15 +63498,15 @@ /area/station/security/checkpoint/engineering) "uYI" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/south, /obj/machinery/requests_console/directional/south{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Bridge"; - name = "Bridge Requests Console"; - can_send_announcements = 1 + name = "Bridge Requests Console" }, -/obj/machinery/light/directional/south, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/command/bridge) "uYJ" = ( @@ -63207,7 +63599,7 @@ }, /area/station/commons/fitness) "vaO" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/item/hand_labeler, /turf/open/floor/iron/dark, @@ -63277,6 +63669,12 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) +"vbq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/locker) "vbz" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/neutral/line{ @@ -63326,6 +63724,10 @@ /obj/machinery/atmospherics/components/tank, /turf/open/floor/iron, /area/station/science/ordnance) +"vbW" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/wood, +/area/station/medical/psychology) "vcn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -63392,10 +63794,10 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "vcL" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/filingcabinet, +/obj/structure/rack, +/obj/item/clothing/mask/breath, /turf/open/floor/iron/dark, -/area/station/security/prison/visit) +/area/station/engineering/transit_tube) "vcW" = ( /obj/effect/spawner/random/structure/table, /obj/effect/spawner/random/maintenance, @@ -63549,6 +63951,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"vfW" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 8 + }, +/obj/structure/sign/departments/maint/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "vfX" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 1 @@ -63611,8 +64024,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, /obj/machinery/door_buttons/access_button{ idDoor = "xeno_airlock_interior"; idSelf = "xeno_airlock_control"; @@ -63629,6 +64040,11 @@ pixel_x = 25; req_access = list("xenobiology") }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/liquid_barrier, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ autoclose = 0; @@ -63637,11 +64053,8 @@ name = "Xenobiology Lab Internal Airlock" }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/effect/mapping_helpers/airlock/locked, /obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/liquid_barrier, +/obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/iron/white/textured, /area/station/science/xenobiology/hallway) "vho" = ( @@ -63828,6 +64241,10 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"vke" = ( +/obj/effect/turf_decal/vg_decals/atmos/plasma, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) "vkg" = ( /obj/machinery/light/small/directional/south, /obj/effect/spawner/random/maintenance, @@ -64094,7 +64511,7 @@ /turf/open/floor/iron/dark, /area/station/security/office) "voV" = ( -/obj/structure/table/wood, +/obj/structure/table/wood/fancy/blue, /obj/machinery/recharger{ pixel_y = 4 }, @@ -64384,10 +64801,10 @@ /area/station/medical/virology) "vtD" = ( /obj/machinery/requests_console/directional/west{ - assistance_requestable = 1; department = "Janitorial"; name = "Janitorial Requests Console" }, +/obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -64959,6 +65376,10 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/port) +"vEc" = ( +/obj/effect/turf_decal/vg_decals/atmos/air, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) "vEp" = ( /obj/structure/dresser, /turf/open/floor/wood, @@ -64972,10 +65393,7 @@ "vEB" = ( /obj/machinery/light/directional/west, /obj/machinery/newscaster/directional/west, -/obj/machinery/chem_master/condimaster{ - desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; - name = "HoochMaster Deluxe" - }, +/obj/structure/closet/secure_closet/bar, /turf/open/floor/wood, /area/station/service/bar/backroom) "vEP" = ( @@ -64991,8 +65409,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/light/small/directional/east, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/white, /area/station/medical/break_room) "vEV" = ( @@ -65295,7 +65712,7 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /obj/machinery/light/directional/east, /obj/machinery/status_display/ai/directional/east, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/aicard, /turf/open/floor/iron/dark, /area/station/command/bridge) @@ -65441,11 +65858,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/large, /area/station/cargo/sorting) -"vNg" = ( -/turf/open/floor/iron/dark/smooth_corner{ - dir = 1 - }, -/area/station/service/chapel) "vNq" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/wood, @@ -66132,8 +66544,8 @@ /area/station/solars/port/fore) "vYZ" = ( /obj/effect/turf_decal/trimline/blue/filled/end, -/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/light/small/directional/south, +/obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/white, /area/station/medical/break_room) "vZb" = ( @@ -66397,6 +66809,7 @@ /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "wdB" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) @@ -66477,10 +66890,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "wfI" = ( -/obj/effect/spawner/random/structure/table, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/effect/turf_decal/siding/wood, +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/station/medical/psychology) "wfJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66590,7 +67003,7 @@ /area/station/engineering/main) "whb" = ( /obj/effect/turf_decal/tile/purple/fourcorners, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /turf/open/floor/iron/dark, /area/station/command/bridge) "whh" = ( @@ -67136,17 +67549,17 @@ "wrt" = ( /obj/machinery/requests_console/directional/south{ department = "Science"; - name = "Science Requests Console"; - receive_ore_updates = 1; - supplies_requestable = 1 + name = "Science Requests Console" }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/structure/table/reinforced/plasmarglass, /obj/item/book/manual/wiki/cytology{ pixel_x = -4; pixel_y = 4 }, /obj/item/book/manual/wiki/plumbing, /obj/item/storage/box/petridish, -/obj/structure/table/reinforced/plasmarglass, /turf/open/floor/iron/white, /area/station/science/xenobiology) "wrA" = ( @@ -67684,6 +68097,14 @@ /obj/structure/railing, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"wBm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_half{ + dir = 8 + }, +/area/station/service/chapel) "wBu" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -67719,19 +68140,13 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/checker, /area/station/science/lab) -"wBV" = ( -/turf/open/floor/iron/dark/smooth_half{ - dir = 8 - }, -/area/station/service/chapel) "wBY" = ( /obj/machinery/requests_console/directional/east{ - assistance_requestable = 1; department = "Atmospherics"; - name = "Atmospherics Requests Console"; - supplies_requestable = 1 + name = "Atmospherics Requests Console" }, -/obj/machinery/newscaster/directional/north, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/machinery/computer/atmos_control/nocontrol/master, /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) @@ -67922,7 +68337,7 @@ /turf/open/floor/iron, /area/station/science/ordnance/office) "wFu" = ( -/obj/structure/chair/comfy/beige, +/obj/structure/chair/comfy/brown, /obj/effect/landmark/start/assistant, /turf/open/floor/carpet, /area/station/hallway/secondary/entry) @@ -67991,7 +68406,11 @@ dir = 1 }, /obj/machinery/light/directional/south, -/obj/machinery/newscaster/directional/south, +/obj/machinery/requests_console/directional/south{ + department = "Kitchen"; + name = "Kitchen Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "wGm" = ( @@ -68187,6 +68606,11 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"wJe" = ( +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/station/service/chapel) "wJm" = ( /obj/structure/cable, /obj/machinery/power/floodlight, @@ -68287,12 +68711,12 @@ /turf/open/floor/iron/white, /area/station/medical/break_room) "wLa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/wood, /area/station/commons/vacant_room/office) "wLb" = ( @@ -68524,7 +68948,6 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 }, -/obj/machinery/light_switch/directional/south, /obj/machinery/button/door/directional/east{ id = "justice_chamber"; name = "Door Bolt Control"; @@ -68824,6 +69247,7 @@ "wTD" = ( /obj/structure/cable, /obj/machinery/light/directional/west, +/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "wTM" = ( @@ -68884,7 +69308,7 @@ "wVm" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/light/directional/south, -/obj/machinery/station_map/engineering/directional/south, +/obj/structure/sign/poster/official/random/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -69027,8 +69451,11 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/foyer) "wXG" = ( +/obj/machinery/light_switch/directional/west{ + pixel_y = 10 + }, +/obj/machinery/firealarm/directional/west, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch/directional/west, /turf/open/floor/iron/dark, /area/station/science/research/abandoned) "wXM" = ( @@ -69352,11 +69779,11 @@ dir = 1 }, /obj/machinery/requests_console/directional/north{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Security"; name = "Security Requests Console" }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) @@ -69441,9 +69868,6 @@ /area/station/hallway/primary/aft) "xfT" = ( /obj/machinery/firealarm/directional/north, -/obj/machinery/light_switch/directional/north{ - pixel_x = 8 - }, /obj/structure/closet/crate, /turf/open/floor/iron/dark/side{ dir = 5 @@ -69684,7 +70108,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, -/obj/structure/chair/office/light{ +/obj/structure/chair/office{ dir = 4 }, /obj/effect/landmark/start/virologist, @@ -69726,7 +70150,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "xjH" = ( -/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/station_map/engineering/directional/west, /turf/open/floor/iron/dark, /area/station/command/bridge) "xjO" = ( @@ -69781,6 +70205,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "xle" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -69832,8 +70259,14 @@ /obj/structure/closet/secure_closet{ req_access = list("bar") }, -/obj/item/storage/box/rubbershot, -/obj/item/gun/ballistic/shotgun/doublebarrel, +/obj/item/stack/sheet/iron/fifty{ + pixel_y = 5; + pixel_x = -4 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_y = 5 + }, +/obj/item/stack/cable_coil, /obj/effect/spawner/random/entertainment/money, /obj/effect/spawner/random/entertainment/money, /turf/open/floor/wood, @@ -69858,7 +70291,8 @@ /turf/open/floor/iron, /area/station/engineering/storage/tech) "xmz" = ( -/obj/effect/decal/cleanable/vomit/old, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/medical) "xmK" = ( @@ -69872,21 +70306,7 @@ /area/station/maintenance/department/engine/atmos) "xnn" = ( /obj/effect/turf_decal/tile/red/fourcorners, -/obj/structure/table/reinforced, -/obj/item/gun/grenadelauncher{ - pixel_y = 10 - }, -/obj/item/grenade/barrier{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/grenade/barrier{ - pixel_y = 3 - }, -/obj/item/grenade/barrier{ - pixel_x = 6; - pixel_y = 3 - }, +/obj/machinery/dish_drive/bullet, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "xny" = ( @@ -69936,6 +70356,10 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/wood/tile, /area/station/service/library/artgallery) +"xog" = ( +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/security/detectives_office) "xow" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -70073,14 +70497,10 @@ /turf/open/floor/iron, /area/station/commons/dorms) "xrL" = ( -/obj/structure/table, -/obj/item/reagent_containers/pill/maintenance, -/obj/item/reagent_containers/pill/maintenance{ - pixel_y = 8; - pixel_x = 7 - }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/plating, -/area/station/maintenance/department/medical) +/area/station/maintenance/department/engine/atmos) "xrQ" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/structure/disposalpipe/segment, @@ -70121,6 +70541,29 @@ dir = 1 }, /obj/machinery/light/small/directional/north, +/obj/machinery/button/door/directional/north{ + id = "medbay_foyer"; + name = "Medbay Doors Control"; + req_access = list("medical"); + desc = "A remote control switch for the medbay foyer."; + normaldoorcontrol = 1; + pixel_x = -6; + specialfunctions = 4 + }, +/obj/machinery/button/door/directional/north{ + name = "Security Post Shutters Control"; + req_access = list("security"); + pixel_x = 6; + id = "medical_security_post" + }, +/obj/machinery/light_switch/directional/north{ + pixel_y = 34; + pixel_x = -6 + }, +/obj/machinery/firealarm/directional/north{ + pixel_y = 32; + pixel_x = 6 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "xsi" = ( @@ -71008,7 +71451,6 @@ /obj/effect/turf_decal/box, /obj/structure/sign/warning/no_smoking/directional/south, /obj/machinery/holopad, -/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/white/smooth_large, /area/station/maintenance/department/science) "xGN" = ( @@ -71071,6 +71513,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) "xHL" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/machinery/modular_computer/preset/id{ dir = 1 }, @@ -71290,14 +71735,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron/dark, /area/station/commons/storage/primary) -"xMv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 4 - }, -/area/station/service/chapel) "xMz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -71473,6 +71910,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/break_room) "xPS" = ( @@ -71652,9 +72090,9 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/requests_console/directional/south{ department = "Cargo Bay"; - name = "Cargo Bay Requests Console"; - supplies_requestable = 1 + name = "Cargo Bay Requests Console" }, +/obj/effect/mapping_helpers/requests_console/supplies, /obj/machinery/conveyor_switch/oneway{ id = "package_sort_2" }, @@ -71822,6 +72260,7 @@ /turf/open/floor/iron/checker, /area/station/commons/dorms/laundry) "xVF" = ( +/obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/chair_maintenance{ dir = 8 }, @@ -72023,6 +72462,7 @@ dir = 1 }, /obj/machinery/camera/autoname/directional/north, +/obj/machinery/newscaster/directional/north, /obj/machinery/computer/station_alert, /turf/open/floor/iron/dark/side{ dir = 1 @@ -72711,7 +73151,8 @@ dir = 1 }, /obj/machinery/door/airlock/bathroom{ - name = "Bathroom" + name = "Bathroom"; + id_tag = "med_break_toilet" }, /turf/open/floor/iron/white/textured, /area/station/medical/break_room) @@ -72860,13 +73301,13 @@ /area/station/engineering/main) "ylb" = ( /obj/machinery/requests_console/directional/west{ - anon_tips_receiver = 1; - assistance_requestable = 1; department = "Research Director's Desk"; - name = "Research Director's Requests Console"; - receive_ore_updates = 1; - can_send_announcements = 1 + name = "Research Director's Requests Console" }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/ore_update, /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/rd) "ylx" = ( @@ -82551,14 +82992,14 @@ pdz vRw qnR cUh -jUb +vfW iGw qnR qnR ndl eUO qnR -qnR +jee qnR qnR qnR @@ -82566,7 +83007,7 @@ ndl qnR qnR iGw -qnR +jee cUh jUb vRw @@ -83085,7 +83526,7 @@ iHO fBi fPN gAI -qem +pJW aqj hsB bbw @@ -84102,7 +84543,7 @@ fPN eyh tMt mNt -mNt +kdC oNL wvU gHO @@ -90027,9 +90468,9 @@ kos daT sDz roS -jQu -jQu -jQu +vbq +vbq +vbq atW sDz sqj @@ -90037,7 +90478,7 @@ nBX jZY erS rRm -jhr +trv wEt wEt wEt @@ -90551,7 +90992,7 @@ vpb mCr lBN rRm -trv +jqp wEt blE wEt @@ -90808,7 +91249,7 @@ tYb jZY erS rRm -cRq +jhr vww hvk iXU @@ -91055,9 +91496,9 @@ kos bpV sDz gAX -jQu +ppi oiO -jQu +ppi mJa sDz fWt @@ -92271,7 +92712,7 @@ cZs cZs cZs wZx -mRx +doA ihP xJb vUA @@ -92524,9 +92965,9 @@ cYs eLo dot bYZ -gKh +los rdn -gKh +los ugn jou aco @@ -93123,7 +93564,7 @@ qvY rRm tnN mPm -wEt +bSr rRm oLg oLg @@ -97154,7 +97595,7 @@ xta wrA sdP unQ -sdP +gfA wrA xta xta @@ -97701,7 +98142,7 @@ eUE cqR tNE sey -qVR +qIN nZL nZL nZL @@ -98014,7 +98455,7 @@ qdE cOn qdE adP -qdE +rVm hEV foE jwc @@ -98973,7 +99414,7 @@ dxW vIP jEI qQq -rhW +ajn aBX odC aBX @@ -99212,7 +99653,7 @@ plz mcU plz plz -tFK +oER oER oER oER @@ -99230,8 +99671,8 @@ rHR dxW dxW jbP -rhW -qgq +ajn +oWq lMT kxd kml @@ -99487,7 +99928,7 @@ dxW wzI qDj qQq -rhW +ajn xgX lMT lMT @@ -99603,7 +100044,7 @@ cZl xba afJ xba -eIJ +pqo rOW nst rOV @@ -99744,7 +100185,7 @@ fuS fuS fuS acf -rhW +ajn awX hpB awX @@ -100549,7 +100990,7 @@ vvy hjG fUX rdk -tbg +xog sDl tNO hjG @@ -101035,8 +101476,8 @@ xXP ksa vpG okt -vcL dli +eIJ jsw eoc vpG @@ -101063,7 +101504,7 @@ vvy hjG aNs ahZ -tbg +xog pnG uOf hjG @@ -101536,7 +101977,7 @@ oER mQx tLo oaa -rhW +ajn auk wOy dKa @@ -104205,7 +104646,7 @@ vKr axx bFj rRZ -iGj +iyt gCT vZS nbI @@ -104462,7 +104903,7 @@ uHE cIP gwS rRZ -iyt +iGj gCT gCT gCT @@ -104697,7 +105138,7 @@ qfo kOB lRy atm -dFA +itS lHm evr mLW @@ -104950,11 +105391,11 @@ ftk uiA lOJ tdz -evr -evr -evr -evr -fIH +dUR +qYQ +qYQ +qYQ +iyk qqD evr asD @@ -104980,7 +105421,7 @@ iyt bqv rPJ rPJ -rPJ +cdE rPJ eRs fDD @@ -105149,7 +105590,7 @@ mrP pOC rQs mkx -uUq +lFE bLO mrP uqt @@ -105233,10 +105674,10 @@ wlw nPp ouI rRZ -fDD mnx fDD fDD +fDD rRZ pvb stP @@ -105492,8 +105933,8 @@ mOs rRZ ckL paH -krY -fDD +ckL +mnx rRZ rRZ ptg @@ -105750,7 +106191,7 @@ rRZ rRZ rRZ rRZ -ndh +rRZ rRZ wKg stP @@ -105776,7 +106217,7 @@ gkZ vQE sSP pfo -kvL +pfo rhD pfo pfo @@ -106005,11 +106446,11 @@ fjE ngu jZI lWL +uIO +umU rRZ wwI -fDD mnx -fDD stP wov rRZ @@ -106260,16 +106701,16 @@ pvL fni gzT aGj +wfI scp -nwj +fzz +oIb rRZ -mnx -fDD -fDD +ckL fDD fcY jQQ -lrc +nLl fDD fDD kvD @@ -106516,15 +106957,15 @@ lng pvL dCA jgV -aGj +vbW dGg kMh -rRZ +kMh lwa -ckL +rRZ wwI -wKg mnx +fDD iyt rRZ wko @@ -106776,8 +107217,8 @@ jvj pvL pvL pvL -rRZ -rRZ +pvL +pvL rRZ rRZ rRZ @@ -106789,7 +107230,7 @@ ndh rRZ rRZ tgG -gvd +sDN tgG tgG mnV @@ -107043,7 +107484,7 @@ iyt rRZ fDD xmz -edc +xmz rRZ sPJ wdB @@ -107298,13 +107739,13 @@ mxn rRZ iyt rRZ -edc -xrL +xmz +ovO xmz lrc -leq -leq -leq +jhf +jhf +jhf sYb cTJ goI @@ -107466,9 +107907,9 @@ ksa ksa ksa ebw -ats -jzo tvH +jzo +ats ljv cCF cmI @@ -108331,7 +108772,7 @@ ndh rRZ rRZ xnd -uaL +xrL xVF tgG cTJ @@ -109626,19 +110067,19 @@ xXP wFB sYs bGF -bGF +aNX wFB snh vFg -dPd +tJc wFB nxU meR -oPm +vke wFB dFT ril -gZH +qhj wFB fgv kDG @@ -109648,15 +110089,15 @@ maz wFB coh vze -dZM +vEc wFB dYV eKm -dSP +cML wFB lJr gxT -qJA +rmJ wFB tXu ksa @@ -110966,9 +111407,9 @@ fdt fdt fdt fdt -oIb +niB wxU -oIb +niB fdt fdt fdt @@ -111855,7 +112296,7 @@ uuA bLy fGh psO -jbM +nhv bLy iSe lHt @@ -112139,7 +112580,7 @@ dJe dMO fqQ jYF -fqQ +tfo dMO yiI sXd @@ -112694,7 +113135,7 @@ loQ jzw rrD uCp -gfA +jzw rrD uCp uUV @@ -112979,7 +113420,7 @@ khD cpE wEK tOe -uJI +vcL xhQ ksa ksa @@ -113289,7 +113730,7 @@ nRj fJK fJK uoo -oIb +niB ksa ksa ksa @@ -113803,7 +114244,7 @@ ivj fJK fJK uoo -oIb +niB ksa ksa ksa @@ -114428,7 +114869,7 @@ qOR mZc mZc bLy -bLy +oIP lzu lzu lzu @@ -114809,7 +115250,7 @@ ksa ksa ksa uoo -uoo +oGl pbE aBC jht @@ -115780,7 +116221,7 @@ cnU mhc byX kLf -wfI +hNJ nBE vsb nBE @@ -116106,9 +116547,9 @@ fdt fdt fdt fdt -oIb +niB wxU -oIb +niB fdt fdt fdt @@ -116293,7 +116734,7 @@ nBE cnU mhc byX -wfI +hNJ kLf nBE vsb @@ -117765,7 +118206,7 @@ ksa ksa xWh iRy -fXj +iLB iLB gXK enc @@ -118022,7 +118463,7 @@ xXP xXP xWh iLB -fXj +iLB iLB jxy vmC @@ -118279,7 +118720,7 @@ ksa ksa jxy tzc -fXj +iLB bAh jxy nft @@ -118792,8 +119233,8 @@ ksa ksa ksa jxy -aOz -aOz +iLB +iLB iLB jxy uZf @@ -119048,10 +119489,10 @@ wtF xXP xXP xXP -jxy -cdE -doA -fXj +xWh +iLB +iLB +vZd jxy cye jSC @@ -119306,9 +119747,9 @@ ksa ksa ksa jxy -doA iLB -qIN +iLB +iLB jxy fXd tpn @@ -120363,11 +120804,11 @@ pgh pgh vKu lIF -tJI -fbF -fbF -fbF -xMv +elS +wBm +wBm +wBm +jxh lIF flM oOy @@ -120620,11 +121061,11 @@ eUW eUW xYi gHr -fmX +cRq mbo vzy nrz -fmX +cRq wZI pmV qcA @@ -120877,11 +121318,11 @@ eUW eUW fDG bPd -pUl -wBV -wBV -wBV -vNg +bPp +gHu +gHu +gHu +wJe bPd qFf tJS @@ -122161,8 +122602,8 @@ eUW lKY sVt gLh -gLh -gLh +uFl +uBT tsN wfQ dEK @@ -122417,7 +122858,7 @@ gcx lsC lKY osP -nLl +tsN loR hqN cDP @@ -122674,9 +123115,9 @@ gcx gcx lKY qBi -gLh -gLh -gLh +nwj +edc +krY tsN wfQ dEK @@ -123985,7 +124426,7 @@ qVX tyG iLZ wXG -jhf +sHG cgs rLe rxR From c2b0725cc772cd74cc9ffb136f56a086bef16e3a Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Sun, 30 Jun 2024 19:56:34 -0500 Subject: [PATCH 15/27] Fix 14 Makes some changes to the engines. Miscellaneous stuff. --- _maps/map_files/BoxStation/BoxStation.dmm | 180 +++-- .../BoxStation/particle_accelerator.dmm | 12 +- .../RandomEngines/BoxStation/sm_teg.dmm | 764 ++++++++++-------- .../RandomEngines/BoxStation/supermatter.dmm | 47 +- .../RandomEngines/BoxStation/teg.dmm | 348 ++++---- 5 files changed, 750 insertions(+), 601 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9eb41558261d3e..38620b41dcc9d8 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5286,6 +5286,8 @@ "bKW" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/item/storage/secure/safe/caps_spare/directional/west, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/iron/dark, /area/station/command/bridge) "bKY" = ( @@ -5681,6 +5683,9 @@ dir = 1 }, /obj/machinery/newscaster/directional/south, +/obj/structure/chair{ + dir = 8 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "bSC" = ( @@ -5899,7 +5904,6 @@ "bWR" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/flowers_pp/style_random, -/obj/effect/mob_spawn/corpse/human/skeleton, /turf/open/floor/grass, /area/station/command/bridge) "bXc" = ( @@ -5954,8 +5958,7 @@ /area/station/hallway/primary/central) "bXL" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/mechanical, +/obj/machinery/vending/access/command, /turf/open/floor/iron/dark, /area/station/command/bridge) "bXP" = ( @@ -7499,7 +7502,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 }, -/obj/structure/sign/poster/official/random/directional/east, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/station/science/research) "cye" = ( @@ -8947,9 +8950,10 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/table/reinforced, /obj/item/paper_bin, +/obj/item/folder/blue{ + pixel_y = 2 + }, /obj/item/pen, -/obj/item/restraints/handcuffs, -/obj/item/assembly/flash/handheld, /turf/open/floor/iron/dark, /area/station/command/bridge) "cUR" = ( @@ -10757,12 +10761,12 @@ }, /obj/structure/sign/warning/radiation/directional/west, /obj/machinery/light/small/directional/west, -/obj/effect/mapping_helpers/apc/cell_5k, +/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/effect/mapping_helpers/apc/cell_5k, /obj/structure/chair{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/south, /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, /area/station/engineering/engine_smes) @@ -10997,6 +11001,16 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/entry) +"dEo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/textured, +/area/station/science/research) "dEu" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, @@ -11587,8 +11601,7 @@ "dOo" = ( /obj/structure/table/glass, /obj/machinery/light/directional/south, -/obj/item/paper_bin, -/obj/item/pen, +/obj/item/storage/box/cups, /turf/open/floor/iron/dark, /area/station/command/bridge) "dOt" = ( @@ -12375,16 +12388,13 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/light/directional/east, /obj/structure/table/reinforced, -/obj/item/folder/yellow{ - pixel_y = 4 - }, -/obj/item/multitool{ - pixel_x = 6 - }, /obj/item/extinguisher{ pixel_x = -6; pixel_y = 8 }, +/obj/item/multitool{ + pixel_x = 6 + }, /turf/open/floor/iron/dark, /area/station/command/bridge) "eaV" = ( @@ -13155,13 +13165,13 @@ /obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ pixel_x = 6 }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -3; - pixel_y = 8 - }, /obj/item/storage/box/handcuffs{ pixel_y = -5; - pixel_x = -6 + pixel_x = -7 + }, +/obj/item/reagent_containers/cup/glass/flask{ + pixel_x = -6; + pixel_y = 10 }, /turf/open/floor/iron/dark, /area/station/command/bridge) @@ -16468,9 +16478,9 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "fzi" = ( -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 8; - name = "Mix to Filter" +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix to Filter"; + dir = 8 }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) @@ -27643,6 +27653,8 @@ /area/station/cargo/storage) "jgz" = ( /obj/structure/table/glass, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/iron/dark, /area/station/command/bridge) "jgH" = ( @@ -29081,6 +29093,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/table/reinforced/rglass, /obj/item/crowbar/red, /obj/item/reagent_containers/cup/beaker{ @@ -35457,10 +35470,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 9 }, -/obj/machinery/firealarm/directional/north, -/obj/machinery/light_switch/directional/north{ - pixel_x = 8 - }, /obj/structure/table/reinforced/rglass, /obj/item/roller{ pixel_y = 6 @@ -37864,6 +37873,11 @@ }, /turf/open/floor/iron/white/textured, /area/station/medical/chemistry) +"mxF" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) "mxN" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/line{ @@ -42760,6 +42774,22 @@ /obj/structure/sink/directional/east, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) +"ofh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/textured, +/area/station/science/research) "ofl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -43844,6 +43874,23 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/station/service/library/lounge) +"owQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/textured, +/area/station/science/research) "owX" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -44951,6 +44998,11 @@ dir = 8 }, /area/station/commons/fitness/recreation) +"oPv" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) "oPA" = ( /turf/open/floor/iron, /area/station/engineering/storage) @@ -46648,10 +46700,15 @@ /turf/open/floor/catwalk_floor/iron_white, /area/station/maintenance/department/science) "ptd" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/light/directional/south, -/obj/structure/sign/poster/official/random/directional/south, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/textured, /area/station/science/research) "pte" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/corner, @@ -47677,8 +47734,8 @@ "pKj" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/structure/table/reinforced, -/obj/item/taperecorder, -/obj/item/tape/random, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash/handheld, /turf/open/floor/iron/dark, /area/station/command/bridge) "pKq" = ( @@ -48257,6 +48314,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +"pVn" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/bar) "pVu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/plumbed{ @@ -53383,10 +53446,6 @@ pixel_x = -24 }, /obj/structure/table/reinforced, -/obj/item/folder/blue{ - pixel_x = 4; - pixel_y = 4 - }, /obj/item/flashlight/lamp{ pixel_y = 3 }, @@ -54947,7 +55006,6 @@ /obj/machinery/camera/autoname/directional/east, /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/leavy/style_random, -/obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled, /turf/open/floor/grass, /area/station/command/bridge) "shF" = ( @@ -55768,13 +55826,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/light/directional/west, /obj/structure/table/reinforced/rglass, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/restraints/handcuffs{ - pixel_y = 3 - }, /turf/open/floor/iron/dark, /area/station/command/bridge) "svX" = ( @@ -56893,7 +56944,10 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 }, -/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = 8 + }, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -57053,6 +57107,7 @@ "sVg" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/machinery/light/small/directional/south, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, /area/station/science/research) "sVp" = ( @@ -71287,9 +71342,9 @@ /area/station/science/xenobiology) "xDd" = ( /obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/window/reinforced/spawner/directional/north, -/obj/effect/decal/remains/human, +/obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/grass, /area/station/command/bridge) "xDl" = ( @@ -73173,11 +73228,14 @@ /turf/open/floor/iron/dark, /area/station/security/processing) "yjo" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/textured, /area/station/science/research) "yjA" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -94595,7 +94653,7 @@ mPm wEt qCL fZB -fZB +pVn fZB xsm peO @@ -110007,7 +110065,7 @@ cxY gwz dKn ukV -yjo +oRg xxe aSr oPd @@ -110261,9 +110319,9 @@ cHD cHD cHD cHD -cst -hVF -dJe +dEo +owQ +dEo dMO dMO dMO @@ -113861,7 +113919,7 @@ tcP tcP fzW auK -dJe +oPv dxk dxk dxk @@ -114632,7 +114690,7 @@ xXP vdX fzW auK -dJe +mxF dxk flU sQL @@ -114887,8 +114945,8 @@ fgj fgj oIP oIP -fzW -auK +yjo +ofh ptd iaT iaT @@ -115146,7 +115204,7 @@ emX emX crV auK -dJe +mxF iaT vvu blQ diff --git a/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm b/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm index cc3f8e6dcf9785..6fe34c60bd9e8f 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/particle_accelerator.dmm @@ -194,6 +194,7 @@ "lg" = ( /obj/machinery/light/small/directional/south, /obj/structure/cable, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "lC" = ( @@ -289,6 +290,7 @@ /obj/machinery/light/small/directional/south, /obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/south, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "sM" = ( @@ -302,6 +304,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) +"sQ" = ( +/obj/structure/chair, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "tq" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -989,7 +995,7 @@ GW "} (7,1,1) = {" PG -oN +sQ GK oN ge @@ -1017,7 +1023,7 @@ Cs "} (8,1,1) = {" PG -oN +sQ GK hq lg @@ -1045,7 +1051,7 @@ GW "} (9,1,1) = {" PG -oN +sQ GK oN PG diff --git a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm index e6feab2f7e56c7..ddad6af70902db 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm @@ -45,7 +45,7 @@ /area/station/engineering/main) "bX" = ( /obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/plating, @@ -70,13 +70,16 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 4 + }, /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "dp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -100,10 +103,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "eq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 4 - }, -/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ev" = ( @@ -133,11 +133,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "eT" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 10 +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 5 }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "eU" = ( @@ -163,8 +161,10 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter) "fX" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -217,9 +217,6 @@ /area/station/engineering/main) "gW" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 6 - }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "hD" = ( @@ -233,11 +230,8 @@ /turf/open/floor/plating, /area/station/engineering/main) "hG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + name = "Cold" }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -246,14 +240,18 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "hT" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 5 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter) "hU" = ( /obj/structure/table, /obj/machinery/camera/directional/north{ @@ -273,12 +271,19 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "it" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, /obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, /turf/open/floor/plating, +/area/station/engineering/supermatter) +"ix" = ( +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "iC" = ( /obj/effect/turf_decal/stripes/line{ @@ -292,13 +297,15 @@ /area/station/engineering/supermatter/room) "iR" = ( /obj/effect/turf_decal/stripes/line{ - dir = 6 + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/turf/open/floor/plating, +/area/station/engineering/supermatter) "iV" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 6 @@ -436,7 +443,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 4 + }, /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -448,16 +460,16 @@ /turf/open/space/basic, /area/space/nearstation) "mg" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, -/obj/machinery/incident_display/delam/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ + dir = 1 + }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "mw" = ( -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ +/obj/machinery/atmospherics/components/trinary/filter/flipped{ dir = 4 }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "mB" = ( @@ -525,8 +537,15 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "nT" = ( -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 5 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/pink/visible, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -583,6 +602,10 @@ dir = 1 }, /obj/machinery/light/directional/north, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix to Engine"; + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "oV" = ( @@ -596,17 +619,14 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) "pN" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/bridge_pipe/pink/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + name = "Hot Loop" }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "qa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "qm" = ( @@ -620,8 +640,9 @@ dir = 8 }, /obj/machinery/light/directional/west, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 }, /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, @@ -650,7 +671,13 @@ /turf/open/floor/plating, /area/station/engineering/main) "ry" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "rB" = ( @@ -710,6 +737,7 @@ "su" = ( /obj/machinery/light/small/directional/south, /obj/structure/cable, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "sA" = ( @@ -787,26 +815,25 @@ dir = 8 }, /obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "tU" = ( /turf/template_noop, /area/template_noop) "tV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "uh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/structure/cable/layer1, /turf/open/floor/plating, -/area/station/engineering/supermatter/room) +/area/station/engineering/supermatter) "uz" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -820,9 +847,22 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "uU" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Mix to SM Loop" +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/obj/machinery/button/door/directional/south{ + id = "engsm"; + name = "Radiation Shutters Control"; + req_access = list("engineering"); + pixel_x = 6 + }, +/obj/machinery/button/door/directional/south{ + id = "sm_vent"; + name = "Supermatter Vent Control"; + req_access = list("engineering"); + pixel_x = -6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 5 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -834,24 +874,34 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) +"vh" = ( +/obj/effect/turf_decal/delivery/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter/room) "vj" = ( /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "vn" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/pink/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "vp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "vD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, -/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "vG" = ( @@ -861,10 +911,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "vR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/effect/turf_decal/delivery/red, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ + dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "wC" = ( /obj/structure/lattice, @@ -887,10 +938,7 @@ /turf/open/floor/iron, /area/station/engineering/main) "wR" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/meter, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "xj" = ( @@ -902,9 +950,10 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "xs" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, /obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1006,8 +1055,8 @@ /turf/open/floor/plating, /area/station/engineering/main) "zj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1049,6 +1098,13 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"AE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "AH" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1069,7 +1125,10 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "Bq" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/co2, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 + }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Bs" = ( @@ -1108,6 +1167,9 @@ c_tag = "Engineering - Engine Room, West"; name = "engineering camera" }, +/obj/machinery/atmospherics/components/trinary/mixer/flipped{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Ca" = ( @@ -1136,11 +1198,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Dj" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_large, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible, +/obj/machinery/meter, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Dq" = ( /obj/effect/turf_decal/stripes/line{ @@ -1169,6 +1229,7 @@ /obj/machinery/light/small/directional/south, /obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/south, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "DQ" = ( @@ -1178,14 +1239,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "DV" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/button/door/directional/south{ - id = "sm_vent"; - name = "Supermatter Vent Control"; - req_access = list("engineering") - }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 9 +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1236,24 +1291,29 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/light/directional/west, /obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "EY" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 9 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"Fr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +"Fc" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Burn to Hot"; + dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) +"Fr" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/pink/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1261,9 +1321,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "SM Loop" +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1295,16 +1354,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "FZ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 10 +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "SM Loop" }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Ga" = ( @@ -1312,19 +1369,17 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Gd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Gg" = ( /obj/effect/turf_decal/delivery/red, -/obj/structure/cable/multilayer/connected, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/layer1, /turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/supermatter/room) +/area/station/engineering/supermatter) "Gj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1341,10 +1396,9 @@ /area/station/engineering/main) "Gm" = ( /obj/effect/turf_decal/delivery/red, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/multilayer/connected, /turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/supermatter/room) +/area/station/engineering/supermatter) "Gn" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 5 @@ -1355,9 +1409,10 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "Go" = ( -/obj/structure/cable/multilayer/connected, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/bridge_pipe/pink/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "GE" = ( @@ -1372,7 +1427,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1434,27 +1497,20 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "In" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Burn to Hot Loop" - }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/delivery/red, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/supermatter/room) "Io" = ( -/obj/machinery/atmospherics/components/trinary/mixer/flipped{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/layer_manifold/purple/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Iu" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, -/obj/machinery/meter, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "IB" = ( @@ -1476,6 +1532,8 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Jc" = ( @@ -1504,7 +1562,10 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Kg" = ( -/obj/machinery/atmospherics/components/binary/pump, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Kp" = ( @@ -1514,9 +1575,12 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "KB" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "KF" = ( @@ -1526,15 +1590,15 @@ /obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix to SM Loop" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "KS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Hot Loop to Waste" + name = "Cold"; + dir = 8 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1548,8 +1612,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "LC" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, /turf/open/floor/iron/dark, @@ -1603,13 +1666,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/light/floor/has_bulb, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Np" = ( /obj/effect/turf_decal/stripes/end{ dir = 8 }, +/obj/structure/closet/radiation, /turf/open/floor/iron/dark, /area/station/engineering/main) "NA" = ( @@ -1719,7 +1784,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold/pink/visible{ - dir = 8 + dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1750,8 +1815,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 8 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1760,13 +1825,10 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter) "Rz" = ( +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible, /obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 5 + dir = 8 }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "RD" = ( @@ -1778,8 +1840,11 @@ /turf/open/floor/iron, /area/station/engineering/main) "RP" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ + dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1804,19 +1869,17 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "SE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/closet/radiation, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable/multilayer/connected, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "SX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 }, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/turf/open/floor/plating, +/obj/machinery/meter, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Td" = ( /obj/structure/lattice, @@ -1824,8 +1887,9 @@ /turf/open/space/basic, /area/space/nearstation) "Tm" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 6 +/obj/machinery/atmospherics/pipe/bridge_pipe/pink/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -1833,15 +1897,22 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/layer2, -/obj/machinery/atmospherics/components/binary/pump/layer4, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + name = "Ports to Space Loop" + }, +/obj/machinery/atmospherics/components/binary/pump/layer4{ + name = "Ports to Space Loop" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Tw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/light/floor/has_bulb, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Hot to Waste" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "TI" = ( @@ -1884,7 +1955,9 @@ /area/station/engineering/supermatter/room) "Uo" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 6 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Ur" = ( @@ -1954,7 +2027,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/structure/closet/radiation, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Vv" = ( @@ -1972,15 +2044,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "VG" = ( -/obj/effect/turf_decal/delivery/red, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer1, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/supermatter/room) +/obj/structure/chair, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "VL" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1997,12 +2063,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "VQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 6 +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 10 }, +/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Wc" = ( @@ -2031,12 +2096,8 @@ /turf/open/floor/iron, /area/station/engineering/main) "WB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "WR" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, @@ -2064,6 +2125,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 1 }, @@ -2077,15 +2139,14 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "XG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/supermatter) "XM" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 }, +/obj/structure/closet/radiation, /turf/open/floor/iron/dark, /area/station/engineering/main) "Yh" = ( @@ -2145,44 +2206,49 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 + dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Zl" = ( -/obj/machinery/atmospherics/components/binary/pump, -/obj/structure/cable/layer1, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Zo" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 10 - }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/obj/machinery/incident_display/delam/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ZK" = ( -/obj/machinery/atmospherics/components/trinary/filter, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Waste" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ZV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, -/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "ZX" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/binary/valve/digital{ dir = 4 }, -/obj/machinery/meter, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -2195,6 +2261,7 @@ TQ TQ tU tU +vj tU tU tU @@ -2202,8 +2269,7 @@ tU tU tU tU -tU -tU +vj tU tU tU @@ -2223,6 +2289,7 @@ DP TQ tU tU +vj tU tU tU @@ -2230,8 +2297,7 @@ tU tU tU tU -tU -tU +vj tU tU tU @@ -2356,7 +2422,7 @@ tU "} (7,1,1) = {" TQ -Bc +VG BA Bc jO @@ -2384,7 +2450,7 @@ ON "} (8,1,1) = {" TQ -Bc +VG BA Hj su @@ -2412,7 +2478,7 @@ tU "} (9,1,1) = {" TQ -Bc +VG BA Bc TQ @@ -2451,15 +2517,15 @@ sn Dq xj tw -VQ +tw tK fw Rw BJ -YW +Io YW rf -tw +ry Us Vr oZ @@ -2479,20 +2545,20 @@ xu UX zd UX -Yr -UX UX -XG -Io +zj +eL +sA +hQ tV eq -Kp -UX -Yr +eq +eq +SX kn sr Xb -tU +vj "} (12,1,1) = {" As @@ -2506,17 +2572,17 @@ tb XF aU aU -vR -qa -Ga -eL -sA -hQ +iV +YV Tm -Ga -Ga -Ga -DQ +YV +Go +Fr +Tm +YV +YV +YV +eT kn sr Xb @@ -2532,18 +2598,18 @@ lb TQ oB UX -UX +wR aU -UX -Yr -UX -Tm -fX +mw +Dj +Zl +ix +sA EY -DQ +LC gW -ci -ci +MO +MO PC Xf oZ @@ -2562,21 +2628,21 @@ Vu US UX aU -UX +mw qa dp vD -ZX -mw +Kp UX LC +kn fy fy sW fy fy Xb -tU +vj "} (15,1,1) = {" TQ @@ -2588,16 +2654,16 @@ TQ TQ TQ db -nT +UX aU -iV +mw Bq vn +Iu ZK -ZK -ZK -YV -DV +Kg +KB +AE fy ll Bs @@ -2616,16 +2682,16 @@ hD uz ev lJ -ry -Zl -vp -UX -Yr -UX -UX UX +aU +vp +LC UX -mg +Zo +fy +hT +hT +hT fy HY mB @@ -2644,23 +2710,23 @@ Jc HM ev Hi -Gd +MO Pb FF Ni -hG sG -it -SX +DV +fy +iR it iR -fy +Vf Ln xB Gn fy Xb -tU +vj "} (18,1,1) = {" TQ @@ -2671,17 +2737,17 @@ Jc YE HM ev +vR YR -Dj yx Yy +vh HG -VG -HG -HG +In +uh Gg Gm -Gm +XG Vf kv Aj @@ -2699,24 +2765,24 @@ Jc Jc HM ev -Wc +RP ZV KF FY Tw -KS BE -uh -WB -uh -Fr +Vr fy +iR +it +iR +Vf Ae Ef Pa fy Xb -tU +vj "} (20,1,1) = {" TQ @@ -2727,16 +2793,16 @@ bQ jY Vg ev -TI -uU +ZX +UX aU FZ zj pN -ci -Iu -YV -YV +uU +fy +hT +hT hT fy Sb @@ -2756,16 +2822,16 @@ TQ TQ TQ oO -Yr -aU UX -TS -eT -kg +aU +mg +Tm +ci +nT +Rz +Rz +Rz Rz -UX -UX -Zo Ew HK sm @@ -2782,15 +2848,15 @@ Wr TQ Np TQ -SE +Wc IW -Yr -Go -xu -Ur -VM -Eu -In +UX +aU +TS +VQ +kg +xs +UX UX UX UX @@ -2800,7 +2866,7 @@ IB AB PM Xb -tU +vj "} (23,1,1) = {" As @@ -2811,17 +2877,17 @@ ev lb TQ UW -UX +Yr wR -Uf +SE +Ur +VM +Eu +fX +UX +UX +UX UX -Vy -Yt -TM -Mk -WR -Kg -rB gf OL eU @@ -2839,18 +2905,18 @@ bg Gk gm xD -Ga DQ +UX Uf -vR -RP -vG -tw -bi -Ga -Ga -WT -Ga +Vy +Yt +TM +Mk +WR +WB +hG +rB +UX Uo ot nr @@ -2870,21 +2936,21 @@ TI UX UX Ju -UX -KB -UX -UX -UX -UX -UX -xs -UX -kn +KS +vG +tw +bi +Ga +Ga +Fc +WT +Ga +Gd IB AB PM Xb -tU +vj "} (26,1,1) = {" RD @@ -2898,8 +2964,8 @@ og lf NZ Qy -MO VL +MO oA AU iC @@ -2926,8 +2992,8 @@ oZ oZ oZ oZ -sr of +sr oZ sr sr @@ -2954,11 +3020,11 @@ Sr Sr Sr jQ -vj Yh UC UC UC +UC Eo vj lS @@ -2985,13 +3051,13 @@ tU tU tU tU -tU -tU +vj +vj Yh UC UC wC -tU +vj tU tU tU diff --git a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm index 061779d1595e1d..20841855fa0075 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm @@ -405,17 +405,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"mO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/structure/cable/multilayer/connected, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "ny" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 8 @@ -444,6 +433,7 @@ "ou" = ( /obj/machinery/light/small/directional/south, /obj/structure/cable, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "oO" = ( @@ -793,14 +783,17 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "Bw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable/multilayer/connected, /obj/machinery/door/poddoor/shutters/radiation/preopen{ id = "engsm"; name = "Radiation Chamber Shutters" }, -/obj/structure/cable/multilayer/connected, /turf/open/floor/plating, /area/station/engineering/supermatter) "BG" = ( @@ -960,6 +953,9 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "GG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -989,6 +985,7 @@ /obj/machinery/light/small/directional/south, /obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/south, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "HQ" = ( @@ -1016,15 +1013,9 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "Ik" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) +/obj/structure/chair, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "Iz" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engine SMES Room" @@ -1715,7 +1706,7 @@ xP "} (7,1,1) = {" GP -oO +Ik uh oO fp @@ -1743,7 +1734,7 @@ oW "} (8,1,1) = {" GP -oO +Ik uh gO ou @@ -1771,10 +1762,10 @@ xP "} (9,1,1) = {" GP -oO +Ik uh oO -oO +FD GP xP TK @@ -2141,9 +2132,9 @@ Dp tw zA HS -Ik -mO -Ik +GG +Bw +GG HS jQ fI diff --git a/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm index 83fc13fa9abe29..6110e5ab6b990b 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/teg.dmm @@ -10,7 +10,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 6 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ax" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -25,16 +25,17 @@ /area/space/nearstation) "aD" = ( /obj/machinery/atmospherics/components/binary/pump{ + name = "Hot"; dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "bc" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "bk" = ( /obj/structure/lattice, @@ -53,7 +54,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "bU" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -92,7 +93,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/cable/layer1, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "dy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -111,13 +112,17 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "dX" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/plasma, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) +"eH" = ( +/obj/structure/chair, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "eK" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -130,7 +135,7 @@ dir = 6 }, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ff" = ( /obj/structure/lattice, @@ -140,7 +145,7 @@ "fq" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "fr" = ( /obj/machinery/light/directional/east, @@ -148,12 +153,12 @@ dir = 8 }, /obj/machinery/status_display/ai/directional/east, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ft" = ( /obj/structure/sign/warning/secure_area/directional/east, /obj/effect/spawner/random/vending/colavend, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "fS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -180,7 +185,7 @@ /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "gD" = ( /obj/effect/turf_decal/bot, @@ -188,14 +193,14 @@ /obj/machinery/light/directional/north, /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/portable_atmospherics/canister/plasma, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "gG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "gT" = ( /obj/structure/lattice/catwalk, @@ -205,12 +210,13 @@ "gZ" = ( /obj/machinery/light/small/directional/south, /obj/structure/cable, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "hg" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "hs" = ( /obj/structure/grille, @@ -222,7 +228,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "hM" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -233,7 +239,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ig" = ( /obj/machinery/light/directional/north, @@ -241,7 +247,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "iy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -253,13 +259,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ja" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "jg" = ( /obj/effect/turf_decal/bot, @@ -272,13 +278,13 @@ }, /obj/machinery/portable_atmospherics/canister/plasma, /obj/structure/cable/layer1, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "km" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/mapping_helpers/apc/cell_10k, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ku" = ( /obj/machinery/sparker/directional/east{ @@ -291,17 +297,17 @@ /area/station/engineering/atmospherics_engine) "kV" = ( /obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Burn to Hot" + name = "Burn to Hot"; + dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "lb" = ( -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "lm" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "lp" = ( /obj/effect/turf_decal/bot, @@ -311,17 +317,17 @@ /obj/machinery/portable_atmospherics/canister/plasma, /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/cable/layer1, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "lv" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ly" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "lA" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -339,7 +345,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "md" = ( /turf/closed/wall/r_wall, @@ -356,12 +362,12 @@ "mm" = ( /obj/machinery/camera/autoname/directional/east, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "mx" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "mG" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ @@ -371,9 +377,10 @@ /area/station/engineering/atmospherics_engine) "mH" = ( /obj/machinery/atmospherics/components/binary/pump{ + name = "Cold"; dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "mJ" = ( /obj/effect/turf_decal/bot, @@ -381,7 +388,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "mW" = ( /obj/structure/lattice/catwalk, @@ -391,12 +398,12 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "nh" = ( /obj/item/radio/intercom/directional/south, /obj/machinery/light/directional/south, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "nw" = ( /obj/structure/cable, @@ -409,13 +416,13 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "os" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ot" = ( /obj/effect/turf_decal/stripes/line{ @@ -423,7 +430,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "oA" = ( /obj/effect/turf_decal/stripes/line{ @@ -431,14 +438,14 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "oK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "pg" = ( /obj/effect/turf_decal/bot, @@ -447,35 +454,35 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "pt" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "qj" = ( /obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "qJ" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 9 }, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "qO" = ( /obj/structure/closet/firecloset, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "re" = ( /obj/machinery/light/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/west, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "rh" = ( /obj/structure/lattice, @@ -487,7 +494,7 @@ "ry" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "rA" = ( /obj/effect/turf_decal/delivery, @@ -495,7 +502,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "rK" = ( /obj/structure/cable, @@ -513,7 +520,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "sJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -521,11 +528,11 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/meson/engine, /obj/item/tank/internals/emergency_oxygen/engi, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "sX" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "tp" = ( /obj/effect/turf_decal/stripes/corner{ @@ -533,10 +540,10 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Mix to Engine" + name = "Mix to Engine"; + dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "tw" = ( /obj/structure/table/reinforced, @@ -545,7 +552,7 @@ pixel_x = 7; pixel_y = 3 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "tI" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ @@ -570,7 +577,7 @@ name = "Engine SMES Room" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron/textured, +/turf/open/floor/iron/dark/textured, /area/station/engineering/main) "tU" = ( /obj/structure/cable, @@ -590,18 +597,18 @@ }, /obj/item/multitool, /obj/item/radio/intercom/directional/west, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "up" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "uv" = ( /obj/machinery/camera/autoname/directional/east, /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ux" = ( /obj/machinery/light/directional/south, @@ -611,7 +618,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "vr" = ( /obj/effect/turf_decal/bot, @@ -622,19 +629,19 @@ req_access = list("engineering") }, /obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "vs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "vD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable/multilayer/connected, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "vF" = ( /turf/closed/wall/r_wall, @@ -643,46 +650,53 @@ /obj/structure/cable/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "vW" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "vX" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "wb" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "wi" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/structure/closet/emcloset, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "wu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/cable/layer1, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "wx" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/pump, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/atmospherics_engine) +"wD" = ( +/obj/machinery/atmospherics/components/binary/valve/digital{ + name = "Space Loop Bypass"; + dir = 4 + }, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "wK" = ( /obj/effect/turf_decal/bot, @@ -691,21 +705,21 @@ pixel_y = 32 }, /obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "wL" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/directional/north, /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "wP" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "wU" = ( /turf/open/floor/engine/vacuum, @@ -714,12 +728,13 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "xS" = ( /obj/machinery/light/small/directional/south, /obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/south, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/engineering/main) "yc" = ( @@ -734,16 +749,16 @@ /obj/effect/turf_decal/bot, /obj/machinery/camera/autoname/directional/north, /obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "yO" = ( /obj/machinery/camera/autoname/directional/west, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "yS" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "zy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -755,7 +770,7 @@ "zB" = ( /obj/structure/rack, /obj/item/pipe_dispenser, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "zR" = ( /obj/machinery/sparker/directional/west{ @@ -771,7 +786,7 @@ dir = 4 }, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Aa" = ( /obj/machinery/light/directional/north, @@ -779,7 +794,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Ak" = ( /obj/effect/turf_decal/stripes/line{ @@ -789,7 +804,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/cable/layer1, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "AM" = ( /obj/effect/turf_decal/delivery, @@ -797,7 +812,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "AP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -808,16 +823,16 @@ "Bf" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "BG" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "CB" = ( /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "CH" = ( /obj/effect/turf_decal/bot, @@ -825,13 +840,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/structure/window/reinforced/spawner/directional/south, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "CY" = ( /obj/machinery/light/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light_switch/directional/east, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Df" = ( /obj/effect/turf_decal/bot, @@ -840,19 +855,19 @@ pixel_y = 32 }, /obj/machinery/portable_atmospherics/canister/plasma, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "Dk" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Dm" = ( /obj/machinery/light/directional/east, /obj/structure/extinguisher_cabinet/directional/east, /obj/item/bot_assembly/firebot, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Dq" = ( /obj/machinery/door/poddoor{ @@ -870,7 +885,7 @@ /area/space/nearstation) "DS" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "EF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -879,7 +894,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "EV" = ( /obj/structure/lattice, @@ -892,11 +907,11 @@ /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 9 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "FS" = ( /obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Gh" = ( /obj/effect/turf_decal/bot, @@ -907,7 +922,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/cable/layer1, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "Gk" = ( /obj/structure/table/reinforced, @@ -915,33 +930,33 @@ pixel_y = 5 }, /obj/item/storage/toolbox/mechanical, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Go" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Gr" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "GJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "GY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Hk" = ( /obj/effect/turf_decal/stripes/line, @@ -962,13 +977,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "HO" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Hot to Burn" }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "HY" = ( /obj/structure/sign/warning/secure_area, @@ -978,29 +993,36 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/engineering/atmospherics_engine) +"IC" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Hot"; + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "IJ" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Burn Byproducts" }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "IL" = ( /obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Jj" = ( /obj/machinery/camera/autoname/directional/west, /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Jo" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "JE" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -1010,14 +1032,16 @@ /turf/open/floor/plating, /area/station/engineering/atmospherics_engine) "Kd" = ( -/obj/machinery/atmospherics/components/binary/pump, -/turf/open/floor/iron, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Cold" + }, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Kk" = ( /obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "KF" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ @@ -1038,21 +1062,21 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/meson/engine, /obj/item/tank/internals/emergency_oxygen/engi, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Lr" = ( /obj/structure/rack, /obj/item/crowbar/large, /obj/item/flashlight, /obj/item/pipe_dispenser, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "LC" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "LD" = ( /obj/machinery/light/directional/north, @@ -1063,7 +1087,7 @@ "LQ" = ( /obj/structure/sign/warning/no_smoking/directional/east, /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "LZ" = ( /obj/structure/lattice/catwalk, @@ -1074,7 +1098,7 @@ /area/space/nearstation) "Mh" = ( /obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Mk" = ( /obj/effect/turf_decal/stripes/line{ @@ -1093,19 +1117,19 @@ /obj/machinery/atmospherics/components/binary/valve/digital{ name = "Space to Cold Loop" }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "MD" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 8 }, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "MH" = ( /obj/effect/turf_decal/bot, /obj/machinery/space_heater, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "MW" = ( /obj/structure/cable/layer1, @@ -1124,7 +1148,7 @@ pixel_y = -24 }, /obj/machinery/light/directional/south, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "No" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -1140,46 +1164,50 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "OH" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/dark/visible, /obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "OO" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Pq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Pv" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ +/obj/machinery/atmospherics/components/binary/pump{ name = "Mix to Burn" }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"Py" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "QA" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "QE" = ( /turf/closed/wall, /area/station/engineering/atmospherics_engine) "QG" = ( /obj/effect/spawner/random/vending/snackvend, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "QH" = ( /obj/structure/cable/multilayer/connected, @@ -1197,18 +1225,18 @@ /obj/machinery/atmospherics/components/binary/valve/digital{ name = "Cold Loop" }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Rr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/binary/valve/digital{ name = "Cold Loop" }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "RA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Sd" = ( /obj/effect/turf_decal/bot, @@ -1219,11 +1247,11 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/cable/layer1, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "So" = ( /obj/structure/table/reinforced, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "SB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1233,7 +1261,7 @@ /obj/item/flashlight, /obj/machinery/camera/autoname/directional/east, /obj/item/radio/intercom/directional/east, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "SM" = ( /obj/machinery/light/directional/west, @@ -1252,7 +1280,7 @@ pixel_x = 3; pixel_y = -3 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "SO" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, @@ -1271,20 +1299,20 @@ /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/meson/engine, /obj/item/tank/internals/emergency_oxygen/engi, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "TT" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Uf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Ui" = ( /obj/effect/turf_decal/bot, @@ -1293,23 +1321,23 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmospherics_engine) "Up" = ( /obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Ut" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ name = "Cold Loop to Space" }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Uz" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "UF" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -1322,12 +1350,12 @@ dir = 4 }, /obj/structure/closet/firecloset, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "UT" = ( /obj/structure/sign/warning/no_smoking/directional/west, /obj/structure/closet/emcloset, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Vj" = ( /obj/structure/lattice, @@ -1356,14 +1384,14 @@ name = "Engine Room" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/iron/textured, +/turf/open/floor/iron/dark/textured, /area/station/engineering/atmospherics_engine) "WP" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 6 }, /obj/machinery/meter, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Xz" = ( /obj/machinery/light/directional/south, @@ -1373,7 +1401,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 5 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "XD" = ( /obj/machinery/firealarm/directional/north, @@ -1385,17 +1413,17 @@ dir = 4 }, /obj/machinery/status_display/ai/directional/west, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Yl" = ( /obj/machinery/atmospherics/pipe/smart/manifold/orange/visible{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "YB" = ( /obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "YM" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -1406,7 +1434,7 @@ /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high/empty, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "Zc" = ( /obj/structure/lattice/catwalk, @@ -1419,7 +1447,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 9 }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) "ZT" = ( /obj/structure/cable/layer1, @@ -1599,7 +1627,7 @@ ml "} (7,1,1) = {" Wg -cp +eH To cp rK @@ -1627,7 +1655,7 @@ mW "} (8,1,1) = {" Wg -cp +eH To nw gZ @@ -1655,10 +1683,10 @@ ml "} (9,1,1) = {" Wg -cp +eH To cp -cp +cj Wg Bf EY @@ -1858,7 +1886,7 @@ dU lb vW lb -mH +IC CB Jo ja @@ -2113,7 +2141,7 @@ up so lm HM -lm +Dk Ut bU Zc @@ -2141,7 +2169,7 @@ Aa wP lb lb -lb +wD lb ax dh @@ -2169,7 +2197,7 @@ lb xr Dk Dk -Dk +Py Mu bU KK From 6af496cbce243ae1aef14e2f24eadb45a879caf6 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Mon, 1 Jul 2024 00:01:26 -0500 Subject: [PATCH 16/27] Fix 15 Conflict fixes for PR 2346. Should be good. --- _maps/map_files/BoxStation/BoxStation.dmm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 38620b41dcc9d8..9ef1bb6430660a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -25415,7 +25415,7 @@ pixel_x = -6; pixel_y = 7 }, -/obj/item/stamp/qm{ +/obj/item/stamp/head/qm{ pixel_x = 8; pixel_y = 12 }, @@ -37020,7 +37020,7 @@ pixel_y = 4; pixel_x = 9 }, -/obj/item/stamp/hos{ +/obj/item/stamp/head/hos{ pixel_x = 10; pixel_y = 6 }, @@ -43295,7 +43295,7 @@ /obj/item/pen{ pixel_y = 4 }, -/obj/item/stamp/ce, +/obj/item/stamp/head/ce, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) "onj" = ( @@ -59023,7 +59023,7 @@ /obj/item/paper_bin, /obj/item/folder/blue, /obj/item/pen, -/obj/item/stamp/hop, +/obj/item/stamp/head/hop, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hop) "tyG" = ( @@ -60005,7 +60005,7 @@ /obj/item/paper_bin, /obj/item/folder/blue, /obj/item/pen/fountain, -/obj/item/stamp/captain, +/obj/item/stamp/head/captain, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "tQJ" = ( @@ -66059,7 +66059,7 @@ pixel_x = 3; pixel_y = 2 }, -/obj/item/stamp/cmo, +/obj/item/stamp/head/cmo, /turf/open/floor/iron/dark/side, /area/station/command/heads_quarters/cmo) "vPG" = ( @@ -66306,7 +66306,7 @@ /obj/item/pen{ pixel_y = 7 }, -/obj/item/stamp/rd{ +/obj/item/stamp/head/rd{ pixel_y = 10 }, /turf/open/floor/carpet/purple, From fd198798eaeb740ea19f7ee25b3a7568eef2644e Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Tue, 2 Jul 2024 23:12:34 -0500 Subject: [PATCH 17/27] Fix 16 Adds some more stuff from Blueshift. Adds the cargo drone bay, located right above waste disposal. Fixes the ATM machines, didn't notice we had added directional ones. --- _maps/map_files/BoxStation/BoxStation.dmm | 481 ++++++++++-------- .../RandomEngines/BoxStation/sm_teg.dmm | 40 +- .../RandomEngines/BoxStation/supermatter.dmm | 37 +- 3 files changed, 333 insertions(+), 225 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9ef1bb6430660a..bbea988e2e7255 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -272,8 +272,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "afl" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 @@ -5291,10 +5294,10 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "bKY" = ( -/obj/effect/decal/cleanable/generic, -/obj/structure/sign/poster/random/directional/north, -/obj/effect/spawner/random/structure/table, -/turf/open/floor/iron/dark, +/obj/machinery/light/small/directional/west, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/maintenance/department/cargo) "bLy" = ( /turf/closed/wall/r_wall, @@ -6601,11 +6604,29 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "cgX" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Cargo - Drone Launch Room"; + name = "cargo camera" + }, +/obj/machinery/status_display/evac/directional/south, /obj/structure/table, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/item/stock_parts/scanning_module{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = -5 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/stock_parts/scanning_module{ + pixel_x = 5 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "chg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/sepia, @@ -6792,7 +6813,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 }, -/obj/machinery/atm, +/obj/machinery/atm/directional/north, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -6882,9 +6903,9 @@ /turf/open/floor/iron/dark, /area/station/commons/vacant_room/office) "clf" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/area/station/cargo/drone_bay) "clg" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -7080,11 +7101,9 @@ /turf/open/floor/iron/dark, /area/station/security/processing) "cox" = ( -/obj/machinery/airalarm/directional/west, -/obj/structure/table, -/obj/effect/spawner/random/maintenance/five, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/effect/spawner/random/structure/tank_holder, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "coA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/meter, @@ -12237,9 +12256,10 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "dZE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14081,11 +14101,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "eGV" = ( -/obj/structure/sign/poster/random/directional/west, -/obj/effect/spawner/random/structure/table, -/obj/effect/spawner/random/maintenance/four, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "eGX" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -14655,10 +14673,18 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "eRQ" = ( -/obj/machinery/vending/cigarette, /obj/machinery/light/small/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/status_display/ai/directional/north, +/obj/structure/rack, +/obj/item/circuitboard/machine/exoscanner{ + pixel_y = 3 + }, +/obj/item/circuitboard/machine/exoscanner, +/obj/item/circuitboard/machine/exoscanner{ + pixel_y = -3 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "eRV" = ( /obj/effect/turf_decal/trimline/purple/filled/warning, /turf/open/floor/iron/white, @@ -15176,10 +15202,10 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/cargo/miningoffice) "fby" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/machinery/airalarm/directional/north, +/obj/machinery/computer/exoscanner_control, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "fbT" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/two, @@ -16278,11 +16304,8 @@ /turf/closed/wall/r_wall, /area/station/command/heads_quarters/qm) "fvV" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/engineering/tool, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/turf/open/floor/plating, +/area/station/cargo/drone_bay) "fvW" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/plating/airless, @@ -19301,10 +19324,9 @@ /turf/open/floor/iron/dark, /area/station/security/execution) "gxx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/barricade/wooden, +/obj/machinery/light/small/directional/north, /turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/area/station/cargo/drone_bay) "gxH" = ( /turf/closed/wall, /area/station/science/breakroom) @@ -22638,9 +22660,9 @@ /turf/open/floor/iron/dark/textured_large, /area/station/cargo/storage) "hxM" = ( -/obj/effect/spawner/random/trash/mess, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/structure/filingcabinet, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "hxS" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -23448,7 +23470,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/red/line, -/obj/machinery/atm, +/obj/machinery/atm/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "hLW" = ( @@ -27589,6 +27611,9 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "jee" = ( @@ -28989,10 +29014,18 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "jDX" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/item/radio/intercom/directional/north, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "jEd" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -32023,11 +32056,6 @@ /obj/structure/closet/secure_closet/security/med, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) -"kEt" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/structure/girder, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "kEL" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -32057,7 +32085,7 @@ /area/station/hallway/primary/central) "kFc" = ( /obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/atm, +/obj/machinery/atm/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "kFf" = ( @@ -35511,10 +35539,11 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "lJj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/random/directional/east, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "lJr" = ( /obj/machinery/camera/directional/north{ c_tag = "Engineering - Atmospherics Nitrogen Chamber"; @@ -36567,11 +36596,13 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "mbK" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/head/beret, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/fuel_pellet, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "mbN" = ( /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 10 @@ -37681,16 +37712,30 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "muO" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/newscaster/directional/south, /obj/structure/table, -/obj/item/poster/random_official, -/obj/item/poster/random_official{ - pixel_y = 7 +/obj/item/folder/yellow{ + pixel_x = 3; + pixel_y = 6 }, -/obj/item/poster/random_official{ +/obj/item/folder/yellow{ + pixel_x = 3; pixel_y = 3 }, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/item/folder/yellow{ + pixel_x = 3 + }, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "mvb" = ( /obj/machinery/button/door/directional/south{ id = "dorm_2"; @@ -40370,7 +40415,7 @@ /area/station/hallway/primary/aft) "nrX" = ( /obj/machinery/light/small/directional/north, -/obj/machinery/atm, +/obj/machinery/atm/directional/north, /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron/dark/side{ dir = 1 @@ -44090,7 +44135,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/line, -/obj/machinery/atm, +/obj/machinery/atm/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "oAe" = ( @@ -44156,9 +44201,9 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) "oAX" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/cargo/drone_bay) "oBh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47134,19 +47179,10 @@ /turf/open/floor/iron, /area/station/science/robotics/lab) "pzi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "pzt" = ( /obj/effect/turf_decal/trimline/neutral/line, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -47614,7 +47650,7 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/machinery/atm, +/obj/machinery/atm/directional/north, /obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) @@ -50895,12 +50931,18 @@ /turf/open/floor/iron/white, /area/station/science/lab) "qQe" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/disposalpipe/segment, -/obj/machinery/light/small/directional/south, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/structure/table, +/obj/item/phone{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_x = -6; + pixel_y = 11 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "qQf" = ( /turf/open/floor/iron/dark/corner{ dir = 1 @@ -51970,10 +52012,6 @@ dir = 5 }, /area/station/security/prison) -"rjd" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) "rjf" = ( /obj/machinery/light/small/directional/west, /obj/item/radio/intercom/chapel/directional/east, @@ -52750,11 +52788,12 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "rwq" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/table, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/structure/cable, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "rws" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/sparker/directional/south{ @@ -55272,10 +55311,16 @@ /turf/open/floor/iron/dark/textured, /area/station/security/processing) "smr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/blobstart, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/box, +/obj/machinery/holopad, +/turf/open/floor/iron/large, +/area/station/cargo/drone_bay) "sms" = ( /turf/closed/wall, /area/station/service/chapel/funeral) @@ -56520,8 +56565,8 @@ /area/station/medical/break_room) "sKs" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "sKy" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/vending/wallmed/directional/west, @@ -56682,10 +56727,9 @@ /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "sMS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/backpack/duffelbag, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "sMY" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/structure/closet/emcloset, @@ -57208,7 +57252,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/line, -/obj/machinery/atm, +/obj/machinery/atm/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/aft) "sWq" = ( @@ -59005,10 +59049,10 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/atmos) "tyt" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/generic, +/obj/machinery/exodrone_launcher, +/obj/item/exodrone, /turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/area/station/cargo/drone_bay) "tyC" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/airalarm/directional/west, @@ -60089,10 +60133,12 @@ }, /area/station/security/prison/safe) "tRW" = ( -/obj/structure/table, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/machinery/light/small/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/computer/exodrone_control_console, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "tRX" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -60302,9 +60348,8 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "tWy" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "tWN" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 @@ -64378,9 +64423,14 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "vlq" = ( -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/machinery/firealarm/directional/east{ + pixel_y = 6 + }, +/obj/machinery/light_switch/directional/east{ + pixel_y = -4 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "vlr" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -66067,10 +66117,11 @@ /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) "vPL" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/coin, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "vPR" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/small/broken/directional/south, @@ -67100,12 +67151,27 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "whN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, -/obj/structure/closet, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/stock_parts/micro_laser{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = 2 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = 6; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "wia" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -67719,7 +67785,7 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 }, -/obj/machinery/atm, +/obj/machinery/atm/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "wtt" = ( @@ -67968,10 +68034,9 @@ /turf/open/floor/wood, /area/station/security/prison/safe) "wxT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/filingcabinet, +/obj/machinery/exodrone_launcher, /turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/area/station/cargo/drone_bay) "wxU" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating/airless, @@ -69483,13 +69548,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining{ + name = "Drone Bay" }, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/landmark/navigate_destination{ + location = "Drone Bay" + }, +/turf/open/floor/iron/dark/textured, +/area/station/cargo/drone_bay) "wXC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -70048,7 +70119,7 @@ "xhj" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, -/area/station/maintenance/department/cargo) +/area/station/cargo/drone_bay) "xhp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70899,6 +70970,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line, +/obj/machinery/atm/directional/north, /obj/machinery/vending/modularpc, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) @@ -71024,13 +71096,8 @@ }, /area/station/service/hydroponics) "xyv" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/chair_maintenance{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/turf/closed/wall, +/area/station/cargo/drone_bay) "xyw" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/effect/turf_decal/trimline/neutral/line{ @@ -79520,13 +79587,13 @@ kfl kfl kfl kfl -cRp -cRp -hsC -hsC -hsC -cRp -cRp +xyv +xyv +clf +clf +clf +xyv +xyv ksa ksa ksa @@ -79777,13 +79844,13 @@ wZF wZF wZF wZF -cRp -eRQ -wxT -vPL +xyv +fvV +fvV +fvV +fvV fvV xyv -cRp tgJ ucJ ksa @@ -80034,13 +80101,13 @@ wZF wZF wZF wZF -cRp +xyv gxx -xMz -smr +wxT +fvV tyt oAX -cRp +xyv ryp ucJ ucJ @@ -80291,13 +80358,13 @@ wZF wZF wZF wZF -cRp -bKY -xMz -xIX -sMS -rjd -cRp +xyv +fvV +fvV +fvV +fvV +fvV +xyv oHt fpa iiv @@ -80548,13 +80615,13 @@ wZF wZF wZF wZF -cRp +xyv mbK -oAX -clf +lJj +lJj lJj whN -cRp +xyv ucJ cim ucJ @@ -80805,13 +80872,13 @@ wZF wZF wZF wZF -cRp -cRp -cRp +xyv +eRQ +eGV pzi -cRp -cRp -cRp +vPL +cgX +xyv wXM pIS gUS @@ -81062,13 +81129,13 @@ wZF wZF wZF wZF -cRp -eGV +xyv +cox +tWy +pzi tWy -uut -cgX cox -cRp +xyv suC pIS aKS @@ -81319,9 +81386,9 @@ wZF wZF wZF wZF -cRp +xyv fby -hxM +tWy dZz sKs qQe @@ -81576,13 +81643,13 @@ wZF wZF wZF wZF -cRp +xyv tRW rwq -nxG -rwq +smr +tWy muO -cRp +xyv mgd pIS kHP @@ -81833,13 +81900,13 @@ wZF wZF wZF wZF -cRp +xyv jDX vlq afh -xMz -xMz -cRp +sMS +hxM +xyv dpc tdV gsj @@ -82349,7 +82416,7 @@ xfW qVf bqd cWF -wJA +bKY jdV rSs xMz @@ -93155,9 +93222,9 @@ wEB wEB wEB wEB -kEt +jay nwz -kEt +jay wEB wEB wEB @@ -94174,7 +94241,7 @@ nwz nwz alM wEB -kEt +jay pYX alM okg diff --git a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm index ddad6af70902db..986380fd08a2db 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/sm_teg.dmm @@ -376,7 +376,9 @@ }, /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/north, -/obj/machinery/firealarm/directional/north, +/obj/machinery/firealarm/directional/north{ + pixel_x = -5 + }, /turf/open/floor/iron/dark, /area/station/engineering/main) "kN" = ( @@ -594,7 +596,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "oO" = ( @@ -750,6 +751,9 @@ "sC" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/south{ + pixel_x = 5 + }, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 }, @@ -1074,6 +1078,7 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "Aj" = ( +/obj/effect/turf_decal/stripes/box, /obj/machinery/power/supermatter_crystal/engine, /turf/open/floor/engine, /area/station/engineering/supermatter) @@ -1415,6 +1420,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"Gv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/button/delam_scram{ + pixel_y = -32 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "GE" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1609,6 +1623,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/delam_scram/directional/west, /turf/open/floor/engine, /area/station/engineering/supermatter) "LC" = ( @@ -1837,6 +1852,9 @@ "RM" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/light/directional/south, +/obj/machinery/firealarm/directional/south{ + pixel_x = -5 + }, /turf/open/floor/iron, /area/station/engineering/main) "RP" = ( @@ -2001,7 +2019,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "UX" = ( @@ -2027,6 +2044,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Vv" = ( @@ -2074,6 +2092,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -2213,6 +2232,17 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"Zk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/north{ + pixel_x = 5 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "Zl" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/violet/visible, /obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ @@ -2538,7 +2568,7 @@ Ux GE RM TQ -ky +Zk ev TI xu @@ -2771,7 +2801,7 @@ KF FY Tw BE -Vr +Gv fy iR it diff --git a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm index 20841855fa0075..5c9c33e95dc236 100644 --- a/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm +++ b/_maps/~monkestation/RandomEngines/BoxStation/supermatter.dmm @@ -196,6 +196,9 @@ c_tag = "Engineering Supermatter Fore"; network = list("ss13","engine") }, +/obj/machinery/button/delam_scram{ + pixel_y = -32 + }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "fB" = ( @@ -440,6 +443,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "oS" = ( +/obj/effect/turf_decal/stripes/box, /obj/machinery/power/supermatter_crystal/engine, /turf/open/floor/engine, /area/station/engineering/supermatter) @@ -472,11 +476,12 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "pJ" = ( -/obj/structure/table, -/obj/item/analyzer, -/obj/item/pipe_dispenser, -/turf/open/floor/iron/dark, -/area/station/engineering/supermatter/room) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/delam_scram/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "pR" = ( /obj/structure/reflector/double/anchored{ dir = 6 @@ -704,6 +709,7 @@ dir = 1 }, /obj/machinery/light/small/directional/north, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "zV" = ( @@ -918,7 +924,7 @@ "Fu" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/south, -/obj/structure/sign/warning/radiation/directional/south, +/obj/structure/sign/delam_procedure/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -1197,20 +1203,25 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/light_switch/directional/north{ + pixel_x = -8 + }, +/obj/machinery/firealarm/directional/north, /obj/structure/table/reinforced, -/obj/machinery/light_switch/directional/north, +/obj/item/clothing/gloves/color/black, /obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = 5 }, -/obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/meson/engine, +/obj/item/analyzer, +/obj/item/pipe_dispenser, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "OR" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/firealarm/directional/north, +/obj/machinery/incident_display/delam/directional/north, /obj/structure/table/reinforced, /obj/item/clothing/suit/utility/radiation, /obj/item/clothing/head/utility/radiation, @@ -1473,11 +1484,11 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "XP" = ( -/obj/machinery/meter, /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/south, +/obj/structure/sign/warning/radiation/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/item/radio/intercom/directional/south, +/obj/machinery/meter, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "XU" = ( @@ -2048,7 +2059,7 @@ dP DX dy kz -yF +pJ yF yF Kw @@ -2249,7 +2260,7 @@ xv xv aW xv -pJ +xv mg mn mn From 99a4488c04b97902915582a42f0ef7ba0845cdf7 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Fri, 12 Jul 2024 00:01:26 -0500 Subject: [PATCH 18/27] Fix 17 Changes the random bars to have a north entrance by default. Changes the cold-room freezer setup to actually work, also added a port for gas canisters. Other stuff. --- _maps/map_files/BoxStation/BoxStation.dmm | 243 +++++++++++------- .../RandomBars/Box/bloody_bar.dmm | 54 ++-- .../RandomBars/Box/clockwork_bar.dmm | 50 ++-- .../RandomBars/Box/default_bar.dmm | 89 +++++-- .../RandomBars/Box/vietmoth_bar.dmm | 43 ++-- 5 files changed, 289 insertions(+), 190 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index bbea988e2e7255..c4ce3d168fb458 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -266,6 +266,7 @@ dir = 8 }, /obj/effect/mapping_helpers/mail_sorting/supply/qm_office, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port) "afh" = ( @@ -1293,7 +1294,6 @@ /turf/open/floor/iron/white, /area/station/science/research) "awE" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, @@ -1433,6 +1433,9 @@ /obj/effect/turf_decal/trimline/dark_blue/line, /obj/structure/sign/departments/aiupload/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/camera/directional/north{ + c_tag = "Port Hallway East" + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "azn" = ( @@ -2149,6 +2152,7 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "aMD" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, /area/station/service/bar/backroom) "aMI" = ( @@ -3425,8 +3429,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/mob/living/basic/goat/pete, /obj/machinery/duct, +/obj/machinery/holopad, +/mob/living/basic/goat/pete, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "bii" = ( @@ -4369,7 +4374,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "bwJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "bwW" = ( @@ -4890,15 +4897,14 @@ "bGd" = ( /obj/machinery/light/directional/east, /obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/closet/secure_closet/freezer/meat, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "bGl" = ( /obj/structure/mirror/directional/east, /obj/structure/sink/kitchen/directional/west, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, /turf/open/floor/wood, /area/station/service/bar/backroom) "bGn" = ( @@ -5343,6 +5349,14 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/wood, /area/station/service/library/lounge) +"bMh" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/port) "bMr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -11677,7 +11691,8 @@ /turf/open/floor/wood, /area/station/commons/vacant_room/office) "dPD" = ( -/obj/structure/closet/secure_closet/freezer/fridge, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, +/obj/structure/closet/secure_closet/freezer/kitchen, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "dPF" = ( @@ -12241,6 +12256,11 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/security/prison/garden) +"dZs" = ( +/obj/effect/turf_decal/tile/green/fourcorners, +/obj/structure/sign/poster/official/cohiba_robusto_ad/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "dZu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12800,7 +12820,7 @@ "ejE" = ( /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, +/obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/port) "ejK" = ( @@ -13379,9 +13399,13 @@ }, /area/station/service/hydroponics/garden) "etV" = ( -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo" +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 }, +/obj/structure/closet/secure_closet/freezer/meat, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "etW" = ( @@ -16401,6 +16425,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/line, +/obj/structure/sign/poster/official/random/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -19948,9 +19973,8 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "gHs" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 - }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "gHu" = ( @@ -21370,9 +21394,14 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "hcK" = ( -/obj/structure/sink/kitchen/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = -8 + }, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/atmospherics/components/binary/pump/on/layer4{ + dir = 8; + name = "Supply to Freezer" }, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) @@ -21495,6 +21524,7 @@ name = "Hydroponics" }, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/machinery/duct, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "hfb" = ( @@ -24722,7 +24752,7 @@ dir = 1 }, /obj/machinery/light/directional/north, -/obj/machinery/oven/range, +/obj/machinery/griddle, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "ikX" = ( @@ -26475,8 +26505,10 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "iJX" = ( -/obj/machinery/airalarm/directional/west, -/obj/structure/kitchenspike, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "iKf" = ( @@ -26490,10 +26522,6 @@ /obj/item/storage/secure/briefcase, /turf/open/floor/iron/dark, /area/station/security/detectives_office) -"iKB" = ( -/obj/machinery/gibber, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) "iKJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28223,7 +28251,7 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, -/obj/machinery/griddle, +/obj/machinery/oven/range, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "jqs" = ( @@ -31922,8 +31950,7 @@ /turf/open/floor/iron/vaporwave, /area/station/service/library/printer) "kCA" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/atmospherics/pipe/layer_manifold/general/visible, /obj/structure/kitchenspike, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) @@ -32021,6 +32048,7 @@ "kDx" = ( /obj/machinery/firealarm/directional/east, /obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/space_heater, /turf/open/floor/iron/dark/side{ dir = 6 }, @@ -33476,7 +33504,7 @@ /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) "laO" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "laR" = ( @@ -44470,13 +44498,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 10 }, /obj/machinery/duct, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) +/turf/open/floor/plating, +/area/station/maintenance/port) "oGe" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -46300,9 +46327,7 @@ /turf/open/floor/iron/white, /area/station/medical/surgery) "pmv" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "pmQ" = ( @@ -49448,6 +49473,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port) "qqy" = ( @@ -49840,6 +49866,7 @@ /obj/machinery/camera/directional/south{ c_tag = "Port Hallway Center" }, +/obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "qwd" = ( @@ -52596,15 +52623,14 @@ /turf/open/floor/iron/white, /area/station/hallway/secondary/exit/departure_lounge) "rtq" = ( -/obj/effect/turf_decal/trimline/green/filled/line, -/obj/effect/turf_decal/trimline/green/line{ - dir = 1 +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 }, -/obj/machinery/camera/directional/south{ - c_tag = "Port Hallway East" +/obj/machinery/duct, +/turf/open/floor/iron/dark/side{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/port) +/area/station/service/hydroponics) "rtz" = ( /obj/machinery/duct, /obj/structure/cable, @@ -56233,6 +56259,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron/dark/side, /area/station/service/hydroponics) "sDz" = ( @@ -57440,9 +57467,10 @@ /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) "sYt" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ - dir = 4 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 }, +/obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "sYv" = ( @@ -58355,11 +58383,12 @@ /turf/open/floor/iron/white, /area/station/medical/break_room) "toh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/service/hydroponics) +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/obj/structure/kitchenspike, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) "tom" = ( /obj/machinery/light/small/directional/south, /obj/machinery/duct, @@ -59324,6 +59353,13 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) +"tCb" = ( +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) "tCM" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron/dark/side{ @@ -60022,7 +60058,8 @@ /area/station/medical/break_room) "tQo" = ( /obj/machinery/light/directional/west, -/obj/structure/kitchenspike, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/obj/machinery/gibber, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "tQD" = ( @@ -64502,6 +64539,7 @@ /area/station/medical/office) "vmq" = ( /obj/effect/turf_decal/tile/green/fourcorners, +/obj/structure/sign/poster/official/high_class_martini/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "vmu" = ( @@ -66002,6 +66040,16 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"vND" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "vNF" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/siding/wood/corner{ @@ -68865,6 +68913,14 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"wLx" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/line, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/port) "wLK" = ( /turf/open/floor/iron/dark, /area/station/engineering/atmos/office) @@ -69050,8 +69106,9 @@ /area/station/command/heads_quarters/ce) "wOD" = ( /obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 9 +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "Freezer to Scrubbers" }, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) @@ -71326,11 +71383,15 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/starboard) "xBN" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom{ - dir = 4 +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/dark/side{ + dir = 1 }, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) +/area/station/service/hydroponics) "xBX" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -71806,14 +71867,10 @@ /turf/open/floor/iron/dark/smooth_corner, /area/station/engineering/gravity_generator) "xLc" = ( -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/light_switch/directional/north{ - pixel_x = 8 - }, -/obj/machinery/firealarm/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/structure/sink/kitchen/directional/south, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "xLi" = ( @@ -86757,8 +86814,8 @@ ogR mKZ vBm bnl -jEi -bsR +jIv +oFP qqu azE bnl @@ -87006,16 +87063,16 @@ leA erS dCZ emg -dSO juc +dSO juc juc qxQ pig pff bnl -wgX -fUs +jIv +kSL aeY kLu exO @@ -87271,7 +87328,7 @@ nJa pig oxO bnl -jIv +azE ejE uHf uKO @@ -89576,14 +89633,14 @@ mCr aAm rwW keu -toh -toh -toh -toh -toh +tGT +tGT +tGT +tGT +tGT sDr heI -keu +xBN tGT tGT dZu @@ -89833,10 +89890,10 @@ jZY erS dCZ emg +tar sjV juc juc -juc jCl pig pEY @@ -90090,7 +90147,7 @@ jZY erS pEY oMG -yaL +rtq yaL yaL yaL @@ -90603,7 +90660,7 @@ nBX jZY erS rRm -trv +jhr wEt wEt wEt @@ -91126,8 +91183,8 @@ xVa iJX kCA tQo -iKB -xBN +toh +hFW xVa wZh nKW @@ -91374,7 +91431,7 @@ tYb jZY erS rRm -jhr +trv vww hvk iXU @@ -91641,7 +91698,7 @@ sWm kfc bia kfc -oFP +sWm hoq sjw nKV @@ -91895,9 +91952,9 @@ wEt vkX xVa xLc -gHs -wev sYt +wev +gHs wOD xVa mOc @@ -92155,7 +92212,7 @@ laO dPD bGd etV -hFW +tCb xVa pnC qiT @@ -93171,7 +93228,7 @@ bVI kpr rWZ ley -erS +bMh rRm kbB mPm @@ -95484,7 +95541,7 @@ cCv pDC gyp pjD -jHn +nvt ksa ksa ksa @@ -96255,7 +96312,7 @@ oLb exf aUs pjD -rtq +erS ksa ksa ksa @@ -96512,7 +96569,7 @@ gcz gcz azm pjD -coj +erS ksa ksa ksa @@ -97538,7 +97595,7 @@ pdN wSz knt jFo -rWZ +wLx pjD oFm ksa @@ -97805,7 +97862,7 @@ ksa ksa vmq vpV -vmq +dZs ksa ksa ksa @@ -98068,9 +98125,9 @@ vui vui vui pcU +vND vui -vui -vui +vND vui qAf eON diff --git a/_maps/~monkestation/RandomBars/Box/bloody_bar.dmm b/_maps/~monkestation/RandomBars/Box/bloody_bar.dmm index a45b48cd09d130..05cb8b1e9168d3 100644 --- a/_maps/~monkestation/RandomBars/Box/bloody_bar.dmm +++ b/_maps/~monkestation/RandomBars/Box/bloody_bar.dmm @@ -36,6 +36,11 @@ }, /turf/open/floor/cult, /area/station/commons/lounge) +"ev" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/barsign/directional/north, +/turf/open/floor/cult, +/area/station/commons/lounge) "eO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -88,7 +93,7 @@ /turf/template_noop, /area/template_noop) "lu" = ( -/obj/machinery/barsign/directional/north, +/obj/machinery/restaurant_portal/restaurant, /turf/open/floor/cult, /area/station/commons/lounge) "ng" = ( @@ -106,8 +111,8 @@ /turf/open/floor/plating, /area/station/commons/lounge) "qb" = ( -/obj/machinery/media/jukebox, -/obj/machinery/light/directional/north, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/light/small/directional/north, /turf/open/floor/cult, /area/station/commons/lounge) "rV" = ( @@ -203,8 +208,7 @@ /turf/open/floor/cult, /area/station/commons/lounge) "DC" = ( -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/restaurant_portal/restaurant, +/obj/machinery/media/jukebox, /turf/open/floor/cult, /area/station/commons/lounge) "DJ" = ( @@ -411,9 +415,9 @@ Bl ue Bl DJ -gA wp gA +wp ae Bl wM @@ -426,7 +430,7 @@ kL "} (2,1,1) = {" Gh -lu +Bl ue ue ue @@ -445,13 +449,13 @@ kL "} (3,1,1) = {" Gh -Bl +ev eu Bl FU Ie ue -Ie +FU Ie Bl FK @@ -463,8 +467,8 @@ Sg kL "} (4,1,1) = {" -jf -cT +Gh +DC Bl Bl QE @@ -482,12 +486,12 @@ em kL "} (5,1,1) = {" -Gh -DC +gf +Bl Bl Bl gA -gA +wp Iy gA wp @@ -501,8 +505,8 @@ jL wz "} (6,1,1) = {" -Gh -qb +jf +Bl Bl Bl Bl @@ -520,8 +524,8 @@ KM KM "} (7,1,1) = {" -Gh -ZK +gf +Bl Bl fk uS @@ -539,14 +543,14 @@ KM KM "} (8,1,1) = {" -jf -Bl +Gh +qb Bl sW bi -fK +ng ue -sW +fk uS fK rV @@ -578,9 +582,9 @@ fa "} (10,1,1) = {" Gh -sW -uS -ng +lu +cT +ZK Gh gf pq diff --git a/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm b/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm index 8636468c7075b8..c74265f2f15cf6 100644 --- a/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm +++ b/_maps/~monkestation/RandomBars/Box/clockwork_bar.dmm @@ -68,6 +68,10 @@ }, /turf/open/floor/bronze, /area/station/commons/lounge) +"iB" = ( +/obj/machinery/media/jukebox, +/turf/open/floor/bronze, +/area/station/commons/lounge) "jv" = ( /obj/machinery/light/directional/east, /turf/open/floor/bronze/flat, @@ -219,8 +223,7 @@ /turf/open/floor/bronze/flat, /area/station/service/theater) "Iw" = ( -/obj/machinery/media/jukebox, -/obj/machinery/light/directional/north, +/obj/machinery/restaurant_portal/restaurant, /turf/open/floor/bronze, /area/station/commons/lounge) "Jy" = ( @@ -269,6 +272,7 @@ /turf/open/floor/bronze, /area/station/commons/lounge) "Ov" = ( +/obj/machinery/light/small/directional/north, /obj/machinery/barsign/directional/north, /turf/open/floor/bronze, /area/station/commons/lounge) @@ -321,7 +325,7 @@ /area/station/commons/lounge) "Tu" = ( /obj/machinery/camera/autoname/directional/north, -/obj/machinery/restaurant_portal/restaurant, +/obj/machinery/light/small/directional/north, /turf/open/floor/bronze, /area/station/commons/lounge) "TL" = ( @@ -389,9 +393,9 @@ TL qG TL LJ -qn LI qn +LI Mm TL PP @@ -404,7 +408,7 @@ Wj "} (2,1,1) = {" OD -Ov +TL qG qG qG @@ -423,13 +427,13 @@ Wj "} (3,1,1) = {" OD -TL +Ov dN TL ol il qG -il +ol il TL ZZ @@ -441,8 +445,8 @@ Ya Wj "} (4,1,1) = {" -Go -kq +OD +iB TL Ui Jy @@ -460,12 +464,12 @@ Ef Wj "} (5,1,1) = {" -OD -Tu +cr +TL TL TL qn -qn +LI fp qn LI @@ -479,8 +483,8 @@ FG Ie "} (6,1,1) = {" -OD -Iw +Go +TL TL TL TL @@ -498,8 +502,8 @@ ca ca "} (7,1,1) = {" -OD -RG +cr +TL TL mm Jy @@ -517,14 +521,14 @@ ca ca "} (8,1,1) = {" -Go -TL +OD +Tu TL si Jy -cu +JZ qG -si +mm Jy cu hB @@ -556,9 +560,9 @@ zp "} (10,1,1) = {" OD -si -Jy -JZ +Iw +kq +RG OD cr tn diff --git a/_maps/~monkestation/RandomBars/Box/default_bar.dmm b/_maps/~monkestation/RandomBars/Box/default_bar.dmm index 004e8e44da2ddb..4bcb92cb557f8f 100644 --- a/_maps/~monkestation/RandomBars/Box/default_bar.dmm +++ b/_maps/~monkestation/RandomBars/Box/default_bar.dmm @@ -62,6 +62,11 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron, /area/station/commons/lounge) +"dQ" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/restaurant_portal/restaurant, +/turf/open/floor/iron, +/area/station/commons/lounge) "ei" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -97,6 +102,12 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/lounge) +"fV" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/light/small/directional/north, +/obj/machinery/barsign/directional/north, +/turf/open/floor/iron, +/area/station/commons/lounge) "gW" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -190,7 +201,10 @@ /area/station/service/theater) "uI" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/structure/chair/stool/bar/directional/west, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/lounge) "vg" = ( @@ -221,7 +235,10 @@ /area/station/commons/lounge) "zQ" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/barsign/directional/north, +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/lounge) "Ca" = ( @@ -299,7 +316,7 @@ "EP" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/camera/autoname/directional/north, -/obj/machinery/restaurant_portal/restaurant, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/commons/lounge) "FT" = ( @@ -353,6 +370,11 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/commons/lounge) +"Lc" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/media/jukebox, +/turf/open/floor/iron, +/area/station/commons/lounge) "Ly" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/structure/table/wood/poker, @@ -368,6 +390,17 @@ }, /turf/open/floor/iron, /area/station/commons/lounge) +"Mq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Bar" + }, +/turf/open/floor/iron/textured, +/area/station/commons/lounge) "Nm" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -435,8 +468,8 @@ /area/station/commons/lounge) "WG" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/media/jukebox, -/obj/machinery/light/directional/north, +/obj/structure/chair/stool/bar/directional/west, +/obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/lounge) "XC" = ( @@ -458,9 +491,9 @@ tH EF tH PD -uI cD -uI +WG +cD DZ tH XC @@ -473,7 +506,7 @@ sZ "} (2,1,1) = {" Ca -zQ +tH EF EF EF @@ -492,13 +525,13 @@ sZ "} (3,1,1) = {" Ca -tH +fV kE tH DV On EF -On +uI On tH Nm @@ -510,8 +543,8 @@ JF sZ "} (4,1,1) = {" -zF -Dt +Ca +Lc tH tH TB @@ -529,12 +562,12 @@ Od sZ "} (5,1,1) = {" -Ca -EP +Mq +tH tH tH FT -FT +zQ dy FT CA @@ -548,8 +581,8 @@ uC ae "} (6,1,1) = {" -Ca -WG +zF +tH tH tH tH @@ -567,16 +600,16 @@ NZ NZ "} (7,1,1) = {" -Ca -eR +Mq +tH tH DR ZX -az +CQ EF fx TB -Cg +CQ tH tH mi @@ -586,16 +619,16 @@ NZ NZ "} (8,1,1) = {" -zF -tH +Ca +EP tH xm Ly -CQ +az EF xm TB -CQ +Cg tH tH mi @@ -625,9 +658,9 @@ dp "} (10,1,1) = {" Ca -fx -TB -Cg +dQ +Dt +eR Ca cH Uq diff --git a/_maps/~monkestation/RandomBars/Box/vietmoth_bar.dmm b/_maps/~monkestation/RandomBars/Box/vietmoth_bar.dmm index f3a19eafce6ed1..57b5eae4f858bc 100644 --- a/_maps/~monkestation/RandomBars/Box/vietmoth_bar.dmm +++ b/_maps/~monkestation/RandomBars/Box/vietmoth_bar.dmm @@ -34,7 +34,6 @@ /turf/open/floor/grass, /area/station/commons/lounge) "ew" = ( -/obj/machinery/camera/autoname/directional/north, /obj/machinery/restaurant_portal/restaurant, /turf/open/floor/grass, /area/station/commons/lounge) @@ -62,9 +61,9 @@ /turf/open/floor/grass, /area/station/commons/lounge) "gY" = ( -/obj/machinery/media/jukebox, -/obj/machinery/light/directional/north, -/turf/open/floor/grass, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/light/small/directional/north, +/turf/open/water/jungle, /area/station/commons/lounge) "hS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -175,7 +174,7 @@ /turf/open/floor/grass, /area/station/commons/lounge) "py" = ( -/obj/machinery/barsign/directional/north, +/obj/machinery/media/jukebox, /turf/open/floor/grass, /area/station/commons/lounge) "pP" = ( @@ -304,6 +303,8 @@ /turf/open/floor/grass, /area/station/commons/lounge) "CX" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/barsign/directional/north, /obj/structure/flora/bush/jungle/a/style_random, /turf/open/floor/grass, /area/station/commons/lounge) @@ -467,9 +468,9 @@ nj jK nj OY -Oz nR Oz +nR po nj YM @@ -482,7 +483,7 @@ yJ "} (2,1,1) = {" Ub -py +nj jK Bs jK @@ -509,7 +510,7 @@ nj jK QO dx -dx +vy Dg xk AS @@ -519,8 +520,8 @@ EB yJ "} (4,1,1) = {" -tT -nB +Ub +py nj nj FS @@ -538,8 +539,8 @@ vc yJ "} (5,1,1) = {" -Ub -ew +vv +nj QO nj Oz @@ -557,8 +558,8 @@ zv Im "} (6,1,1) = {" -Ub -gY +tT +nj nj lY Ke @@ -576,8 +577,8 @@ ZC ZC "} (7,1,1) = {" -Ub -BD +vv +nj mL mL mL @@ -595,8 +596,8 @@ jB jB "} (8,1,1) = {" -tT -mL +Ub +gY mL Yt FS @@ -634,9 +635,9 @@ Ol "} (10,1,1) = {" Ub -qi -FS -HA +ew +nB +BD Ub vv Hh From 4041130287b109edb67b3af2190926fb995c23a8 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Fri, 19 Jul 2024 00:12:53 -0500 Subject: [PATCH 19/27] Fix 18 Changes a single tile that was the wrong type. Makes changes for PR 2582. --- _maps/map_files/BoxStation/BoxStation.dmm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c4ce3d168fb458..5a5e545ac7c736 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -24627,7 +24627,7 @@ /obj/structure/desk_bell{ pixel_x = -6 }, -/turf/open/floor/iron, +/turf/open/floor/iron/white, /area/station/medical/pharmacy) "ijn" = ( /obj/structure/disposalpipe/segment{ @@ -56671,9 +56671,7 @@ pixel_x = 8 }, /obj/machinery/firealarm/directional/south, -/obj/machinery/vending/hydroseeds{ - slogan_delay = 700 - }, +/obj/machinery/vending/hydroseeds/permabrig, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "sLG" = ( From baab07b6e2745c31c7368d14d4bb0aadd633c1a2 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Tue, 23 Jul 2024 02:42:07 -0500 Subject: [PATCH 20/27] Fix 19 Reverts the change I did to match PR 2582, makes it match PR 2691. Miscellaneous stuff. --- _maps/map_files/BoxStation/BoxStation.dmm | 477 +++++++++++----------- 1 file changed, 233 insertions(+), 244 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 5a5e545ac7c736..676e253cae2978 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1573,10 +1573,10 @@ "aBM" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/machinery/firealarm/directional/west, -/obj/machinery/airalarm/directional/north, +/obj/machinery/status_display/ai/directional/north, /obj/structure/table/reinforced/rglass, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "aBX" = ( @@ -3627,7 +3627,7 @@ id = "secondary_shop"; dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/textured, /area/station/commons/vacant_room/commissary) "blE" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -3780,10 +3780,9 @@ /turf/open/floor/iron/dark, /area/station/commons/storage/primary) "bnM" = ( -/obj/structure/sign/flag/nanotrasen/directional/west, -/obj/structure/bed/dogbed/runtime, -/mob/living/simple_animal/pet/cat/runtime, -/turf/open/floor/carpet/royalblue, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) "bnP" = ( /obj/effect/turf_decal/stripes/line{ @@ -4503,10 +4502,8 @@ /area/station/maintenance/port/aft) "byP" = ( /obj/machinery/camera/autoname/directional/south, -/obj/structure/table/wood, -/obj/item/clothing/neck/stethoscope, -/obj/item/flashlight/pen, -/turf/open/floor/carpet/royalblue, +/obj/machinery/suit_storage_unit/cmo, +/turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "byR" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -4716,7 +4713,7 @@ pixel_x = 6; id = "medbay_desk_shutters" }, -/obj/machinery/computer/records/medical{ +/obj/machinery/computer/crew{ dir = 4 }, /turf/open/floor/iron/white, @@ -5954,10 +5951,6 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 }, -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/office) "bXB" = ( @@ -9323,7 +9316,16 @@ /area/station/engineering/atmos/hfr_room) "daj" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/pdapainter/medbay, +/obj/structure/table, +/obj/item/folder/blue{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/folder/white, +/obj/item/folder/blue{ + pixel_x = 3; + pixel_y = 3 + }, /turf/open/floor/iron/dark/side, /area/station/command/heads_quarters/cmo) "daN" = ( @@ -9793,24 +9795,6 @@ /obj/machinery/duct, /turf/open/floor/iron/dark/textured, /area/station/security/prison/garden) -"diy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/machinery/duct, -/turf/open/floor/iron/dark/textured, -/area/station/medical/storage) "diA" = ( /obj/structure/sign/poster/random/directional/west, /obj/machinery/space_heater, @@ -12097,9 +12081,14 @@ /area/station/medical/office) "dWN" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "dWS" = ( @@ -14802,9 +14791,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/line, /turf/open/floor/iron/white, /area/station/medical/medbay/central) @@ -16412,9 +16398,6 @@ /area/station/maintenance/starboard/fore) "fxy" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light_switch/directional/south{ - pixel_x = 8 - }, /obj/item/radio/intercom/directional/west, /obj/structure/filingcabinet/chestdrawer, /obj/item/storage/secure/briefcase, @@ -19144,15 +19127,20 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) "guA" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 +/obj/effect/turf_decal/trimline/dark_blue/filled/warning{ + dir = 4 }, -/obj/structure/chair/office{ +/obj/effect/turf_decal/trimline/dark_blue/warning{ dir = 8 }, -/obj/effect/landmark/start/medical_doctor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/white, -/area/station/medical/office) +/area/station/medical/medbay/central) "guB" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -21006,6 +20994,26 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/janitor) +"gWa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Chief Medical Officer's Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/command/heads_quarters/cmo) "gWi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22219,13 +22227,22 @@ }, /area/station/hallway/secondary/exit/departure_lounge) "hqV" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/delivery, +/obj/machinery/status_display/evac/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, /obj/structure/disposalpipe/trunk{ dir = 2 }, /obj/machinery/disposal/bin, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/dark, +/obj/machinery/camera/directional/east{ + c_tag = "Medical - CMO Office"; + network = list("ss13","medbay"); + name = "medical camera" + }, +/turf/open/floor/iron/checker{ + dir = 1 + }, /area/station/command/heads_quarters/cmo) "hqW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -22553,14 +22570,21 @@ /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/turret_protected/aisat_interior) "hvU" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/structure/table/reinforced/rglass, -/obj/machinery/fax{ - fax_name = "Medical Office"; - name = "Medical Office Fax Machine" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/open/floor/iron/white, -/area/station/medical/office) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance{ + name = "CMO Office Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "hvW" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -24627,7 +24651,7 @@ /obj/structure/desk_bell{ pixel_x = -6 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) "ijn" = ( /obj/structure/disposalpipe/segment{ @@ -25230,8 +25254,8 @@ /obj/item/book/manual/wiki/chemistry{ pixel_x = 5 }, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "iqS" = ( @@ -26629,7 +26653,7 @@ pixel_x = 3; pixel_y = 4 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/textured, /area/station/medical/office) "iLB" = ( /obj/effect/decal/cleanable/dirt, @@ -26936,22 +26960,11 @@ /turf/open/floor/iron, /area/station/engineering/storage) "iQM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer's Office" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = 8 }, -/turf/open/floor/iron/white/textured, +/turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) "iQR" = ( /obj/effect/turf_decal/box, @@ -27552,17 +27565,13 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "jct" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/warning{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark_blue/warning{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/cmo) "jcB" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, @@ -29458,7 +29467,7 @@ name = "Paramedic Office" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/textured, /area/station/medical/paramedic) "jKa" = ( /obj/machinery/door/firedoor, @@ -29827,6 +29836,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Chief Medical Officer's Quarters" @@ -30488,17 +30500,12 @@ /turf/open/floor/wood, /area/station/service/library) "kbR" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/checker{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/area/station/command/heads_quarters/cmo) "kbT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31755,12 +31762,11 @@ /area/station/medical/break_room) "kya" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 }, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "kyl" = ( @@ -34156,6 +34162,10 @@ dir = 5 }, /obj/machinery/newscaster/directional/north, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/office) "llW" = ( @@ -35359,7 +35369,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/unres, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/central) "lFE" = ( /obj/effect/turf_decal/siding/wood{ @@ -36221,7 +36231,15 @@ /area/station/security/prison/mess) "lVh" = ( /obj/machinery/light/directional/south, -/turf/open/floor/carpet/royalblue, +/obj/structure/table/wood, +/obj/item/clothing/neck/stethoscope, +/obj/item/flashlight/pen, +/obj/item/clothing/glasses/hud/health, +/obj/item/toy/figure/cmo{ + pixel_y = 12; + pixel_x = -8 + }, +/turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "lVj" = ( /obj/machinery/button/door/directional/north{ @@ -36396,7 +36414,7 @@ /area/station/commons/vacant_room/office) "lYQ" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/computer/crew{ +/obj/machinery/computer/records/medical{ dir = 4 }, /turf/open/floor/iron/white, @@ -37562,12 +37580,9 @@ /turf/open/floor/iron/white, /area/station/medical/virology) "mrX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/suit_storage_unit/cmo, -/turf/open/floor/iron/dark, +/obj/structure/bed/dogbed/runtime, +/mob/living/simple_animal/pet/cat/runtime, +/turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) "mse" = ( /obj/structure/cable, @@ -38341,15 +38356,7 @@ /area/station/tcommsat/computer) "mHp" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/table, -/obj/item/clothing/glasses/hud/health, -/obj/item/toy/figure/cmo{ - pixel_y = 8; - pixel_x = -4 - }, +/obj/machinery/pdapainter/medbay, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "mHw" = ( @@ -39271,8 +39278,8 @@ /area/station/hallway/primary/fore) "mXK" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "mXM" = ( @@ -41318,7 +41325,7 @@ /obj/structure/desk_bell{ pixel_x = 6 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) "nFR" = ( /obj/effect/turf_decal/tile/red/full, @@ -45673,8 +45680,8 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/table/reinforced/rglass, /obj/machinery/computer/records/medical/laptop, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "oZQ" = ( @@ -46045,9 +46052,6 @@ /obj/effect/mapping_helpers/requests_console/announcement, /obj/effect/mapping_helpers/requests_console/assistance, /obj/effect/mapping_helpers/requests_console/information, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "pia" = ( @@ -46980,11 +46984,10 @@ /area/station/medical/psychology) "pvN" = ( /obj/item/storage/secure/safe/directional/south, -/obj/machinery/light_switch/directional/south, /obj/structure/bed, /obj/item/bedsheet/cmo, /obj/effect/landmark/start/chief_medical_officer, -/turf/open/floor/carpet/royalblue, +/turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "pwm" = ( /obj/machinery/door/firedoor, @@ -48685,10 +48688,12 @@ /turf/open/floor/iron/vaporwave, /area/station/service/library/printer) "qbc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/office) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/cmo) "qbg" = ( /obj/structure/chair/office/light{ dir = 8 @@ -50184,6 +50189,15 @@ }, /turf/closed/wall/r_wall, /area/station/engineering/atmos) +"qCf" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/checker{ + dir = 1 + }, +/area/station/command/heads_quarters/cmo) "qCg" = ( /turf/closed/wall, /area/station/commons/vacant_room/commissary) @@ -50903,7 +50917,7 @@ /obj/structure/desk_bell{ pixel_x = 6 }, -/turf/open/floor/iron/white, +/turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) "qPJ" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -51243,7 +51257,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, -/turf/open/floor/iron/dark/textured, +/turf/open/floor/iron/white/textured, /area/station/medical/medbay/central) "qVb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51819,18 +51833,12 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) "rfY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/airlock/maintenance{ - name = "CMO Office Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/camera/autoname/directional/east, +/obj/structure/closet/secure_closet/medical3, +/obj/item/wrench/medical, +/turf/open/floor/iron/white, +/area/station/medical/office) "rgf" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -52058,9 +52066,6 @@ }, /area/station/engineering/break_room) "rjn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/effect/turf_decal/tile/blue/full, /obj/effect/turf_decal/box, /obj/machinery/holopad, @@ -52148,7 +52153,7 @@ dir = 8 }, /obj/machinery/camera/autoname/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /turf/open/floor/iron/white, @@ -52370,14 +52375,17 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/service/chapel/office) "roF" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/cafeteria{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/area/station/command/heads_quarters/cmo) +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "roO" = ( /obj/machinery/power/transmission_laser{ dir = 8 @@ -52653,16 +52661,14 @@ /area/station/maintenance/port/fore) "rtY" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/directional/east{ - c_tag = "Medical - CMO Office"; - network = list("ss13","medbay"); - name = "medical camera" +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "rud" = ( @@ -53059,10 +53065,10 @@ /area/station/security/office) "rzV" = ( /obj/effect/turf_decal/tile/brown/fourcorners, +/obj/machinery/firealarm/directional/east, /obj/machinery/computer/department_orders/medical{ dir = 8 }, -/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/white, /area/station/medical/office) "rAk" = ( @@ -54315,7 +54321,7 @@ /turf/open/floor/plating, /area/station/engineering/main) "rTK" = ( -/turf/open/floor/carpet/royalblue, +/turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) "rTM" = ( /obj/structure/lattice, @@ -55600,6 +55606,9 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "sre" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -56671,7 +56680,7 @@ pixel_x = 8 }, /obj/machinery/firealarm/directional/south, -/obj/machinery/vending/hydroseeds/permabrig, +/obj/machinery/vending/hydroseeds, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "sLG" = ( @@ -56680,14 +56689,10 @@ /area/station/service/library) "sLK" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/sign/flag/nanotrasen/directional/south, /obj/machinery/light/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/obj/structure/sign/flag/nanotrasen/directional/south, +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "sLP" = ( @@ -59801,7 +59806,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "tLN" = ( -/obj/structure/cable, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/table/reinforced/rglass, /obj/item/storage/medkit/regular{ @@ -59810,8 +59814,8 @@ }, /obj/item/wrench/medical, /obj/item/gun/syringe, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "tLT" = ( @@ -61967,8 +61971,6 @@ /area/station/security/execution/transfer) "uwq" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/structure/chair/office/light{ dir = 1 }, @@ -62352,6 +62354,11 @@ /obj/machinery/light/directional/north, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, +/obj/structure/table/reinforced/rglass, +/obj/machinery/fax{ + fax_name = "Medical Office"; + name = "Medical Office Fax Machine" + }, /turf/open/floor/iron/white, /area/station/medical/office) "uFl" = ( @@ -64528,10 +64535,10 @@ /area/station/maintenance/starboard/aft) "vmo" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 + dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 + dir = 4 }, /turf/open/floor/iron/white, /area/station/medical/office) @@ -66143,18 +66150,7 @@ /area/station/maintenance/department/security/brig) "vPF" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/structure/table, -/obj/item/folder/white, -/obj/item/folder/blue{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/folder/blue{ - pixel_x = 3; - pixel_y = 2 - }, /obj/item/stamp/head/cmo, /turf/open/floor/iron/dark/side, /area/station/command/heads_quarters/cmo) @@ -67903,9 +67899,6 @@ /area/station/commons/storage/primary) "wup" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/machinery/door/poddoor/shutters/preopen{ id = "cmo_shutters"; name = "CMO Office Shutters" @@ -70261,15 +70254,11 @@ /area/station/medical/medbay/lobby) "xiA" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "xiC" = ( @@ -72117,8 +72106,8 @@ fax_name = "Chief Medical Officer's Office"; name = "Chief Medical Officer's Fax Machine" }, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "xRh" = ( @@ -72967,8 +72956,8 @@ "ycB" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "ycH" = ( @@ -73012,13 +73001,9 @@ /area/station/commons/fitness/recreation) "ydu" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria{ - dir = 8 +/obj/structure/chair, +/turf/open/floor/iron/checker{ + dir = 1 }, /area/station/command/heads_quarters/cmo) "ydv" = ( @@ -73338,6 +73323,10 @@ dir = 9 }, /obj/machinery/airalarm/directional/north, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/office) "yjc" = ( @@ -110974,10 +110963,10 @@ wxL kjv qOH yja -guA rOg -fNe rOg +fNe +vmo rOg rOg gPu @@ -110994,7 +110983,7 @@ xXd xXd xXd xXd -diy +gWG xXd rRZ rRZ @@ -111232,9 +111221,9 @@ lbf qOH uEZ dSr -qbc +dSr maG -qbc +bXo bXo bXo jAi @@ -111489,10 +111478,10 @@ lbf qOH llR bXw -dTG dWs +dTG +ptt ptt -vmo ptt iDj bJZ @@ -111746,9 +111735,9 @@ czJ qOH nle rzV -hvU hBx wYn +rfY eQZ lve yaZ @@ -112003,13 +111992,13 @@ nxn qOH qOH qOH -bJZ tJO bJZ qOH qOH qOH qOH +qOH xsl btK cuE @@ -112260,9 +112249,9 @@ lbf xAf rjQ hso -kbR -dtT uQm +dtT +roF uQm uQm uQm @@ -112518,7 +112507,7 @@ sdL lFz mqX sre -ghk +vdQ vdQ vdQ vdQ @@ -112774,8 +112763,8 @@ lbf gXW rjQ vcv +guA lcX -jct rlz lcX xsR @@ -113031,8 +113020,8 @@ xBK rCT lWn lWn +gWa hff -iQM lWn lWn lWn @@ -113288,8 +113277,8 @@ lbf jKW lWn aBM -mXK -kya +dWN +kbR aZq mrX bnM @@ -113545,11 +113534,11 @@ lbf vOm hTS oZP -mXK -kya +dWN +qCf jQb -rTK -rTK +jct +qbc lVh lWn skE @@ -113802,10 +113791,10 @@ lbf vOm hTS xRd -mXK +dWN kya aZq -rTK +iQM rTK pvN lWn @@ -114059,7 +114048,7 @@ lbf iuK hTS iqR -mXK +dWN sLK aZq aZq @@ -114316,7 +114305,7 @@ lbf vOm hTS ycB -mXK +dWN xiA daj drJ @@ -114831,7 +114820,7 @@ iaE lWn hqV rtY -roF +mXK ppx mxr phW @@ -115087,8 +115076,8 @@ lbf nBE khD khD +hvU khD -rfY khD khD khD @@ -115345,7 +115334,7 @@ nBE qmb mhc vLk -mhc +lRi nBE rHt grF From 299265d70787d497330e75d2390ab6f9a3f0d191 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Tue, 23 Jul 2024 02:44:15 -0500 Subject: [PATCH 21/27] Fix 20 Oops, wrong vendor prefab. --- _maps/map_files/BoxStation/BoxStation.dmm | 200 +++++++++++----------- 1 file changed, 101 insertions(+), 99 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 676e253cae2978..d5e4e68da9124d 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -17983,6 +17983,18 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) +"fZw" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "fZy" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet/black, @@ -19127,20 +19139,12 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) "guA" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/warning{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark_blue/warning{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/cmo) "guB" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -20994,26 +20998,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/janitor) -"gWa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer's Office" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark/textured, -/area/station/command/heads_quarters/cmo) "gWi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22576,15 +22560,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "Chief Medical Officer's Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/airlock/maintenance{ - name = "CMO Office Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) +/turf/open/floor/iron/dark/textured, +/area/station/command/heads_quarters/cmo) "hvW" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -26960,11 +26948,13 @@ /turf/open/floor/iron, /area/station/engineering/storage) "iQM" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/light_switch/directional/north{ - pixel_x = 8 +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/checker{ + dir = 1 }, -/turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) "iQR" = ( /obj/effect/turf_decal/box, @@ -30500,12 +30490,14 @@ /turf/open/floor/wood, /area/station/service/library) "kbR" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/checker{ - dir = 1 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 }, -/area/station/command/heads_quarters/cmo) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/office) "kbT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31762,9 +31754,7 @@ /area/station/medical/break_room) "kya" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, +/obj/item/kirbyplants/random, /turf/open/floor/iron/checker{ dir = 1 }, @@ -39443,6 +39433,13 @@ /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"naW" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = 8 + }, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/cmo) "nbm" = ( /obj/machinery/airalarm/directional/west, /obj/effect/spawner/random/structure/table_or_rack, @@ -48688,12 +48685,20 @@ /turf/open/floor/iron/vaporwave, /area/station/service/library/printer) "qbc" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/effect/turf_decal/trimline/dark_blue/filled/warning{ + dir = 4 }, -/turf/open/floor/carpet/blue, -/area/station/command/heads_quarters/cmo) +/obj/effect/turf_decal/trimline/dark_blue/warning{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "qbg" = ( /obj/structure/chair/office/light{ dir = 8 @@ -50189,15 +50194,6 @@ }, /turf/closed/wall/r_wall, /area/station/engineering/atmos) -"qCf" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/checker{ - dir = 1 - }, -/area/station/command/heads_quarters/cmo) "qCg" = ( /turf/closed/wall, /area/station/commons/vacant_room/commissary) @@ -51833,12 +51829,21 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) "rfY" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/camera/autoname/directional/east, -/obj/structure/closet/secure_closet/medical3, -/obj/item/wrench/medical, -/turf/open/floor/iron/white, -/area/station/medical/office) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance{ + name = "CMO Office Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "rgf" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -52375,17 +52380,14 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/service/chapel/office) "roF" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/checker{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/area/station/command/heads_quarters/cmo) "roO" = ( /obj/machinery/power/transmission_laser{ dir = 8 @@ -56680,7 +56682,9 @@ pixel_x = 8 }, /obj/machinery/firealarm/directional/south, -/obj/machinery/vending/hydroseeds, +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, /turf/open/floor/iron/dark, /area/station/security/prison/garden) "sLG" = ( @@ -64534,12 +64538,10 @@ /turf/open/floor/wood, /area/station/maintenance/starboard/aft) "vmo" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/camera/autoname/directional/east, +/obj/structure/closet/secure_closet/medical3, +/obj/item/wrench/medical, /turf/open/floor/iron/white, /area/station/medical/office) "vmq" = ( @@ -110966,7 +110968,7 @@ yja rOg rOg fNe -vmo +kbR rOg rOg gPu @@ -111737,7 +111739,7 @@ nle rzV hBx wYn -rfY +vmo eQZ lve yaZ @@ -112251,7 +112253,7 @@ rjQ hso uQm dtT -roF +fZw uQm uQm uQm @@ -112763,7 +112765,7 @@ lbf gXW rjQ vcv -guA +qbc lcX rlz lcX @@ -113020,7 +113022,7 @@ xBK rCT lWn lWn -gWa +hvU hff lWn lWn @@ -113278,7 +113280,7 @@ jKW lWn aBM dWN -kbR +kya aZq mrX bnM @@ -113535,10 +113537,10 @@ vOm hTS oZP dWN -qCf +roF jQb jct -qbc +guA lVh lWn skE @@ -113792,9 +113794,9 @@ vOm hTS xRd dWN -kya -aZq iQM +aZq +naW rTK pvN lWn @@ -115076,7 +115078,7 @@ lbf nBE khD khD -hvU +rfY khD khD khD From d07a7c55e986abf9bcfe4f0248cd7e7dab153a74 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Tue, 23 Jul 2024 03:10:06 -0500 Subject: [PATCH 22/27] Fix 21 Forgot to change some stuff. --- _maps/map_files/BoxStation/BoxStation.dmm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d5e4e68da9124d..77a6c7986e26aa 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -12350,7 +12350,7 @@ pixel_x = 7; pixel_y = 7 }, -/turf/open/floor/iron/white/textured, +/turf/open/floor/iron/textured, /area/station/science/robotics/lab) "eav" = ( /turf/closed/wall, @@ -13278,6 +13278,7 @@ /area/station/hallway/primary/port) "erV" = ( /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "esk" = ( @@ -38346,6 +38347,7 @@ /area/station/tcommsat/computer) "mHp" = ( /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/cable, /obj/machinery/pdapainter/medbay, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) @@ -49231,6 +49233,7 @@ /area/station/security/office) "qmb" = ( /obj/machinery/light/small/directional/north, +/obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -52073,6 +52076,7 @@ "rjn" = ( /obj/effect/turf_decal/tile/blue/full, /obj/effect/turf_decal/box, +/obj/structure/cable, /obj/machinery/holopad, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/cmo) @@ -54323,6 +54327,7 @@ /turf/open/floor/plating, /area/station/engineering/main) "rTK" = ( +/obj/structure/cable, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) "rTM" = ( @@ -58810,6 +58815,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/cable, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Chief Medical Officer's Quarters" @@ -62974,7 +62980,7 @@ /obj/structure/desk_bell{ pixel_x = 7 }, -/turf/open/floor/iron/white/textured, +/turf/open/floor/iron/textured, /area/station/science/robotics/lab) "uNE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -67905,6 +67911,7 @@ id = "cmo_shutters"; name = "CMO Office Shutters" }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/command/heads_quarters/cmo) "wuE" = ( @@ -72103,6 +72110,7 @@ /area/station/hallway/primary/central) "xRd" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable, /obj/structure/table/reinforced/rglass, /obj/machinery/fax{ fax_name = "Chief Medical Officer's Office"; @@ -72957,6 +72965,7 @@ /area/station/ai_monitored/turret_protected/aisat/atmos) "ycB" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable, /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/iron/checker{ dir = 1 @@ -115334,9 +115343,9 @@ wxL mOH nBE qmb -mhc vLk lRi +tpC nBE rHt grF @@ -115849,7 +115858,7 @@ pUp nBE rHt mhc -ydO +tpC grF nBE mhc From de2d0f59bb500edc2100a70a3832d032a82d33ee Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Wed, 24 Jul 2024 06:50:26 -0500 Subject: [PATCH 23/27] Fix 22 Changes the layout of the Telecomms Control and Server Rooms slightly, changes were based on BeeStation's BoxStation. Changes some stuff in Technical Storage. Miscellaneous. --- _maps/map_files/BoxStation/BoxStation.dmm | 750 +++++++++++----------- 1 file changed, 388 insertions(+), 362 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 77a6c7986e26aa..549a1afae9054f 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -928,11 +928,15 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "aqW" = ( -/obj/effect/turf_decal/stripes/end{ +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 1 }, -/obj/structure/cable, -/turf/open/floor/engine/telecomms, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "ara" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -1265,6 +1269,7 @@ "avI" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "avL" = ( @@ -1431,11 +1436,12 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/line, -/obj/structure/sign/departments/aiupload/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/camera/directional/north{ c_tag = "Port Hallway East" }, +/obj/machinery/light/small/directional/north, +/obj/structure/sign/departments/aiupload/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "azn" = ( @@ -3785,11 +3791,8 @@ /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) "bnP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/telecomms/processor/preset_four, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/server/presets/engineering, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "bod" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -5283,11 +5286,17 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "bKR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 }, -/obj/machinery/telecomms/server/presets/security, -/turf/open/floor/engine/telecomms, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ + dir = 8 + }, +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "bKW" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, @@ -8326,7 +8335,15 @@ "cMq" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/multitool, +/obj/item/stock_parts/cell/high, +/obj/item/assembly/signaler{ + pixel_y = 20; + pixel_x = 6 + }, +/obj/item/assembly/signaler{ + pixel_y = 20; + pixel_x = -6 + }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "cMv" = ( @@ -8728,11 +8745,14 @@ /turf/open/floor/wood, /area/station/commons/vacant_room/office) "cSm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 }, -/obj/machinery/telecomms/broadcaster/preset_left, -/turf/open/floor/engine/telecomms, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "cSq" = ( /obj/structure/disposalpipe/trunk, @@ -9843,6 +9863,9 @@ /area/station/maintenance/department/cargo) "djT" = ( /obj/effect/turf_decal/trimline/green/filled/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/storage/tech) "djX" = ( @@ -9970,11 +9993,14 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "dlY" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 }, -/obj/machinery/telecomms/server/presets/command, -/turf/open/floor/engine/telecomms, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "dmh" = ( /obj/machinery/light/directional/west, @@ -10985,9 +11011,8 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, -/obj/structure/table, +/obj/structure/rack, /obj/item/plant_analyzer, -/obj/item/stock_parts/cell/high, /turf/open/floor/iron, /area/station/engineering/storage/tech) "dDE" = ( @@ -13411,14 +13436,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "euj" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/processor/preset_three, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "euq" = ( /obj/machinery/space_heater, @@ -13730,7 +13749,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/light_switch/directional/east, +/obj/machinery/light_switch/directional/south{ + pixel_x = -8 + }, /obj/machinery/firealarm/directional/south, /obj/structure/rack, /obj/item/storage/toolbox/mechanical, @@ -14256,11 +14277,8 @@ /turf/open/floor/iron, /area/station/engineering/storage) "eKA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/telecomms/server/presets/service, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/server/presets/command, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "eKK" = ( /obj/machinery/atmospherics/components/tank/air{ @@ -14351,6 +14369,7 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/iron, /area/station/engineering/storage/tech) "eMb" = ( @@ -15178,11 +15197,14 @@ /turf/open/floor/iron, /area/station/hallway/secondary/service) "fbk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine/telecomms, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ + dir = 8 + }, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "fbm" = ( /obj/effect/turf_decal/stripes/line{ @@ -15709,7 +15731,6 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "fkC" = ( @@ -16442,7 +16463,7 @@ dir = 6 }, /obj/machinery/requests_console/auto_name/directional/south, -/obj/machinery/vending/assist, +/obj/structure/closet/toolcloset, /turf/open/floor/iron, /area/station/engineering/storage/tech) "fxU" = ( @@ -16511,7 +16532,7 @@ /area/station/maintenance/disposal/incinerator) "fzi" = ( /obj/machinery/atmospherics/components/binary/pump{ - name = "Mix to Filter"; + name = "Mix to Scrubbers"; dir = 8 }, /turf/open/floor/iron/dark, @@ -18017,14 +18038,17 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "fZN" = ( -/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, /obj/effect/turf_decal/trimline/yellow/line, +/obj/machinery/light/small/directional/north, +/obj/machinery/status_display/ai/directional/north, /obj/structure/table, /obj/item/electronics/apc, -/obj/item/electronics/airlock, +/obj/item/electronics/airlock{ + pixel_y = 8 + }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "fZO" = ( @@ -18278,14 +18302,6 @@ /obj/effect/mapping_helpers/apc/full_charge, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) -"gfn" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/line, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/port) "gfA" = ( /obj/machinery/camera/autoname/directional/west, /turf/open/floor/wood, @@ -19220,12 +19236,9 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "gvD" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /obj/machinery/blackbox_recorder, -/turf/open/floor/engine/telecomms, +/obj/structure/cable, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "gvF" = ( /obj/effect/turf_decal/trimline/red/filled/line, @@ -19526,7 +19539,7 @@ /obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/components/binary/pump/on/scrubbers/visible/layer2{ dir = 4; - name = "External Ports to Filter" + name = "External Ports to Scrubbers" }, /turf/open/floor/iron/dark/side{ dir = 10 @@ -19874,9 +19887,7 @@ /area/station/maintenance/port) "gFJ" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/storage/tech) "gGh" = ( @@ -20635,11 +20646,8 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) "gPV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/telecomms/receiver/preset_right, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/bus/preset_one, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "gQi" = ( /obj/machinery/light/small/directional/south, @@ -21787,6 +21795,15 @@ /turf/open/floor/glass/reinforced, /area/station/security/prison/workout) "hkf" = ( +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 8; + name = "Supply to Loop" + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 4; + name = "Loop to Scrubbers" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/iron/dark/side{ dir = 9 }, @@ -24594,6 +24611,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable, /obj/machinery/door/airlock/engineering/glass{ name = "Server Room" }, @@ -24601,6 +24619,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 8 + }, /turf/open/floor/iron/dark/textured_large, /area/station/tcommsat/computer) "ijg" = ( @@ -24950,11 +24971,16 @@ /turf/open/floor/wood, /area/station/commons/vacant_room/office) "ina" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 }, -/obj/machinery/telecomms/bus/preset_four, -/turf/open/floor/engine/telecomms, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner, +/obj/machinery/light/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "inn" = ( /obj/effect/decal/cleanable/dirt, @@ -25423,7 +25449,9 @@ c_tag = "Telecomms Monitoring"; network = list("tcomms") }, -/obj/structure/tank_holder/oxygen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, /turf/open/floor/iron/dark/side{ dir = 5 }, @@ -25592,11 +25620,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "iuU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/telecomms/server/presets/supply, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/server/presets/security, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "ivb" = ( /obj/effect/turf_decal/stripes/line{ @@ -26192,7 +26217,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/service{ +/obj/machinery/door/airlock/service/glass{ name = "Kitchen Counter" }, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, @@ -27220,11 +27245,11 @@ "iXg" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/binary/pump/on/layer2{ - name = "External to Filter" + name = "External to Scrubbers" }, /obj/machinery/atmospherics/components/binary/pump/on/layer4{ dir = 1; - name = "Air to External" + name = "Supply to External" }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) @@ -28069,6 +28094,9 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/storage/tech) "jmc" = ( @@ -28341,11 +28369,12 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "jsd" = ( -/obj/machinery/light/small/directional/south, /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 }, +/obj/machinery/light/small/directional/south, +/obj/machinery/status_display/evac/directional/south, /obj/structure/table, /obj/item/stock_parts/subspace/filter, /obj/item/stock_parts/subspace/filter, @@ -28910,11 +28939,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "jBv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/telecomms/receiver/preset_left, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/bus/preset_two, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "jBF" = ( /obj/effect/turf_decal/stripes/line, @@ -29068,6 +29094,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/machinery/atmospherics/pipe/layer_manifold/dark/visible{ + dir = 4 + }, /turf/open/floor/iron/dark/textured_large, /area/station/tcommsat/computer) "jEi" = ( @@ -29726,11 +29755,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "jOm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/telecomms/server/presets/engineering, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/server/presets/medical, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "jOr" = ( /turf/open/floor/wood/tile, @@ -29787,11 +29813,15 @@ /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) "jPt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 }, -/obj/machinery/telecomms/broadcaster/preset_right, -/turf/open/floor/engine/telecomms, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "jPP" = ( /obj/structure/disposalpipe/segment{ @@ -30354,13 +30384,9 @@ /turf/open/floor/iron/white, /area/station/science/lab) "jZe" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/spawner/random/trash/garbage, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/machinery/telecomms/server/presets/common, +/turf/open/floor/circuit/green/telecomms, +/area/station/tcommsat/server) "jZl" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/iron/textured, @@ -30610,11 +30636,8 @@ /area/station/command/meeting_room) "keI" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 4 +/obj/effect/turf_decal/trimline/dark_blue/filled/end{ + dir = 1 }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) @@ -31975,7 +31998,7 @@ dir = 1 }, /obj/machinery/light/small/directional/north, -/obj/structure/table, +/obj/structure/rack, /obj/item/analyzer, /obj/item/healthanalyzer, /turf/open/floor/iron, @@ -32146,7 +32169,7 @@ }, /obj/machinery/atmospherics/components/binary/pump/on/supply/visible/layer4{ dir = 8; - name = "Air to External Ports" + name = "Supply to External Ports" }, /turf/open/floor/iron/dark/side{ dir = 9 @@ -33123,14 +33146,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "kUV" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/server/presets/supply, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "kVb" = ( /obj/structure/table, @@ -33447,6 +33464,10 @@ /obj/item/paint_palette, /turf/open/floor/iron/dark/side, /area/station/commons/fitness/recreation) +"kZz" = ( +/obj/machinery/telecomms/processor/preset_four, +/turf/open/floor/circuit/green/telecomms, +/area/station/tcommsat/server) "kZD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33537,6 +33558,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, +/obj/machinery/vending/assist, /turf/open/floor/iron, /area/station/engineering/storage/tech) "lbK" = ( @@ -34531,6 +34553,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) "lsQ" = ( @@ -36378,9 +36401,14 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/starboard/aft) "lYr" = ( +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 1 + }, /obj/structure/sign/warning/no_smoking/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/circuit/green/telecomms/mainframe, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "lYB" = ( /obj/structure/chair/office{ @@ -37576,8 +37604,7 @@ /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) "mse" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/iron/dark/smooth_large, /area/station/tcommsat/computer) "msk" = ( @@ -38413,9 +38440,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "mIF" = ( -/obj/effect/turf_decal/stripes/box, -/obj/machinery/telecomms/hub/preset, -/turf/open/floor/engine/telecomms, +/obj/machinery/ntnet_relay, +/obj/structure/cable, +/turf/open/floor/circuit/telecomms, /area/station/tcommsat/server) "mIK" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -38848,6 +38875,7 @@ /obj/effect/turf_decal/trimline/yellow/corner{ dir = 1 }, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -39740,6 +39768,17 @@ pixel_y = 3 }, /obj/item/stack/cable_coil, +/obj/item/assembly/flash/handheld{ + pixel_y = 17; + pixel_x = -9 + }, +/obj/item/assembly/flash/handheld{ + pixel_y = 17 + }, +/obj/item/assembly/flash/handheld{ + pixel_y = 17; + pixel_x = 9 + }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "ngl" = ( @@ -42673,7 +42712,13 @@ /area/station/maintenance/department/cargo) "obA" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/landmark/generic_maintenance_landmark, +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/multitool, +/obj/item/clothing/glasses/meson, /turf/open/floor/iron, /area/station/engineering/storage/tech) "obC" = ( @@ -43873,11 +43918,17 @@ }, /area/station/service/chapel) "ovA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ + dir = 1 }, -/obj/machinery/telecomms/server/presets/science, -/turf/open/floor/engine/telecomms, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "ovM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44621,14 +44672,10 @@ /turf/open/floor/iron/white, /area/station/science/circuits) "oIw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, +/obj/machinery/light/directional/west, /obj/structure/cable, -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/turf/open/floor/engine/telecomms, +/obj/machinery/power/smes/engineering, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "oIE" = ( /obj/effect/turf_decal/tile/bar/opposingcorners{ @@ -44942,11 +44989,8 @@ /turf/open/floor/iron/freezer, /area/station/science/xenobiology) "oNc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/telecomms/server/presets/medical, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/server/presets/service, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "oNi" = ( /obj/structure/disposalpipe/segment{ @@ -46262,32 +46306,22 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "plV" = ( -/obj/machinery/status_display/ai{ - pixel_x = -32 - }, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, /obj/effect/turf_decal/trimline/yellow/corner, /obj/structure/table, /obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 + pixel_x = -6; + pixel_y = 6 }, -/obj/item/assembly/flash/handheld, -/obj/item/assembly/flash/handheld, +/obj/item/flashlight, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "pme" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/telecomms/bus/preset_two, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/hub/preset, +/obj/structure/cable, +/turf/open/floor/circuit/telecomms, /area/station/tcommsat/server) "pml" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -46535,6 +46569,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Port to Loop" + }, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -46661,11 +46699,13 @@ /turf/open/floor/iron/dark/textured, /area/station/medical/morgue) "prs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 1 }, -/obj/machinery/telecomms/bus/preset_one, -/turf/open/floor/engine/telecomms, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "prw" = ( /obj/structure/cable, @@ -50751,11 +50791,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "qMY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/effect/turf_decal/siding/wideplating_new/dark, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 1 }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine/telecomms, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "qNB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -51348,13 +51388,19 @@ /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "qXp" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 4 + }, /obj/structure/cable, -/obj/effect/decal/cleanable/blood/tracks, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/iron/dark/telecomms, +/area/station/tcommsat/server) "qXs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -51465,14 +51511,8 @@ /turf/open/floor/iron/white, /area/station/science/research) "qZw" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 4; - name = "freezer passive vent" - }, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/receiver/preset_right, +/turf/open/floor/circuit/telecomms, /area/station/tcommsat/server) "qZC" = ( /obj/effect/turf_decal/bot, @@ -51566,11 +51606,9 @@ /turf/open/floor/iron/dark, /area/station/security/prison/garden) "rbo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, +/obj/machinery/telecomms/broadcaster/preset_left, /obj/structure/cable, -/turf/open/floor/engine/telecomms, +/turf/open/floor/circuit/telecomms, /area/station/tcommsat/server) "rbv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51873,8 +51911,9 @@ pixel_x = 1; pixel_y = -1 }, +/obj/item/clothing/gloves/color/yellow, /obj/item/multitool, -/obj/item/clothing/glasses/meson, +/obj/item/t_scanner, /turf/open/floor/iron, /area/station/engineering/storage/tech) "rgv" = ( @@ -52548,7 +52587,7 @@ dir = 8 }, /obj/machinery/light/small/directional/west, -/obj/structure/sign/warning/secure_area/directional/west, +/obj/structure/sign/warning/cold_temp/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -53771,15 +53810,8 @@ /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "rJu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Telecomms Server Room"; - network = list("tcomms") - }, -/obj/machinery/ntnet_relay, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/bus/preset_three, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "rJz" = ( /obj/structure/chair{ @@ -54201,8 +54233,15 @@ /turf/closed/wall, /area/station/maintenance/department/medical) "rSc" = ( -/obj/structure/cable, -/turf/open/floor/circuit/green/telecomms/mainframe, +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "rSo" = ( /obj/effect/spawner/random/trash/graffiti, @@ -56885,10 +56924,13 @@ /turf/open/floor/iron/dark, /area/station/command/meeting_room) "sPy" = ( -/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating_new/dark, /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/circuit/green/telecomms/mainframe, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "sPC" = ( /obj/structure/flora/grass/jungle/b/style_random, @@ -57078,14 +57120,8 @@ }, /area/station/commons/fitness) "sSM" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/machinery/telecomms/message_server/preset, -/turf/open/floor/engine/telecomms, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "sSP" = ( /obj/structure/cable, @@ -57295,11 +57331,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "sWq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/telecomms/processor/preset_one, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/processor/preset_two, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "sWt" = ( /obj/structure/table/reinforced, @@ -58626,7 +58659,7 @@ "trS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/plating, /area/station/tcommsat/computer) "trV" = ( @@ -61180,11 +61213,8 @@ /turf/closed/wall/r_wall, /area/station/engineering/atmos/hfr_room) "ujm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/telecomms/bus/preset_three, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/processor/preset_one, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "ujt" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -61409,7 +61439,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "ulQ" = ( -/obj/machinery/light/small/broken/directional/west, +/obj/machinery/light/small/broken/directional/east, /obj/structure/table, /obj/effect/spawner/random/clothing/gloves, /turf/open/floor/plating, @@ -62180,10 +62210,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "uAy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/broadcaster/preset_right, +/turf/open/floor/circuit/telecomms, /area/station/tcommsat/server) "uAL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62351,11 +62379,17 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "uEU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/effect/turf_decal/siding/wideplating_new/dark{ + dir = 8 }, -/obj/machinery/telecomms/processor/preset_two, -/turf/open/floor/engine/telecomms, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "uEZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -62401,7 +62435,8 @@ }, /area/station/service/hydroponics) "uFw" = ( -/turf/open/floor/circuit/green/telecomms/mainframe, +/obj/machinery/telecomms/bus/preset_four, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "uFF" = ( /obj/effect/spawner/random/trash/moisture_trap, @@ -63246,14 +63281,7 @@ /area/station/security/office) "uTb" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/structure/rack, -/obj/item/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/item/clothing/gloves/color/yellow, -/obj/item/t_scanner, -/obj/item/multitool, +/obj/machinery/portable_atmospherics/pump, /turf/open/floor/iron, /area/station/engineering/storage/tech) "uTo" = ( @@ -63629,11 +63657,11 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "uYf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/effect/turf_decal/siding/wideplating_new/dark, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 }, -/obj/machinery/telecomms/processor/preset_three, -/turf/open/floor/engine/telecomms, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "uYB" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -64290,11 +64318,8 @@ /turf/open/space/basic, /area/space/nearstation) "vir" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/telecomms/server/presets/common, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/server/presets/science, +/turf/open/floor/circuit/green/telecomms, /area/station/tcommsat/server) "viW" = ( /obj/effect/turf_decal/tile/blue/fourcorners, @@ -65269,8 +65294,17 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "vAm" = ( -/obj/effect/turf_decal/stripes/end, -/turf/open/floor/engine/telecomms, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating_new/dark/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "vAq" = ( /obj/effect/spawner/random/structure/closet_maintenance, @@ -66104,9 +66138,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/storage/tech) "vOS" = ( @@ -70779,14 +70811,12 @@ /turf/open/floor/wood, /area/station/service/bar) "xsB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 1 +/obj/machinery/camera/directional/west{ + c_tag = "Telecomms Server Room"; + network = list("tcomms") }, -/turf/open/floor/engine/telecomms, +/obj/machinery/telecomms/receiver/preset_left, +/turf/open/floor/circuit/telecomms, /area/station/tcommsat/server) "xsC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, @@ -70986,6 +71016,7 @@ /obj/item/screwdriver{ pixel_y = 10 }, +/obj/item/multitool, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "xvT" = ( @@ -72884,12 +72915,7 @@ /area/station/commons/dorms) "ybU" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 4 - }, +/obj/effect/turf_decal/trimline/dark_blue/filled/end, /obj/machinery/camera/directional/east{ c_tag = "Tech Storage - Secure" }, @@ -96101,15 +96127,15 @@ vrf nwz nwz nwz -nwz -nwz cuU nwz -feW nwz nwz +pYX +feW nwz nwz +jay nwz tuu wEB @@ -96356,15 +96382,15 @@ byK nwz jay pHd -jZe nPl nPl nPl -qXp -qXp nPl nPl -jZe +nPl +nPl +nPl +nPl nPl nPl nPl @@ -96613,17 +96639,17 @@ fqx feW cuU xYn -wEB -wEB -bJd -wEB -wEB -wEB -wEB -wEB -aZB -wEB -wEB +jay +feW +nwz +nwz +jay +cuU +nwz +nwz +nwz +nwz +pYX wRe cuU wEB @@ -96822,7 +96848,7 @@ xIp dIO rEe jFo -gfn +rWZ pjD fPs ksa @@ -96871,17 +96897,17 @@ nwz jay xYn wEB -sWg -nwz -vrf wEB -hKf -hlL -oxY -nwz -ekU +bJd wEB -wRe +wEB +wEB +wEB +wEB +aZB +wEB +wEB +auG xba xba xba @@ -97127,16 +97153,16 @@ cuU nwz nwz xYn -jwW -feW -nwz +wEB +sWg nwz -jke +vrf +wEB +hKf +hlL oxY nwz -feW -tbI -dwB +ekU wEB wRe xba @@ -97338,7 +97364,7 @@ six szU qLz pjD -erS +jHn ksa ksa ksa @@ -97384,16 +97410,16 @@ wEB wEB jay xYn -wEB -cuU -jay -kVX -wEB -hKf -cfP -eUB -bsX -pXi +jwW +feW +nwz +nwz +jke +oxY +nwz +feW +tbI +dwB wEB wRe xba @@ -97641,18 +97667,18 @@ sbg vrf nwz xYn -xba -xba -xba -xba -xba -xba -xba -xba -xba -xba -xba -auG +wEB +cuU +jay +kVX +wEB +hKf +cfP +eUB +bsX +pXi +wEB +wRe xba rFn rFn @@ -97899,15 +97925,15 @@ nPl nPl wJa xba -uFw -uFw -qMY -uAy -rJu -uAy -fbk -uFw -uFw +xba +xba +xba +xba +xba +xba +xba +xba +xba xba wRe xba @@ -98414,13 +98440,13 @@ jay wPT xba ina -bnP +jPt jPt rSc -uFw +qXp rSc cSm -pme +cSm uEU xba afJ @@ -98671,13 +98697,13 @@ feW xYn xba sPy -rSc -rSc -rSc +bnP +jZe +qMY mIF -rSc -uFw -uFw +qMY +kUV +oNc lYr xba afJ @@ -98930,9 +98956,9 @@ xba uYf ujm gPV -uFw -uFw -rSc +qMY +pme +qMY jBv sWq prs @@ -99186,12 +99212,12 @@ xYn xba bKR dlY -kUV +dlY vAm -uFw +fbk aqW -euj -oNc +dlY +dlY ovA xba afJ @@ -99441,15 +99467,15 @@ qmY pHd sZC xba -uFw -uFw +euj +rJu qZw ajT ija ajT -qZw -uFw +uAy uFw +kZz xba afJ xba @@ -99682,13 +99708,13 @@ vyt bzW niG sRZ -sRZ +nxf nxf gcD sOm gcD nxf -sRZ +nxf sRZ hpM wEB @@ -99700,8 +99726,8 @@ wEB xba ajT ajT -trS -trS +ajT +ajT mse trS trS @@ -105341,9 +105367,9 @@ vhb wlw rRZ iyt -lhd -ulQ -lhd +mnx +ckL +paH rRZ fDD lJK @@ -105854,10 +105880,10 @@ wlw nPp ouI rRZ -mnx fDD fDD fDD +mnx rRZ pvb stP @@ -106112,9 +106138,9 @@ gcu mOs rRZ ckL -paH -ckL -mnx +lhd +ulQ +lhd rRZ rRZ ptg From 2f5ad678a74104160379661e96da23722d6763c3 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Fri, 26 Jul 2024 13:10:47 -0500 Subject: [PATCH 24/27] Fix 23 Fixes a disposal pipe. --- _maps/map_files/BoxStation/BoxStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 549a1afae9054f..9c76fbd570b119 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -106642,8 +106642,8 @@ gbD gVB fxG fxG -fxG lQO +fxG bDt tmQ pvL From 2c3f434fb1ba02bdc97f27c74fd44fd580ad5f1c Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Fri, 26 Jul 2024 13:53:10 -0500 Subject: [PATCH 25/27] Fix 24 Fixes the access on the secure tech storage airlock. --- _maps/map_files/BoxStation/BoxStation.dmm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9c76fbd570b119..c7f6eb6300120e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -56897,13 +56897,19 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/aft) "sOm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage" }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, -/obj/effect/mapping_helpers/airlock/access/all/command/general, -/turf/open/floor/iron/dark, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tech_storage, +/turf/open/floor/iron/dark/textured, /area/station/engineering/storage/tech) "sOo" = ( /obj/machinery/firealarm/directional/north, From c1a29d67c509072c0b22593876718aac324b23de Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Sun, 28 Jul 2024 15:31:51 -0500 Subject: [PATCH 26/27] Fix 25 Fixes another disposals pipe. --- _maps/map_files/BoxStation/BoxStation.dmm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c7f6eb6300120e..5eae15f515c236 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8082,6 +8082,15 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) +"cHV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical) "cIi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -105629,7 +105638,7 @@ gwS feS lgs tpL -iyt +cHV bqv rPJ rPJ From b70c897e438ad916ba69b7b62722c6f3733237e2 Mon Sep 17 00:00:00 2001 From: The Black Screen Date: Thu, 1 Aug 2024 16:08:48 -0500 Subject: [PATCH 27/27] Fix 26 Fixes the soil. --- _maps/map_files/BoxStation/BoxStation.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 5eae15f515c236..f1b4d35e8a2033 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -8792,7 +8792,7 @@ /turf/open/floor/iron, /area/station/engineering/break_room) "cSx" = ( -/obj/machinery/hydroponics/soil, +/obj/machinery/growing/soil, /turf/open/floor/grass, /area/station/service/chapel/funeral) "cSz" = ( @@ -40217,7 +40217,7 @@ /turf/open/floor/iron/dark/textured, /area/station/command/teleporter) "nmw" = ( -/obj/machinery/hydroponics/soil, +/obj/machinery/growing/soil, /turf/open/floor/grass, /area/station/hallway/primary/central) "nmY" = (