From a35972a2121067c5a40e7cd15068227f8d2bf708 Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Mon, 21 Jul 2025 20:11:50 +0100 Subject: [PATCH] The Bodega Update: remapping the commissary and library (#21029) This PR remaps the operations commissary, moving it across to the service hallway where it can receive much more foot traffic than in its original position. Reflecting its new spot in service, and considering particularly how much a hydroponicist can contribute to the commissary, both service and operations staff now have access to it - although I personally anticipate this will remain primarily used by operations. Adjacent vendors in the service hall have been moved into the commissary to encourage interaction, and hopefully to capture a little of that bodega feel - although I'm open for other ideas on how to capture the right atmosphere. Because of the location, the library has necessarily also been remapped. It's now smaller, but my hope is that it uses the space it has more effectively. The old location of the commissary is now generic maintenance until someone finds a better use for it. A few points: - "Is this bad for librarians?" Hopefully not! It isn't a very popular job right now, and I don't expect this PR to change that, but I've gone into the remap with the intention of making the library a more appealing place to be in than before. The old library has a lot of dead space, particularly with its gigantic office, whereas this new design is intended to be a little more compact. Now featuring tinted windows if you want to get some mood lighting going on. - "Why the move?" The current location of the commissary is within view of virtually no foot traffic period - operations generally is an extremely isolated department, and something like the commissary lives and dies in the playerbase according to how visible it is. Appropriately, this moves it to a more visible spot. image image --- code/modules/library/lib_items.dm | 1 - html/changelogs/hazelmouse-bodega.yml | 60 + maps/sccv_horizon/code/sccv_horizon_areas.dm | 3 + maps/sccv_horizon/sccv_horizon.dmm | 2380 ++++++++++-------- 4 files changed, 1409 insertions(+), 1035 deletions(-) create mode 100644 html/changelogs/hazelmouse-bodega.yml diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 933c7f11560..bcfe2bade18 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -17,7 +17,6 @@ icon_state = "book-0" anchored = 1 density = 1 - opacity = 1 build_amt = 5 /obj/structure/bookcase/Initialize() diff --git a/html/changelogs/hazelmouse-bodega.yml b/html/changelogs/hazelmouse-bodega.yml new file mode 100644 index 00000000000..2c93cb28065 --- /dev/null +++ b/html/changelogs/hazelmouse-bodega.yml @@ -0,0 +1,60 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "The operations commissary has been moved to service, adjacent to the library, and now accomodates access both from operations and service staff. The library has also been remapped to accomodate this move." + - rscadd: "Bookcases no longer obstruct vision." + - rscadd: "Hydroponics now has a first-aid kit." diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm index e5c14c3e043..b764339fe64 100644 --- a/maps/sccv_horizon/code/sccv_horizon_areas.dm +++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm @@ -231,6 +231,9 @@ /area/maintenance/hangar/port name = "Port Hangar Maintenance" +/area/maintenance/wing/cargo_compartment + name = "Auxiliary Cargo Maintenance" + /area/maintenance/hangar/starboard name = "Starboard Hangar Maintenance" diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index f18655c9125..5ef78cf6bf8 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -774,27 +774,20 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "aeT" = ( -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "horizon_commissary_desk"; - name = "desk shutters"; - pixel_x = -7; - pixel_y = 25 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/button/remote/airlock{ - dir = 1; - id = "horizon_commissary_door"; - name = "commissary door bolts"; - pixel_x = 7; - pixel_y = 25; - specialfunctions = 4 +/obj/structure/filingcabinet/chestdrawer{ + pixel_x = 10 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = 34 +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = -5 }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/lino/diamond, +/area/horizon/library) "aeU" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -934,10 +927,12 @@ /turf/simulated/floor/wood, /area/bridge/minibar) "agn" = ( -/obj/effect/floor_decal/spline/plain/lime{ - dir = 5 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/vending/hydronutrients/gardenvend, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/garden) "agt" = ( /obj/structure/table/stone/marble, @@ -1322,11 +1317,11 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "ajt" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "library" + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/commissary) "ajv" = ( /obj/effect/floor_decal/corner/dark_blue/full, /obj/structure/cable/green{ @@ -1628,6 +1623,10 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "alh" = ( @@ -1945,13 +1944,15 @@ /turf/simulated/floor/tiled/dark, /area/centcom/bar) "amF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/brown{ - dir = 10 +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/operations/lobby) +/obj/effect/landmark/start{ + name = "Librarian" + }, +/obj/structure/bed/stool/chair/office/light, +/turf/simulated/floor/lino/diamond, +/area/horizon/library) "amG" = ( /obj/machinery/optable, /turf/simulated/floor/tiled/white, @@ -2254,11 +2255,11 @@ /turf/simulated/open, /area/maintenance/wing/starboard) "aoY" = ( -/obj/machinery/vending/cigarette, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_one) "apb" = ( @@ -2314,6 +2315,10 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/aux_atmospherics/deck_2/starboard/wing) "app" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/horizon/library) "aps" = ( @@ -2425,10 +2430,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/custodial/disposals) "aqf" = ( -/obj/machinery/light, -/obj/effect/floor_decal/corner/dark_green/full, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "aqg" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -3035,6 +3041,18 @@ }, /turf/simulated/floor/tiled, /area/bridge/controlroom) +"auv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + req_one_access = list(12,26,29,31,48,67) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/full, +/area/maintenance/wing/cargo_compartment) "auF" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -3954,7 +3972,7 @@ name = "fore, commissary" }, /turf/simulated/floor/plating, -/area/horizon/commissary) +/area/maintenance/wing/cargo_compartment) "aCf" = ( /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular{ @@ -4911,6 +4929,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "aJg" = ( @@ -5113,11 +5132,11 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) "aJW" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 9 +/obj/effect/floor_decal/industrial/warning{ + dir = 5 }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "aKh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 @@ -5537,11 +5556,24 @@ }, /area/shuttle/mining) "aNQ" = ( -/obj/structure/coatrack{ - pixel_x = -10; - pixel_y = 1 +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 }, -/turf/simulated/floor/carpet/brown, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/turf/simulated/floor/wood, /area/horizon/library) "aNR" = ( /obj/effect/floor_decal/industrial/warning{ @@ -6497,7 +6529,7 @@ /area/lawoffice/representative) "aTp" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ - id = "bar" + id = "library" }, /turf/simulated/floor/tiled/dark/full, /area/horizon/bar/backroom) @@ -6728,13 +6760,13 @@ /obj/effect/floor_decal/corner_wide/lime{ dir = 9 }, -/obj/machinery/vending/wallpharm{ - pixel_x = -28 - }, /obj/machinery/light/floor{ dir = 8 }, /obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/closet/walllocker/medical/firstaid{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/white, /area/medical/reception) "aVk" = ( @@ -6967,6 +6999,8 @@ /obj/structure/engineer_maintenance/pipe{ dir = 8 }, +/obj/random/pottedplant, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "aWI" = ( @@ -7147,20 +7181,17 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "aXK" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/operations/lobby) @@ -9143,9 +9174,9 @@ /turf/simulated/floor/wood, /area/horizon/bar) "bkZ" = ( -/obj/machinery/vending/mredispenser, -/obj/effect/floor_decal/industrial/hatch/grey, /obj/item/device/radio/intercom/west, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/vending/overloaders, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "blb" = ( @@ -10600,14 +10631,15 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "bvS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/alarm/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/operations/lobby) +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/small/west, +/turf/simulated/floor/lino/diamond, +/area/horizon/library) "bvU" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -13236,11 +13268,17 @@ /turf/simulated/floor/tiled/full, /area/horizon/holodeck_control) "bOh" = ( -/obj/structure/disposalpipe/segment, -/obj/random/junk, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_two/fore/port) +/obj/machinery/door/airlock/maintenance{ + dir = 4; + name = "Commissary Maintenance"; + req_one_access = list(26,29,31,48,67,35,25,28,37) + }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/commissary) "bOj" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -14483,13 +14521,10 @@ /turf/simulated/floor/wood, /area/merchant_station) "bWy" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/item/device/radio/intercom/east, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/structure/lattice/catwalk, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/open, +/area/horizon/hydroponics) "bWz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/portables_connector/scrubber, @@ -14684,15 +14719,15 @@ /turf/simulated/floor/carpet, /area/lawoffice/consular_two) "bXs" = ( -/obj/machinery/door/window/eastleft{ - req_one_access = list(50) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate, +/obj/random/loot, +/obj/random/condiment, +/obj/machinery/light/small/emergency{ + dir = 8 }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "horizon_commissary_desk" - }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/wing/cargo_compartment) "bXG" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -15422,12 +15457,14 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "cdk" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 +/obj/structure/bed/stool/chair/sofa/red{ + dir = 4 }, -/obj/machinery/firealarm/east, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/red, +/area/horizon/library) "cdt" = ( /turf/simulated/floor/holofloor/reinforced, /area/horizon/holodeck/source_biesel) @@ -15444,6 +15481,9 @@ /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "cdC" = ( +/obj/effect/floor_decal/spline/plain/lime{ + dir = 4 + }, /obj/structure/sink/kitchen{ dir = 8; name = "sink"; @@ -15454,9 +15494,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/spline/plain/lime{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/garden) "cdG" = ( @@ -15821,30 +15859,15 @@ /area/horizon/holodeck/source_biesel) "cfO" = ( /obj/structure/table/wood, -/obj/machinery/recharger{ - pixel_x = -15 +/obj/item/device/flashlight/lamp/green{ + pixel_x = 7; + pixel_y = 3 }, -/obj/effect/floor_decal/spline/fancy/wood, -/obj/item/storage/pill_bottle/dice/tajara{ - pixel_x = 8 +/obj/item/toy/desk/officetoy{ + pixel_x = -9; + pixel_y = 5 }, -/obj/item/storage/pill_bottle/dice/gaming{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/storage/pill_bottle/dice{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/deck/cards{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/deck/cards{ - pixel_x = -4; - pixel_y = 10 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/red, /area/horizon/library) "cfT" = ( /obj/effect/floor_decal/corner/green/diagonal, @@ -16531,10 +16554,25 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "clL" = ( -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "2-8"; + d1 = 2; + d2 = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/carpet/brown, +/turf/simulated/floor/wood, /area/horizon/library) "clN" = ( /obj/structure/platform{ @@ -18174,24 +18212,12 @@ }, /area/antag/raider) "cyE" = ( -/obj/structure/table/standard, -/obj/machinery/camera/network/second_deck{ - c_tag = "Second Deck - Commissary Backroom"; +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/item/folder/yellow{ - pixel_y = 3 - }, -/obj/item/device/price_scanner{ - pixel_y = 4; - pixel_x = -16 - }, -/obj/item/device/quikpay{ - destinationact = "Operations"; - pixel_y = 3 - }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/machinery/alarm/south, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "cyK" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/floor_decal/corner/dark_blue/full{ @@ -19204,16 +19230,16 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "cGs" = ( @@ -20174,9 +20200,13 @@ /turf/simulated/wall, /area/maintenance/substation/research) "cNI" = ( -/obj/machinery/vending/snack, -/obj/effect/floor_decal/industrial/hatch/grey, -/turf/simulated/floor/tiled/full, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/structure/bed/stool/chair/padded/red{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/horizon/hallway/deck_two/fore) "cNL" = ( /obj/structure/lattice, @@ -20434,21 +20464,14 @@ /turf/simulated/floor/tiled, /area/maintenance/aux_atmospherics/deck_2/starboard/wing) "cPO" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/corner/dark_green/full{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/horizon/library) +/turf/simulated/floor/tiled, +/area/horizon/commissary) "cPP" = ( /obj/effect/floor_decal/corner_wide/green/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20654,6 +20677,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"cRr" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "cRs" = ( /obj/effect/landmark/start{ name = "wizard" @@ -20940,8 +20970,16 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "cTe" = ( -/obj/structure/bookcase/libraryspawn/religion, -/turf/simulated/floor/carpet/brown, +/obj/machinery/door/window{ + req_access = list(37); + name = "Library Desk" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/lino/diamond, /area/horizon/library) "cTg" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -21431,13 +21469,10 @@ /turf/simulated/floor/tiled, /area/horizon/security/equipment) "cWL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/bed/stool/chair/office/dark{ + dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/red, /area/horizon/library) "cWX" = ( /obj/effect/floor_decal/corner_wide/black{ @@ -22202,15 +22237,8 @@ /turf/simulated/floor/plating, /area/bridge/controlroom) "dda" = ( -/obj/machinery/door/airlock/glass_service{ - dir = 1; - name = "Library" - }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/wood, /area/horizon/library) "ddb" = ( /obj/effect/floor_decal/industrial/warning, @@ -23816,16 +23844,13 @@ /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_tribunal) "dpr" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/item/device/radio/intercom/west, -/obj/machinery/disposal/small/east, +/obj/effect/floor_decal/corner/dark_green/full, /obj/structure/disposalpipe/trunk{ - dir = 4 + dir = 1 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/disposal/small/east, +/turf/simulated/floor/tiled, +/area/horizon/commissary) "dpt" = ( /obj/machinery/door/airlock/centcom{ name = "Superheavy Support Garage"; @@ -27691,10 +27716,25 @@ /turf/simulated/floor/tiled/dark, /area/horizon/custodial/disposals) "dSp" = ( -/obj/machinery/seed_extractor, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/horizon/hydroponics/garden) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/turf/simulated/floor/wood, +/area/horizon/library) "dSv" = ( /obj/item/device/laser_pointer/blue{ pixel_x = -12; @@ -31267,7 +31307,7 @@ dir = 9 }, /obj/structure/extinguisher_cabinet/west, -/obj/machinery/vending/overloaders, +/obj/machinery/computer/arcade, /turf/simulated/floor/wood, /area/horizon/bar) "esd" = ( @@ -31553,16 +31593,19 @@ /turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/lower) "euv" = ( -/obj/structure/disposalpipe/sortjunction/flipped{ - name = "Library Office"; - sortType = "Library Office" +/obj/machinery/vending/cigarette, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/operations, +/turf/simulated/floor/tiled/full, +/area/horizon/commissary) "euC" = ( /obj/structure/bed/stool/chair/sofa/left/orange{ dir = 8 @@ -32013,18 +32056,21 @@ /turf/simulated/floor/plating, /area/hallway/engineering) "eyu" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/item/device/radio/intercom/south, -/obj/machinery/disposal/small/north, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/structure/bed/stool/chair{ + dir = 4 + }, +/obj/machinery/newscaster/west, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_two/fore) "eyF" = ( /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /obj/effect/floor_decal/corner/dark_blue{ dir = 8 @@ -32410,8 +32456,7 @@ "eBU" = ( /obj/structure/statue/gusoku, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor/dark_monotile, @@ -32658,7 +32703,21 @@ /turf/simulated/wall/r_wall, /area/horizon/security/brig) "eDA" = ( -/turf/simulated/floor/carpet/red, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/horizon/library) "eDD" = ( /obj/effect/map_effect/door_helper/unres, @@ -32819,11 +32878,18 @@ /turf/simulated/floor/plating, /area/hangar/intrepid) "eEp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/table/wood, +/obj/machinery/recharger{ + pixel_x = -3; + pixel_y = 2 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/deck/cards{ + pixel_x = 12; + pixel_y = 1 + }, +/obj/random/pottedplant_small{ + pixel_x = 7; + pixel_y = 9 }, /turf/simulated/floor/wood, /area/horizon/library) @@ -34314,18 +34380,11 @@ }, /area/shuttle/legion) "ePD" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +/obj/structure/table/wood, +/obj/machinery/librarycomp{ + pixel_y = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = -21; - pixel_y = 32 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/red, /area/horizon/library) "ePL" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, @@ -34358,6 +34417,10 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/wood, /area/horizon/library) "eQr" = ( @@ -35332,6 +35395,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) +"eXu" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/operations/lobby) "eXE" = ( /obj/machinery/recharge_station, /obj/structure/railing/mapped{ @@ -36004,15 +36078,10 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "fbW" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_service{ - dir = 4; - name = "Library" +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "library" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled/dark/full, /area/horizon/library) "fbX" = ( /obj/structure/shuttle_part/mercenary/small{ @@ -37058,14 +37127,25 @@ /turf/simulated/floor/plating, /area/shuttle/mining) "fjb" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/camera/network/service{ - c_tag = "Service - Library Fore"; - dir = 1 +/obj/effect/floor_decal/corner/dark_green{ + dir = 6 }, -/obj/machinery/newscaster/south, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) "fjf" = ( /obj/structure/table/reinforced/steel, /obj/machinery/button/remote/blast_door{ @@ -37477,12 +37557,16 @@ /turf/unsimulated/floor/plating, /area/centcom/holding) "fmh" = ( -/obj/effect/floor_decal/corner/dark_green/full{ +/obj/item/storage/bag/inflatable{ + pixel_y = 9 + }, +/obj/structure/table/rack/folding_table, +/obj/random/tech_supply, +/obj/machinery/light/small/emergency{ dir = 4 }, -/obj/structure/table/rack/retail_shelf, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "fmi" = ( /obj/structure/cable{ icon_state = "4-8" @@ -37989,12 +38073,12 @@ /turf/simulated/floor/tiled, /area/storage/primary) "fqP" = ( -/obj/structure/disposalpipe/segment{ - icon_state = "pipe-c" - }, /obj/machinery/light/small/emergency{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + icon_state = "pipe-c" + }, /obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/port) @@ -38481,8 +38565,7 @@ "fuM" = ( /obj/machinery/photocopier, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/marble, /area/antag/wizard) @@ -39271,9 +39354,9 @@ /turf/simulated/floor/plating, /area/engineering/atmos/propulsion/starboard) "fBC" = ( -/obj/structure/bed/stool/chair/office/dark, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/structure/bookcase/libraryspawn/fiction, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/library) "fBE" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -40327,14 +40410,15 @@ /turf/unsimulated/floor, /area/centcom/distress_prep) "fJo" = ( -/obj/machinery/power/apc/east, -/obj/structure/cable/green, -/obj/structure/coatrack{ - pixel_x = 10 - }, /obj/effect/floor_decal/spline/plain/lime{ dir = 6 }, +/obj/machinery/disposal/small/west, +/obj/machinery/power/apc/east, +/obj/structure/cable/green, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/garden) "fJt" = ( @@ -40931,9 +41015,6 @@ /turf/unsimulated/floor/plating, /area/centcom/spawning) "fNE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, @@ -41487,16 +41568,16 @@ }, /area/tdome/tdomeobserve) "fSC" = ( -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp/green{ - pixel_x = -5; - pixel_y = 13 +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 }, -/obj/random/pottedplant_small{ - pixel_x = 6 +/obj/machinery/door/airlock/maintenance{ + dir = 4; + name = "Library Maintenance"; + req_access = list(37) }, -/obj/machinery/power/outlet, -/turf/simulated/floor/carpet/red, +/turf/simulated/floor/tiled/dark/full, /area/horizon/library) "fSL" = ( /turf/simulated/floor/tiled, @@ -41941,12 +42022,11 @@ /turf/simulated/floor/plating, /area/horizon/hallway/deck_three/primary/starboard/docks) "fVt" = ( -/obj/effect/floor_decal/corner/dark_green/diagonal, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "fVy" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -43348,12 +43428,12 @@ }, /area/centcom/holding) "gfa" = ( -/obj/effect/floor_decal/spline/plain/lime{ - dir = 9 - }, /obj/structure/reagent_dispensers/watertank, -/obj/structure/engineer_maintenance/electric/wall, -/turf/simulated/floor/tiled/dark, +/obj/machinery/alarm/north{ + req_one_access = list(24,11,55) + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/garden) "gfk" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -43590,18 +43670,18 @@ /turf/unsimulated/wall/fakepdoor, /area/centcom/specops) "ghu" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 +/obj/effect/floor_decal/industrial/outline/operations, +/obj/structure/table/rack, +/obj/item/device/price_scanner, +/obj/item/device/quikpay{ + destinationact = "Operations"; + pixel_y = 3 }, -/obj/structure/table/wood, -/obj/machinery/librarycomp{ - pixel_y = 7 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/alarm/east, +/obj/item/storage/box/plasticbag, +/obj/item/storage/toolbox/mechanical, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/commissary) "ghv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -44743,7 +44823,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, -/obj/machinery/alarm/south, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/wood, /area/horizon/library) "gpK" = ( @@ -45088,9 +45170,8 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, -/obj/machinery/atm{ - dir = 4; - pixel_x = 16 +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -45849,8 +45930,7 @@ /area/centcom/legion) "gxH" = ( /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/linoleum, /area/antag/actor) @@ -46209,7 +46289,6 @@ /obj/machinery/camera/network/service{ c_tag = "Service - Deck 2 - Bar Back Counter" }, -/obj/machinery/computer/arcade, /turf/simulated/floor/wood, /area/horizon/bar) "gAs" = ( @@ -46487,11 +46566,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "gBU" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, /obj/machinery/libraryscanner, -/turf/simulated/floor/wood, +/obj/item/device/radio/intercom/north, +/turf/simulated/floor/lino/diamond, /area/horizon/library) "gBY" = ( /obj/structure/table/reinforced/wood, @@ -48493,8 +48570,7 @@ /area/horizon/security/hallway) "gQh" = ( /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/simulated/floor/plating, /area/turbolift/primary/deck_1) @@ -50329,16 +50405,16 @@ /turf/simulated/floor/wood, /area/bridge/minibar) "hdF" = ( -/obj/machinery/firealarm/north, -/obj/effect/floor_decal/corner/dark_green/full{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/machinery/power/apc/east, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/structure/trash_pile, +/obj/effect/decal/cleanable/cobweb2, +/obj/machinery/light/small/emergency{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "hdI" = ( /obj/effect/floor_decal/corner/dark_blue/full{ dir = 1 @@ -51084,6 +51160,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "hjm" = ( @@ -52429,17 +52508,14 @@ /turf/simulated/floor/tiled, /area/operations/lower/machinist) "htE" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "shutters_deck2_librarydesk"; - name = "Library Shutters"; - opacity = 0 +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 }, -/turf/simulated/floor/tiled/dark/full, -/area/horizon/library) +/obj/structure/bed/stool/chair{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_two/fore) "htP" = ( /obj/structure/window/reinforced/crescent{ dir = 8 @@ -52818,8 +52894,19 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "hws" = ( -/obj/structure/bookcase/libraryspawn/reference, -/turf/simulated/floor/carpet/brown, +/obj/structure/table/wood, +/obj/item/storage/box/fancy/matches{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/random/pottedplant_small{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/machinery/door/window/southright{ + req_access = list(37) + }, +/turf/simulated/floor/lino/diamond, /area/horizon/library) "hww" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ @@ -53958,8 +54045,11 @@ /turf/unsimulated/floor, /area/centcom/spawning) "hFV" = ( -/obj/structure/bookcase/libraryspawn/fiction, -/turf/simulated/floor/carpet/brown, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/papershredder, +/turf/simulated/floor/wood, /area/horizon/library) "hGb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -54436,12 +54526,9 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "hJm" = ( -/obj/effect/floor_decal/corner/dark_green/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "hJo" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/filingcabinet/filingcabinet{ @@ -54491,8 +54578,7 @@ pixel_y = 32 }, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/dark, /area/antag/actor) @@ -54978,11 +55064,15 @@ /turf/simulated/floor/tiled/dark/full, /area/crew_quarters/heads/chief) "hNq" = ( -/obj/structure/bed/stool/chair/office/dark{ +/obj/machinery/door/airlock/maintenance{ + req_one_access = list(12,26,29,31,48,67); dir = 4 }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/wing/cargo_compartment) "hNt" = ( /obj/effect/floor_decal/corner/yellow{ dir = 10 @@ -55883,7 +55973,7 @@ icon_state = "d2-1" }, /turf/simulated/floor/plating, -/area/horizon/commissary) +/area/maintenance/wing/cargo_compartment) "hUh" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plating, @@ -55965,16 +56055,11 @@ }, /area/centcom/holding) "hUX" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/firealarm/south, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/obj/machinery/light{ - dir = 4 + dir = 5 }, +/obj/machinery/bookbinder, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/wood, /area/horizon/library) "hVe" = ( @@ -58612,20 +58697,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "iqe" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/bed/stool/chair/office/light{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/spline/plain/lime{ + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/turf/simulated/floor/tiled/dark, +/area/horizon/commissary) "iqf" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -60587,11 +60669,10 @@ /turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "iEs" = ( -/obj/structure/bed/stool/chair/sofa/right/red{ - dir = 1 - }, -/turf/simulated/floor/carpet/red, -/area/horizon/library) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/wing/cargo_compartment) "iEz" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/portables_connector{ @@ -62440,6 +62521,7 @@ }, /obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/portable_atmospherics/hydroponics/soil, +/obj/structure/engineer_maintenance/pipe/wall, /turf/simulated/floor/grass/no_edge, /area/horizon/hydroponics/garden) "iRC" = ( @@ -62794,20 +62876,8 @@ /turf/template_noop, /area/template_noop) "iUV" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/light_switch{ - pixel_x = 20; - pixel_y = 21 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, +/obj/structure/bookcase/libraryspawn/nonfiction, +/turf/simulated/floor/tiled/dark/full, /area/horizon/library) "iUY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -63583,7 +63653,7 @@ icon_state = "d2-1" }, /turf/simulated/wall, -/area/horizon/commissary) +/area/maintenance/wing/cargo_compartment) "jay" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 10 @@ -63782,16 +63852,11 @@ }, /area/centcom/ferry) "jbY" = ( -/obj/structure/table/standard, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "horizon_commissary_desk" +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "jcd" = ( /obj/effect/floor_decal/spline/plain/black, /obj/structure/bed/stool/chair/shuttle/double{ @@ -64402,9 +64467,6 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 1 }, -/obj/effect/floor_decal/spline/plain/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -66407,8 +66469,8 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/obj/effect/floor_decal/spline/plain/corner/lime{ + dir = 4 }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) @@ -66496,6 +66558,15 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control/beta) +"jvI" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "jvM" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -67634,13 +67705,38 @@ /turf/template_noop, /area/template_noop) "jEM" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/effect/floor_decal/spline/plain/lime{ dir = 4 }, -/obj/machinery/newscaster/east, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "horizon_commissary_door"; + name = "Commissary Door Bolts"; + pixel_x = 22; + specialfunctions = 4; + pixel_y = -2 + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "horizon_commissary_desk"; + name = "Desk Shutters"; + pixel_x = 22; + pixel_y = 10 + }, +/obj/machinery/button/switch/holosign{ + id = "commissary"; + dir = 4; + pixel_y = 1; + pixel_x = 29 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 12; + pixel_x = 29 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/dark, +/area/horizon/commissary) "jEP" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_waste) @@ -68870,6 +68966,15 @@ }, /turf/unsimulated/floor, /area/centcom/distress_prep) +"jOy" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "jOE" = ( /obj/structure/window/reinforced{ dir = 4 @@ -69032,12 +69137,11 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/brig) "jPM" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/coatrack{ + pixel_x = -11; + pixel_y = 19 + }, /turf/simulated/floor/wood, /area/horizon/library) "jPP" = ( @@ -72178,8 +72282,7 @@ "klO" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/grass, /area/antag/actor) @@ -72778,11 +72881,12 @@ /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "kqC" = ( -/obj/effect/floor_decal/corner/dark_green/full{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate, +/obj/random/loot, +/obj/random/contraband, +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/wing/cargo_compartment) "kqF" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -72803,8 +72907,17 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) "kqH" = ( -/obj/machinery/vending/battlemonsters, -/turf/simulated/floor/carpet/red, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bed/stool/chair/padded/red{ + dir = 8 + }, +/obj/machinery/power/apc/north, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/lino/diamond, /area/horizon/library) "kqO" = ( /obj/random/junk, @@ -73982,19 +74095,14 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/hapt) "kzq" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_service{ - dir = 1; - name = "Library" - }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/brown/full{ + dir = 1 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/full, -/area/horizon/library) +/turf/simulated/floor/tiled, +/area/horizon/commissary) "kzs" = ( /turf/simulated/floor/tiled/full, /area/hallway/primary/aft) @@ -75162,16 +75270,8 @@ /turf/simulated/floor/tiled, /area/engineering/bluespace_drive) "kHW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/dark_green{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/wall, +/area/maintenance/wing/cargo_compartment) "kHY" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/spline/fancy/wood{ @@ -75322,6 +75422,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "kJh" = ( @@ -76048,15 +76149,28 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "kPM" = ( -/obj/machinery/photocopier, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 +/obj/machinery/atm{ + dir = 1; + pixel_y = 28 }, -/obj/machinery/light{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/engineer_maintenance/electric{ + dir = 1 + }, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/horizon/commissary) "kPR" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -76728,7 +76842,26 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/xenobiology/xenoflora) "kUJ" = ( -/obj/structure/bed/stool/chair/padded/brown, +/obj/structure/table/wood, +/obj/random/pottedplant_small{ + pixel_x = -3; + pixel_y = 12 + }, +/obj/machinery/button/switch/windowtint{ + id = "library"; + pixel_x = 7; + pixel_y = -1; + dir = 1 + }, +/obj/item/material/ashtray/bronze{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -1; + pixel_x = -2 + }, /turf/simulated/floor/carpet/red, /area/horizon/library) "kUQ" = ( @@ -78145,8 +78278,7 @@ /obj/item/storage/backpack/satchel/leather/withwallet, /obj/structure/table/stone/marble, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/marble, /area/antag/wizard) @@ -79109,6 +79241,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "loH" = ( @@ -79559,22 +79695,18 @@ /turf/unsimulated/floor, /area/centcom/control) "lrU" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 +/obj/machinery/power/apc/north, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, /obj/machinery/light{ dir = 8 }, -/obj/machinery/alarm/west, -/obj/machinery/power/apc/north, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/bed/stool/chair/padded/brown{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/effect/floor_decal/industrial/hatch/operations, +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled/full, +/area/horizon/commissary) "lsa" = ( /turf/unsimulated/floor/wood, /area/antag/raider) @@ -82460,8 +82592,7 @@ /area/horizon/security/warden) "lMk" = ( /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning{ @@ -84017,11 +84148,22 @@ /turf/simulated/floor/tiled/white, /area/medical/ors) "lWM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + name = "Library"; + sortType = "Library" + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hallway/deck_two/fore) @@ -84519,11 +84661,15 @@ }, /area/horizon/holodeck/source_moghes) "mbi" = ( -/obj/structure/table/rack/retail_shelf{ - name = "high value goods shelf" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/structure/closet, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "mbj" = ( /obj/structure/bed/stool/chair/office/bridge/generic{ desc = "Looks suspiciously comfortable."; @@ -84769,8 +84915,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/vending/actor, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/dark_monotile, /area/antag/actor) @@ -86670,7 +86815,9 @@ /turf/simulated/floor/exoplanet/grass/grove, /area/centcom/shared_dream) "mqM" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ + id = "library" + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/garden) "mqP" = ( @@ -86838,8 +86985,7 @@ }, /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/wood, /area/antag/actor) @@ -89534,14 +89680,13 @@ /area/rnd/xenoarch_storage) "mOg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "mOr" = ( @@ -89931,7 +90076,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ dir = 1; - req_access = list(12) + req_one_access = list(12,26,29,31,48,67,35,25,28,37) }, /obj/structure/cable/green{ icon_state = "1-2" @@ -90148,8 +90293,8 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "mUd" = ( -/obj/structure/disposalpipe/segment{ - icon_state = "pipe-c" +/obj/structure/bed/stool/bar/padded/red{ + dir = 8 }, /turf/simulated/floor/wood, /area/horizon/library) @@ -90298,6 +90443,7 @@ /obj/machinery/door/airlock/glass{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "mVa" = ( @@ -90447,6 +90593,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/hallway/primary/central_two) @@ -92457,16 +92604,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "nkM" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/mining{ - name = "Commissary Backroom"; - req_one_access = list(26,29,31,48,67) +/obj/machinery/door/airlock/maintenance{ + req_one_access = list(12,26,29,31,48,67) }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/tiled/full, +/area/maintenance/wing/cargo_compartment) "nkR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -93687,16 +93830,13 @@ /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) "nth" = ( -/obj/structure/table/standard, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "horizon_commissary_desk" +/obj/structure/closet, +/obj/random/loot, +/obj/machinery/light/small/emergency{ + dir = 8 }, -/obj/machinery/door/window/eastright{ - req_one_access = list(50) - }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "nto" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/red, @@ -93867,13 +94007,12 @@ /turf/unsimulated/floor/monotile, /area/antag/raider) "nuw" = ( -/obj/machinery/camera/network/service{ - c_tag = "Second Deck - Public Garden" +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/vending/hydronutrients/gardenvend, -/turf/simulated/floor/tiled/dark, -/area/horizon/hydroponics/garden) +/obj/machinery/alarm/west, +/turf/simulated/floor/tiled, +/area/horizon/hallway/deck_two/fore) "nuz" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner_wide/orange{ @@ -93980,8 +94119,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/linoleum, /area/antag/actor) @@ -95388,15 +95526,15 @@ /turf/simulated/floor/grass/no_edge, /area/crew_quarters/lounge) "nGl" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/bed/stool/chair/office/light{ dir = 8 }, -/obj/structure/filingcabinet/filingcabinet{ - density = 0; - pixel_x = -9 +/obj/effect/floor_decal/spline/plain/lime{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/horizon/commissary) "nGn" = ( /obj/structure/table/standard, /obj/item/stack/material/glass/full{ @@ -96039,17 +96177,14 @@ /turf/unsimulated/floor, /area/centcom/legion) "nLv" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, -/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/green{ - icon_state = "1-2" + d2 = 2; + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/hallway/primary/central_one) +/obj/machinery/power/apc/north, +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/wing/cargo_compartment) "nLA" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/hidden, @@ -96190,9 +96325,34 @@ /turf/simulated/floor/tiled/full, /area/hallway/primary/aft) "nML" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/turf/simulated/floor/tiled/dark/full, -/area/horizon/library) +/obj/machinery/holosign/service{ + id = "commissary" + }, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/glass_mining{ + dir = 4; + name = "Commissary"; + id_tag = "horizon_commissary_door" + }, +/turf/simulated/floor/tiled/full, +/area/horizon/commissary) "nMN" = ( /obj/structure/sign/directions/security{ dir = 4 @@ -96252,16 +96412,22 @@ /turf/simulated/floor/tiled/dark, /area/horizon/longbow) "nNi" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 + }, /obj/structure/cable/green{ - icon_state = "1-2" + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass{ - id_tag = "horizon_commissary_door"; - name = "Commissary" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/horizon/commissary) "nNm" = ( @@ -97305,7 +97471,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/spline/plain/lime{ - dir = 8 + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/garden) @@ -99931,7 +100097,7 @@ icon_state = "d2-2" }, /turf/simulated/wall, -/area/horizon/commissary) +/area/maintenance/wing/cargo_compartment) "ooT" = ( /obj/structure/bed/stool/chair/office/dark{ dir = 4 @@ -101261,8 +101427,7 @@ /area/centcom/legion/hangar5) "ozR" = ( /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, @@ -102887,13 +103052,20 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "oMu" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 9 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/light{ +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/newscaster/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "oMK" = ( @@ -103659,11 +103831,17 @@ /turf/simulated/floor/plating, /area/shuttle/mining) "oSE" = ( -/obj/structure/bed/stool/chair/sofa/corner/convex/red{ - dir = 4 +/obj/effect/floor_decal/corner/brown/full{ + dir = 8 }, -/turf/simulated/floor/carpet/red, -/area/horizon/library) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/horizon/commissary) "oSI" = ( /obj/structure/table/standard, /obj/machinery/vending/wallmed1{ @@ -104125,6 +104303,13 @@ }, /turf/unsimulated/floor/wood, /area/antag/burglar) +"oWl" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "oWu" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -106566,13 +106751,13 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/investigations_hallway) "pnT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/structure/table/rack/retail_shelf, +/obj/machinery/camera/network/service{ + c_tag = "Second Deck - Commissary Starboard"; + dir = 1 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/turf/simulated/floor/tiled/full, +/area/horizon/commissary) "pnU" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/machinery/door/firedoor, @@ -107577,8 +107762,19 @@ /turf/simulated/floor/carpet/rubber, /area/engineering/engine_room/rust) "pvi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/table/wood, +/obj/item/storage/pill_bottle/dice/tajara{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/storage/pill_bottle/dice/gaming{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/machinery/power/outlet, +/obj/item/storage/pill_bottle/dice{ + pixel_x = 7; + pixel_y = 1 }, /turf/simulated/floor/wood, /area/horizon/library) @@ -109691,9 +109887,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/custodial/disposals) "pLo" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/floor_decal/corner/dark_green/full{ dir = 1 }, @@ -110183,9 +110376,6 @@ /obj/effect/floor_decal/corner/dark_green/full{ dir = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "pOJ" = ( @@ -110544,11 +110734,14 @@ /turf/unsimulated/floor, /area/centcom/holding) "pRg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/table/wood, +/obj/item/toy/desk/newtoncradle{ + pixel_x = 3; + pixel_y = 10 }, -/turf/simulated/floor/tiled, -/area/horizon/hallway/deck_two/fore) +/obj/machinery/power/outlet, +/turf/simulated/floor/carpet/red, +/area/horizon/library) "pRi" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -110887,8 +111080,22 @@ /turf/space/dynamic, /area/horizon/exterior) "pTJ" = ( -/obj/structure/bookcase/libraryspawn/nonfiction, -/turf/simulated/floor/carpet/brown, +/obj/structure/table/wood, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/southleft{ + req_access = list(37) + }, +/obj/item/paper_bin{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/pen/fountain/black{ + pixel_x = -1; + pixel_y = 6 + }, +/turf/simulated/floor/lino/diamond, /area/horizon/library) "pTP" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -111491,7 +111698,7 @@ "pYz" = ( /obj/structure/foamedmetal, /turf/simulated/floor/plating, -/area/horizon/commissary) +/area/maintenance/wing/cargo_compartment) "pYB" = ( /obj/structure/lattice, /turf/space/dynamic, @@ -112447,15 +112654,15 @@ /turf/simulated/floor/tiled, /area/maintenance/aux_atmospherics/deck_2/starboard/wing) "qfg" = ( -/obj/structure/table/standard, -/obj/item/device/radio/intercom/west, -/obj/machinery/light, -/obj/item/paper_bin{ - pixel_y = 5 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/item/pen/black, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/random/junk, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "qfl" = ( /obj/effect/floor_decal/corner_wide/lime/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -112830,11 +113037,19 @@ /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "qhY" = ( -/obj/structure/table/wood, -/obj/item/toy/desk/newtoncradle, -/obj/machinery/power/outlet, -/turf/simulated/floor/carpet/red, -/area/horizon/library) +/obj/machinery/vending/cola, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/operations, +/turf/simulated/floor/tiled/full, +/area/horizon/commissary) "qhZ" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Engineering Lower Deck Substation" @@ -113611,21 +113826,14 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "qoC" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/effect/floor_decal/spline/plain/lime{ + dir = 6 }, -/obj/machinery/firealarm/east, -/obj/structure/disposalpipe/segment{ - icon_state = "pipe-c" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/horizon/library) +/turf/simulated/floor/tiled/dark, +/area/horizon/commissary) "qoD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -114012,16 +114220,13 @@ /turf/simulated/floor/plating, /area/horizon/security/hallway) "qrF" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/light/small/emergency{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/corner/brown{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/operations/lobby) +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_two/fore/port) "qrG" = ( /obj/machinery/power/terminal{ dir = 8 @@ -114032,17 +114237,21 @@ /turf/simulated/floor/tiled/dark/full, /area/storage/shields) "qrM" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, /obj/structure/disposalpipe/segment{ + dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/horizon/commissary) "qrO" = ( /obj/item/reagent_containers/food/drinks/waterbottle{ pixel_x = -6; @@ -115216,11 +115425,10 @@ /turf/simulated/floor/carpet/rubber, /area/bridge/controlroom) "qAT" = ( -/obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/lino/diamond, /area/horizon/library) "qAU" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -117144,23 +117352,16 @@ /turf/unsimulated/floor/freezer, /area/antag/mercenary) "qOl" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_service{ +/obj/structure/table/reinforced/steel, +/obj/machinery/door/window/westleft{ + req_one_access = list(26,29,31,48,67,35,25,28,37) + }, +/obj/machinery/door/blast/shutters{ dir = 4; - name = "Library Office"; - req_access = list(37) + id = "horizon_commissary_desk" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/horizon/library) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/commissary) "qOn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -117801,8 +118002,7 @@ /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control/beta) "qST" = ( -/obj/machinery/lapvend, -/turf/simulated/floor/carpet/red, +/turf/simulated/floor/lino/diamond, /area/horizon/library) "qSW" = ( /obj/structure/cable{ @@ -118839,9 +119039,13 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "qZA" = ( -/obj/machinery/bookbinder, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/camera/network/service{ + c_tag = "Service - Library"; + dir = 1 + }, +/obj/machinery/vending/battlemonsters, +/turf/simulated/floor/tiled/dark/full, /area/horizon/library) "qZC" = ( /turf/simulated/wall, @@ -119809,19 +120013,14 @@ /turf/simulated/floor/grass/no_edge, /area/rnd/xenobiology/xenoflora) "rge" = ( -/obj/machinery/newscaster/east, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/structure/table/rack/retail_shelf, +/obj/machinery/vending/wallpharm{ + pixel_x = 28; + pixel_y = 3 }, -/obj/machinery/camera/network/service{ - c_tag = "Service - Library Aft"; - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/item/device/radio/intercom/south, +/turf/simulated/floor/tiled/full, +/area/horizon/commissary) "rgf" = ( /obj/structure/dispenser/oxygen, /obj/effect/floor_decal/corner/red{ @@ -119835,6 +120034,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "rgm" = ( @@ -120785,11 +120985,14 @@ /turf/simulated/wall/shuttle/hapt, /area/shuttle/hapt) "rod" = ( -/obj/structure/bed/stool/chair/sofa/left/red{ - dir = 4 +/obj/machinery/vending/zora, +/obj/machinery/alarm/south, +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/carpet/red, -/area/horizon/library) +/obj/effect/floor_decal/industrial/hatch/operations, +/turf/simulated/floor/tiled/full, +/area/horizon/commissary) "rof" = ( /obj/effect/floor_decal/corner/yellow/full, /obj/effect/floor_decal/corner/yellow{ @@ -121339,17 +121542,22 @@ /turf/simulated/floor/plating, /area/shuttle/quark/cargo_hold) "rsj" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/obj/machinery/light{ +/obj/item/device/destTagger, +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/operations, +/obj/item/storage/box/fancy/candle_box, +/obj/item/stack/packageWrap, +/obj/item/paper_scanner, +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/disposal/small/north, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/item/device/toner{ + pixel_y = 5 }, -/turf/simulated/floor/wood, +/obj/item/device/toner{ + pixel_y = -1 + }, +/turf/simulated/floor/lino/diamond, /area/horizon/library) "rsk" = ( /obj/structure/cable{ @@ -123012,10 +123220,7 @@ }, /area/centcom/holding) "rFv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/brown{ dir = 5 }, /turf/simulated/floor/tiled, @@ -123709,10 +123914,11 @@ /turf/simulated/floor/plating, /area/hangar/intrepid) "rLv" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/small/south, /turf/simulated/floor/wood, /area/horizon/library) "rLF" = ( @@ -123744,7 +123950,15 @@ /turf/simulated/floor/carpet/purple, /area/crew_quarters/heads/hor) "rMk" = ( -/turf/simulated/floor/tiled, +/obj/structure/table/reinforced/steel, +/obj/machinery/door/window/westright{ + req_one_access = list(26,29,31,48,67,35,25,28,37) + }, +/obj/machinery/door/blast/shutters{ + dir = 4; + id = "horizon_commissary_desk" + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/commissary) "rMm" = ( /obj/structure/cable/green{ @@ -123777,24 +123991,9 @@ /turf/simulated/floor/tiled, /area/bridge) "rMu" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/coatrack{ - pixel_x = 8; - pixel_y = 9 - }, -/obj/structure/engineer_maintenance/pipe{ - dir = 1 - }, -/obj/structure/engineer_maintenance/electric{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/structure/table/rack/retail_shelf, +/turf/simulated/floor/tiled/full, +/area/horizon/commissary) "rMz" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ore, @@ -124241,18 +124440,12 @@ /turf/space/transit/east, /area/template_noop) "rQk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, -/obj/machinery/atm{ - dir = 4; - pixel_x = 16 - }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "rQo" = ( /obj/structure/railing/mapped{ dir = 4 @@ -124853,15 +125046,11 @@ /turf/simulated/floor/grass/no_edge, /area/rnd/hallway/secondary) "rUC" = ( -/obj/structure/disposalpipe/junction, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/horizon/library) +/turf/simulated/floor/tiled, +/area/horizon/commissary) "rUN" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -125465,16 +125654,11 @@ /turf/simulated/floor, /area/turret_protected/ai_upload_foyer) "rZR" = ( -/obj/machinery/camera/network/second_deck{ - c_tag = "Second Deck - Commissary"; - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, -/obj/structure/table/rack/retail_shelf, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "rZT" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/structure/table/standard, @@ -125589,11 +125773,22 @@ /turf/simulated/floor/tiled, /area/security/checkpoint2) "saN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + sortType = "Commissary"; + name = "Commissary" + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/hallway/primary/central_two) @@ -126216,15 +126411,19 @@ /turf/simulated/floor/wood, /area/operations/qm) "sew" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/effect/floor_decal/spline/plain/lime{ + dir = 5 }, -/obj/machinery/camera/network/service{ - c_tag = "Service - Library Port"; +/obj/item/device/radio/intercom/east, +/obj/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/commissary) "seO" = ( /obj/structure/cable{ icon_state = "1-8" @@ -128783,6 +128982,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/floor_decal/spline/plain/lime{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/garden) "szr" = ( @@ -130937,12 +131139,15 @@ /turf/simulated/floor/carpet/magenta, /area/horizon/holodeck/source_cafe) "sPD" = ( -/obj/machinery/papershredder, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/effect/floor_decal/corner/dark_green{ + dir = 6 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/atm{ + dir = 4; + pixel_x = 16 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_two) "sPI" = ( /obj/effect/floor_decal/corner/red/full{ dir = 1 @@ -131559,16 +131764,15 @@ /area/centcom/legion/hangar5) "sUN" = ( /obj/structure/table/wood, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 +/obj/item/folder/purple{ + pixel_x = -3 }, -/obj/machinery/librarycomp/public{ - pixel_y = 7 +/obj/item/folder/red{ + pixel_x = 3; + pixel_y = 2 }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/item/device/radio/intercom/west, +/turf/simulated/floor/carpet/red, /area/horizon/library) "sUS" = ( /obj/effect/floor_decal/industrial/warning{ @@ -133861,12 +134065,14 @@ }, /area/centcom/control) "toh" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/machinery/alarm/east, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/item/material/shard{ + icon_state = "small" + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "tol" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/grille/firedoor{ id = "hra" @@ -134131,6 +134337,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "tpW" = ( @@ -134299,10 +134506,9 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "tqU" = ( -/obj/effect/floor_decal/spline/plain/lime{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/seed_extractor, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/garden) "trc" = ( /obj/effect/floor_decal/industrial/hatch/red, @@ -135478,6 +135684,7 @@ /obj/machinery/door/airlock/glass{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "tyX" = ( @@ -135659,15 +135866,15 @@ }, /area/antag/ninja) "tzZ" = ( -/obj/structure/disposalpipe/junction/yjunction, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/horizon/hallway/deck_two/fore) +/area/hallway/primary/central_two) "tAd" = ( /obj/effect/floor_decal/spline/fancy{ dir = 10 @@ -137112,6 +137319,14 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_three/primary/central) +"tLc" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate, +/obj/random/loot, +/obj/random/contraband, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/wing/cargo_compartment) "tLq" = ( /obj/effect/floor_decal/corner_wide/purple/full{ dir = 4 @@ -137813,7 +138028,9 @@ /obj/machinery/camera/network/service{ c_tag = "Service - Hydroponics 1" }, -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/closet/walllocker/medical/firstaid{ + pixel_y = 32 + }, /turf/simulated/open, /area/horizon/hydroponics) "tQl" = ( @@ -137846,14 +138063,12 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "tQG" = ( -/obj/structure/table/wood, -/obj/item/toy/desk/officetoy, -/obj/random/pottedplant_small{ - pixel_x = 7; - pixel_y = 9 +/obj/effect/floor_decal/industrial/outline/service, +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/power/outlet, -/turf/simulated/floor/carpet/red, +/obj/machinery/lapvend, +/turf/simulated/floor/tiled/dark/full, /area/horizon/library) "tQM" = ( /obj/structure/tank_wall/nitrous_oxide{ @@ -138291,9 +138506,8 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room/turbine) "tTI" = ( -/obj/effect/floor_decal/corner/dark_green/diagonal, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/wing/cargo_compartment) "tTJ" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, @@ -139421,12 +139635,11 @@ /turf/simulated/floor/carpet/rubber, /area/server) "ucm" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 5 - }, -/obj/structure/table/rack/retail_shelf, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate, +/obj/random/loot, +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/wing/cargo_compartment) "ucp" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -141460,8 +141673,7 @@ /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/dark_monotile, /area/antag/actor) @@ -142925,20 +143137,17 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "uAP" = ( -/obj/structure/table/wood, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 +/obj/structure/disposalpipe/segment{ + icon_state = "pipe-c" }, -/obj/item/toy/desk/fan{ - pixel_x = -6; - pixel_y = 15 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/random/pottedplant_small{ - pixel_x = 12; - pixel_y = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/commissary) "uAQ" = ( /obj/machinery/light/small{ dir = 8 @@ -144472,7 +144681,24 @@ /turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/buffet) "uLY" = ( -/turf/simulated/floor/carpet/brown, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/turf/simulated/floor/wood, /area/horizon/library) "uMi" = ( /obj/effect/floor_decal/spline/plain{ @@ -144592,7 +144818,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/spline/plain/lime{ dir = 8 }, /turf/simulated/floor/tiled, @@ -145024,17 +145250,10 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "uRh" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/structure/table/wood, -/obj/item/device/paicard, -/obj/item/paper_scanner, -/obj/item/device/toner, -/obj/item/stack/packageWrap, -/obj/item/device/destTagger, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/seed_storage/garden, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/hydroponics/garden) "uRq" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/ppflowers, @@ -146890,21 +147109,13 @@ /turf/simulated/floor/tiled/white, /area/rnd/test_range) "veq" = ( -/obj/structure/table/reinforced/wood, -/obj/machinery/door/window/desk/eastleft{ - name = "Library Desk"; - req_access = list(37) - }, +/obj/machinery/smartfridge/secure, /obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "shutters_deck2_librarydesk"; - name = "Library Shutters"; - opacity = 0 + dir = 4; + id = "horizon_commissary_desk" }, -/turf/simulated/floor/wood, -/area/horizon/library) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/commissary) "ver" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -147024,13 +147235,25 @@ /turf/simulated/floor/tiled/full, /area/maintenance/substation/engineering) "veZ" = ( -/obj/machinery/light, -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 +/obj/structure/table/rack/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/stool/chair/folding{ + pixel_y = 13 }, -/obj/structure/table/rack/retail_shelf, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/item/material/stool/chair/folding{ + pixel_y = 13 + }, +/obj/item/material/stool/chair/folding{ + pixel_y = 13 + }, +/obj/item/material/stool/chair/folding{ + pixel_y = 13 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "vfa" = ( /obj/structure/railing/mapped{ dir = 8 @@ -147198,24 +147421,19 @@ }, /area/centcom/legion) "vgq" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 8 +/obj/effect/floor_decal/spline/plain/lime{ + dir = 9 }, -/obj/effect/landmark/start{ - name = "Librarian" - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/machinery/button/remote/blast_door{ +/obj/structure/disposalpipe/segment{ dir = 1; - id = "shutters_deck2_librarydesk"; - name = "Desk Shutter"; - pixel_y = 32; - req_access = list(37) + icon_state = "pipe-c" }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/commissary) "vgr" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge/aibunker) @@ -147329,6 +147547,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "vhf" = ( @@ -147373,6 +147594,10 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_two) "vhJ" = ( @@ -147979,8 +148204,7 @@ "vmK" = ( /obj/item/modular_computer/console/preset/civilian, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/marble, /area/antag/wizard) @@ -148419,9 +148643,15 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/vending/cola, -/obj/effect/floor_decal/industrial/hatch/grey, -/turf/simulated/floor/tiled/full, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/random/pottedplant_small{ + pixel_x = -4; + pixel_y = 6 + }, +/turf/simulated/floor/wood, /area/horizon/hallway/deck_two/fore) "vpq" = ( /obj/machinery/light{ @@ -148728,10 +148958,22 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/engine_room/rust) "vrw" = ( -/obj/structure/bed/stool/chair/sofa/corner/convex/red{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/carpet/red, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood, /area/horizon/library) "vrH" = ( /obj/structure/curtain/open/shower/security, @@ -149208,20 +149450,28 @@ /turf/unsimulated/floor/plating, /area/shuttle/transport1) "vvu" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/table/rack/retail_shelf, +/obj/random/loot{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/machinery/light/small{ dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/random/loot{ + pixel_x = -7; + pixel_y = 12 }, -/obj/machinery/requests_console/east{ - department = "Library"; - departmentType = 1; - name = "Library Requests Console" +/obj/random/loot{ + pixel_x = -7; + pixel_y = -2 }, -/turf/simulated/floor/wood, -/area/horizon/library) +/obj/random/loot{ + pixel_x = 8; + pixel_y = -2 + }, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/commissary) "vvv" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 9 @@ -149244,13 +149494,15 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/structure/disposalpipe/junction/yjunction, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "vvG" = ( @@ -149768,14 +150020,28 @@ /turf/simulated/floor/tiled/white, /area/rnd/conference) "vzs" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/table/reinforced/steel, +/obj/machinery/camera/network/service{ + c_tag = "Second Deck - Commissary Backroom"; + dir = 1 + }, +/obj/item/paper_bin{ + pixel_y = 5; + pixel_x = -3 + }, +/obj/item/pen/black{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/random/lavalamp{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/machinery/light/small{ dir = 8 }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/horizon/library) +/turf/simulated/floor/tiled/dark/full, +/area/horizon/commissary) "vzu" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -150764,7 +151030,10 @@ /turf/simulated/floor/tiled/full, /area/operations/storage) "vFP" = ( -/obj/effect/floor_decal/spline/fancy/wood/corner, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/bed/stool/bar/padded/red{ + dir = 1 + }, /turf/simulated/floor/wood, /area/horizon/library) "vFQ" = ( @@ -151491,6 +151760,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "vNk" = ( @@ -151586,18 +151856,14 @@ /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) "vOy" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/small/west, -/obj/machinery/light{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment{ + icon_state = "pipe-c" + }, /obj/effect/floor_decal/spline/plain/lime{ - dir = 4 + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/garden) @@ -151732,16 +151998,7 @@ /turf/space/dynamic, /area/template_noop) "vPz" = ( -/obj/machinery/hologram/holopad, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/horizon/library) "vPA" = ( @@ -151758,12 +152015,28 @@ /turf/template_noop, /area/horizon/grauwolf) "vPJ" = ( -/obj/structure/bed/stool/chair/office/dark, -/obj/machinery/firealarm/west, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/table/wood, +/obj/machinery/power/outlet, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 13 + }, +/obj/item/paper/crumpled{ + pixel_x = -8; + pixel_y = 7 + }, +/obj/item/toy/desk/fan{ + pixel_x = -1; + pixel_y = -6 + }, +/obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/red, /area/horizon/library) "vPK" = ( /obj/structure/disposalpipe/segment{ @@ -151884,13 +152157,10 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "vQE" = ( -/obj/effect/floor_decal/spline/plain/corner{ - dir = 8 - }, /obj/effect/floor_decal/corner/dark_green{ dir = 9 }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/spline/plain/lime{ dir = 8 }, /turf/simulated/floor/tiled, @@ -152224,16 +152494,12 @@ /turf/simulated/floor/plating, /area/horizon/maintenance/deck_three/aft/starboard) "vTj" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/bed/stool/chair/padded/brown{ +/obj/structure/bed/stool/chair/sofa/corner/convex/red{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/item/device/radio/intercom/west, +/obj/structure/engineer_maintenance/pipe/wall, +/turf/simulated/floor/carpet/red, /area/horizon/library) "vTk" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -153648,11 +153914,11 @@ /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "wdB" = ( -/obj/machinery/vending/coffee, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/machinery/vending/mredispenser, /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_one) "wdM" = ( @@ -156906,9 +157172,11 @@ /turf/unsimulated/floor/plating, /area/centcom/legion/hangar5) "wBa" = ( -/obj/machinery/vending/zora, -/obj/effect/floor_decal/industrial/hatch/grey, -/turf/simulated/floor/tiled/full, +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/effect/floor_decal/spline/plain/lime{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "wBd" = ( /obj/effect/floor_decal/corner/dark_green{ @@ -157256,13 +157524,12 @@ /turf/unsimulated/floor, /area/centcom/bar) "wDC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/obj/effect/floor_decal/corner/dark_green/diagonal, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/horizon/library) "wDF" = ( /obj/machinery/recharge_station, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -158159,10 +158426,23 @@ /turf/simulated/open, /area/horizon/security/investigations_hallway) "wJF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, -/obj/machinery/alarm/east, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "wJJ" = ( @@ -158280,6 +158560,10 @@ }, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) +"wKI" = ( +/obj/structure/bookcase/libraryspawn/religion, +/turf/simulated/floor/tiled/dark/full, +/area/horizon/library) "wKO" = ( /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Supermatter Reactor Monitoring"; @@ -158886,12 +159170,10 @@ /turf/simulated/floor/tiled/dark, /area/horizon/holodeck_control/beta) "wOx" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, -/obj/structure/table/rack/retail_shelf, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/tiled/dark/full, +/area/maintenance/wing/cargo_compartment) "wOB" = ( /obj/machinery/porta_turret, /obj/effect/floor_decal/industrial/warning/full, @@ -159473,13 +159755,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/security/checkpoint) -"wSf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/corner/dark_green/diagonal, -/turf/simulated/floor/tiled, -/area/horizon/commissary) "wSl" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/reinforced, @@ -160737,11 +161012,9 @@ /area/horizon/bar) "xbx" = ( /obj/machinery/firealarm/west, -/obj/machinery/alarm/north{ - req_one_access = list(24,11,55) - }, /obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/portable_atmospherics/hydroponics/soil, +/obj/structure/engineer_maintenance/electric/wall, /turf/simulated/floor/grass/no_edge, /area/horizon/hydroponics/garden) "xbz" = ( @@ -161734,12 +162007,12 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "xig" = ( -/obj/machinery/alarm/north, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/horizon/commissary) +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/wing/cargo_compartment) "xij" = ( /obj/machinery/power/smes/buildable/horizon_shuttle{ RCon_tag = "Spark" @@ -162122,9 +162395,13 @@ /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "xkF" = ( -/obj/machinery/vending/coffee, -/obj/effect/floor_decal/industrial/hatch/grey, -/turf/simulated/floor/tiled/full, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/structure/bed/stool/chair/padded/red{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/horizon/hallway/deck_two/fore) "xkG" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -162290,17 +162567,26 @@ /turf/simulated/floor/exoplanet/barren/raskara, /area/centcom/shared_dream) "xlx" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "shutters_deck2_librarydesk"; - name = "Library Shutters"; - opacity = 0 +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/glass_mining{ + dir = 4; + name = "Commissary Backroom"; + req_one_access = list(26,29,31,48,67,35,25,28,37) }, /turf/simulated/floor/tiled/dark/full, -/area/horizon/library) +/area/horizon/commissary) "xlA" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -163488,8 +163774,7 @@ dir = 9 }, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/dark, /area/antag/actor) @@ -166733,8 +167018,7 @@ /obj/item/crowbar, /obj/structure/table/rack, /obj/machinery/light/small{ - dir = 8; - must_start_working = 1 + dir = 8 }, /turf/unsimulated/floor/marble, /area/antag/wizard) @@ -167328,10 +167612,24 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "xWB" = ( -/obj/structure/bed/stool/chair/padded/brown{ +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/carpet/red, +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/horizon/library) "xWF" = ( /obj/effect/floor_decal/corner_wide/lime/diagonal, @@ -167786,6 +168084,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/hallway/deck_two/fore) @@ -169355,13 +169654,30 @@ /turf/simulated/floor/plating, /area/engineering/smes/rust) "yjx" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8"; + d1 = 4; + d2 = 8 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/seed_storage/garden, -/turf/simulated/floor/tiled/dark, -/area/horizon/hydroponics/garden) +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/glass_service{ + dir = 8; + name = "Library" + }, +/turf/simulated/floor/tiled/full, +/area/horizon/library) "yjB" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/effect/floor_decal/spline/plain{ @@ -169650,12 +169966,8 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/shuttle/burglar) "ylt" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/obj/machinery/light, -/obj/random/pottedplant, -/turf/simulated/floor/wood, +/obj/structure/bookcase/libraryspawn/reference, +/turf/simulated/floor/tiled/dark/full, /area/horizon/library) "ylx" = ( /obj/machinery/door/firedoor{ @@ -255499,9 +255811,9 @@ bNt usX sbX mCW -fID -fID -fID +kHW +kHW +kHW jaw jjj eSV @@ -255756,9 +256068,9 @@ bNt obB mNY sDO -fID -mbi +kHW mbi +aqf ooS vUJ eSV @@ -256011,11 +256323,11 @@ bNt bNt bNt wBC -bvS -amF +mNY +pfA nkM -rFv -fBC +hJm +hJm qfg jaw jjj @@ -256270,9 +256582,9 @@ gef eCN jij grI -fID +kHW xig -rMk +hJm cyE ooS vUJ @@ -256527,11 +256839,11 @@ gef wrL ixE rbP -fID -aeT +kHW +kHW hNq -rMk -fID +kHW +kHW jaw jjj eSV @@ -256784,11 +257096,11 @@ gef hHn cNr nZP -fID +kHW bXs -nth +hJm jbY -fID +nth ooS vUJ eSV @@ -257041,12 +257353,12 @@ uOG jZU hYV vZG -kJh -kqC -aJW +kHW +tLc +hJm aJW aqf -fID +kHW hUd jjj eSV @@ -257298,12 +257610,12 @@ rvG hHn rCo vsJ -kJh -ucm -tTI +kHW +iEs +hJm tTI wOx -fID +kHW aCd vUJ eSV @@ -257555,12 +257867,12 @@ gef kRU fPX nAh -kJh -ucm +kHW +nLv +oWl tTI -tTI -wOx -fID +kqC +kHW pYz hUd jjj @@ -257812,13 +258124,13 @@ sTH oeR ozd pfA -kJh +kHW ucm -hJm +jOy fVt rZR -fID -fID +kHW +kHW ooS vUJ eSV @@ -258068,13 +258380,13 @@ pDT cfc eac aXK -qrF -nNi -kHW -wDC -wSf +eXu +auv +jvI +cRr +jbY veZ -fID +kHW tvh wyO gag @@ -258326,12 +258638,12 @@ mFQ lvG rYl mHK -fID +kHW hdF toh rQk fmh -fID +kHW rqy iho bYo @@ -267319,10 +267631,10 @@ akX rrL kdm aWG -dXg +htE +eyu wnM -oMu -dXg +nuw wlx wtG uio @@ -267577,18 +267889,18 @@ rrL gvi igT xWA -pRg +xWA vhd xWA wxR kYs -jvu +vQE vQE uNr jvu -jvu -jvu -jvu +dXg +dXg +dXg jgM ibE qBj @@ -267834,7 +268146,7 @@ vNj tyW tpU lWM -tzZ +idI xZF idI paT @@ -268084,14 +268396,14 @@ mUW aJf mWc saN -saN +tzZ kJg vhG rrL gvi igT +oMu xWA -pRg miG xWA jAO @@ -268338,18 +268650,18 @@ ePj hjd jna nSy -lFh -rbI -lFh hwH +rbI +fjb lFh +sPD lFh nhp kdm pLo wJF fNE -cdk +fNE grK gcr wtG @@ -268594,17 +268906,17 @@ lHh xGE cGg cBm -dLA -dLA -nML -nML -dLA -nML +fID +fID +kJh nML +kJh +fID +fID dLA dLA -dLA -dLA +fbW +yjx fbW dLA dLA @@ -268851,16 +269163,16 @@ dTq pMj tmE oiJ -dLA +fID lrU oSE -bLe +nNi dpr rod -vrw +fID vTj -dLA -fSC +cdk +bLe xWB ePD vPJ @@ -269108,19 +269420,19 @@ dIX wJA mOg xPN -nML +kJh rMu -aZp +rFv qhY -qAT -tQG -iEs -jZD -dLA +rUC +rMu +ajt +aZp +pRg kUJ eDA cWL -app +cWL cfO mqM dcJ @@ -269364,10 +269676,10 @@ nKf nKf jKr vvy -nLv -kzq -iUV -ajt +gEi +kJh +rMu +rFv euv rUC pnT @@ -269375,7 +269687,7 @@ ajt rLv dda jPM -ajt +vrw vPz app qZA @@ -269622,20 +269934,20 @@ hrx xGE akU gEi -nML +fID kPM -eQi +kzq qrM cPO rge -sPD +fID hUX -dLA +wDC hFV aNQ eEp vFP -ylt +fBC bSl iRz cwL @@ -269879,20 +270191,20 @@ eKC vQP sZQ hpE -dLA +fID xlx veq -xlx +rMk qOl -dLA -xlx -xlx -dLA +fID +fID +aeT +amF pTJ uLY pvi -fjb -bSl +vFP +iUV bSl gfa nUI @@ -270136,21 +270448,21 @@ iYO vQP sZQ gEi -htE +kJh uAP vgq nGl iqe vzs -uRh +fID gBU -dLA +qAT hws -uLY +dSp mUd -eyu +jZD +ylt bSl -nuw tqU szn bEb @@ -270393,22 +270705,22 @@ jYj vQP sZQ gEi -htE +kJh ghu sew jEM qoC vvu -bWy +fID rsj -dLA +bvS cTe clL eQi gpI +wKI bSl -yjx -tqU +uRh szn fAA wNc @@ -270650,21 +270962,21 @@ aSD xGE cTB auG -dLA -dLA -dLA -dLA -dLA -dLA -dLA +fID +fID +fID +fID +bOh +fID +fID dLA dLA dLA dLA kqH qST +tQG bSl -dSp agn vOy cdC @@ -270919,13 +271231,13 @@ wNq pFY dLA dLA +fSC dLA bSl bSl kGy bSl bSl -bSl cpI aAS vpV @@ -271175,9 +271487,9 @@ efg efg fqP wNq -bOh wNq wNq +qrF wNq wNq wNq @@ -272470,7 +272782,7 @@ lFt lZJ cpI aOk -hNk +bWy xjw ava hNk