From 291d7af747d10f0c15f2816a8c42a1a8de935ac0 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 14:16:27 +0100 Subject: [PATCH 01/59] basic layout for missing rooms and full cryo/bitrunning den --- _maps/map_files/KiloStation/KiloStation.dmm | 1699 +++++++++---------- 1 file changed, 845 insertions(+), 854 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 438b1f6035e7..5c04598c604f 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -323,11 +323,6 @@ /obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/space/nearstation) -"acZ" = ( -/obj/structure/flora/grass/jungle/a/style_random, -/obj/structure/flora/bush/ferny/style_random, -/turf/open/misc/asteroid, -/area/space/nearstation) "add" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/lavendergrass/style_random, @@ -1556,6 +1551,16 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"awB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "awG" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -1908,6 +1913,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "aDD" = ( @@ -2284,7 +2292,6 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "aLC" = ( -/obj/machinery/computer/pandemic, /obj/effect/turf_decal/delivery, /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -4513,14 +4520,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/duct, -/obj/machinery/door/airlock{ - name = "Kitchen" - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -4531,7 +4534,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/iron/dark, /area/station/service/kitchen) "bDu" = ( @@ -4629,14 +4631,9 @@ /turf/open/floor/iron/white, /area/station/security/prison/mess) "bFm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/cryopod, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "bFu" = ( /obj/structure/cable, /turf/closed/wall/rust, @@ -5137,10 +5134,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/window/left/directional/south{ - name = "Kitchen Access"; - req_access = list("kitchen") - }, /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/department/bridge) @@ -6177,6 +6170,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"chC" = ( +/obj/machinery/computer/order_console/bitrunning, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/storage) "chD" = ( /turf/closed/wall, /area/station/ai_monitored/turret_protected/aisat/foyer) @@ -6610,11 +6609,7 @@ /obj/effect/turf_decal/arrows, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, +/obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) "cmc" = ( @@ -7848,9 +7843,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/structure/chair{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -8085,15 +8077,6 @@ /obj/machinery/modular_computer/console/preset/id{ dir = 1 }, -/obj/machinery/button/door/directional/east{ - id = "qmprivacy"; - name = "Privacy Shutters Control"; - pixel_y = 38; - req_access = list("qm") - }, -/obj/machinery/keycard_auth/directional/east{ - pixel_y = 26 - }, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/qm) "cRW" = ( @@ -8117,25 +8100,21 @@ "cSl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/north, -/obj/machinery/chem_mass_spec, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/machinery/component_printer{ + pixel_y = 10 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) "cSq" = ( -/obj/structure/flora/rock/pile/style_random{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 - }, -/turf/open/misc/asteroid, -/area/space/nearstation) +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "cSJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8165,10 +8144,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/hallway/primary/aft) -"cTk" = ( -/obj/machinery/duct, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "cTz" = ( /obj/machinery/computer/pod/old/mass_driver_controller/chapelgun{ pixel_x = 30 @@ -8211,6 +8186,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) "cTY" = ( @@ -8453,25 +8429,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) -"cXd" = ( -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "cXg" = ( /obj/structure/railing, /obj/effect/turf_decal/bot, @@ -8674,6 +8631,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +"daT" = ( +/obj/machinery/byteforge, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "dbi" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -8734,13 +8697,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"dch" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/misc/asteroid, -/area/space/nearstation) "dcl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -9896,14 +9852,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"dsJ" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron/checker, -/area/station/service/hydroponics) "dtb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/closed/wall/r_wall, @@ -10179,10 +10127,6 @@ "dyj" = ( /turf/closed/wall/rust, /area/station/security/checkpoint/supply) -"dyu" = ( -/obj/structure/flora/bush/jungle/b, -/turf/open/misc/asteroid, -/area/space/nearstation) "dyC" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -10984,6 +10928,11 @@ }, /obj/structure/cable, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "dNL" = ( @@ -12153,11 +12102,8 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "ejQ" = ( -/obj/structure/flora/grass/jungle/a/style_random, -/obj/structure/flora/bush/ferny/style_random, -/obj/effect/decal/cleanable/dirt, -/turf/open/misc/asteroid, -/area/space/nearstation) +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "ejU" = ( /obj/structure/cable, /turf/open/floor/circuit/green{ @@ -12175,6 +12121,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +"ejY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "eki" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, @@ -12661,6 +12614,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) +"erE" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/storage) "erH" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, @@ -13228,11 +13185,13 @@ dir = 8 }, /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "eBQ" = ( @@ -13524,6 +13483,7 @@ dir = 9 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "eHI" = ( @@ -13673,13 +13633,13 @@ /area/station/engineering/supermatter/room) "eJy" = ( /obj/machinery/door/airlock/maintenance{ - name = "Mining Dock Maintenance" + name = "Bitrunning Den Maintenance" }, /obj/structure/cable, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron/dark, -/area/station/cargo/miningoffice) +/area/station/bitrunning/den) "eJE" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -13826,7 +13786,7 @@ "eMo" = ( /obj/structure/sign/departments/evac, /turf/closed/wall, -/area/station/maintenance/department/cargo) +/area/station/hallway/secondary/exit/departure_lounge) "eMr" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, @@ -14037,15 +13997,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/space/basic, /area/space/nearstation) -"eQg" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id = "virologysurgery"; - name = "Virology Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/medical/virology) "eQj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -14531,17 +14482,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "eYS" = ( -/obj/effect/turf_decal/loading_area, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) +/obj/machinery/netpod, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/bitrunning/den) "eZa" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -15591,6 +15534,7 @@ "fpG" = ( /obj/structure/cable, /obj/effect/decal/cleanable/cobweb, +/obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/plating, /area/station/maintenance/department/bridge) "fpQ" = ( @@ -16295,10 +16239,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/service/chapel) -"fyS" = ( -/obj/item/storage/box/lights/mixed, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "fyZ" = ( /obj/structure/chair/office/light{ dir = 4 @@ -16808,14 +16748,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - name = "virology sorting disposal pipe" - }, -/obj/effect/mapping_helpers/mail_sorting/medbay/virology, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/virology) "fHj" = ( @@ -16830,11 +16768,11 @@ /area/station/hallway/primary/aft) "fHw" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/table_or_rack, -/obj/effect/spawner/random/trash/bucket, -/obj/effect/spawner/random/trash/janitor_supplies, /obj/machinery/light/small/directional/north, -/turf/open/floor/plating, +/obj/machinery/icecream_vat, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/bot/right, +/turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "fHZ" = ( /obj/structure/table, @@ -17324,6 +17262,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/space/nearstation) +"fOk" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "fOt" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -17531,6 +17475,12 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron, /area/station/cargo/storage) "fRp" = ( @@ -17582,6 +17532,15 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"fRZ" = ( +/obj/machinery/computer/quantum_console, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 6 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "fSa" = ( /obj/docking_port/stationary{ area_type = /area/station/construction/mining/aux_base; @@ -17727,18 +17686,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"fUP" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/red/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/service/bar/atrium) "fUQ" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/sign/warning/vacuum/external/directional/west, @@ -18094,6 +18041,8 @@ "gbs" = ( /obj/effect/spawner/random/trash/moisture_trap, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/bucket, +/obj/effect/spawner/random/trash/janitor_supplies, /turf/open/floor/plating, /area/station/maintenance/department/bridge) "gbB" = ( @@ -18264,14 +18213,10 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "geO" = ( -/obj/structure/table/optable, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /turf/open/floor/iron/showroomfloor, /area/station/medical/virology) "geV" = ( @@ -18527,9 +18472,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tcomms) -"giT" = ( -/turf/open/floor/plating, -/area/station/maintenance/starboard) "giU" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -18556,9 +18498,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, @@ -20030,9 +19969,10 @@ "gHI" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/supply/qm, -/obj/machinery/door/airlock/command{ +/obj/machinery/door/airlock/mining/glass{ name = "Quartermaster's Office" }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/qm) "gIo" = ( @@ -20293,14 +20233,6 @@ /mob/living/basic/mining/legion, /turf/open/floor/plating, /area/station/cargo/warehouse) -"gMA" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) "gMC" = ( /obj/machinery/suit_storage_unit/engine, /obj/effect/turf_decal/delivery, @@ -20605,6 +20537,14 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"gRN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/shaft_miner, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/effect/turf_decal/tile/yellow, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "gRP" = ( /obj/item/kirbyplants/random, /obj/machinery/status_display/ai/directional/south, @@ -20979,6 +20919,11 @@ /obj/item/flashlight/flare, /obj/machinery/light/small/directional/west, /obj/structure/sign/poster/contraband/random/directional/west, +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/obj/effect/spawner/random/maintenance, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/station/maintenance/starboard) "gXX" = ( @@ -21274,6 +21219,19 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/station/service/library) +"hej" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "hev" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -21367,22 +21325,20 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) "hgc" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #2" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/bitrunner, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/airalarm/directional/north, -/obj/machinery/light/small/directional/north, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #2"; - suffix = "#2" +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_half, +/area/station/bitrunning/den) "hgf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21498,6 +21454,14 @@ }, /turf/open/floor/iron/dark, /area/station/medical/virology) +"hin" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/effect/turf_decal/tile/yellow, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "hiQ" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21621,10 +21585,8 @@ /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) "hjL" = ( -/obj/machinery/door/firedoor, /obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/iron/dark, +/turf/open/floor/iron, /area/station/cargo/storage) "hjZ" = ( /obj/machinery/door/morgue{ @@ -22538,7 +22500,6 @@ dir = 1 }, /obj/structure/noticeboard/directional/south, -/obj/effect/landmark/start/hangover, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "hxw" = ( @@ -22864,12 +22825,17 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/office) "hDa" = ( +/obj/structure/cable, /obj/structure/disposalpipe/segment{ - dir = 9 + dir = 4 }, -/obj/structure/cable, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/area/station/hallway/secondary/exit/departure_lounge) "hDy" = ( /obj/structure/grille/broken, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22990,17 +22956,9 @@ /turf/open/misc/asteroid, /area/station/maintenance/aft) "hEH" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/disposal/bin, /obj/machinery/light/directional/east, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/iron/dark, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) "hEI" = ( /obj/machinery/pdapainter/medbay, @@ -23103,9 +23061,6 @@ /obj/structure/extinguisher_cabinet/directional/south{ pixel_x = 26 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -24655,6 +24610,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/security/execution/transfer) +"icX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/shaft_miner, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/effect/turf_decal/tile/yellow, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "idh" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; @@ -26077,9 +26042,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"iyI" = ( -/turf/closed/wall, -/area/station/medical/virology) "iyM" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26115,15 +26077,14 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "izu" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/east, /obj/structure/cable, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) +/turf/open/floor/iron/dark/textured_half, +/area/station/bitrunning/den) "izv" = ( /obj/structure/closet{ name = "chapel locker" @@ -26492,6 +26453,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/mob/living/basic/sloth/citrus, /turf/open/floor/iron, /area/station/cargo/storage) "iFI" = ( @@ -27694,19 +27656,11 @@ }, /area/station/service/chapel/monastery) "iYf" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/virology{ - name = "Operating Theater B" - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/iron/dark, /area/station/medical/virology) "iYj" = ( @@ -27762,18 +27716,8 @@ /turf/open/floor/iron/dark, /area/station/medical/virology) "iYI" = ( -/obj/effect/turf_decal/arrows, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) +/turf/closed/wall, +/area/station/bitrunning/den) "iYS" = ( /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/caution/stand_clear, @@ -28057,15 +28001,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/dark, /area/station/service/chapel) -"jdR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - dir = 1; - id = "virologysurgery"; - name = "Virology Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/medical/virology) "jdW" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -28277,16 +28212,10 @@ /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "jgI" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate, -/obj/item/clothing/shoes/jackboots{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/cowboy/black, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/cryopod, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "jgN" = ( /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) @@ -28768,19 +28697,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"jqJ" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/obj/item/clothing/head/utility/chefhat{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/kitchen/rollingpin{ - pixel_x = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "jqS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -29068,12 +28984,21 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "jwu" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/stripes/corner, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, /area/station/cargo/storage) "jwV" = ( /turf/closed/wall/r_wall/rust, @@ -29365,12 +29290,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"jCZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/insectguts, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/bridge) "jDs" = ( /obj/structure/table, /obj/item/razor, @@ -29544,9 +29463,6 @@ /obj/machinery/firealarm/directional/west, /obj/item/radio/intercom/directional/north, /obj/machinery/pdapainter/supply, -/obj/machinery/byteforge{ - pixel_y = 14 - }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/qm) "jGt" = ( @@ -30405,18 +30321,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "jUi" = ( -/obj/structure/table, -/obj/item/tank/internals/anesthetic{ - pixel_x = -5 - }, -/obj/item/tank/internals/anesthetic{ - pixel_x = -5 - }, /obj/machinery/vending/wallmed/directional/north{ pixel_x = -32 }, /obj/machinery/light/directional/north, -/obj/item/storage/backpack/duffelbag/med/surgery, /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -30787,18 +30695,17 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "kaX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/shaft_miner, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/effect/turf_decal/tile/yellow, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, /turf/open/floor/iron, -/area/station/cargo/miningoffice) -"kbc" = ( -/obj/structure/sign/poster/random/directional/north, -/obj/effect/spawner/random/structure/steam_vent, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/bridge) +/area/station/cargo/storage) "kbf" = ( /obj/machinery/light/directional/east, /obj/machinery/status_display/ai/directional/east, @@ -30859,11 +30766,8 @@ /turf/open/floor/plating, /area/station/security/prison) "kbT" = ( -/obj/structure/closet/secure_closet/hydroponics, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/machinery/newscaster/directional/south, -/obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron/checker, /area/station/service/hydroponics) @@ -30920,6 +30824,11 @@ pixel_x = 6 }, /obj/effect/turf_decal/stripes/corner, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/machinery/door/airlock{ + name = "Kitchen" + }, +/obj/machinery/door/firedoor, /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) @@ -31248,6 +31157,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "kkc" = ( @@ -32961,13 +32873,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/central) -"kPt" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable, -/obj/structure/lattice/catwalk, -/obj/effect/decal/cleanable/dirt, -/turf/open/misc/asteroid, -/area/space/nearstation) "kPv" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -33029,6 +32934,25 @@ /obj/effect/spawner/random/clothing/kittyears_or_rabbitears, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"kQq" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #1" + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #2"; + suffix = "#2" + }, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) "kQH" = ( /obj/machinery/skill_station, /obj/effect/turf_decal/box, @@ -33092,6 +33016,16 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/command/gateway) +"kRf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/mining/glass{ + name = "Bitrunning Den" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/bitrunning/den) "kRu" = ( /obj/effect/turf_decal/siding/blue, /obj/structure/disposalpipe/segment{ @@ -33584,6 +33518,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) "kZx" = ( @@ -33713,12 +33648,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"laE" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plating, -/area/station/maintenance/department/bridge) "laH" = ( /obj/structure/table/wood/fancy, /obj/item/storage/fancy/candle_box, @@ -33972,14 +33901,13 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "lfu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/computer/cryopod{ + dir = 4; + pixel_x = -32 }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) +/obj/machinery/cryopod, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "lfz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -36208,6 +36136,11 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/station/security/processing) +"lRW" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall, +/area/station/bitrunning/den) "lRZ" = ( /obj/machinery/door/airlock/external{ name = "Abandoned External Airlock" @@ -36245,6 +36178,10 @@ }, /turf/open/floor/plating, /area/station/cargo/warehouse) +"lSF" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) "lTc" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -36851,11 +36788,8 @@ /area/station/hallway/primary/starboard) "mej" = ( /obj/structure/cable, -/obj/machinery/icecream_vat, -/obj/effect/turf_decal/bot/right, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "mes" = ( @@ -37479,17 +37413,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/engineering/atmos) -"mnG" = ( -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/virology{ - name = "Virology Access" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "viro-airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/virology, -/turf/open/floor/iron/dark, -/area/station/medical/virology) "mnK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -37632,6 +37555,12 @@ /obj/structure/cable/layer1, /turf/open/floor/engine, /area/station/engineering/gravity_generator) +"mqO" = ( +/obj/item/kirbyplants{ + icon_state = "plant-05" + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "mqU" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -37870,13 +37799,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) -"mvm" = ( -/obj/effect/turf_decal/arrows, -/obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/cargo/storage) "mvz" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -38081,10 +38003,9 @@ /turf/open/floor/iron, /area/station/security/prison/garden) "mza" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/sign/poster/random/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/department/bridge) +/obj/structure/closet/secure_closet/hydroponics, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "mzp" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -38102,7 +38023,6 @@ /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/wardrobe/hydro_wardrobe, -/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron/checker, /area/station/service/hydroponics) @@ -38462,6 +38382,21 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/maintenance/port/fore) +"mFO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/bitrunner, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_half, +/area/station/bitrunning/den) "mFQ" = ( /obj/structure/chair/sofa/bench{ dir = 4 @@ -38598,16 +38533,24 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "mIe" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) "mIo" = ( @@ -39420,7 +39363,6 @@ "mVP" = ( /obj/effect/turf_decal/arrows, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, /obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -39431,6 +39373,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron, /area/station/cargo/storage) "mWg" = ( @@ -39848,9 +39791,16 @@ /turf/open/floor/iron, /area/station/cargo/storage) "ncQ" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, /turf/open/floor/iron, /area/station/cargo/storage) "ncS" = ( @@ -40230,9 +40180,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/detectives_office) -"nlR" = ( -/turf/closed/wall/rust, -/area/station/medical/virology) "nmo" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 @@ -40615,15 +40562,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"nsA" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "Shower_1Privacy"; - name = "Shower 1 Privacy Shutter" - }, -/turf/open/floor/plating, -/area/station/commons/toilet/restrooms) "nsM" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -42011,6 +41949,7 @@ /obj/effect/turf_decal/siding/white{ dir = 1 }, +/obj/effect/landmark/start/hangover, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "nSq" = ( @@ -42039,14 +41978,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) -"nTd" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) "nTo" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating/airless, @@ -42116,14 +42047,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) -"nTK" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/bridge) "nUf" = ( /obj/machinery/newscaster/directional/north, /obj/item/kirbyplants/random, @@ -42195,6 +42118,13 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/psychology) +"nXg" = ( +/obj/machinery/quantum_server, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/bot/left, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "nXp" = ( /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -42424,12 +42354,43 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating, /area/station/maintenance/fore) +"oaP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "obi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"obm" = ( +/obj/structure/table, +/obj/item/reagent_containers/spray/cleaner{ + pixel_y = 9 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -7; + pixel_y = 1 + }, +/obj/item/food/donkpocket/warm, +/obj/item/food/donkpocket/warm/teriyaki{ + pixel_x = -9; + pixel_y = -2 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "obq" = ( /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, @@ -42458,7 +42419,6 @@ /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, -/obj/item/storage/box/monkeycubes, /obj/item/reagent_containers/syringe/antiviral, /obj/item/reagent_containers/dropper, /obj/structure/reagent_dispensers/wall/virusfood/directional/south, @@ -42847,17 +42807,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/fore) -"oiK" = ( -/obj/effect/turf_decal/loading_area, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "oiO" = ( /turf/closed/wall/mineral/bronze, /area/station/maintenance/department/chapel) @@ -43049,7 +42998,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -43286,9 +43237,6 @@ /turf/open/floor/iron/smooth_large, /area/station/maintenance/department/chapel/monastery) "orD" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -44773,15 +44721,13 @@ /turf/open/space, /area/space) "oSX" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "oTd" = ( @@ -45090,26 +45036,13 @@ /turf/open/floor/engine, /area/station/engineering/gravity_generator) "oXK" = ( -/obj/structure/table, -/obj/item/hand_labeler, -/obj/item/crowbar/red, -/obj/item/gps/mining, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch/directional/north, -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/siding/thinplating_new/dark, /obj/structure/cable, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) +/turf/open/floor/iron/dark/textured_half, +/area/station/bitrunning/den) "oYc" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ @@ -45419,6 +45352,7 @@ "pdq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/department/bridge) "pdE" = ( @@ -45452,6 +45386,7 @@ dir = 4 }, /obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "pet" = ( @@ -46260,8 +46195,10 @@ /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/spawner/random/trash/food_packaging, -/turf/open/floor/plating, +/obj/machinery/food_cart, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/bot/right, +/turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "ppy" = ( /obj/structure/table/wood, @@ -46406,6 +46343,16 @@ }, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"prt" = ( +/obj/machinery/shower/directional/north, +/obj/item/soap/nanotrasen{ + pixel_x = 3; + pixel_y = -4 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/bot/left, +/turf/open/floor/iron/freezer, +/area/station/bitrunning/den) "prK" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -47042,7 +46989,6 @@ /area/station/command/heads_quarters/cmo) "pEc" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, /area/station/maintenance/department/bridge) @@ -47344,6 +47290,12 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) +"pJa" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "pJr" = ( /obj/machinery/iv_drip, /obj/structure/bed{ @@ -47417,7 +47369,6 @@ /obj/machinery/computer/cargo, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/east, /obj/machinery/requests_console/directional/north{ department = "Quartermaster's Desk"; name = "Quartermaster's Requests Console"; @@ -48801,15 +48752,14 @@ /turf/open/floor/plating, /area/station/hallway/primary/port) "qih" = ( -/obj/machinery/door/airlock/maintenance, /obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/cargo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "qij" = ( /obj/effect/turf_decal/box/corners, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -48930,23 +48880,23 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "qkq" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #1" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/the_griffin{ - pixel_y = 32 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/landmark/start/bitrunner, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #1"; - suffix = "#1" +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_half, +/area/station/bitrunning/den) "qks" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49077,19 +49027,6 @@ /obj/item/flashlight/lamp, /turf/open/floor/plating/plasma/rust, /area/station/maintenance/space_hut/plasmaman) -"qmg" = ( -/obj/machinery/door/window/right/directional/north{ - name = "Hydroponics Delivery Access"; - req_access = list("hydroponics") - }, -/obj/effect/turf_decal/delivery, -/obj/structure/plasticflaps/opaque, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=1"; - location = "Hydroponics" - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/bridge) "qms" = ( /obj/machinery/atmospherics/miner/n2o, /turf/open/floor/engine/n2o, @@ -49734,6 +49671,14 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) +"qxW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "qyn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, @@ -50933,21 +50878,19 @@ /turf/open/floor/plating, /area/station/service/bar/atrium) "qTJ" = ( -/obj/structure/closet/wardrobe/miner, -/obj/effect/turf_decal/delivery, -/obj/item/clothing/suit/hooded/wintercoat/miner, -/obj/item/clothing/suit/hooded/wintercoat/miner, -/obj/item/clothing/suit/hooded/wintercoat/miner, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/tile/brown/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_half, +/area/station/bitrunning/den) "qTY" = ( /obj/structure/table, /obj/item/surgical_drapes, @@ -51352,9 +51295,6 @@ "qZS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -52333,14 +52273,18 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) "rqL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/shaft_miner, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, /turf/open/floor/iron, -/area/station/cargo/miningoffice) +/area/station/cargo/storage) "rqV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -52732,13 +52676,15 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1; + name = "virology sorting disposal pipe" + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/virology, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "rvU" = ( @@ -53155,6 +53101,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "rDi" = ( @@ -53481,6 +53428,20 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/service/janitor) +"rIG" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/item/gps/mining, +/obj/structure/table, +/obj/item/crowbar/red, +/obj/item/hand_labeler, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "rIY" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -53879,10 +53840,6 @@ /turf/open/floor/iron, /area/station/commons/storage/primary) "rOX" = ( -/obj/machinery/hydroponics/constructable, -/obj/item/seeds/tower{ - pixel_y = -6 - }, /turf/open/floor/plating, /area/station/maintenance/department/bridge) "rPl" = ( @@ -53967,13 +53924,11 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/toy/talking/ai{ - pixel_x = -6; - pixel_y = -1 - }, /obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/blood/old, +/obj/item/toy/plush/lizard_plushie, /turf/open/floor/plating, -/area/station/maintenance/department/bridge) +/area/station/service/hydroponics) "rQx" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -54102,6 +54057,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/cargo/warehouse) +"rRF" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/bitrunning/den) "rRJ" = ( /obj/machinery/camera/directional/south{ c_tag = "Satellite External Fore"; @@ -54386,10 +54345,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"rYa" = ( -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "rYc" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall, @@ -54511,6 +54466,17 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/science/research) +"saP" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/mining/glass{ + name = "Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/cargo/miningoffice) "saW" = ( /turf/open/floor/iron/white, /area/station/security/prison/mess) @@ -54756,6 +54722,16 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"sdB" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "sdT" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -55004,14 +54980,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "sij" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Virology Maintenance" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/virology, -/turf/open/floor/iron/dark, +/turf/closed/wall/r_wall, /area/station/maintenance/department/medical/central) "siF" = ( /obj/effect/decal/cleanable/dirt, @@ -56872,12 +56841,6 @@ /turf/open/floor/iron, /area/station/command/bridge) "sNo" = ( -/obj/machinery/food_cart, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/turf_decal/bot/right, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "sNx" = ( @@ -57153,6 +57116,8 @@ }, /obj/structure/cable, /obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "sRh" = ( @@ -58175,9 +58140,18 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #2" + }, +/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/machinery/airalarm/directional/north, +/obj/effect/decal/cleanable/oil, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #1"; + suffix = "#1" + }, /turf/open/floor/iron/dark, /area/station/cargo/storage) "tiY" = ( @@ -58482,8 +58456,17 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "tnc" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/effect/turf_decal/delivery, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=1"; + location = "Hydroponics" + }, +/obj/machinery/door/window/left/directional/east{ + req_access = list("hydroponics"); + name = "hydroponics delivery access" + }, +/obj/structure/plasticflaps/opaque, +/turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "tnp" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, @@ -58830,6 +58813,9 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/storage) +"tsS" = ( +/turf/open/floor/plating, +/area/station/medical/virology) "tsY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59910,11 +59896,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) -"tNa" = ( -/obj/structure/closet/firecloset, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) "tNe" = ( /obj/effect/turf_decal/tile/purple, /obj/structure/disposalpipe/junction, @@ -59967,11 +59948,15 @@ /area/station/science/ordnance) "tNQ" = ( /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/navigate_destination/common/cryogenics, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/glass{ + name = "Cryogenic Storage" + }, +/turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "tNW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60511,15 +60496,6 @@ "tXg" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/bridge) -"tXm" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Operating Theater Secondary" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, -/turf/open/floor/iron/dark, -/area/station/medical/medbay/central) "tXr" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -60826,10 +60802,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) -"ubJ" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/medical/surgery/aft) "ubM" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62089,6 +62061,14 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) +"uwf" = ( +/obj/structure/closet/wardrobe/miner, +/obj/item/clothing/suit/hooded/wintercoat/miner, +/obj/item/clothing/suit/hooded/wintercoat/miner, +/obj/item/clothing/suit/hooded/wintercoat/miner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/storage) "uwl" = ( /obj/structure/chair/pew{ dir = 4 @@ -62492,6 +62472,14 @@ /obj/effect/turf_decal/siding/wideplating/dark/corner, /turf/open/floor/iron/dark, /area/station/service/chapel) +"uEM" = ( +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, +/obj/machinery/door/airlock/mining/glass{ + name = "Quartermaster's Office" + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/qm) "uEX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64952,7 +64940,6 @@ /area/station/science/robotics/mechbay) "vvf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -65074,15 +65061,6 @@ /obj/machinery/computer/records/medical/laptop, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) -"vwQ" = ( -/obj/structure/closet/emcloset/anchored, -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/bridge) "vxa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66693,6 +66671,9 @@ /obj/item/reagent_containers/cup/bottle/nutrient/l4z, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, +/obj/item/seeds/tower{ + pixel_y = -6 + }, /turf/open/floor/plating, /area/station/maintenance/department/bridge) "vTt" = ( @@ -67578,12 +67559,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"why" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/maintenance, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/bridge) "whP" = ( /obj/machinery/vending/engivend, /obj/effect/turf_decal/bot, @@ -67593,6 +67568,18 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) +"whT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "wij" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -68134,13 +68121,8 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "wpn" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/obj/item/radio/intercom/directional/north, -/obj/machinery/status_display/ai/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) "wpw" = ( /turf/closed/wall, @@ -68205,10 +68187,10 @@ /turf/open/floor/engine/vacuum, /area/station/science/ordnance/bomb) "wqu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/flora/rock, -/turf/open/misc/asteroid, -/area/space/nearstation) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/bridge) "wqE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68323,12 +68305,18 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "wrY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) "wsg" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/bot, @@ -68728,6 +68716,12 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"wzD" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/bridge) "wzG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/sofa/corp/left{ @@ -68881,6 +68875,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/cargo/miningoffice) +"wCh" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/bridge) "wCR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68944,9 +68942,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tile/green{ dir = 1 }, @@ -68969,8 +68964,8 @@ /area/station/security/prison/safe) "wEI" = ( /obj/structure/chair/stool/bar/directional/east, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "wEJ" = ( @@ -69588,10 +69583,10 @@ "wNb" = ( /obj/structure/closet/secure_closet/quartermaster, /obj/effect/turf_decal/bot, -/obj/item/gun/energy/e_gun/mini, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/item/lead_pipe, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/qm) "wNf" = ( @@ -69771,14 +69766,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"wPX" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock" - }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining, -/turf/open/floor/iron/dark, -/area/station/cargo/miningoffice) "wQc" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -69794,6 +69781,21 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) +"wQG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 5; + pixel_y = 16; + pixel_x = -22 + }, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 8; + pixel_x = -6 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_half, +/area/station/bitrunning/den) "wQI" = ( /obj/structure/sign/warning/electric_shock/directional/south, /obj/structure/flora/bush/pale/style_random, @@ -70021,6 +70023,13 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "wTU" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/button/door/directional/east{ + id = "qmprivacy"; + name = "Privacy Shutters Control"; + pixel_y = 38; + req_access = list("qm") + }, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/qm) "wUU" = ( @@ -70453,12 +70462,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/station/service/library) -"xcR" = ( -/obj/structure/flora/grass/jungle/a/style_random{ - icon_state = "bushc2" - }, -/turf/open/misc/asteroid, -/area/space/nearstation) "xcT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -70703,6 +70706,8 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "xhY" = ( @@ -71173,6 +71178,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"xoW" = ( +/turf/closed/wall/r_wall, +/area/station/service/hydroponics) "xpa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -71525,9 +71533,9 @@ /turf/open/floor/iron, /area/station/security/prison/garden) "xvC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/holopad, -/mob/living/basic/sloth/citrus, +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/mob/living/basic/sloth, /turf/open/space/basic, /area/station/solars/port/fore) "xvF" = ( @@ -71593,6 +71601,20 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"xwH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron, +/area/station/cargo/storage) "xwJ" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/siding/purple/corner{ @@ -71962,12 +71984,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"xCP" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen" - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "xCY" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom/directional/north{ @@ -72292,9 +72308,6 @@ network = list("ss13","medical") }, /obj/item/radio/intercom/directional/south, -/obj/machinery/computer/operating{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -72602,15 +72615,20 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "xNN" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/mining/glass{ - name = "Mining Dock" +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/contraband/the_griffin{ + pixel_y = 32 }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining, -/turf/open/floor/iron/dark, -/area/station/cargo/miningoffice) +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "xOa" = ( /obj/machinery/conveyor{ dir = 1; @@ -72716,20 +72734,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron/dark, /area/station/command/bridge) -"xPT" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/item/kirbyplants{ - icon_state = "plant-05" - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "xPY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -73505,15 +73509,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) -"ybO" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "Shower_2Privacy"; - name = "Shower 2 Privacy Shutter" - }, -/turf/open/floor/plating, -/area/station/commons/toilet/restrooms) "ycd" = ( /obj/machinery/computer/upload/ai{ dir = 1 @@ -73522,13 +73517,9 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "ycr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/item/weldingtool, -/obj/structure/sign/poster/random/directional/north, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, -/area/station/maintenance/department/bridge) +/area/station/service/hydroponics) "ycs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -92521,11 +92512,11 @@ vXf pwF ufU vjh -vjh -eNQ -eNQ -eNQ -eNQ +mtV +mtV +mtV +mtV +mtV vjh xju eKU @@ -92778,13 +92769,13 @@ ibL cdD rnJ xLd -hpv -aDQ -ecF -xcR -uiX -xDc -xDc +fYw +tsS +tsS +tsS +tsS +dEF +dEF xDc xDc vqr @@ -93035,13 +93026,13 @@ qTY pwF kJH srx -ubJ -add -ecF -acW -aaO -aDQ -ybO +fYw +tsS +tsS +dEF +dEF +dEF +dEF fsu jiU tIk @@ -93292,13 +93283,13 @@ rzB jMa suQ raS -ubJ -aaO -ecF -dyu -bKl -add -osy +fYw +tsS +tsS +tsS +tsS +tsS +dEF uNO uNO bDV @@ -93550,12 +93541,12 @@ htS rKk hpv fYw -nKC -nKC +tsS +tsS +dEF +tsS +tsS dEF -acZ -adf -nsA lOZ iun uBo @@ -94063,10 +94054,10 @@ wOk uGU omi eBH -tXm +gkv vvf geO -jdR +nKC dAB qlw dEF @@ -94323,7 +94314,7 @@ aDo gkv fjn hGm -jdR +nKC iju unz hkp @@ -94578,9 +94569,9 @@ lBB sRZ cjS gkv -eQg +tsS iYf -iyI +dEF eMW uqF dEF @@ -94831,9 +94822,9 @@ opL kHG ofg ofg -nlR +dEF uBX -iyI +dEF dEF iYW wEw @@ -95088,7 +95079,7 @@ xJN fPc qnT pIT -iyI +dEF rot bAQ nvH @@ -95345,7 +95336,7 @@ yaZ tVu aTe pcG -mnG +dEF uEX nCU llY @@ -95602,10 +95593,10 @@ cSl lkl jMU jJd -iyI +dEF iYA hih -iyI +dEF lyr oYu aLC @@ -95859,10 +95850,10 @@ vbT etY nri wNQ -iyI -iyI +dEF +dEF nKC -iyI +dEF qjM ffa hkp @@ -96117,12 +96108,12 @@ fxt fbK rtr eDr -nlR +dEF jHo rBS wFs oJH -iyI +dEF gbh umL bwW @@ -96631,12 +96622,12 @@ ouK fKf fyZ qNL -iyI +dEF evD ear qip -nlR -iyI +dEF +dEF tqG cZT rhN @@ -96888,11 +96879,11 @@ ofg cRW yaH cRW -iyI -iyI -iyI -iyI -iyI +dEF +dEF +dEF +dEF +dEF bKc lCz ryK @@ -105625,8 +105616,8 @@ lJd vbo lJd hNL -fUP -wEt +bFw +mZW wqu tXg niQ @@ -105883,9 +105874,9 @@ pvf bln qUj bDr -dvk -niQ -dvk +wzD +wCh +rOX fpG gbs tXg @@ -106138,7 +106129,7 @@ hxw vWE ndT ezV -cTk +jds kcx xPk mej @@ -107685,9 +107676,9 @@ ffv maX dyX xPk -laE +xPk tnc -rPo +qXn tXg wFl dKJ @@ -107941,13 +107932,13 @@ wxq hat wxq hat -xPk -sWI -xPk -kbc -niQ +hat ejQ -yaG +ejQ +ejQ +ejQ +ejQ +arl kEm cTh gjc @@ -108200,11 +108191,11 @@ eeb gTA jHT mzs -xPk +ejQ ycr -niQ -dch -slo +ejQ +ejQ +arl qHT lzv reT @@ -108457,11 +108448,11 @@ vJN hat qvh sRh -qXn -tnc -niQ -kPt -slo +ejQ +ejQ +ejQ +ejQ +arl cfK vcm hHP @@ -108714,11 +108705,11 @@ bQb aMe mfF fKS -qmg -urE -niQ +ejQ +ycr +ejQ cSq -slo +arl rmL wLX reT @@ -108971,11 +108962,11 @@ xvj aMe oNk kbT -sWI -jCZ -niQ -abJ -yaG +ejQ +ejQ +ejQ +ejQ +arl xWm eON jRF @@ -109227,14 +109218,14 @@ wzp dcF hat gmj -dsJ -xPk -why -niQ -niQ -tXg -tXg -tXg +kbT +ejQ +ycr +ejQ +ejQ +arl +arl +arl arl arl wRj @@ -109485,13 +109476,13 @@ eYd fmV pqu pjX -sWI mza -tnc -vwQ -tXg +mza +ejQ +ejQ +xoW rQs -tXg +xoW eIP wwj gii @@ -109742,13 +109733,13 @@ wFi hat wxq hat -xPk -xPk -nTK -xPk -tXg -tXg -tXg +hat +hat +aMe +hat +xoW +xoW +xoW arl arl ipA @@ -113076,7 +113067,7 @@ awT aMU iLX rZV -jqJ +cTN xZL xZL rZV @@ -113849,12 +113840,12 @@ dty cqr lDu mtN -syF -rZV +iYI +iYI nfY nfY atu -gHI +uEM nfY lmO orD @@ -114105,16 +114096,16 @@ eMr gBd xxN lDu -mrt -xCP -rZV +qxW +iYI +nXg qkq eYS iYI fRf mVP hjL -cXd +fLo wdL xYx wdL @@ -114127,11 +114118,11 @@ etO gzv yaF pOq -cQR -nTd +vOW +vOW hDa -tNa -cQR +vOW +vOW jDJ lux hEQ @@ -114363,11 +114354,11 @@ xxN xxN lDu tah -rYa -rZV +iYI +fRZ hgc -oiK -mvm +eYS +iYI ncQ clV jwu @@ -114384,10 +114375,10 @@ jnp ixx bHR xTH -wJn +sMh lfu -cQR -cQR +ejY +vOW eMo pIl pIl @@ -114620,14 +114611,14 @@ uuW uuW lDu tOJ -fyS -vOX -qAR -oUz -wPX +iYI +fOk +mFO +eYS +iYI xNN -qAR -qAR +erE +kQq tiK dWM oAJ @@ -114641,9 +114632,9 @@ tOy pLe yaF jAl -cQR +vOW bFm -wJn +awB wpn cLG jwn @@ -114877,14 +114868,14 @@ pLJ pLJ oLH wCY -cTN -rZV +lRW +daT qTJ -chT -chT +prt +iYI wrY -tVt -qAR +lSF +lKq lKq hOc hOc @@ -114898,8 +114889,8 @@ tOy xcT tDG kTD -cQR -gMA +vOW +bFm qih tNQ dNx @@ -115134,14 +115125,14 @@ vCh reo lDu wCY -giT -rZV +iYI +iYI oXK -wdx -vuu +obm +iYI rqL -qRm -gKI +chC +hOc acm aaa acm @@ -115155,9 +115146,9 @@ pmy eYv kVD cQb -cQR +vOW jgI -cQR +pJa hEH oSX kdO @@ -115392,13 +115383,13 @@ dry lDu xZL xZL -rZV -xPT -hbC -chT +iYI +oXK +sdB +iYI kaX -ohR -oUz +uwf +hOc qJs acK qJs @@ -115412,9 +115403,9 @@ tOy etO etO tOy -cQR -cQR -cQR +vOW +vOW +vOW vOW wJe sMh @@ -115651,11 +115642,11 @@ lDu xZL eJy izu -iRq -aLI -dVB -kyj -qAR +wQG +kRf +xwH +mqO +hOc aaa aaa aaa @@ -115906,12 +115897,12 @@ eGD rcI lDu xZL -rZV -pNY -bRx -rcp -mjW -pmk +iYI +iYI +rRF +iYI +saP +qAR qAR aaa aaa @@ -116164,12 +116155,12 @@ cGr oLH kxT rZV -gKI +hej +chT +rcp +hin +tVt qAR -oUz -dez -oUz -gKI qAR aaa aaa @@ -116421,12 +116412,12 @@ uwq oLH wCY sJS -acm -oUz -twd -hBa -gPO -oUz +oaP +wdx +vuu +icX +qRm +gKI acm aaa aaa @@ -116678,11 +116669,11 @@ lDu lDu mrt sJS -aaQ -oUz -wCe -iVn -xzI +rIG +hbC +chT +gRN +ohR oUz aaQ aaa @@ -116935,12 +116926,12 @@ lDu xZL xZL rZV -qJs -rLR -oUz -fxY -oUz -fae +whT +iRq +aLI +dVB +kyj +qAR qJs aaa aaa @@ -117192,12 +117183,12 @@ lDu wCY rZV rZV -aaa -aaa -aaa -pBi -aaa -aaa +pNY +bRx +rcp +mjW +pmk +qAR aaa aaa aaa @@ -117449,12 +117440,12 @@ oLH wCY sJS aaa -aaa -aaa -aaa -aaa -aaa -aaa +gKI +qAR +oUz +dez +oUz +gKI aaa aaa aaa @@ -117706,12 +117697,12 @@ sRz xZL sJS aaa -aaa -aaa -aaa -aaa -aaa -aaa +acm +oUz +twd +hBa +gPO +oUz aaa aaa aaa @@ -117963,12 +117954,12 @@ lDu wCY rZV aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaQ +oUz +wCe +iVn +xzI +oUz aaa aaa aaa @@ -118220,12 +118211,12 @@ oLH wCY rZV aaa -aaa -aaa -aaa -aaa -aaa -aaa +qJs +rLR +oUz +fxY +oUz +fae aaa aaa aaa @@ -118480,7 +118471,7 @@ aaa aaa aaa aaa -aaa +pBi aaa aaa aaa From 48d496ef500886a7a9797e4a508aaf07d2297207 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 15:30:05 +0100 Subject: [PATCH 02/59] finishes pathology rooms and its maint --- _maps/map_files/KiloStation/KiloStation.dmm | 549 +++++++++++++------- 1 file changed, 374 insertions(+), 175 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5c04598c604f..e7cc722310a9 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -2292,13 +2292,15 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "aLC" = ( -/obj/effect/turf_decal/delivery, /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/table, +/obj/machinery/microwave, +/obj/effect/spawner/random/food_or_drink/donkpockets, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "aLI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4370,7 +4372,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -4381,7 +4382,7 @@ }, /obj/effect/turf_decal/tile/green/opposingcorners, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "bAS" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -10225,11 +10226,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "dAQ" = ( /obj/machinery/door/airlock/research/glass{ name = "Ordnance Lab" @@ -10412,7 +10410,7 @@ /area/station/maintenance/fore) "dEF" = ( /turf/closed/wall/r_wall, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "dEM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10554,6 +10552,10 @@ }, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"dIq" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/pathology) "dIv" = ( /obj/machinery/module_duplicator, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -11287,6 +11289,19 @@ dir = 4 }, /area/station/hallway/primary/fore) +"dUd" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/pathology) "dUe" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -11313,12 +11328,6 @@ /obj/machinery/light_switch/directional/west{ pixel_y = -4 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/machinery/button/door/directional/west{ id = "virologysurgery"; name = "Virology Privacy Toggle"; @@ -11328,8 +11337,11 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "dUE" = ( /obj/structure/chair{ dir = 1 @@ -11614,7 +11626,7 @@ name = "mankey" }, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "eaw" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 @@ -11922,7 +11934,7 @@ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "egV" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/corner{ @@ -12837,7 +12849,7 @@ /obj/structure/flora/bush/large/style_random, /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "evE" = ( /turf/closed/wall/mineral/plastitanium, /area/station/maintenance/port/greater) @@ -13825,7 +13837,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "eMX" = ( /obj/structure/girder/displaced, /obj/structure/grille/broken, @@ -14783,7 +14795,7 @@ layer = 4 }, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/medical/pathology) "ffi" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/green{ @@ -15100,12 +15112,16 @@ /obj/machinery/firealarm/directional/north{ pixel_x = 26 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 }, +/obj/effect/turf_decal/tile/green, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "fjw" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -15515,7 +15531,7 @@ /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "fpz" = ( /obj/machinery/door/airlock/engineering{ name = "Electrical Maintenance" @@ -16199,18 +16215,19 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/structure/closet/secure_closet/personal/patient, /obj/machinery/camera/directional/north{ c_tag = "Medbay Aux Storage"; name = "medical camera"; network = list("ss13","medical") }, /obj/effect/turf_decal/bot, -/obj/item/toy/figure/paramedic, /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/computer/records/pathology{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/medical/paramedic) "fyD" = ( @@ -16755,7 +16772,7 @@ dir = 5 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "fHj" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -17136,7 +17153,7 @@ }, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "fMs" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/siding/blue{ @@ -18217,8 +18234,13 @@ /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "geV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18501,8 +18523,9 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "gjD" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/corner{ @@ -20611,8 +20634,17 @@ /obj/effect/turf_decal/delivery, /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/door_buttons/airlock_controller{ + idExterior = "pathology_airlock_exterior"; + idInterior = "pathology_airlock_interior"; + idSelf = "pathology_airlock_control"; + name = "Pathology Access Console"; + pixel_x = 8; + pixel_y = 25; + req_access = list("pathology") + }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "gSF" = ( /turf/closed/wall/r_wall, /area/station/security/prison/mess) @@ -21009,7 +21041,7 @@ }, /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "hah" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, @@ -21453,7 +21485,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "hin" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21607,7 +21639,7 @@ /area/station/maintenance/department/electrical) "hkp" = ( /turf/closed/wall/r_wall/rust, -/area/station/medical/virology) +/area/station/medical/pathology) "hkq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22681,6 +22713,14 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) +"hBu" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Pathology Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/virology, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/medical/pathology) "hBx" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -23055,18 +23095,21 @@ /area/station/command/bridge) "hGm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/iv_drip, /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/extinguisher_cabinet/directional/south{ pixel_x = 26 }, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "hGC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/white, @@ -24982,11 +25025,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "ijy" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2; @@ -26083,6 +26123,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/east, /obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_half, /area/station/bitrunning/den) "izv" = ( @@ -27658,11 +27705,13 @@ "iYf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/medical/virology) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/pathology) "iYj" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, @@ -27714,7 +27763,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "iYI" = ( /turf/closed/wall, /area/station/bitrunning/den) @@ -27728,12 +27777,9 @@ /obj/machinery/vending/wardrobe/viro_wardrobe, /obj/effect/turf_decal/delivery, /obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "iZm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -29514,7 +29560,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "jHy" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -29542,7 +29588,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/green/opposingcorners, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "jHT" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/trimline/green/filled/line, @@ -30327,10 +30373,12 @@ /obj/machinery/light/directional/north, /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 + dir = 1 }, +/obj/effect/turf_decal/bot, +/obj/machinery/disease2/centrifuge, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "jUz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -30366,8 +30414,11 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/item/device/antibody_scanner, +/obj/item/device/antibody_scanner, +/obj/item/device/antibody_scanner, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "jVA" = ( /obj/structure/table, /obj/item/paper_bin, @@ -33814,6 +33865,12 @@ /obj/item/stack/rods, /turf/open/floor/carpet/green, /area/station/cargo/warehouse) +"ldM" = ( +/obj/structure/cable, +/mob/living/basic/lizard/eats_the_roaches, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/pathology) "lea" = ( /obj/machinery/rnd/production/techfab/department/cargo, /obj/effect/turf_decal/bot, @@ -34270,17 +34327,26 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/virology{ - name = "Virology Access" - }, /obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "viro-airlock" - }, /obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door_buttons/access_button{ + idDoor = "pathology_airlock_interior"; + idSelf = "pathology_airlock_control"; + name = "Pathology Access Button"; + pixel_x = -24; + pixel_y = 5; + req_access = list("pathology") + }, +/obj/machinery/door/airlock/virology{ + autoclose = 0; + frequency = 1449; + id_tag = "pathology_airlock_interior"; + name = "Pathology Interior Airlock" + }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "lme" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -34372,6 +34438,9 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"lnp" = ( +/turf/closed/wall/r_wall, +/area/station/medical/pathology) "lnD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35091,7 +35160,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "lyT" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -39801,6 +39870,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/cargo/storage) "ncS" = ( @@ -40601,6 +40671,19 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/fore) +"ntx" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/pathology) "ntC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line{ @@ -40747,10 +40830,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"nvH" = ( -/obj/structure/sign/warning/biohazard, -/turf/closed/wall/r_wall/rust, -/area/station/medical/virology) "nvI" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -41140,7 +41219,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "nDi" = ( /obj/machinery/meter, /obj/effect/turf_decal/stripes/line{ @@ -41630,7 +41709,7 @@ "nKC" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/medical/pathology) "nKO" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, @@ -42119,7 +42198,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/psychology) "nXg" = ( -/obj/machinery/quantum_server, +/obj/machinery/quantum_server{ + pixel_y = 3 + }, /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/bot/left, /obj/effect/decal/cleanable/cobweb, @@ -42425,8 +42506,17 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/item/storage/box/monkeycubes/mousecubes, +/obj/item/storage/box/monkeycubes/mousecubes{ + pixel_y = 7; + pixel_x = 10 + }, +/obj/item/storage/box/monkeycubes/mousecubes{ + pixel_y = 8; + pixel_x = -11 + }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "oce" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -42666,7 +42756,7 @@ /obj/structure/flora/bush/ferny/style_random, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "ofH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/blood/gibs/old, @@ -44084,6 +44174,14 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"oGR" = ( +/obj/machinery/computer/records/pathology, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/medical/pathology) "oGU" = ( /obj/item/target/clown, /obj/structure/window/reinforced/spawner/directional/north, @@ -44296,7 +44394,7 @@ dir = 1 }, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "oJU" = ( /obj/docking_port/stationary{ dheight = 1; @@ -45041,6 +45139,13 @@ /obj/effect/turf_decal/trimline/brown/line, /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/structure/cable, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_half, /area/station/bitrunning/den) "oYc" = ( @@ -45119,7 +45224,7 @@ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "oYN" = ( /obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, @@ -46165,6 +46270,11 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"poO" = ( +/obj/structure/cable, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/pathology) "poU" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/lavendergrass/style_random, @@ -47616,7 +47726,7 @@ /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "pOd" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/bot, @@ -48770,7 +48880,7 @@ /obj/machinery/airalarm/directional/east, /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "qiu" = ( /obj/structure/railing{ dir = 1 @@ -48852,7 +48962,7 @@ }, /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "qkf" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -48981,11 +49091,14 @@ }, /obj/item/restraints/handcuffs, /obj/item/pen, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "qly" = ( /obj/structure/frame/computer{ anchored = 1; @@ -51299,8 +51412,9 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "qZX" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/aft) @@ -52080,7 +52194,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sink/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -52090,7 +52203,7 @@ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "rou" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -52283,6 +52396,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/cargo/storage) "rqV" = ( @@ -52657,6 +52771,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) +"rvu" = ( +/obj/structure/chair/office/light, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/pathology) "rvz" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/closet/secure_closet/personal, @@ -52979,6 +53099,17 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"rAt" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/obj/effect/turf_decal/bot_white/right, +/obj/machinery/iv_drip, +/turf/open/floor/iron/dark, +/area/station/medical/pathology) "rAA" = ( /obj/effect/decal/cleanable/ash, /obj/effect/mapping_helpers/burnt_floor, @@ -53045,8 +53176,9 @@ network = list("ss13","medical") }, /mob/living/carbon/human/species/monkey, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "rBV" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/mmi, @@ -54477,6 +54609,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/cargo/miningoffice) +"saU" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation A" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/pathology) "saW" = ( /turf/open/floor/iron/white, /area/station/security/prison/mess) @@ -58814,8 +58955,24 @@ /turf/open/floor/iron/dark, /area/station/cargo/storage) "tsS" = ( -/turf/open/floor/plating, -/area/station/medical/virology) +/obj/structure/table, +/obj/item/restraints/handcuffs{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/item/pen{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/folder/white{ + pixel_x = 7; + pixel_y = 8 + }, +/obj/item/toy/plush/moth/tyriaplush{ + pixel_x = 5 + }, +/turf/open/floor/iron/dark, +/area/station/medical/pathology) "tsY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59109,6 +59266,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/maintenance/department/crew_quarters/bar) +"txj" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/disease2/diseaseanalyser, +/turf/open/floor/iron/dark, +/area/station/medical/pathology) "txl" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -60921,7 +61086,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "ued" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -61593,11 +61758,14 @@ /obj/machinery/light/small/directional/south, /obj/machinery/iv_drip, /obj/effect/turf_decal/bot_white/right, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "unE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61765,7 +61933,7 @@ "uqF" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/medical/pathology) "uqI" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -62343,15 +62511,23 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "viro-airlock" +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door_buttons/access_button{ + idDoor = "pathology_airlock_exterior"; + idSelf = "pathology_airlock_control"; + name = "Pathology Access Button"; + pixel_y = -24; + req_access = list("pathology") }, /obj/machinery/door/airlock/virology{ - name = "Virology Access" + autoclose = 0; + frequency = 1449; + id_tag = "pathology_airlock_exterior"; + name = "Pathology Exterior Airlock" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "uCa" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer, /obj/effect/turf_decal/delivery, @@ -62491,8 +62667,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/green/opposingcorners, +/obj/structure/sink/directional/south, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "uFb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/corner, @@ -63582,7 +63759,7 @@ /obj/structure/noticeboard/directional/south, /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "uYP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -63973,7 +64150,7 @@ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/medical/virology) +/area/station/medical/pathology) "veW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64319,7 +64496,7 @@ }, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/supply/qm, -/obj/machinery/door/airlock/command{ +/obj/machinery/door/airlock/mining/glass{ name = "Quartermaster's Office" }, /turf/open/floor/iron/dark, @@ -64939,15 +65116,13 @@ /turf/open/floor/plating, /area/station/science/robotics/mechbay) "vvf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/obj/effect/turf_decal/bot, +/obj/machinery/disease2/incubator, +/turf/open/floor/iron/dark, +/area/station/medical/pathology) "vvn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/machinery/door/window/left/directional/north{ @@ -68939,17 +69114,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/virologist, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ +/obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) +/area/station/medical/pathology) "wEy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sink/directional/south, @@ -69039,7 +69212,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "wFu" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -69784,15 +69957,6 @@ "wQG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 5; - pixel_y = 16; - pixel_x = -22 - }, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 8; - pixel_x = -6 - }, /obj/structure/cable, /turf/open/floor/iron/dark/textured_half, /area/station/bitrunning/den) @@ -70226,6 +70390,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"wYj" = ( +/obj/structure/lattice/catwalk, +/obj/item/toy/plush/space_lizard_plushie{ + desc = "He stared into the void and listened. He didn't expect an answer..."; + name = "Void-Stares-Back" + }, +/turf/open/space/basic, +/area/space/nearstation) "wYk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70710,6 +70882,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"xhM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/pathology) "xhY" = ( /obj/machinery/light/directional/north, /obj/machinery/newscaster/directional/north, @@ -71158,7 +71340,7 @@ /obj/structure/flora/bush/grassy/style_random, /obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, -/area/station/medical/virology) +/area/station/medical/pathology) "xoO" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -71671,6 +71853,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/item/toy/figure/paramedic{ + pixel_x = -9 + }, /turf/open/floor/iron/dark, /area/station/medical/paramedic) "xxJ" = ( @@ -72311,8 +72496,15 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/medical/virology) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/pathology) "xIS" = ( /obj/machinery/newscaster/directional/north, /obj/machinery/camera/directional/north{ @@ -72748,6 +72940,13 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/iron/dark, /area/station/medical/storage) +"xQH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/pathology) "xQU" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -92517,7 +92716,7 @@ mtV mtV mtV mtV -vjh +mtV xju eKU jiR @@ -92770,10 +92969,10 @@ cdD rnJ xLd fYw -tsS -tsS -tsS -tsS +dIq +dIq +poO +ldM dEF dEF xDc @@ -93027,8 +93226,8 @@ pwF kJH srx fYw -tsS -tsS +hBu +dEF dEF dEF dEF @@ -93284,12 +93483,12 @@ jMa suQ raS fYw +ntx +dUd +saU +rvu tsS -tsS -tsS -tsS -tsS -dEF +lnp uNO uNO bDV @@ -93541,12 +93740,12 @@ htS rKk hpv fYw -tsS -tsS -dEF -tsS -tsS -dEF +oGR +xhM +nKC +xQH +rAt +lnp lOZ iun uBo @@ -93800,10 +93999,10 @@ sHn gkv jUi xIQ -dEF +lnp nKC nKC -dEF +lnp osy uNO dDp @@ -94060,7 +94259,7 @@ geO nKC dAB qlw -dEF +lnp tYi nXC cWQ @@ -94569,12 +94768,12 @@ lBB sRZ cjS gkv -tsS +txj iYf -dEF +lnp eMW uqF -dEF +lnp rhN obM wij @@ -94822,16 +95021,16 @@ opL kHG ofg ofg -dEF +lnp uBX -dEF -dEF +lnp +lnp iYW wEw dUn fMn udI -dEF +lnp nZZ rNo xOq @@ -95079,10 +95278,10 @@ xJN fPc qnT pIT -dEF +lnp rot bAQ -nvH +hkp gSC gjx jHS @@ -95336,7 +95535,7 @@ yaZ tVu aTe pcG -dEF +lnp uEX nCU llY @@ -95345,7 +95544,7 @@ qZS egU fpx obU -dEF +lnp kzz iYa bCO @@ -95593,10 +95792,10 @@ cSl lkl jMU jJd -dEF +lnp iYA hih -dEF +lnp lyr oYu aLC @@ -95850,16 +96049,16 @@ vbT etY nri wNQ -dEF -dEF +lnp +lnp nKC -dEF +lnp qjM ffa hkp -dEF -dEF -dEF +lnp +lnp +lnp rhN bkT jTc @@ -96108,12 +96307,12 @@ fxt fbK rtr eDr -dEF +lnp jHo rBS wFs oJH -dEF +lnp gbh umL bwW @@ -96622,12 +96821,12 @@ ouK fKf fyZ qNL -dEF +lnp evD ear qip -dEF -dEF +lnp +lnp tqG cZT rhN @@ -96879,11 +97078,11 @@ ofg cRW yaH cRW -dEF -dEF -dEF -dEF -dEF +lnp +lnp +lnp +lnp +lnp bKc lCz ryK @@ -115391,7 +115590,7 @@ kaX uwf hOc qJs -acK +wYj qJs lKq iSb From 50e4021bd31c55f379dd32f91dd55cb497512da0 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 15:41:47 +0100 Subject: [PATCH 03/59] puts nanites back into their rightful place --- _maps/map_files/KiloStation/KiloStation.dmm | 50 +++++++++++++++------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index e7cc722310a9..c9268ce865fa 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -7991,6 +7991,7 @@ /area/station/engineering/atmos/pumproom) "cPu" = ( /obj/machinery/light/directional/west, +/obj/machinery/vending/wardrobe/gene_wardrobe, /turf/open/floor/grass, /area/station/science/genetics) "cPw" = ( @@ -8075,9 +8076,8 @@ /obj/item/toy/figure/qm{ pixel_x = -17 }, -/obj/machinery/modular_computer/console/preset/id{ - dir = 1 - }, +/obj/structure/table, +/obj/item/modular_computer/laptop, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/qm) "cRW" = ( @@ -21233,6 +21233,16 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/medical/storage) +"hdB" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/table, +/obj/item/storage/box/disks_nanite, +/obj/item/nanite_scanner, +/obj/item/nanite_remote, +/turf/open/floor/iron/dark, +/area/station/science/research) "hdY" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -24759,7 +24769,6 @@ "ieu" = ( /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/nanite_program_hub, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance/office) "ieI" = ( @@ -31222,7 +31231,10 @@ /turf/open/space/basic, /area/space/nearstation) "kkg" = ( -/obj/machinery/computer/nanite_cloud_controller, +/obj/structure/table, +/obj/item/storage/toolbox/electrical{ + pixel_y = 5 + }, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) "kkC" = ( @@ -42018,7 +42030,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/directional/east, /obj/structure/cable, -/obj/machinery/nanite_programmer, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance/office) "nSh" = ( @@ -61695,7 +61706,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/machinery/vending/wardrobe/gene_wardrobe, +/obj/machinery/nanite_program_hub, /turf/open/floor/iron/dark, /area/station/science/research) "unr" = ( @@ -63125,9 +63136,6 @@ pixel_x = 8; pixel_y = 9 }, -/obj/item/storage/toolbox/electrical{ - pixel_y = 5 - }, /obj/item/storage/box/disks_nanite, /obj/item/storage/box/disks_nanite, /turf/open/floor/iron/dark, @@ -64007,6 +64015,16 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"vbD" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/nanite_programmer, +/turf/open/floor/iron/dark, +/area/station/science/research) "vbP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -68978,6 +68996,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/computer/nanite_cloud_controller, /turf/open/floor/iron/dark, /area/station/science/research) "wAC" = ( @@ -70594,7 +70613,12 @@ /area/station/science/xenobiology) "xcj" = ( /obj/effect/turf_decal/siding/green, -/obj/machinery/door/firedoor/border_only/closed, +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + dir = 2; + icon_state = "right"; + name = "Garden Pen" + }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/garden) "xck" = ( @@ -112225,7 +112249,7 @@ bUx cKY mDj vGY -eHI +hdB eHI eHI rPy @@ -112483,7 +112507,7 @@ imS wzI wzI unp -wAz +vbD wAz nEA jeU From a9fcb370aebad5bf5d797b91c1c8fc2cf8111d34 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 16:08:11 +0100 Subject: [PATCH 04/59] botany --- _maps/map_files/KiloStation/KiloStation.dmm | 370 ++++++++++++++------ 1 file changed, 264 insertions(+), 106 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index c9268ce865fa..b002cc3de00b 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -4231,6 +4231,16 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"byw" = ( +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/machinery/light/directional/west, +/obj/machinery/egg_incubator, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/grass, +/area/station/service/hydroponics) "byy" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6493,6 +6503,12 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard) +"ckC" = ( +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/grass, +/area/station/service/hydroponics) "ckJ" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall, @@ -8114,7 +8130,15 @@ /area/station/medical/pharmacy) "cSq" = ( /obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/misc/sandy_dirt, /area/station/service/hydroponics) "cSJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8435,6 +8459,10 @@ /obj/effect/turf_decal/bot, /obj/structure/table, /obj/machinery/splicer, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -11; + pixel_y = 5 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "cXh" = ( @@ -8890,6 +8918,10 @@ }, /turf/open/floor/iron/dark, /area/station/science/lab) +"dfx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/grass, +/area/station/service/hydroponics) "dfD" = ( /turf/open/floor/grass, /area/station/service/hydroponics/garden) @@ -12114,7 +12146,8 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "ejQ" = ( -/turf/open/floor/iron/dark, +/obj/structure/nestbox, +/turf/open/misc/sandy_dirt, /area/station/service/hydroponics) "ejU" = ( /obj/structure/cable, @@ -13718,6 +13751,9 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) +"eKM" = ( +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "eKT" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/showroomfloor, @@ -13825,6 +13861,10 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"eMM" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/grass, +/area/station/service/hydroponics) "eMW" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17049,15 +17089,6 @@ /obj/structure/flora/bush/ferny/style_random, /turf/open/misc/asteroid, /area/station/maintenance/port/lesser) -"fKS" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/green/fourcorners, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/watering_can, -/obj/item/reagent_containers/cup/watering_can, -/turf/open/floor/iron/checker, -/area/station/service/hydroponics) "fLd" = ( /obj/machinery/power/port_gen/pacman, /obj/structure/sign/warning/electric_shock/directional/north, @@ -18681,6 +18712,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/vending/wardrobe/hydro_wardrobe, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "gmn" = ( @@ -19151,6 +19183,12 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/hallway/primary/port) +"gtv" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "gtC" = ( /obj/machinery/conveyor{ dir = 4; @@ -20137,6 +20175,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/brig) +"gJP" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "gKd" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ dir = 4 @@ -22571,6 +22618,12 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/hop) +"hxX" = ( +/obj/structure/flora/bush/grassy/style_random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/grass, +/area/station/service/hydroponics) "hxZ" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/west, @@ -24866,6 +24919,17 @@ /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, /area/station/security/prison) +"ifW" = ( +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "ifX" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -26185,6 +26249,10 @@ /obj/machinery/vending/clothing, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"iAB" = ( +/obj/machinery/light/small/directional/south, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "iAC" = ( /obj/machinery/suit_storage_unit/rd, /obj/effect/turf_decal/delivery, @@ -26334,6 +26402,9 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) +"iCA" = ( +/turf/open/floor/grass, +/area/station/service/hydroponics) "iCK" = ( /obj/effect/turf_decal/bot, /obj/machinery/conveyor{ @@ -30826,10 +30897,9 @@ /turf/open/floor/plating, /area/station/security/prison) "kbT" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron/checker, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/grass, /area/station/service/hydroponics) "kbV" = ( /obj/structure/table, @@ -36165,6 +36235,14 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/medical/exam_room) +"lQT" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/grass, +/area/station/service/hydroponics) "lRd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/event_spawn, @@ -36871,6 +36949,7 @@ /obj/structure/cable, /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/cup/bucket, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "mes" = ( @@ -36949,10 +37028,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/green/filled/line, -/obj/effect/landmark/start/botanist, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/closet/secure_closet/hydroponics, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "mfG" = ( @@ -37189,7 +37268,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/machinery/cryopod, +/obj/structure/chair/sofa/corp/left, /turf/open/floor/iron/grimy, /area/station/hallway/primary/fore) "mjh" = ( @@ -38084,8 +38163,10 @@ /turf/open/floor/iron, /area/station/security/prison/garden) "mza" = ( -/obj/structure/closet/secure_closet/hydroponics, -/turf/open/floor/iron/dark, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/machinery/light/directional/east, +/mob/living/basic/chicken, +/turf/open/misc/sandy_dirt, /area/station/service/hydroponics) "mzp" = ( /obj/machinery/disposal/bin, @@ -38101,11 +38182,8 @@ /turf/open/floor/iron, /area/station/command/bridge) "mzs" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/wardrobe/hydro_wardrobe, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron/checker, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/floor/grass, /area/station/service/hydroponics) "mzt" = ( /obj/structure/flora/grass/jungle/a/style_random{ @@ -39094,6 +39172,11 @@ /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/science/genetics) +"mQx" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/grass, +/area/station/service/hydroponics) "mQB" = ( /obj/effect/turf_decal/arrows/white, /obj/effect/turf_decal/stripes/line{ @@ -39681,13 +39764,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"nax" = ( -/obj/machinery/computer/cryopod{ - pixel_y = -32; - dir = 1 - }, -/turf/open/floor/iron/grimy, -/area/station/hallway/primary/fore) "naC" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/camera/directional/west{ @@ -42778,6 +42854,13 @@ /mob/living/basic/mining/legion, /turf/open/floor/plating, /area/station/cargo/warehouse) +"ofX" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/flora/bush/sparsegrass/style_random, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "ogg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -44343,6 +44426,13 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) +"oIM" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "oIS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -44486,7 +44576,7 @@ /obj/structure/window/reinforced/spawner{ dir = 1 }, -/obj/machinery/cryopod, +/obj/structure/chair/sofa/corp/right, /turf/open/floor/iron/grimy, /area/station/hallway/primary/fore) "oLG" = ( @@ -44553,10 +44643,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/green/filled/line, -/obj/effect/landmark/start/botanist, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/closet/secure_closet/hydroponics, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "oNo" = ( @@ -45393,6 +45483,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/grimy, /area/station/security/prison) +"pbW" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "pbY" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/table/wood, @@ -45890,13 +45984,13 @@ /turf/open/floor/wood, /area/station/maintenance/starboard/fore) "pjX" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/secure_closet/hydroponics, /obj/structure/sign/poster/contraband/kudzu{ pixel_x = 32 }, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron/checker, +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/grass, /area/station/service/hydroponics) "pjZ" = ( /obj/effect/turf_decal/tile/yellow{ @@ -46778,7 +46872,6 @@ /area/station/command/heads_quarters/hop) "pxH" = ( /obj/machinery/hydroponics/constructable, -/obj/structure/railing/corner, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/hydroponics) @@ -49594,6 +49687,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/closet/secure_closet/hydroponics, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "qvi" = ( @@ -54703,6 +54797,11 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) +"sbK" = ( +/obj/structure/flora/bush/flowers_br/style_random, +/mob/living/basic/chicken, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "sbX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -56993,6 +57092,7 @@ /turf/open/floor/iron, /area/station/command/bridge) "sNo" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "sNx" = ( @@ -57272,11 +57372,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"sRh" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron/checker, -/area/station/service/hydroponics) "sRi" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ @@ -57791,6 +57886,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/starboard) +"tai" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/mob/living/basic/chicken, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "tav" = ( /obj/structure/cable, /obj/effect/turf_decal/bot, @@ -58320,6 +58422,13 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/security/brig) +"tjf" = ( +/obj/structure/window/reinforced/spawner{ + dir = 1 + }, +/obj/structure/chair/sofa/corp, +/turf/open/floor/iron/grimy, +/area/station/hallway/primary/fore) "tjv" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63672,6 +63781,15 @@ /obj/structure/cable, /turf/open/floor/grass, /area/station/security/prison/garden) +"uXn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/chicken_grinder, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/grass, +/area/station/service/hydroponics) "uXB" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/firecloset, @@ -65831,6 +65949,16 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"vFt" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/mob/living/basic/chicken, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics) "vFv" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66859,15 +66987,11 @@ /turf/open/floor/plating, /area/station/service/chapel/monastery) "vTs" = ( -/obj/machinery/hydroponics/constructable, -/obj/item/seeds/apple, -/obj/item/reagent_containers/cup/bottle/nutrient/l4z, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, -/obj/item/seeds/tower{ - pixel_y = -6 - }, -/turf/open/floor/plating, +/obj/machinery/fishing_portal_generator, +/obj/effect/turf_decal/bot/right, +/turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "vTt" = ( /obj/effect/decal/cleanable/dirt, @@ -67022,6 +67146,49 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"vVv" = ( +/obj/structure/flora/bush/sparsegrass/style_random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/table/glass, +/obj/item/chicken_book, +/obj/item/chicken_book, +/obj/item/chicken_book, +/obj/item/chicken_book, +/obj/item/chicken_scanner{ + pixel_x = 6 + }, +/obj/item/chicken_scanner{ + pixel_x = 6 + }, +/obj/item/chicken_scanner{ + pixel_x = 6 + }, +/obj/item/chicken_scanner{ + pixel_x = 6 + }, +/obj/item/chicken_feed{ + pixel_y = 2; + pixel_x = -5 + }, +/obj/machinery/feed_machine{ + pixel_y = 1; + pixel_x = 9 + }, +/obj/item/storage/bag/egg{ + pixel_y = 8 + }, +/obj/item/storage/bag/egg{ + pixel_y = 8 + }, +/obj/item/storage/bag/egg{ + pixel_y = 8 + }, +/obj/item/storage/bag/egg{ + pixel_y = 8 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/grass, +/area/station/service/hydroponics) "vVw" = ( /turf/closed/wall/r_wall/rust, /area/station/science/lab) @@ -68877,14 +69044,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/hop) -"wzp" = ( -/obj/machinery/hydroponics/constructable, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/service/hydroponics) "wzr" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -69071,6 +69230,7 @@ /area/station/cargo/miningoffice) "wCh" = ( /obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/bridge) "wCR" = ( @@ -69341,24 +69501,14 @@ "wGA" = ( /obj/structure/table, /obj/structure/railing, -/obj/item/seeds/potato{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/seeds/sugarcane{ - pixel_x = -3; +/obj/effect/turf_decal/bot, +/obj/item/aquarium_kit, +/obj/item/fishing_rod, +/obj/item/fish_feed{ pixel_y = 3 }, -/obj/item/seeds/wheat{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/seeds/random{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/spray/cleaner, -/obj/effect/turf_decal/bot, +/obj/item/fishing_hook, +/obj/item/fishing_line, /turf/open/floor/iron, /area/station/service/hydroponics) "wGD" = ( @@ -69457,6 +69607,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/green/opposingcorners, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/watering_can, +/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron, /area/station/service/hydroponics) "wHQ" = ( @@ -73548,6 +73701,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/maintenance/fore) +"xZt" = ( +/obj/structure/flora/bush/flowers_yw/style_random, +/turf/open/floor/grass, +/area/station/service/hydroponics) "xZL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73740,8 +73897,9 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "ycr" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron/dark, +/obj/structure/flora/bush/grassy/style_random, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/grass, /area/station/service/hydroponics) "ycs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -97079,7 +97237,7 @@ yeY eFR fVJ oLs -nax +hsJ dkh jUU nqm @@ -97335,7 +97493,7 @@ qlC tbn lLp aWI -oLs +tjf nCA cXZ kxU @@ -108156,10 +108314,10 @@ hat wxq hat hat -ejQ -ejQ -ejQ -ejQ +byw +iCA +mQx +ofX ejQ arl kEm @@ -108414,10 +108572,10 @@ eeb gTA jHT mzs -ejQ +iCA ycr -ejQ -ejQ +gtv +sbK arl qHT lzv @@ -108670,11 +108828,11 @@ pxH vJN hat qvh -sRh -ejQ -ejQ -ejQ -ejQ +iCA +xZt +eMM +gtv +iAB arl cfK vcm @@ -108927,10 +109085,10 @@ cXg bQb aMe mfF -fKS -ejQ -ycr -ejQ +dfx +dfx +vVv +ifW cSq arl rmL @@ -109185,10 +109343,10 @@ xvj aMe oNk kbT -ejQ -ejQ -ejQ -ejQ +hxX +uXn +oIM +tai arl xWm eON @@ -109437,14 +109595,14 @@ fLv rbO wYk qVz -wzp +pxH dcF hat gmj -kbT -ejQ -ycr -ejQ +ckC +lQT +gJP +pbW ejQ arl arl @@ -109699,10 +109857,10 @@ eYd fmV pqu pjX +vFt mza -mza -ejQ -ejQ +eKM +eKM xoW rQs xoW From b0e245f4773665d0d49a5f954c075f77d7770783 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 16:08:49 +0100 Subject: [PATCH 05/59] stray decal --- _maps/map_files/KiloStation/KiloStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index b002cc3de00b..944bad5c2813 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -23163,7 +23163,6 @@ /obj/structure/extinguisher_cabinet/directional/south{ pixel_x = 26 }, -/obj/effect/turf_decal/tile/blue, /obj/structure/cable, /obj/effect/turf_decal/tile/green{ dir = 1 From 2eca4a11c9f3f0e8f0f6ff1b3ce0e204919a46fe Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 16:33:30 +0100 Subject: [PATCH 06/59] total tesla engine makeover and removal of singulo (it breaks everything, who did this) --- .../RandomEngines/KiloStation/singularity.dmm | 821 ++++++++++++++---- 1 file changed, 665 insertions(+), 156 deletions(-) diff --git a/_maps/~monkestation/RandomEngines/KiloStation/singularity.dmm b/_maps/~monkestation/RandomEngines/KiloStation/singularity.dmm index ae0b4e69c26f..0c57762c474b 100644 --- a/_maps/~monkestation/RandomEngines/KiloStation/singularity.dmm +++ b/_maps/~monkestation/RandomEngines/KiloStation/singularity.dmm @@ -5,6 +5,14 @@ /obj/item/flashlight/lamp, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"bd" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "cY" = ( @@ -48,6 +56,30 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"gj" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"gG" = ( +/obj/machinery/power/energy_accumulator/grounding_rod, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "gS" = ( /obj/structure/cable, /obj/machinery/power/emitter{ @@ -103,6 +135,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "jc" = ( @@ -121,6 +163,42 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"js" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/grounding_rod, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"jw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "kf" = ( /obj/machinery/field/generator, /turf/open/floor/plating/airless, @@ -159,9 +237,35 @@ /obj/item/stack/cable_coil, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"lY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "lZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"mf" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"mC" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "mS" = ( @@ -189,6 +293,7 @@ /obj/machinery/power/terminal{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "ob" = ( @@ -199,30 +304,75 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/siding/yellow{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "oe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/window/plasma, /obj/structure/cable/multilayer/connected, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "or" = ( -/obj/machinery/power/rad_collector, -/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/siding/yellow{ + dir = 5 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"ow" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/engineering/glass{ + name = "Space Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "oK" = ( /turf/open/floor/iron, /area/station/engineering/supermatter/room) "oN" = ( /obj/machinery/light/blacklight/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/machinery/camera/emp_proof/directional/west{ c_tag = "Singularity Engine #2" }, +/obj/effect/turf_decal/siding/yellow{ + dir = 9 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "pa" = ( @@ -238,6 +388,9 @@ /obj/structure/chair/sofa/corp{ dir = 4 }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "ql" = ( @@ -252,6 +405,18 @@ /area/station/engineering/supermatter/room) "re" = ( /obj/machinery/light/blacklight/directional/east, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "ru" = ( @@ -284,15 +449,35 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"sn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/energy_accumulator/tesla_coil, +/obj/effect/turf_decal/siding/yellow{ + dir = 9 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "sz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"th" = ( -/obj/machinery/camera/emp_proof/directional/north{ - c_tag = "Singularity Engine #3" - }, -/turf/open/floor/plating, +"ta" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, /area/station/engineering/supermatter/room) "tB" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ @@ -327,6 +512,26 @@ "xs" = ( /obj/structure/cable, /obj/structure/cable/layer1, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"xt" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "xG" = ( @@ -334,6 +539,7 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "xZ" = ( @@ -370,16 +576,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"zH" = ( -/obj/machinery/the_singularitygen, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "zP" = ( /turf/template_noop, /area/template_noop) "Ar" = ( /turf/closed/wall/rust, /area/station/engineering/supermatter/room) +"Bl" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "BM" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -399,6 +605,15 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "Cu" = ( @@ -417,8 +632,21 @@ "DA" = ( /obj/machinery/light/blacklight/directional/north, /obj/structure/cable, -/obj/structure/window/plasma, -/obj/machinery/camera/emp_proof/directional/south, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"Ei" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "En" = ( @@ -442,11 +670,12 @@ /area/station/engineering/supermatter/room) "Fj" = ( /obj/structure/cable, -/obj/structure/window/plasma, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) -"Fu" = ( -/obj/machinery/light/cold/no_nightlight/directional/east, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "FB" = ( @@ -454,24 +683,50 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"Ga" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable/layer1, +"GX" = ( /obj/structure/cable, -/turf/open/space/basic, -/area/space) +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "Hs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "HV" = ( -/obj/machinery/power/energy_accumulator/grounding_rod, +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"HX" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "Ib" = ( /obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "Ii" = ( @@ -494,9 +749,20 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"JC" = ( -/obj/structure/window/plasma, -/obj/structure/cable, +"IT" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "JH" = ( @@ -507,17 +773,38 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"Ka" = ( +/obj/structure/cable, +/obj/machinery/power/energy_accumulator/tesla_coil, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"Kj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "KY" = ( /obj/machinery/light/blacklight/directional/east, -/obj/machinery/power/energy_accumulator/grounding_rod, +/obj/effect/turf_decal/siding/yellow{ + dir = 6 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"Lc" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "Le" = ( /obj/structure/particle_accelerator/end_cap, /obj/effect/turf_decal/stripes/line{ @@ -525,12 +812,38 @@ }, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"LD" = ( -/obj/machinery/light/blacklight/directional/north, -/obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/machinery/camera/emp_proof/directional/north{ - c_tag = "Singularity Engine #1" +"Lg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/energy_accumulator/tesla_coil, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"LD" = ( +/obj/machinery/light/blacklight/directional/north, +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera/emp_proof/directional/north{ + c_tag = "Singularity Engine #1" + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) @@ -543,6 +856,29 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"Ml" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 6 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"MX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "Nv" = ( @@ -565,6 +901,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "NK" = ( @@ -585,12 +922,20 @@ /obj/machinery/light/blacklight/directional/east, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"OT" = ( -/obj/machinery/the_singularitygen/tesla, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"Pj" = ( -/turf/open/floor/plating, +"OE" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, /area/station/engineering/supermatter/room) "PO" = ( /obj/effect/turf_decal/stripes/line{ @@ -605,6 +950,18 @@ "Qj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "Qn" = ( @@ -623,6 +980,33 @@ /obj/structure/chair/sofa/corp/left{ dir = 4 }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"QH" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/chair/sofa/corp{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"QQ" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "Rx" = ( @@ -639,25 +1023,65 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"RV" = ( -/obj/structure/particle_accelerator/particle_emitter/right, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "Su" = ( /obj/effect/turf_decal/bot, /obj/machinery/power/emitter, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"Sw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"SJ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "SM" = ( /obj/structure/cable/multilayer/connected, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"Tk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "Uk" = ( -/obj/machinery/power/energy_accumulator/tesla_coil, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"Un" = ( +/obj/structure/particle_accelerator/particle_emitter/right, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"Ur" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "Uv" = ( @@ -674,11 +1098,26 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "UA" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"UG" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "UP" = ( @@ -688,6 +1127,12 @@ "UU" = ( /obj/machinery/power/smes/engineering, /obj/structure/cable, +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "Vk" = ( @@ -698,7 +1143,35 @@ /turf/closed/wall/r_wall/rust, /area/station/engineering/supermatter/room) "VI" = ( -/obj/machinery/power/rad_collector, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/light/cold/no_nightlight/directional/east, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"VM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/the_singularitygen/tesla, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "Wl" = ( @@ -711,19 +1184,32 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"WN" = ( +/obj/structure/cable, +/obj/structure/cable/layer1, +/obj/machinery/light/directional/south, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "WU" = ( /obj/structure/cable, /obj/machinery/light/blacklight/directional/north, +/obj/effect/turf_decal/siding/yellow{ + dir = 9 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "WZ" = ( /turf/open/space/basic, /area/space/nearstation) -"Xz" = ( -/obj/machinery/power/energy_accumulator/tesla_coil, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "XV" = ( /obj/structure/cable, /obj/structure/cable/layer1, @@ -770,6 +1256,29 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"ZH" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) +"ZL" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) (1,1,1) = {" zP @@ -813,9 +1322,9 @@ zs zs zs zs -zs -zs -zs +zP +zP +zP "} (3,1,1) = {" zs @@ -829,16 +1338,16 @@ zP zP zP zs -pk -iW -iW +sn +jw +js iW BT ob zs -OT -zH -zs +zP +zP +zP "} (4,1,1) = {" zs @@ -852,16 +1361,16 @@ zs zs zs zs -pk -Ib -oK -oK +Lg +Ka +gG +Bl oK UU zs -th -Pj zs +zs +zP "} (5,1,1) = {" zs @@ -873,18 +1382,18 @@ pa zP zs oN -Zp -Zp -Zp -Ib +IT +zs +VM +Ei Ib SM qW xs is yw -Pj zs +zP "} (6,1,1) = {" zs @@ -895,53 +1404,53 @@ zs zs hV Nv -iW -oK +Kj +lY +ow +Zp +Uk oK -or -VI -VI -Xz +Uk Uk HV zs -yw -Lc +WN zs +zP "} (7,1,1) = {" zs WU -oK -oK -oK +QQ +ZL +OE re -oK -pk -iW -oK -Fu +bd +Tk +Kj +Ml +zs or +mC VI -VI -Xz -Uk +ZH +ZH KY zs yw -Pj zs +zP "} (8,1,1) = {" rz -Ib -oK -oK +HX +Uk +Uk QB -pJ +QH pJ JH -Ib +SJ zs zs zs @@ -953,13 +1462,13 @@ zs zs jc zs -zs +zP "} (9,1,1) = {" fN -Ib -oK -oK +gj +Uk +Uk oK hD hD @@ -972,7 +1481,7 @@ IJ cY cY cY -Ga +vF vF XV cY @@ -1003,10 +1512,10 @@ IJ "} (11,1,1) = {" rz -Ib -oK -oK -pk +xt +Uk +Uk +MX Ii Ii aJ @@ -1029,11 +1538,11 @@ pa UA Hs NK -pk +MX lZ lZ lZ -Fj +mf RL WZ zu @@ -1049,14 +1558,14 @@ rP "} (13,1,1) = {" zs -Ib -oK +xt +Uk pk -PO -Dm -kM -EK -Fj +oK +UG +Uk +Uk +GX RL WZ zu @@ -1072,14 +1581,14 @@ rP "} (14,1,1) = {" ic -Ib -oK +Ur +Uk pk -Le -UP -PV -LZ -Fj +PO +Dm +kM +EK +GX RL WZ zu @@ -1095,14 +1604,14 @@ rP "} (15,1,1) = {" rz -Ib -oK +xt +Uk pk -Yj -uW -uW -RV -Fj +Le +UP +PV +LZ +GX RL WZ zu @@ -1118,14 +1627,14 @@ rP "} (16,1,1) = {" rz -Ib -oK +HX +Uk NK -pk -oK -oK -oK -Fj +Yj +uW +uW +Un +GX RL WZ zu @@ -1141,14 +1650,14 @@ rP "} (17,1,1) = {" rz -Ib -oK +HX +Uk Mb IL IL IL -IL -Fj +Sw +mf RL WZ zu @@ -1164,14 +1673,14 @@ rP "} (18,1,1) = {" ic -Ib -oK -oK +Ur +Uk +Uk eP oK -oK -Ii -JC +Uk +ta +mf RL WZ zu From 46fb2afc4388e82a72f1d65428de6f5ac2b699a7 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 16:41:21 +0100 Subject: [PATCH 07/59] final tweaks (i think) --- _maps/map_files/KiloStation/KiloStation.dmm | 48 ++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 944bad5c2813..d8b219d1aeb0 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -120132,14 +120132,14 @@ aaa acm acK acm -acm -qJs -acm -acK -acK -acK -acm -qJs +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120389,14 +120389,14 @@ aaa acK qDp acm -acm -aaQ -aeo -aeo -acm -aeo -aeo -aaQ +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -120647,7 +120647,7 @@ acm eiW aaa aaa -acm +aaa aaa aaa aaa @@ -120903,11 +120903,11 @@ aaa acm viq aaQ -aeo -aeo -acm -aeo -acm +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -121160,7 +121160,7 @@ aaa acm viq aaa -acm +aaa aaa aaa aaa @@ -121417,7 +121417,7 @@ aaa acm acK aeo -aeo +aaa aaa aaa aaa From eb431a4e3bf98e39f8c1b230c5840c686314e603 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 17:03:05 +0100 Subject: [PATCH 08/59] fixes linters --- _maps/map_files/KiloStation/KiloStation.dmm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index d8b219d1aeb0..ec9fc1581e01 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -20991,7 +20991,6 @@ "gXU" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, /obj/structure/grille/broken, /obj/item/clothing/gloves/color/fyellow, /obj/item/flashlight, @@ -42562,7 +42561,7 @@ /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, /obj/machinery/door/window/left/directional/north{ - name = "Kitchen Delivery Access"; + name = ssss; req_access = list("kitchen") }, /obj/machinery/navbeacon{ @@ -58723,7 +58722,7 @@ }, /obj/machinery/door/window/left/directional/east{ req_access = list("hydroponics"); - name = "hydroponics delivery access" + name = Hydroponics Delivery Access }, /obj/structure/plasticflaps/opaque, /turf/open/floor/iron/dark, From d4bd94ada7b69265ed885f0400fd4469b8da5e1b Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 17:10:01 +0100 Subject: [PATCH 09/59] oops --- _maps/map_files/KiloStation/KiloStation.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ec9fc1581e01..8ebadd352f35 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -42560,14 +42560,14 @@ "obq" = ( /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - name = ssss; - req_access = list("kitchen") - }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=1"; location = "Kitchen" }, +/obj/machinery/door/window/left/directional/north{ + name = "Kitchen Delivery Access"; + req_access = list("kitchen") + }, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "obM" = ( From 0d5d34f92cb4a9260ab08a47f731bb616ac869b2 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 17:13:12 +0100 Subject: [PATCH 10/59] fixes it fr fr this time --- _maps/map_files/KiloStation/KiloStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 8ebadd352f35..58b391f2a2a7 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -58722,7 +58722,7 @@ }, /obj/machinery/door/window/left/directional/east{ req_access = list("hydroponics"); - name = Hydroponics Delivery Access + name = "HydroponicsDeliveryAccess" }, /obj/structure/plasticflaps/opaque, /turf/open/floor/iron/dark, From a1611f7e5af19e2c28ad820cafaa87a5a68e1964 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 18:09:50 +0100 Subject: [PATCH 11/59] kilo artsci, move the russians a little to prevent a deathtrap --- _maps/map_files/KiloStation/KiloStation.dmm | 981 ++++++++++++++------ 1 file changed, 688 insertions(+), 293 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 58b391f2a2a7..0e380bfcbaea 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -2591,6 +2591,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/science/xenobiology) +"aQn" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/artsci{ + pixel_y = 5; + pixel_x = 8 + }, +/obj/item/analysis_bin, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/explab) "aQs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3418,6 +3428,19 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"bje" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + name = "Experimentation Lab"; + space_dir = 4; + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "bji" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -5708,6 +5731,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"cbn" = ( +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "cbp" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5950,6 +5977,14 @@ /obj/structure/sign/poster/contraband/revolver, /turf/closed/wall, /area/station/commons/locker) +"cef" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/science/explab) "ceg" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -6165,6 +6200,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) +"chd" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/spawner/random/clothing/costume, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "chg" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ @@ -8066,6 +8109,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) +"cRm" = ( +/obj/effect/artifact_spawner, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "cRq" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -9361,6 +9409,11 @@ }, /turf/open/floor/iron, /area/station/security/prison/safe) +"dmy" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/explab) "dmA" = ( /obj/effect/turf_decal/tile/purple, /obj/item/kirbyplants{ @@ -10947,6 +11000,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +"dMU" = ( +/obj/machinery/atmospherics/components/unary/artifact_heatingpad{ + dir = 4 + }, +/obj/item/toy/plush/lizard_plushie, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/engine, +/area/station/science/explab) "dMW" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/water_source/puddle, @@ -10969,6 +11030,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"dNH" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "dNL" = ( /obj/machinery/computer/security/telescreen/interrogation{ name = "isolation room monitor"; @@ -11087,6 +11154,17 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"dQb" = ( +/obj/machinery/door/airlock/external{ + name = "Experimentation Science Lab"; + space_dir = 4; + dir = 4 + }, +/obj/structure/fans/tiny, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/science/explab) "dQx" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -15935,7 +16013,6 @@ /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, /obj/structure/chair/stool/directional/west, -/mob/living/basic/trooper/russian/ranged/lootless, /turf/open/floor/plating, /area/station/maintenance/starboard) "fuX" = ( @@ -17237,6 +17314,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard) +"fMR" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/explab) "fNe" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -17749,6 +17832,12 @@ /obj/structure/noticeboard/directional/west, /turf/open/floor/iron, /area/station/service/hydroponics) +"fVh" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 4 + }, +/turf/open/floor/plating, +/area/space/nearstation) "fVj" = ( /obj/machinery/door/airlock/public/glass{ name = "Docking Hallway" @@ -17940,6 +18029,14 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/service/hydroponics) +"fYT" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "fYU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/depsec/medical, @@ -18018,6 +18115,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"gaY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, +/turf/open/floor/engine, +/area/station/science/explab) "gba" = ( /obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/north{ @@ -19334,6 +19435,11 @@ /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/closed/wall, /area/station/security/checkpoint/engineering) +"gwB" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/space/basic, +/area/space/nearstation) "gwI" = ( /obj/structure/chair{ dir = 8 @@ -21665,6 +21771,19 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/ai_monitored/command/nuke_storage) +"hjG" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Artifact Science Lab" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "hjJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22048,6 +22167,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) +"hod" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "hoz" = ( /obj/structure/table/wood, /obj/structure/mirror/directional/west, @@ -23917,6 +24043,12 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/engine/telecomms, /area/station/tcommsat/server) +"hQZ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/space/basic, +/area/space/nearstation) "hRa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -25086,6 +25218,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/office) +"ijq" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "ijr" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 @@ -25818,6 +25959,9 @@ "isS" = ( /turf/open/floor/iron/grimy, /area/station/security/prison) +"iti" = ( +/turf/open/floor/engine, +/area/station/science/explab) "itn" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/command/nuke_storage) @@ -27996,6 +28140,11 @@ "jbt" = ( /turf/closed/wall/mineral/plastitanium, /area/station/maintenance/starboard) +"jbA" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/basic/trooper/russian/ranged/lootless, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "jbP" = ( /obj/structure/flora/rock/pile/style_random, /obj/effect/turf_decal/stripes/line{ @@ -28234,6 +28383,11 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"jfG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "jfK" = ( /obj/structure/table/glass, /obj/item/stack/package_wrap, @@ -29958,6 +30112,20 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) +"jLt" = ( +/obj/effect/landmark/start/scientist, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "jLy" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -31884,6 +32052,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/gateway) +"kwl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "kwm" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/iron, @@ -32937,6 +33112,11 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) +"kOp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "kOt" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -33825,6 +34005,11 @@ /obj/item/clothing/mask/russian_balaclava, /turf/open/floor/iron/dark, /area/station/security/lockers) +"lbE" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "lbJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -36174,6 +36359,16 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/command/bridge) +"lPn" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "lPU" = ( /obj/machinery/shower/directional/west, /turf/open/floor/plastic, @@ -36186,6 +36381,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/cargo/warehouse) +"lQd" = ( +/obj/machinery/artifact_zapper, +/turf/open/floor/engine, +/area/station/science/explab) "lQj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/yellow{ @@ -38679,6 +38878,20 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"mHr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "mHu" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -39401,6 +39614,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"mTo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "mTz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39491,6 +39710,17 @@ }, /turf/open/floor/iron, /area/station/engineering/hallway) +"mVF" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/nearstation) "mVL" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -40336,6 +40566,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/detectives_office) +"nma" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/nearstation) "nmo" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 @@ -41853,6 +42095,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"nMm" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/nearstation) "nMB" = ( /obj/machinery/computer/records/security{ dir = 1 @@ -42056,6 +42309,14 @@ /obj/effect/turf_decal/box, /turf/open/floor/engine, /area/station/science/xenobiology) +"nQI" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "nQK" = ( /turf/closed/wall/r_wall/rust, /area/station/security/prison/shower) @@ -44634,6 +44895,13 @@ }, /turf/open/floor/iron/grimy, /area/station/security/prison) +"oNi" = ( +/obj/machinery/artifact_xray, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) "oNk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -48651,6 +48919,11 @@ }, /turf/open/floor/iron/dark, /area/station/service/kitchen) +"qbW" = ( +/obj/effect/spawner/random/structure/crate, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "qbY" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -49444,6 +49717,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard) +"qqo" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "qqJ" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -50135,6 +50418,18 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +"qDh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "qDp" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -52852,6 +53147,18 @@ /mob/living/basic/mining/legion, /turf/open/misc/asteroid/lowpressure, /area/space/nearstation) +"rvf" = ( +/obj/machinery/door/airlock/external{ + name = "Experimentation Lab"; + space_dir = 4; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "rvj" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -53397,7 +53704,6 @@ /obj/structure/spider/stickyweb, /obj/effect/mapping_helpers/broken_floor, /obj/effect/turf_decal/siding/wood, -/mob/living/basic/trooper/russian/ranged/lootless, /turf/open/floor/plating, /area/station/maintenance/starboard) "rEi" = ( @@ -54636,6 +54942,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/cargo/warehouse) +"rZs" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/space/basic, +/area/station/science/explab) "rZE" = ( /obj/effect/turf_decal/siding/blue/corner{ dir = 8 @@ -55751,6 +56061,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) +"sre" = ( +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "srf" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -56160,6 +56473,10 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) +"syQ" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "syS" = ( /obj/structure/chair/office/light{ dir = 4 @@ -56727,6 +57044,14 @@ /obj/machinery/computer/nanite_chamber_control, /turf/open/floor/iron/dark, /area/station/science/lab) +"sIp" = ( +/obj/effect/spawner/random/trash/garbage, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "sIq" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -57978,6 +58303,12 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"tbR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "tbS" = ( /obj/machinery/door/airlock/mining/glass{ name = "Drone Control" @@ -58722,7 +59053,7 @@ }, /obj/machinery/door/window/left/directional/east{ req_access = list("hydroponics"); - name = "HydroponicsDeliveryAccess" + name = HydroponicsDeliveryAccess }, /obj/structure/plasticflaps/opaque, /turf/open/floor/iron/dark, @@ -59009,6 +59340,9 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) +"tqX" = ( +/turf/open/space/basic, +/area/station/cargo/mining/asteroid_magnet) "tqZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, @@ -59938,6 +60272,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"tGX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "tGZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65417,6 +65756,16 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/engineering/atmos/pumproom) +"vxK" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/nearstation) "vxL" = ( /obj/structure/chair{ dir = 1 @@ -68865,6 +69214,12 @@ }, /turf/open/floor/engine, /area/station/engineering/gravity_generator) +"wwA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "wwC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69721,6 +70076,10 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"wIU" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "wIY" = ( /obj/structure/table, /obj/item/assembly/timer, @@ -70366,6 +70725,15 @@ }, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/qm) +"wUx" = ( +/obj/machinery/asteroid_magnet{ + center_x = 128; + center_y = 58; + area_size = 3 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/explab) "wUU" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -70929,6 +71297,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/mob/living/basic/trooper/russian/ranged/lootless, /turf/open/floor/plating, /area/station/maintenance/department/electrical) "xeP" = ( @@ -70963,6 +71332,15 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/maintenance/department/security) +"xfQ" = ( +/obj/effect/artifact_spawner, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "xfU" = ( /obj/item/circuitboard/computer/solar_control, /turf/open/misc/asteroid/airless, @@ -71792,6 +72170,11 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"xuD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "xuG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -72765,6 +73148,9 @@ /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/carpet/green, /area/station/maintenance/port/greater) +"xKo" = ( +/turf/closed/wall, +/area/station/science/explab) "xKr" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue{ @@ -73255,6 +73641,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"xSI" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/cable, +/turf/open/space/basic, +/area/space/nearstation) "xSO" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral, @@ -114457,7 +114852,7 @@ qpZ wCY nDp vOX -fkP +jbA lDu lDu wzI @@ -114957,7 +115352,7 @@ kIY eLx rZV rZV -rZV +hjG vOX rZV rZV @@ -115213,8 +115608,8 @@ nxa czH smb rZV -aeu -aeu +qbW +fYT asj jtD ntG @@ -115470,8 +115865,8 @@ sJS chc vOX vOX -aeu -aeu +xuD +mTo rpl iAR qyn @@ -115726,9 +116121,9 @@ rZV rZV vOX rZV -aeu -aeu -aeu +chd +kOp +sIp rpl rpl rau @@ -115979,13 +116374,13 @@ aeu aeu aeu aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu +rZV +lbE +wIU +hod +kwl +tbR +tGX asj pSu esO @@ -116236,13 +116631,13 @@ aaa aaa aeu aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu +rZV +rvf +rZV +jfG +jfG +wwA +syQ rpl hkd eki @@ -116493,13 +116888,13 @@ aaa aaa aaa aaa -aaa -aeu -aeu -aeu -aeu -aeu -aeu +rZV +lbE +rZV +rZV +rZV +rZV +rZV rpl adT bFu @@ -116750,9 +117145,9 @@ aaa aaa aaa aaa -aaa -aaa -aeU +rZV +bje +rZV aeu aeu aeu @@ -117002,13 +117397,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +nMm +nma +nma +nma +nma +xSI +vxK aUz aeU aeu @@ -117259,7 +117654,7 @@ aaa aaa aaa aaa -aaa +mVF aaa aaa aaa @@ -117516,7 +117911,7 @@ aaa aaa aaa aaa -aaa +mVF aaa aaa aaa @@ -117773,7 +118168,7 @@ aaa aaa aaa aaa -aaa +mVF aaa aaa aaa @@ -118029,8 +118424,8 @@ aaa aaa aaa aaa -aaa -aaa +fVh +mVF aaa aaa aaa @@ -118284,13 +118679,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acK +acK +gwB +hQZ +acK +acK +acK aaa aaa aaa @@ -118540,15 +118935,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acK +acK +xKo +xKo +dQb +xKo +xKo +acK +acK aaa aaa aaa @@ -118797,15 +119192,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acK +xKo +xKo +cef +qDh +dmy +xKo +xKo +acK aaa aaa aaa @@ -118970,101 +119365,101 @@ aaa aaa aaa aaa -"} -(174,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aeU -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeU -aeu -aeU -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -mDD -lxG -gFt -mSq -lLH -wUU -cnq -oNI -hOs -lXP -dME -itR -dgw -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +"} +(174,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aeU +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeU +aeu +aeU +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +mDD +lxG +gFt +mSq +lLH +wUU +cnq +oNI +hOs +lXP +dME +itR +dgw +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +acK +rZs +fMR +gaY +mHr +dNH +xfQ +rZs +acK +aaa +aaa aaa aaa aaa @@ -119311,15 +119706,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acK +rZs +iti +dMU +jLt +sre +cRm +rZs +acK aaa aaa aaa @@ -119568,15 +119963,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acK +rZs +lQd +iti +lPn +cbn +nQI +rZs +acK aaa aaa aaa @@ -119825,15 +120220,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acK +xKo +xKo +oNi +qqo +ijq +xKo +xKo +acK aaa aaa aaa @@ -120082,15 +120477,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acK +acK +xKo +wUx +sre +aQn +xKo +acK +acK aaa aaa aaa @@ -120340,13 +120735,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acK +xKo +rZs +rZs +rZs +xKo +acK aaa aaa aaa @@ -120597,15 +120992,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oRy +oRy +oRy +oRy +oRy +oRy +oRy +oRy +oRy aaa aaa aaa @@ -120854,15 +121249,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy aaa aaa aaa @@ -121111,15 +121506,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy aaa aaa aaa @@ -121368,15 +121763,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaB -aaa -aaa +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy aaa aaa aaa @@ -121625,15 +122020,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy aaa aaa aaa @@ -121882,15 +122277,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy aaa aaa aaa @@ -122139,15 +122534,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy aaa aaa aaa @@ -122396,15 +122791,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy aaa aaa aaa @@ -122653,15 +123048,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oRy +oRy +oRy +oRy +oRy +oRy +oRy +oRy +oRy aaa aaa aaa @@ -123437,7 +123832,7 @@ aaa aaa aaa aaa -aaa +aaB aaa aaa aaa From c52e27214d58480e8e689523bf0998894943068b Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 18:12:26 +0100 Subject: [PATCH 12/59] stops a warcrime --- _maps/map_files/KiloStation/KiloStation.dmm | 25 ++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 0e380bfcbaea..45c9367da3ad 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -8374,6 +8374,11 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, /area/station/hallway/secondary/entry) +"cVy" = ( +/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space) "cVH" = ( /obj/structure/closet/secure_closet/hop, /obj/effect/turf_decal/bot, @@ -120991,8 +120996,6 @@ aaa aaa aaa aaa -aaa -oRy oRy oRy oRy @@ -121001,6 +121004,8 @@ oRy oRy oRy oRy +cVy +aaa aaa aaa aaa @@ -121248,7 +121253,6 @@ aaa aaa aaa aaa -aaa oRy tqX tqX @@ -121263,6 +121267,7 @@ aaa aaa aaa aaa +aaa aeo aaa aeo @@ -121505,7 +121510,6 @@ aaa aaa aaa aaa -aaa oRy tqX tqX @@ -121520,6 +121524,7 @@ aaa aaa aaa aaa +aaa aaQ aaa aeo @@ -121762,7 +121767,6 @@ aaa aaa aaa aaa -aaa oRy tqX tqX @@ -121779,6 +121783,7 @@ aaa aaa aaa aaa +aaa aaQ aaa aaa @@ -122019,7 +122024,6 @@ aaa aaa aaa aaa -aaa oRy tqX tqX @@ -122034,6 +122038,7 @@ aaa aaa aaa aaa +aaa aaQ acm aaQ @@ -122276,7 +122281,6 @@ aaa aaa aaa aaa -aaa oRy tqX tqX @@ -122292,6 +122296,7 @@ aaa aaa aaa aaa +aaa aeo aaa aeo @@ -122533,7 +122538,6 @@ aaa aaa aaa aaa -aaa oRy tqX tqX @@ -122549,6 +122553,7 @@ aaa aaa aaa aaa +aaa aeo acm aaQ @@ -122790,7 +122795,6 @@ aeU aaa aaa aaa -aaa oRy tqX tqX @@ -122806,6 +122810,7 @@ aaa aaa aaa aaa +aaa aeo aaa aeo @@ -123047,7 +123052,6 @@ aeU aaa aaa aaa -aaa oRy oRy oRy @@ -123065,6 +123069,7 @@ aaa aaa aaa aaa +aaa aeo aeo aeo From a821c347338df1d2e04273e959a43c5caa93e191 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 18:14:24 +0100 Subject: [PATCH 13/59] bruh --- _maps/map_files/KiloStation/KiloStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 45c9367da3ad..21984ed554aa 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -59058,7 +59058,7 @@ }, /obj/machinery/door/window/left/directional/east{ req_access = list("hydroponics"); - name = HydroponicsDeliveryAccess + name = "HydroponicsDeliveryAccess" }, /obj/structure/plasticflaps/opaque, /turf/open/floor/iron/dark, From 309df6459ccc35b3b975acb2e49ea355a9b5ec07 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 18:17:28 +0100 Subject: [PATCH 14/59] i forgor mining gear --- _maps/map_files/KiloStation/KiloStation.dmm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 21984ed554aa..a8fb8af9d8f9 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -8374,11 +8374,6 @@ /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, /area/station/hallway/secondary/entry) -"cVy" = ( -/obj/structure/lattice/catwalk, -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space) "cVH" = ( /obj/structure/closet/secure_closet/hop, /obj/effect/turf_decal/bot, @@ -25230,6 +25225,13 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 }, +/obj/structure/rack, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "ijr" = ( @@ -121004,7 +121006,7 @@ oRy oRy oRy oRy -cVy +oRy aaa aaa aaa From f869f61924778719913e90f3e94be55a0aacea9d Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 18:27:58 +0100 Subject: [PATCH 15/59] removes a stray apc --- _maps/map_files/KiloStation/KiloStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index a8fb8af9d8f9..c71676513201 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -22171,7 +22171,6 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "hoz" = ( From b30f536c45bd612d0013e881ff0fd5db3b4dc5cf Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 18:36:09 +0100 Subject: [PATCH 16/59] forgot a plating under windows --- _maps/map_files/KiloStation/KiloStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index c71676513201..e5eed49bb0d5 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -54950,7 +54950,7 @@ /area/station/cargo/warehouse) "rZs" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/space/basic, +/turf/open/floor/plating, /area/station/science/explab) "rZE" = ( /obj/effect/turf_decal/siding/blue/corner{ From 94e482434ad8e254d58c648e2b8823806de4a778 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 21:02:08 +0100 Subject: [PATCH 17/59] removed weird map artifacts, made maint a little more dangerous, cryo signs, made artsci entrace more obvious --- _maps/map_files/KiloStation/KiloStation.dmm | 161 +++++++++++--------- 1 file changed, 90 insertions(+), 71 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index e5eed49bb0d5..ac37c19d8203 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -497,12 +497,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/grille/broken, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/maintenance/starboard) "aeZ" = ( /obj/effect/turf_decal/stripes/line{ @@ -5145,6 +5143,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/sign/poster/contraband/random/directional/west, +/obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard) "bQN" = ( @@ -7350,6 +7349,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/sign/directions/cryo/directional/south{ + pixel_x = -32; + pixel_y = -40 + }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "cAl" = ( @@ -7906,6 +7909,9 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/structure/sign/directions/cryo/directional/north{ + pixel_x = -32 + }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "cLL" = ( @@ -12256,6 +12262,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, /obj/structure/extinguisher_cabinet/directional/east, +/mob/living/basic/trooper/russian/ranged/lootless, /turf/open/floor/plating, /area/station/maintenance/department/electrical) "ekm" = ( @@ -13791,9 +13798,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/sign/poster/contraband/random/directional/north, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/obj/structure/sign/directions/science{ + dir = 4; + pixel_x = -32; + pixel_y = 30 + }, +/turf/open/floor/iron/dark, /area/station/maintenance/starboard) "eKk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14586,6 +14596,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/sign/directions/cryo/directional/north{ + pixel_x = -32 + }, /turf/open/floor/iron, /area/station/hallway/primary/aft) "eYE" = ( @@ -15849,9 +15862,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/sign/poster/contraband/random/directional/west, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/maintenance/starboard) "fsu" = ( /obj/effect/turf_decal/box, @@ -16006,15 +16017,6 @@ "fuB" = ( /turf/closed/wall/rust, /area/station/maintenance/starboard/aft) -"fuV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/chair/stool/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "fuX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17482,6 +17484,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/sign/directions/cryo/directional/east{ + pixel_y = 32 + }, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -18399,18 +18404,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) -"gfe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sign/directions/evac{ - dir = 8; - pixel_y = 24 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "gfi" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -37367,6 +37360,13 @@ dir = 1 }, /area/station/hallway/primary/starboard) +"mhz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "mhP" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -44479,6 +44479,7 @@ /area/station/maintenance/port/greater) "oFt" = ( /obj/machinery/light/small/directional/east, +/mob/living/basic/trooper/syndicate/melee, /turf/open/floor/carpet/green, /area/station/maintenance/port/greater) "oFC" = ( @@ -45562,7 +45563,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/mob/living/basic/goat/pete, /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) @@ -46613,6 +46613,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"pnR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/mapping_helpers/dead_body_placer, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "pog" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46784,6 +46793,11 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"pqG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "pqS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -48194,6 +48208,7 @@ id = "hopqueue"; name = "Queue Shutters" }, +/obj/structure/sign/directions/cryo/directional/east, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "pPj" = ( @@ -50502,6 +50517,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/departments/evac/directional/north, /obj/effect/turf_decal/caution/stand_clear, +/obj/structure/sign/directions/cryo/directional/east{ + pixel_y = 41 + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "qEh" = ( @@ -51794,8 +51812,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/maintenance/starboard) "qZx" = ( /turf/closed/wall/r_wall/rust, @@ -52705,7 +52722,6 @@ /turf/open/misc/asteroid/airless, /area/station/engineering/gravity_generator) "rqi" = ( -/obj/structure/sign/poster/official/pda_ad, /turf/closed/wall, /area/station/command/heads_quarters/hop) "rqm" = ( @@ -54463,6 +54479,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/sign/directions/cryo/directional/east{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "rQs" = ( @@ -55608,9 +55627,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/sign/poster/contraband/random/directional/east, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/obj/structure/sign/directions/science{ + dir = 4; + pixel_y = 10; + pixel_x = 32 + }, +/turf/open/floor/iron/dark, /area/station/maintenance/starboard) "sjG" = ( /obj/effect/spawner/structure/window/reinforced/tinted, @@ -56483,17 +56505,6 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard) -"syS" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/mob/living/basic/parrot/poly, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) "syZ" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -65268,8 +65279,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/maintenance/starboard) "vqg" = ( /obj/item/kirbyplants{ @@ -68151,7 +68161,6 @@ "weV" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/lights/mixed, -/obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) "weW" = ( @@ -70990,6 +70999,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, +/mob/living/basic/mining/goliath, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "wZW" = ( @@ -71303,7 +71313,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/mob/living/basic/trooper/russian/ranged/lootless, /turf/open/floor/plating, /area/station/maintenance/department/electrical) "xeP" = ( @@ -72281,7 +72290,6 @@ "xvC" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, -/mob/living/basic/sloth, /turf/open/space/basic, /area/station/solars/port/fore) "xvF" = ( @@ -72584,8 +72592,7 @@ /area/station/maintenance/port/fore) "xAL" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/maintenance/starboard) "xAQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73148,6 +73155,18 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) +"xJY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/sign/directions/science{ + dir = 1; + pixel_y = 40; + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "xKn" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -95291,7 +95310,7 @@ aaa aaa aaa aaa -syS +aaa aaa aaa aaa @@ -113566,7 +113585,7 @@ gpI qmW vuI lDu -xZL +mhz vqe kYB oLH @@ -114080,7 +114099,7 @@ jhN iXD wRn lDu -xZL +mhz rZV tMW lDu @@ -114337,7 +114356,7 @@ lDu oLH lDu lDu -gfe +mhz syF mKC lDu @@ -114589,7 +114608,7 @@ rZV mfI weV roO -mxo +pqG guT xAL rZV @@ -114844,18 +114863,18 @@ mxo hUD gmJ rjR -xZL +mhz sjo -wCY -xZL -xZL +mhz +mhz +mhz fsp -wCY -fuV +xJY +mhz bQD pio qpZ -wCY +pnR nDp vOX jbA @@ -115100,8 +115119,8 @@ rZV oIp mrt fsd -xZL -wCY +mrt +mhz rZV cQJ iFd @@ -122549,7 +122568,7 @@ tqX tqX oRy aaa -aaa +aaB aaa aaa aaa @@ -123838,7 +123857,7 @@ aaa aaa aaa aaa -aaB +aaa aaa aaa aaa From ac61cfbdc931d0c9b7af58a5fc3bc456459826a4 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 16 Mar 2024 21:33:28 +0100 Subject: [PATCH 18/59] firelocks and removes one fire alarm --- _maps/map_files/KiloStation/KiloStation.dmm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ac37c19d8203..302e24b05ae0 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -27997,7 +27997,6 @@ "iYW" = ( /obj/machinery/vending/wardrobe/viro_wardrobe, /obj/effect/turf_decal/delivery, -/obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/medical/pathology) @@ -33334,6 +33333,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, /obj/structure/cable, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/bitrunning/den) "kRu" = ( @@ -60595,6 +60595,7 @@ /obj/machinery/door/airlock/glass{ name = "Cryogenic Storage" }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "tNW" = ( From 11a637e8e4e3b1109db75ca2a2c0bb3abbf35dc3 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sun, 17 Mar 2024 13:17:32 +0100 Subject: [PATCH 19/59] brig rework, dead body placers near dangerous locations --- _maps/map_files/KiloStation/KiloStation.dmm | 3370 ++++++++++--------- 1 file changed, 1749 insertions(+), 1621 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 302e24b05ae0..5da6462d189e 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -147,14 +147,6 @@ /obj/item/storage/medkit/regular, /turf/open/floor/iron/showroomfloor, /area/station/security/office) -"abB" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Brig Control" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/armory, -/turf/open/floor/iron/dark, -/area/station/security/warden) "abC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/circuit/green{ @@ -205,24 +197,11 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "ach" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/effect/decal/cleanable/blood/old, -/obj/machinery/camera/directional/south{ - c_tag = "Autopsy Room"; - name = "detective camera" - }, -/obj/effect/landmark/generic_maintenance_landmark, -/obj/effect/landmark/start/detective, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/detectives_office) +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "acj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/hydroponics/constructable, @@ -265,6 +244,14 @@ /obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"acv" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/port/lesser) "acx" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/stripes/corner{ @@ -534,8 +521,15 @@ /turf/open/floor/iron, /area/station/engineering/main) "afL" = ( -/turf/closed/wall, -/area/station/command/heads_quarters/hos) +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "afQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -628,6 +622,10 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"ahZ" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/security/processing) "aia" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1399,13 +1397,8 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "ate" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/evidence) +/turf/open/lava, +/area/station/security/brig) "ath" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/engineering, @@ -1975,6 +1968,15 @@ /obj/structure/girder, /turf/open/floor/plating/airless, /area/space/nearstation) +"aEk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/security/processing) "aEC" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -2014,6 +2016,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/tcommsat/computer) +"aFL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/mob_spawn/corpse/human/damaged, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "aGd" = ( /obj/structure/table, /obj/machinery/camera/directional/west{ @@ -2128,6 +2139,17 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/office) +"aHI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig) "aHQ" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/secure_closet/chief_medical, @@ -2139,13 +2161,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) -"aIl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) "aIq" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall, @@ -2287,6 +2302,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/interrogation) "aLC" = ( @@ -2657,16 +2673,6 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/foyer) -"aSo" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "aSr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2761,6 +2767,11 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/recharge_floor, /area/station/science/robotics/mechbay) +"aUc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "aUh" = ( /obj/effect/turf_decal/bot, /obj/structure/safe{ @@ -3686,7 +3697,7 @@ /area/station/engineering/gravity_generator) "bnY" = ( /obj/structure/sign/departments/security, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/station/security/detectives_office) "bod" = ( /obj/structure/disposalpipe/segment{ @@ -3695,6 +3706,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/fore) +"bol" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "boo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/machinery/door/window/left/directional/south{ @@ -3720,8 +3739,11 @@ /area/station/maintenance/starboard/fore) "boE" = ( /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "boZ" = ( /obj/structure/table, /obj/item/storage/box/syringes{ @@ -3746,12 +3768,12 @@ /area/station/science/xenobiology) "bpg" = ( /obj/structure/rack, -/obj/effect/turf_decal/bot, /obj/item/wrench, /obj/item/crowbar/red, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/lockers) "bpj" = ( @@ -4066,14 +4088,18 @@ "btI" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/red, -/obj/item/kirbyplants{ - icon_state = "plant-02"; - pixel_y = 3 - }, /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -4204,6 +4230,16 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/medical/central) +"bxa" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "bxs" = ( /obj/effect/turf_decal/box, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -4321,7 +4357,12 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/security/office) "bzo" = ( @@ -4747,10 +4788,10 @@ /area/station/hallway/primary/starboard) "bHv" = ( /obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot, /obj/machinery/status_display/evac/directional/north, /obj/item/clothing/mask/russian_balaclava, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/lockers) "bHB" = ( @@ -4862,15 +4903,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"bJm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/security/brig) "bJv" = ( /turf/open/floor/engine{ name = "Holodeck Projector Floor" @@ -5391,16 +5423,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/airless, /area/space/nearstation) -"bUJ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/security{ - name = "Evidence" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/evidence) "bUN" = ( /turf/open/floor/plating/airless, /area/space) @@ -5713,17 +5735,17 @@ /turf/open/floor/iron/showroomfloor, /area/station/ai_monitored/security/armory) "caS" = ( -/obj/machinery/computer/security{ - dir = 8 +/obj/structure/chair/office{ + dir = 1 }, -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/landmark/start/warden, +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 }, -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "cbf" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6402,8 +6424,12 @@ /turf/open/floor/grass, /area/station/service/hydroponics/garden) "ciY" = ( -/turf/closed/wall/rust, -/area/station/security/warden) +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "cjl" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -6640,12 +6666,12 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "clN" = ( -/obj/structure/chair/office{ - dir = 1 - }, +/obj/structure/closet/secure_closet/evidence, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/evidence) "clQ" = ( /obj/structure/chair/sofa/left/maroon{ dir = 8 @@ -6672,12 +6698,15 @@ /turf/open/floor/iron, /area/station/cargo/storage) "cmc" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/bed/dogbed/mcgriff, +/mob/living/basic/pet/dog/pug/mcgriff, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron/dark, -/area/station/maintenance/aft) +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "cml" = ( /turf/closed/wall/rust, /area/station/service/library) @@ -6815,7 +6844,7 @@ }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "cpC" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -6919,6 +6948,8 @@ "crh" = ( /obj/structure/cable, /obj/machinery/holopad/secure, +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) "crk" = ( @@ -7058,16 +7089,15 @@ /turf/open/misc/asteroid/airless, /area/space/nearstation) "ctv" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/closet{ + name = "evidence closet" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/holopad, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) +/turf/open/floor/iron/dark, +/area/station/security/evidence) "ctx" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/tile/yellow, @@ -8199,14 +8229,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"cSX" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/security/warden) "cTh" = ( /obj/machinery/porta_turret/ai{ dir = 1 @@ -8755,9 +8777,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/fore) -"dbu" = ( -/turf/closed/wall/rust, -/area/station/maintenance/department/security) "dbK" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -9314,16 +9333,11 @@ /turf/open/floor/plastic, /area/station/hallway/secondary/service) "dkI" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "dkL" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -9389,6 +9403,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) +"dlO" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/processing) "dlS" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/engine/vacuum, @@ -9986,13 +10009,11 @@ /turf/open/floor/iron/dark, /area/station/commons/storage/primary) "dup" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "duA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/masks, @@ -10165,6 +10186,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/interrogation) "dxm" = ( @@ -10257,15 +10279,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) -"dzy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/landmark/start/warden, -/obj/structure/chair/office, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) "dzL" = ( /obj/machinery/modular_computer/console/preset/engineering{ dir = 8 @@ -10417,6 +10430,13 @@ /obj/item/food/cracker, /turf/open/floor/carpet/royalblue, /area/station/service/chapel/office) +"dCw" = ( +/obj/structure/chair/sofa/corp{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "dCM" = ( /turf/closed/wall/rust, /area/station/service/bar/atrium) @@ -10457,6 +10477,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/fore) +"dDR" = ( +/obj/structure/chair/sofa/corp/left{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "dEc" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -10645,6 +10672,7 @@ /area/station/service/chapel/office) "dIq" = ( /obj/structure/cable, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical/pathology) "dIv" = ( @@ -10866,7 +10894,6 @@ /turf/closed/wall/r_wall/rust, /area/station/command/heads_quarters/captain/private) "dKK" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Security Office" }, @@ -10874,6 +10901,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/office) "dKN" = ( @@ -10996,7 +11024,6 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/photocopier, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) @@ -11023,6 +11050,29 @@ /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, /area/station/science/genetics) +"dNk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/obj/machinery/button/door/directional/east{ + pixel_y = -8; + name = "Armoury Shutter Toggle"; + id = "sidearmory"; + req_access = list("brig") + }, +/obj/machinery/button/door/directional/east{ + pixel_y = 8; + name = "Prison Lockdown"; + id = "prisonblast"; + req_access = list("brig") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "dNx" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -11069,14 +11119,12 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "dOk" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/wood/fancy, +/obj/machinery/microwave, +/obj/effect/spawner/random/food_or_drink/donkpockets, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "dOz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -11118,6 +11166,18 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"dPi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/security/brig) "dPn" = ( /obj/structure/cable, /obj/machinery/photocopier, @@ -11608,6 +11668,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/blood/old, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/interrogation) "dXI" = ( @@ -11828,6 +11889,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/office) "ecf" = ( @@ -12318,15 +12380,12 @@ /area/station/service/bar) "elg" = ( /obj/machinery/light/small/directional/north, -/obj/structure/table/optable{ - name = "Forensics Operating Table" - }, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/blood/old, -/obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark, -/area/station/security/detectives_office) +/area/station/maintenance/port/lesser) "elw" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -12677,18 +12736,15 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "eqK" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/taperecorder{ - pixel_x = 4; - pixel_y = 2 +/obj/structure/closet{ + name = "evidence closet" }, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/evidence) "eqV" = ( /obj/structure/table, /obj/item/tank/jetpack/carbondioxide{ @@ -12754,14 +12810,14 @@ /area/station/medical/pharmacy) "erN" = ( /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "esn" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -12800,12 +12856,13 @@ /turf/closed/wall/r_wall/rust, /area/station/maintenance/port/fore) "esK" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) +/turf/open/floor/iron/dark, +/area/station/security/evidence) "esO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -12847,19 +12904,9 @@ /turf/open/floor/iron, /area/station/engineering/main) "etB" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/lighter{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/item/clothing/mask/cigarette/cigar, /obj/machinery/light/directional/west, /obj/machinery/airalarm/directional/west, -/obj/item/paper_bin, +/obj/machinery/photocopier, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) "etD" = ( @@ -13416,15 +13463,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/storage) -"eDx" = ( -/obj/machinery/firealarm/directional/east, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/security/brig) "eDT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13828,6 +13866,15 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +"eKE" = ( +/obj/structure/table, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/obj/item/storage/box/deputy, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/warden) "eKG" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -13843,9 +13890,14 @@ /turf/open/misc/sandy_dirt, /area/station/service/hydroponics) "eKT" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) +/obj/structure/table, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "eKU" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/bot, @@ -14075,14 +14127,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"ePe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "ePf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15178,14 +15222,13 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) "fiR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/computer/security{ dir = 1 }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/processing) +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/warden) "fiY" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -15361,15 +15404,7 @@ /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) "flt" = ( -/obj/structure/bed, -/obj/machinery/iv_drip, -/obj/item/bedsheet/medical, -/obj/effect/decal/cleanable/blood/old, /obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "flH" = ( @@ -15438,10 +15473,15 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/airlock/engineering{ + name = "Emergency Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) "fmx" = ( @@ -15811,13 +15851,20 @@ /turf/closed/wall/r_wall, /area/station/science/genetics) "frP" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron/checker, -/area/station/security/processing/cremation) +/obj/machinery/door/airlock/security/glass{ + name = "Transferring Centre" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/processing) "frT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15975,6 +16022,13 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) +"fud" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/processing) "fun" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood{ @@ -16464,6 +16518,21 @@ dir = 8 }, /area/station/service/chapel) +"fAY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_x = -7 + }, +/obj/machinery/recharger{ + pixel_x = 7 + }, +/obj/item/toy/figure/warden, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/warden) "fBh" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ @@ -16711,18 +16780,6 @@ }, /turf/open/floor/iron, /area/station/commons/locker) -"fEe" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/item/folder/red, -/obj/machinery/door/window/brigdoor/left/directional/north{ - dir = 2; - name = "Brig Control Desk"; - req_access = list("armory") - }, -/turf/open/floor/plating, -/area/station/security/warden) "fEj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16851,13 +16908,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"fGC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/evidence) "fGI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17525,22 +17575,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/office) "fPQ" = ( -/obj/structure/table/glass, -/obj/item/clothing/gloves/latex, -/obj/item/healthanalyzer, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "fQb" = ( @@ -17839,7 +17873,8 @@ /area/station/service/hydroponics) "fVh" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 4 + dir = 4; + piping_layer = 2 }, /turf/open/floor/plating, /area/space/nearstation) @@ -17943,8 +17978,9 @@ }, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "fXm" = ( /obj/structure/table, /obj/item/clipboard, @@ -18810,12 +18846,11 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "gmn" = ( -/obj/structure/grille/broken, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/iron/dark, +/area/station/security/warden) "gmo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/structure/window/reinforced, @@ -18979,20 +19014,13 @@ /turf/open/floor/engine/n2o, /area/station/engineering/atmos) "gpy" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/security/glass{ - name = "Transferring Centre" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/unres, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark, -/area/station/security/processing) +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "gpz" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -19082,16 +19110,18 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "gqz" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Evidence Closet" + }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "gqD" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -19152,6 +19182,8 @@ fax_name = "Security Office"; name = "Security Office Fax Machine" }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/office) "gry" = ( @@ -19175,6 +19207,12 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/station/solars/port/fore) +"gsa" = ( +/obj/effect/turf_decal/bot, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/warden) "gse" = ( /obj/structure/chair/pew/left{ dir = 8 @@ -19323,12 +19361,9 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) "gtU" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark, -/area/station/maintenance/aft) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "gtW" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/rd) @@ -19396,13 +19431,6 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"gvx" = ( -/obj/structure/closet/secure_closet/evidence, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/evidence) "gvM" = ( /obj/structure/cable, /obj/structure/table, @@ -19666,11 +19694,9 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) "gBf" = ( -/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/port/lesser) "gBi" = ( @@ -20098,21 +20124,6 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/cmo) -"gHD" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/item/clothing/gloves/latex, -/obj/item/storage/backpack/duffelbag/sec/surgery{ - pixel_y = 5 - }, -/obj/item/clothing/mask/surgical, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm/directional/east, -/obj/machinery/status_display/ai/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/detectives_office) "gHE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20334,7 +20345,7 @@ /area/station/maintenance/department/electrical) "gLn" = ( /obj/structure/sign/departments/medbay/alt, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/station/security/medical) "gLp" = ( /obj/structure/window/reinforced/spawner, @@ -20425,6 +20436,17 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/fore) +"gMY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/security/office) "gNq" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, /obj/effect/turf_decal/bot, @@ -20966,6 +20988,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig) "gVp" = ( @@ -20996,8 +21019,15 @@ "gVv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/directional/east{ + c_tag = "Aft Hallway Transfer Centre Doors"; + name = "aft camera" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "gVC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21086,7 +21116,7 @@ /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "gXU" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -21536,6 +21566,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/office) "hgL" = ( @@ -21814,7 +21845,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "hkr" = ( /obj/machinery/computer/slot_machine, /obj/effect/turf_decal/bot_white, @@ -21847,6 +21878,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/office) "hkC" = ( @@ -22063,7 +22095,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "hnb" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -22313,6 +22345,8 @@ dir = 4 }, /obj/machinery/recharge_station, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/office) "hpY" = ( @@ -22426,7 +22460,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/research) "hsr" = ( -/obj/structure/cable, /obj/structure/sign/poster/contraband/random/directional/north, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -22443,12 +22476,14 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "hsB" = ( -/obj/structure/bodycontainer/morgue, /obj/effect/turf_decal/delivery, /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/structure/bodycontainer/crematorium{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/security/medical) "hsC" = ( @@ -22638,6 +22673,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/office) "hwN" = ( @@ -22968,13 +23005,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/science/ordnance) -"hCd" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) "hCl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -23121,10 +23151,6 @@ dir = 1 }, /area/station/hallway/primary/central/fore) -"hEh" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "hEk" = ( /obj/structure/table, /obj/item/stack/package_wrap, @@ -23151,6 +23177,10 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"hEp" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "hEw" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -23449,14 +23479,15 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "hJp" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/bot, -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/evidence) "hJy" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/vault{ @@ -23758,9 +23789,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) -"hNI" = ( -/turf/closed/wall/rust, -/area/station/security/detectives_office) "hNL" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, @@ -25111,7 +25139,7 @@ }, /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "igR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25198,14 +25226,6 @@ /obj/structure/cable/layer1, /turf/open/floor/engine, /area/station/engineering/gravity_generator) -"ijd" = ( -/obj/structure/chair/comfy/brown{ - color = "#c45c57"; - dir = 1 - }, -/obj/effect/landmark/start/head_of_security, -/turf/open/floor/carpet/red, -/area/station/command/heads_quarters/hos) "ijl" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -25480,6 +25500,12 @@ /obj/machinery/camera/directional/west{ c_tag = "Security Office Computers" }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/security/office) "ilJ" = ( @@ -25958,6 +25984,14 @@ "isS" = ( /turf/open/floor/iron/grimy, /area/station/security/prison) +"itf" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/security/office) "iti" = ( /turf/open/floor/engine, /area/station/science/explab) @@ -26142,10 +26176,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/checkpoint/science/research) -"iwL" = ( -/obj/structure/sign/warning/secure_area, -/turf/closed/wall, -/area/station/security/processing) "iwT" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/radiation, @@ -26483,19 +26513,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) -"iBy" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/security/glass{ - name = "Brig Control" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/security/armory, -/turf/open/floor/iron/dark, -/area/station/security/warden) "iBz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -27401,6 +27418,15 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/recharge_floor, /area/station/science/robotics/mechbay) +"iPU" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "iPY" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -27453,6 +27479,7 @@ }, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, +/obj/effect/mob_spawn/corpse/human/damaged, /turf/open/floor/plating, /area/station/maintenance/port/fore) "iRq" = ( @@ -27795,15 +27822,6 @@ /obj/structure/sign/poster/contraband/random/directional/south, /turf/closed/wall, /area/station/maintenance/port/lesser) -"iVV" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/evidence) "iWj" = ( /obj/structure/table, /obj/effect/turf_decal/bot, @@ -27990,10 +28008,16 @@ /area/station/bitrunning/den) "iYS" = ( /obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/firedoor, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/dark, -/area/station/security/processing) +/area/station/security/warden) "iYW" = ( /obj/machinery/vending/wardrobe/viro_wardrobe, /obj/effect/turf_decal/delivery, @@ -28012,14 +28036,13 @@ /turf/open/floor/iron/dark, /area/station/medical/storage) "iZv" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/processing) +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "iZB" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -28182,13 +28205,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"jck" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) "jco" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -28325,17 +28341,6 @@ }, /turf/open/floor/plating, /area/station/service/chapel) -"jeR" = ( -/obj/structure/table, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/evidence) "jeS" = ( /obj/machinery/atmospherics/miner/oxygen, /turf/open/floor/engine/o2, @@ -28466,14 +28471,19 @@ /turf/open/floor/iron/dark, /area/station/security/medical) "jgy" = ( -/obj/structure/closet/secure_closet/evidence, -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/security/evidence) +/mob/living/basic/clown{ + name = "Lost Cause"; + limb_destroyer = 1; + health = 1000; + desc = "Imprisoned for his many sins."; + maxHealth = 1000; + wound_bonus = 10 + }, +/obj/effect/decal/remains/human, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/fakebasalt, +/area/station/security/brig) "jgz" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -28742,8 +28752,15 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "jkk" = ( -/turf/closed/wall, -/area/station/security/evidence) +/obj/structure/sign/departments/security/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig) "jks" = ( /obj/effect/turf_decal/bot, /obj/structure/table, @@ -28865,7 +28882,7 @@ /turf/closed/wall/rust, /area/station/cargo/drone_bay) "joh" = ( -/turf/closed/wall/rust, +/turf/closed/wall/r_wall, /area/station/command/heads_quarters/hos) "jop" = ( /obj/effect/spawner/structure/window, @@ -28906,6 +28923,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/brig) "joS" = ( @@ -28958,7 +28977,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/satellite) "jqb" = ( -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/station/security/detectives_office) "jqt" = ( /obj/machinery/computer/bank_machine, @@ -28978,6 +28997,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mob_spawn/corpse/human/damaged, /turf/open/floor/carpet/green, /area/station/maintenance/port/greater) "jqV" = ( @@ -29193,6 +29213,16 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"juE" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/processing) "juL" = ( /obj/item/radio/intercom/directional/east, /obj/effect/decal/cleanable/dirt, @@ -29953,7 +29983,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -30006,6 +30035,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "jJW" = ( @@ -30131,15 +30161,15 @@ /obj/structure/sign/poster/official/help_others{ pixel_y = 32 }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) +/area/station/security/brig) "jLK" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30198,6 +30228,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/engineering/hallway) +"jMr" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/security/processing) "jMF" = ( /obj/structure/closet/emcloset/anchored, /obj/effect/turf_decal/bot, @@ -30210,10 +30248,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "jMK" = ( -/obj/effect/spawner/random/engineering/tracking_beacon, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "jMU" = ( /obj/item/kirbyplants{ icon_state = "plant-10" @@ -30479,14 +30519,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) -"jRR" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron/dark, -/area/station/maintenance/port/lesser) "jSu" = ( /obj/machinery/conveyor{ id = "garbage" @@ -30523,16 +30555,6 @@ /obj/structure/sign/warning/electric_shock, /turf/closed/wall/rust, /area/station/maintenance/aft) -"jSE" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/security{ - name = "Equipment Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "jSF" = ( /turf/open/floor/carpet/green, /area/station/cargo/warehouse) @@ -30725,6 +30747,10 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage_shared) +"jWQ" = ( +/obj/structure/sign/departments/security, +/turf/closed/wall/r_wall, +/area/station/maintenance/port/lesser) "jXd" = ( /obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/segment{ @@ -30762,12 +30788,9 @@ /turf/open/floor/iron/solarpanel/airless, /area/station/solars/starboard/aft) "jXN" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) +/turf/closed/wall/r_wall, +/area/station/security/brig) "jXX" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -30949,20 +30972,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/storage/tech) -"kay" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "kaM" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -31020,8 +31029,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, /turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) +/area/station/security/brig) "kbv" = ( /obj/effect/turf_decal/delivery, /obj/structure/reagent_dispensers/fueltank, @@ -31066,7 +31079,6 @@ /turf/open/floor/grass, /area/station/service/hydroponics) "kbV" = ( -/obj/structure/table, /obj/item/storage/box/evidence, /obj/item/taperecorder{ pixel_x = 5 @@ -31074,6 +31086,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/table, /turf/open/floor/iron/dark, /area/station/security/lockers) "kbY" = ( @@ -31161,6 +31174,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) "kcX" = ( @@ -31187,9 +31201,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"kem" = ( -/turf/closed/wall/rust, -/area/station/security/processing) "kep" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -31283,16 +31294,17 @@ /turf/open/floor/iron/solarpanel/airless, /area/station/solars/starboard/aft) "kgE" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Transferring Centre" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/security/glass{ + name = "Brig Control" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark, -/area/station/security/processing) +/turf/open/floor/iron, +/area/station/security/warden) "khe" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -31328,14 +31340,12 @@ "kio" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) "kir" = ( @@ -31415,23 +31425,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) -"kjl" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -5; - pixel_y = 7 - }, -/obj/item/pen{ - pixel_x = 8; - pixel_y = 5 - }, -/obj/item/pen/red{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/toy/figure/hos, -/turf/open/floor/carpet/red, -/area/station/command/heads_quarters/hos) "kju" = ( /obj/structure/chair/sofa/right/maroon{ dir = 8 @@ -31677,13 +31670,8 @@ /turf/open/floor/iron/white, /area/station/security/prison/safe) "kom" = ( -/obj/machinery/computer/security/telescreen/entertainment/directional/south, /obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/structure/bed/dogbed/cayenne{ - name = "Lia's bed" - }, -/mob/living/basic/carp/pet/lia, -/turf/open/floor/iron/dark, +/turf/closed/wall/r_wall, /area/station/command/heads_quarters/hos) "kox" = ( /obj/machinery/atmospherics/miner/carbon_dioxide, @@ -31924,9 +31912,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31995,9 +31980,6 @@ /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, /area/station/maintenance/port/aft) -"kvl" = ( -/turf/closed/wall/r_wall/rust, -/area/station/security/evidence) "kvo" = ( /obj/structure/table, /obj/machinery/firealarm/directional/west, @@ -32327,6 +32309,8 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) "kBP" = ( @@ -32702,18 +32686,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"kIz" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/item/folder/red, -/obj/item/pen, -/obj/machinery/door/window/left/directional/south{ - name = "Security Desk"; - req_access = list("security") - }, -/turf/open/floor/plating, -/area/station/hallway/primary/aft) "kIE" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, /obj/effect/turf_decal/bot, @@ -33007,6 +32979,16 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/aft) +"kND" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/security/processing) "kNG" = ( /obj/structure/sign/poster/official/help_others, /turf/closed/wall, @@ -33053,21 +33035,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "kNO" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/structure/closet/emcloset, -/obj/structure/sign/warning/secure_area/directional/south{ - name = "EMERGENCY STORAGE" - }, -/turf/open/floor/iron/dark, +/turf/closed/wall, /area/station/hallway/primary/central) "kNP" = ( /obj/effect/turf_decal/bot, @@ -33432,16 +33403,10 @@ /turf/open/floor/carpet/royalblue, /area/station/service/chapel/office) "kTe" = ( -/obj/structure/table/glass, -/obj/item/storage/medkit/regular, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/syringe, -/obj/machinery/camera/directional/east{ - c_tag = "Security Infirmary" +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "kTk" = ( @@ -33500,6 +33465,12 @@ /obj/structure/cable, /turf/open/floor/grass, /area/station/medical/psychology) +"kUr" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) "kUB" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral, @@ -33522,13 +33493,17 @@ /turf/closed/wall, /area/station/engineering/storage_shared) "kUV" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/button/crematorium/indestructible{ - pixel_x = 22 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 }, -/turf/open/floor/iron/checker, -/area/station/security/processing/cremation) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "kUX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -33714,6 +33689,14 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"kXK" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "kXN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -33902,6 +33885,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/security/brig) "kZU" = ( @@ -34133,6 +34117,7 @@ /obj/structure/cable, /mob/living/basic/lizard/eats_the_roaches, /obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical/pathology) "lea" = ( @@ -34144,19 +34129,14 @@ /turf/open/floor/iron/dark, /area/station/cargo/storage) "lep" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/computer/operating{ - name = "Forensics Operating Computer" - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, -/obj/machinery/airalarm/directional/north, -/obj/machinery/light_switch/directional/west, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron/dark, -/area/station/security/detectives_office) +/area/station/maintenance/port/lesser) "lev" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -34360,6 +34340,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"lhA" = ( +/obj/machinery/door/airlock/security{ + name = "Evidence" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "lhG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -34401,6 +34392,11 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"lik" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "lix" = ( /obj/structure/closet/secure_closet/brig{ name = "Prisoner Locker" @@ -34555,7 +34551,7 @@ /area/station/hallway/primary/starboard) "llh" = ( /obj/structure/sign/warning/electric_shock, -/turf/closed/wall/rust, +/turf/closed/wall/r_wall, /area/station/maintenance/port/lesser) "llj" = ( /obj/effect/decal/cleanable/dirt, @@ -34676,6 +34672,7 @@ /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/station/security/brig) "lmO" = ( @@ -34713,6 +34710,28 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) +"lnT" = ( +/obj/item/kirbyplants{ + icon_state = "plant-02"; + pixel_y = 3 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/processing) "lnU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34985,12 +35004,12 @@ /area/station/engineering/lobby) "lsb" = ( /obj/effect/turf_decal/bot, -/obj/structure/table, /obj/machinery/recharger, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/table, /turf/open/floor/iron, /area/station/command/heads_quarters/hos) "lsf" = ( @@ -35272,13 +35291,23 @@ /turf/open/floor/iron/dark, /area/station/security/evidence) "lwp" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/processing/cremation) -"lwu" = ( -/turf/closed/wall, -/area/station/security/medical) +/obj/machinery/door/airlock/security/glass{ + name = "Transferring Centre" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/processing) "lwT" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -35316,6 +35345,13 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) +"lxg" = ( +/obj/item/kirbyplants{ + icon_state = "plant-10" + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/warden) "lxo" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, @@ -35351,6 +35387,15 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) +"lxz" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "lxG" = ( /obj/structure/table, /obj/item/stock_parts/cell/high, @@ -35406,8 +35451,10 @@ }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "lyr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -35472,14 +35519,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"lAk" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) "lAr" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -35546,10 +35585,23 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "lAW" = ( -/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/security/glass{ + name = "Transferring Centre" + }, /obj/structure/cable, -/turf/open/floor/iron/checker, -/area/station/security/processing/cremation) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "lBj" = ( /obj/structure/table/wood, /obj/structure/cable, @@ -35728,7 +35780,6 @@ icon_state = "plant-02"; pixel_y = 3 }, -/obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -35828,8 +35879,10 @@ /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) "lGs" = ( -/turf/closed/wall, -/area/station/security/warden) +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "lGF" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -36304,16 +36357,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) -"lOY" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Evidence Closet" - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/evidence) "lOZ" = ( /obj/effect/turf_decal/box, /obj/machinery/shower/directional/west, @@ -36549,9 +36592,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) -"lTf" = ( -/turf/closed/wall/rust, -/area/station/security/medical) "lTu" = ( /obj/machinery/vending/drugs, /obj/structure/disposalpipe/segment{ @@ -36845,22 +36885,13 @@ /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "lYG" = ( -/obj/structure/closet/secure_closet/evidence, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/iron/dark, -/area/station/security/evidence) -"lYT" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/bed/maint, +/obj/item/bedsheet/clown, +/obj/item/toy/plush/lizard_plushie, +/turf/open/floor/fakebasalt, +/area/station/security/brig) "lYX" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, @@ -37099,6 +37130,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/brig) "mdB" = ( @@ -37183,15 +37217,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"mfd" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/airalarm/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/brig) "mff" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, @@ -37493,6 +37518,10 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"mjO" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/warden) "mjR" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/mapping_helpers/burnt_floor, @@ -37584,20 +37613,12 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "mlj" = ( -/obj/structure/table, -/obj/item/storage/box/deputy, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/obj/machinery/camera/directional/west{ - c_tag = "Warden's Office" - }, -/obj/structure/reagent_dispensers/wall/peppertank/directional/west, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/structure/table/optable, +/obj/machinery/button/crematorium/indestructible{ + pixel_x = 22 }, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/medical) "mlm" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; @@ -37799,6 +37820,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/office) "mob" = ( @@ -37863,15 +37887,10 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mpd" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/landmark/start/warden, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "mpv" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -37944,6 +37963,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard) +"mrw" = ( +/obj/structure/cable, +/obj/structure/table/wood, +/obj/item/stamp/hos, +/obj/item/stamp/denied{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/folder/red, +/obj/item/clipboard, +/turf/open/floor/carpet/red, +/area/station/command/heads_quarters/hos) "mrz" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -38012,6 +38043,15 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/station/maintenance/starboard) +"mrX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/security/brig) "msf" = ( /obj/structure/sign/painting/library_secure{ pixel_x = -32 @@ -38100,13 +38140,14 @@ }, /area/station/ai_monitored/turret_protected/ai) "mtI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bodycontainer/crematorium{ - dir = 4 +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/checker, -/area/station/security/processing/cremation) +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/processing) "mtN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38145,11 +38186,11 @@ /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "mun" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Brig" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/office) "muN" = ( @@ -38523,9 +38564,17 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "mCm" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/brigdoor/left/directional/north{ + dir = 2; + name = "Brig Control Desk"; + req_access = list("armory") + }, +/obj/item/folder/red, +/obj/effect/turf_decal/delivery, /turf/open/floor/plating, -/area/station/hallway/primary/aft) +/area/station/security/warden) "mCs" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38615,12 +38664,12 @@ /turf/closed/wall/rust, /area/station/cargo/warehouse) "mDJ" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Head of Security's Office" }, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/security/hos, +/obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "mDM" = ( @@ -38951,6 +39000,11 @@ dir = 4 }, /obj/structure/extinguisher_cabinet/directional/east, +/mob/living/basic/carp/pet/lia, +/obj/structure/bed/dogbed/cayenne{ + name = "Lia's bed" + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "mIT" = ( @@ -39512,9 +39566,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"mRp" = ( -/turf/closed/wall/rust, -/area/station/security/evidence) "mRF" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -39716,6 +39767,34 @@ }, /turf/open/floor/iron, /area/station/engineering/hallway) +"mVy" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; + name = "Bottle of Tears"; + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_y = 2 + }, +/obj/item/storage/box/seccarts{ + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/machinery/keycard_auth/directional/south{ + pixel_x = -6 + }, +/obj/machinery/button/door/directional/south{ + id = "hosspace"; + name = "Space Blast Door Toggle"; + pixel_x = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) "mVF" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -39997,7 +40076,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "naC" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/camera/directional/west{ @@ -40148,21 +40227,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"ncB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atm, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "ncC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/event_spawn, @@ -40528,18 +40592,6 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) -"njT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "nkd" = ( /obj/structure/table, /obj/item/storage/briefcase, @@ -41042,7 +41094,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "ntG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -41060,18 +41112,16 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "ntR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/closet/secure_closet/warden, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/turf/open/floor/iron, -/area/station/security/processing) +/turf/open/floor/iron/dark, +/area/station/security/warden) "nuf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -41102,6 +41152,10 @@ /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/red, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/station/security/office) "nuF" = ( @@ -41174,19 +41228,20 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/lab) "nvK" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/computer/security/telescreen/prison{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/computer/security{ - dir = 4 +/obj/machinery/firealarm/directional/east, +/obj/structure/table/glass, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 5; + pixel_y = -1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 }, +/obj/item/healthanalyzer, +/obj/item/clothing/gloves/latex, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/medical) "nvP" = ( /obj/structure/cable, /obj/machinery/duct, @@ -41350,6 +41405,17 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/space/nearstation) +"nxT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/security/processing) "nxY" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -41484,6 +41550,7 @@ dir = 8 }, /obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/interrogation) "nBZ" = ( @@ -41716,15 +41783,15 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/lab) "nFe" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/computer/prisoner/management{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 }, /turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) +/area/station/security/warden) "nFm" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -42148,6 +42215,9 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"nNR" = ( +/turf/closed/wall/r_wall, +/area/station/security/brig) "nNT" = ( /obj/structure/sign/departments/custodian, /turf/closed/wall, @@ -42187,7 +42257,7 @@ /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "nOJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42589,11 +42659,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/status_display/evac/directional/south, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "nYa" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -42602,6 +42673,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/machinery/pdapainter/security, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "nYo" = ( @@ -42782,6 +42854,15 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, /turf/open/space/basic, /area/space/nearstation) +"oaL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/processing) "oaO" = ( /obj/structure/disposalpipe/segment, /obj/structure/window/reinforced/spawner/directional/north, @@ -42897,6 +42978,14 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/security/execution/transfer) +"oct" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Security Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/security/office) "ocv" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -43002,6 +43091,15 @@ /obj/structure/flora/bush/pointy/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +"oea" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "oeF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, @@ -43145,6 +43243,12 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/lowpressure, /area/space/nearstation) +"ogJ" = ( +/obj/effect/landmark/start/warden, +/obj/structure/chair/office, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "ogM" = ( /obj/structure/table/wood/fancy, /obj/effect/turf_decal/siding/wideplating/dark/corner, @@ -43538,34 +43642,14 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) "ons" = ( -/obj/machinery/recharger{ - pixel_x = -7 - }, -/obj/machinery/recharger{ - pixel_x = 7 - }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/closet/secure_closet/evidence, +/obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/item/toy/figure/warden, -/obj/structure/table, -/obj/item/radio/intercom/directional/north{ - pixel_x = 32 - }, -/obj/machinery/button/door/directional/north{ - id = "sidearmory"; - name = "Armoury Shutter Toggle"; - pixel_x = -8; - req_access = list("armory") - }, -/obj/machinery/button/door/directional/north{ - id = "prisonblast"; - name = "Prison Lockdown"; - pixel_x = 8; - req_access = list("brig") - }, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/evidence) "oou" = ( /obj/machinery/telecomms/receiver/preset_right, /obj/effect/turf_decal/stripes/line{ @@ -44199,6 +44283,18 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/station/solars/starboard/aft) +"oAk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/processing) "oAo" = ( /obj/structure/cable, /obj/effect/landmark/start/hangover, @@ -44365,6 +44461,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/office) "oCt" = ( @@ -44692,6 +44789,16 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) +"oIC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/security/brig) "oIM" = ( /obj/structure/railing{ dir = 1 @@ -44818,7 +44925,7 @@ /turf/open/floor/wood, /area/station/service/library) "oKW" = ( -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/station/security/office) "oLa" = ( /obj/effect/turf_decal/bot, @@ -44833,6 +44940,16 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"oLk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/security/processing) "oLp" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/structure/lattice, @@ -45065,6 +45182,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/interrogation) "oQH" = ( @@ -45127,6 +45245,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/office) "oSf" = ( @@ -45341,6 +45460,24 @@ }, /turf/open/floor/iron/grimy, /area/station/security/prison/safe) +"oVb" = ( +/obj/structure/cable, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/item/toy/figure/hos, +/obj/item/pen{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/item/pen/red{ + pixel_x = 5; + pixel_y = 1 + }, +/turf/open/floor/carpet/red, +/area/station/command/heads_quarters/hos) "oVc" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt, @@ -45413,6 +45550,24 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) +"oWt" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Transferring Centre" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "oWx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -46619,7 +46774,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, -/obj/effect/mapping_helpers/dead_body_placer, +/obj/effect/mob_spawn/corpse/human/damaged, /turf/open/floor/plating, /area/station/maintenance/starboard) "pog" = ( @@ -46659,6 +46814,7 @@ "poO" = ( /obj/structure/cable, /obj/machinery/light/small/directional/east, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical/pathology) "poU" = ( @@ -46958,7 +47114,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "ptu" = ( /obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2, @@ -47035,11 +47191,8 @@ /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) "pvs" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/detective, -/turf/open/floor/iron/dark, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, /area/station/maintenance/port/lesser) "pvu" = ( /obj/machinery/vending/wardrobe/atmos_wardrobe, @@ -47281,6 +47434,23 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"pAy" = ( +/obj/item/multitool{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/structure/table, +/obj/item/flashlight, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/warden) "pAB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -47300,15 +47470,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"pAQ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Brig Control" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/armory, -/turf/open/floor/iron/dark, -/area/station/security/warden) "pBd" = ( /turf/closed/wall/rust, /area/station/medical/paramedic) @@ -47361,6 +47522,9 @@ /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/office) "pCj" = ( @@ -48775,6 +48939,7 @@ }, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, +/obj/effect/mob_spawn/corpse/human/damaged, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "qaR" = ( @@ -48845,16 +49010,14 @@ /turf/open/floor/iron/dark, /area/station/medical/storage) "qbv" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/security/glass{ - name = "Brig" - }, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, /area/station/security/brig) "qbA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -48872,14 +49035,15 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "qbB" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "hosspace"; - name = "Space Blast Door" +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/command/heads_quarters/hos) +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "qbE" = ( /obj/structure/altar_of_gods, /obj/effect/turf_decal/siding/wood{ @@ -48956,6 +49120,7 @@ }, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/security/brig) "qci" = ( @@ -48970,8 +49135,11 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "qcI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49512,10 +49680,12 @@ /turf/closed/wall/rust, /area/station/maintenance/fore) "qlD" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "qlV" = ( /obj/effect/turf_decal/stripes, /obj/effect/decal/cleanable/greenglow, @@ -49748,6 +49918,9 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) +"qqw" = ( +/turf/closed/wall/r_wall, +/area/station/security/warden) "qqJ" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -50033,14 +50206,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central) -"qvJ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "qvV" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -50094,20 +50259,13 @@ /turf/open/floor/carpet/green, /area/station/service/lawoffice) "qwi" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Transferring Centre" - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/security/processing) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "qwx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -50924,11 +51082,6 @@ /turf/open/floor/iron, /area/station/security/brig) "qKX" = ( -/obj/machinery/door/airlock/engineering{ - name = "Emergency Storage" - }, -/obj/effect/mapping_helpers/airlock/unres, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) "qLb" = ( @@ -50966,6 +51119,12 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/maintenance/port/fore) +"qMj" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/security/brig) "qMC" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -51224,6 +51383,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/office) "qRh" = ( @@ -51735,15 +51895,13 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "qXX" = ( -/obj/structure/closet{ - name = "evidence closet" - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/security/glass{ + name = "ULTRAMAX CONTAINMENT - DANGER" }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, -/area/station/security/evidence) +/area/station/security/brig) "qYr" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -52025,6 +52183,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/office) "rdc" = ( @@ -52392,6 +52552,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "rjR" = ( @@ -52548,6 +52711,14 @@ "rmT" = ( /obj/machinery/light_switch/directional/east, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/office) "rna" = ( @@ -53108,20 +53279,16 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "ruo" = ( -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/machinery/computer/security/telescreen/prison{ + dir = 8; + pixel_x = 24 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 }, -/obj/machinery/light/small/directional/east, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "rup" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -53138,15 +53305,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/storage) -"ruB" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "ruU" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -53587,6 +53745,15 @@ /obj/structure/transit_tube/curved/flipped, /turf/open/space/basic, /area/space/nearstation) +"rBB" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/security/processing) "rBE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/maintenance{ @@ -53729,16 +53896,9 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "rEi" = ( -/obj/structure/table/glass, -/obj/machinery/computer/records/medical/laptop, -/obj/machinery/vending/wallmed/directional/east, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "rEs" = ( @@ -53887,6 +54047,13 @@ }, /turf/open/floor/iron/dark, /area/station/service/bar/atrium) +"rGy" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "rGK" = ( /obj/structure/railing{ dir = 1 @@ -53896,6 +54063,32 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +"rGS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/button/door/directional/east{ + pixel_y = -8; + name = "Cell Blast Door Toggle"; + id = "brigcelldoor"; + req_access = list("brig") + }, +/obj/machinery/button/door/directional/east{ + pixel_y = 8; + name = "Front Blast Door Toggle"; + id = "brigfrontdoor"; + req_access = list("brig") + }, +/obj/machinery/camera/directional/east{ + c_tag = "Aft Hallway Transfer Centre Doors"; + name = "aft camera" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "rHc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/disposalpipe/segment{ @@ -54005,6 +54198,12 @@ /obj/item/hand_labeler, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"rIS" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) "rIY" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -54288,10 +54487,26 @@ "rNx" = ( /turf/closed/wall/r_wall/rust, /area/station/service/chapel) +"rNB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "rNJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "rNN" = ( @@ -54661,7 +54876,8 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/execution/education) "rRY" = ( -/turf/closed/wall/r_wall, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/dark, /area/station/security/interrogation) "rRZ" = ( /obj/effect/turf_decal/tile/blue{ @@ -54847,15 +55063,6 @@ dir = 1 }, /area/station/hallway/primary/port) -"rVE" = ( -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "rVY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -54884,22 +55091,6 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos/storage/gas) -"rXp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Aft Hallway Security Firelock"; - name = "aft camera" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "rXv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -54988,6 +55179,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/limb, +/obj/effect/mob_spawn/corpse/human/damaged, /turf/open/floor/plating, /area/station/maintenance/department/electrical) "rZN" = ( @@ -55483,10 +55675,6 @@ }, /turf/open/floor/iron, /area/station/security/processing) -"sgC" = ( -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/office) "sgW" = ( /obj/structure/window/reinforced/spawner/directional/east, /mob/living/carbon/human/species/monkey, @@ -55667,9 +55855,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/station/ai_monitored/command/nuke_storage) -"skC" = ( -/turf/closed/wall/rust, -/area/station/security/brig) "skM" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -55881,25 +56066,13 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "sow" = ( -/obj/item/kirbyplants{ - icon_state = "plant-02"; - pixel_y = 3 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/computer/crew{ dir = 1 }, -/turf/open/floor/iron, -/area/station/security/processing) +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/warden) "soB" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -56093,12 +56266,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "srf" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Brig" +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/turf/open/floor/iron/dark, +/turf/open/floor/iron, /area/station/security/brig) "srg" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -56389,6 +56560,10 @@ }, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) +"swd" = ( +/obj/structure/sign/warning, +/turf/closed/wall/r_wall, +/area/station/security/processing) "swA" = ( /obj/item/reagent_containers/cup/glass/flask/gold{ pixel_x = 3; @@ -56596,6 +56771,17 @@ "sAv" = ( /turf/closed/wall/r_wall, /area/station/security/prison) +"sAL" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) "sAR" = ( /obj/structure/table, /obj/item/stack/sheet/cardboard{ @@ -56725,21 +56911,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"sCJ" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/item/folder/red, -/obj/item/pen, -/obj/machinery/door/window/brigdoor/left/directional/north{ - name = "Brig Control Desk"; - req_access = list("armory") - }, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/turf/open/floor/plating, -/area/station/security/warden) "sCK" = ( /obj/machinery/computer/communications{ dir = 4 @@ -57039,14 +57210,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) -"sHD" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "sHX" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57359,7 +57522,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "sMe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/chair/office{ @@ -57643,14 +57806,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"sQw" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "brigcelldoor"; - name = "Cell Blast Door" - }, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) "sQx" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple, @@ -58046,6 +58201,7 @@ /obj/machinery/door/airlock/security/glass{ name = "Security Office" }, +/obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/office) @@ -58129,7 +58285,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "sYs" = ( /obj/structure/sign/departments/security, /turf/closed/wall/rust, @@ -58522,8 +58678,10 @@ /obj/effect/mapping_helpers/mail_sorting/security/detectives_office, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "tfi" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/sand/plating, @@ -58623,22 +58781,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "tgx" = ( -/obj/item/storage/toolbox/electrical{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/toolbox/mechanical, -/obj/item/multitool{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/item/flashlight, -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/evidence) "tgJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -58793,13 +58941,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"tjE" = ( -/obj/structure/sign/departments/security, -/turf/closed/wall, -/area/station/maintenance/aft) "tjO" = ( /obj/structure/sign/departments/medbay/alt, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/station/security/office) "tjR" = ( /obj/machinery/modular_computer/console/preset/research{ @@ -59477,7 +59621,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "ttt" = ( /obj/machinery/vending/games, /obj/effect/turf_decal/delivery, @@ -59759,16 +59903,11 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "tyk" = ( -/obj/structure/closet/secure_closet/warden, -/obj/effect/turf_decal/delivery, -/obj/machinery/firealarm/directional/north, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, +/obj/machinery/vending/wallmed/directional/east, +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/medical) "tyA" = ( /obj/structure/flora/bush/jungle/c/style_random, /turf/open/floor/grass, @@ -59897,6 +60036,9 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/office) "tAx" = ( @@ -60218,6 +60360,9 @@ /obj/machinery/computer/cloning, /turf/open/floor/iron/dark, /area/station/science/genetics) +"tFY" = ( +/turf/closed/wall/r_wall, +/area/station/security/execution/education) "tGb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60329,10 +60474,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) -"tIq" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/open/floor/plating, -/area/station/security/evidence) "tIu" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/small/directional/north, @@ -61045,15 +61186,11 @@ /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "tVS" = ( +/obj/structure/closet/secure_closet/evidence, /obj/effect/turf_decal/bot, -/obj/machinery/computer/prisoner/management{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, +/obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/evidence) "tWa" = ( /obj/machinery/computer/records/security, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -61212,6 +61349,14 @@ /obj/structure/cable, /turf/open/floor/grass, /area/station/security/prison/garden) +"tYf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "tYi" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -62134,14 +62279,17 @@ /turf/open/floor/iron, /area/station/security/prison/garden) "umJ" = ( -/obj/machinery/door/firedoor, /obj/structure/cable, -/obj/machinery/door/airlock/security/glass{ - name = "Cremator Room" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/security/armory, -/turf/open/floor/iron/checker, -/area/station/security/processing/cremation) +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/office) "umL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -62278,6 +62426,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage/gas) +"unX" = ( +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/fakebasalt, +/area/station/security/brig) "uok" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -62545,15 +62697,14 @@ /turf/closed/wall/r_wall, /area/station/engineering/gravity_generator) "usF" = ( -/obj/structure/sign/departments/security/directional/west, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "usV" = ( /obj/structure/table/wood, /obj/item/pai_card, @@ -62690,6 +62841,11 @@ /obj/structure/lattice, /turf/open/space/basic, /area/station/solars/starboard/aft) +"uvL" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/security/brig) "uvO" = ( /turf/closed/wall, /area/station/engineering/gravity_generator) @@ -63634,6 +63790,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig) "uNi" = ( @@ -63709,16 +63866,14 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "uOA" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/evidence) "uOB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/grimy, @@ -63769,11 +63924,11 @@ /area/station/engineering/atmos/pumproom) "uQj" = ( /obj/structure/cable, -/obj/machinery/pdapainter/security, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark, +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, /area/station/command/heads_quarters/hos) "uQn" = ( /obj/effect/turf_decal/stripes/line{ @@ -64169,6 +64324,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "uXM" = ( @@ -64256,10 +64412,6 @@ /obj/effect/mapping_helpers/airlock/access/any/science/genetics, /turf/open/floor/iron/dark, /area/station/science/genetics) -"uZg" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall/rust, -/area/station/command/heads_quarters/hos) "uZq" = ( /obj/structure/sink/directional/south, /obj/effect/turf_decal/siding/white{ @@ -64290,6 +64442,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/office) "uZL" = ( @@ -64370,7 +64523,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "var" = ( -/obj/structure/table, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -64380,6 +64532,7 @@ /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 }, +/obj/structure/table, /turf/open/floor/iron/showroomfloor, /area/station/security/office) "vaz" = ( @@ -64420,13 +64573,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"vba" = ( -/obj/machinery/computer/records/security{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hos) "vbd" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -64754,7 +64900,7 @@ dir = 4 }, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "vha" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -65613,6 +65759,20 @@ /obj/machinery/disease2/incubator, /turf/open/floor/iron/dark, /area/station/medical/pathology) +"vvg" = ( +/obj/structure/table, +/obj/item/taperecorder{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/warden) "vvn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/machinery/door/window/left/directional/north{ @@ -65635,7 +65795,6 @@ pixel_y = 5 }, /obj/item/radio, -/obj/structure/table, /obj/item/radio/intercom/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Security Equipment Room" @@ -65643,6 +65802,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/table, /turf/open/floor/iron/dark, /area/station/security/lockers) "vvC" = ( @@ -65722,8 +65882,11 @@ /turf/open/floor/iron, /area/station/engineering/lobby) "vwH" = ( -/obj/structure/table/wood, -/obj/machinery/computer/records/medical/laptop, +/obj/effect/landmark/start/head_of_security, +/obj/structure/chair/comfy/brown{ + color = "#c45c57"; + dir = 1 + }, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) "vxa" = ( @@ -66644,15 +66807,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/customs) -"vJk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Checkpoint" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) "vJm" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/directional/east, @@ -66871,19 +67025,17 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/brig) "vMg" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/warden) +/turf/closed/wall/r_wall, +/area/station/security/medical) "vMk" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/corner{ @@ -67468,6 +67620,14 @@ /obj/structure/cable, /obj/effect/turf_decal/bot, /obj/machinery/holopad/secure, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/office) "vUu" = ( @@ -67648,8 +67808,15 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "vWY" = ( -/turf/closed/wall, -/area/station/security/processing/cremation) +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/office) "vXa" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/decal/cleanable/dirt, @@ -68102,7 +68269,7 @@ }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "wer" = ( /obj/machinery/conveyor{ dir = 8; @@ -68147,18 +68314,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"weR" = ( -/obj/structure/closet{ - name = "evidence closet" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/evidence) "weV" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/lights/mixed, @@ -68208,13 +68363,16 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "wgr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/office{ +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, /turf/open/floor/iron/dark, -/area/station/hallway/primary/aft) +/area/station/security/warden) "wgA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -68572,17 +68730,13 @@ /area/station/medical/chemistry) "wmr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Aft Hallway Transfer Centre Doors"; - name = "aft camera" - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "wms" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -68675,35 +68829,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"wnX" = ( -/obj/structure/table/wood, -/obj/item/storage/box/seccarts{ - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; - name = "Bottle of Tears"; - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_y = 2 - }, -/obj/machinery/keycard_auth/directional/south{ - pixel_x = -6 - }, -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/button/door/directional/south{ - id = "hosspace"; - name = "Space Blast Door Toggle"; - pixel_x = 8 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hos) "woc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -68960,18 +69085,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, -/obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "brig-entrance-right" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, /area/station/security/brig) "wrc" = ( /obj/effect/spawner/structure/window/reinforced, @@ -69107,6 +69226,14 @@ "wuc" = ( /turf/closed/wall/r_wall/rust, /area/station/science/xenobiology) +"wud" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/security/processing) "wue" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69456,6 +69583,12 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/service) +"wzH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/iron/dark, +/area/station/security/warden) "wzI" = ( /turf/closed/wall, /area/station/command/heads_quarters/rd) @@ -69582,6 +69715,15 @@ luminosity = 2 }, /area/station/ai_monitored/turret_protected/ai) +"wBy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "hosspace"; + name = "Space Blast Door" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hos) "wBJ" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/neutral, @@ -69639,12 +69781,15 @@ /turf/closed/wall/r_wall, /area/station/maintenance/port/lesser) "wDF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/structure/lattice/catwalk/mining, +/obj/structure/railing{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/evidence) +/obj/structure/railing{ + dir = 4 + }, +/turf/open/lava, +/area/station/security/brig) "wDI" = ( /obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid/lowpressure, @@ -70257,9 +70402,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, +/obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/security/brig) "wMl" = ( @@ -70367,11 +70510,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/machinery/shower/directional/east{ - name = "emergency shower" - }, -/obj/structure/mirror/directional/north, -/obj/structure/sink/directional/south, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -70381,6 +70519,13 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, +/obj/structure/bed{ + dir = 1 + }, +/obj/item/bedsheet/medical{ + dir = 1 + }, +/obj/machinery/iv_drip, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "wOk" = ( @@ -70465,11 +70610,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard) -"wPK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/brig) "wPO" = ( /obj/structure/rack, /obj/item/gun/energy/ionrifle{ @@ -70631,13 +70771,13 @@ /area/station/command/bridge) "wSq" = ( /obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm/directional/west, /obj/item/clothing/mask/russian_balaclava, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/lockers) "wSv" = ( @@ -70770,6 +70910,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/brig) "wVA" = ( @@ -70980,17 +71126,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"wYW" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/folder/red, -/obj/item/stamp/denied{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/stamp/hos, -/turf/open/floor/carpet/red, -/area/station/command/heads_quarters/hos) "wYX" = ( /obj/structure/sign/warning, /turf/closed/wall, @@ -71003,6 +71138,20 @@ /mob/living/basic/mining/goliath, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) +"wZJ" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 9 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -10 + }, +/turf/open/floor/iron, +/area/station/security/brig) "wZW" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, @@ -71035,19 +71184,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"xap" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/sign/departments/security/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/brig) "xau" = ( /obj/machinery/firealarm/directional/west, /obj/machinery/recharge_station, @@ -71133,6 +71269,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"xce" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/security/brig) "xcf" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -71630,6 +71773,14 @@ /obj/item/clothing/gloves/latex, /turf/open/floor/iron/dark, /area/station/science/genetics) +"xkd" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/security/processing) "xke" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -71781,10 +71932,6 @@ /obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) -"xmD" = ( -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/showroomfloor, -/area/station/security/warden) "xmI" = ( /obj/structure/flora/grass/jungle/b/style_random, /obj/structure/flora/bush/flowers_br/style_random, @@ -71900,10 +72047,10 @@ "xoI" = ( /obj/machinery/holopad, /obj/structure/cable, -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "xoK" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, @@ -72170,12 +72317,6 @@ }, /turf/closed/wall, /area/station/maintenance/starboard) -"xun" = ( -/obj/structure/table, -/obj/item/clothing/suit/costume/justice, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/plating, -/area/station/maintenance/aft) "xuA" = ( /obj/machinery/vending/hydroseeds{ slogan_delay = 700 @@ -72307,12 +72448,8 @@ /area/station/security/execution/transfer) "xvG" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Autopsy" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/detective, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/iron/dark, /area/station/security/detectives_office) "xvM" = ( @@ -72475,16 +72612,25 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) "xym" = ( -/obj/structure/sign/poster/official/enlist{ - pixel_y = -32 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) +/obj/structure/cable, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance-right" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/security/brig) "xyp" = ( /obj/structure/rack, /obj/item/plant_analyzer, @@ -72667,12 +72813,11 @@ "xCh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "xCp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73135,15 +73280,20 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "xJK" = ( -/obj/item/clothing/head/helmet/toggleable/justice/escape{ - name = "justice helmet" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/obj/structure/sign/poster/official/the_owl{ - pixel_y = 32 +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/aft) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "xJN" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -73273,7 +73423,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron, -/area/station/hallway/primary/aft) +/area/station/security/brig) "xLX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -73619,6 +73769,17 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/engine, /area/station/science/xenobiology) +"xSf" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/processing) "xSi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, @@ -73654,19 +73815,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"xSC" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Aft Hallway Security Doors"; - name = "aft camera" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "xSI" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -73913,6 +74061,19 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) +"xVR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/warden) "xWh" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ @@ -74086,17 +74247,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) -"xYY" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "xZi" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -74321,20 +74471,10 @@ /turf/open/floor/grass, /area/station/service/hydroponics) "ycs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance" - }, /obj/structure/sign/directions/evac{ pixel_y = -24 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron/dark, +/turf/closed/wall/r_wall, /area/station/maintenance/port/aft) "ycx" = ( /turf/closed/wall/rust, @@ -74454,6 +74594,14 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) +"yeD" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/departments/security/directional/west, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/brig) "yeH" = ( /obj/effect/decal/cleanable/dirt, /mob/living/basic/ghost, @@ -74766,10 +74914,6 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "yjW" = ( -/obj/machinery/computer/crew{ - dir = 4 - }, -/obj/effect/turf_decal/bot, /obj/machinery/requests_console/directional/west{ anon_tips_receiver = 1; assistance_requestable = 1; @@ -74777,21 +74921,16 @@ name = "Security Requests Console"; pixel_y = -32 }, -/obj/machinery/button/door/directional/west{ - id = "brigcelldoor"; - name = "Cell Blast Door Toggle"; - pixel_y = -6 - }, -/obj/machinery/button/door/directional/west{ - id = "brigfrontdoor"; - name = "Front Blast Door Toggle"; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/table/glass, +/obj/machinery/camera/directional/east{ + c_tag = "Security Infirmary" }, +/obj/item/storage/medkit/regular, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/syringe, /turf/open/floor/iron/dark, -/area/station/security/warden) +/area/station/security/medical) "ykb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74860,14 +74999,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"ylu" = ( -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/security/brig) "ylD" = ( /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -74875,13 +75006,10 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "ylM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/detectives_office) +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "ylP" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/decal/cleanable/dirt, @@ -88452,7 +88580,7 @@ nCL nCL nCL nKy -hEh +wDz jQn cyT iVj @@ -88964,7 +89092,7 @@ wgK iMA xad adf -iza +wDz llh wDz gij @@ -89226,12 +89354,12 @@ mMy jri mCu bIq -wjK -dbu +iVj +iVj kES xfx -dbu -dbu +iVj +iVj wjK cmU cmU @@ -89484,7 +89612,7 @@ rRM tzA kra iln -wAt +tFY tlV ezY qCi @@ -89741,7 +89869,7 @@ hUA cTY oig wXt -wAt +tFY bLN rkV aLg @@ -89998,7 +90126,7 @@ jri hqP hQa xrS -wAt +tFY vPG mRF apL @@ -91800,16 +91928,16 @@ kgc tsY dMd gLT -tCU -tCU -tCU -gPA -tCU +cuR +cuR +cuR +cuR +cuR ycs -tCU -tCU -tCU -tCU +cuR +cuR +cuR +cuR qzD mWg pQi @@ -92057,7 +92185,7 @@ gPA pQi pPZ pQi -tCU +cuR tZD oCr nuz @@ -92066,7 +92194,7 @@ kio grs hpW tzL -tCU +cuR eEX gDy hOU @@ -92314,7 +92442,7 @@ cuR iaY nhz qRS -gPA +cuR bvk hkA tzY @@ -92558,7 +92686,7 @@ pjC pqD kzl bXS -stu +jWQ kTK wDz wDz @@ -92569,9 +92697,9 @@ vGn oXe cuR cuR -qJR cuR -tCU +cuR +cuR aIw qRf mnR @@ -92580,8 +92708,8 @@ oHe cjq hwJ aYU -tCU -gPA +cuR +cuR cuR cuR qJR @@ -92816,7 +92944,7 @@ pqD ruW dfK jJN -sQw +ofx wuo dwx plj @@ -92843,14 +92971,14 @@ vWY frP mtI lwp -aUz -aaa -aaa -aaa +juE +dlO +oZE +aeo +acm +aaQ +acm acm -aaa -aaa -aaa aaa aaa aaa @@ -93072,45 +93200,45 @@ weW iza ckJ wuT -iza -pqD +wDz +wDz hCr kLW xrp cbf xYK qEh -gVi +mrX gVi uMD gVi gVi -sWV +gMY kcW kBF -pNe +itf vYs dYB dUE hwJ vUt rmT -sgC +umJ umJ lAW kUV -lwp -aaa -aaa -aaa -aaa -aeo -aaa -aaa -aaa -aaB -aaa +oWt +oLk +xkd +oZE +acm +acK +acm aaa +oZE +oZE +oZE +oZE aaa aaa aaa @@ -93330,17 +93458,17 @@ pqD fNy bMY eEe -pqD -cXh -cXh -cXh -cXh +wDz +nNR +nNR +nNR +nNR wlS pns wFJ nzW kZP -ylu +nzW nzW xpa aiN @@ -93353,23 +93481,23 @@ aVI oKW joh mDJ -afL -afL -afL joh +joh +joh +joh +iPU +aEk +oZE acm acm -acm -acm -aeo -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oZE +oZE +oZE +vuM +brK +xgs +xgs +qkf aaa aaa aaa @@ -93596,9 +93724,9 @@ crk mxH gLn kxG -lwu -lwu -lTf +vMg +vMg +vMg oKW tUV uZC @@ -93613,20 +93741,20 @@ qCZ etB pya lsS -afL -afL -aaa -aaa -aaa -acm -aaa -aaa -aaa -aaa -aaa -aaa -aaa +joh +iPU +aEk +oZE aaa +aaQ +oZE +oZE +awi +sMe +lRJ +fJs +lIr +rRb aaa aaa aaa @@ -93851,7 +93979,7 @@ uhy ngg sXB mxH -lTf +vMg wNT sEs xMM @@ -93869,21 +93997,21 @@ lsb xSn pUH tZf -tZf -wnX +mVy +joh afL -aeU -aaa -aaa -aeo -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aEk +oZE +acK +acK +oZE +fTQ +bum +hKc +jvl +xgs +xgs +xgs aaa aaa aaa @@ -94101,11 +94229,11 @@ pqD ofz fNy gJC -pqD -cXh -skC -cXh -cXh +wDz +nNR +nNR +nNR +nNR vVt vtf jgv @@ -94124,23 +94252,23 @@ cjN oKW nvA jco -pUH -kjl +oVb tZf nPo +wBy qbB -aeU -aeU -aaa +wud +oZE +oZE +oZE +oZE +kND +uap +lnU +riB +hmO acm -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +qJs aaa aaa aaa @@ -94377,27 +94505,27 @@ eqA oKW oKW dKK -xpa +oct oKW -afL +joh dMH crh vwH -ijd viu -qbB -aeU -aUz -aeU -acm -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +wBy +xSf +oaL +oAk +oAk +oAk +fud +lnT +mbP +sgA +mGG +xgs +xgs +xgs aaa aaa aaa @@ -94622,9 +94750,9 @@ lmh gYl wms wHh -lGs -lGs -lGs +vMg +bxa +kXK ciY lGs oKW @@ -94638,24 +94766,24 @@ pSG gpM cFO pIS -pUH -wYW +mrw tZf -vba -qbB -aeU -aeU -aeu -cke -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +kUr +wBy +lxz +nxT +jMr +rBB +jMr +ahZ +nZE +tOB +sgA +lzs +gOq +lIr +fdC +oSK aaa aaa aaa @@ -94872,14 +95000,14 @@ qId fNy ofz hVl -iza -cXh -cXh -cXh -cXh +wDz +nNR +nNR +nNR +nNR xex -mfd -ciY +dSv +vMg tyk mlj nvK @@ -94899,19 +95027,19 @@ mTK xPY nYa uQj -uZg -aeU -aeU -aeU -aeu -aeu -aaa -aaa -aaa -aaa -aaa -aaa -aaa +oZE +oZE +oZE +oZE +oZE +swd +tOa +xPc +cRG +rIq +xgs +xgs +qkf aaa aaa aaa @@ -95136,12 +95264,12 @@ plj qKS wDs lmF -pAQ -hCd -xmD -jck -dzy -sCJ +hAP +hAP +hAP +hAP +hAP +hAP ocz dZA lYX @@ -95156,17 +95284,17 @@ jPG sYu mIR kom -afL +cry aeu aeU aeU -aeU -aeu -aaa -aaa -aaa -aaa -aaa +acK +oZE +oZE +oZE +oZE +oZE +oZE aaa aaa aaa @@ -95393,12 +95521,12 @@ iFe ngg sXB jmw -vMg +hAP tVS esK ctv eqK -vMg +hAP jJs dGp spw @@ -95643,20 +95771,20 @@ xds iuC fKJ cuD -pqD -cXh -cXh -cXh -cXh +wDz +nNR +nNR +nNR +nNR omQ jmw -fEe +hAP clN dup dkI hJp -lGs -xex +hAP +sAL dSv gjg oKW @@ -95907,12 +96035,12 @@ plj nKu yld jmw -vMg -cSX +hAP +lwn mpd -lAk +dkI eKT -abB +hAP wVc eWu smR @@ -96164,12 +96292,12 @@ skA ngg sXB xaZ -lGs +hAP ons tgx gqz uOA -vMg +lhA joP dZA lYX @@ -96414,19 +96542,19 @@ hri jWD oce wQI -pqD -skC -cXh -cXh -cXh +wDz +nNR +nNR +nNR +nNR ieg uKO -lGs -vMg -vMg -iBy -vMg -lGs +hAP +hAP +hAP +hAP +hAP +hAP sJW dZA wVE @@ -96681,7 +96809,7 @@ rxi dSv pXU qDX -bJm +qbv qbY qbv mdp @@ -96938,10 +97066,10 @@ uXL aPF tiY nzW -wPK -eDx +nzW +nzW srf -veu +hEp dZA rrY aEO @@ -97193,15 +97321,15 @@ cXh lqn oQz cXh +nNR +plj +plj +nNR jkk -tIq -bUJ -jkk -jkk -xap +hEp wMe ktu -dzS +rhd moz mgC mop @@ -97450,13 +97578,13 @@ nem gME dXz ura -mRp -gvx +nNR ate -jeR -jkk -shC -sFF +ate +plj +ocz +wZJ +hEp wqZ dzS bHv @@ -97473,7 +97601,7 @@ aeu aeu aUz aeU -acm +aaa aaa aaa aaa @@ -97707,14 +97835,14 @@ iHT sSd aLi jVA -jkk +nNR jgy -fGC -iVV -mRp -gJL -odc -eoM +ate +plj +ocz +dDR +hEp +wqZ ksM rFK qVs @@ -97730,7 +97858,7 @@ aeU aeU aeU aaa -acm +aaa aaa aaa aaa @@ -97964,14 +98092,14 @@ rqx oJs dxk rmd -jkk -lwn +nNR +unX wDF qXX -jkk -mdE -aUw -vyl +ocz +dCw +uvL +wqZ moz rFK aJF @@ -97983,11 +98111,11 @@ qbf fQM csM rhd -hmO -xgs -kem -acm -qJs +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -98221,14 +98349,14 @@ gCu fRP aLi myc -jkk +nNR lYG -lOY -weR -hAP -xmO -sFF -war +ate +plj +ocz +rGy +hEp +dPi rhd lbD hCl @@ -98238,13 +98366,13 @@ wHQ fDi bpg gBi -oZE -oZE -vuM -brK -xgs -xgs -qkf +rhd +rhd +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -98478,13 +98606,13 @@ bDu tXX nBE rRY -kvl -hAP -hAP -hAP -hAP +nNR +ate +ate +plj +ocz dOk -rVE +hEp hna rhd rhd @@ -98492,16 +98620,16 @@ rkG rhd rkG rhd -jSE +rhd rkG rhd -oZE -awi -sMe -lRJ -fJs -lIr -rRb +qqw +qqw +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -98732,33 +98860,33 @@ iNc ueO kTK wDz -jRR +wDz wDz wDz jXN -aSo -xSC -xYY +plj +plj +nNR usF -ruB -jhg +hEp +hEp sYn ntE naw ttn psP igC -iwL +qqw ntR iYS -xgs -fTQ -bum -hKc -jvl -xgs -xgs -xgs +bol +vvg +qqw +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -98786,7 +98914,7 @@ aaa aaa aaa aaa -aaa +aaB aaa aaa aaa @@ -98993,16 +99121,16 @@ hsr jHy pqD jLy -dOk +rIS jMK -jhg +yeD qcv -jhg +hEp xoI erN -nVK -dtt -nVK +qMj +xce +qMj fWX boE kgE @@ -99010,12 +99138,12 @@ qwi iZv gpy fiR -uap -lnU -riB -hmO -acm -qJs +mjO +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -99252,27 +99380,27 @@ gdA kbl xCh weh -weh +oIC weh xLU gXJ vgU coz gVv -ePe +wmr wmr lyd -tjE -gmG -gmG -gmG +qqw +xVR +aUc +ogJ sow -mbP -sgA -mGG -xgs -xgs -xgs +mjO +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -99505,32 +99633,32 @@ iza pqD kwK hpg -pqD -hNI +jqb +jqb nBc nBc jqb jqb sMa -nVK +lik nXW -ekM -vJk -mCm -gmG -gmG -pDM +qqw +qqw +mjO +mjO +mjO +qqw xJK qlD gtU -nZE -tOB -sgA -lzs -gOq -lIr -fdC -oSK +gsa +mjO +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -99761,32 +99889,32 @@ hhX pqD gqD jqI -pqD -pqD +jqb +jqb vCf lDS xfe prK jqb -ayY -nVK -wWm -kIz +aHI +lik +nXW +mjO wgr nFe cmc -nPT +oea gmn -nPT -xun -tjE -tOa -xPc -cRG -rIq -xgs -xgs -qkf +tYf +aUc +gtU +lxg +mjO +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -100018,7 +100146,7 @@ hKB pqD iza pvs -pqD +jqb tpl duM cZW @@ -100031,19 +100159,19 @@ tfh mCm caS ruo -gmG -gmG -pDM -pDM -gmG -gmG -hmO -kem -hmO -kem -hmO -acm -qJs +dNk +rGS +wzH +rNB +fAY +pAy +eKE +qqw +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -100282,20 +100410,20 @@ glX nlA jRm taU -ayY -nVK +shC +sFF xym -gmG -gmG -pDM -gmG -rTi -rTi -rTi -gva -rTi -rTi -rTi +qqw +qqw +qqw +qqw +sSZ +sSZ +sSZ +jwV +sSZ +sSZ +sSZ rTi rTi gva @@ -100539,10 +100667,10 @@ ykO oaz nDS taU -kay -qvJ -njT -gmG +gJL +odc +eoM +cfL xUQ nPT pDM @@ -100787,8 +100915,8 @@ rTv fNe rqW vkh -jqb -gHD +pqD +kWA jqb vCG rbH @@ -100796,10 +100924,10 @@ ppy gdP uNI bnY -aIl -suo -lYT -gmG +mdE +aUw +vyl +cfL gmG pRP gmG @@ -101044,19 +101172,19 @@ tzI fNe cRq btI +pqD +acv jqb jqb -hNI jqb jqb jqb -hNI jqb jqb -ncB -sHD -rXp -gmG +xmO +sFF +war +cfL pRP nIh pDM @@ -101559,7 +101687,7 @@ tzI gWw tuF kNO -ekM +qKX bza cTi ipg @@ -116419,7 +116547,7 @@ syF rZV eNy wCY -xZL +aFL vOX rZV lDu From 799f1f8fddbab2060ad8b6e07f4bbea993f76672 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sun, 17 Mar 2024 13:29:40 +0100 Subject: [PATCH 20/59] fixes pipes (i think) --- _maps/map_files/KiloStation/KiloStation.dmm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5da6462d189e..711806bd642f 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -20438,8 +20438,6 @@ /area/station/maintenance/fore) "gMY" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/security/glass{ name = "Security Office" }, @@ -20985,8 +20983,6 @@ /turf/open/floor/iron/dark, /area/station/medical/paramedic) "gVi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -28915,7 +28911,6 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain/private) "joP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -31169,8 +31164,6 @@ /turf/open/floor/carpet/red, /area/station/service/chapel) "kcW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -35808,8 +35801,6 @@ /area/station/service/hydroponics/garden) "lEQ" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -38045,7 +38036,6 @@ /area/station/maintenance/starboard) "mrX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/disposalpipe/segment{ dir = 10 @@ -45617,8 +45607,6 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "oXe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/poddoor/preopen{ id = "prisonblast"; name = "Prison Blast Door" @@ -57353,6 +57341,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/security/brig) "sJY" = ( @@ -63787,7 +63776,6 @@ /turf/open/floor/iron, /area/station/engineering/main) "uMD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/disposalpipe/segment, @@ -67023,8 +67011,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, @@ -93209,7 +93195,7 @@ cbf xYK qEh mrX -gVi +uMD uMD gVi gVi From 658d65a4c8079d5388e235ac854f4ae398d34a9c Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sun, 17 Mar 2024 13:39:30 +0100 Subject: [PATCH 21/59] more pipes --- _maps/map_files/KiloStation/KiloStation.dmm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 711806bd642f..1b5d0e6c906a 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -72609,10 +72609,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance-right" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, From 83bbc70dc5784417d14925e81a1056eb80a02002 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sun, 17 Mar 2024 13:52:58 +0100 Subject: [PATCH 22/59] modifies dets office, changes brig entrance a bit, reruns the test cuz they somehow broke --- _maps/map_files/KiloStation/KiloStation.dmm | 269 +++++++++++--------- 1 file changed, 147 insertions(+), 122 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 1b5d0e6c906a..aa9791d993ef 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -2140,15 +2140,19 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/office) "aHI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, /area/station/security/brig) "aHQ" = ( /obj/effect/turf_decal/delivery, @@ -2519,6 +2523,17 @@ /obj/effect/mapping_helpers/mail_sorting/medbay/virology, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) +"aOV" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) "aPg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, @@ -2796,12 +2811,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "aUw" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /turf/open/floor/iron/goonplaque, /area/station/security/brig) "aUz" = ( @@ -9150,6 +9159,19 @@ }, /turf/open/space/basic, /area/space) +"dhR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) "dhT" = ( /obj/structure/cable, /obj/structure/table, @@ -10031,9 +10053,8 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "duM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood, /area/station/security/detectives_office) "duU" = ( @@ -12610,19 +12631,15 @@ /turf/open/floor/iron/dark, /area/station/science/lab) "eoM" = ( -/obj/machinery/door/poddoor/preopen{ - id = "brigfrontdoor"; - name = "Front Security Blast Door" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/firedoor, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, /area/station/security/brig) "eoT" = ( /obj/structure/table, @@ -20276,14 +20293,11 @@ /turf/closed/wall/rust, /area/station/maintenance/disposal/incinerator) "gJL" = ( -/obj/machinery/door/poddoor/preopen{ - id = "brigfrontdoor"; - name = "Front Security Blast Door" - }, /obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, /area/station/security/brig) "gJP" = ( /obj/structure/railing{ @@ -21836,11 +21850,14 @@ /turf/closed/wall/r_wall/rust, /area/station/medical/pathology) "hkq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/iron, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, /area/station/security/brig) "hkr" = ( /obj/machinery/computer/slot_machine, @@ -25423,8 +25440,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "ikT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/green, /area/station/security/detectives_office) "ikX" = ( @@ -31722,8 +31737,6 @@ /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "kqs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/detectives_office) "kqD" = ( @@ -34388,6 +34401,12 @@ "lik" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "brigfrontdoor"; + name = "Front Security Blast Door" + }, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/security/brig) "lix" = ( @@ -35759,13 +35778,15 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/storage) "lDS" = ( -/obj/structure/filingcabinet/security, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/station/security/detectives_office) "lDV" = ( @@ -37141,11 +37162,7 @@ /turf/open/floor/iron/dark, /area/station/cargo/warehouse) "mdE" = ( -/obj/machinery/light/small/directional/north, /obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, @@ -38241,6 +38258,21 @@ /obj/machinery/smartfridge, /turf/closed/wall, /area/station/service/kitchen) +"mwi" = ( +/obj/effect/mapping_helpers/airlock/access/all/security/detective, +/obj/machinery/door/airlock/security{ + name = "Detective's Office" + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/detectives_office) "mwj" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -42246,7 +42278,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/security/brig) "nOJ" = ( /obj/effect/decal/cleanable/dirt, @@ -42653,7 +42685,20 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance-right" + }, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/poddoor/preopen{ + id = "brigfrontdoor"; + name = "Front Security Blast Door" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, /area/station/security/brig) "nYa" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -43044,15 +43089,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"odc" = ( -/obj/machinery/door/poddoor/preopen{ - id = "brigfrontdoor"; - name = "Front Security Blast Door" - }, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/security/brig) "odd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/machinery/door/airlock/research/glass{ @@ -44787,6 +44823,8 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig) "oIM" = ( @@ -47007,7 +47045,7 @@ /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/bot, /obj/structure/disposalpipe/trunk{ - dir = 4 + dir = 1 }, /turf/open/floor/iron/dark, /area/station/security/detectives_office) @@ -55673,14 +55711,17 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) "shC" = ( -/obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance-right" }, /obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/security/brig) "shE" = ( @@ -56320,19 +56361,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"srW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Detective's Office" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/access/all/security/detective, -/turf/open/floor/iron/dark, -/area/station/security/detectives_office) "srX" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -57069,8 +57097,8 @@ /turf/open/floor/iron, /area/station/security/checkpoint/engineering) "sFF" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/brig) "sFG" = ( @@ -57501,8 +57529,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) "sMa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -57510,7 +57536,24 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/door/airlock/security/glass{ + id_tag = "innerbrig"; + name = "Brig" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-entrance-right" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id = "brigfrontdoor"; + name = "Front Security Blast Door" + }, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/iron/dark, /area/station/security/brig) "sMe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58669,7 +58712,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/security/brig) "tfi" = ( /obj/structure/disposalpipe/segment, @@ -63799,12 +63842,10 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "uNI" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/filingcabinet/security, /turf/open/floor/iron/dark, /area/station/security/detectives_office) "uNK" = ( @@ -65187,12 +65228,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "vlJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -65967,9 +66002,6 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "vyl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/machinery/light/small/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 @@ -67991,18 +68023,10 @@ dir = 4 }, /obj/structure/cable, -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig" - }, -/obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "brig-entrance-right" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, /area/station/security/brig) "was" = ( /obj/structure/chair/pew/right{ @@ -68254,6 +68278,8 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig) "wer" = ( @@ -71471,6 +71497,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/security/detectives_office) "xfx" = ( @@ -71924,17 +71951,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, /area/station/medical/psychology) -"xmO" = ( -/obj/machinery/door/airlock/security/glass{ - id_tag = "outerbrig"; - name = "Brig" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "brig-entrance-right" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/turf/open/floor/iron/dark, -/area/station/security/brig) "xmQ" = ( /obj/machinery/door/airlock/external{ name = "External Airlock" @@ -72602,15 +72618,17 @@ dir = 4 }, /obj/structure/cable, -/obj/machinery/door/airlock/security/glass{ - id_tag = "innerbrig"; - name = "Brig" - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance-right" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination, +/obj/machinery/door/airlock/security/glass{ + id_tag = "outerbrig"; + name = "Brig" + }, /turf/open/floor/iron/dark, /area/station/security/brig) "xyp" = ( @@ -72798,6 +72816,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/station/security/brig) "xCp" = ( @@ -73404,6 +73426,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/station/security/brig) "xLX" = ( @@ -99617,7 +99642,7 @@ kwK hpg jqb jqb -nBc +mwi nBc jqb jqb @@ -99879,8 +99904,8 @@ xfe prK jqb aHI -lik -nXW +aOV +dhR mjO wgr nFe @@ -100132,9 +100157,9 @@ jqb tpl duM cZW -duM +nlA vlJ -srW +jqb hkq nOI tfh @@ -100650,7 +100675,7 @@ oaz nDS taU gJL -odc +hEp eoM cfL xUQ @@ -101163,8 +101188,8 @@ jqb jqb jqb jqb -xmO -sFF +vVt +hEp war cfL pRP From d5ad1641b03bf5090dc466fcfd6319683594d2da Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sun, 17 Mar 2024 17:34:44 +0100 Subject: [PATCH 23/59] small changes everywhere, adds dedicated cryo room to perma --- _maps/map_files/KiloStation/KiloStation.dmm | 476 +++++++++++++------- 1 file changed, 320 insertions(+), 156 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index aa9791d993ef..754582ab54dc 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -993,6 +993,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/ai_monitored/security/armory) "ams" = ( @@ -3716,7 +3717,6 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "bol" = ( -/obj/structure/reagent_dispensers/wall/peppertank/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -4135,6 +4135,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/security/processing) "buq" = ( @@ -6505,6 +6506,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/office) "cjR" = ( @@ -7143,6 +7145,7 @@ dir = 8 }, /obj/structure/cable, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/ai_monitored/security/armory) "cuD" = ( @@ -7291,6 +7294,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"cyf" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/prison) "cyp" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -7643,6 +7650,9 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +"cGO" = ( +/turf/open/misc/asteroid/airless, +/area/space) "cGP" = ( /turf/closed/wall/r_wall, /area/station/service/chapel/monastery) @@ -8719,6 +8729,14 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/security/detectives_office) +"dar" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/turf/open/space/basic, +/area/space/nearstation) "daG" = ( /obj/machinery/door/airlock/maintenance/external{ name = "Mass Driver Intersection" @@ -9668,6 +9686,13 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"doT" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/safe) "doU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -10034,6 +10059,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/security/evidence) "duA" = ( @@ -11279,6 +11305,17 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) +"dQI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/waterbottle/tea{ + pixel_x = 12 + }, +/obj/item/food/salad/eggbowl{ + pixel_x = -6 + }, +/turf/open/floor/plating, +/area/station/security/prison/safe) "dQM" = ( /obj/effect/turf_decal/bot, /obj/structure/closet{ @@ -11942,7 +11979,7 @@ /area/space/nearstation) "ecY" = ( /obj/structure/sign/warning/docking, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/station/maintenance/port/aft) "edj" = ( /obj/effect/turf_decal/tile/neutral{ @@ -13542,6 +13579,19 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/engineering/atmos) +"eEF" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = -2 + }, +/obj/effect/spawner/random/food_or_drink/soup{ + pixel_x = 6; + pixel_y = 11 + }, +/turf/open/floor/plating, +/area/station/security/prison/safe) "eEJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -14537,6 +14587,14 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/foyer) +"eXA" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/security/prison/safe) "eXJ" = ( /obj/machinery/conveyor_switch/oneway{ id = "QMLoad2"; @@ -15596,6 +15654,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/smooth_large, /area/station/maintenance/department/chapel/monastery) +"fnT" = ( +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/plastic, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/safe) "fnZ" = ( /obj/structure/table, /obj/item/reagent_containers/condiment/saltshaker{ @@ -16117,6 +16182,10 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/command/teleporter) +"fvc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/security/lockers) "fvh" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -16724,6 +16793,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/security/lockers) "fDr" = ( @@ -17641,6 +17711,7 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "fQO" = ( @@ -19724,7 +19795,6 @@ /obj/item/flashlight/seclite, /obj/effect/decal/cleanable/dirt, /obj/item/toy/figure/secofficer, -/obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -20413,7 +20483,7 @@ /area/station/maintenance/starboard/fore) "gMq" = ( /obj/machinery/door/airlock/grunge{ - name = "Cell 2" + name = "Prison Cryogenics" }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21690,6 +21760,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"hiB" = ( +/obj/machinery/door/airlock/grunge{ + name = "Cell 2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/prison) "hiQ" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22294,6 +22372,13 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) +"hpt" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + layer = 4.1 + }, +/turf/open/space/basic, +/area/space/nearstation) "hpu" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -22669,12 +22754,6 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) -"hvB" = ( -/obj/structure/grille/broken, -/obj/effect/decal/cleanable/glass, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plating/rust, -/area/station/security/prison) "hwA" = ( /turf/closed/wall/rust, /area/station/maintenance/solars/starboard/aft) @@ -23027,6 +23106,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/security/lockers) "hCr" = ( @@ -23499,6 +23579,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/security/evidence) "hJy" = ( @@ -24980,6 +25061,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/brig) "ieu" = ( @@ -28018,7 +28100,6 @@ /turf/closed/wall, /area/station/bitrunning/den) "iYS" = ( -/obj/machinery/firealarm/directional/west, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 4 @@ -33892,6 +33973,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/brig) "kZU" = ( @@ -36008,9 +36090,6 @@ }, /turf/open/floor/iron, /area/station/security/processing) -"lIs" = ( -/turf/closed/wall/rust, -/area/station/security/execution/education) "lIR" = ( /obj/machinery/door/poddoor/shutters{ dir = 1; @@ -37469,8 +37548,8 @@ pixel_x = 24; pixel_y = 8 }, -/obj/structure/urinal/directional/north, -/turf/open/floor/plating/rust, +/obj/structure/toilet, +/turf/open/floor/vault, /area/station/security/prison/shower) "miM" = ( /obj/effect/turf_decal/tile/red{ @@ -37916,6 +37995,12 @@ /obj/effect/mapping_helpers/airlock/access/all/command/hop, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"mqk" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/cryopod, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/safe) "mqC" = ( /turf/open/floor/iron, /area/station/security/prison) @@ -39822,9 +39907,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/railing{ - dir = 9 - }, /obj/structure/cable, /turf/open/space/basic, /area/space/nearstation) @@ -40399,6 +40481,13 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"nfo" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/safe) "nfD" = ( /obj/structure/spirit_board, /obj/machinery/light/very_dim/directional/south, @@ -40648,10 +40737,6 @@ /area/station/security/detectives_office) "nma" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /obj/structure/railing{ dir = 8 }, @@ -41436,6 +41521,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/processing) "nxY" = ( @@ -41751,6 +41837,12 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) +"nEn" = ( +/obj/machinery/camera/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/safe) "nEs" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/delivery, @@ -42784,6 +42876,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/processing) "nZF" = ( @@ -48252,6 +48345,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/closed/wall, /area/station/maintenance/disposal/incinerator) +"pNi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/sign/directions/cryo/directional/north{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/station/security/prison) "pNA" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/machinery/newscaster/directional/south, @@ -49639,6 +49742,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"qkZ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) "qld" = ( /obj/effect/turf_decal/box, /obj/machinery/light/directional/north, @@ -50602,6 +50712,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) +"qCw" = ( +/obj/effect/spawner/random/trash/cigbutt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/plastic{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/security/prison/safe) "qCI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -52847,6 +52965,11 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/engineering/atmos) +"roC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/plating, +/area/station/security/prison/safe) "roF" = ( /obj/machinery/door/airlock/command/glass{ name = "Server Access" @@ -54523,6 +54646,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "rNJ" = ( @@ -54533,6 +54657,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "rNN" = ( @@ -54706,6 +54831,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"rQc" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/safe) "rQl" = ( /obj/effect/turf_decal/plaque{ icon_state = "L11" @@ -54938,6 +55071,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, /area/station/maintenance/starboard) +"rTe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/cryopod{ + dir = 1; + pixel_y = -20 + }, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/plating, +/area/station/security/prison/safe) "rTi" = ( /obj/structure/grille, /turf/closed/wall/r_wall, @@ -55381,6 +55523,10 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) +"sca" = ( +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/airless, +/area/space) "scc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, @@ -56113,6 +56259,11 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) +"soH" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/security/prison/safe) "soL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -57370,6 +57521,7 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/brig) "sJY" = ( @@ -58199,9 +58351,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) -"sWl" = ( -/turf/closed/wall/rust, -/area/station/maintenance/solars/port/aft) "sWA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -58873,6 +59022,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/security/office) "thC" = ( @@ -60071,6 +60221,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/office) "tAx" = ( @@ -60379,6 +60530,9 @@ dir = 8 }, /obj/structure/cable, +/obj/structure/sign/directions/cryo/directional/north{ + pixel_x = -32 + }, /turf/open/floor/iron, /area/station/security/prison) "tFq" = ( @@ -63035,6 +63189,7 @@ "uzK" = ( /obj/structure/curtain, /obj/structure/cable, +/obj/structure/sign/directions/cryo/directional/west, /turf/open/floor/iron, /area/station/security/prison/shower) "uzQ" = ( @@ -64219,9 +64374,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft) -"uUS" = ( -/turf/closed/wall, -/area/station/maintenance/solars/port/aft) "uVe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, @@ -65008,10 +65160,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"vhZ" = ( -/obj/effect/spawner/structure/electrified_grille, -/turf/open/floor/plating/rust, -/area/station/security/prison) "vim" = ( /obj/effect/turf_decal/siding/thinplating/light/corner{ dir = 4 @@ -65395,6 +65543,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"vpp" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/cryopod, +/turf/open/floor/plating, +/area/station/security/prison/safe) "vps" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, @@ -65962,10 +66116,6 @@ "vxK" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /obj/structure/cable, /turf/open/space/basic, /area/space/nearstation) @@ -68716,6 +68866,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/brig) "wmj" = ( @@ -70415,6 +70566,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/brig) "wMl" = ( @@ -70538,8 +70690,20 @@ dir = 1 }, /obj/machinery/iv_drip, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) +"wOb" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) "wOk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -72194,9 +72358,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) -"xrS" = ( -/turf/closed/wall/rust, -/area/station/security/execution/transfer) "xsJ" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -72319,6 +72480,11 @@ }, /turf/closed/wall, /area/station/maintenance/starboard) +"xur" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/security/prison/safe) "xuA" = ( /obj/machinery/vending/hydroseeds{ slogan_delay = 700 @@ -73785,6 +73951,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/processing) "xSi" = ( @@ -73824,10 +73991,6 @@ /area/station/hallway/secondary/exit/departure_lounge) "xSI" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, /obj/structure/cable, /turf/open/space/basic, /area/space/nearstation) @@ -74771,6 +74934,7 @@ }, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/security/office) "yhI" = ( @@ -80350,10 +80514,10 @@ aaa aaa aeU aeu -aeU -aeU -aeU -aeu +dWG +dWG +dWG +dWG dWG dmw tzh @@ -80606,11 +80770,11 @@ aaa aaa aaa aeu -aeu -aeu -aeU -aeu -aeu +dWG +dWG +fnT +eEF +soH dWG sfi wJw @@ -80863,11 +81027,11 @@ aaa aaa aaa aeu -aeu -aeu -aeu -aeu -aeU +dWG +mqk +soH +soH +rTe dWG dWG jLk @@ -81118,16 +81282,16 @@ aaa aaa aaa aaa -aaa -aaa -aeU aeu aeu -aeU -aeU -mWy +dWG +soH +xur +rQc +soH +cyf gCY -gYA +pNi aDD aDD hkF @@ -81375,15 +81539,15 @@ aaa aaa aaa aaa -aaa -aaa -aeU -aeU aeu -aeU -aeU -mWy -cOf +aeu +dWG +nEn +soH +nfo +nfo +hiB +kkV kkV eCu kkV @@ -81632,13 +81796,13 @@ aaa aaa aaa aaa -aaa -aaa -aeu -aeu aeu aeu -aeU +dWG +vpp +soH +eXA +roC dWG dWG gMq @@ -81651,7 +81815,7 @@ sAv xGN gyb gyb -sAv +xlA pCP sAm wkP @@ -81889,14 +82053,14 @@ aaa aaa aaa aaa -aaa -aaa -aeu -aeu -aeu aeu aeu dWG +dWG +doT +dQI +qCw +dWG mmo wJw toh @@ -81908,7 +82072,7 @@ mWy tFn ajw ajw -hvB +gyb aDD kkV sAv @@ -82146,13 +82310,13 @@ aaa aaa aaB aaa -aaa -aaa -aaa +cGO aeu aeu -aUz -aeu +dWG +dWG +dWG +dWG dWG hYo bNO @@ -82165,7 +82329,7 @@ mWy hhi xlA xlA -mWy +aDD jYo kkV sAv @@ -82402,13 +82566,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cGO +cGO +aeu +aeu +aeu +aeu +aeu vku nKO eJN @@ -82422,7 +82586,7 @@ sAv xDG xlA xlA -mWy +aDD wBf kkV myp @@ -82659,11 +82823,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +sca +cGO +cGO +cGO +cGO aaa aaa acm @@ -82679,8 +82843,8 @@ sAv woG bMw xlA -vhZ -ssF +gyb +mqC ezC iQg smC @@ -82916,10 +83080,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +cGO +cGO +cGO +cGO aaa aaa aaa @@ -82936,7 +83100,7 @@ mWy glo jsI xlA -sAv +xlA aDD kkV myp @@ -83173,10 +83337,10 @@ aeU aeu aeu aeU -aaa -aaa -aaa -aaa +cGO +cGO +sca +cGO aaa aaa aaa @@ -83433,7 +83597,7 @@ aeU aeU aeU aeU -aaa +cGO aaa aaa aaa @@ -90129,27 +90293,27 @@ aeu add cnQ mxf -jri +mMy hqP hQa -xrS +mMy tFY vPG mRF apL -lIs +tFY wAt cJx -gPA +cuR iTj iTj iTj -tCU -tCU -uUS +cuR +cuR +xKP lsu -sWl -uUS +xKP +xKP aeu aeu aeu @@ -90389,15 +90553,15 @@ kNf fDT pmd hYY -jri +mMy unv mLe bGx ffo lXL qJR -gPA -tCU +cuR +cuR ovm cgU hcP @@ -90406,7 +90570,7 @@ gPA gAp fjw jHR -uUS +xKP aeu aeU aeU @@ -90659,7 +90823,7 @@ qRD jZd kYI rBd -tCU +cuR eGW mui uJg @@ -90911,11 +91075,11 @@ qnc qKI qJR wNf -tCU -tCU +cuR +cuR tSP cIg -gPA +cuR tCU ftX xlk @@ -91169,10 +91333,10 @@ cuR cuR eEh nMD -tCU +cuR kWW tCU -tCU +cuR cuR kuL hOh @@ -91433,7 +91597,7 @@ mij pFl ibU bzo -tCU +cuR aeu aeu aeU @@ -91690,10 +91854,10 @@ mWV vek kJs sKb -tCU -gPA -tCU -tCU +cuR +cuR +cuR +cuR ecY pxe beK @@ -93497,7 +93661,7 @@ aEk oZE acm acm -oZE +acm oZE oZE vuM @@ -95291,8 +95455,8 @@ jPG sYu mIR kom -cry -aeu +aaa +aaa aeU aeU acK @@ -97324,7 +97488,7 @@ wDz kTK wDz wDz -cXh +nNR lqn oQz cXh @@ -98628,8 +98792,8 @@ rhd rkG rhd rhd -rkG -rhd +fvc +fvc qqw qqw aaa @@ -99126,7 +99290,7 @@ oWx iza hsr jHy -pqD +wDz jLy rIS jMK @@ -117816,12 +117980,12 @@ aaa aaa aaa mVF -aaa -aaa -aaa -aaa -aaa -aaa +acK +dar +dar +dar +dar +wOb aaa aeU aeU @@ -118073,7 +118237,7 @@ aaa aaa aaa mVF -aaa +hpt aaa aaa aaa @@ -118330,7 +118494,7 @@ aaa aaa aaa mVF -aaa +qkZ aaa aaa aaa @@ -118587,7 +118751,7 @@ aaa aaa fVh mVF -aaa +qkZ aaa aaa aaa From bdc60ca8c28ac18813485240df9a440ee3b2ea60 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sun, 17 Mar 2024 21:24:08 +0100 Subject: [PATCH 24/59] bar maint --- _maps/map_files/KiloStation/KiloStation.dmm | 1084 +++++++++++++------ 1 file changed, 731 insertions(+), 353 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 754582ab54dc..2aaa3ccb6a67 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -367,9 +367,14 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/atmos) "adT" = ( -/obj/structure/cable, -/turf/closed/wall, -/area/station/maintenance/department/electrical) +/obj/structure/mineral_door/wood{ + name = "Secret Beer Storage" + }, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "aed" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -800,6 +805,11 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance/storage) +"akN" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "akV" = ( /obj/structure/sign/departments/security, /turf/closed/wall/rust, @@ -1360,9 +1370,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/security/prison/mess) -"asj" = ( -/turf/closed/wall/rust, -/area/station/maintenance/department/electrical) "asu" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -1688,6 +1695,14 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/port) +"azm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "azo" = ( /obj/structure/rack, /obj/item/clothing/suit/armor/bulletproof{ @@ -2023,7 +2038,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, -/obj/effect/mob_spawn/corpse/human/damaged, +/obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/plating, /area/station/maintenance/starboard) "aGd" = ( @@ -3341,17 +3356,13 @@ /turf/open/floor/iron/dark, /area/station/command/teleporter) "bhm" = ( -/obj/machinery/computer/monitor{ - dir = 1; - name = "backup power monitoring console" - }, /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/structure/noticeboard/directional/south, -/obj/structure/spider/stickyweb, -/obj/structure/cable, +/obj/effect/mob_spawn/corpse/human/assistant, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "bhr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -3854,6 +3865,13 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"bqa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/broken_bottle{ + pixel_x = 8 + }, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "bqd" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 @@ -4717,10 +4735,6 @@ /obj/machinery/cryopod, /turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) -"bFu" = ( -/obj/structure/cable, -/turf/closed/wall/rust, -/area/station/maintenance/department/electrical) "bFv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4771,6 +4785,16 @@ /obj/structure/sign/warning/engine_safety, /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) +"bHi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "bHj" = ( /obj/structure/table, /obj/item/paper_bin/construction{ @@ -4913,6 +4937,16 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"bJr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/mob/living/basic/rabbit{ + name = "Princess" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "bJv" = ( /turf/open/floor/engine{ name = "Holodeck Projector Floor" @@ -4990,6 +5024,13 @@ /obj/machinery/autolathe, /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) +"bLs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "bLN" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6237,6 +6278,7 @@ /obj/effect/spawner/random/maintenance, /obj/effect/spawner/random/clothing/costume, /obj/effect/spawner/random/clothing/costume, +/obj/effect/decal/cleanable/cobweb, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "chg" = ( @@ -7083,6 +7125,15 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"cts" = ( +/obj/structure/mineral_door/wood{ + name = "Secret Beer Storage" + }, +/obj/structure/barricade/wooden/crude, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "ctt" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -9654,6 +9705,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/smooth_large, /area/station/maintenance/department/chapel/monastery) +"dop" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/booze{ + pixel_x = 1; + pixel_y = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "doy" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -10018,6 +10077,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) +"dtc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "dtg" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ dir = 4 @@ -10415,18 +10482,18 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "dBe" = ( -/obj/structure/table, +/obj/machinery/light/small/directional/east, +/obj/structure/sign/poster/contraband/missing_gloves{ + pixel_x = 32 + }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/east, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high{ - pixel_x = 4; - pixel_y = 4 +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 }, -/obj/item/stock_parts/cell/high, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "dBg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -12378,13 +12445,13 @@ /turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "eki" = ( -/obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, /obj/structure/extinguisher_cabinet/directional/east, -/mob/living/basic/trooper/russian/ranged/lootless, +/obj/effect/mob_spawn/corpse/human/damaged, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "ekm" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) @@ -12917,14 +12984,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/evidence) -"esO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "esZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -12957,6 +13016,14 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/engineering/main) +"etz" = ( +/obj/item/chair/stool{ + pixel_x = 3; + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "etB" = ( /obj/machinery/light/directional/west, /obj/machinery/airalarm/directional/west, @@ -14985,6 +15052,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/processing) +"fdM" = ( +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "fdY" = ( /turf/closed/wall, /area/station/medical/medbay/lobby) @@ -15786,20 +15859,19 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/pathology) "fpz" = ( -/obj/machinery/door/airlock/engineering{ - name = "Electrical Maintenance" - }, -/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/spider/stickyweb, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/iron/dark, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "fpG" = ( /obj/structure/cable, /obj/effect/decal/cleanable/cobweb, @@ -15991,6 +16063,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 9 + }, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "fsu" = ( @@ -16288,6 +16363,10 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/port) +"fwd" = ( +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "fwf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -17158,6 +17237,7 @@ /obj/structure/chair/office{ dir = 8 }, +/mob/living/basic/trooper/russian/ranged/lootless, /turf/open/floor/carpet/green, /area/station/maintenance/port/greater) "fIR" = ( @@ -17451,6 +17531,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, /turf/open/floor/plating, /area/station/maintenance/starboard) "fMR" = ( @@ -17532,6 +17615,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/space/nearstation) +"fOh" = ( +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/beer, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "fOk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/airalarm/directional/north, @@ -20233,6 +20322,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/qm) +"gIb" = ( +/obj/structure/chair/stool/bar{ + dir = 8 + }, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "gIo" = ( /obj/effect/decal/cleanable/dirt, /obj/item/wrench, @@ -20425,8 +20520,9 @@ "gLm" = ( /obj/machinery/status_display/ai/directional/south, /obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "gLn" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall/r_wall, @@ -20520,6 +20616,13 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/fore) +"gML" = ( +/obj/item/chair/stool{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "gMY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -21051,14 +21154,13 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "gVc" = ( -/obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/obj/structure/sign/poster/contraband/missing_gloves{ - pixel_x = 32 - }, +/obj/effect/mob_spawn/corpse/human/damaged, +/obj/effect/decal/cleanable/blood/tracks, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "gVg" = ( /obj/effect/turf_decal/bot, /obj/item/radio/intercom/directional/north, @@ -21916,14 +22018,12 @@ /turf/open/floor/iron/dark/textured_large, /area/station/service/bar/backroom) "hkd" = ( -/obj/machinery/power/smes, -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/electric_shock/directional/north, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/spider/stickyweb, -/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "hkp" = ( /turf/closed/wall/r_wall/rust, /area/station/medical/pathology) @@ -22754,6 +22854,15 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) +"hwp" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/booze{ + pixel_x = 10; + pixel_y = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "hwA" = ( /turf/closed/wall/rust, /area/station/maintenance/solars/starboard/aft) @@ -24358,6 +24467,14 @@ /obj/structure/plasticflaps/opaque, /turf/open/floor/plating, /area/station/security/prison/shower) +"hUk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/grille/broken, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "hUw" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25266,6 +25383,15 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) +"ihC" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/booze{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "ihD" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/blood/old, @@ -25918,8 +26044,11 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, /obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "irj" = ( /obj/structure/sign/departments/security, /turf/closed/wall, @@ -26210,6 +26339,14 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"ivv" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "ivF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26526,13 +26663,10 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) "iAR" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/obj/structure/spider/stickyweb, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, +/obj/effect/mob_spawn/corpse/human/assistant, +/obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "iAU" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -26715,6 +26849,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"iDG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "iEi" = ( /obj/structure/chair{ dir = 4 @@ -27144,6 +27286,14 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) +"iJt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "iJu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/sign/warning/xeno_mining/directional/west, @@ -27959,6 +28109,16 @@ /obj/structure/sign/departments/cargo, /turf/closed/wall, /area/station/hallway/secondary/exit/departure_lounge) +"iWW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "iXd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28127,6 +28287,13 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/iron/dark, /area/station/medical/storage) +"iZp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical/old, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "iZv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -28167,6 +28334,15 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"iZZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "jam" = ( /obj/machinery/light/directional/north, /obj/machinery/medical_kiosk{ @@ -28890,6 +29066,11 @@ "jlh" = ( /turf/closed/wall/r_wall, /area/station/maintenance/central) +"jls" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "jlw" = ( /turf/closed/wall, /area/station/service/bar) @@ -29088,7 +29269,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mob_spawn/corpse/human/damaged, +/obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/carpet/green, /area/station/maintenance/port/greater) "jqV" = ( @@ -29263,10 +29444,9 @@ /obj/machinery/power/port_gen/pacman, /obj/structure/sign/warning/no_smoking/directional/north, /obj/effect/decal/cleanable/cobweb, -/obj/structure/spider/stickyweb, /obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "jtJ" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/tile/neutral, @@ -31350,6 +31530,17 @@ }, /turf/open/floor/iron/dark, /area/station/command/gateway) +"kfY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/directional/south, +/obj/item/broken_bottle{ + pixel_x = 10; + pixel_y = -2 + }, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "kgc" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31461,6 +31652,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/security/courtroom) +"kiK" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/blood/gibs/limb, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "kiO" = ( /obj/structure/lattice, /obj/structure/sign/warning/secure_area/directional/west, @@ -34020,6 +34219,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/service/lawoffice) +"lay" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/booze{ + pixel_x = 4; + pixel_y = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "laB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34168,16 +34375,13 @@ /turf/open/floor/grass, /area/station/command/heads_quarters/hop) "lcZ" = ( -/obj/machinery/door/airlock/engineering{ - name = "Electrical Maintenance" - }, -/obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/iron/dark, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "lda" = ( /obj/structure/chair/sofa/left/maroon{ dir = 8 @@ -34368,13 +34572,17 @@ /area/station/cargo/warehouse) "lgl" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/spider/stickyweb, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 }, -/obj/structure/cable, +/obj/item/grenade/chem_grenade/cleaner{ + name = "Holy Hand Grenade" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "lgu" = ( /obj/structure/table, /obj/machinery/recharger, @@ -34546,6 +34754,14 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) +"ljx" = ( +/obj/machinery/chem_master/condimaster{ + desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; + name = "BrewMaster 2199" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "ljy" = ( /obj/structure/chair{ dir = 4 @@ -34772,6 +34988,14 @@ "lmO" = ( /turf/closed/wall/rust, /area/station/cargo/storage) +"lmX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/broken_bottle{ + pixel_x = -8; + pixel_y = 6 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "lnc" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/landmark/start/paramedic, @@ -35199,6 +35423,12 @@ }, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"ltk" = ( +/obj/machinery/door/window/left/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "lts" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -35669,6 +35899,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/maintenance/fore) +"lAE" = ( +/obj/item/chair/stool{ + dir = 4; + pixel_x = -9; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "lAV" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -35889,6 +36128,13 @@ /obj/item/kirbyplants, /turf/open/floor/iron/dark, /area/station/command/bridge) +"lEj" = ( +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "lEs" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -40307,6 +40553,17 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"nbT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "nbU" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, @@ -40364,13 +40621,11 @@ /turf/open/floor/iron, /area/station/cargo/storage) "ncS" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "ndz" = ( /obj/machinery/smartfridge/extract/preloaded, /turf/closed/wall, @@ -40447,6 +40702,16 @@ /obj/effect/mapping_helpers/airlock/access/all/service/lawyer, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"neG" = ( +/obj/item/chair/stool{ + dir = 8; + pixel_x = -2; + pixel_y = -6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "neJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41217,7 +41482,7 @@ }, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "ntR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -41861,6 +42126,19 @@ }, /turf/open/floor/iron/dark, /area/station/science/research) +"nEE" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -7; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_x = 5; + pixel_y = 11 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "nEQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43078,6 +43356,11 @@ }, /turf/open/floor/iron/dark, /area/station/medical/pathology) +"oca" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/chair/stool/bar, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "oce" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -44695,7 +44978,6 @@ /area/station/maintenance/port/greater) "oFt" = ( /obj/machinery/light/small/directional/east, -/mob/living/basic/trooper/syndicate/melee, /turf/open/floor/carpet/green, /area/station/maintenance/port/greater) "oFC" = ( @@ -46493,6 +46775,15 @@ }, /turf/open/floor/iron/dark, /area/station/command/teleporter) +"pjs" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/booze{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "pjC" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -46893,7 +47184,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, -/obj/effect/mob_spawn/corpse/human/damaged, +/obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/plating, /area/station/maintenance/starboard) "pog" = ( @@ -47648,12 +47939,11 @@ /area/station/security/office) "pCj" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mob_spawn/corpse/human/assistant, /obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "pCu" = ( /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/blood/old, @@ -47662,6 +47952,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/fore) +"pCD" = ( +/obj/structure/table, +/obj/structure/window/spawner/directional/east, +/obj/item/grenade/chem_grenade/cleaner{ + name = "Holy Hand Grenade"; + pixel_x = 4; + pixel_y = 12 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "pCF" = ( /obj/structure/door_assembly/door_assembly_ext{ anchored = 1 @@ -48706,16 +49006,9 @@ /area/station/command/bridge) "pSu" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/spider/stickyweb, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable, +/obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "pSG" = ( /turf/open/floor/iron/showroomfloor, /area/station/security/office) @@ -50494,12 +50787,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "qyn" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/oil, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "qyo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50980,6 +51271,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/checkpoint/science/research) +"qGD" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/booze, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "qGK" = ( /turf/closed/wall, /area/station/medical/storage) @@ -52148,7 +52444,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "rau" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/sink/kitchen/directional/south{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; name = "old sink" @@ -52157,9 +52452,8 @@ dir = 8 }, /obj/effect/landmark/generic_maintenance_landmark, -/obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "raM" = ( /obj/machinery/light/directional/west, /obj/machinery/status_display/ai/directional/west, @@ -52941,18 +53235,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/pathology) "rou" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, -/obj/structure/cable, /obj/effect/spawner/random/structure/crate, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/power/terminal{ - dir = 4 - }, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "rov" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -53002,9 +53288,6 @@ luminosity = 2 }, /area/station/ai_monitored/turret_protected/ai) -"rpl" = ( -/turf/closed/wall, -/area/station/maintenance/department/electrical) "rpB" = ( /obj/structure/urinal/directional/north, /turf/open/floor/plating/rust, @@ -53720,15 +54003,10 @@ /turf/open/floor/iron/white, /area/station/security/prison/mess) "rxX" = ( -/obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/clothing/gloves/color/fyellow{ - pixel_y = 6 - }, -/obj/item/storage/toolbox/electrical, -/obj/structure/spider/stickyweb, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "ryn" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -54039,7 +54317,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/spider/stickyweb, /obj/effect/mapping_helpers/broken_floor, /obj/effect/turf_decal/siding/wood, /turf/open/floor/plating, @@ -55058,7 +55335,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "rSN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/hydroponics/constructable, @@ -55347,9 +55624,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/limb, -/obj/effect/mob_spawn/corpse/human/damaged, +/obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "rZN" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/command/storage/satellite) @@ -55650,6 +55927,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/kitchen) +"sdj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "sdm" = ( /obj/structure/table/wood, /obj/machinery/computer/libraryconsole/bookmanagement{ @@ -56248,6 +56533,14 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/station/security/warden) +"soA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mob_spawn/corpse/human/damaged, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "soB" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -58614,11 +58907,10 @@ /area/station/medical/storage) "tbb" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/storage/belt/utility, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/remains/human, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "tbi" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/docking, @@ -58991,6 +59283,10 @@ /obj/structure/flora/rock/pile/style_2, /turf/open/misc/asteroid/airless, /area/space/nearstation) +"tgW" = ( +/obj/effect/spawner/random/trash/garbage, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "tgZ" = ( /obj/structure/table, /obj/item/radio{ @@ -59015,6 +59311,12 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/starboard) +"thq" = ( +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "thy" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -59617,9 +59919,8 @@ }, /obj/item/wallframe/camera, /obj/item/screwdriver, -/obj/structure/spider/stickyweb, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "tpY" = ( /obj/machinery/vending/autodrobe/all_access, /obj/structure/noticeboard/directional/west, @@ -60357,6 +60658,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"tCz" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/vending/boozeomat, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "tCQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -61022,6 +61330,13 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) +"tOP" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/basic/pet/dog/pug{ + real_name = "Cupcake" + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "tPn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, @@ -61474,6 +61789,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) +"tXv" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/blood/gibs/core, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "tXz" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -63789,6 +64111,14 @@ }, /turf/open/floor/iron/dark, /area/station/science/research) +"uJM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "uJP" = ( /obj/machinery/door/window/left/directional/north{ dir = 4; @@ -64768,9 +65098,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/radio/intercom/directional/west, -/obj/item/wallframe/apc, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "vbi" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/fore) @@ -68406,6 +68735,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"wdy" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/booze{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "wdD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69504,6 +69842,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai_upload) +"wwl" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "wwv" = ( /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69966,6 +70308,13 @@ "wEt" = ( /turf/closed/wall/r_wall/rust, /area/station/service/bar/atrium) +"wEv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/down, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "wEw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70624,6 +70973,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"wNh" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/booze{ + pixel_x = -3; + pixel_y = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "wNo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71629,12 +71987,14 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "xeI" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "xeP" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -71644,13 +72004,12 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "xeT" = ( -/obj/machinery/power/smes, -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/electric_shock/directional/south, -/obj/structure/spider/stickyweb, -/obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 10 + }, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "xfe" = ( /obj/structure/table, /obj/item/storage/box/evidence{ @@ -72317,6 +72676,13 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"xrj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "xrm" = ( /obj/machinery/blackbox_recorder, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -73486,6 +73852,7 @@ pixel_y = 40; pixel_x = -32 }, +/obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "xKn" = ( @@ -73785,6 +74152,12 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"xOA" = ( +/obj/item/chair/stool{ + pixel_x = -4 + }, +/turf/open/floor/glass, +/area/station/maintenance/starboard) "xOB" = ( /turf/closed/wall/r_wall/rust, /area/station/engineering/main) @@ -74045,8 +74418,13 @@ /obj/effect/decal/cleanable/blood/gibs/limb, /obj/effect/landmark/event_spawn, /obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/area/station/maintenance/starboard) "xTG" = ( /turf/closed/wall, /area/station/maintenance/solars/starboard/aft) @@ -115170,7 +115548,7 @@ mhz mhz fsp xJY -mhz +uJM bQD pio qpZ @@ -115935,7 +116313,7 @@ smb rZV qbW fYT -asj +vOX jtD ntG rZK @@ -116192,7 +116570,7 @@ vOX vOX xuD mTo -rpl +rZV iAR qyn rSL @@ -116449,13 +116827,13 @@ rZV chd kOp sIp -rpl -rpl +rZV +rZV rau tbb xTx gLm -asj +vOX rZV xtV vOX @@ -116706,12 +117084,12 @@ hod kwl tbR tGX -asj +vOX pSu -esO +fkP pCj lgl -esO +fkP rou rZV syF @@ -116963,7 +117341,7 @@ jfG jfG wwA syQ -rpl +rZV hkd eki rxX @@ -117220,12 +117598,12 @@ rZV rZV rZV rZV -rpl -adT -bFu -adT -bFu -adT +rZV +rZV +vOX +rZV +vOX +cts adT vOX dJo @@ -117475,15 +117853,15 @@ bje rZV aeu aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu +rZV +tCz +lmX +nEE +neG +iDG +fkP +hUk +dtc lDu lDu lWm @@ -117732,15 +118110,15 @@ vxK aUz aeU aeu -aeu -aeu -aeu -aeu -aap -aeu -aeu -aeu -aeu +rZV +fdM +akN +lay +thq +bLs +azm +wEv +soA uVQ mER rif @@ -117989,15 +118367,15 @@ wOb aaa aeU aeU -aeu -aeu -aeu -aeu -aUz -aap -aeu -aeu -aeu +sJS +fOh +fkP +pjs +lAE +bLs +tXv +iZp +fwd plm fjI sbh @@ -118246,15 +118624,15 @@ aaa aaa aaa aeU -aeu -aeu -aeu -aeU -aeU -cui -aeu -aeu -aeu +sJS +ljx +tOP +qGD +lEj +bJr +kiK +xAL +kfY uVQ lqE doH @@ -118502,16 +118880,16 @@ aaa aaa aaa aaa -aaa -aeu -aeu -aeu -aeu -aeU aeU -aap -aeu -aeu +sJS +pCD +ltk +dop +xOA +sdj +xrj +xrj +rZV uVQ uVQ mbl @@ -118759,16 +119137,16 @@ aaa aaa aaa aaa -aaa aeU -aeu -aeu -aap -coy -aeu -aeu -aeu -aeu +sJS +iWW +nbT +iZZ +bHi +ivv +gML +etz +rZV aeu waT hjb @@ -119016,16 +119394,16 @@ aaa aaa aaa aaa -aaa -aUz aeU -aeu -aeu -aeu -aeu -aeu -aeu -aeu +sJS +xOA +wNh +thq +bLs +jls +ihC +wdy +rZV aeu waT hdY @@ -119273,16 +119651,16 @@ aaa aaa aaa aaa -aaa -aaa aeU -aeu -aeu -aeu -aeu -aeu -aeu -aeu +rZV +oca +hwp +bqa +iJt +wwl +tgW +gIb +rZV aeu aDS uFL @@ -119530,16 +119908,16 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aeu -aeu -aeu -aeu -aeu -aeu -aeu +aeU +rZV +sJS +sJS +rZV +rZV +rZV +sJS +sJS +rZV aeU aDS uFL @@ -119787,13 +120165,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aeU +aeU +aeU +aeU vku aeu -aeU +aeu aUz coy aeU @@ -120045,9 +120423,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aeU +aeU +aeU aaQ aeU cmU @@ -121313,7 +121691,7 @@ aaa aaa aaa aaa -aaa +aaB aaa aaa oRy @@ -122868,7 +123246,7 @@ tqX tqX oRy aaa -aaB +aaa aaa aaa aaa @@ -123125,10 +123503,10 @@ tqX tqX oRy aaa -aaa -aaa -aaa -aaa +aeU +aUz +aeU +aeU aaa aaa aeo @@ -123381,13 +123759,13 @@ oRy oRy oRy oRy -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeU +aeU +aeu +aeu +aeu +aeu +aeU aaa aaa aeo @@ -123637,15 +124015,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeU +aeU +aeu +aap +aeu +aap +aeu +aeu +aeU aaa aaa aaa @@ -123894,15 +124272,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeU +aeu +aeu +aap +aUz +aeU +aeu +aeu +aeU aaa aaa aaQ @@ -124151,15 +124529,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aUz +aeu +aeu +aUz +aeU +cui +aap +aeu +aeU aaa aaa aaa @@ -124174,7 +124552,7 @@ aeu aeu aeu aUz -aeU +cui aeU aeu aeu @@ -124408,15 +124786,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeU +aeu +aap +aap +aeU +coy +aeu +aeu +aeu aaa aaa aaa @@ -124665,15 +125043,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeU +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu aaa aaa aaa @@ -124922,14 +125300,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeU +aeu +aeu +aeu +aeu +aeu +aeu +aeU aaa aaa aaa @@ -125179,13 +125557,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeu +aeu +aeu +aeu +aeu +aeu +aeU aaa aaa aaa @@ -125436,12 +125814,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeu +aeu +aeu +aeu +aeu +aeu aaa aaa aaa @@ -125692,14 +126070,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu aaa aaa aaa @@ -125949,14 +126327,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu aaa aaa aaa @@ -126206,14 +126584,14 @@ aaa aaa aaa aaa -aaa -aaa aeu aeu -aaa -aaa -aaa -aaa +aeu +aeu +aeu +aeu +aeu +aeu aaa aaa aaa @@ -126468,9 +126846,9 @@ aeu aeu aeu aeu -aaa -aaa -aaa +aeu +aeu +aeu aaa aaa aaa @@ -126726,8 +127104,8 @@ aeu aeu aeu aeu -aaa -aaa +aeu +aeu aaa aaa aaa From 5e2bf75482646fc33cf6bc31f97fd1b6817a0760 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sun, 17 Mar 2024 21:34:24 +0100 Subject: [PATCH 25/59] adds a missing cable --- _maps/map_files/KiloStation/KiloStation.dmm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 2aaa3ccb6a67..f83ca38448b6 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -19727,10 +19727,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) -"gxW" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall, -/area/station/maintenance/starboard) "gyb" = ( /turf/open/floor/plating/rust, /area/station/security/prison) @@ -22018,7 +22014,6 @@ /turf/open/floor/iron/dark/textured_large, /area/station/service/bar/backroom) "hkd" = ( -/obj/structure/sign/warning/electric_shock/directional/north, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate, @@ -26921,10 +26916,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"iFd" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall/rust, -/area/station/maintenance/starboard) "iFe" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41481,6 +41472,7 @@ amount = 10 }, /obj/effect/decal/cleanable/blood/old, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard) "ntR" = ( @@ -72004,7 +71996,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "xeT" = ( -/obj/structure/sign/warning/electric_shock/directional/south, /obj/effect/decal/cleanable/blood/tracks{ dir = 10 }, @@ -115801,10 +115792,10 @@ mrt mhz rZV cQJ -iFd +vOX rEh fML -gxW +rZV oHR fkP vKE From f0a8e7da45cef2a54299477953698a83a92e424e Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 18 Mar 2024 14:00:23 +0100 Subject: [PATCH 26/59] dorms rework, moves bathroom to above medbay near chapel entrance --- _maps/map_files/KiloStation/KiloStation.dmm | 3776 +++++++++++-------- 1 file changed, 2181 insertions(+), 1595 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f83ca38448b6..e1fe7bd6774f 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -187,6 +187,21 @@ /obj/machinery/holopad/secure, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"abR" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"abV" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "aca" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet{ @@ -201,7 +216,7 @@ /obj/effect/mapping_helpers/burnt_floor, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "acj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/hydroponics/constructable, @@ -251,7 +266,7 @@ dir = 4 }, /turf/open/floor/iron/dark, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "acx" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/stripes/corner{ @@ -281,6 +296,14 @@ /obj/structure/sign/warning/radiation, /turf/closed/wall/rust, /area/station/engineering/atmos) +"acH" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/item/soap/nanotrasen, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "acK" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -627,6 +650,10 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"ahT" = ( +/obj/structure/sign/warning/vacuum/external, +/turf/closed/wall, +/area/station/maintenance/department/security/upper) "ahZ" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron, @@ -988,11 +1015,16 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "amn" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/newscaster/directional/east, -/obj/effect/landmark/start/hangover/closet, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "amr" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -1585,21 +1617,14 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/checkpoint/science/research) "awW" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/machinery/camera/directional/south{ - c_tag = "Restrooms"; - name = "recreation camera" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/effect/spawner/random/structure/chair_comfy, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "axd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external, @@ -1741,6 +1766,11 @@ /obj/machinery/telecomms/broadcaster/preset_right, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) +"azD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/maintenance/fore) "aAg" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/ai) @@ -1833,10 +1863,9 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/structure/cable, /obj/effect/landmark/navigate_destination, /turf/open/floor/iron/dark, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "aBN" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -1857,32 +1886,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "aCp" = ( -/obj/effect/turf_decal/box, -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/mirror/directional/west, -/obj/machinery/newscaster/directional/south{ - pixel_x = -28 - }, -/obj/machinery/light/small/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/blobstart, /obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/east{ - id = "Unit_3Privacy"; - name = "Unit 3 Privacy Toggle"; - pixel_y = -8 - }, -/obj/machinery/button/door/directional/east{ - id = "Unit_3"; - name = "Unit 3 Privacy Lock"; - normaldoorcontrol = 1; - pixel_y = 8; - specialfunctions = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "aCz" = ( /obj/structure/rack, /obj/item/gun/ballistic/shotgun/riot{ @@ -2306,6 +2315,17 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) +"aKS" = ( +/obj/structure/sink/directional/north, +/obj/structure/mirror/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "aKY" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, @@ -2385,6 +2405,19 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) +"aMu" = ( +/obj/structure/urinal/directional/west, +/obj/effect/decal/remains/human, +/obj/item/clothing/head/helmet/old{ + pixel_x = -7; + pixel_y = -6 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "aMy" = ( /obj/item/kirbyplants{ icon_state = "plant-05" @@ -2427,11 +2460,15 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) "aNg" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/electric_shock/directional/north, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "aNp" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -2561,7 +2598,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/turf_decal/stripes/corner{ @@ -2730,6 +2766,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +"aSA" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "aSX" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -2834,12 +2881,10 @@ /turf/open/misc/asteroid/airless, /area/space/nearstation) "aUU" = ( -/obj/structure/table, -/obj/machinery/light/small/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/medical/gauze, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "aUW" = ( /turf/open/floor/iron/stairs/medium{ dir = 4 @@ -3070,6 +3115,13 @@ /obj/machinery/duct, /turf/open/floor/wood, /area/station/service/bar/atrium) +"aZT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "bax" = ( /turf/closed/wall, /area/station/commons/storage/primary) @@ -3300,6 +3352,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"bfz" = ( +/obj/structure/urinal/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "bfA" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3328,6 +3391,12 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"bfN" = ( +/obj/machinery/door/airlock/grunge{ + name = "Restrooms" + }, +/turf/open/floor/iron/dark, +/area/station/commons/toilet/restrooms) "bgl" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/hop) @@ -3489,9 +3558,11 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "bjz" = ( -/obj/structure/flora/grass/jungle/a/style_random, -/turf/open/misc/asteroid, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "bjB" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -3565,12 +3636,6 @@ /turf/open/floor/wood, /area/station/maintenance/port/fore) "bkT" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/camera/directional/north{ @@ -3578,8 +3643,15 @@ name = "recreation camera" }, /obj/machinery/status_display/ai/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "bla" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -3817,12 +3889,17 @@ /turf/open/floor/iron/dark, /area/station/cargo/sorting) "bpp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sink/directional/north, +/obj/structure/mirror/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "bpz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4298,8 +4375,8 @@ "bxG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random/directional/south, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, /area/station/maintenance/fore) "byb" = ( /obj/effect/decal/cleanable/dirt, @@ -4446,10 +4523,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/space/basic, /area/space/nearstation) -"bAi" = ( -/obj/structure/sign/departments/security, -/turf/closed/wall, -/area/station/maintenance/fore) "bAs" = ( /obj/structure/table/wood/fancy/black, /obj/item/food/grown/poppy/geranium{ @@ -4464,6 +4537,12 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/station/service/chapel) +"bAB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "bAQ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/shower/directional/east{ @@ -4580,27 +4659,16 @@ /turf/open/floor/iron, /area/station/cargo/sorting) "bCO" = ( -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/lipstick/random{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/lipstick/random{ - pixel_x = 6; - pixel_y = 3 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/item/lipstick/random{ - pixel_x = 6 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/item/pen, -/obj/structure/table, -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "bDj" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -4683,17 +4751,16 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "bDV" = ( -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/door/airlock/grunge{ + id_tag = "Cabin_3"; + name = "Cabin 3" }, -/obj/effect/turf_decal/tile/red{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "bEa" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible, /obj/structure/lattice/catwalk, @@ -4868,11 +4935,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/garden) -"bHP" = ( -/obj/structure/flora/grass/jungle/a/style_random, -/obj/structure/chair, -/turf/open/misc/asteroid, -/area/station/maintenance/port/lesser) "bHR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/chair/office, @@ -4971,10 +5033,6 @@ /obj/effect/landmark/start/captain, /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/captain) -"bJU" = ( -/obj/structure/sign/warning/pods, -/turf/closed/wall, -/area/station/commons/locker) "bJV" = ( /obj/effect/spawner/structure/window/bronze, /turf/open/floor/plating, @@ -5096,12 +5154,15 @@ /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "bMY" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk, -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "bNl" = ( /obj/docking_port/stationary/escape_pod{ dir = 4 @@ -5186,13 +5247,15 @@ /turf/open/misc/asteroid/airless, /area/space/nearstation) "bPY" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Unit_2Privacy"; - name = "Unit 2 Privacy Shutter" +/obj/structure/table, +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/pizzabox/pineapple{ + pixel_x = -2; + pixel_y = 11 }, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "bPZ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -5647,18 +5710,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "bXS" = ( -/obj/machinery/door/airlock/external{ - name = "Prison External Airlock" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/port/lesser) "bXX" = ( @@ -5801,6 +5856,7 @@ /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "cbn" = ( @@ -6045,10 +6101,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) -"cee" = ( -/obj/structure/sign/poster/contraband/revolver, -/turf/closed/wall, -/area/station/commons/locker) "cef" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -6263,6 +6315,14 @@ }, /turf/open/floor/iron/recharge_floor, /area/station/maintenance/port/aft) +"cgZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "chc" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -6631,9 +6691,12 @@ /turf/open/floor/grass, /area/station/service/hydroponics) "ckJ" = ( -/obj/structure/sign/warning/secure_area, -/turf/closed/wall, -/area/station/maintenance/port/lesser) +/obj/structure/weightmachine/weightlifter, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "ckQ" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/bot, @@ -7169,6 +7232,13 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"ctI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "cua" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -7201,12 +7271,14 @@ /area/station/ai_monitored/security/armory) "cuD" = ( /obj/structure/sign/departments/security/directional/south, -/obj/structure/flora/grass/jungle/b/style_random, /obj/machinery/light/directional/south, -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "cuR" = ( /turf/closed/wall/r_wall, /area/station/maintenance/port/aft) @@ -7407,22 +7479,12 @@ /turf/open/floor/iron/dark, /area/station/cargo/storage) "czz" = ( -/obj/structure/bed, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/airalarm/directional/east, -/obj/effect/landmark/start/assistant, -/obj/item/bedsheet/dorms, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/north{ - id = "Cabin_2"; - name = "Cabin 2 Privacy Lock"; - normaldoorcontrol = 1; - specialfunctions = 4 +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/effect/mapping_helpers/broken_floor, -/obj/item/pillow/random, -/turf/open/floor/wood, -/area/station/commons/locker) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "czH" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -8024,6 +8086,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/courtroom) +"cLR" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "cLV" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -8445,7 +8514,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "cVb" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -8499,7 +8568,7 @@ /obj/effect/landmark/start/hangover/closet, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "cVS" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -8566,14 +8635,16 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) "cWQ" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/machinery/door/airlock/grunge{ + id_tag = "Cabin_2"; + name = "Cabin 2" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "cWS" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -8693,14 +8764,15 @@ /turf/open/floor/iron, /area/station/engineering/hallway) "cYv" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/structure/chair/office/light{ + dir = 8 }, -/obj/effect/landmark/start/hangover, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "cYy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -8788,6 +8860,13 @@ }, /turf/open/space/basic, /area/space/nearstation) +"daC" = ( +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "daG" = ( /obj/machinery/door/airlock/maintenance/external{ name = "Mass Driver Intersection" @@ -9026,11 +9105,6 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/aft) -"deZ" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "dfi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9078,17 +9152,19 @@ /area/station/service/hydroponics/garden) "dfK" = ( /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 8 }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "dfS" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres, @@ -9609,18 +9685,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/station/solars/starboard/fore) -"dny" = ( -/obj/structure/table, -/obj/item/storage/backpack{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/backpack, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "dnz" = ( /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, @@ -10326,6 +10390,10 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/engine, /area/station/science/xenobiology) +"dxx" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "dxB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10573,20 +10641,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"dDp" = ( -/obj/structure/mirror/directional/north, -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) "dDO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -10725,11 +10779,19 @@ /turf/open/floor/grass, /area/station/medical/psychology) "dHi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/structure/sign/poster/random/directional/north, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "dHq" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -11333,7 +11395,7 @@ /obj/item/clothing/mask/gas, /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "dQb" = ( /obj/machinery/door/airlock/external{ name = "Experimentation Science Lab"; @@ -11356,17 +11418,34 @@ /turf/open/floor/iron/dark, /area/station/medical/medbay/central) "dQC" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/assistant, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -5 + }, +/obj/item/pen{ + pixel_x = -5 + }, +/obj/item/pen{ + pixel_x = -5 + }, +/obj/item/pen{ + pixel_x = -5 + }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "dQG" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue, @@ -11468,20 +11547,14 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "dSe" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/item/crowbar/red, -/obj/item/restraints/handcuffs, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/revolver{ - pixel_y = 32 +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/obj/structure/grille/broken, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "dSn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -11771,6 +11844,16 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) +"dWp" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bedsheetbin, +/obj/structure/table, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "dWG" = ( /turf/closed/wall/r_wall, /area/station/security/prison/safe) @@ -11863,15 +11946,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/bar/backroom) -"dZk" = ( -/obj/machinery/door/airlock/grunge{ - id_tag = "Cabin_2"; - name = "Cabin 2" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark, -/area/station/commons/locker) "dZA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12063,6 +12137,14 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/genetics) +"edr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard) "edU" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -12450,6 +12532,7 @@ /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/mob_spawn/corpse/human/damaged, /obj/effect/decal/cleanable/blood/old, +/obj/effect/decal/cleanable/blood, /turf/open/floor/plating, /area/station/maintenance/starboard) "ekm" = ( @@ -12508,9 +12591,11 @@ /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/reagent_dispensers/fueltank{ + name = "Ratte" + }, /turf/open/floor/iron/dark, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "elw" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -12590,16 +12675,11 @@ /turf/open/misc/asteroid, /area/space/nearstation) "emo" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/structure/chair/office{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "emx" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -12641,18 +12721,6 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"enj" = ( -/obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/spawner/structure/electrified_grille, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) "enr" = ( /obj/structure/table, /obj/item/storage/box/lights/mixed{ @@ -12967,8 +13035,10 @@ /turf/open/floor/carpet/green, /area/station/maintenance/port/greater) "esq" = ( -/turf/closed/wall/rust, -/area/station/commons/locker) +/obj/structure/statue/sandstone/assistant, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass/plasma, +/area/station/commons/fitness/recreation) "esv" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/iron/grimy, @@ -13243,15 +13313,13 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) "exJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, /obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "exN" = ( /obj/effect/turf_decal/box/corners, /obj/effect/decal/cleanable/dirt, @@ -13365,14 +13433,11 @@ /turf/open/floor/plating, /area/station/security/execution/education) "ezZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/window/reinforced/spawner/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "eAa" = ( /obj/structure/rack, @@ -13602,13 +13667,22 @@ /area/station/hallway/primary/central/fore) "eEe" = ( /obj/structure/sign/warning/electric_shock/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/structure/lattice/catwalk, /obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/table, +/obj/item/storage/backpack, +/obj/item/storage/backpack{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "eEh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -14040,6 +14114,11 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"eLh" = ( +/obj/machinery/shower/directional/south, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "eLm" = ( /turf/closed/wall, /area/station/security/checkpoint/customs) @@ -14224,6 +14303,10 @@ /obj/item/flashlight/lamp/green, /turf/open/floor/wood/tile, /area/station/service/library) +"eOp" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/commons/toilet/restrooms) "eOs" = ( /obj/effect/decal/cleanable/robot_debris, /turf/closed/wall/r_wall/rust, @@ -14412,37 +14495,30 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"eRx" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/courtroom) -"eRy" = ( +"eRu" = ( +/obj/structure/toilet, +/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/box, -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/mirror/directional/west, -/obj/machinery/newscaster/directional/south{ - pixel_x = -28 - }, -/obj/machinery/light/small/directional/east, -/obj/effect/landmark/blobstart, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/east{ - id = "Unit_1Privacy"; - name = "Unit 1 Privacy Toggle"; - pixel_y = -8 - }, /obj/machinery/button/door/directional/east{ - id = "Unit_1"; - name = "Unit 1 Privacy Lock"; + id = "Unit_3"; + name = "Unit 3 Privacy Lock"; normaldoorcontrol = 1; pixel_y = 8; specialfunctions = 4 }, +/obj/effect/landmark/start/assistant, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) +"eRx" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) +"eRy" = ( +/obj/structure/statue/bronze/marx, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass/plasma, +/area/station/commons/fitness/recreation) "eRC" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 6 @@ -14729,20 +14805,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"eYu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/item/megaphone{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "eYv" = ( /obj/machinery/exodrone_launcher, /obj/effect/turf_decal/trimline/yellow, @@ -14834,6 +14896,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"eZq" = ( +/turf/closed/wall/rust, +/area/station/maintenance/department/security/upper) "eZx" = ( /obj/machinery/microwave{ pixel_y = 5 @@ -15012,6 +15077,14 @@ }, /turf/open/floor/iron/dark, /area/station/service/bar/backroom) +"fcY" = ( +/obj/machinery/shower/directional/south, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/random/directional/east, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "fdd" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -15468,6 +15541,9 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) +"fjC" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/security/upper) "fjI" = ( /obj/structure/chair/office{ dir = 4 @@ -15651,8 +15727,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/delivery, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "fmA" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -15761,7 +15838,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "fol" = ( /obj/docking_port/stationary{ dir = 4; @@ -16069,28 +16146,18 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "fsu" = ( -/obj/effect/turf_decal/box, -/obj/machinery/shower/directional/east, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/item/soap/nanotrasen, -/obj/machinery/newscaster/directional/west, -/obj/effect/landmark/generic_maintenance_landmark, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/east{ - id = "Shower_2"; - name = "Shower 2 Privacy Lock"; - normaldoorcontrol = 1; - pixel_y = 8; - specialfunctions = 4 +/obj/structure/bed{ + dir = 4 }, -/obj/machinery/button/door/directional/east{ - id = "Shower_2Privacy"; - name = "Shower 2 Privacy Toggle"; - pixel_y = -8 +/obj/item/bedsheet/dorms{ + dir = 4 }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/effect/landmark/start/hangover, +/obj/machinery/newscaster/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "fsJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -16126,7 +16193,7 @@ "fti" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "ftl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -16569,20 +16636,12 @@ /turf/open/floor/iron/dark, /area/station/medical/paramedic) "fyD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, /obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "fyG" = ( /obj/structure/cable, @@ -16612,7 +16671,7 @@ /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "fzn" = ( /obj/machinery/door/airlock/external{ name = "Science Escape Pod"; @@ -16644,12 +16703,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/storage) -"fzH" = ( -/obj/structure/chair, -/obj/effect/landmark/start/assistant, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "fzJ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -16901,15 +16954,21 @@ /turf/open/floor/iron/dark, /area/station/cargo/sorting) "fDB" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge{ - name = "Restrooms" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/commons/locker) +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "fDS" = ( /obj/machinery/air_sensor/carbon_tank, /turf/open/floor/engine/co2, @@ -16940,12 +16999,13 @@ /obj/item/kirbyplants{ icon_state = "applebush" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/red{ + dir = 4 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "fEj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17073,7 +17133,7 @@ /obj/structure/sign/poster/contraband/random/directional/west, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "fGI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17380,11 +17440,11 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) "fKJ" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/ferny/style_random, -/turf/open/misc/asteroid, -/area/station/maintenance/port/lesser) +/obj/structure/punching_bag, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "fLd" = ( /obj/machinery/power/port_gen/pacman, /obj/structure/sign/warning/electric_shock/directional/north, @@ -17542,6 +17602,13 @@ }, /turf/open/floor/engine, /area/station/science/explab) +"fNd" = ( +/obj/machinery/door/airlock/medical{ + id_tag = "Unit_3"; + name = "Unit 3" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "fNe" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -17558,9 +17625,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/office) "fNy" = ( -/obj/structure/flora/grass/jungle/b/style_random, -/turf/open/misc/asteroid, -/area/station/maintenance/port/lesser) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "fNG" = ( /obj/machinery/light/directional/north, /obj/machinery/status_display/evac/directional/north, @@ -17952,20 +18019,15 @@ /turf/open/floor/iron/dark, /area/station/service/library) "fSW" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/item/restraints/legcuffs/beartrap, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "fSY" = ( -/obj/machinery/bluespace_vendor/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atm, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -18023,6 +18085,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/status_display/evac/directional/east, /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "fUp" = ( @@ -18148,6 +18211,12 @@ /obj/effect/landmark/start/psychologist, /turf/open/floor/carpet, /area/station/medical/psychology) +"fWU" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "fWX" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -18275,6 +18344,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"fZo" = ( +/obj/machinery/door/airlock/medical{ + id_tag = "Shower_2"; + name = "Shower 2" + }, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "fZy" = ( /obj/effect/turf_decal/siding/blue/corner{ dir = 1 @@ -18464,15 +18541,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood, /area/station/service/bar) -"gbU" = ( -/obj/effect/turf_decal/bot, -/obj/structure/frame/computer{ - anchored = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) "gbY" = ( /obj/effect/turf_decal/bot/left, /obj/effect/decal/cleanable/ash, @@ -18499,10 +18567,8 @@ /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) "gcL" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/spawner/random/engineering/tracking_beacon, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "gdA" = ( /obj/machinery/door/airlock/maintenance, @@ -18513,7 +18579,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/dark, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "gdI" = ( /obj/structure/chair/pew{ dir = 8 @@ -18523,15 +18589,6 @@ dir = 8 }, /area/station/service/chapel) -"gdL" = ( -/obj/machinery/door/airlock/grunge{ - id_tag = "Cabin_3"; - name = "Cabin 3" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark, -/area/station/commons/locker) "gdP" = ( /obj/structure/chair{ dir = 1 @@ -18546,6 +18603,15 @@ }, /turf/open/floor/wood, /area/station/security/detectives_office) +"gej" = ( +/obj/effect/decal/cleanable/blood/gibs/body, +/obj/effect/decal/cleanable/blood, +/obj/structure/toilet, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "gel" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -19325,7 +19391,7 @@ icon_state = "detective" }, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "gqR" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/decal/cleanable/dirt, @@ -19367,6 +19433,9 @@ /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/station/maintenance/aft) +"grL" = ( +/turf/closed/wall, +/area/station/maintenance/department/security/upper) "grQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/hatch{ @@ -19553,6 +19622,7 @@ }, /obj/machinery/status_display/evac/directional/east, /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "guC" = ( @@ -19567,8 +19637,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "guJ" = ( -/turf/open/misc/asteroid, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "guK" = ( /obj/machinery/bookbinder, /obj/structure/window/reinforced/spawner/directional/north, @@ -19826,6 +19900,15 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"gAh" = ( +/obj/machinery/shower/directional/south, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "gAp" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -19924,14 +20007,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "gBN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "gBT" = ( /obj/structure/table, @@ -19979,16 +20057,14 @@ /turf/open/floor/iron, /area/station/security/prison) "gDe" = ( -/obj/structure/dresser, /obj/machinery/airalarm/directional/east, -/obj/machinery/button/door/directional/north{ - id = "Cabin_1"; - name = "Cabin 1 Privacy Lock"; - normaldoorcontrol = 1; - specialfunctions = 4 +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "gDl" = ( /obj/effect/spawner/random/entertainment/arcade, /turf/open/floor/iron/grimy, @@ -20211,14 +20287,20 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "gGq" = ( -/obj/structure/table, -/obj/machinery/light/small/directional/east, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/suit/armor/vest, -/obj/item/clothing/neck/stethoscope, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) +/obj/effect/turf_decal/tile/red, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/kirbyplants{ + icon_state = "plant-10"; + pixel_x = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "gGs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20429,12 +20511,13 @@ /area/station/maintenance/starboard/fore) "gJC" = ( /obj/structure/sign/departments/security/directional/south, -/obj/structure/flora/bush/pale/style_random, /obj/machinery/light/directional/south, -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "gJE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line, @@ -20485,6 +20568,20 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) +"gKz" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/closet/wardrobe/mixed, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "gKB" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/table_frame, @@ -20513,6 +20610,17 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"gLg" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "gLm" = ( /obj/machinery/status_display/ai/directional/south, /obj/effect/decal/cleanable/dirt, @@ -20667,7 +20775,8 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/box, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "gNM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -20909,6 +21018,16 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"gRt" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "gRN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/shaft_miner, @@ -21155,6 +21274,7 @@ /obj/effect/decal/cleanable/blood/tracks, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/blood, /turf/open/floor/plating, /area/station/maintenance/starboard) "gVg" = ( @@ -21229,6 +21349,14 @@ }, /turf/open/floor/engine, /area/station/engineering/gravity_generator) +"gWv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/departments/restroom/directional/west{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/fore) "gWw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -21324,6 +21452,7 @@ /obj/effect/turf_decal/stripes/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "gYx" = ( @@ -21676,25 +21805,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) -"hfF" = ( -/obj/structure/bed{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/obj/effect/landmark/start/assistant, -/obj/item/bedsheet/dorms{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/north{ - id = "Cabin_3"; - name = "Cabin 3 Privacy Lock"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/item/pillow/random, -/turf/open/floor/wood, -/area/station/commons/locker) "hfP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -22396,17 +22506,12 @@ /turf/open/floor/wood, /area/station/service/theater) "hoE" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "hoI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -22450,7 +22555,7 @@ /obj/structure/grille, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "hph" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line{ @@ -22606,9 +22711,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "hri" = ( -/obj/structure/dresser, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "hrN" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -22627,6 +22733,17 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) +"hrO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "hrY" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -22656,7 +22773,7 @@ /obj/structure/sign/poster/contraband/random/directional/north, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "hsx" = ( /obj/machinery/vending/hydroseeds{ slogan_delay = 700 @@ -22691,14 +22808,11 @@ /turf/open/floor/iron/grimy, /area/station/hallway/primary/fore) "hsL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "hsO" = ( /obj/structure/cable, @@ -22711,9 +22825,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/storage/art) "hsW" = ( -/obj/structure/noticeboard/directional/east, -/turf/closed/mineral/random/labormineral, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "htJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -23226,6 +23341,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "hCK" = ( @@ -23300,15 +23416,20 @@ /turf/closed/wall/r_wall, /area/station/tcommsat/server) "hDC" = ( -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "hDK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -24054,19 +24175,13 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "hOH" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/machinery/firealarm/directional/south, -/obj/machinery/light/directional/south, -/obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "hOJ" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -24136,16 +24251,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "hPq" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; name = "dormitories sorting disposal pipe" }, -/obj/structure/cable, /obj/effect/mapping_helpers/mail_sorting/service/dormitories, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "hPx" = ( @@ -24227,6 +24338,12 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "hQs" = ( @@ -24382,6 +24499,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "hSv" = ( @@ -24560,12 +24678,16 @@ /area/station/maintenance/aft) "hVl" = ( /obj/structure/sign/warning/electric_shock/directional/south, -/obj/structure/flora/grass/jungle/a/style_random, /obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/microwave, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "hVF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -24573,6 +24695,37 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"hVJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/effect/landmark/start/hangover, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/pen, +/obj/item/lipstick/random{ + pixel_x = 6 + }, +/obj/item/lipstick/random{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/lipstick/random{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "hVL" = ( /obj/machinery/computer/slot_machine, /obj/effect/turf_decal/bot_white, @@ -24627,7 +24780,7 @@ /obj/structure/sign/poster/contraband/random/directional/west, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "hWD" = ( /obj/structure/chair{ dir = 8 @@ -24682,7 +24835,7 @@ /obj/effect/landmark/start/hangover/closet, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "hYa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -25000,6 +25153,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "icw" = ( @@ -25402,31 +25556,13 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "iiQ" = ( -/obj/effect/turf_decal/box, -/obj/structure/toilet{ - dir = 8 - }, -/obj/structure/mirror/directional/west, -/obj/machinery/newscaster/directional/south{ - pixel_x = -28 - }, -/obj/machinery/light/small/directional/east, -/obj/effect/landmark/start/assistant, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/east{ - id = "Unit_2Privacy"; - name = "Unit 2 Privacy Toggle"; - pixel_y = -8 - }, -/obj/machinery/button/door/directional/east{ - id = "Unit_2"; - name = "Unit2 Privacy Lock"; - normaldoorcontrol = 1; - pixel_y = 8; - specialfunctions = 4 +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = 6 }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "ijc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -25590,14 +25726,13 @@ /turf/closed/wall/rust, /area/station/engineering/atmos) "iku" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/effect/landmark/event_spawn, /obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "ikx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25611,17 +25746,14 @@ /turf/open/floor/catwalk_floor/iron, /area/station/service/chapel/dock) "ikE" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/medkit/regular, +/obj/structure/table, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "ikH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25723,8 +25855,19 @@ /turf/open/floor/iron/dark, /area/station/security/office) "ilJ" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/open/floor/plating, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "imo" = ( /obj/structure/sign/directions/science{ @@ -26156,6 +26299,15 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) +"isc" = ( +/obj/machinery/shower/directional/east, +/obj/item/soap/nanotrasen, +/obj/structure/sign/poster/official/no_erp{ + pixel_y = -32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "isw" = ( /obj/machinery/chem_heater/withbuffer, /obj/effect/turf_decal/bot, @@ -26270,22 +26422,20 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) -"iun" = ( -/obj/machinery/door/airlock/medical{ - id_tag = "Shower_1"; - name = "Shower 1" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/commons/toilet/restrooms) +"iuz" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "iuC" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Cabin_4Privacy"; - name = "Cabin 4 Privacy Shutter" +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "iuE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26388,7 +26538,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "iwB" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -26509,6 +26659,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) +"ixW" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "iyd" = ( /obj/machinery/door/poddoor/incinerator_atmos_main, /turf/open/floor/engine, @@ -26928,6 +27085,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "iFm" = ( @@ -27039,6 +27197,24 @@ }, /turf/open/floor/bronze, /area/station/maintenance/department/chapel) +"iGC" = ( +/obj/machinery/button/door/directional/north{ + id = "Cabin_3"; + name = "Cabin 3 Privacy Lock"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/structure/table/wood, +/obj/item/storage/secure/briefcase{ + pixel_y = 4 + }, +/obj/item/radio{ + desc = "An old handheld radio. You could use it, if you really wanted to."; + icon_state = "radio"; + name = "old radio" + }, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "iGD" = ( /obj/structure/table, /obj/machinery/computer/security/telescreen/minisat{ @@ -27547,7 +27723,7 @@ /obj/structure/sign/poster/contraband/random/directional/north, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "iNh" = ( /obj/machinery/camera/directional/east{ c_tag = "Xenobiology Cell 4"; @@ -27652,6 +27828,13 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/recharge_floor, /area/station/science/robotics/mechbay) +"iPS" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/landmark/start/hangover/closet, +/obj/machinery/newscaster/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "iPU" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -28121,16 +28304,13 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "iXx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "iXD" = ( /obj/machinery/camera/directional/east{ @@ -28164,13 +28344,20 @@ /turf/open/space/basic, /area/space) "iYa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "iYb" = ( /obj/structure/railing{ dir = 4 @@ -28332,6 +28519,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "jam" = ( @@ -28391,9 +28579,6 @@ /turf/open/floor/plating, /area/station/security/office) "jbf" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -28948,7 +29133,6 @@ "jiR" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, -/obj/structure/sign/departments/restroom/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/trunk, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -28974,13 +29158,11 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "jiU" = ( -/obj/machinery/door/airlock/medical{ - id_tag = "Shower_2"; - name = "Shower 2" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/commons/toilet/restrooms) +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/landmark/start/hangover/closet, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "jjj" = ( /obj/machinery/bluespace_vendor/directional/south, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -29128,9 +29310,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "jnj" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, @@ -29190,16 +29369,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/brig) -"joS" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/east, -/obj/structure/reagent_dispensers/water_cooler, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "joY" = ( /turf/closed/wall/rust, /area/station/maintenance/disposal) @@ -29493,6 +29662,23 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) +"jvg" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "jvh" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/radiation, @@ -29649,9 +29835,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "jzo" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -29829,6 +30012,17 @@ "jCm" = ( /turf/closed/wall, /area/station/maintenance/department/crew_quarters/bar) +"jCy" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "jCD" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -29858,12 +30052,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"jDs" = ( -/obj/structure/table, -/obj/item/razor, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/commons/locker) "jDy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30033,6 +30221,11 @@ /obj/machinery/pdapainter/supply, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/qm) +"jGk" = ( +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "jGt" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -30052,6 +30245,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/cargo/warehouse) +"jGV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "jGW" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -30088,7 +30286,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/space_heater, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "jHR" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -30135,6 +30333,12 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/medical/psychology) +"jIC" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Restrooms" + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/fore) "jID" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30291,15 +30495,15 @@ /turf/open/floor/wood, /area/station/maintenance/port/fore) "jJN" = ( -/obj/effect/turf_decal/stripes/end, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "jJW" = ( /obj/item/kirbyplants{ icon_state = "plant-18" @@ -30639,25 +30843,14 @@ /turf/open/floor/iron/dark, /area/station/science/server) "jPq" = ( -/obj/structure/table/wood, -/obj/effect/decal/cleanable/cobweb, -/obj/item/storage/secure/briefcase{ - pixel_y = 4 - }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio" - }, -/obj/machinery/airalarm/directional/west, -/obj/machinery/button/door/directional/north{ - id = "Cabin_4"; - name = "Cabin 4 Privacy Lock"; - normaldoorcontrol = 1; - specialfunctions = 4 +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = -10; + pixel_y = 8 }, -/turf/open/floor/wood, -/area/station/commons/locker) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "jPB" = ( /turf/closed/wall/rust, /area/station/security/courtroom) @@ -30854,12 +31047,11 @@ /turf/open/floor/iron/dark, /area/station/service/janitor) "jTc" = ( -/obj/effect/turf_decal/bot, /obj/machinery/holopad, /obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "jTk" = ( /obj/structure/flora/rock/pile/style_random{ pixel_x = -6; @@ -30993,13 +31185,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "jWD" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Cabin_3Privacy"; - name = "Cabin 3 Privacy Shutter" - }, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/structure/chair/sofa/middle, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "jWL" = ( /obj/machinery/vending/tool, /obj/effect/turf_decal/bot, @@ -31014,15 +31203,14 @@ /turf/closed/wall/r_wall, /area/station/maintenance/port/lesser) "jXd" = ( -/obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/structure/chair/stool/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "jXi" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31963,6 +32151,10 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/hallway/primary/aft) +"koI" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/station/commons/toilet/restrooms) "kpH" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31980,6 +32172,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/status_display/evac/directional/east, /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "kql" = ( @@ -32329,8 +32522,10 @@ /obj/effect/spawner/random/decoration/glowstick, /obj/structure/grille/broken, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "kwM" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/yellow, @@ -32473,10 +32668,12 @@ /area/station/maintenance/port/lesser) "kzz" = ( /obj/machinery/light/directional/north, -/obj/structure/chair/stool/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/cobweb, /turf/open/floor/iron/dark, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "kzG" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood{ @@ -32498,16 +32695,14 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/lab) "kzP" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "kzT" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32797,7 +32992,7 @@ /obj/structure/closet/wardrobe/green, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "kFG" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -32898,6 +33093,13 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) +"kHo" = ( +/obj/machinery/door/airlock/medical{ + id_tag = "Unit_2"; + name = "Unit 2" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "kHr" = ( /obj/effect/turf_decal/delivery, /obj/structure/reagent_dispensers/fueltank, @@ -32929,9 +33131,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/iron/dark, /area/station/maintenance/fore) "kHQ" = ( /obj/structure/sign/poster/official/wtf_is_co2, @@ -33067,6 +33269,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/service/library) +"kKq" = ( +/mob/living/basic/clown{ + name = "Maniac" + }, +/obj/structure/toilet{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/commons/toilet/restrooms) "kKw" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/door/poddoor/preopen{ @@ -33131,6 +33344,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/status_display/evac/directional/east, /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "kMe" = ( @@ -33423,13 +33637,22 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/dark, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "kPo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/central) +"kPt" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/dice/d100{ + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "kPv" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -33482,6 +33705,10 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) +"kPU" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "kQf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ @@ -33726,7 +33953,7 @@ /area/station/hallway/primary/port) "kTK" = ( /turf/closed/wall/r_wall/rust, -/area/station/maintenance/port/lesser) +/area/station/security/brig) "kUd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -33765,7 +33992,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "kUS" = ( /turf/closed/wall, /area/station/engineering/storage_shared) @@ -33787,7 +34014,8 @@ }, /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/box, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "kUZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -34417,9 +34645,11 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/reagent_dispensers/fueltank{ + name = "Big Bertha" + }, /turf/open/floor/iron/dark, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "lev" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -34679,6 +34909,14 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"lii" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/airalarm/directional/east, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/landmark/start/assistant, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "lik" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -34883,7 +35121,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "llY" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34925,6 +35163,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "lmi" = ( @@ -34985,6 +35224,7 @@ pixel_x = -8; pixel_y = 6 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "lnc" = ( @@ -35069,10 +35309,14 @@ "loI" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/door/airlock/grunge{ + name = "Restrooms" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/commons/toilet/restrooms) "loO" = ( /obj/machinery/airlock_sensor/incinerator_ordmix{ pixel_x = -24 @@ -35186,11 +35430,9 @@ /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "lqM" = ( -/obj/structure/table, /obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/commons/locker) +/turf/closed/wall, +/area/station/commons/fitness/recreation) "lqN" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -35208,14 +35450,14 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "lqP" = ( -/obj/machinery/door/airlock/grunge{ - id_tag = "Cabin_1"; - name = "Cabin 1" +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark, -/area/station/commons/locker) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "lqR" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, @@ -35286,12 +35528,14 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "lrP" = ( -/obj/machinery/door/airlock/medical{ - id_tag = "Unit_1"; - name = "Unit 1" +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/pizzabox/margherita{ + pixel_x = -1; + pixel_y = 11 }, -/turf/open/floor/iron/dark, -/area/station/commons/toilet/restrooms) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "lrR" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -35327,6 +35571,11 @@ }, /turf/closed/wall, /area/station/engineering/atmos) +"lsn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "lst" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -35377,9 +35626,11 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "lsX" = ( -/obj/structure/sign/departments/restroom, -/turf/closed/wall, -/area/station/commons/locker) +/obj/structure/chair/office/light, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "lsZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/hydroponics/constructable, @@ -36369,11 +36620,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) "lJA" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/lighter, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "lJD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36685,29 +36934,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) -"lOZ" = ( -/obj/effect/turf_decal/box, -/obj/machinery/shower/directional/west, -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/item/bikehorn/rubberducky, -/obj/machinery/newscaster/directional/west, -/obj/effect/landmark/start/assistant, -/obj/effect/landmark/start/hangover, -/obj/machinery/button/door/directional/east{ - id = "Shower_1"; - name = "Shower 1 Privacy Lock"; - normaldoorcontrol = 1; - pixel_y = 8; - specialfunctions = 4 - }, -/obj/machinery/button/door/directional/east{ - id = "Shower_1Privacy"; - name = "Shower 1 Privacy Toggle"; - pixel_y = -8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) "lPh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37121,14 +37347,10 @@ /turf/open/floor/plating/airless, /area/station/hallway/secondary/entry) "lWJ" = ( -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/sign/poster/official/random/directional/south, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "lWL" = ( @@ -37519,7 +37741,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) @@ -37682,6 +37903,15 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron/dark, /area/station/security/lockers) +"mgP" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/storage/dice{ + pixel_x = -8; + pixel_y = 2 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "mgR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37930,10 +38160,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "mlj" = ( @@ -38274,15 +38503,23 @@ /turf/open/floor/iron, /area/station/cargo/storage) "mqU" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "mrl" = ( /turf/closed/wall, /area/station/command/heads_quarters/cmo) @@ -38700,6 +38937,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "myc" = ( @@ -39686,12 +39924,11 @@ /turf/open/floor/iron, /area/station/command/bridge) "mOK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/window/reinforced/spawner/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "mPo" = ( /obj/structure/table, @@ -40282,6 +40519,19 @@ /obj/structure/sign/poster/contraband/random/directional/south, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) +"mXX" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/kirbyplants{ + icon_state = "plant-14"; + pixel_y = 11 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "mYv" = ( /obj/effect/turf_decal/siding/thinplating/dark/end{ dir = 8 @@ -40356,9 +40606,9 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "mZO" = ( -/obj/structure/chair, /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "mZR" = ( @@ -40553,6 +40803,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/gibs, +/obj/effect/decal/cleanable/blood, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "nbU" = ( @@ -40578,7 +40829,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "ncC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/event_spawn, @@ -40615,12 +40866,18 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/plating, /area/station/maintenance/starboard) "ndz" = ( /obj/machinery/smartfridge/extract/preloaded, /turf/closed/wall, /area/station/science/xenobiology) +"ndI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/security/upper) "ndP" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /obj/effect/decal/cleanable/dirt, @@ -40801,6 +41058,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "ngi" = ( @@ -40942,12 +41200,11 @@ /turf/open/floor/iron, /area/station/command/bridge) "njf" = ( -/obj/machinery/door/airlock/medical{ - id_tag = "Unit_3"; - name = "Unit 3" - }, -/turf/open/floor/iron/dark, -/area/station/commons/toilet/restrooms) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "njL" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -40960,16 +41217,13 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "nkd" = ( -/obj/structure/table, -/obj/item/storage/briefcase, -/obj/item/clothing/neck/tie/red, -/obj/item/clothing/head/hats/bowler{ - pixel_y = 8 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, -/obj/item/cane, -/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "nkg" = ( /obj/machinery/igniter/incinerator_atmos, /turf/open/floor/engine, @@ -41042,6 +41296,20 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"nmF" = ( +/obj/structure/toilet, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/box, +/obj/machinery/button/door/directional/east{ + id = "Unit_1"; + name = "Unit 1 Privacy Lock"; + normaldoorcontrol = 1; + pixel_y = 8; + specialfunctions = 4 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "nmR" = ( /obj/machinery/modular_computer/console/preset/id{ dir = 8 @@ -41938,17 +42206,18 @@ /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) "nCs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/assistant, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/assistant, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "nCv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -42081,6 +42350,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"nEj" = ( +/obj/effect/spawner/random/structure/chair_comfy{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "nEk" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/machinery/door/poddoor/shutters{ @@ -42351,6 +42629,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"nIH" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/obj/structure/toilet{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "nIR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42427,16 +42713,17 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "nKh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "nKj" = ( /obj/effect/turf_decal/siding/thinplating/dark/end{ dir = 4 @@ -42791,16 +43078,22 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/plating, /area/station/cargo/storage) -"nQX" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/wardrobe/mixed, -/obj/machinery/light/small/directional/south, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +"nRu" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/commons/locker) +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_x = -8; + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "nRC" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency{ @@ -43028,17 +43321,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/checkpoint/customs) -"nXC" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) "nXW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43134,13 +43416,18 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "nZC" = ( -/obj/effect/turf_decal/bot, -/obj/structure/punching_bag, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/noticeboard/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/sink/directional/north, +/obj/structure/mirror/directional/south, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "nZE" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/stripes/line{ @@ -43195,11 +43482,18 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "nZZ" = ( -/obj/machinery/firealarm/directional/west, -/obj/structure/chair/stool/directional/east, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/commons/locker) +/obj/machinery/button/door/directional/north{ + id = "Cabin_1"; + name = "Cabin 1 Privacy Lock"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/structure/table/wood, +/obj/item/lighter, +/obj/item/folder/red, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "oam" = ( /turf/closed/wall, /area/station/maintenance/disposal) @@ -43317,14 +43611,18 @@ /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "obM" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/grunge{ - name = "Restrooms" +/obj/structure/bed{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/commons/locker) +/obj/item/bedsheet/dorms{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/pillow/random, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "obU" = ( /obj/structure/table/glass, /obj/item/clothing/gloves/latex, @@ -43351,16 +43649,16 @@ "oca" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/chair/stool/bar, +/obj/effect/decal/cleanable/blood, /turf/open/floor/glass, /area/station/maintenance/starboard) "oce" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/pale/style_random, -/turf/open/misc/asteroid, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "ocg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -43512,7 +43810,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "ofg" = ( /turf/closed/wall, /area/station/medical/pharmacy) @@ -43533,12 +43831,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "ofr" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random{ pixel_y = 32 }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/iron/dark, /area/station/maintenance/fore) "ofs" = ( /obj/effect/turf_decal/tile/neutral{ @@ -43581,11 +43879,19 @@ }, /obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/security/brig) "ofz" = ( -/obj/structure/flora/rock/pile/style_random, -/turf/open/misc/asteroid, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/vending/clothing, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "ofA" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/east, @@ -44229,7 +44535,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, @@ -44284,6 +44589,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) "ouk" = ( @@ -44385,7 +44691,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "ova" = ( -/obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -45878,6 +46183,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"oVg" = ( +/obj/structure/girder, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/security/upper) "oVl" = ( /obj/machinery/door/airlock/external{ name = "Satellite External Airlock" @@ -45970,7 +46281,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "oWG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46071,15 +46382,12 @@ /turf/open/floor/iron/dark/textured_half, /area/station/bitrunning/den) "oYc" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge{ - name = "Recreation Area" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/iron/dark, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "oYd" = ( /obj/machinery/light/directional/south, @@ -46160,6 +46468,16 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/station/maintenance/fore) +"oYY" = ( +/obj/structure/urinal/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "oZb" = ( /obj/structure/railing{ dir = 4 @@ -46496,17 +46814,15 @@ /turf/open/floor/iron, /area/station/cargo/office) "peZ" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/newscaster/directional/west, -/obj/effect/landmark/start/hangover/closet, -/obj/machinery/button/door/directional/west{ - id = "Cabin_4Privacy"; - name = "Cabin 4 Privacy Toggle"; - pixel_y = -24 +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/pizzabox/meat{ + pixel_y = 12; + pixel_x = -2 }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "pfc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 4 @@ -46789,6 +47105,12 @@ c_tag = "Recreation Fitness Ring"; name = "recreation camera" }, +/obj/item/training_toolbox, +/obj/item/training_toolbox{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/structure/table, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "pjE" = ( @@ -47103,6 +47425,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "pnA" = ( @@ -47455,18 +47778,12 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "psf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "psn" = ( /obj/item/clothing/mask/gas/sechailer{ @@ -47521,6 +47838,21 @@ /obj/machinery/air_sensor/oxygen_tank, /turf/open/floor/engine/o2, /area/station/engineering/atmos) +"ptv" = ( +/obj/structure/chair/sofa/right, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "ptL" = ( /obj/effect/turf_decal/sand/plating, /obj/item/poster/random_contraband, @@ -47595,7 +47927,7 @@ "pvs" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "pvu" = ( /obj/machinery/vending/wardrobe/atmos_wardrobe, /obj/effect/turf_decal/bot, @@ -48076,12 +48408,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/medical/central) -"pEu" = ( -/obj/structure/table, -/obj/item/storage/medkit/regular, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/commons/locker) "pEA" = ( /obj/structure/table, /obj/machinery/camera/directional/east{ @@ -48405,15 +48731,13 @@ /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) "pJK" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "pKf" = ( @@ -48553,6 +48877,15 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) +"pLA" = ( +/obj/machinery/door/airlock/grunge{ + name = "Leave" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/structure/barricade/wooden/crude, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/commons/toilet/restrooms) "pLB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, @@ -49013,6 +49346,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +"pTb" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = -6 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "pTc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -49215,12 +49556,18 @@ /turf/open/floor/iron, /area/station/command/bridge) "pXN" = ( -/obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/newscaster/directional/east, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "pXU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49609,6 +49956,16 @@ /obj/machinery/door/firedoor, /turf/open/floor/engine, /area/station/science/xenobiology) +"qeq" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "qew" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ @@ -49830,6 +50187,19 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/showroomfloor, /area/station/security/execution/transfer) +"qhX" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "qhZ" = ( /obj/machinery/light/directional/north, /obj/item/kirbyplants/random, @@ -50027,6 +50397,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"qkP" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "qkZ" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -50401,6 +50778,9 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +"qrH" = ( +/turf/closed/wall/rust, +/area/station/commons/fitness/recreation) "qrN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/generic_maintenance_landmark, @@ -50419,8 +50799,9 @@ /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/landmark/start/hangover/closet, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "qrS" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/blue{ @@ -50472,6 +50853,18 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"qsp" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "qsv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -50496,6 +50889,20 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/lobby) +"qsP" = ( +/obj/structure/toilet, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/box, +/obj/machinery/button/door/directional/east{ + id = "Unit_2"; + name = "Unit2 Privacy Lock"; + normaldoorcontrol = 1; + pixel_y = 8; + specialfunctions = 4 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "qth" = ( /obj/structure/closet/secure_closet/security/science, /obj/item/crowbar, @@ -50548,13 +50955,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/plating, /area/station/cargo/warehouse) -"quy" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood, -/area/station/commons/locker) "quG" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -50602,23 +51002,10 @@ /turf/open/misc/asteroid/lowpressure, /area/space/nearstation) "qvz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/box/corners, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, -/obj/machinery/door/window/right/directional/east{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Fitness Ring" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "qvG" = ( /obj/effect/turf_decal/stripes/corner, @@ -50825,7 +51212,7 @@ }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "qzv" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, @@ -51113,6 +51500,7 @@ /obj/machinery/holopad, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "qEj" = ( @@ -51157,15 +51545,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "qEJ" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/obj/machinery/status_display/evac/directional/south, +/obj/effect/spawner/random/structure/chair_comfy, +/obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/commons/toilet/restrooms) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "qEL" = ( /obj/effect/turf_decal/bot, /obj/machinery/disposal/bin, @@ -51274,12 +51658,6 @@ "qHe" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/command/storage/eva) -"qHu" = ( -/obj/item/kirbyplants{ - icon_state = "plant-14" - }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) "qHy" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -51323,13 +51701,13 @@ /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "qId" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Unit_1Privacy"; - name = "Unit 1 Privacy Shutter" +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/storage/dice{ + pixel_x = -4 }, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "qIv" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/caution/stand_clear, @@ -51439,18 +51817,11 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "qKE" = ( -/obj/structure/bed{ - dir = 4 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/item/bedsheet/brown{ +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/structure/sign/poster/contraband/random/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "qKH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/rebels_unite{ @@ -51665,9 +52036,13 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "qOz" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/oil, -/turf/open/floor/plating, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, /area/station/maintenance/fore) "qOB" = ( /obj/structure/chair/sofa/left/maroon{ @@ -51942,6 +52317,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"qSt" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "qSB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51980,12 +52362,14 @@ /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "qSN" = ( -/obj/machinery/door/airlock/medical{ - id_tag = "Unit_2"; - name = "Unit 2" +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/storage/dice{ + pixel_x = -8; + pixel_y = 3 }, -/turf/open/floor/iron/dark, -/area/station/commons/toilet/restrooms) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "qSO" = ( /obj/machinery/computer/records/medical{ dir = 4 @@ -52194,7 +52578,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "qVW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -52549,6 +52933,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/primary) +"rcf" = ( +/obj/structure/toilet{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/commons/toilet/restrooms) "rcp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -52733,6 +53125,10 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"reQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "reT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -52815,6 +53211,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "rhd" = ( @@ -52854,8 +53254,17 @@ /turf/open/floor/iron/dark, /area/station/science/lab) "rhN" = ( -/turf/closed/wall, -/area/station/commons/locker) +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "rhT" = ( /turf/closed/wall, /area/station/service/lawoffice) @@ -53087,6 +53496,12 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"rmm" = ( +/obj/machinery/shower/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "rmu" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -53383,6 +53798,17 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"rqD" = ( +/obj/structure/chair/sofa/left, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "rqG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53591,6 +54017,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft) +"rti" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "rtr" = ( /obj/structure/table/glass, /obj/item/folder/white, @@ -53634,6 +54069,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "rtF" = ( @@ -53741,12 +54177,20 @@ /turf/open/floor/iron/dark, /area/station/medical/storage) "ruW" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/emcloset/anchored, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "rvd" = ( /mob/living/basic/mining/legion, /turf/open/misc/asteroid/lowpressure, @@ -54184,6 +54628,16 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/maintenance/aft) +"rBN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "rBS" = ( /obj/structure/flora/bush/jungle/b/style_random, /obj/structure/flora/bush/flowers_pp/style_random, @@ -54898,10 +55352,12 @@ /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "rNo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/commons/locker) +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/airalarm/directional/east, +/obj/effect/landmark/start/assistant, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "rNx" = ( /turf/closed/wall/r_wall/rust, /area/station/service/chapel) @@ -55054,17 +55510,17 @@ /turf/open/floor/plating, /area/station/maintenance/department/bridge) "rPx" = ( -/obj/structure/bed{ - dir = 4 +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/effect/landmark/start/assistant, -/obj/item/bedsheet/dorms{ - dir = 4 +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, -/obj/effect/landmark/start/hangover, -/obj/item/pillow/random, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "rPy" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -55326,6 +55782,7 @@ "rSL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/blood, /turf/open/floor/plating, /area/station/maintenance/starboard) "rSN" = ( @@ -55925,6 +56382,7 @@ }, /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "sdm" = ( @@ -55958,11 +56416,9 @@ /turf/open/floor/iron/dark/textured_large, /area/station/bitrunning/den) "sdT" = ( -/obj/structure/girder, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/turf/closed/wall, +/area/station/commons/toilet/restrooms) "see" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -56255,7 +56711,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/commons/fitness/recreation) "sjk" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/blood/old, @@ -56301,6 +56757,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "skB" = ( @@ -56531,6 +56988,7 @@ /obj/effect/decal/cleanable/blood/tracks{ dir = 8 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/plating, /area/station/maintenance/starboard) "soB" = ( @@ -56983,6 +57441,15 @@ /obj/docking_port/stationary/escape_pod, /turf/open/space/basic, /area/space) +"svy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/razor, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "svC" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -57427,7 +57894,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/wardrobe/mixed, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "sDv" = ( /obj/structure/table, /turf/open/floor/plating, @@ -57439,8 +57906,18 @@ /turf/closed/wall/r_wall/rust, /area/station/engineering/atmos/pumproom) "sDD" = ( -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "sDW" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -57556,6 +58033,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "sGF" = ( @@ -57662,6 +58140,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) +"sHN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/public/glass{ + name = "Restrooms" + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/fore) "sHX" = ( /obj/structure/chair/stool/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57918,8 +58405,14 @@ }, /turf/open/floor/iron, /area/station/service/janitor) +"sLB" = ( +/obj/machinery/door/airlock/medical{ + id_tag = "Unit_1"; + name = "Unit 1" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "sLD" = ( -/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, @@ -58119,9 +58612,6 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "sOy" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -58253,6 +58743,15 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/command/bridge) +"sQl" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "sQq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58325,7 +58824,7 @@ /obj/structure/grille/broken, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "sRb" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -58636,6 +59135,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) +"sWv" = ( +/obj/structure/sign/poster/contraband/revolver, +/turf/closed/wall/r_wall, +/area/station/medical/pathology) "sWA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -58677,6 +59180,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "sXC" = ( @@ -59253,24 +59757,16 @@ /turf/open/floor/iron/dark, /area/station/security/evidence) "tgJ" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood/old, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/obj/effect/landmark/generic_maintenance_landmark, +/obj/effect/turf_decal/tile/blue, /obj/effect/decal/cleanable/dirt, -/obj/machinery/button/door/directional/west{ - id = "Abandoned Cell"; - name = "Abandoned Door Lock"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "tgU" = ( /obj/structure/flora/rock/pile/style_2, /turf/open/misc/asteroid/airless, @@ -59625,6 +60121,13 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/fore) +"tmu" = ( +/obj/machinery/door/airlock/medical{ + id_tag = "Shower_1"; + name = "Shower 1" + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "tmv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/rebels_unite{ @@ -59795,6 +60298,13 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/carpet/red, /area/station/service/chapel) +"toU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "toZ" = ( /obj/effect/turf_decal/bot, /obj/structure/tank_dispenser/oxygen{ @@ -60284,17 +60794,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"two" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/airlock/security/glass{ - id_tag = "Abandoned Cell"; - name = "Abandoned Cell" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) "twu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -60700,17 +61199,19 @@ /turf/open/floor/iron/dark/textured_large, /area/station/service/chapel/funeral) "tDs" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/cane, +/obj/item/clothing/neck/tie/red, +/obj/item/storage/briefcase, +/obj/item/clothing/head/hats/bowler{ + pixel_y = 8 + }, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "tDu" = ( /obj/structure/chair/pew{ dir = 8 @@ -60761,6 +61262,21 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"tDV" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants{ + icon_state = "plant-16"; + pixel_y = 11 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "tDW" = ( /obj/structure/railing/corner{ dir = 8 @@ -60948,18 +61464,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"tIk" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) "tIu" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/small/directional/north, @@ -61324,9 +61828,7 @@ /area/station/maintenance/starboard) "tOP" = ( /obj/effect/decal/cleanable/dirt, -/mob/living/basic/pet/dog/pug{ - real_name = "Cupcake" - }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "tPn" = ( @@ -61334,6 +61836,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"tPv" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall, +/area/station/commons/toilet/restrooms) "tPw" = ( /obj/structure/table, /obj/item/flashlight/flare/candle/infinite{ @@ -61505,7 +62011,6 @@ /obj/item/kirbyplants{ icon_state = "plant-05" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -61528,15 +62033,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) -"tSI" = ( -/obj/machinery/door/airlock/grunge{ - id_tag = "Cabin_4"; - name = "Cabin 4" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark, -/area/station/commons/locker) "tSN" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -61605,15 +62101,25 @@ /turf/closed/wall/r_wall, /area/station/maintenance/aft) "tUr" = ( -/obj/structure/table, -/obj/machinery/recharger, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/the_griffin{ - pixel_x = 32 +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) +"tUy" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "tUO" = ( /obj/structure/railing{ dir = 1 @@ -61858,21 +62364,18 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "tYi" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/machinery/button/door/directional/north{ + id = "Cabin_2"; + name = "Cabin 2 Privacy Lock"; + normaldoorcontrol = 1; + specialfunctions = 4 }, -/obj/machinery/washing_machine, -/obj/machinery/airalarm/directional/west, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/structure/bed, +/obj/item/bedsheet/dorms, +/obj/effect/landmark/start/hangover, +/obj/item/pillow/random, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "tYx" = ( /obj/machinery/door/airlock/external{ name = "Common Mining Dock" @@ -62004,7 +62507,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "tZK" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -62018,9 +62521,13 @@ /turf/closed/wall/rust, /area/station/maintenance/port/lesser) "tZX" = ( -/obj/structure/flora/bush/pale/style_random, -/turf/open/misc/asteroid, -/area/station/maintenance/port/lesser) +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "uap" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62264,7 +62771,7 @@ /obj/structure/grille/broken, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "ueY" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -62306,6 +62813,13 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) +"ufh" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "ufy" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -62501,16 +63015,15 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "uhE" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/turf/open/floor/wood, -/area/station/commons/locker) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "uib" = ( /obj/machinery/status_display/evac/directional/east, /obj/effect/decal/cleanable/dirt, @@ -62622,14 +63135,16 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "ukd" = ( -/obj/effect/turf_decal/bot, -/obj/structure/frame/computer{ - anchored = 1 +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "uke" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -62680,7 +63195,7 @@ "ukT" = ( /obj/structure/sign/warning/no_smoking, /turf/closed/wall, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "ukU" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -63016,6 +63531,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"upt" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "upK" = ( /obj/effect/turf_decal/siding/thinplating/dark/end, /turf/open/floor/glass/reinforced, @@ -63069,7 +63591,10 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/obj/machinery/atm, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/departments/restroom/directional/east, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -63397,17 +63922,6 @@ }, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) -"uwG" = ( -/obj/effect/spawner/random/vending/colavend, -/obj/effect/turf_decal/delivery, -/obj/structure/sign/poster/official/no_erp{ - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/commons/locker) "uwP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -63590,14 +64104,10 @@ /turf/closed/wall/rust, /area/station/engineering/atmos/pumproom) "uAF" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/vending/clothing, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/commons/locker) +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "uAH" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/door/firedoor/border_only{ @@ -63616,17 +64126,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) -"uBo" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) "uBO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue, @@ -63909,6 +64408,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/execution/transfer) +"uGC" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "uGD" = ( /obj/structure/cable, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -63956,16 +64465,20 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "uHv" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/commons/locker) +/area/station/commons/fitness/recreation) "uHD" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -63999,13 +64512,16 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "uHG" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "Unit_3Privacy"; - name = "Unit 3 Privacy Shutter" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "uHL" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/camera/autoname/directional/south, @@ -64269,15 +64785,6 @@ /obj/item/storage/box/disks_nanite, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) -"uMc" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "uMf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64454,17 +64961,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/warehouse) -"uQE" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) "uQF" = ( /obj/machinery/door/poddoor/preopen{ id = "Xenolab"; @@ -64576,6 +65072,12 @@ "uSH" = ( /turf/closed/wall/r_wall, /area/station/engineering/main) +"uSO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "uST" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64953,6 +65455,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "uZN" = ( @@ -65179,6 +65682,15 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"vcz" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "vcL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/south, @@ -65236,17 +65748,13 @@ /turf/open/space/basic, /area/space/nearstation) "vea" = ( -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/machinery/newscaster/directional/west, -/obj/effect/landmark/start/hangover/closet, -/obj/machinery/button/door/directional/west{ - id = "Cabin_3Privacy"; - name = "Cabin 3 Privacy Toggle"; - pixel_y = -24 +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/turf_decal/box, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "vef" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, @@ -65367,12 +65875,11 @@ /turf/open/floor/iron, /area/station/cargo/storage) "vgm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/commons/locker) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "vgz" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/power/apc/auto_name/directional/north, @@ -65481,6 +65988,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"vib" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/basic/pet/dog/pug{ + real_name = "Cupcake" + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "vim" = ( /obj/effect/turf_decal/siding/thinplating/light/corner{ dir = 4 @@ -65829,10 +66344,9 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) "voo" = ( -/obj/effect/decal/cleanable/blood/old, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "vou" = ( /obj/machinery/disposal/bin, @@ -65949,15 +66463,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating/airless, /area/station/maintenance/disposal/incinerator) -"vqr" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/grunge{ - name = "Recreation Area" - }, -/turf/open/floor/iron/dark, -/area/station/commons/fitness/recreation) "vqs" = ( /obj/structure/rack, /obj/item/rcl/pre_loaded, @@ -66145,12 +66650,18 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) "vtt" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/washing_machine{ + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "vtv" = ( /obj/structure/table/bronze, /obj/item/clothing/suit/costume/bronze, @@ -66204,6 +66715,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"vuD" = ( +/obj/structure/statue/sandstone/assistant, +/turf/open/floor/glass/plasma, +/area/station/commons/fitness/recreation) "vuF" = ( /obj/machinery/light_switch/directional/west, /obj/machinery/disposal/bin, @@ -66912,6 +67427,20 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"vEI" = ( +/obj/structure/sign/poster/random/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "vEK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -67298,6 +67827,12 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/customs) +"vJi" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "vJm" = ( /obj/structure/lattice/catwalk, /obj/machinery/light/directional/east, @@ -67807,12 +68342,9 @@ /turf/open/floor/iron/dark, /area/station/science/research) "vPX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/commons/locker) +/turf/closed/wall, +/area/station/commons/fitness/recreation) "vQf" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ @@ -68046,6 +68578,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -68296,6 +68831,14 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"vWX" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "vWY" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -68811,12 +69354,11 @@ /obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/station/maintenance/starboard) -"weW" = ( -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +"wfj" = ( +/obj/effect/spawner/random/structure/chair_comfy{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, /turf/open/floor/iron, @@ -68919,6 +69461,12 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"whk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/maintenance/fore) "whm" = ( /obj/effect/turf_decal/delivery, /obj/machinery/suit_storage_unit/standard_unit{ @@ -68953,10 +69501,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"wij" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/open/floor/plating, -/area/station/commons/locker) "win" = ( /obj/effect/turf_decal/siding/thinplating/light/corner{ dir = 1 @@ -69239,6 +69783,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "wmB" = ( @@ -69760,6 +70305,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "wuv" = ( @@ -69791,19 +70337,11 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "wuT" = ( -/obj/machinery/door/airlock/external{ - name = "Prison External Airlock" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, -/turf/open/floor/iron/dark, -/area/station/maintenance/port/lesser) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "wvj" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/command_all, @@ -69836,8 +70374,19 @@ /area/station/ai_monitored/turret_protected/ai_upload) "wwl" = ( /obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/blood, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) +"wwq" = ( +/mob/living/basic/clown{ + name = "Destructor" + }, +/obj/structure/toilet, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/commons/toilet/restrooms) "wwv" = ( /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70137,6 +70686,9 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"wAg" = ( +/turf/closed/wall/r_wall/rust, +/area/station/maintenance/department/security/upper) "wAn" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -70529,6 +71081,10 @@ /obj/item/fishing_line, /turf/open/floor/iron, /area/station/service/hydroponics) +"wGC" = ( +/obj/item/toy/plush/lizard_plushie, +/turf/open/floor/plating, +/area/station/commons/toilet/restrooms) "wGD" = ( /obj/machinery/door/poddoor/preopen{ id = "gravity"; @@ -70693,11 +71249,19 @@ /turf/open/floor/cult, /area/station/service/chapel/office) "wIu" = ( -/obj/item/kirbyplants{ - icon_state = "plant-16" +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "wIE" = ( /obj/machinery/power/shieldwallgen, /obj/effect/turf_decal/bot, @@ -70709,23 +71273,16 @@ /turf/open/floor/iron/dark, /area/station/command/teleporter) "wII" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/door/window/right/directional/east{ base_state = "left"; icon_state = "left"; name = "Fitness Ring" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "wIL" = ( /obj/structure/kitchenspike, @@ -70881,6 +71438,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/hydroponics) +"wLD" = ( +/obj/structure/dresser, +/obj/machinery/newscaster/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation) "wLM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -71173,12 +71737,13 @@ /area/station/bitrunning/den) "wQI" = ( /obj/structure/sign/warning/electric_shock/directional/south, -/obj/structure/flora/bush/pale/style_random, /obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "wQK" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/lavendergrass/style_random, @@ -71273,6 +71838,13 @@ "wRU" = ( /turf/closed/wall, /area/station/engineering/atmos) +"wRX" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "wSh" = ( /obj/structure/sign/poster/official/fruit_bowl, /turf/closed/wall/r_wall, @@ -71727,7 +72299,7 @@ /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "xaz" = ( /obj/structure/railing/corner{ dir = 4 @@ -71900,13 +72472,15 @@ /turf/open/floor/iron/dark, /area/station/security/office) "xds" = ( -/obj/structure/bed, -/obj/effect/landmark/start/assistant, -/obj/item/bedsheet/dorms, -/obj/effect/landmark/start/hangover, -/obj/item/pillow/random, -/turf/open/floor/wood, -/area/station/commons/locker) +/obj/effect/spawner/random/structure/chair_comfy{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "xdv" = ( /obj/structure/table, /obj/effect/turf_decal/bot, @@ -72183,7 +72757,6 @@ /turf/open/floor/iron, /area/station/command/bridge) "xju" = ( -/obj/item/storage/medkit/regular, /obj/machinery/light/directional/east, /obj/structure/table, /obj/machinery/newscaster/directional/east, @@ -72191,6 +72764,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/item/storage/medkit/brute, +/obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "xjv" = ( @@ -72511,6 +73086,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/item/megaphone{ + pixel_x = 4; + pixel_y = 4 + }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "xnK" = ( @@ -72691,6 +73270,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "xrz" = ( @@ -72730,17 +73310,15 @@ /turf/closed/wall, /area/station/maintenance/starboard/fore) "xsX" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, /obj/effect/landmark/start/hangover, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/obj/structure/chair/stool/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "xsZ" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ @@ -73750,7 +74328,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/pathology) "xIS" = ( -/obj/machinery/newscaster/directional/north, /obj/machinery/camera/directional/north{ c_tag = "Fore Hallway Monastary Tube"; name = "fore camera" @@ -73758,6 +74335,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -74010,20 +74588,9 @@ /turf/open/floor/iron/dark, /area/station/security/medical) "xMN" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/washing_machine, -/obj/machinery/light/directional/east, /obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/light_switch/directional/east, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/restrooms) +/turf/closed/wall, +/area/station/commons/fitness/recreation) "xNc" = ( /turf/closed/wall/r_wall/rust, /area/station/command/heads_quarters/cmo) @@ -74123,25 +74690,24 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "xOq" = ( -/obj/item/kirbyplants{ - icon_state = "plant-16" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron, -/area/station/commons/locker) -"xOu" = ( +/obj/machinery/door/airlock/grunge{ + id_tag = "Cabin_1"; + name = "Cabin 1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) +"xOu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "xOA" = ( /obj/item/chair/stool{ @@ -74187,7 +74753,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/unres, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/maintenance/port/lesser) "xPO" = ( @@ -74392,17 +74958,12 @@ /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "xTt" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/disposal/bin, -/obj/machinery/light/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/commons/locker) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "xTx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -74696,6 +75257,15 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"xXd" = ( +/obj/structure/toilet, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "xXo" = ( /obj/structure/sign/departments/xenobio, /turf/closed/wall/r_wall, @@ -74784,6 +75354,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "xZi" = ( @@ -74997,6 +75568,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) +"ybL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/security/upper) "ycd" = ( /obj/machinery/computer/upload/ai{ dir = 1 @@ -75051,6 +75627,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "ydw" = ( @@ -75170,11 +75747,16 @@ }, /area/station/hallway/primary/fore) "yfc" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) +"yfk" = ( +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "yfq" = ( /obj/structure/lattice/catwalk, /obj/structure/transit_tube/horizontal{ @@ -75502,11 +76084,15 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) "ykB" = ( -/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/restrooms) "ykK" = ( /obj/structure/frame/computer{ anchored = 1; @@ -75549,7 +76135,7 @@ /obj/effect/mapping_helpers/burnt_floor, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/area/station/maintenance/department/security/upper) "ylP" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/decal/cleanable/dirt, @@ -92446,7 +93032,7 @@ csa vjh tSk meO -uFp +reQ qSC lch nUP @@ -92702,9 +93288,9 @@ csa csa eNQ aPj -deZ +kPU qvz -eYu +ezZ ezZ psf jzo @@ -93216,11 +93802,11 @@ csa csa eNQ wyX -fzH +jGk gBN voo gNJ -uMc +mOK sOy pjC pqD @@ -93228,11 +93814,11 @@ kzl bXS jWQ kTK -wDz -wDz -wDz +nNR +nNR +nNR kTK -wDz +nNR vGn oXe cuR @@ -93473,14 +94059,14 @@ csa csa vjh syZ -deZ +kPU fyD hsL iXx wII jbf lWJ -pqD +aSA ruW dfK jJN @@ -93736,12 +94322,12 @@ jXX mzB ova pJK -weW -iza +fNy +kPU ckJ wuT -wDz -wDz +qhX +nNR hCr kLW xrp @@ -93992,13 +94578,13 @@ jiR mle hQg hPq -dny -joS -pqD -fNy +yfk +yfk +qSt +sQl bMY eEe -wDz +nNR nNR nNR nNR @@ -94246,12 +94832,12 @@ dEF dEF xDc xDc -vqr +xDc ilJ oYc -fkL -xDc -iza +fNy +toU +jGk fKJ guJ yfc @@ -94503,7 +95089,7 @@ dEF dEF fsu jiU -tIk +xDc wIu kzP njf @@ -94758,18 +95344,18 @@ saU rvu tsS lnp -uNO -uNO +iGC +lii bDV sDD hOH -uNO -osy -pqD -ofz +nEj +nEj +qeq +ixW fNy gJC -wDz +nNR nNR nNR nNR @@ -95015,17 +95601,17 @@ nKC xQH rAt lnp -lOZ -iun -uBo +xDc +xDc +xDc dHi xsX qSN iiQ bPY tZX -bjz -yfc +fNy +wRX ofx wpg dwx @@ -95271,18 +95857,18 @@ xIQ lnp nKC nKC -lnp -osy -uNO -dDp -sDD +sWv +wLD +qkP +xDc +vEI awW -uNO -uNO -pqD -oce +pTb +vuD +kPt guJ -yfc +fNy +jvg ofx rtD fUf @@ -95530,17 +96116,17 @@ dAB qlw lnp tYi -nXC +lii cWQ hDC jXd lrP eRy qId +wfj fNy -ofz hVl -wDz +nNR nNR nNR nNR @@ -95787,16 +96373,16 @@ iju unz hkp xMN -uQE -qHu +xDc +xDc mqU qEJ -rhN +fWU esq -pqD -pqD -fKJ -yfc +vcz +wuT +fNy +nRu ofx hph bwB @@ -96043,17 +96629,17 @@ lnp eMW uqF lnp -rhN +iPS obM -wij +xDc fDB lsX -rhN +mgP jPq peZ -iuC -bjz -yfc +tZX +fNy +wRX ofx hSa kLW @@ -96305,13 +96891,13 @@ rNo xOq uHv vgm -tSI +bjz cYv xds iuC -fKJ +fNy cuD -wDz +nNR nNR nNR nNR @@ -96558,15 +97144,15 @@ pOb veV hkp lqM -rNo +xDc vPX dQC uAF -rhN -rhN -rhN -iza -guJ +fNy +fNy +kPU +ptv +wuT yfc ofx dnL @@ -96817,13 +97403,13 @@ lnp kzz iYa bCO -uHv -nQX -rhN -hfF +hVJ +njf +daC +uFp vea jWD -bHP +guJ yfc ofx hSa @@ -97073,16 +97659,16 @@ uYJ hkp fzk nKh -jDs -uHv -vgm -gdL -cYv +yfk +svy +fNy +fNy +ctI hri -jWD -oce +rqD +guJ wQI -wDz +nNR nNR nNR nNR @@ -97328,17 +97914,17 @@ hkp lnp lnp lnp -rhN +xDc bkT jTc hoE -rhN -esq -rhN -cee -pqD +iuz +abV +abR fNy -yfc +cLR +yfk +wRX ofx iXM bwB @@ -97587,15 +98173,15 @@ umL bwW qzu nCs -pEu +yfk ikE -vgm -dZk -quy +hri +ckJ +guJ lJA -iza +gKz ofz -yfc +gRt ofx rtD uZL @@ -97841,22 +98427,22 @@ ofB sij als vnL -rhN +xDc cVI nKh nkd tDs xTt -rhN +ufh czz amn -pqD -ckJ +xDc +rdM siS -wDz +nNR kTK -wDz -wDz +nNR +nNR nNR lqn oQz @@ -98098,22 +98684,22 @@ lnp lnp tqG cZT -rhN +xDc hXY nKh iku -ikE -uwG -rhN -esq +bAB +yfk +fNy +fNy rhN -pqD +grL llI ncj cUY fGz dPR -wDz +fjC nem gME dXz @@ -98310,14 +98896,14 @@ aaa aaa aaa cmU -vku -aeu -aeu -aeu -aeu -aeu -aeu -efG +tPv +uNO +uNO +eOp +uNO +uNO +uNO +uNO xLX efG yeY @@ -98355,22 +98941,22 @@ lnp bKc lCz ryK -esq +qrH qrP -nKh +rBN fEc -ikE -vgm +hrO +vWX lqP uhE rPx -pqD -pqD -iza -kzl +grL +grL +eZq +ahT xav qVR -kTK +wAg iHT sSd aLi @@ -98506,75 +99092,75 @@ aeu aeu aeu aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -efG +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aeu +uNO +nmF +sLB +uGC +oYY +bfz +aMu +uNO dHc qlC tbn @@ -98612,22 +99198,22 @@ jQE jQE pEt jQE -rhN -rhN +xDc +xDc fmy fti aBF -bJU -rhN +fkL +xDc gDe pXN -iza +eZq kFB -iza +eZq sQZ tZG ukT -wDz +fjC rqx oJs dxk @@ -98824,14 +99410,14 @@ aaa aaa aeu aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -efG +uNO +uNO +uNO +tDV +jGV +uSO +qsp +uNO ofr efG xIS @@ -98875,16 +99461,16 @@ otS uAA otb lXe -rhN -rhN -rhN -pqD -jqI +xDc +xDc +xDc +grL +ybL hWw -jqI +ybL kUR -vWU -wDz +oVg +fjC gCu fRP aLi @@ -99081,15 +99667,15 @@ aaa aaa aeu aeu -aeu -aeu -aeu -aeu -aeu +uNO +qsP +kHo +tUy +dxx hsW -aeu -qlC -ehY +dWp +osy +azD qlC fSY eFR @@ -99135,13 +99721,13 @@ uAA dLk uAA uwR -pqD +grL kPk -pqD +grL sDq xav iwo -wDz +fjC bDu tXX nBE @@ -99338,16 +99924,16 @@ aaa aaa aeu aeu -aeu -aeu -aeu -qlC -qlC -efG -efG -efG -ehY -qlC +uNO +uNO +uNO +mXX +dxx +hsW +rti +bfN +gWv +jIC sLD dfV not @@ -99394,15 +99980,15 @@ apv hoK vkC scE -pqD -iza +grL +eZq iNc ueO -kTK -wDz -wDz -wDz -wDz +wAg +fjC +fjC +fjC +fjC jXN plj plj @@ -99595,16 +100181,16 @@ aaa aaa aaa aeu -aeu -aeu -aeu -efG +uNO +eRu +fNd +upt qKE aUU -efG +jCy loI qOz -qlC +sHN uqN vTD wdD @@ -99652,14 +100238,14 @@ apv apv hoK gOo -pqD -pqD +grL +grL fob oWx -iza +eZq hsr jHy -wDz +fjC jLy rIS jMK @@ -99852,15 +100438,15 @@ aaa aaa aaa aeU -aeu -aeu -aeu -efG +uNO +uNO +uNO +uNO vtt fSW -qlC +gLg sdT -tpr +whk efG qlC efG @@ -99910,8 +100496,8 @@ mkQ hHM vNS vfF -pqD -pqD +grL +grL ofa tZG tZG @@ -100109,14 +100695,14 @@ aaa aaa aeU aeu -aeu -aeu -aeu -qlC +uNO +rmm +isc +uNO aNg -two -efG -efG +fSW +aKS +uNO bxG efG aLK @@ -100168,9 +100754,9 @@ apv apv hoK hkC -pqD -iza -pqD +grL +eZq +grL kwK hpg jqb @@ -100366,14 +100952,14 @@ aaa aaa aUz aeu -aeu -aeu -aeu -efG +uNO +eLh +dxx +tmu dSe exJ tgJ -qlC +osy kHI efG efG @@ -100426,9 +101012,9 @@ xNJ apv jcd hhX -pqD +grL gqD -jqI +ybL jqb jqb vCf @@ -100623,14 +101209,14 @@ aaa aaa aeU aeu -aeu -aeu -aeu -qlC -gbU +uNO +uNO +uNO +uNO +vtt emo bpp -enj +uNO gYV cKW ydV @@ -100683,8 +101269,8 @@ rJJ rFx qhf hKB -pqD -iza +grL +eZq pvs jqb tpl @@ -100880,14 +101466,14 @@ aaa aaa aeu aeu -aeu -aeu -aeu -efG +uNO +gAh +acH +uNO ukd -uDt +aZT ykB -bAi +uNO ueY pGS sTO @@ -101137,14 +101723,14 @@ aaa aaa aeu aeu -aeu -aeu -aeu -qlC +uNO +fcY +vJi +fZo tUr gGq nZC -qlC +osy nNT nrh efG @@ -101394,14 +101980,14 @@ aaa aaa aaa aeu -aeu -aeu -aeu -qlC -efG -qlC -efG -efG +uNO +uNO +uNO +osy +uNO +pLA +uNO +uNO uTG fuX vlv @@ -101455,8 +102041,8 @@ rTv fNe rqW vkh -pqD -kWA +grL +ndI jqb vCG rbH @@ -101653,12 +102239,12 @@ aaa aaa aeu aeu -aeu -aeu -aeu -aeu -aeu -efG +uNO +wGC +koI +gej +kKq +uNO skR pxl dED @@ -101712,7 +102298,7 @@ tzI fNe cRq btI -pqD +grL acv jqb jqb @@ -101910,12 +102496,12 @@ aeo acm vku aeu -aeu -aeu -aeu -aeu -aeu -qlC +uNO +uNO +uNO +wwq +nIH +osy drp aZh btK @@ -102169,10 +102755,10 @@ acm aUz coy aeu -aeu -aeu -aeu -efG +uNO +xXd +rcf +uNO hVZ rtN dpe @@ -102426,10 +103012,10 @@ acm aaa aaa cmU -aUz -aeu -efG -qlC +uNO +uNO +uNO +osy efG efG qlC @@ -117077,7 +117663,7 @@ tbR tGX vOX pSu -fkP +lsn pCj lgl fkP @@ -118360,10 +118946,10 @@ aeU aeU sJS fOh -fkP +vib pjs lAE -bLs +cgZ tXv iZp fwd @@ -118879,7 +119465,7 @@ dop xOA sdj xrj -xrj +edr rZV uVQ uVQ From 18305a1cbcfae4c05b9253878465114d4291b481 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 18 Mar 2024 14:05:22 +0100 Subject: [PATCH 27/59] linters fix --- _maps/map_files/KiloStation/KiloStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index e1fe7bd6774f..4420be593697 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -5248,7 +5248,6 @@ /area/space/nearstation) "bPY" = ( /obj/structure/table, -/obj/structure/table, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/item/pizzabox/pineapple{ pixel_x = -2; From 3aa1518ec4081d7509734c20e9dfe678f045d78c Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 18 Mar 2024 14:17:19 +0100 Subject: [PATCH 28/59] removes a pipe --- _maps/map_files/KiloStation/KiloStation.dmm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 4420be593697..3d353593b4b1 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -4667,6 +4667,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "bDj" = ( @@ -31186,6 +31187,7 @@ "jWD" = ( /obj/structure/chair/sofa/middle, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "jWL" = ( @@ -47850,6 +47852,7 @@ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "ptL" = ( @@ -53806,6 +53809,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "rqG" = ( @@ -57905,7 +57909,6 @@ /turf/closed/wall/r_wall/rust, /area/station/engineering/atmos/pumproom) "sDD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red{ dir = 1 }, From 3c097d17510162db10ff7629fe0e77a6fe049a7a Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 19 Mar 2024 16:47:49 +0100 Subject: [PATCH 29/59] medbay rework, think that's all for now --- _maps/map_files/KiloStation/KiloStation.dmm | 3720 +++++++++---------- 1 file changed, 1811 insertions(+), 1909 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 3d353593b4b1..ea9c7bd4f1ed 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -281,17 +281,16 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) "acD" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/disposal/bin, /obj/machinery/airalarm/directional/west, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/atmospherics/components/unary/cryo_cell{ dir = 4 }, +/obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 + dir = 1 }, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "acF" = ( /obj/structure/sign/warning/radiation, /turf/closed/wall/rust, @@ -1129,13 +1128,12 @@ /turf/closed/wall, /area/space/nearstation) "anI" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "anN" = ( @@ -1670,19 +1668,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) -"ayc" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/blue{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) "ayh" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple, @@ -2138,20 +2123,33 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "aHC" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Cryogenics"; - name = "medical camera"; - network = list("ss13","medical") +/obj/effect/turf_decal/siding/blue{ + dir = 1 }, -/obj/structure/table, -/obj/item/book/manual/wiki/medicine, -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/west, +/obj/machinery/door/window/left/directional/south{ + name = "First Aid Supplies" + }, +/obj/item/storage/medkit/toxin{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/toxin, +/obj/item/storage/medkit/toxin{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/machinery/requests_console/directional/north{ + assistance_requestable = 1; + department = "Medbay"; + name = "Medbay Requests Console" }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "aHD" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/tile/red{ @@ -2180,16 +2178,12 @@ /turf/open/floor/iron/dark, /area/station/security/brig) "aHQ" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/secure_closet/chief_medical, -/obj/machinery/firealarm/directional/south, /obj/structure/extinguisher_cabinet/directional/west, -/obj/item/gun/energy/e_gun/mini, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/turf/closed/wall, +/area/station/medical/cryo) "aIq" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall, @@ -2561,21 +2555,22 @@ /turf/open/floor/iron, /area/station/command/gateway) "aOS" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/door/airlock/medical/glass{ + name = "Primary Treatment Centre" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "virology sorting disposal pipe" - }, -/obj/effect/mapping_helpers/mail_sorting/medbay/virology, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "aOV" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -2666,7 +2661,7 @@ name = "Emergency Medical Lockdown Shutters" }, /turf/open/floor/grass, -/area/station/medical/paramedic) +/area/station/medical/office) "aQl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2702,16 +2697,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) -"aQQ" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) "aRH" = ( /obj/structure/chair{ dir = 4 @@ -3271,21 +3256,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/execution/education) -"bdM" = ( -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring medbay to ensure patient safety."; - dir = 1; - name = "Medbay Monitor"; - network = list("medical") - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/reagent_dispensers/wall/peppertank/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) "bdU" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -3544,19 +3514,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"bjk" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) "bjz" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -3581,19 +3538,14 @@ /turf/open/floor/plating/airless, /area/station/maintenance/disposal/incinerator) "bjN" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/event_spawn, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) "bjR" = ( /obj/structure/flora/rock/style_random, /turf/open/misc/asteroid, @@ -4124,15 +4076,9 @@ /turf/open/floor/iron/dark, /area/station/service/library) "bsR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/treatment_center) "bsT" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/item/clothing/suit/hooded/wintercoat/engineering, @@ -4234,15 +4180,18 @@ /turf/open/floor/iron/dark, /area/station/security/processing) "buq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/effect/turf_decal/siding/blue, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/suit_storage_unit/medical, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "buD" = ( /obj/machinery/griddle, /obj/effect/turf_decal/bot, @@ -4253,11 +4202,16 @@ /turf/open/floor/iron/dark, /area/station/service/kitchen) "buJ" = ( -/obj/structure/bed/dogbed/runtime, -/mob/living/simple_animal/pet/cat/runtime, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/vending/drugs, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/cryo) "buS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4583,14 +4537,16 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "bBe" = ( -/obj/effect/spawner/random/vending/colavend, -/obj/machinery/airalarm/directional/south, +/obj/structure/bed/pod{ + desc = "An old medical bed, just waiting for replacement with something up to date."; + name = "medical bed" + }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron/dark, -/area/station/medical/storage) +/area/station/medical/treatment_center) "bBr" = ( /obj/machinery/door/airlock/engineering{ name = "Emergency Storage" @@ -5063,15 +5019,6 @@ /obj/structure/flora/rock/pile/style_random, /turf/open/misc/asteroid, /area/space/nearstation) -"bKU" = ( -/obj/effect/turf_decal/bot, -/obj/structure/bedsheetbin, -/obj/structure/table/glass, -/obj/machinery/airalarm/directional/north, -/obj/machinery/status_display/evac/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/paramedic) "bLf" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -5352,6 +5299,15 @@ /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/misc/asteroid/lowpressure, /area/space/nearstation) +"bRD" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "cmoprivacy"; + name = "Office Privacy Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/command/heads_quarters/cmo) "bRJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5665,17 +5621,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"bXe" = ( -/obj/machinery/stasis{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/obj/machinery/defibrillator_mount/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/exam_room) "bXf" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/blue, @@ -5698,15 +5643,14 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "bXS" = ( @@ -5968,23 +5912,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"cdd" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/machinery/status_display/evac/directional/east, -/obj/structure/disposalpipe/segment, -/obj/structure/table, -/obj/machinery/fax{ - fax_name = "Medical"; - name = "Medical Fax Machine" - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) "cdf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -6187,6 +6114,7 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "ceT" = ( @@ -6481,12 +6409,11 @@ /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/foyer) "ciA" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "ciI" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -6756,16 +6683,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) -"clH" = ( -/obj/structure/table, -/obj/item/healthanalyzer, -/obj/item/crowbar/red, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/exam_room) "clL" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -7350,21 +7267,22 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "cvL" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/bot, /obj/machinery/button/door/directional/south{ id = "medbay_front_door"; name = "Medbay Doors Toggle"; normaldoorcontrol = 1; req_access = list("medical") }, -/obj/machinery/computer/crew{ - dir = 4 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 }, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/station/medical/paramedic) +/area/station/medical/office) "cvM" = ( /obj/structure/sign/warning/secure_area{ name = "EMERGENCY STORAGE" @@ -7804,9 +7722,6 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "cHz" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/event_spawn, @@ -8358,9 +8273,6 @@ layer = 4.1 }, /obj/structure/flora/bush/sparsegrass/style_random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics) "cSJ" = ( @@ -8392,15 +8304,16 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) "cTI" = ( -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "medbay_front_door"; - name = "Medbay" +/obj/machinery/vending/wallmed/directional/north, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "cTN" = ( /obj/effect/turf_decal/bot, @@ -8448,13 +8361,13 @@ /area/space/nearstation) "cUk" = ( /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/psychology) "cUw" = ( @@ -9056,18 +8969,16 @@ /turf/open/floor/engine/vacuum, /area/station/science/ordnance/bomb) "dea" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 + dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "dez" = ( @@ -9181,16 +9092,17 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "dfW" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/chief_medical_officer, /obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "dgg" = ( /obj/effect/turf_decal/delivery, /obj/machinery/pipedispenser/disposal, @@ -9324,12 +9236,9 @@ /turf/open/floor/iron/dark, /area/station/service/bar/atrium) "dhY" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron, -/area/station/medical/medbay/central) +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "dif" = ( /obj/machinery/atmospherics/components/trinary/mixer{ dir = 4 @@ -10471,17 +10380,10 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "dzQ" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "dzS" = ( @@ -10505,6 +10407,15 @@ }, /obj/effect/turf_decal/caution/stand_clear, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "medbay_front_door"; + name = "Medbay" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "dAB" = ( @@ -10774,10 +10685,10 @@ /turf/open/floor/plating, /area/station/security/prison) "dHg" = ( -/obj/structure/flora/grass/jungle/a/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "dHi" = ( /obj/structure/sign/poster/random/directional/north, /obj/effect/turf_decal/tile/red{ @@ -11000,19 +10911,20 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "dKa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 + dir = 4 }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) +/area/station/medical/treatment_center) "dKo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11211,7 +11123,7 @@ /area/station/maintenance/disposal/incinerator) "dMU" = ( /obj/machinery/atmospherics/components/unary/artifact_heatingpad{ - dir = 4 + dir = 8 }, /obj/item/toy/plush/lizard_plushie, /obj/effect/decal/cleanable/blood/old, @@ -11449,6 +11361,7 @@ "dQG" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "dQI" = ( @@ -12542,16 +12455,22 @@ /turf/open/floor/plating/airless, /area/station/maintenance/disposal/incinerator) "ekB" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/loading_area{ - dir = 8 +/obj/effect/turf_decal/siding/blue{ + dir = 10 }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/obj/effect/turf_decal/bot, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "ekL" = ( /turf/closed/wall/rust, /area/station/service/kitchen/coldroom) @@ -12981,6 +12900,15 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/cargo/office) +"ern" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/central) "ero" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 @@ -12995,6 +12923,7 @@ /area/station/cargo/storage) "erH" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) "erN" = ( @@ -13111,7 +13040,6 @@ "etY" = ( /obj/effect/turf_decal/tile/yellow, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -13502,6 +13430,12 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"eAx" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/central) "eAF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13636,19 +13570,28 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/item/toy/figure/chemist{ + pixel_x = -8 + }, +/obj/item/clothing/glasses/science{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/science, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) "eDu" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/siding/blue{ - dir = 5 +/obj/structure/table/glass, +/obj/item/storage/box/gloves{ + pixel_y = 8 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 +/obj/item/storage/box/masks{ + pixel_y = 4 }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/obj/item/storage/box/bodybags, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "eDT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13890,6 +13833,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "eHY" = ( @@ -14218,6 +14162,18 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/grass, /area/station/service/hydroponics) +"eMN" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "eMW" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14290,12 +14246,15 @@ /turf/open/floor/iron/white, /area/station/security/prison/mess) "eOi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "eOl" = ( @@ -14383,13 +14342,14 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "eQb" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoprivacy"; - name = "Office Privacy Shutters" +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 }, -/turf/open/floor/plating, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "eQf" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ @@ -14572,6 +14532,11 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/surgery/aft) +"eSG" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "eTh" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 @@ -14640,11 +14605,8 @@ dir = 10 }, /mob/living/simple_animal/bot/cleanbot/medbay, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "eUM" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/closed/wall/r_wall, @@ -14686,9 +14648,15 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "eWd" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/medical/storage) +/obj/structure/disposalpipe/segment, +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "eWu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15011,6 +14979,9 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) "fbZ" = ( @@ -15051,6 +15022,7 @@ name = "Psychology" }, /obj/effect/mapping_helpers/airlock/access/all/medical/psychology, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/medical/psychology) "fcM" = ( @@ -15308,9 +15280,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, @@ -15764,23 +15733,17 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "fne" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "fnu" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -15871,15 +15834,14 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "foP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/effect/landmark/start/paramedic, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "foQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15904,17 +15866,6 @@ /obj/item/clothing/glasses/sunglasses/big, /turf/open/floor/carpet/green, /area/station/service/lawoffice) -"fph" = ( -/obj/effect/spawner/random/engineering/tracking_beacon, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) "fpk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16145,6 +16096,23 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) +"fss" = ( +/obj/structure/table/glass, +/obj/machinery/fax{ + fax_name = "Chief Medical Officer's Office"; + name = "Chief Medical Officer's Fax Machine" + }, +/obj/item/toy/figure/cmo{ + pixel_x = 10; + pixel_y = 11 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/newscaster/directional/north, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "fsu" = ( /obj/structure/bed{ dir = 4 @@ -16158,17 +16126,6 @@ /obj/item/pillow/random, /turf/open/floor/wood, /area/station/commons/fitness/recreation) -"fsJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "fsZ" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -16494,19 +16451,11 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "fxx" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/machinery/light_switch/directional/west, -/obj/machinery/light/directional/west, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/medical/paramedic) +/turf/closed/wall, +/area/station/medical/storage) "fxB" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible, @@ -16617,24 +16566,23 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance/storage) "fyw" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /obj/machinery/camera/directional/north{ c_tag = "Medbay Aux Storage"; name = "medical camera"; network = list("ss13","medical") }, -/obj/effect/turf_decal/bot, /obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 }, -/obj/machinery/computer/records/pathology{ - dir = 8 +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/table, +/obj/machinery/fax{ + fax_name = "Medical"; + name = "Medical Fax Machine" }, -/turf/open/floor/iron/dark, -/area/station/medical/paramedic) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/office) "fyD" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -16693,16 +16641,16 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "fzG" = ( -/obj/machinery/vending/medical, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/newscaster/directional/east, +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "fzJ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -17019,7 +16967,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/iron/dark, -/area/station/maintenance/port/greater) +/area/station/medical/treatment_center) "fEu" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -17105,9 +17053,21 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "fFH" = ( -/obj/structure/flora/bush/large/style_random, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/machinery/modular_computer/console/preset/id{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/obj/machinery/requests_console/directional/north{ + department = "Chief Medical Officer's Desk"; + name = "Chief Medical Officer's Requests Console"; + anon_tips_receiver = 1; + can_send_announcements = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "fFW" = ( /obj/structure/easel, /obj/item/canvas/nineteen_nineteen, @@ -17421,6 +17381,19 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"fKw" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/central) "fKx" = ( /obj/effect/turf_decal/delivery, /obj/machinery/disposal/delivery_chute{ @@ -17598,7 +17571,7 @@ /area/station/maintenance/starboard) "fMR" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1 + dir = 6 }, /turf/open/floor/engine, /area/station/science/explab) @@ -18209,12 +18182,17 @@ /area/station/medical/psychology) "fWL" = ( /obj/effect/landmark/start/psychologist, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet, /area/station/medical/psychology) "fWU" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, +/obj/item/toy/plush/lizard_plushie{ + pixel_y = 4; + pixel_x = -2 + }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "fWX" = ( @@ -18324,18 +18302,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard) -"fYU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/depsec/medical, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) "fZk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -18403,6 +18369,9 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) "gaR" = ( @@ -18490,16 +18459,14 @@ /turf/open/floor/plating, /area/station/maintenance/department/bridge) "gbB" = ( -/obj/item/computer_disk/medical, -/obj/item/computer_disk/medical, -/obj/item/computer_disk/medical, -/obj/item/clothing/neck/stethoscope{ - pixel_y = 5 +/obj/effect/landmark/start/medical_doctor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "gbF" = ( /obj/machinery/door/poddoor/preopen{ id = "gravity"; @@ -18672,6 +18639,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/medical/morgue) "gfc" = ( @@ -18798,21 +18766,14 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "ghX" = ( -/obj/effect/turf_decal/tile/blue, -/obj/item/clipboard, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/folder/blue, -/obj/structure/table/reinforced/rglass, -/obj/item/folder/white{ - pixel_x = -8; - pixel_y = 3 +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/item/clothing/glasses/hud/health, +/obj/machinery/recharge_station, /turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "gii" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19481,16 +19442,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"gsr" = ( -/obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) "gsu" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -19513,9 +19464,6 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) -"gsy" = ( -/turf/closed/wall, -/area/station/medical/exam_room) "gsB" = ( /obj/structure/table, /obj/item/pipe_dispenser, @@ -19625,6 +19573,22 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) +"guB" = ( +/obj/structure/chair/office/light, +/obj/effect/landmark/start/depsec/medical, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/security/checkpoint/medical) "guC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19799,6 +19763,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "gyb" = ( @@ -19928,21 +19893,19 @@ /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "gAO" = ( -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/door/airlock/medical/glass{ - id_tag = "medbay_front_door"; - name = "Medbay" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/effect/landmark/navigate_destination, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "gBd" = ( /obj/machinery/portable_atmospherics/canister/plasma, @@ -20553,13 +20516,14 @@ /turf/open/misc/sandy_dirt, /area/station/service/hydroponics) "gKd" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "gKg" = ( /obj/structure/railing, /obj/structure/disposalpipe/segment{ @@ -20737,14 +20701,20 @@ /turf/open/floor/iron/dark, /area/station/security/office) "gNq" = ( -/obj/machinery/vending/wardrobe/medi_wardrobe, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/stasis{ + dir = 1 + }, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, -/area/station/medical/storage) +/area/station/medical/treatment_center) "gNy" = ( /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, @@ -20853,6 +20823,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "gPy" = ( @@ -20900,9 +20871,15 @@ /turf/open/floor/iron/dark, /area/station/cargo/miningoffice) "gPS" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "gQd" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -20913,24 +20890,15 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "gQo" = ( -/obj/machinery/firealarm/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8; + name = "cmo sorting disposal pipe" }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "gQq" = ( /obj/machinery/computer/mecha{ dir = 1 @@ -21226,26 +21194,20 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "gUP" = ( -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 +/obj/machinery/status_display/evac/directional/west, +/obj/effect/turf_decal/bot, +/obj/structure/frame/computer{ + anchored = 1; + dir = 4 }, -/obj/item/storage/medkit/fire{ - pixel_x = 3; - pixel_y = 3 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/obj/item/storage/medkit/fire, -/obj/item/storage/medkit/fire{ - pixel_x = -3; - pixel_y = -3 +/obj/effect/turf_decal/siding/blue{ + dir = 8 }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/status_display/evac/directional/west, -/obj/structure/sign/warning/no_smoking/directional/north, /turf/open/floor/iron/dark, -/area/station/medical/storage) +/area/station/medical/treatment_center) "gUS" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/event_spawn, @@ -21278,12 +21240,16 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "gVg" = ( -/obj/effect/turf_decal/bot, /obj/item/radio/intercom/directional/north, -/obj/machinery/suit_storage_unit/medical, -/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/computer/records/pathology, +/obj/effect/turf_decal/box, +/obj/machinery/light/directional/north, +/obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, -/area/station/medical/paramedic) +/area/station/medical/office) "gVi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/disposalpipe/segment, @@ -21704,17 +21670,13 @@ /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) "hdA" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - name = "cmo sorting disposal pipe" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/cable, -/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "hdB" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -22617,14 +22579,13 @@ /area/station/solars/port/fore) "hpQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/closet/secure_closet/psychology, +/obj/machinery/light_switch/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/medical/psychology) "hpS" = ( @@ -22896,23 +22857,13 @@ /turf/open/floor/plating, /area/station/security/prison) "huR" = ( -/obj/structure/table, -/obj/item/reagent_containers/chem_pack{ - pixel_x = 10; - pixel_y = 10 - }, -/obj/item/stack/medical/gauze{ - pixel_x = 8 - }, -/obj/item/stack/medical/mesh{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage" }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/medical/exam_room) +/area/station/medical/storage) "huS" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -23450,14 +23401,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/engineering/atmos) -"hDX" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) "hEa" = ( /obj/item/kirbyplants{ icon_state = "applebush" @@ -23529,12 +23472,21 @@ /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) "hEI" = ( -/obj/machinery/pdapainter/medbay, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/cryo) "hEQ" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -23656,15 +23608,12 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "hHg" = ( -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/medbay/central) +/obj/effect/spawner/random/engineering/tracking_beacon, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "hHj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -23985,20 +23934,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/vacant_room/commissary) -"hLz" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "medical sorting disposal pipe" - }, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 4 - }, -/obj/effect/mapping_helpers/mail_sorting/medbay/general, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) "hLO" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -24238,6 +24173,7 @@ /obj/item/toy/figure/psychologist{ pixel_y = 18 }, +/obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/carpet, /area/station/medical/psychology) "hPp" = ( @@ -24287,15 +24223,16 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "hPV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/door/airlock/medical/glass{ + name = "Primary Treatment Centre" }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "hPW" = ( /turf/closed/wall/r_wall/rust, /area/station/tcommsat/computer) @@ -24791,6 +24728,20 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/fore) +"hXf" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Common Channel" + }, +/obj/item/toy/plush/lizard_plushie, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "hXK" = ( /obj/structure/sign/directions/security{ pixel_y = -40 @@ -25438,7 +25389,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics) "ifX" = ( @@ -25457,19 +25407,8 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "igg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "igl" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -25709,7 +25648,7 @@ /area/station/cargo/storage) "ikr" = ( /obj/machinery/door/airlock/maintenance{ - name = "Psychology Maintenance" + name = "CMO Maintenance" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -25718,9 +25657,11 @@ dir = 4 }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, -/area/station/maintenance/port/fore) +/area/station/command/heads_quarters/cmo) "ikt" = ( /obj/structure/plaque/static_plaque/atmos, /turf/closed/wall/rust, @@ -26367,21 +26308,6 @@ "itn" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/command/nuke_storage) -"itr" = ( -/obj/structure/table/glass, -/obj/item/clipboard{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/book/manual/wiki/chemistry{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/book/manual/wiki/grenades, -/obj/item/toy/figure/chemist, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/pharmacy) "itw" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/power/shieldwallgen, @@ -26410,12 +26336,17 @@ /turf/open/floor/plating, /area/station/cargo/warehouse) "itZ" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/storage/secure/briefcase{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "iug" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 1 @@ -26468,14 +26399,20 @@ /turf/open/floor/iron/dark, /area/station/command/teleporter) "ivh" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 4; - id = "cmoprivacy"; - name = "Office Privacy Shutters" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/plating, -/area/station/command/heads_quarters/cmo) +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/cryo) "ivm" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/firecloset, @@ -26968,11 +26905,17 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "iCV" = ( +/obj/effect/turf_decal/siding/blue/corner{ + dir = 4 + }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/loading_area/white{ + color = "#52B4E9" + }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "iCW" = ( /obj/item/kirbyplants{ icon_state = "plant-05" @@ -27009,6 +26952,12 @@ /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) +"iDP" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "iEi" = ( /obj/structure/chair{ dir = 4 @@ -27073,6 +27022,31 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"iFb" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 5 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/south{ + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/item/storage/medkit/o2{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/o2, +/obj/item/storage/medkit/o2{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/storage) "iFe" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27144,20 +27118,14 @@ /turf/open/floor/iron/dark, /area/station/service/library) "iFK" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 9 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "iFR" = ( /obj/structure/railing{ dir = 8 @@ -27236,17 +27204,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "iGI" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/command{ - name = "Chief Medical Officer's Office" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/obj/structure/table/glass, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, -/area/station/medical/storage) +/area/station/medical/treatment_center) "iGK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/purple/corner{ @@ -27385,18 +27346,8 @@ /turf/open/floor/iron, /area/station/cargo/storage) "iIF" = ( -/obj/structure/table/glass, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/glasses/science{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/glasses/science, -/obj/item/storage/pill_bottle/epinephrine, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/pharmacy) +/turf/closed/wall/r_wall, +/area/station/security/checkpoint/medical) "iIP" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -27639,7 +27590,6 @@ /area/station/hallway/primary/central) "iLT" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, /obj/machinery/space_heater, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -27656,9 +27606,19 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) "iMr" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/medical/psychology) +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light_switch/directional/south, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "iMx" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/camera/autoname/directional/south, @@ -27880,6 +27840,12 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"iQw" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "iQK" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -28454,17 +28420,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/medical/pathology) -"iZm" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "iZp" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/toolbox/mechanical/old, @@ -28825,7 +28780,6 @@ /area/station/cargo/storage) "jfy" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, /obj/structure/rack, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -28836,18 +28790,20 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "jfK" = ( -/obj/structure/table/glass, -/obj/item/stack/package_wrap, -/obj/item/storage/secure/briefcase, -/obj/item/hand_labeler, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/item/radio/intercom/directional/west, -/obj/item/wrench/medical, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/vending/wardrobe/medi_wardrobe, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/cryo) "jfV" = ( /obj/structure/closet/secure_closet/captains, /obj/effect/turf_decal/bot, @@ -28968,6 +28924,7 @@ "jhr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "jhv" = ( @@ -29041,15 +28998,17 @@ /turf/open/floor/iron, /area/station/security/prison) "jhX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 +/obj/structure/bed/pod{ + desc = "An old medical bed, just waiting for replacement with something up to date."; + dir = 4; + name = "medical bed" }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "jia" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 1 @@ -29076,27 +29035,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central) -"jiE" = ( -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/toxin{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/toxin, -/obj/item/storage/medkit/toxin{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "jiJ" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/turf_decal/box/corners{ @@ -29107,23 +29045,14 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "jiN" = ( -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/machinery/recharger, /obj/machinery/status_display/evac/directional/west, -/obj/item/toy/figure/cmo{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -9; - pixel_y = 10 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/atmospherics/components/unary/cryo_cell{ dir = 4 }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "jiO" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29839,6 +29768,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "jzt" = ( @@ -29865,18 +29795,17 @@ /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) "jzB" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/airalarm/directional/south, +/obj/machinery/light_switch/directional/south{ + pixel_x = 12 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 +/obj/machinery/firealarm/directional/south{ + pixel_x = -15 }, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/turf/open/floor/iron/dark, +/area/station/medical/cryo) "jzF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random/directional/south, @@ -29976,16 +29905,6 @@ /obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron/dark, /area/station/command/bridge) -"jBO" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/medical/medbay/central) "jBR" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30034,6 +29953,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"jCL" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/station/maintenance/port/fore) "jCP" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -30974,6 +30899,15 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) +"jSr" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/landmark/start/medical_doctor, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/storage) "jSu" = ( /obj/machinery/conveyor{ id = "garbage" @@ -31075,11 +31009,6 @@ /obj/structure/sign/warning/docking, /turf/closed/wall/rust, /area/station/maintenance/port/greater) -"jTu" = ( -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/medical/exam_room) "jUa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -31161,12 +31090,15 @@ /turf/open/floor/wood, /area/station/maintenance/department/crew_quarters/bar) "jVZ" = ( -/obj/structure/water_source/puddle, -/obj/structure/flora/bush/reed/style_random{ - pixel_y = 5 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "jWw" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -31431,14 +31363,15 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "kaT" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/effect/turf_decal/siding/blue{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "kaW" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -31666,6 +31599,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/greater) "keE" = ( @@ -31777,13 +31711,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "khj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "kho" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31797,6 +31727,21 @@ /obj/structure/sign/warning/biohazard, /turf/closed/wall, /area/station/maintenance/starboard) +"khL" = ( +/obj/machinery/button/door{ + id = "emmd"; + name = "Medical Lockdown Toggle"; + pixel_x = -18; + pixel_y = -25 + }, +/obj/machinery/button/door{ + id = "cmoprivacy"; + name = "Privacy Shutters Toggle"; + pixel_x = -18; + pixel_y = -34 + }, +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/cmo) "kio" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31933,14 +31878,16 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/office) "kkC" = ( -/obj/item/toy/beach_ball{ - pixel_y = 6 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 +/obj/structure/table/glass, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 }, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/item/computer_disk/medical, +/obj/item/computer_disk/medical, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "kkP" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -32035,6 +31982,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plating, /area/station/maintenance/port/fore) "kmK" = ( @@ -32092,17 +32042,26 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "knL" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/stripes/corner{ +/obj/effect/turf_decal/siding/blue, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/shower/directional/west{ - name = "emergency shower" +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/south{ + name = "First Aid Supplies"; + req_access = list("medical"); + dir = 1 }, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/item/defibrillator/loaded{ + pixel_y = 6 + }, +/obj/item/defibrillator/loaded{ + pixel_y = 3 + }, +/obj/item/defibrillator/loaded, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "knR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32199,6 +32158,15 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/landmark/navigate_destination, +/obj/machinery/door/airlock/medical/glass{ + id_tag = "medbay_front_door"; + name = "Medbay" + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "kqs" = ( @@ -32323,10 +32291,16 @@ /turf/open/floor/iron, /area/station/commons/storage/art) "krM" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "krN" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -32391,14 +32365,11 @@ /turf/open/floor/iron, /area/station/security/brig) "ktA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/event_spawn, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "kua" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32743,15 +32714,8 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "kAR" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, /turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "kBd" = ( /obj/machinery/door/airlock/maintenance{ name = "E.V.A. Maintenance" @@ -32818,14 +32782,22 @@ "kCm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/port/fore) "kCZ" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/siding/blue, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/west, +/obj/item/mod/module/plasma_stabilizer, +/obj/item/mod/module/thermal_regulator, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "kDe" = ( /obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -32861,12 +32833,9 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "kDw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "kDy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -32931,6 +32900,7 @@ /obj/effect/landmark/event_spawn, /obj/machinery/holopad, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/medical/psychology) "kEQ" = ( @@ -33112,18 +33082,17 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "kHw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "kHG" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, @@ -33813,14 +33782,12 @@ /turf/open/floor/iron/dark, /area/station/bitrunning/den) "kRu" = ( -/obj/effect/turf_decal/siding/blue, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction/flip{ + dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "kRD" = ( @@ -33874,14 +33841,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "kSx" = ( +/obj/effect/landmark/start/medical_doctor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/siding/blue, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "kSR" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ @@ -33961,15 +33925,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"kUp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable, -/turf/open/floor/grass, -/area/station/medical/psychology) "kUr" = ( /obj/machinery/computer/records/security{ dir = 1 @@ -34535,8 +34490,27 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"lcr" = ( +/obj/structure/sign/warning/no_smoking/directional/north, +/obj/effect/turf_decal/arrows/red{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "lcw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -35229,13 +35203,12 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "lnc" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/landmark/start/paramedic, -/obj/structure/chair/office/light, -/obj/structure/cable, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "lnm" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -35330,6 +35303,14 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +"loX" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/central) "lpf" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/light/directional/north, @@ -35467,17 +35448,18 @@ /turf/closed/wall, /area/station/engineering/atmos/pumproom) "lrc" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/effect/turf_decal/siding/blue{ + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 +/obj/machinery/airalarm/directional/west, +/obj/machinery/firealarm/directional/west{ + pixel_y = 14 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "lre" = ( /obj/machinery/status_display/evac/directional/west, /obj/effect/decal/cleanable/dirt, @@ -36240,16 +36222,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/psychology) -"lCa" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/psychology) "lCs" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36557,15 +36529,23 @@ /turf/open/floor/wood, /area/station/service/bar) "lHX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/structure/disposalpipe/segment{ - dir = 10 + dir = 2 }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Virology Monkey Pen"; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "lIr" = ( @@ -37022,13 +37002,17 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "lQK" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/caution/stand_clear, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/medical/exam_room) +/area/station/medical/storage) "lQT" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/effect/turf_decal/stripes/line, @@ -37068,15 +37052,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "lRq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/siding/blue, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "lRE" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -37147,17 +37125,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) -"lTu" = ( -/obj/machinery/vending/drugs, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) "lTM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -37181,27 +37148,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/security/courtroom) -"lUM" = ( -/obj/effect/turf_decal/tile/blue, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/item/stamp/cmo{ - pixel_x = 8; - pixel_y = 20 - }, -/obj/machinery/light_switch/directional/south{ - pixel_x = -8 - }, -/obj/machinery/keycard_auth/directional/south{ - pixel_x = 8 - }, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) "lVe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sink/kitchen/directional/south{ @@ -37323,14 +37269,16 @@ /turf/open/floor/iron/dark, /area/station/maintenance/solars/starboard/fore) "lWr" = ( -/obj/structure/table/glass, -/obj/item/storage/medkit/regular{ - pixel_x = 2 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 }, -/obj/item/healthanalyzer, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/cryo) "lWw" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/purple/corner{ @@ -37544,15 +37492,19 @@ /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "mbc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Central"; + name = "medical camera"; + network = list("ss13","medical") }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "mbh" = ( @@ -37774,13 +37726,11 @@ /turf/closed/wall/r_wall, /area/station/science/ordnance/office) "mfs" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoprivacy"; - name = "Office Privacy Shutters" +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 }, -/turf/open/floor/plating, -/area/station/medical/storage) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "mfD" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -38445,10 +38395,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/evidence) -"mpv" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/medical/pharmacy) "mqa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -38522,8 +38468,15 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "mrl" = ( -/turf/closed/wall, -/area/station/command/heads_quarters/cmo) +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) "mrt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38572,6 +38525,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/greater) "mrI" = ( @@ -38632,10 +38586,11 @@ "msL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "msS" = ( @@ -38761,15 +38716,28 @@ /turf/open/floor/iron/dark, /area/station/security/office) "muN" = ( -/obj/machinery/computer/records/medical{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/obj/structure/cable, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/cryo) "mvz" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -38950,16 +38918,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"myd" = ( -/obj/structure/table/glass, -/obj/structure/mirror/directional/south, -/obj/item/mod/module/plasma_stabilizer, -/obj/item/mod/module/thermal_regulator, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "myg" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/stripes/line{ @@ -39116,11 +39074,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/fore) "mCg" = ( @@ -39133,6 +39089,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/medical/morgue) "mCk" = ( @@ -39287,22 +39244,14 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "mEt" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/button/door/directional/north{ - id = "medbay_front_door"; - name = "Medbay Doors Toggle"; - normaldoorcontrol = 1; - req_access = list("medical") - }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/machinery/computer/department_orders/medical, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "mEH" = ( @@ -39493,17 +39442,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/service/chapel) -"mHm" = ( -/obj/effect/landmark/start/depsec/medical, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/security/checkpoint/medical) "mHq" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -39613,21 +39551,6 @@ /obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) -"mJk" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "chemistry_shutters"; - name = "Chemistry Lobby Shutters" - }, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/airlock/medical/glass{ - name = "Pharmacy" - }, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy, -/turf/open/floor/iron/dark, -/area/station/medical/pharmacy) "mJo" = ( /obj/structure/disposalpipe/junction/flip{ dir = 8 @@ -39757,13 +39680,12 @@ /turf/open/floor/iron/dark, /area/station/security/office) "mMa" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "mMb" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/cobweb, @@ -39850,6 +39772,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/bar/backroom) +"mNN" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "mNT" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -39972,16 +39900,14 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "mPM" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Break Room" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "mPP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40679,7 +40605,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -40723,9 +40648,14 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "nbg" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/medical/paramedic) +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/storage) "nbn" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -40934,6 +40864,7 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "nex" = ( @@ -41398,13 +41329,14 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "noO" = ( -/obj/structure/flora/tree/jungle/small/style_random, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/obj/structure/cable, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "npg" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41581,10 +41513,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/stripes/corner, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) "nrv" = ( @@ -42163,9 +42097,6 @@ /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) "nBD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/blue{ @@ -42174,6 +42105,10 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/machinery/light/directional/west, +/obj/effect/landmark/start/paramedic, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "nBE" = ( @@ -42514,6 +42449,7 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/showroomfloor, /area/station/medical/surgery/fore) "nGE" = ( @@ -42794,11 +42730,11 @@ /turf/open/floor/iron/dark, /area/station/science/xenobiology) "nKV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "nLm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -43239,6 +43175,7 @@ "nUP" = ( /obj/effect/landmark/event_spawn, /obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "nUZ" = ( @@ -43287,16 +43224,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"nWW" = ( -/obj/structure/closet/secure_closet/psychology, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/psychology) "nXg" = ( /obj/machinery/quantum_server{ pixel_y = 3 @@ -43813,7 +43740,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/security/upper) "ofg" = ( -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/station/medical/pharmacy) "ofp" = ( /obj/structure/disposalpipe/segment, @@ -44753,23 +44680,12 @@ /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay Central"; - name = "medical camera"; - network = list("ss13","medical") - }, -/obj/structure/disposalpipe/trunk{ +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/obj/effect/turf_decal/siding/blue{ +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) "owA" = ( @@ -44822,12 +44738,14 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "oxp" = ( -/obj/structure/flora/bush/jungle/a/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/obj/structure/flora/bush/sunny/style_random, /obj/machinery/light/directional/west, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/machinery/suit_storage_unit/cmo, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "oxC" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -44915,21 +44833,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"ozt" = ( -/obj/structure/chair/office/light, -/obj/effect/landmark/start/depsec/medical, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/station/security/checkpoint/medical) "ozw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/item/tank/internals/oxygen/empty, @@ -45500,13 +45403,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig) -"oIM" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/misc/sandy_dirt, -/area/station/service/hydroponics) "oIS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -45606,10 +45502,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/button/door/directional/north{ - id = "emmd"; - name = "Medical Lockdown Toggle" - }, /obj/structure/cable, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -45699,14 +45591,12 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "oMJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/medical_doctor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/south, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "oMZ" = ( /obj/item/radio/intercom/directional/north, /turf/open/misc/sandy_dirt, @@ -45761,6 +45651,15 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +"oNw" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/obj/machinery/door/airlock/command{ + name = "Chief Medical Officer's Office" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/cmo) "oNH" = ( /obj/structure/disposalpipe/junction/flip, /turf/open/floor/iron, @@ -46295,18 +46194,14 @@ /turf/open/floor/iron/white, /area/station/security/prison/mess) "oWQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 +/obj/machinery/door/airlock/medical/glass{ + id_tag = "medbay_front_door"; + name = "Medbay" }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/medical/storage) "oXa" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -46584,34 +46479,46 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) +"paB" = ( +/obj/machinery/button/door/directional/north{ + id = "emmd"; + name = "Medical Lockdown Toggle" + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/surgery/fore) "paM" = ( /obj/structure/cable, /turf/open/floor/wood, /area/station/maintenance/port/greater) "paU" = ( -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/siding/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "pbk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ +/obj/effect/landmark/start/paramedic, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "pbs" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall/rust, @@ -46937,6 +46844,7 @@ /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "pig" = ( @@ -47344,9 +47252,11 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, /area/station/maintenance/port/fore) "pms" = ( @@ -47648,9 +47558,8 @@ pixel_x = 8; pixel_y = 6 }, -/obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/medical/paramedic) +/area/station/medical/office) "pqB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/box, @@ -48208,7 +48117,7 @@ /area/station/command/bridge) "pBd" = ( /turf/closed/wall/rust, -/area/station/medical/paramedic) +/area/station/medical/office) "pBf" = ( /obj/effect/turf_decal/siding/thinplating/dark/end{ dir = 8 @@ -48286,6 +48195,10 @@ pixel_x = 4; pixel_y = 12 }, +/obj/item/toy/plush/lizard_plushie{ + pixel_y = 4; + pixel_x = -2 + }, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "pCF" = ( @@ -48386,16 +48299,8 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) "pDY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/turf/closed/wall, +/area/station/medical/cryo) "pEc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, @@ -48455,6 +48360,7 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "pFs" = ( @@ -48514,12 +48420,18 @@ /area/station/hallway/secondary/service) "pFY" = ( /obj/machinery/newscaster/directional/north, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/item/kirbyplants/random, +/obj/machinery/light_switch/directional/north{ + pixel_x = 23 + }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "pGe" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -48700,14 +48612,31 @@ /turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "pJr" = ( -/obj/machinery/iv_drip, -/obj/structure/bed{ - dir = 4 +/obj/effect/turf_decal/siding/blue{ + dir = 9 }, -/obj/structure/curtain, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/exam_room) +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/machinery/door/window/left/directional/south{ + name = "First Aid Supplies" + }, +/obj/item/storage/medkit/brute{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/brute{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/storage) "pJs" = ( /obj/structure/sign/warning/fire, /turf/closed/wall, @@ -48743,14 +48672,24 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "pKf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/arrows/red{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "pKm" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -48940,12 +48879,16 @@ /turf/open/floor/iron/dark, /area/station/construction/mining/aux_base) "pMj" = ( -/obj/effect/landmark/start/paramedic, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "pMS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49357,15 +49300,10 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "pTc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/sign/poster/random/directional/south, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "pTL" = ( /obj/effect/turf_decal/bot/left, /turf/open/floor/iron, @@ -49610,13 +49548,14 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/atmos) "pYZ" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "pZe" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -49708,7 +49647,7 @@ "qaR" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/wall, -/area/station/medical/paramedic) +/area/station/medical/office) "qaZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 1 @@ -49740,38 +49679,20 @@ dir = 8 }, /area/station/hallway/primary/central/fore) -"qbk" = ( -/turf/closed/wall/rust, -/area/station/medical/exam_room) "qbq" = ( -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/brute{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/brute, -/obj/item/storage/medkit/brute{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/glass, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/door/window/left/directional/east{ - name = "First-Aid Supplies"; - req_access = list("medical") - }, /obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "qbv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49828,15 +49749,14 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "qbO" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/ferny/style_random, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/grass, -/area/station/medical/psychology) +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "qbP" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/door/firedoor/border_only{ @@ -49980,18 +49900,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance/storage) "qez" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/psychology) +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/cmo) "qeJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50146,7 +50057,6 @@ /area/station/hallway/primary/port) "qht" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) @@ -50691,13 +50601,13 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "qpP" = ( -/obj/structure/chair/office/light, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/chair/office/light, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "qpZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50805,34 +50715,8 @@ /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "qrS" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/structure/table, -/obj/item/clipboard{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6 - }, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) @@ -50871,6 +50755,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"qsw" = ( +/obj/machinery/pdapainter/medbay, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "qsy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50989,16 +50880,17 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics) "qvi" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Desk" +/obj/effect/turf_decal/siding/blue{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron/dark, -/area/station/medical/paramedic) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/machinery/light_switch/directional/east{ + pixel_y = -33 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/storage) "qvq" = ( /obj/structure/flora/rock/style_random, /turf/open/misc/asteroid/lowpressure, @@ -51173,16 +51065,10 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "qyo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "qyA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/box, @@ -52352,6 +52238,7 @@ dir = 1 }, /obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "qSJ" = ( @@ -52440,21 +52327,17 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "qUJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/left/directional/west{ - name = "Soothing Nature Exhibit"; - req_access = list("psychology") - }, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Common Channel" }, -/turf/open/floor/iron/dark, -/area/station/medical/psychology) +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "qUO" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -53226,16 +53109,17 @@ /turf/open/floor/iron/stairs/old, /area/station/maintenance/port/fore) "rhs" = ( -/obj/machinery/modular_computer/console/preset/id{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/table/glass, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/neck/stethoscope, +/obj/item/wrench/medical, /obj/effect/turf_decal/bot, -/obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 + dir = 1 }, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "rhy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53488,6 +53372,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/chapel, /area/station/service/chapel) +"rlR" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/central) "rlT" = ( /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) @@ -54041,6 +53934,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/item/storage/pill_bottle/epinephrine, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) "rtw" = ( @@ -54169,16 +54063,11 @@ /turf/open/floor/iron/dark, /area/station/cargo/storage) "ruU" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "ruW" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -54964,22 +54853,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) -"rHc" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) "rHi" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/small/directional/north, @@ -55214,7 +55087,7 @@ name = "Emergency Medical Lockdown Shutters" }, /turf/open/floor/grass, -/area/station/medical/paramedic) +/area/station/medical/office) "rKY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55451,6 +55324,16 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/central) +"rOc" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/central) "rOq" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -55598,15 +55481,14 @@ /turf/open/floor/plating, /area/station/service/hydroponics) "rQx" = ( -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "rQG" = ( /obj/structure/bodycontainer/crematorium, /obj/effect/turf_decal/stripes/line{ @@ -55767,18 +55649,18 @@ /turf/open/floor/iron/dark, /area/station/security/interrogation) "rRZ" = ( -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/photocopier, +/obj/effect/turf_decal/box, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "rSi" = ( /turf/closed/wall/rust, /area/station/medical/surgery/fore) @@ -55886,16 +55768,11 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "rUP" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "rUQ" = ( @@ -55920,14 +55797,16 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "rVp" = ( -/obj/machinery/computer/crew{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/depsec/medical, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 }, -/obj/effect/turf_decal/bot, -/obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 + dir = 4 }, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "rVt" = ( @@ -56060,16 +55939,12 @@ /turf/open/floor/plating, /area/station/science/explab) "rZE" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/landmark/start/paramedic, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "rZK" = ( @@ -56207,18 +56082,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "sbJ" = ( -/obj/structure/table, -/obj/item/wrench/medical, -/obj/machinery/light/directional/west, -/obj/machinery/status_display/evac/directional/west, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = 8; - pixel_y = 7 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) +/area/station/medical/treatment_center) "sbK" = ( /obj/structure/flora/bush/flowers_br/style_random, /mob/living/basic/chicken, @@ -56974,7 +56841,9 @@ "son" = ( /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "sow" = ( @@ -57096,7 +56965,6 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) "spX" = ( -/obj/structure/cable, /obj/machinery/space_heater, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -57198,12 +57066,25 @@ /turf/open/floor/iron, /area/station/security/brig) "srg" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/anesthetic_mix, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/medbay/central) +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Central"; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Common Channel" + }, +/obj/machinery/newscaster/directional/north, +/obj/item/kirbyplants/random, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "srk" = ( /obj/machinery/deepfryer, /obj/effect/turf_decal/bot, @@ -57574,18 +57455,11 @@ /turf/open/floor/plating, /area/station/command/heads_quarters/ce) "sxM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "syu" = ( /obj/structure/sign/warning/deathsposal{ layer = 4 @@ -57776,19 +57650,12 @@ /turf/open/floor/grass, /area/station/security/prison/garden) "sBO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 }, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/turf/open/floor/iron/dark, +/area/station/medical/cryo) "sCa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -58315,14 +58182,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "sKm" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/suit_storage_unit/cmo, /obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "sKy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58696,17 +58561,24 @@ /turf/open/floor/iron, /area/station/security/checkpoint/engineering) "sPK" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/loading_area{ +/obj/effect/turf_decal/siding/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/clothing/gloves/latex/nitrile, +/obj/item/wrench/medical, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "sPP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58983,17 +58855,18 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "sTZ" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "sUq" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -59190,16 +59063,12 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "sXE" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/airalarm/directional/south, +/obj/effect/landmark/start/paramedic, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "sXG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -59355,9 +59224,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "tai" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, /mob/living/basic/chicken, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics) @@ -59387,22 +59253,6 @@ }, /turf/open/floor/plating, /area/station/security/detectives_office) -"taW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/siding/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) "tbb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -59522,17 +59372,11 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "tdB" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "tdW" = ( /obj/machinery/light_switch/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59829,13 +59673,12 @@ /turf/open/space/basic, /area/space) "thG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "thU" = ( /mob/living/basic/mining/goliath/ancient, /turf/open/misc/asteroid/lowpressure, @@ -60363,15 +60206,13 @@ /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) "tpy" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue, +/obj/effect/mapping_helpers/mail_sorting/medbay/general, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8; + name = "medbay sorting disposal pipe" + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/blue/corner, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "tpD" = ( @@ -60526,6 +60367,17 @@ /obj/machinery/atmospherics/miner/plasma, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) +"trT" = ( +/obj/machinery/computer/records/security{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "tsf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60534,6 +60386,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "tsg" = ( +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "tsn" = ( @@ -60885,9 +60738,14 @@ /turf/open/floor/iron/dark, /area/station/security/medical) "tyA" = ( -/obj/structure/flora/bush/jungle/c/style_random, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/structure/closet/secure_closet/chief_medical, +/obj/item/gun/energy/e_gun/mini, +/obj/item/screwdriver, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "tyI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -60980,20 +60838,17 @@ /turf/open/floor/iron/dark, /area/station/security/office) "tzN" = ( -/obj/structure/table/glass, -/obj/item/storage/box/rxglasses{ - pixel_x = 4; - pixel_y = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/item/storage/box/beakers, -/obj/item/gun/syringe{ - pixel_y = 5 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/item/reagent_containers/spray/cleaner, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "tzU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61019,15 +60874,11 @@ /turf/open/floor/iron, /area/station/security/office) "tAx" = ( -/obj/item/kirbyplants{ - icon_state = "plant-18" - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "tAI" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -61139,6 +60990,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "tCh" = ( @@ -61289,19 +61143,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) -"tEt" = ( -/obj/machinery/microwave{ - pixel_y = 5 - }, -/obj/structure/table/glass, -/obj/structure/sign/poster/official/no_erp{ - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) "tEE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61906,32 +61747,28 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"tPX" = ( -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/storage/medkit/o2{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/o2, -/obj/item/storage/medkit/o2{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/table/glass, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/door/window/left/directional/east{ - dir = 8; - name = "First-Aid Supplies"; - req_access = list("medical") +"tPT" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 }, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Common Channel" + }, /turf/open/floor/iron/dark, -/area/station/medical/storage) +/area/station/medical/cryo) +"tPX" = ( +/obj/machinery/medical_kiosk, +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "tQo" = ( /obj/structure/closet/crate/medical, /obj/item/storage/medkit/regular{ @@ -62001,10 +61838,13 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "tSc" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "tSk" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -62208,17 +62048,24 @@ /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) "tWd" = ( -/obj/structure/chair/office/light{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "tWe" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Medbay" }, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "tWg" = ( @@ -62296,6 +62143,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard) +"tXy" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 6 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/north, +/obj/item/storage/box/syringes{ + pixel_y = 4 + }, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/storage) "tXz" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -62311,15 +62175,18 @@ /turf/open/floor/plating, /area/station/hallway/secondary/entry) "tXR" = ( -/obj/structure/chair/office/light{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "tXS" = ( /obj/machinery/atmospherics/components/tank/oxygen, /turf/open/floor/iron/showroomfloor, @@ -62419,14 +62286,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"tZc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoprivacy"; - name = "Office Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/command/heads_quarters/cmo) "tZe" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -62897,14 +62756,15 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "ugc" = ( -/obj/structure/flora/grass/jungle/b/style_random, -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/computer/crew{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "ugp" = ( /obj/structure/chair/sofa/bench/right, /obj/effect/turf_decal/box/corners{ @@ -62918,19 +62778,17 @@ /area/station/hallway/primary/central/fore) "ugq" = ( /obj/structure/sign/departments/psychology/directional/north, -/obj/structure/chair{ - desc = "A gray chair. Nothing more relaxing while waiting for therapy than watching the dying."; - dir = 8; - name = "therapy waiting chair" +/obj/effect/turf_decal/siding/blue{ + dir = 5 }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/rnd/production/techfab/department/medical, +/obj/effect/turf_decal/stripes/box, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "ugr" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -63055,12 +62913,21 @@ name = "Chemistry Desk"; req_access = list("pharmacy") }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/medical/pharmacy) "uiu" = ( -/obj/structure/flora/bush/jungle/b/style_random, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/machinery/camera/directional/north{ + c_tag = "Chief Medical Officer's Office"; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "uiE" = ( /obj/machinery/ai_slipper{ uses = 8 @@ -63160,15 +63027,6 @@ dir = 8 }, /area/station/hallway/primary/central/fore) -"uko" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/bot, -/obj/machinery/vending/drugs, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) "ukM" = ( /obj/structure/sign/warning/vacuum/external/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63485,6 +63343,17 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"uow" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) "uoA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/cardboard, @@ -63778,19 +63647,6 @@ "utF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/modular_computer/console/preset/cargochat/medical{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "utH" = ( @@ -64161,17 +64017,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/pathology) -"uCa" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) "uCd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -64597,15 +64442,19 @@ /turf/open/floor/iron/white, /area/station/security/prison/mess) "uJs" = ( -/obj/machinery/computer/security/telescreen/cmo{ - dir = 1; - name = "Chief Medical Officer's telescreen"; - network = list("medical"); - pixel_y = 2 +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/medical/glass{ + name = "Cryogenics Bay" }, -/obj/structure/table/reinforced/rglass, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) "uJE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -65152,6 +65001,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "uTT" = ( @@ -65177,18 +65027,14 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "uUm" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/shower/directional/east{ - name = "emergency shower" - }, -/obj/effect/turf_decal/box, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/item/toy/figure/paramedic{ + pixel_x = 10; + pixel_y = 15 }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/turf/open/floor/iron/dark, +/area/station/medical/storage) "uUA" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/closed/wall, @@ -65229,7 +65075,7 @@ name = "Emergency Medical Lockdown Shutters" }, /turf/open/floor/grass, -/area/station/medical/paramedic) +/area/station/medical/office) "uVK" = ( /obj/machinery/bluespace_vendor/directional/north, /turf/open/floor/iron/dark, @@ -65299,12 +65145,14 @@ /turf/open/floor/grass, /area/station/security/prison/garden) "uXn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/chicken_grinder, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/grass, /area/station/service/hydroponics) "uXB" = ( @@ -65488,13 +65336,6 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/station/cargo/warehouse) -"uZT" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/turf/open/floor/iron, -/area/station/medical/medbay/central) "uZX" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ @@ -65523,6 +65364,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) +"vah" = ( +/obj/machinery/computer/crew{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "vao" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -65662,7 +65513,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, @@ -66062,12 +65912,14 @@ /turf/closed/wall, /area/station/hallway/primary/central) "vkq" = ( -/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable, +/obj/effect/landmark/start/paramedic, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "vkr" = ( /obj/item/radio/intercom/directional/east, /obj/structure/disposalpipe/segment, @@ -66110,9 +65962,6 @@ dir = 8 }, /area/station/hallway/primary/port) -"vkE" = ( -/turf/closed/wall/rust, -/area/station/security/checkpoint/medical) "vkJ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/power/terminal{ @@ -66390,24 +66239,15 @@ /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, /area/station/maintenance/department/security) +"vpu" = ( +/turf/closed/wall, +/area/station/medical/treatment_center) "vpD" = ( -/obj/structure/table/glass, -/obj/item/storage/box/bodybags{ - pixel_y = 5 +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/item/storage/belt/medical, -/obj/item/crowbar, -/obj/item/clothing/neck/stethoscope, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/hud/health, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "vpV" = ( /obj/structure/chair{ dir = 4 @@ -66611,16 +66451,21 @@ /turf/open/space, /area/space/nearstation) "vsJ" = ( -/obj/structure/flora/bush/jungle/b/style_random, -/obj/structure/flora/bush/flowers_pp/style_random, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/keycard_auth/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = 10 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "vsR" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) @@ -66951,6 +66796,20 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/engineering/atmos/pumproom) +"vxu" = ( +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring medbay to ensure patient safety."; + dir = 1; + name = "Medbay Monitor"; + network = list("medical") + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "vxK" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, @@ -67509,16 +67368,9 @@ /turf/open/misc/sandy_dirt, /area/station/service/hydroponics) "vFv" = ( -/obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) +/area/station/medical/treatment_center) "vFD" = ( /obj/structure/table/wood, /obj/item/device/walkman{ @@ -67840,6 +67692,9 @@ /obj/machinery/light/directional/east, /turf/open/floor/plating/airless, /area/station/hallway/secondary/entry) +"vJn" = ( +/turf/closed/wall, +/area/station/medical/medbay/central) "vJv" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/component_printer, @@ -67913,6 +67768,22 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/service/bar/backroom) +"vJY" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table/glass, +/obj/item/storage/box/rxglasses{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/stack/medical/gauze{ + pixel_x = 8 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "vJZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68374,6 +68245,7 @@ dir = 1 }, /obj/effect/landmark/start/chemist, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) "vQF" = ( @@ -68424,16 +68296,20 @@ /turf/closed/wall, /area/station/engineering/atmos) "vRN" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/item/storage/belt/medical, -/obj/item/clothing/neck/stethoscope, -/obj/effect/turf_decal/delivery, /obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/bot, +/obj/structure/frame/computer{ + anchored = 1; + dir = 4 + }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/effect/turf_decal/siding/blue{ + dir = 9 + }, /turf/open/floor/iron/dark, -/area/station/medical/storage) +/area/station/medical/treatment_center) "vRO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68462,10 +68338,6 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai_upload) "vRU" = ( -/obj/structure/closet/secure_closet/medical3, -/obj/item/storage/belt/medical, -/obj/item/clothing/neck/stethoscope, -/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -68478,11 +68350,12 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/medical/storage) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "vRX" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, @@ -68613,22 +68486,15 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "vUr" = ( -/obj/structure/table/glass, -/obj/item/crowbar{ - pixel_x = -8; - pixel_y = 11 - }, /obj/machinery/light/directional/east, -/obj/item/roller{ - pixel_x = 7; - pixel_y = 10 +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 }, -/obj/item/roller, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/computer/records/medical{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/medical/paramedic) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/office) "vUs" = ( /obj/structure/bed, /obj/machinery/iv_drip, @@ -68698,7 +68564,6 @@ /area/station/security/brig) "vVv" = ( /obj/structure/flora/bush/sparsegrass/style_random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table/glass, /obj/item/chicken_book, /obj/item/chicken_book, @@ -68737,6 +68602,9 @@ pixel_y = 8 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/grass, /area/station/service/hydroponics) "vVw" = ( @@ -68979,6 +68847,24 @@ /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/chapel) +"vZt" = ( +/obj/machinery/stasis{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Central"; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/effect/turf_decal/siding/blue{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "vZu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -69094,6 +68980,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/west, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/medical/morgue) "wbo" = ( @@ -69188,24 +69075,30 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "wcC" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 4 +/obj/structure/table/glass, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 6 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 +/obj/item/clothing/glasses/hud/health{ + pixel_y = 4 }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/obj/item/clothing/glasses/hud/health{ + pixel_y = 2 + }, +/obj/item/clothing/glasses/hud/health, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "wcN" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "wcP" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -70200,17 +70093,27 @@ /turf/open/floor/iron/dark, /area/station/cargo/storage) "wsg" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/bot, -/obj/machinery/newscaster/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/vending/medical, /obj/machinery/camera/directional/north{ - c_tag = "Chief Medical Officer's Office"; + c_tag = "Medbay Central"; name = "medical camera"; network = list("ss13","medical") }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/cryo) "wso" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm/directional/south, @@ -70249,9 +70152,6 @@ "wtP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -70278,17 +70178,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) +/area/station/medical/treatment_center) "wuh" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral, @@ -70672,7 +70567,7 @@ pixel_x = -7 }, /turf/open/floor/iron/dark, -/area/station/medical/paramedic) +/area/station/medical/office) "wzY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -70796,14 +70691,16 @@ /turf/open/floor/plating, /area/station/maintenance/department/bridge) "wCR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/central) +/area/station/medical/treatment_center) "wCY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70893,15 +70790,13 @@ /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "wEJ" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 + dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "wEM" = ( @@ -70942,20 +70837,11 @@ /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain/private) "wFm" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/computer/department_orders/medical{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "wFs" = ( @@ -71351,14 +71237,21 @@ /turf/open/floor/iron, /area/station/security/prison/safe) "wJy" = ( +/obj/effect/turf_decal/siding/blue, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/general, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1; + name = "medbay sorting disposal pipe" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/exam_room) +/area/station/medical/storage) "wJD" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/nitrogen, @@ -71367,29 +71260,19 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage/gas) "wKa" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/landmark/start/chief_medical_officer, -/obj/machinery/button/door{ - id = "emmd"; - name = "Medical Lockdown Toggle"; - pixel_x = -18; - pixel_y = -25 - }, -/obj/machinery/button/door{ - id = "cmoprivacy"; - name = "Privacy Shutters Toggle"; - pixel_x = -18; - pixel_y = -34 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/area/station/medical/cryo) "wKb" = ( /obj/structure/railing/corner, /obj/item/kirbyplants/random, @@ -71477,10 +71360,14 @@ /turf/open/floor/iron, /area/station/security/brig) "wMl" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "wMt" = ( @@ -71639,12 +71526,37 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "wOy" = ( -/obj/machinery/iv_drip, -/obj/structure/bed, -/obj/structure/curtain, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/station/medical/exam_room) +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/east, +/obj/machinery/door/window/right/directional/south{ + name = "First Aid Supplies"; + req_access = list("medical") + }, +/obj/item/storage/medkit/fire{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/fire, +/obj/item/storage/medkit/fire{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay Central"; + name = "medical camera"; + network = list("ss13","medical") + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/storage) "wOB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71909,23 +71821,21 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "wSU" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/requests_console/directional/north{ - anon_tips_receiver = 1; - assistance_requestable = 1; - department = "Chief Medical Officer's Desk"; - name = "Chief Medical Officer's Requests Console"; - can_send_announcements = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/machinery/fax{ - fax_name = "Chief Medical Officer's Office"; - name = "Chief Medical Officer's Fax Machine" +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/cmo) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/cryo) "wSY" = ( /obj/machinery/camera/directional/south{ c_tag = "Satellite Antechamber"; @@ -72002,7 +71912,6 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) @@ -72286,15 +72195,15 @@ /area/station/maintenance/fore) "xau" = ( /obj/machinery/firealarm/directional/west, -/obj/machinery/recharge_station, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/storage) +/area/station/medical/treatment_center) "xav" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -72537,16 +72446,7 @@ /turf/open/floor/iron, /area/station/engineering/hallway) "xev" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, +/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "xex" = ( @@ -72613,12 +72513,16 @@ /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) "xfZ" = ( -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_br/style_random, /obj/machinery/airalarm/directional/west, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/structure/bed/dogbed/runtime, +/obj/item/toy/cattoy, +/mob/living/simple_animal/pet/cat/runtime, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "xgs" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -72653,16 +72557,6 @@ "xha" = ( /turf/open/floor/engine/co2, /area/station/engineering/atmos) -"xhi" = ( -/obj/structure/sign/departments/chemistry/directional/west, -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/lobby) "xhl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/landmark/generic_maintenance_landmark, @@ -72737,8 +72631,18 @@ /turf/open/floor/iron/dark, /area/station/cargo/sorting) "xiC" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/mapping_helpers/mail_sorting/medbay/virology, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 2; + name = "virology sorting disposal pipe" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "xja" = ( @@ -73037,11 +72941,29 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) "xmI" = ( -/obj/structure/flora/grass/jungle/b/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) +"xmN" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 10 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Virology Monkey Pen"; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/machinery/status_display/evac/directional/west, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "xmQ" = ( /obj/machinery/door/airlock/external{ name = "External Airlock" @@ -73574,7 +73496,7 @@ /area/station/cargo/warehouse) "xvW" = ( /turf/closed/wall, -/area/station/medical/paramedic) +/area/station/medical/office) "xwk" = ( /obj/machinery/computer/security/mining, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -73626,17 +73548,17 @@ /turf/open/floor/iron/dark, /area/station/science/lab) "xwO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/blue, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/paramedic, -/obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/showroomfloor, -/area/station/medical/paramedic) +/area/station/medical/office) "xwU" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -73657,22 +73579,16 @@ /turf/closed/wall/r_wall, /area/station/command/heads_quarters/cmo) "xxz" = ( -/obj/structure/table/glass, -/obj/item/storage/box/bodybags{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 2 +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/machinery/computer/crew{ dir = 8 }, -/obj/item/toy/figure/paramedic{ - pixel_x = -9 - }, -/turf/open/floor/iron/dark, -/area/station/medical/paramedic) +/turf/open/floor/iron/showroomfloor, +/area/station/medical/office) "xxJ" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -74101,11 +74017,11 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "xEV" = ( @@ -74136,15 +74052,13 @@ /turf/open/floor/iron/dark, /area/station/command/teleporter) "xFt" = ( -/obj/structure/flora/grass/jungle/a/style_random, -/obj/structure/flora/bush/ferny/style_random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 }, -/obj/structure/cable, -/turf/open/floor/grass, -/area/station/medical/psychology) +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/command/heads_quarters/cmo) "xFE" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/decal/cleanable/dirt, @@ -74243,16 +74157,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) -"xHU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron/dark, -/area/station/maintenance/port/greater) "xIm" = ( /obj/machinery/door/airlock/engineering{ name = "Emergency Storage" @@ -74354,16 +74258,16 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "xJn" = ( -/obj/machinery/computer/records/security{ - dir = 1 +/obj/effect/landmark/start/depsec/medical, +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/south, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 }, -/turf/open/floor/iron/dark, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/showroomfloor, /area/station/security/checkpoint/medical) "xJs" = ( /obj/effect/turf_decal/stripes/line, @@ -74411,6 +74315,7 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 }, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) "xJY" = ( @@ -74435,16 +74340,6 @@ "xKo" = ( /turf/closed/wall, /area/station/science/explab) -"xKr" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/medbay/lobby) "xKO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74777,11 +74672,22 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "xQq" = ( -/obj/machinery/rnd/production/techfab/department/medical, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/box, +/obj/structure/table/glass, +/obj/item/storage/belt/medical{ + pixel_y = 6 + }, +/obj/item/storage/belt/medical{ + pixel_y = 4 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/dark, -/area/station/medical/storage) +/area/station/medical/treatment_center) "xQH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -74943,13 +74849,9 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "xST" = ( -/obj/effect/turf_decal/tile/blue, -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/station/command/heads_quarters/cmo) +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/medical/cryo) "xSU" = ( /obj/structure/railing/corner, /obj/structure/disposalpipe/segment{ @@ -93267,21 +93169,21 @@ pqS mUs hTj pmq -fsJ -eWP -hBJ -mtV +vpu +vpu +vpu +vpu fEj -mtV -mtV -hBJ -vjh -vjh -xHU -vjh -vjh +vpu +vpu +vpu +vpu +vpu +vpu +vpu +eSG kex -jVD +dBg eNQ csa csa @@ -93520,23 +93422,23 @@ wrz lLY cBO rwW -eWP -eWP -esG -eWP -eWP -esG +pVz +pVz +jCL +pVz +vpu +vZt gUP qbq eUs vRU vRN gNq -jop +xmN xau jhX -myd -ycx +vpu +eSG kex jfy vjh @@ -93776,24 +93678,24 @@ sbB qWC qOT lcF -eWP -esG +pVz +pDY acD sKm jiN aHQ -qGK +lcr tzN iFK igg fne -ayc +mPM pKf mPM kHw oMJ -tEt -vjh +vpu +vBi hpY wVb eNQ @@ -94028,12 +93930,12 @@ jQR hCV xAK jeT -pVz -pVz +xxk +xxk ikr -xBI -pVz -eWP +xxk +xxk +xxk jfK sBO bjN @@ -94041,15 +93943,15 @@ jzB pDY iGI thG -taW +igg ktA hdA kSx ruU -jop +tAx tAx pTc -qGK +vpu vjh wFG ycx @@ -94285,7 +94187,7 @@ jQR hCV jcj mvD -pVz +xxk oxp qbO xfZ @@ -94300,13 +94202,13 @@ mfs vpD eDu wcC -hLz +hdA lRq fzG -jop +hXf mMa bBe -qGK +vpu cDJ eSu iRJ @@ -94542,7 +94444,7 @@ pVz wdn pLO xtt -xBI +xxk uiu noO dHg @@ -94552,12 +94454,12 @@ buJ kAR gbB ghX -lUM -qGK -jiE +xST +mNN +igg tPX xQq -rHc +hdA sxM sJM sJM @@ -94799,21 +94701,21 @@ pVz xBI pVz qKx -pVz +xxk fFH ugc jVZ xmI -gHC +oNw lWr khj pYZ wKa uJs -mfs -eWd +eMN +iDP eWd -qGK +vJY gQo qyo gbf @@ -95056,22 +94958,22 @@ xBI pVz pVP ami -pVz +xxk vsJ xFt -kUp +dHg itZ -xxk +bRD wSU hEI muN rhs -tZc +xST eQb -jBO +sbJ hHg -qGK -iZm +iQw +hdA sXE sJM tBh @@ -95313,18 +95215,18 @@ ixi pVz dYM eyj -xBI -iMr -iMr +xxk +fss +qsw qUJ iMr xxk +tPT +uow ivh mrl -ivh -mrl -tZc -srg +xST +eQb dhY nKV sbJ @@ -95570,25 +95472,25 @@ tmd xBI oRz pVz -pVz -nWW -lCa +xxk +xxk +xxk qez -eUN -gsy -clH -bXe +khL +xxk +qGK +jop huR -bXe -gsy +jop +qGK srg -uZT +gKd gKd pMj dKa wCR sJM -sJM +paB oKJ fth sJM @@ -95837,14 +95739,14 @@ lrc sPK kaT ekB -gsy -uCa +qGK +vpu hPV -fph +bsR bsR aOS -hDX -lTu +vpu +sJM rSi cuU gbf @@ -96090,11 +95992,11 @@ kEC wtP rwr wOy -aQQ +kDw tSc gPS buq -gsy +jop mEt anI son @@ -96358,7 +96260,7 @@ utF wFm dzQ qrS -cdd +xev xev cHz cvF @@ -96605,17 +96507,17 @@ xzA eUN ugq iCV -gPS +jSr kDw kCZ -jTu +jop wEJ kRu -rFt -sSJ -lAu -sSJ -rFt +eAx +fKw +rlR +rlR +rlR owm jrs cMT @@ -96860,20 +96762,20 @@ jUU dkh jUU dkh -gsy +qGK aHC -uko -gsr +kDw +kDw knL -qbk -bjk +jop +wEJ rZE +loX rFt -ddS -fYU -bdM -vkE -mpv +sSJ +lAu +sSJ +sSJ opL kHG ofg @@ -97117,19 +97019,19 @@ phH vJg pri eMB -xvW -xvW +qGK +iFb nbg qvi -xvW -nbg +tXy +qGK mbc rUP -sSJ -lfQ -mHm -rVp +ern rFt +ddS +rVp +vxu iIF xJN fPc @@ -97374,20 +97276,20 @@ xjI yhI eby gtK -xvW -bKU +qGK +qGK uUm oWQ fxx -pBd +qGK cTI gAO -rFt -lJL -ozt +rOc +sSJ +lfQ xJn -rFt -itr +vah +iIF yaZ tVu aTe @@ -97639,12 +97541,12 @@ cvL xvW dAz kqn +vJn rFt -sSJ -sSJ -sSJ -rFt -ofg +lJL +guB +trT +iIF cSl lkl jMU @@ -97897,11 +97799,11 @@ wzW pFq bXA naC -xKr -xKr -xKr -xhi -mJk +rFt +sSJ +sSJ +sSJ +iIF vbT etY nri @@ -111020,7 +110922,7 @@ oNk kbT hxX uXn -oIM +gtv tai arl xWm From f3c3cb96e05bfb1b4859a91612eba70a60260b48 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 19 Mar 2024 16:57:41 +0100 Subject: [PATCH 30/59] removes a pipe (again) --- _maps/map_files/KiloStation/KiloStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ea9c7bd4f1ed..e3a0eb144be1 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -28791,7 +28791,6 @@ /area/station/maintenance/starboard) "jfK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 From fce13eca0d8ab980666f28964a562298bae6a68c Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 19 Mar 2024 17:16:33 +0100 Subject: [PATCH 31/59] added showers and tweaked qm's office a bit --- _maps/map_files/KiloStation/KiloStation.dmm | 29 +++++++++------------ 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index e3a0eb144be1..2eea22765d5e 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -27096,7 +27096,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/mob/living/basic/sloth/citrus, /turf/open/floor/iron, /area/station/cargo/storage) "iFI" = ( @@ -33084,10 +33083,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -45590,11 +45586,11 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "oMJ" = ( -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, /obj/structure/sign/poster/random/directional/south, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/shower/directional/north, +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, /area/station/medical/treatment_center) "oMZ" = ( /obj/item/radio/intercom/directional/north, @@ -49298,11 +49294,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"pTc" = ( -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/structure/sign/poster/random/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/treatment_center) "pTL" = ( /obj/effect/turf_decal/bot/left, /turf/open/floor/iron, @@ -68002,6 +67993,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"vNy" = ( +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/treatment_center) "vNB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -93948,8 +93943,8 @@ hdA kSx ruU tAx -tAx -pTc +vNy +oMJ vpu vjh wFG @@ -115801,7 +115796,7 @@ iYI iYI nfY nfY -atu +nfY uEM nfY lmO From e981d111a45f4fa3ea03a75f5e37b1d173244a36 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 19 Mar 2024 19:27:07 +0100 Subject: [PATCH 32/59] medbay tweaks, more cameras in updated areas --- _maps/map_files/KiloStation/KiloStation.dmm | 346 +++++++++++++------- 1 file changed, 235 insertions(+), 111 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 2eea22765d5e..59ca6cb38ccd 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1022,6 +1022,10 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/camera/directional/south{ + c_tag = "Recreation Fitness Ring"; + name = "recreation camera" + }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "amr" = ( @@ -2871,6 +2875,11 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) "aUW" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1; + name = "chapel sorting disposal pipe" + }, +/obj/effect/mapping_helpers/mail_sorting/service/chapel, /turf/open/floor/iron/stairs/medium{ dir = 4 }, @@ -4537,14 +4546,10 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "bBe" = ( -/obj/structure/bed/pod{ - desc = "An old medical bed, just waiting for replacement with something up to date."; - name = "medical bed" - }, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, +/obj/machinery/defibrillator_mount/directional/south, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/stasis, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) "bBr" = ( @@ -8848,15 +8853,14 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "dbK" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "dbR" = ( @@ -12023,6 +12027,16 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"eco" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/central) "ecE" = ( /turf/closed/wall/rust, /area/station/service/chapel/storage) @@ -12059,11 +12073,11 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "edU" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/west, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/grimy, /area/station/hallway/primary/fore) "eeb" = ( @@ -12907,6 +12921,9 @@ }, /obj/machinery/light/directional/south, /obj/machinery/light_switch/directional/south, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "ero" = ( @@ -14348,6 +14365,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/showroomfloor, /area/station/medical/treatment_center) "eQf" = ( @@ -16649,6 +16668,7 @@ }, /obj/machinery/light/directional/east, /obj/effect/turf_decal/box, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/showroomfloor, /area/station/medical/treatment_center) "fzJ" = ( @@ -17392,6 +17412,9 @@ }, /obj/structure/cable, /obj/effect/turf_decal/box, +/obj/structure/chair{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "fKx" = ( @@ -17668,18 +17691,16 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/bitrunning/den) "fOt" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "fOu" = ( @@ -17736,7 +17757,7 @@ pixel_y = -30 }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 }, /turf/open/floor/iron/stairs/left{ dir = 4 @@ -18130,10 +18151,10 @@ /turf/open/floor/plating, /area/station/medical/medbay/central) "fVJ" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/fore) "fVM" = ( @@ -18244,6 +18265,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "fYf" = ( @@ -19028,10 +19052,10 @@ /turf/open/floor/carpet/green, /area/station/security/detectives_office) "glY" = ( +/obj/machinery/airalarm/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/grimy, /area/station/hallway/primary/fore) "gmj" = ( @@ -20701,7 +20725,6 @@ /turf/open/floor/iron/dark, /area/station/security/office) "gNq" = ( -/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/stasis{ dir = 1 }, @@ -20713,6 +20736,7 @@ dir = 8 }, /obj/machinery/light/directional/west, +/obj/machinery/defibrillator_mount/directional/west, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) "gNy" = ( @@ -25188,18 +25212,16 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "idh" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - name = "chapel sorting disposal pipe" - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/siding/white{ dir = 4 }, -/obj/effect/mapping_helpers/mail_sorting/service/chapel, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "idq" = ( @@ -25404,6 +25426,7 @@ }, /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark, /area/station/medical/morgue) "igg" = ( @@ -28126,6 +28149,14 @@ /obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/iron/dark, /area/station/maintenance/department/crew_quarters/bar) +"iUQ" = ( +/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, +/obj/machinery/door/airlock/grunge{ + name = "Morgue" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/fore) "iUT" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/starboard/fore) @@ -29002,8 +29033,10 @@ name = "medical bed" }, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/defibrillator_mount/directional/south, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 }, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) @@ -31415,6 +31448,9 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, +/obj/machinery/camera/directional/east{ + c_tag = "Evidence Closet" + }, /turf/open/floor/iron/dark, /area/station/security/brig) "kbv" = ( @@ -32583,7 +32619,6 @@ dir = 8 }, /obj/item/radio/intercom/directional/north, -/obj/structure/sign/departments/medbay/alt/directional/west, /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) @@ -33080,12 +33115,12 @@ /turf/open/floor/iron/dark, /area/station/engineering/main) "kHw" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/treatment_center) "kHG" = ( @@ -35304,6 +35339,9 @@ dir = 8 }, /obj/machinery/airalarm/directional/south, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "lpf" = ( @@ -36502,6 +36540,13 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/item/storage/box/bodybags{ + pixel_y = 2 + }, +/obj/item/storage/box/bodybags{ + pixel_x = 4; + pixel_y = 6 + }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "lHD" = ( @@ -37492,14 +37537,14 @@ name = "medical camera"; network = list("ss13","medical") }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 1 }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "mbh" = ( @@ -39239,15 +39284,29 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) "mEt" = ( -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 +/obj/structure/table/glass, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = -4; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 13 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/reagent_containers/dropper, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, -/obj/machinery/computer/department_orders/medical, -/obj/effect/turf_decal/box, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/iron/dark, /area/station/medical/medbay/central) "mEH" = ( /obj/effect/turf_decal/box/corners, @@ -39675,11 +39734,15 @@ /turf/open/floor/iron/dark, /area/station/security/office) "mMa" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 }, -/turf/open/floor/iron/showroomfloor, +/obj/effect/turf_decal/bot, +/obj/structure/frame/computer{ + anchored = 1; + dir = 8 + }, +/turf/open/floor/iron/dark, /area/station/medical/treatment_center) "mMb" = ( /obj/effect/turf_decal/delivery, @@ -40452,8 +40515,23 @@ icon_state = "plant-14"; pixel_y = 11 }, +/obj/machinery/camera/directional/north{ + name = "bathroom camera" + }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) +"mYe" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/cable, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/central) "mYv" = ( /obj/effect/turf_decal/siding/thinplating/dark/end{ dir = 8 @@ -41423,16 +41501,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"nqm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/grunge{ - name = "Morgue" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/morgue, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "nqn" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/firecloset, @@ -43943,10 +44011,11 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/sign/departments/medbay/alt/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "oiu" = ( @@ -44663,12 +44732,14 @@ /turf/open/floor/iron/dark, /area/station/service/bar) "ovN" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/navigate_destination/chapel, /obj/structure/transit_tube/station/dispenser/reverse/flipped{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron/grimy, /area/station/hallway/primary/fore) "owm" = ( @@ -46812,15 +46883,16 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "phL" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, /obj/machinery/door/window{ dir = 4 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/corner, /turf/open/floor/iron/dark, /area/station/medical/morgue) "phQ" = ( @@ -47604,6 +47676,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/dark, /area/station/medical/morgue) "prn" = ( @@ -48245,9 +48319,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "pDs" = ( -/obj/effect/turf_decal/stripes/white/corner{ - dir = 4 - }, /obj/effect/turf_decal/stripes/white/corner{ dir = 1 }, @@ -48257,6 +48328,9 @@ /obj/effect/mapping_helpers/dead_body_placer, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/red/corner{ + dir = 4 + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/medical/morgue) @@ -49514,14 +49588,11 @@ /turf/open/floor/iron, /area/station/security/brig) "pYb" = ( -/obj/structure/bodycontainer/morgue{ - dir = 8 - }, -/obj/effect/turf_decal/bot_white, /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/table/optable, /turf/open/floor/iron/dark, /area/station/medical/morgue) "pYm" = ( @@ -54056,6 +54127,7 @@ /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/showroomfloor, /area/station/medical/treatment_center) "ruW" = ( @@ -54895,6 +54967,9 @@ /obj/structure/sign/departments/holy{ pixel_y = 30 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/stairs/right{ dir = 4 }, @@ -55322,8 +55397,19 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) +"rOm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/fore) "rOq" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -60867,6 +60953,9 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/treatment_center) "tAI" = ( @@ -61295,6 +61384,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "tIu" = ( @@ -63273,6 +63365,13 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) +"unN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/grimy, +/area/station/hallway/primary/fore) "unQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -64995,15 +65094,14 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "uTT" = ( -/obj/structure/bodycontainer/morgue{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/effect/turf_decal/bot_white, /obj/machinery/light/small/directional/north, /obj/structure/sign/poster/contraband/random/directional/east, +/obj/machinery/computer/operating{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/medical/morgue) "uUk" = ( @@ -66263,6 +66361,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/port) +"vqc" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "vqe" = ( /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/dirt, @@ -66832,10 +66935,11 @@ /turf/open/floor/iron/dark, /area/station/service/janitor) "vxZ" = ( -/obj/structure/bodycontainer/morgue, /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/iron/dark, /area/station/medical/morgue) "vyl" = ( @@ -67507,6 +67611,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/north{ + c_tag = "Security Office Lockers" + }, /turf/open/floor/iron, /area/station/hallway/primary/aft) "vGY" = ( @@ -67995,6 +68102,9 @@ /area/station/maintenance/port/greater) "vNy" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/treatment_center) "vNB" = ( @@ -68857,6 +68967,7 @@ /obj/effect/turf_decal/siding/blue{ dir = 9 }, +/obj/machinery/defibrillator_mount/directional/west, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) "vZu" = ( @@ -70784,14 +70895,13 @@ /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "wEJ" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/structure/cable, +/obj/effect/turf_decal/box, +/obj/machinery/computer/department_orders/medical, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/iron/dark, /area/station/medical/medbay/central) "wEM" = ( /obj/effect/turf_decal/stripes/line{ @@ -71921,6 +72031,15 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"wVl" = ( +/obj/structure/cable, +/obj/machinery/modular_computer/console/preset/cargochat/medical, +/obj/effect/turf_decal/box, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/medbay/central) "wVA" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/corner, @@ -72189,14 +72308,16 @@ /area/station/maintenance/fore) "xau" = ( /obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +/obj/effect/turf_decal/bot, +/obj/structure/bed/pod{ + desc = "An old medical bed, just waiting for replacement with something up to date."; + dir = 4; + name = "medical bed" }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/iron/dark, /area/station/medical/treatment_center) "xav" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72398,13 +72519,17 @@ /turf/open/floor/iron/dark, /area/station/service/lawoffice) "xef" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/station/medical/morgue) "xeh" = ( @@ -73554,19 +73679,15 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/office) "xwU" = ( -/obj/structure/table, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/item/storage/box/bodybags{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 2 - }, /obj/machinery/light/small/directional/east, /obj/machinery/light_switch/directional/east, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/station/medical/morgue) "xxk" = ( @@ -75640,6 +75761,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -96509,9 +96633,9 @@ wEJ kRu eAx fKw +mYe rlR -rlR -rlR +eco owm jrs cMT @@ -96762,7 +96886,7 @@ kDw kDw knL jop -wEJ +wVl rZE loX rFt @@ -98036,7 +98160,7 @@ eTt hxf ovN edU -nki +iUQ fOt dbK pDs @@ -98291,7 +98415,7 @@ gcb dDO fbm uOB -uOB +unN glY cXZ uTT @@ -98805,13 +98929,13 @@ uNO xLX efG yeY -eFR +vqc fVJ oLs hsJ dkh jUU -nqm +dkh dkh dkh uVJ @@ -99063,7 +99187,7 @@ dHc qlC tbn lLp -aWI +rOm tjf nCA cXZ From 0f56f2468e61c7e134548c92d5257668e94bc70d Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 19 Mar 2024 22:02:28 +0100 Subject: [PATCH 33/59] adds cryoxadone beakers and mannitol to cryo (lol) --- _maps/map_files/KiloStation/KiloStation.dmm | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 59ca6cb38ccd..e93ac57e7ea6 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -53179,6 +53179,28 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = 6 + }, +/obj/item/storage/pill_bottle/mannitol{ + pixel_x = 8 + }, /turf/open/floor/iron/dark, /area/station/medical/cryo) "rhy" = ( From 5a166b7a3fcdda2a245d68ae7e4c00dc207cdb02 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Wed, 20 Mar 2024 14:02:38 +0100 Subject: [PATCH 34/59] remakes the artsci lab because it was ugly, cupcake upgrade --- _maps/map_files/KiloStation/KiloStation.dmm | 1300 ++++++++++--------- 1 file changed, 666 insertions(+), 634 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index e93ac57e7ea6..b0925904acc7 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1072,6 +1072,12 @@ }, /turf/open/floor/plating, /area/station/science/robotics/lab) +"amF" = ( +/obj/machinery/atmospherics/components/unary/artifact_heatingpad{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/explab) "amG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/girder, @@ -2671,16 +2677,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/science/xenobiology) -"aQn" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/artsci{ - pixel_y = 5; - pixel_x = 8 - }, -/obj/item/analysis_bin, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark, -/area/station/science/explab) "aQs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3648,6 +3644,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/engineering/atmos) +"bly" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "blA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5809,7 +5809,14 @@ /turf/open/floor/iron, /area/station/security/brig) "cbn" = ( -/obj/effect/turf_decal/tile/purple, +/obj/machinery/asteroid_magnet{ + center_x = 128; + center_y = 58; + area_size = 3 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "cbp" = ( @@ -5841,6 +5848,13 @@ dir = 4 }, /area/station/service/chapel) +"cbL" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "ccd" = ( /obj/structure/railing{ dir = 4 @@ -6033,14 +6047,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) -"cef" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/plasma, -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine, -/area/station/science/explab) "ceg" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -8050,6 +8056,14 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) +"cMF" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "cMT" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/stripes/corner{ @@ -8205,8 +8219,9 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "cRm" = ( -/obj/effect/artifact_spawner, -/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "cRq" = ( @@ -8770,14 +8785,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/security/detectives_office) -"dar" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/turf/open/space/basic, -/area/space/nearstation) "daC" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/effect/decal/cleanable/dirt, @@ -9518,11 +9525,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/safe) -"dmy" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark, -/area/station/science/explab) "dmA" = ( /obj/effect/turf_decal/tile/purple, /obj/item/kirbyplants{ @@ -11125,14 +11127,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) -"dMU" = ( -/obj/machinery/atmospherics/components/unary/artifact_heatingpad{ - dir = 8 - }, -/obj/item/toy/plush/lizard_plushie, -/obj/effect/decal/cleanable/blood/old, -/turf/open/floor/engine, -/area/station/science/explab) "dMW" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/water_source/puddle, @@ -11178,12 +11172,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"dNH" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/explab) "dNL" = ( /obj/machinery/computer/security/telescreen/interrogation{ name = "isolation room monitor"; @@ -11312,17 +11300,6 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/security/upper) -"dQb" = ( -/obj/machinery/door/airlock/external{ - name = "Experimentation Science Lab"; - space_dir = 4; - dir = 4 - }, -/obj/structure/fans/tiny, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/science/explab) "dQx" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -12072,6 +12049,18 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) +"edy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "edU" = ( /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/west, @@ -14643,6 +14632,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"eVN" = ( +/obj/machinery/artifact_xray, +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine, +/area/station/science/explab) "eVP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/corner{ @@ -17579,6 +17573,15 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) +"fMJ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/structure/cable, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "fML" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -17592,12 +17595,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) -"fMR" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 6 - }, -/turf/open/floor/engine, -/area/station/science/explab) "fNd" = ( /obj/machinery/door/airlock/medical{ id_tag = "Unit_3"; @@ -17690,6 +17687,18 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/iron/dark/smooth_large, /area/station/bitrunning/den) +"fOn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "fOt" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -17844,6 +17853,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) +"fQv" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + name = "Artifact Science Lab"; + space_dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/turf/open/floor/plating, +/area/station/science/explab) "fQx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -18105,13 +18125,6 @@ /obj/structure/noticeboard/directional/west, /turf/open/floor/iron, /area/station/service/hydroponics) -"fVh" = ( -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 4; - piping_layer = 2 - }, -/turf/open/floor/plating, -/area/space/nearstation) "fVj" = ( /obj/machinery/door/airlock/public/glass{ name = "Docking Hallway" @@ -18403,10 +18416,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"gaY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, -/turf/open/floor/engine, -/area/station/science/explab) "gba" = ( /obj/machinery/light/directional/west, /obj/structure/extinguisher_cabinet/directional/north{ @@ -19695,11 +19704,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/closed/wall, /area/station/security/checkpoint/engineering) -"gwB" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/space/basic, -/area/space/nearstation) "gwI" = ( /obj/structure/chair{ dir = 8 @@ -22558,13 +22562,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) -"hpt" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - layer = 4.1 - }, -/turf/open/space/basic, -/area/space/nearstation) "hpu" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -24339,12 +24336,6 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/engine/telecomms, /area/station/tcommsat/server) -"hQZ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/space/basic, -/area/space/nearstation) "hRa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -25545,12 +25536,7 @@ /turf/open/floor/plating, /area/station/security/office) "ijq" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, +/obj/effect/turf_decal/stripes/corner, /obj/structure/rack, /obj/item/storage/bag/ore, /obj/item/storage/bag/ore, @@ -25558,6 +25544,10 @@ /obj/item/pickaxe, /obj/item/pickaxe, /obj/item/pickaxe, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "ijr" = ( @@ -26899,6 +26889,11 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) +"iCl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "iCA" = ( /turf/open/floor/grass, /area/station/service/hydroponics) @@ -28792,6 +28787,14 @@ }, /turf/open/floor/iron/dark, /area/station/science/research) +"jeV" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "jeZ" = ( /obj/item/kirbyplants{ icon_state = "plant-05" @@ -30182,6 +30185,18 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"jGp" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/effect/turf_decal/tile/purple/opposingcorners{ + dir = 8 + }, +/obj/machinery/suit_storage_unit/standard_unit, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "jGt" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -30562,20 +30577,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) -"jLt" = ( -/obj/effect/landmark/start/scientist, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/explab) "jLy" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -32631,6 +32632,10 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/miningoffice) +"kyo" = ( +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "kyR" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -33575,6 +33580,7 @@ "kOp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/start/scientist, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "kOt" = ( @@ -36976,16 +36982,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/command/bridge) -"lPn" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/explab) "lPU" = ( /obj/machinery/shower/directional/west, /turf/open/floor/plastic, @@ -36998,10 +36994,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/cargo/warehouse) -"lQd" = ( -/obj/machinery/artifact_zapper, -/turf/open/floor/engine, -/area/station/science/explab) "lQj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/yellow{ @@ -38822,6 +38814,12 @@ "mvW" = ( /turf/open/floor/engine/plasma, /area/station/engineering/atmos) +"mwa" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "mwe" = ( /obj/machinery/smartfridge, /turf/closed/wall, @@ -39508,20 +39506,6 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) -"mHr" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/explab) "mHu" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -40361,14 +40345,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) -"mVF" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "mVL" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -41250,14 +41226,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/detectives_office) -"nma" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "nmo" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 @@ -41958,6 +41926,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"nwK" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "nwN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ @@ -41991,6 +41964,12 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) +"nxb" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/explab) "nxc" = ( /obj/machinery/door/poddoor/shutters{ dir = 1; @@ -42244,6 +42223,12 @@ "nCL" = ( /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"nCM" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "nCU" = ( /obj/effect/turf_decal/tile/green, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42839,17 +42824,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"nMm" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "nMB" = ( /obj/machinery/computer/records/security{ dir = 1 @@ -43057,10 +43031,9 @@ /turf/open/floor/engine, /area/station/science/xenobiology) "nQI" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 +/obj/structure/chair/office/light{ + dir = 1; + pixel_y = 3 }, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) @@ -45676,13 +45649,6 @@ }, /turf/open/floor/iron/grimy, /area/station/security/prison) -"oNi" = ( -/obj/machinery/artifact_xray, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/explab) "oNk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -49411,6 +49377,11 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +"pUo" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "pUA" = ( /obj/structure/table/reinforced, /obj/structure/disposalpipe/segment{ @@ -49873,6 +49844,13 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +"qcp" = ( +/obj/machinery/artifact_zapper{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/south, +/turf/open/floor/engine, +/area/station/science/explab) "qcv" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -50377,13 +50355,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/commons/fitness/recreation) -"qkZ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 9 - }, -/turf/open/space/basic, -/area/space/nearstation) "qld" = ( /obj/effect/turf_decal/box, /obj/machinery/light/directional/north, @@ -50679,16 +50650,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard) -"qqo" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/explab) "qqw" = ( /turf/closed/wall/r_wall, /area/station/security/warden) @@ -51360,18 +51321,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"qDh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/explab) "qDp" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -52123,6 +52072,12 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) +"qQJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/explab) "qQQ" = ( /obj/effect/turf_decal/siding/blue{ dir = 1 @@ -52630,6 +52585,23 @@ /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) +"qXp" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/camera/directional/west{ + c_tag = "Ordnance Mixing Lab"; + name = "science camera"; + network = list("ss13","rd") + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "qXv" = ( /obj/effect/turf_decal/siding/blue{ dir = 1 @@ -56982,6 +56954,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, /area/station/maintenance/central) +"soS" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/engine, +/area/station/science/explab) "soZ" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/condiment/saltshaker{ @@ -59838,6 +59815,10 @@ /obj/structure/chair/sofa/corp, /turf/open/floor/iron/grimy, /area/station/hallway/primary/fore) +"tju" = ( +/obj/structure/lattice/catwalk, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "tjv" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64095,6 +64076,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"uBC" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "uBO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue, @@ -64233,6 +64225,25 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central) +"uEz" = ( +/obj/structure/table, +/obj/item/analysis_bin, +/obj/item/book/manual/wiki/artsci{ + pixel_y = 5; + pixel_x = 8 + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners{ + dir = 8 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -8; + pixel_y = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "uEC" = ( /obj/effect/turf_decal/siding/wideplating/dark/corner, /turf/open/floor/iron/dark, @@ -65953,7 +65964,8 @@ "vib" = ( /obj/effect/decal/cleanable/dirt, /mob/living/basic/pet/dog/pug{ - real_name = "Cupcake" + real_name = null; + name = "Cupcake" }, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating, @@ -66183,6 +66195,10 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"vlP" = ( +/obj/structure/lattice, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "vme" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -66927,8 +66943,14 @@ /area/station/security/checkpoint/medical) "vxK" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing, /obj/structure/cable, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/space/basic, /area/space/nearstation) "vxL" = ( @@ -69450,6 +69472,19 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/service/bar/atrium) +"wgR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "wgS" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -69765,6 +69800,10 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/brig) +"wmc" = ( +/obj/effect/artifact_spawner, +/turf/open/floor/engine, +/area/station/science/explab) "wmj" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/bot, @@ -71341,6 +71380,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) +"wJi" = ( +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "wJj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/cardboard, @@ -71622,17 +71668,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) -"wOb" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4; - layer = 4.1 - }, -/obj/structure/railing{ - dir = 9 - }, -/turf/open/space/basic, -/area/space/nearstation) "wOk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -71713,6 +71748,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +"wPj" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "wPp" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -72017,15 +72057,6 @@ }, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/qm) -"wUx" = ( -/obj/machinery/asteroid_magnet{ - center_x = 128; - center_y = 58; - area_size = 3 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/explab) "wUU" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -72636,12 +72667,18 @@ /turf/open/floor/plating, /area/station/maintenance/department/security) "xfQ" = ( -/obj/effect/artifact_spawner, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners{ + dir = 8 + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/sign/poster/random/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "xfU" = ( @@ -74964,11 +75001,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"xSI" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "xSO" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral, @@ -118721,15 +118753,15 @@ aaa aaa aaa aaa -nMm -nma -nma -nma -nma -xSI +aaa +aaa +aaa +aaa +aaa +aaa vxK -aUz -aeU +fMJ +pUo aeu rZV fdM @@ -118978,16 +119010,16 @@ aaa aaa aaa aaa -mVF -acK -dar -dar -dar -dar -wOb aaa -aeU -aeU +aaa +aaa +aaa +aaa +aaa +aaa +aaa +uBC +pUo sJS fOh vib @@ -119235,8 +119267,7 @@ aaa aaa aaa aaa -mVF -hpt +aaa aaa aaa aaa @@ -119245,6 +119276,7 @@ aaa aaa aaa aeU +jeV sJS ljx tOP @@ -119492,16 +119524,16 @@ aaa aaa aaa aaa -mVF -qkZ aaa aaa aaa +acm aaa aaa aaa aaa aeU +jeV sJS pCD ltk @@ -119748,17 +119780,17 @@ aaa aaa aaa aaa -fVh -mVF -qkZ -aaa -aaa -aaa -aaa aaa aaa +aeo +acm +aeo +acm +aeo aaa aeU +aeU +jeV sJS iWW nbT @@ -120003,19 +120035,19 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa acK acK -gwB -hQZ acK acK acK -aaa -aaa -aaa -aaa -aaa -aeU +tju +tju +wJi +jeV sJS xOA wNh @@ -120254,25 +120286,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +oRy +oRy +oRy +oRy +oRy +oRy +oRy +oRy +oRy acK acK xKo +rZs +rZs +rZs xKo -dQb -xKo -xKo -acK -acK -aaa -aaa -aaa -aaa -aeU +tju +wPj +pUo rZV oca hwp @@ -120511,25 +120543,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy acK xKo xKo -cef -qDh -dmy +wmc +wmc +wmc xKo xKo -acK -aaa -aaa -aaa -aaa -aeU +wPj +mwa rZV sJS sJS @@ -120768,25 +120800,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -acK -rZs -fMR -gaY -mHr -dNH +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy +xKo +xKo xfQ -rZs -acK -aaa -aaa -aaa -aaa -aeU +fOn +fOn +fOn +qXp +xKo +xKo +mwa aeU aeU aeU @@ -121025,25 +121057,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -acK +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy rZs -iti -dMU -jLt -sre +uEz cRm -rZs -acK -aaa -aaa -aaa -aaa -aaa +kyo +sre +sre +cbL +cMF +xKo +mwa aeU aeU aeU @@ -121282,26 +121314,26 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -acK +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy rZs -lQd -iti -lPn cbn nQI -rZs -acK -aaa -aaa -aaa -aaa -aaa -aaa +sre +iCl +bly +nwK +nCM +fQv +mwa +aeU aaa aaa aeo @@ -121539,26 +121571,26 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -acK -xKo -xKo -oNi -qqo +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy +rZs ijq +edy +edy +edy +wgR +edy +jGp xKo -xKo -acK -aaa -aaa -aaa -aaa -aaa -aaa +tju +aeU aaa aaa aeo @@ -121796,26 +121828,26 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -acK -acK +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy xKo -wUx -sre -aQn xKo -acK -acK -aaa -aaa -aaa -aaa -aaa -aaa +eVN +iti +amF +iti +qcp +xKo +xKo +tju +aeU aaa aaa aeo @@ -122053,26 +122085,26 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +oRy +tqX +tqX +tqX +tqX +tqX +tqX +tqX +oRy acK xKo -rZs -rZs -rZs xKo -acK -aaa -aaa -aaa -aaa -aaa -aaa -aaa +soS +qQJ +nxb +xKo +xKo +tju +tju +aeU aeo aaa aeo @@ -122310,11 +122342,6 @@ aaa aaa aaa aaa -aaa -aaa -aaB -aaa -aaa oRy oRy oRy @@ -122324,12 +122351,17 @@ oRy oRy oRy oRy -aaa -aaa -aaa -aaa -aaa -aaa +acK +acK +xKo +rZs +rZs +rZs +xKo +tju +tju +vlP +aeU aeo acm acm @@ -122572,21 +122604,21 @@ aaa aaa aaa aaa -oRy -tqX -tqX -tqX -tqX -tqX -tqX -tqX -oRy -aaa aaa aaa aaa aaa aaa +acK +acK +acK +tju +tju +tju +tju +vlP +aeU +aeU aeo aaa aeo @@ -122694,156 +122726,156 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(182,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -aeu -dME -jvR -fII -cjI -dME -mDD -dME -dME -rvz -rVt -gDS -mDD +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +"} +(182,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +aeu +dME +jvR +fII +cjI +dME +mDD +dME +dME +rvz +rVt +gDS +mDD +acm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa acm -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -oRy -tqX -tqX -tqX -tqX -tqX -tqX -tqX -oRy -aaa -aaa -aaa -aaa -aaa -aaa +vQF +vQF +aeU +vlP +aeU +aeU +aeU aaQ aaa aeo @@ -123086,15 +123118,6 @@ aaa aaa aaa aaa -oRy -tqX -tqX -tqX -tqX -tqX -tqX -tqX -oRy aaa aaa aaa @@ -123103,6 +123126,15 @@ aaa aaa aaa aaa +aeU +aeU +aeU +aeU +aeU +aeU +aeU +aaa +aaa aaQ aaa aaa @@ -123343,21 +123375,21 @@ aaa aaa aaa aaa -oRy -tqX -tqX -tqX -tqX -tqX -tqX -tqX -oRy +aaa +aaB aaa aaa aaa aaa aaa aaa +aeU +aeU +aeU +aeU +aeU +aeU +aeU aaQ acm aaQ @@ -123600,15 +123632,6 @@ aaa aaa aaa aaa -oRy -tqX -tqX -tqX -tqX -tqX -tqX -tqX -oRy aaa aaa aaa @@ -123616,6 +123639,15 @@ aaa aaa aaa aaa +aaa +aeU +aeU +aeU +aeU +aeU +aeU +aaa +aaa aeo aaa aeo @@ -123857,15 +123889,6 @@ aaa aaa aaa aaa -oRy -tqX -tqX -tqX -tqX -tqX -tqX -tqX -oRy aaa aaa aaa @@ -123873,6 +123896,15 @@ aaa aaa aaa aaa +aaa +aeU +aeU +aeU +aeU +aeU +aeU +aaa +aaa aeo acm aaQ @@ -124114,17 +124146,17 @@ aeU aaa aaa aaa -oRy -tqX -tqX -tqX -tqX -tqX -tqX -tqX -oRy +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aeU +aeU +aeU aUz aeU aeU @@ -124371,15 +124403,15 @@ aeU aaa aaa aaa -oRy -oRy -oRy -oRy -oRy -oRy -oRy -oRy -oRy +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aeU aeU aeU aeu From 16a42e49398180f89935b6e26d0b7903221b0323 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Wed, 20 Mar 2024 14:04:39 +0100 Subject: [PATCH 35/59] decorations --- _maps/map_files/KiloStation/KiloStation.dmm | 46 +++++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index b0925904acc7..2a67a650e0bd 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1076,6 +1076,7 @@ /obj/machinery/atmospherics/components/unary/artifact_heatingpad{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/station/science/explab) "amG" = ( @@ -8222,6 +8223,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "cRq" = ( @@ -26316,6 +26318,7 @@ /turf/open/floor/iron, /area/station/security/office) "iti" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/station/science/explab) "itn" = ( @@ -26892,6 +26895,7 @@ "iCl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/box, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "iCA" = ( @@ -32634,6 +32638,7 @@ /area/station/cargo/miningoffice) "kyo" = ( /obj/effect/landmark/start/scientist, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "kyR" = ( @@ -40696,6 +40701,19 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"nbe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/science/explab) "nbg" = ( /obj/effect/turf_decal/siding/blue{ dir = 4 @@ -41929,6 +41947,7 @@ "nwK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "nwN" = ( @@ -52076,6 +52095,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/station/science/explab) "qQQ" = ( @@ -52600,6 +52620,7 @@ name = "science camera"; network = list("ss13","rd") }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "qXv" = ( @@ -57132,6 +57153,7 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "sre" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "srf" = ( @@ -58767,6 +58789,11 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/dark, /area/station/science/research) +"sQU" = ( +/obj/effect/artifact_spawner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/engine, +/area/station/science/explab) "sQZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/girder/displaced, @@ -72679,6 +72706,7 @@ }, /obj/machinery/airalarm/directional/north, /obj/structure/sign/poster/random/directional/west, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "xfU" = ( @@ -119532,7 +119560,7 @@ aaa aaa aaa aaa -aeU +aUz jeV sJS pCD @@ -120555,8 +120583,8 @@ oRy acK xKo xKo -wmc -wmc +sQU +sQU wmc xKo xKo @@ -120821,7 +120849,7 @@ xKo mwa aeU aeU -aeU +aUz vku aeu aeu @@ -121582,7 +121610,7 @@ tqX oRy rZs ijq -edy +nbe edy edy wgR @@ -122618,7 +122646,7 @@ tju tju vlP aeU -aeU +aUz aeo aaa aeo @@ -123131,7 +123159,7 @@ aeU aeU aeU aeU -aeU +coy aeU aaa aaa @@ -123384,7 +123412,7 @@ aaa aaa aaa aeU -aeU +aUz aeU aeU aeU @@ -123898,7 +123926,7 @@ aaa aaa aaa aeU -aeU +coy aeU aeU aeU From 5e10489984c3a5e9784b98cc8ad81679899b84e0 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 26 Mar 2024 22:47:21 +0100 Subject: [PATCH 36/59] console conflicts --- _maps/map_files/KiloStation/KiloStation.dmm | 68 ++------------------- 1 file changed, 6 insertions(+), 62 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5c2eb0fa1672..b508c355866f 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -5025,20 +5025,12 @@ /turf/open/floor/plating/rust, /area/station/maintenance/department/crew_quarters/bar) "bEj" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /obj/machinery/door/poddoor/preopen{ id = "hosspace"; name = "Space Blast Door" }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/modular_computer/preset/id{ - dir = 1 - }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/heads_quarters/hos) "bEv" = ( @@ -9780,14 +9772,6 @@ /obj/item/storage/pill_bottle/mannitol{ pixel_x = 8 }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/modular_computer/preset/id{ - dir = 8 - }, /obj/effect/turf_decal/bot, /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -12675,11 +12659,11 @@ /area/station/security/courtroom) "dYS" = ( /obj/structure/cable, -/obj/machinery/modular_computer/console/preset/cargochat/medical, /obj/effect/turf_decal/box, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/machinery/modular_computer/preset/cargochat/medical, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) "dZe" = ( @@ -14309,26 +14293,6 @@ "eAI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/modular_computer/preset/cargochat/medical{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "eAZ" = ( @@ -18922,9 +18886,6 @@ /turf/open/floor/plating, /area/station/medical/medbay/central) "fVH" = ( -/obj/machinery/modular_computer/console/preset/id{ - dir = 4 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, @@ -18935,6 +18896,9 @@ anon_tips_receiver = 1; can_send_announcements = 1 }, +/obj/machinery/modular_computer/preset/id{ + dir = 4 + }, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/cmo) "fVM" = ( @@ -40017,31 +39981,11 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "mMg" = ( -/obj/item/toy/figure/qm{ - pixel_x = -17 - }, /obj/structure/table, /obj/item/modular_computer/laptop, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/item/toy/figure/qm{ pixel_x = -17 }, -/obj/machinery/modular_computer/preset/id{ - dir = 1 - }, -/obj/machinery/button/door/directional/east{ - id = "qmprivacy"; - name = "Privacy Shutters Control"; - pixel_y = 38; - req_access = list("qm") - }, -/obj/machinery/keycard_auth/directional/east{ - pixel_y = 26 - }, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/qm) "mMj" = ( @@ -43232,7 +43176,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "nPo" = ( -/obj/machinery/modular_computer/console/preset/id{ +/obj/machinery/modular_computer/preset/id{ dir = 1 }, /turf/open/floor/wood, From e94fb744b41f06b3e0f82ebc74280070132c4a4d Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Wed, 27 Mar 2024 19:14:27 +0100 Subject: [PATCH 37/59] changed windows color in qm's office --- _maps/map_files/KiloStation/KiloStation.dmm | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index b508c355866f..9a813366114d 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1477,7 +1477,7 @@ /turf/open/floor/iron/dark/side{ dir = 4 }, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "arz" = ( /obj/effect/decal/cleanable/blood/old, /obj/item/tank/internals/emergency_oxygen/empty, @@ -1561,7 +1561,7 @@ name = "Privacy Shutters" }, /turf/open/floor/plating, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "atB" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -12610,7 +12610,7 @@ }, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "dXN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15996,7 +15996,7 @@ }, /obj/structure/cable, /turf/open/floor/wood, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "fdC" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -20322,7 +20322,7 @@ name = "Quartermaster's Office" }, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "gtC" = ( /obj/machinery/conveyor{ dir = 4; @@ -21024,7 +21024,7 @@ }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "gER" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -28092,7 +28092,7 @@ }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "iNU" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32894,7 +32894,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "kwM" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/yellow, @@ -34448,7 +34448,7 @@ /obj/machinery/computer/security/qm, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "kXw" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/cable, @@ -39987,7 +39987,7 @@ pixel_x = -17 }, /turf/open/floor/carpet/orange, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "mMj" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall/rust, @@ -41243,7 +41243,7 @@ /area/station/science/server) "nfY" = ( /turf/closed/wall, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "ngi" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43466,7 +43466,7 @@ pixel_y = 7 }, /turf/open/floor/carpet/orange, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "nTA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, @@ -47736,7 +47736,7 @@ req_access = list("qm") }, /turf/open/floor/carpet/orange, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "pqS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -51686,7 +51686,7 @@ dir = 8 }, /turf/open/floor/carpet/orange, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "qGi" = ( /obj/effect/turf_decal/delivery, /obj/structure/table, @@ -58175,7 +58175,7 @@ dir = 6 }, /turf/open/floor/wood, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "sGJ" = ( /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/showroomfloor, @@ -61251,7 +61251,7 @@ dir = 9 }, /turf/open/floor/wood, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "tDg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/stripes/line, @@ -61902,7 +61902,7 @@ name = "Quartermaster's Office" }, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "tPh" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -65184,7 +65184,7 @@ }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "uNv" = ( /obj/machinery/power/turbine/turbine_outlet, /turf/open/floor/engine, @@ -65273,7 +65273,7 @@ /obj/item/radio/intercom/directional/north, /obj/machinery/pdapainter/supply, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "uPm" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -67538,7 +67538,7 @@ }, /obj/item/lead_pipe, /turf/open/floor/iron/dark, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "vBi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -70827,7 +70827,7 @@ }, /obj/machinery/holopad, /turf/open/floor/wood, -/area/station/command/heads_quarters/qm) +/area/station/cargo/quartermaster) "wwG" = ( /turf/closed/wall/r_wall/rust, /area/station/science/ordnance/office) From e7d84225540ede847b8dd56ad98b6eb95e7225c8 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Thu, 28 Mar 2024 23:53:56 +0100 Subject: [PATCH 38/59] changed floor in ranch, oops I synced too fast --- _maps/map_files/KiloStation/KiloStation.dmm | 50 ++++++++++++--------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 9a813366114d..d68f5781812d 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -843,7 +843,7 @@ /obj/structure/railing{ dir = 8 }, -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "aka" = ( /turf/closed/wall/r_wall, @@ -3060,9 +3060,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, /area/station/service/hydroponics) "aVH" = ( @@ -3626,9 +3624,7 @@ pixel_y = 8 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/grass, /area/station/service/hydroponics) "bfA" = ( @@ -4542,7 +4538,7 @@ /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "bvg" = ( -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "bvk" = ( /obj/effect/landmark/secequipment, @@ -7835,7 +7831,7 @@ dir = 1 }, /obj/structure/flora/bush/sparsegrass/style_random, -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "cwl" = ( /obj/structure/girder, @@ -8217,7 +8213,8 @@ /obj/structure/railing{ dir = 1 }, -/turf/open/misc/sandy_dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "cGl" = ( /obj/machinery/disposal/bin, @@ -15000,7 +14997,7 @@ /area/station/hallway/primary/central/fore) "eMj" = ( /obj/machinery/light/small/directional/south, -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "eMr" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -18770,7 +18767,10 @@ /area/station/ai_monitored/command/storage/satellite) "fTc" = ( /mob/living/basic/chicken, -/turf/open/misc/sandy_dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "fTr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20632,6 +20632,13 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +"gyo" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/sandy_dirt, +/area/station/service/hydroponics) "gyv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -21440,7 +21447,7 @@ "gMa" = ( /obj/structure/flora/bush/flowers_br/style_random, /mob/living/basic/chicken, -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "gMg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22217,7 +22224,7 @@ /obj/structure/railing{ dir = 1 }, -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "hbT" = ( /obj/effect/decal/cleanable/dirt, @@ -29619,7 +29626,7 @@ /area/station/medical/storage) "jor" = ( /obj/structure/nestbox, -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "joC" = ( /obj/effect/turf_decal/siding/wood{ @@ -40486,7 +40493,10 @@ layer = 4.1 }, /obj/structure/flora/bush/sparsegrass/style_random, -/turf/open/misc/sandy_dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "mTz" = ( /obj/structure/cable, @@ -52820,7 +52830,7 @@ dir = 8 }, /mob/living/basic/chicken, -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "qYO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57434,7 +57444,7 @@ /obj/structure/flora/bush/sparsegrass/style_random, /obj/machinery/light/directional/east, /mob/living/basic/chicken, -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "stO" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, @@ -60692,7 +60702,7 @@ /area/station/maintenance/starboard/fore) "ttI" = ( /obj/structure/flora/bush/flowers_br/style_random, -/turf/open/misc/sandy_dirt, +/turf/open/floor/sandy_dirt, /area/station/service/hydroponics) "ttJ" = ( /obj/structure/window/reinforced/spawner/directional/south, @@ -111136,7 +111146,7 @@ gVM wDf uHT aVF -hbK +gyo fTc arl xWm From 96c2f8f7743aa08b403369006cec6017b2765c24 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Fri, 5 Apr 2024 13:27:16 +0200 Subject: [PATCH 39/59] null wars + crate shelves in cargo --- _maps/map_files/KiloStation/KiloStation.dmm | 151 ++++++++++---------- 1 file changed, 77 insertions(+), 74 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index d68f5781812d..9857187d0915 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1102,13 +1102,13 @@ name = "Robotics Privacy Shutters" }, /obj/machinery/door/window/left/directional/north{ - name = "Robotics Desk"; - req_access = list("robotics") + name = "Robotics Desk" }, /obj/structure/desk_bell{ pixel_x = -7; pixel_y = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/plating, /area/station/science/robotics/lab) "amG" = ( @@ -3042,8 +3042,7 @@ /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/loading_area, /obj/machinery/door/window/right/directional/south{ - name = "Trash Chute"; - req_access = list("janitor") + name = "Trash Chute" }, /obj/item/reagent_containers/cup/bucket, /obj/item/mop, @@ -3052,6 +3051,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/iron, /area/station/service/janitor) "aVF" = ( @@ -3155,9 +3155,9 @@ /obj/item/food/grown/tomato, /obj/machinery/door/firedoor, /obj/machinery/door/window/right/directional/west{ - name = "Hydroponics Desk"; - req_access = list("hydroponics") + name = "Hydroponics Desk" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/iron, /area/station/service/hydroponics) "aYk" = ( @@ -4345,11 +4345,11 @@ }, /obj/machinery/door/window/right/directional/west{ dir = 4; - name = "Cargo Desk"; - req_access = list("shipping") + name = "Cargo Desk" }, /obj/item/flashlight, /obj/effect/spawner/random/bureaucracy/birthday_wrap, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/plating, /area/station/cargo/office) "bsI" = ( @@ -4908,14 +4908,14 @@ }, /obj/machinery/door/window/left/directional/west{ dir = 4; - name = "Mailroom Desk"; - req_access = list("shipping") + name = "Mailroom Desk" }, /obj/effect/landmark/start/hangover, /obj/structure/desk_bell{ pixel_x = -8; pixel_y = 10 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/iron, /area/station/cargo/sorting) "bCA" = ( @@ -10207,10 +10207,10 @@ /obj/machinery/door/firedoor/heavy, /obj/machinery/door/window/left/directional/north{ dir = 2; - name = "Chemistry Desk"; - req_access = list("pharmacy") + name = "Chemistry Desk" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy, /turf/open/floor/plating, /area/station/medical/pharmacy) "dlI" = ( @@ -10657,6 +10657,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) "dry" = ( @@ -15825,9 +15826,9 @@ location = "Kitchen" }, /obj/machinery/door/window/left/directional/north{ - name = "Kitchen Delivery Access"; - req_access = list("kitchen") + name = "Kitchen Delivery Access" }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "faZ" = ( @@ -15895,10 +15896,10 @@ }, /obj/machinery/door/window/left/directional/east{ dir = 1; - name = "Research and Development Delivery Access"; - req_access = list("science") + name = "Research and Development Delivery Access" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "fcs" = ( @@ -18330,8 +18331,7 @@ }, /obj/machinery/door/window/left/directional/south{ dir = 8; - name = "Atmospherics Delivery Access"; - req_access = list("atmospherics") + name = "Atmospherics Delivery Access" }, /obj/machinery/door/poddoor/preopen{ id = "atmos"; @@ -18341,6 +18341,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage/gas) "fMB" = ( @@ -18926,13 +18927,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/window/brigdoor/right/directional/north{ id = "Cell 4"; - name = "Cell 4"; - req_access = list("security") + name = "Cell 4" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "fWq" = ( @@ -19746,13 +19747,13 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/yellow, /obj/machinery/door/window/right/directional/south{ - name = "Cargo Disposal"; - req_access = list("shipping") + name = "Cargo Disposal" }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/iron, /area/station/cargo/sorting) "gjV" = ( @@ -19943,8 +19944,7 @@ dir = 8 }, /obj/machinery/door/window/left/directional/south{ - name = "Trash Chute"; - req_access = list("janitor") + name = "Trash Chute" }, /obj/machinery/conveyor_switch/oneway{ dir = 4; @@ -19959,6 +19959,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/iron, /area/station/service/janitor) "gog" = ( @@ -20132,9 +20133,9 @@ /obj/item/pen, /obj/machinery/door/firedoor, /obj/machinery/door/window/left/directional/west{ - name = "Hydroponics Desk"; - req_access = list("hydroponics") + name = "Hydroponics Desk" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/iron, /area/station/service/hydroponics) "gqn" = ( @@ -20598,13 +20599,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/window/brigdoor/right/directional/north{ id = "Cell 3"; - name = "Cell 3"; - req_access = list("security") + name = "Cell 3" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "gxU" = ( @@ -21505,13 +21506,13 @@ /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, /obj/machinery/door/window/left/directional/east{ - name = "Service Hall Delivery Access"; - req_access = list("service") + name = "Service Hall Delivery Access" }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=4"; location = "Bar" }, +/obj/effect/mapping_helpers/airlock/access/all/service/general, /turf/open/floor/iron/dark, /area/station/maintenance/department/crew_quarters/bar) "gNE" = ( @@ -22968,12 +22969,12 @@ "hnl" = ( /obj/machinery/door/window/left/directional/north{ dir = 2; - name = "Cargo Delivery Access"; - req_access = list("shipping") + name = "Cargo Delivery Access" }, /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "hnw" = ( @@ -25893,7 +25894,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/cargo_technician, +/obj/structure/cargo_shelf, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/cargo/storage) "ihy" = ( @@ -27225,11 +27227,11 @@ /obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor/left/directional/north{ dir = 2; - name = "Brig Control Desk"; - req_access = list("armory") + name = "Brig Control Desk" }, /obj/item/folder/red, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plating, /area/station/security/warden) "iBD" = ( @@ -27478,13 +27480,13 @@ dir = 8 }, /obj/machinery/door/window/right/directional/west{ - name = "Library Desk"; - req_access = list("library") + name = "Library Desk" }, /obj/item/clipboard, /obj/item/toy/figure/curator, /obj/item/pen/fountain, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/iron/dark, /area/station/service/library) "iFR" = ( @@ -36748,13 +36750,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/window/brigdoor/right/directional/north{ id = "Cell 1"; - name = "Cell 1"; - req_access = list("security") + name = "Cell 1" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "lIr" = ( @@ -38866,13 +38868,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/window/brigdoor/right/directional/north{ id = "Cell 5"; - name = "Cell 5"; - req_access = list("security") + name = "Cell 5" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "mrR" = ( @@ -39985,6 +39987,7 @@ /obj/machinery/door/window/right/directional/west, /obj/structure/window/reinforced/spawner/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron/dark, /area/station/command/bridge) "mMg" = ( @@ -45023,10 +45026,10 @@ location = "Robotics" }, /obj/machinery/door/window/left/directional/east{ - name = "Robotics Delivery Access"; - req_access = list("robotics") + name = "Robotics Delivery Access" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/access/all/science/robotics, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) "oyA" = ( @@ -45929,8 +45932,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/door/window/right/directional/south{ dir = 4; - name = "Mail Chute"; - req_access = list("shipping") + name = "Mail Chute" }, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -45938,6 +45940,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/iron, /area/station/cargo/sorting) "oOW" = ( @@ -48978,13 +48981,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/window/brigdoor/right/directional/north{ id = "Cell 6"; - name = "Cell 6"; - req_access = list("security") + name = "Cell 6" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "pMw" = ( @@ -49326,8 +49329,7 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/yellow, /obj/machinery/door/window/left/directional/south{ - name = "Cargo Disposal"; - req_access = list("shipping") + name = "Cargo Disposal" }, /obj/machinery/conveyor_switch/oneway{ id = "packageSort2"; @@ -49348,6 +49350,7 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/iron, /area/station/cargo/sorting) "pRw" = ( @@ -50163,10 +50166,10 @@ location = "Hydroponics" }, /obj/machinery/door/window/left/directional/east{ - req_access = list("hydroponics"); name = "HydroponicsDeliveryAccess" }, /obj/structure/plasticflaps/opaque, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "qfS" = ( @@ -52204,13 +52207,13 @@ name = "Atmospherics Blast Door" }, /obj/machinery/door/window/right/directional/west{ - name = "Atmospherics Desk"; - req_access = list("atmospherics") + name = "Atmospherics Desk" }, /obj/structure/desk_bell{ pixel_x = 8; pixel_y = 10 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/station/engineering/atmos/storage/gas) "qPz" = ( @@ -53461,8 +53464,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/window/left/directional/west{ dir = 4; - name = "Cargo Desk"; - req_access = list("shipping") + name = "Cargo Desk" }, /obj/item/clipboard{ pixel_x = 3; @@ -53476,6 +53478,7 @@ pixel_x = -8; pixel_y = 10 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/plating, /area/station/cargo/office) "riW" = ( @@ -57553,11 +57556,9 @@ /area/station/security/lockers) "svW" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/obj/item/clothing/gloves/cargo_gauntlet, -/obj/item/clothing/gloves/cargo_gauntlet, -/obj/item/clothing/gloves/cargo_gauntlet, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/structure/cargo_shelf, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/cargo/storage) "svZ" = ( @@ -59125,13 +59126,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/window/brigdoor/right/directional/north{ id = "Cell 2"; - name = "Cell 2"; - req_access = list("security") + name = "Cell 2" }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "sVh" = ( @@ -60486,8 +60487,7 @@ }, /obj/machinery/door/window/right/directional/north{ dir = 4; - name = "Engineering Delivery Access"; - req_access = list("engineering") + name = "Engineering Delivery Access" }, /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -60498,6 +60498,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/iron/dark, /area/station/engineering/lobby) "tpY" = ( @@ -62041,8 +62042,7 @@ }, /obj/machinery/door/window/left/directional/east{ dir = 8; - name = "Ore Redemtion Window"; - req_access = list("mineral_storeroom") + name = "Ore Redemtion Window" }, /turf/open/floor/plating, /area/station/cargo/office) @@ -63216,9 +63216,9 @@ /obj/item/folder/red, /obj/item/pen, /obj/machinery/door/window/brigdoor/right/directional/west{ - name = "Armoury Desk"; - req_access = list("armory") + name = "Armoury Desk" }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/plating, /area/station/ai_monitored/security/armory) "ujO" = ( @@ -64800,8 +64800,7 @@ name = "Engineering Blast Doors" }, /obj/machinery/door/window/left/directional/east{ - name = "Engineering Desk"; - req_access = list("engineering") + name = "Engineering Desk" }, /obj/structure/desk_bell{ pixel_x = -7; @@ -64810,6 +64809,7 @@ /obj/item/folder/yellow{ pixel_x = 3 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/plating, /area/station/engineering/lobby) "uHF" = ( @@ -70975,6 +70975,9 @@ /obj/item/folder/red, /obj/item/hand_labeler, /obj/item/hand_labeler, +/obj/item/clothing/gloves/cargo_gauntlet, +/obj/item/clothing/gloves/cargo_gauntlet, +/obj/item/clothing/gloves/cargo_gauntlet, /turf/open/floor/iron/dark, /area/station/cargo/storage) "wyF" = ( @@ -71084,10 +71087,10 @@ name = "navigation beacon (Security Delivery)" }, /obj/machinery/door/window/right/directional/north{ - name = "Security Delivery Access"; - req_access = list("security") + name = "Security Delivery Access" }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/maintenance/port/aft) "wzY" = ( @@ -74828,10 +74831,10 @@ }, /obj/machinery/door/window/left/directional/west{ dir = 1; - name = "Crate Return Door"; - req_access = list("shipping") + name = "Crate Return Door" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /turf/open/floor/plating, /area/station/cargo/storage) "xOg" = ( @@ -75515,10 +75518,10 @@ dir = 1 }, /obj/machinery/door/window/left/directional/north{ - name = "Library Desk Access"; - req_access = list("library") + name = "Library Desk Access" }, /obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/mapping_helpers/airlock/access/all/service/library, /turf/open/floor/iron/dark, /area/station/service/library) "yad" = ( From b1d5f3ea816182af3111115a217054725b2da2cb Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 8 Apr 2024 12:27:08 +0200 Subject: [PATCH 40/59] adds a composter in perma --- _maps/map_files/KiloStation/KiloStation.dmm | 37 +++++++++++---------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 9857187d0915..617f3665e69c 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -616,6 +616,18 @@ c_tag = "Prison Botany"; network = list("ss13","prison") }, +/obj/structure/closet/crate/hydroponics, +/obj/effect/spawner/random/contraband/prison, +/obj/item/seeds/pumpkin, +/obj/item/seeds/wheat, +/obj/item/seeds/ambrosia, +/obj/item/seeds/grass, +/obj/item/seeds/carrot, +/obj/item/seeds/tomato, +/obj/item/seeds/potato, +/obj/item/seeds/garlic, +/obj/item/seeds/onion, +/obj/item/paper/guides/jobs/hydroponics, /turf/open/floor/iron, /area/station/security/prison/garden) "agy" = ( @@ -2365,8 +2377,6 @@ /area/space/nearstation) "aII" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/wardrobe/cargo_wardrobe, -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -2374,6 +2384,8 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/cargo_shelf, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/cargo/storage) "aJh" = ( @@ -7450,22 +7462,11 @@ /turf/open/floor/iron, /area/station/command/bridge) "cqQ" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/paper/guides/jobs/hydroponics, -/obj/item/seeds/onion, -/obj/item/seeds/garlic, -/obj/item/seeds/potato, -/obj/item/seeds/tomato, -/obj/item/seeds/carrot, -/obj/item/seeds/grass, -/obj/item/seeds/ambrosia, -/obj/item/seeds/wheat, -/obj/item/seeds/pumpkin, -/obj/effect/spawner/random/contraband/prison, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 }, /obj/structure/cable, +/obj/machinery/composters, /turf/open/floor/iron, /area/station/security/prison/garden) "cre" = ( @@ -57557,8 +57558,8 @@ "svW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/obj/structure/cargo_shelf, -/obj/effect/turf_decal/delivery, +/obj/machinery/vending/wardrobe/cargo_wardrobe, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/cargo/storage) "svZ" = ( @@ -57831,8 +57832,6 @@ /turf/open/floor/plating, /area/station/security/prison) "sAr" = ( -/obj/machinery/vending/wardrobe/cargo_wardrobe, -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -57843,6 +57842,8 @@ name = "cargo camera"; network = list("ss13","qm") }, +/obj/structure/cargo_shelf, +/obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/cargo/storage) "sAv" = ( From f830e0c02da7677d9cd6dc1b72c82d580ad8c752 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 8 Apr 2024 22:19:12 +0200 Subject: [PATCH 41/59] xenobio ranching --- _maps/map_files/KiloStation/KiloStation.dmm | 2210 ++++++++----------- 1 file changed, 903 insertions(+), 1307 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 1c1d23b8cfb9..d6959e233c12 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -419,17 +419,12 @@ /turf/closed/mineral/random/labormineral, /area/space/nearstation) "aew" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/light_switch/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Xenobiology Closet"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "aex" = ( /obj/structure/lattice/catwalk, @@ -561,13 +556,26 @@ /turf/open/floor/plating, /area/station/security/execution/transfer) "agz" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "xeno6"; - name = "Creature Cell 6" +/obj/structure/table/reinforced/plasmarglass, +/obj/structure/microscope{ + pixel_x = -1; + pixel_y = 2 }, -/obj/structure/cable, -/turf/open/floor/plating, +/obj/item/biopsy_tool{ + pixel_x = 14; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = -8; + pixel_y = 12 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "agC" = ( /obj/effect/turf_decal/tile/neutral{ @@ -1877,8 +1885,6 @@ /turf/open/floor/plating, /area/station/security/prison/mess) "aAy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/effect/turf_decal/tile/purple{ @@ -2494,21 +2500,15 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/maintenance/fore) +"aLM" = ( +/obj/structure/sign/xenobio_guide, +/turf/closed/wall/r_wall, +/area/station/science/xenobiology) "aLP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) -"aLS" = ( -/obj/machinery/chem_master, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/light_switch/directional/south, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "aMa" = ( /turf/open/floor/iron, /area/station/hallway/primary/central) @@ -2555,18 +2555,15 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "aMK" = ( -/obj/structure/grille/broken, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/machinery/chem_heater/withbuffer, +/obj/machinery/light/neon_lining, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "aMU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -2799,11 +2796,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) -"aQl" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/science/xenobiology) "aQs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4021,14 +4013,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/machinery/door/window/left/directional/south{ dir = 1; - name = "Maximum Security Test Chamber"; - req_access = list("xenobiology") + name = "Maximum Security Test Chamber" }, /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/purple/full, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "boq" = ( /obj/effect/turf_decal/box, @@ -4054,28 +4047,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"boZ" = ( -/obj/structure/table, -/obj/item/storage/box/syringes{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/storage/box/beakers{ - pixel_y = 2 - }, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/button/door/directional/south{ - id = "xeno2"; - name = "Creature Cell 2 Toggle"; - pixel_x = -24; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "bpj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4127,17 +4098,14 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "bpV" = ( -/obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/north, /obj/structure/cable, +/obj/structure/sign/poster/contraband/random/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/poster/contraband/random/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/turf/closed/wall/r_wall, +/area/station/science/xenobiology) "bqd" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 @@ -4157,21 +4125,11 @@ }, /area/station/hallway/primary/central/fore) "bqi" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/meter, /obj/structure/cable, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "bqy" = ( @@ -4696,6 +4654,18 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) +"bBm" = ( +/obj/structure/table/reinforced/plasmarglass, +/obj/item/toy/plush/slimeplushie, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "bBr" = ( /obj/machinery/door/airlock/engineering{ name = "Emergency Storage" @@ -4842,19 +4812,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"bEd" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Gas to Chamber" - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "bEe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/random/structure/barricade, @@ -5333,13 +5290,22 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "bOR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "xeno5"; - name = "Creature Cell 5" +/obj/machinery/requests_console/directional/north{ + department = "Xenobiology"; + name = "Xenobiology Requests Console"; + pixel_x = -32; + receive_ore_updates = 1; + supplies_requestable = 1 }, -/obj/structure/cable, -/turf/open/floor/plating, +/obj/machinery/computer/slime_market, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "bPr" = ( /obj/effect/turf_decal/tile/red{ @@ -6849,11 +6815,14 @@ /turf/open/space/basic, /area/space/nearstation) "ckA" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/carpet/neon/simple/green, +/area/station/science/xenobiology) "ckD" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/supply/qm, @@ -7776,16 +7745,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/cmo) -"cAz" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "cAU" = ( /obj/structure/sign/departments/chemistry/directional/west, /obj/machinery/light/directional/west, @@ -8050,7 +8009,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/sign/poster/contraband/random/directional/west, /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard) @@ -8213,13 +8171,11 @@ /turf/open/floor/iron/showroomfloor, /area/station/ai_monitored/security/armory) "cHZ" = ( -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/poddoor/preopen{ - id = "xeno_blastdoor"; - name = "Xenobiology Containment Blast Door" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/neon_lining{ + dir = 4 }, -/obj/effect/turf_decal/caution/stand_clear, -/turf/open/floor/iron/dark, +/turf/open/floor/stone, /area/station/science/xenobiology) "cIb" = ( /obj/effect/turf_decal/stripes/line{ @@ -8357,11 +8313,6 @@ /obj/structure/grille/broken, /turf/open/floor/plating/airless, /area/space/nearstation) -"cKd" = ( -/obj/effect/turf_decal/box/corners, -/obj/structure/sign/warning/electric_shock/directional/south, -/turf/open/floor/engine, -/area/station/science/xenobiology) "cKs" = ( /turf/open/floor/iron/showroomfloor, /area/station/medical/treatment_center) @@ -8693,12 +8644,15 @@ "cQx" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/microscope{ - pixel_x = -1; - pixel_y = 1 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, +/obj/item/storage/toolbox/mechanical, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "cQE" = ( /obj/effect/decal/cleanable/dirt, @@ -9393,8 +9347,6 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "dcS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -10039,14 +9991,10 @@ /turf/open/floor/iron, /area/station/security/prison/safe) "dmA" = ( -/obj/effect/turf_decal/tile/purple, -/obj/item/kirbyplants{ - icon_state = "plant-10" +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 }, -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "dmC" = ( @@ -10226,15 +10174,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/smooth_large, /area/station/maintenance/department/chapel/monastery) -"doy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "xeno4"; - name = "Creature Cell 4" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/science/xenobiology) "doB" = ( /obj/machinery/atmospherics/components/trinary/filter{ dir = 4 @@ -10896,15 +10835,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"dxu" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Cell 1"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/engine, -/area/station/science/xenobiology) "dxB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11102,13 +11032,6 @@ /obj/machinery/cryopod, /turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) -"dBV" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/fueltank, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "dCa" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/tile/blue{ @@ -11499,7 +11422,9 @@ dir = 4 }, /obj/structure/cable, -/turf/open/floor/iron/showroomfloor, +/obj/effect/turf_decal/box, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "dJm" = ( /obj/structure/chair/office/light, @@ -12585,14 +12510,11 @@ "ecf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/duct, +/obj/machinery/light/neon_lining{ dir = 4 }, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/stone, /area/station/science/xenobiology) "ecl" = ( /obj/effect/decal/cleanable/dirt, @@ -13338,24 +13260,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/commons/storage/primary) -"eoV" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/table, -/obj/structure/window/reinforced/spawner/directional/north{ - layer = 2.9 - }, -/obj/machinery/light/directional/south, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/newscaster/directional/south{ - pixel_x = 28 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "eoW" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 @@ -13397,18 +13301,11 @@ /turf/open/floor/glass, /area/station/maintenance/starboard) "epI" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/landmark/start/scientist, -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/duct, +/obj/machinery/light/neon_lining{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/stone, /area/station/science/xenobiology) "epN" = ( /obj/effect/spawner/structure/window/reinforced, @@ -13566,6 +13463,17 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/carpet/green, /area/station/maintenance/port/greater) +"ess" = ( +/obj/machinery/slime_market_pad, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "esv" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/iron/grimy, @@ -14249,6 +14157,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft) +"eEO" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Cell 2"; + name = "xenobiology camera"; + network = list("ss13","rd","xeno") + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "eEX" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -15127,6 +15044,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/fore) +"eTB" = ( +/obj/machinery/plumbing/ooze_sucker{ + mapping_id = "1"; + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "eTG" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -15450,15 +15374,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard) -"eZa" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "eZm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15853,15 +15768,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/starboard) -"ffN" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "xeno2"; - name = "Creature Cell 2" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/science/xenobiology) "ffY" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/landmark/event_spawn, @@ -17520,15 +17426,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/grass, /area/station/service/hydroponics) -"fEC" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 6"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine, -/area/station/science/xenobiology) "fEE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18645,16 +18542,13 @@ /turf/open/floor/plating, /area/station/medical/medbay/central) "fVM" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/l3closet/scientist, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/extinguisher, -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/neon_lining, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "fVT" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -19169,6 +19063,19 @@ }, /turf/open/floor/wood, /area/station/security/detectives_office) +"gef" = ( +/obj/structure/table/reinforced/plasmarglass, +/obj/item/book/manual/wiki/cytology{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/box/petridish, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "gel" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -19638,16 +19545,18 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "gmx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light_switch/directional/south, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/carpet/neon/simple/green, +/area/station/science/xenobiology) "gmB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -20992,16 +20901,15 @@ /turf/open/floor/engine, /area/station/engineering/gravity_generator) "gJz" = ( -/obj/structure/grille, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/turf/open/floor/carpet/neon/simple/green, +/area/station/science/xenobiology) "gJE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line, @@ -21399,13 +21307,14 @@ /turf/open/floor/engine/co2, /area/station/engineering/atmos) "gRg" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "xeno1"; - name = "Creature Cell 1" +/obj/machinery/corral_corner{ + mapping_id = "2" }, -/obj/structure/cable, -/turf/open/floor/plating, +/obj/machinery/slime_pen_controller{ + mapping_id = "2"; + dir = 4 + }, +/turf/open/floor/engine, /area/station/science/xenobiology) "gRq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21522,9 +21431,15 @@ /obj/structure/table/reinforced, /obj/item/crowbar/red, /obj/item/wrench, -/obj/item/storage/toolbox/mechanical, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "gSW" = ( /obj/machinery/door/firedoor, @@ -21845,6 +21760,13 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"gZR" = ( +/obj/machinery/light/neon_lining{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, +/area/station/science/xenobiology) "hah" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, @@ -21874,20 +21796,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/office) -"hbe" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xeno4"; - name = "Creature Cell 4" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - dir = 4; - name = "Creature Cell"; - req_access = list("xenobiology") - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "hbf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -22728,22 +22636,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"hnw" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xeno2"; - name = "Creature Cell 2" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Creature Cell"; - req_access = list("xenobiology") - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "hnA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22942,6 +22834,12 @@ }, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"hqH" = ( +/obj/machinery/corral_corner{ + mapping_id = "3" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "hqL" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -23199,22 +23097,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/gateway) -"hvl" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/toy/figure/scientist{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "hvn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23388,6 +23270,19 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) +"hxS" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/carpet/neon/simple/green, +/area/station/science/xenobiology) "hxZ" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/west, @@ -23605,19 +23500,16 @@ /turf/closed/wall/r_wall/rust, /area/station/maintenance/port/greater) "hBR" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/l3closet/scientist, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/machinery/firealarm/directional/north, -/obj/item/extinguisher, /obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Air to Room" + name = "Air to Room"; + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, +/obj/machinery/light/neon_lining, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "hBV" = ( /obj/effect/decal/cleanable/dirt, @@ -23762,6 +23654,13 @@ }, /turf/open/floor/iron/dark, /area/station/service/lawoffice) +"hEC" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/holopad, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "hEE" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -23822,22 +23721,19 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "hFx" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4; name = "xenobiology sorting disposal pipe" }, -/obj/structure/cable, /obj/effect/mapping_helpers/mail_sorting/science/xenobiology, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/showroomfloor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/neon_lining{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "hFy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24875,7 +24771,6 @@ /area/station/maintenance/port/greater) "hUD" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/south, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -25185,10 +25080,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/command/heads_quarters/rd) -"hZn" = ( -/obj/structure/sign/warning/electric_shock, -/turf/closed/wall, -/area/station/science/xenobiology) "hZp" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -25235,21 +25126,18 @@ /turf/open/floor/iron/dark, /area/station/service/kitchen) "hZP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "sci-maint-passthrough" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/turf/open/floor/iron/dark, +/turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "hZS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -25604,20 +25492,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/open/floor/iron/dark, /area/station/maintenance/port/fore) -"ieb" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Xenobiology Euthanization Chamber"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/circuit/telecomms, -/area/station/science/xenobiology) "ieI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -25940,6 +25814,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/cargo/storage) +"ikq" = ( +/obj/structure/closet/secure_closet/cytology, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "ikt" = ( /obj/structure/plaque/static_plaque/atmos, /turf/closed/wall/rust, @@ -26517,21 +26402,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) -"isw" = ( -/obj/machinery/chem_heater/withbuffer, -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/button/door/directional/north{ - id = "xeno1"; - name = "Creature Cell 1 Toggle"; - pixel_x = -24; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "isD" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -27063,13 +26933,14 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "iBt" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "xeno3"; - name = "Creature Cell 3" +/obj/machinery/corral_corner{ + mapping_id = "4" }, -/obj/structure/cable, -/turf/open/floor/plating, +/obj/machinery/slime_pen_controller{ + mapping_id = "4"; + dir = 8 + }, +/turf/open/floor/engine, /area/station/science/xenobiology) "iBv" = ( /obj/effect/decal/cleanable/dirt, @@ -27817,15 +27688,6 @@ "iMX" = ( /turf/open/floor/engine/air, /area/station/engineering/atmos) -"iNh" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 4"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine, -/area/station/science/xenobiology) "iNi" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark/corner, @@ -27935,8 +27797,13 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/cryo) "iPY" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/machinery/duct, +/obj/machinery/light/neon_lining, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "iQd" = ( /obj/effect/turf_decal/bot, @@ -28098,13 +27965,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"iSS" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "iSU" = ( /obj/machinery/computer/security{ dir = 4 @@ -28414,15 +28274,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"iXD" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 3"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine, -/area/station/science/xenobiology) "iXM" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line{ @@ -28683,14 +28534,15 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) "jcs" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/obj/machinery/biomass_recycler, +/obj/item/stack/biomass, +/obj/item/stack/biomass, +/obj/item/stack/biomass, +/obj/item/stack/biomass, +/obj/item/stack/biomass, +/obj/item/stack/biomass, +/turf/open/floor/stone, +/area/station/science/xenobiology) "jcK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -28708,21 +28560,19 @@ /turf/open/floor/grass, /area/station/service/hydroponics/garden) "jdp" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/camera/directional/south{ c_tag = "Xenobiology Entrance"; name = "science camera"; network = list("ss13","rd") }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/light/neon_lining{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/stone, /area/station/science/xenobiology) "jds" = ( /turf/closed/wall, @@ -28972,20 +28822,6 @@ "jgN" = ( /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) -"jgW" = ( -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/button/door/directional/south{ - id = "xeno4"; - name = "Creature Cell 4 Toggle"; - pixel_x = 24; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "jhc" = ( /obj/structure/table/bronze, /obj/item/clothing/head/costume/bronze{ @@ -29280,8 +29116,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/meter, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "jnp" = ( @@ -30289,20 +30127,13 @@ /turf/open/floor/bronze, /area/station/maintenance/department/chapel) "jFv" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 8 - }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/duct, +/obj/machinery/light/neon_lining{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "jFG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -30570,7 +30401,7 @@ /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "jJJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30744,22 +30575,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/surgery/aft) -"jMj" = ( -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/light/directional/north, -/obj/machinery/requests_console/directional/north{ - department = "Xenobiology"; - name = "Xenobiology Requests Console"; - pixel_x = -32; - receive_ore_updates = 1; - supplies_requestable = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "jMo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31506,15 +31321,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "kaW" = ( -/obj/structure/girder, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/machinery/corral_corner{ + mapping_id = "4" }, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/turf/open/floor/engine, +/area/station/science/xenobiology) "kbf" = ( /obj/machinery/light/directional/east, /obj/machinery/status_display/ai/directional/east, @@ -31635,11 +31446,27 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "kdr" = ( -/obj/effect/turf_decal/box/corners{ +/obj/structure/sign/warning/electric_shock/directional/north, +/obj/structure/table/reinforced/plasmarglass, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Cell 2"; + name = "xenobiology camera"; + network = list("ss13","rd","xeno"); dir = 1 }, -/obj/structure/sign/warning/electric_shock/directional/north, -/turf/open/floor/engine, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "kdB" = ( /obj/effect/turf_decal/tile/yellow, @@ -31789,18 +31616,6 @@ /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, /area/station/solars/starboard/aft) -"khd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/sign/directions/science{ - dir = 4; - pixel_x = -32; - pixel_y = 30 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard) "khe" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -31997,7 +31812,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/duct, +/obj/effect/turf_decal/box, +/turf/open/floor/stone, /area/station/science/xenobiology) "kkT" = ( /obj/structure/table, @@ -32699,8 +32516,14 @@ /turf/open/floor/iron, /area/station/service/chapel/dock) "kwx" = ( -/obj/structure/sign/xenobio_guide, -/turf/closed/wall/rust, +/obj/machinery/corral_corner{ + mapping_id = "3" + }, +/obj/machinery/slime_pen_controller{ + mapping_id = "3"; + dir = 8 + }, +/turf/open/floor/engine, /area/station/science/xenobiology) "kwM" = ( /obj/effect/turf_decal/tile/brown, @@ -33040,13 +32863,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/explab) "kDe" = ( -/obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, +/obj/effect/turf_decal/box, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "kDg" = ( @@ -33510,16 +33330,14 @@ /turf/open/floor/iron/dark, /area/station/security/evidence) "kKw" = ( -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/poddoor/preopen{ - id = "xeno_blastdoor"; - name = "Xenobiology Containment Blast Door" - }, -/obj/effect/turf_decal/caution/stand_clear, /obj/structure/disposalpipe/segment{ dir = 6 }, -/turf/open/floor/iron/dark, +/obj/machinery/light/neon_lining{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "kKE" = ( /obj/machinery/door/airlock/maintenance, @@ -33716,7 +33534,13 @@ }, /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "kNJ" = ( /obj/structure/table/wood, @@ -34241,19 +34065,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/gateway, /turf/open/floor/iron/dark, /area/station/command/gateway) -"kWe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "kWj" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -34352,22 +34163,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/pathology) -"kXJ" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xeno1"; - name = "Creature Cell 1" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Creature Cell"; - req_access = list("xenobiology") - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "kXN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -34423,16 +34218,15 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "kYB" = ( -/obj/structure/rack, -/obj/item/storage/bag/ore, -/obj/item/tank/internals/emergency_oxygen, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/obj/structure/table/reinforced/plasmarglass, +/obj/item/vacuum_pack, +/obj/item/vacuum_pack, +/obj/item/vacuum_pack, +/obj/item/disk/vacuum_upgrade/biomass, +/obj/item/disk/vacuum_upgrade/biomass, +/obj/item/disk/vacuum_upgrade/biomass, +/turf/open/floor/stone, +/area/station/science/xenobiology) "kYG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34624,6 +34418,16 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/service/chapel) +"laI" = ( +/obj/machinery/corral_corner{ + mapping_id = "1" + }, +/obj/machinery/slime_pen_controller{ + mapping_id = "1"; + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "laX" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34794,22 +34598,20 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) "leB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/directions/evac{ dir = 4; pixel_y = -24 }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "sci-maint-passthrough" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/turf/open/floor/iron/dark, +/turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "leC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35073,15 +34875,14 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "lis" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard) +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/carpet/neon/simple/green, +/area/station/science/xenobiology) "lix" = ( /obj/structure/closet/secure_closet/brig{ name = "Prisoner Locker" @@ -35101,11 +34902,10 @@ /area/station/security/checkpoint/supply) "liE" = ( /obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/turf/closed/wall/r_wall, +/area/station/science/xenobiology) "liK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/effect/decal/cleanable/dirt, @@ -35836,23 +35636,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/station/service/library) -"lth" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/button/door/directional/south{ - id = "xeno5"; - name = "Creature Cell 5 Toggle"; - pixel_x = -24; - req_access = list("xenobiology") - }, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "lts" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -35955,14 +35738,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "luI" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/effect/turf_decal/tile/purple/half/contrasted, /obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, /turf/open/floor/iron/showroomfloor, @@ -38210,20 +37987,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"miz" = ( -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/button/door/directional/north{ - id = "xeno3"; - name = "Creature Cell 3 Toggle"; - pixel_x = 24; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "miM" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -39089,26 +38852,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/hallway) -"mwp" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) -"mwr" = ( -/obj/effect/decal/cleanable/oil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard) "mws" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39278,6 +39021,10 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/station/security/prison/garden) +"mzf" = ( +/mob/living/basic/slime, +/turf/open/floor/engine, +/area/station/science/xenobiology) "mzp" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -39361,25 +39108,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/department/security/upper) -"mAH" = ( -/obj/structure/table, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/gloves/latex, -/obj/item/storage/box/monkeycubes{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/storage/box/monkeycubes{ - pixel_y = 3 - }, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "mBm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, @@ -39831,14 +39559,17 @@ /turf/open/floor/iron/dark, /area/station/tcommsat/server) "mIT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 +/obj/machinery/duct, +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "mIW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39853,6 +39584,23 @@ /obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) +"mIY" = ( +/obj/structure/table/reinforced/plasmarglass, +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Cell 2"; + name = "xenobiology camera"; + network = list("ss13","rd","xeno"); + dir = 1 + }, +/obj/item/toy/plush/lizard_plushie, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "mJo" = ( /obj/structure/disposalpipe/junction/flip{ dir = 8 @@ -39917,12 +39665,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/station/service/bar) -"mKC" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/ore_box, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "mKF" = ( /obj/item/toy/plush/lizard_plushie, /turf/open/floor/plating, @@ -40146,13 +39888,12 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "mOt" = ( -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/machinery/duct, +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "mOz" = ( /obj/effect/turf_decal/stripes/line{ @@ -40228,20 +39969,6 @@ /obj/structure/noticeboard/directional/east, /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) -"mPE" = ( -/obj/structure/sink/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Computers"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "mPP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40286,7 +40013,10 @@ /obj/effect/turf_decal/bot, /obj/machinery/holopad, /obj/structure/cable, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/duct, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/scientist, +/turf/open/floor/stone, /area/station/science/xenobiology) "mQk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41196,10 +40926,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/explab) -"ndz" = ( -/obj/machinery/smartfridge/extract/preloaded, -/turf/closed/wall, -/area/station/science/xenobiology) "ndP" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /obj/effect/decal/cleanable/dirt, @@ -41404,12 +41130,8 @@ "nhy" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/rack, -/obj/item/storage/backpack/satchel/science, -/obj/item/analyzer, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/turf/closed/wall/r_wall, +/area/station/science/xenobiology) "nhz" = ( /obj/structure/sign/departments/security/directional/east, /obj/machinery/light/small/directional/east, @@ -41834,7 +41556,7 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/stone, /area/station/science/xenobiology) "nqR" = ( /obj/structure/table, @@ -41881,13 +41603,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/hallway/primary/central) -"nrB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "nrF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42373,8 +42088,6 @@ /area/station/maintenance/port/greater) "nzM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/event_spawn, /obj/structure/cable, /turf/open/floor/iron/dark, @@ -42458,8 +42171,17 @@ req_access = list("pathology") }, /obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, /turf/open/floor/iron/dark, /area/station/medical/pathology) +"nBI" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "nBZ" = ( /obj/machinery/newscaster/directional/west, /obj/structure/table, @@ -42602,18 +42324,6 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"nDZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "nEe" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -43074,12 +42784,6 @@ /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, /area/station/security/prison/safe) -"nKQ" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "nLm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -43259,11 +42963,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/security/execution/transfer) -"nPl" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "nPo" = ( /obj/machinery/modular_computer/preset/id{ dir = 1 @@ -43378,8 +43077,16 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "nQx" = ( -/obj/effect/turf_decal/box, -/turf/open/floor/engine, +/obj/structure/table/reinforced/plasmarglass, +/obj/item/book/manual/wiki/plumbing, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "nQH" = ( /obj/machinery/door/firedoor, @@ -43656,7 +43363,14 @@ req_access = list("xenobiology") }, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "nXu" = ( /obj/effect/spawner/structure/window/reinforced, @@ -43784,6 +43498,14 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) +"nZZ" = ( +/obj/machinery/smartfridge/extract/preloaded, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "oam" = ( /turf/closed/wall, /area/station/maintenance/disposal) @@ -43972,15 +43694,15 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "odd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/door/airlock/research/glass{ - name = "Slime Euthanization Chamber" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/turf/open/floor/iron/dark, +/obj/machinery/plumbing/ooze_compressor, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "odA" = ( /obj/effect/turf_decal/stripes/corner{ @@ -44193,15 +43915,12 @@ /area/station/commons/fitness/recreation) "oiu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple/corner, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/duct, +/obj/machinery/light/neon_lining{ dir = 4 }, -/turf/open/floor/iron/showroomfloor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "oix" = ( /obj/effect/turf_decal/tile/neutral{ @@ -44351,19 +44070,14 @@ }, /area/station/service/chapel/funeral) "okt" = ( -/obj/machinery/door/window/left/directional/north{ - dir = 4; - name = "Creature Cell"; - req_access = list("xenobiology") - }, -/obj/structure/cable, +/obj/machinery/duct, /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 8 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "okJ" = ( /obj/effect/decal/cleanable/dirt, @@ -44542,13 +44256,11 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "opE" = ( -/obj/effect/landmark/start/scientist, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + name = "Gas to Chamber"; + dir = 8 }, -/obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "opL" = ( @@ -44694,12 +44406,11 @@ /turf/open/floor/plating, /area/station/tcommsat/computer) "orY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "ose" = ( /obj/structure/table/wood, @@ -44710,7 +44421,7 @@ "osn" = ( /obj/structure/sign/departments/xenobio, /turf/closed/wall/r_wall, -/area/station/maintenance/starboard) +/area/station/science/xenobiology) "osx" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/booze{ @@ -45197,10 +44908,10 @@ /area/station/hallway/primary/fore) "oAO" = ( /obj/effect/turf_decal/stripes/corner, -/obj/machinery/lapvend, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/machinery/slime_extract_requestor, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "oAS" = ( @@ -45605,6 +45316,7 @@ "oHR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/starboard) "oIg" = ( @@ -45699,7 +45411,9 @@ /area/station/maintenance/port/lesser) "oJm" = ( /obj/structure/cable, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/duct, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "oJq" = ( /obj/machinery/disposal/bin, @@ -45963,7 +45677,14 @@ network = list("ss13","rd","xeno") }, /obj/machinery/light/small/directional/west, -/turf/open/floor/engine, +/obj/structure/table/reinforced/plasmarglass, +/obj/item/screwdriver, +/obj/item/wirecutters, +/obj/item/storage/box/lights/mixed, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "oPr" = ( /obj/effect/turf_decal/siding/wood{ @@ -46183,6 +45904,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "oTM" = ( @@ -46305,9 +46027,24 @@ /turf/open/floor/iron, /area/station/security/brig) "oVc" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, +/obj/structure/reagent_dispensers/watertank, +/obj/item/extinguisher{ + pixel_y = 4 + }, +/obj/item/extinguisher{ + pixel_x = -4 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) +"oVh" = ( +/obj/machinery/duct, +/turf/open/floor/engine, /area/station/science/xenobiology) "oVl" = ( /obj/machinery/door/airlock/external{ @@ -46892,15 +46629,11 @@ /area/station/maintenance/starboard/fore) "peF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/duct, +/obj/machinery/light/neon_lining{ dir = 4 }, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/stone, /area/station/science/xenobiology) "peJ" = ( /obj/effect/turf_decal/tile/blue{ @@ -46974,6 +46707,15 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) +"pfQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "pfV" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47068,21 +46810,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) -"pig" = ( -/obj/machinery/airalarm/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Labs"; - name = "xenobiology camera"; - network = list("ss13","rd","xeno") - }, -/obj/structure/closet/secure_closet/cytology, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "pii" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{ dir = 4 @@ -47657,18 +47384,14 @@ /area/station/maintenance/solars/starboard/aft) "pnI" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "sci-maint-passthrough" - }, /obj/machinery/door/airlock/research{ name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/access/any/science/xenobio, /obj/effect/mapping_helpers/airlock/access/any/science/genetics, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/science/xenobiology) "pnK" = ( @@ -47914,16 +47637,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"prr" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - name = "euthanization chamber freezer" - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "prP" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -48075,23 +47788,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/dark, /area/station/command/gateway) -"puJ" = ( -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Creature Cell"; - req_access = list("xenobiology") - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "pvb" = ( /obj/structure/sign/warning/secure_area, /obj/item/multitool, @@ -48495,20 +48191,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) -"pCa" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xeno3"; - name = "Creature Cell 3" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/left/directional/north{ - dir = 4; - name = "Creature Cell"; - req_access = list("xenobiology") - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "pCd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -49210,16 +48892,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) -"pNL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/purple/corner, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/station/science/xenobiology) "pNV" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, @@ -49865,15 +49537,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"pYy" = ( -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "pYO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50129,13 +49792,6 @@ }, /turf/open/floor/plating, /area/station/science/robotics/lab) -"qdM" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/firecloset, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "qdR" = ( /obj/machinery/door/poddoor/preopen{ id = "Xenolab"; @@ -50538,7 +50194,7 @@ /obj/structure/cable, /obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "qlg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50784,6 +50440,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/showroomfloor, /area/station/science/robotics/lab) +"qoI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "qoT" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -51482,6 +51143,7 @@ }, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "qCX" = ( @@ -52734,17 +52396,18 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "qWJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/airalarm/directional/south, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/sign/poster/contraband/random/directional/north, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/carpet/neon/simple/green, +/area/station/science/xenobiology) "qWN" = ( /obj/machinery/plate_press, /obj/machinery/light/small/directional/south, @@ -53093,6 +52756,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/primary) +"rcg" = ( +/obj/machinery/door/airlock/research{ + name = "Xenobiology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "rcp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -53137,15 +52812,14 @@ /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain) "rcN" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Xenobiology Maintenance" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/light/neon_lining, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard/fore) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "rcS" = ( /obj/structure/chair/pew/left{ dir = 8 @@ -53466,17 +53140,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "riN" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Gas to Chamber" - }, /obj/structure/cable, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 1 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "riQ" = ( @@ -53936,14 +53601,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"rqu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "rqx" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -54201,26 +53858,10 @@ /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) "rtK" = ( -/obj/structure/table, -/obj/item/folder, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -4 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 4 - }, -/obj/item/reagent_containers/dropper, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 +/obj/machinery/light/neon_lining{ + dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/stone, /area/station/science/xenobiology) "rtL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54672,16 +54313,30 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "rAL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/emcloset, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/obj/structure/table/reinforced/plasmarglass, +/obj/item/experi_scanner{ + pixel_x = 4 + }, +/obj/item/experi_scanner{ + pixel_x = 4 + }, +/obj/item/clothing/glasses/science, +/obj/item/clothing/glasses/science, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, +/obj/machinery/light/small/directional/south, +/turf/open/floor/stone, +/area/station/science/xenobiology) "rAO" = ( -/obj/structure/sign/departments/xenobio, -/turf/closed/wall, -/area/station/maintenance/starboard/fore) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/carpet/neon/simple/green, +/area/station/science/xenobiology) "rAQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -54996,17 +54651,12 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "rHm" = ( -/obj/machinery/door/firedoor/heavy, -/obj/machinery/door/poddoor/preopen{ - id = "xeno_blastdoor"; - name = "Xenobiology Containment Blast Door" - }, /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/effect/turf_decal/caution/stand_clear, /obj/structure/cable, -/turf/open/floor/iron/dark, +/obj/effect/landmark/start/scientist, +/turf/open/floor/stone, /area/station/science/xenobiology) "rHs" = ( /obj/structure/table, @@ -55145,19 +54795,15 @@ /turf/open/floor/grass, /area/station/service/chapel) "rJO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/duct, +/obj/machinery/light/neon_lining{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "rJS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55790,10 +55436,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) -"rST" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/closed/wall/r_wall, -/area/station/maintenance/starboard) "rSU" = ( /obj/effect/turf_decal/delivery, /obj/machinery/airalarm/directional/west, @@ -56757,19 +56399,13 @@ /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "shS" = ( -/obj/effect/turf_decal/siding/purple/corner{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/light/neon_lining{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/stone, /area/station/science/xenobiology) "shV" = ( /obj/machinery/airalarm/directional/west, @@ -57766,12 +57402,6 @@ /obj/effect/turf_decal/caution/stand_clear, /turf/open/floor/iron/dark, /area/station/security/warden) -"syu" = ( -/obj/structure/sign/warning/deathsposal{ - layer = 4 - }, -/turf/closed/wall, -/area/station/science/xenobiology) "syF" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -58983,11 +58613,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "sQx" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple/corner, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "sQz" = ( @@ -59026,6 +58653,10 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/iron/dark, /area/station/science/research) +"sRe" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "sRi" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ @@ -59706,13 +59337,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/station/maintenance/starboard) -"tcn" = ( -/obj/structure/girder, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "tcz" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -59732,6 +59356,9 @@ "tdk" = ( /turf/closed/wall/rust, /area/station/commons/storage/art) +"tdl" = ( +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "tds" = ( /obj/machinery/gravity_generator/main, /obj/effect/decal/cleanable/greenglow, @@ -60166,17 +59793,12 @@ /turf/open/floor/iron, /area/station/engineering/lobby) "tly" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Xenobiology Maintenance" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/directions/evac{ dir = 4; pixel_y = -24 }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard) +/turf/closed/wall/r_wall, +/area/station/science/xenobiology) "tlA" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/leavy/style_random, @@ -60558,15 +60180,13 @@ /obj/machinery/atmospherics/components/tank/air{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/light/neon_lining, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/effect/turf_decal/tile/purple/opposingcorners{ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/structure/sign/warning/no_smoking{ - pixel_y = 30 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "tpY" = ( /obj/machinery/vending/autodrobe/all_access, @@ -61032,6 +60652,14 @@ "twX" = ( /turf/closed/wall/r_wall, /area/station/security/prison/shower) +"txa" = ( +/obj/machinery/chem_master, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "txb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61888,13 +61516,40 @@ /turf/open/floor/iron, /area/station/command/bridge) "tMW" = ( -/obj/structure/girder, -/obj/effect/decal/cleanable/dirt, -/obj/structure/grille/broken, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard) +/obj/machinery/newscaster/directional/east, +/obj/structure/table/reinforced/plasmarglass, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/dropper{ + pixel_y = -4 + }, +/obj/item/reagent_containers/dropper, +/turf/open/floor/stone, +/area/station/science/xenobiology) "tNe" = ( /obj/effect/turf_decal/tile/purple, /obj/structure/disposalpipe/junction, @@ -62252,7 +61907,6 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/poster/contraband/random/directional/south, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, @@ -62767,6 +62421,12 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"uaP" = ( +/obj/machinery/corral_corner{ + mapping_id = "1" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "ubt" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -63480,10 +63140,16 @@ /turf/closed/wall, /area/station/security/courtroom) "ulZ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "umj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64888,26 +64554,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/security/brig) -"uLt" = ( -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank, -/obj/item/extinguisher{ - pixel_y = 4 - }, -/obj/item/extinguisher{ - pixel_x = -4 - }, -/obj/machinery/button/door/directional/south{ - id = "xeno6"; - name = "Creature Cell 6 Toggle"; - pixel_x = 24; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "uLA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/west, @@ -65440,22 +65086,18 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "uXI" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "uXM" = ( -/turf/closed/wall/rust, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "uXP" = ( /obj/effect/spawner/random/structure/closet_maintenance, @@ -65465,17 +65107,10 @@ /turf/closed/wall/rust, /area/station/hallway/primary/aft) "uYb" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab" - }, /obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "sci-maint-passthrough" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/turf/open/floor/iron/dark, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "uYc" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -65567,6 +65202,20 @@ /obj/effect/mapping_helpers/airlock/access/any/science/genetics, /turf/open/floor/iron/dark, /area/station/science/genetics) +"uZk" = ( +/obj/structure/closet/l3closet/scientist, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/extinguisher, +/obj/item/tank/internals/emergency_oxygen, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/showroomfloor, +/area/station/science/xenobiology) "uZq" = ( /obj/structure/sink/directional/south, /obj/effect/turf_decal/siding/white{ @@ -65968,18 +65617,12 @@ /turf/open/floor/iron/grimy, /area/station/security/prison/safe) "vgJ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/light/neon_lining{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "vha" = ( /obj/effect/turf_decal/tile/red, @@ -66689,11 +66332,14 @@ "vse" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/machinery/door/window/left/directional/south{ - name = "Maximum Security Test Chamber"; - req_access = list("xenobiology") + name = "Maximum Security Test Chamber" }, /obj/structure/cable, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/xenobio, +/turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "vsp" = ( /obj/effect/landmark/event_spawn, @@ -67062,12 +66708,10 @@ "vys" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/siding/purple/corner{ +/obj/machinery/light/neon_lining{ dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/stone, /area/station/science/xenobiology) "vyD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -67169,15 +66813,6 @@ "vzy" = ( /turf/closed/wall, /area/station/service/janitor) -"vzD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/passive_vent{ - name = "killroom vent" - }, -/turf/open/floor/circuit/telecomms, -/area/station/science/xenobiology) "vzL" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/effect/decal/cleanable/dirt, @@ -67650,18 +67285,17 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "vEW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 1 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) +/turf/open/floor/carpet/neon/simple/green, +/area/station/science/xenobiology) "vEZ" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -70407,6 +70041,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/glass, /area/station/maintenance/starboard) +"wtf" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/directional/west{ + c_tag = "Xenobiology Cell 2"; + name = "xenobiology camera"; + network = list("ss13","rd","xeno"); + dir = 4 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "wtt" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -70829,15 +70473,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/checkpoint/science/research) "wAG" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/structure/chair/office/light{ dir = 1; pixel_y = 3 @@ -70846,6 +70481,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) "wAS" = ( @@ -71832,8 +71468,7 @@ "wSv" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/maintenance/starboard) "wSL" = ( /obj/effect/decal/cleanable/dirt, @@ -71857,6 +71492,12 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"wSV" = ( +/obj/machinery/corral_corner{ + mapping_id = "2" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "wSY" = ( /obj/machinery/camera/directional/south{ c_tag = "Satellite Antechamber"; @@ -72392,20 +72033,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"xcf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/light/small/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 4; - name = "killroom vent" - }, -/turf/open/floor/circuit/telecomms, -/area/station/science/xenobiology) "xck" = ( /obj/machinery/power/tracker, /obj/effect/turf_decal/box, @@ -72620,7 +72247,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/stone, /area/station/science/xenobiology) "xgC" = ( /obj/effect/turf_decal/tile/neutral{ @@ -73406,17 +73033,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "xta" = ( -/obj/effect/turf_decal/siding/purple/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/light/neon_lining{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/stone, /area/station/science/xenobiology) "xtc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74215,12 +73836,9 @@ /area/station/medical/chemistry) "xFI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, /turf/open/floor/iron/showroomfloor, /area/station/science/xenobiology) @@ -74328,7 +73946,9 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/duct, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/stone, /area/station/science/xenobiology) "xHT" = ( /obj/machinery/firealarm/directional/east, @@ -74402,16 +74022,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) -"xIM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/circuit/telecomms, -/area/station/science/xenobiology) "xJc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -74641,14 +74251,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "xNu" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/research/glass{ - name = "Xenobiology Closet" +/obj/machinery/plumbing/ooze_compressor, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "xNJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74906,10 +74514,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/storage) -"xSi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/closed/wall/r_wall, -/area/station/science/genetics) "xSn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -75323,10 +74927,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"xXo" = ( -/obj/structure/sign/departments/xenobio, -/turf/closed/wall/r_wall, -/area/station/maintenance/starboard/fore) "xXp" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -76186,18 +75786,14 @@ /turf/open/floor/iron/showroomfloor, /area/station/service/bar/atrium) "ykd" = ( -/obj/structure/sink/directional/east, /obj/structure/disposalpipe/sorting/mail{ dir = 1 }, /obj/effect/mapping_helpers/mail_sorting/science/xenobiology, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ +/obj/machinery/light/neon_lining{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/stone, /area/station/science/xenobiology) "ykv" = ( /obj/structure/railing/corner{ @@ -111860,12 +111456,12 @@ aUz aeU aeu aeu -lZi -lZi -lZi -iUT -lZi -lRk +vJc +vJc +vJc +wuc +vJc +wpw bpV liE pAx @@ -112118,24 +111714,24 @@ aeu aeu aeu wuc -gpI +bBm oPn -vuI -lZi +nZZ +txa aMK gJz -lZi -lZi -iUT -lZi -lZi -lZi -iUT -lZi -lZi +vJc +vJc +wuc +vJc +vJc +vJc +wuc +vJc +vJc nhy -nmu -lZi +rcg +vJc jeG fJq vnH @@ -112374,25 +111970,25 @@ aeu aeu aeu aeu -vJc -qmW -nQx -qmW -lZi +aLM +mIY +uXM +sRe +sRe rcN -xXo -lZi -gpI +gJz +uaP +qmW eWT -vuI -wpw -gpI -dxu -vuI -iUT -fvU +qmW +uaP +wSV +qmW +eEO +qmW +wSV qWJ -lZi +vJc uDT kLm hpC @@ -112632,24 +112228,24 @@ aeu aeu glv vJc -jhN +ess +tdl +sRe +tdl +rcN +gJz qmW -cKd -wpw -ieb -xcf -wpw qmW -nQx +mzf qmW -uXM qmW -nQx qmW -lZi -qdM -nmu -iUT +qmW +mzf +qmW +qmW +hxS +wuc lhJ mQu ggZ @@ -112890,23 +112486,23 @@ vJc vJc vJc bOR -bOR -bOR +tdl +sRe uXM -vzD -xIM -wpw -jhN +rcN +gJz +qmW +oVh +eTB +qmW +qmW +qmW +oVh +eTB qmW -wRn -hZn -jhN qmW -wRn -lZi -dBV gmx -lZi +vJc sgW uJP dMW @@ -113147,23 +112743,23 @@ vuI wuc jJD oVc -mwp -lth -wpw +sRe +sRe +sRe iPY odd -wpw -ffN -hnw -ffN -wpw -gRg -kXJ +laI +oVh +qmW +qmW +uaP gRg -lZi -tcn +oVh +qmW +qmW +wSV vEW -lZi +vJc lko oHP xjT @@ -113405,22 +113001,22 @@ vJc lev gSQ riN -bEd -pig -prr +tdl +tdl +iPY mIT -wpw -jMj +rAO okt -boZ -syu -isw +rAO +rAO +rAO +rAO okt -aLS -lZi +rAO +rAO rAO hZP -lZi +vJc tFq kwV edj @@ -113662,11 +113258,11 @@ qdR lev cQx bqi -rAD -eZa +tdl +tdl luI rJO -cAz +vgJ jFv vgJ xta @@ -113674,7 +113270,7 @@ ykd shS epI rtK -lev +gZR kKw hFx frO @@ -113919,18 +113515,18 @@ tGx boo vse jmM -mQe +hEC jec -oJm +nBI kkP -nKQ +oJm oJm mQe dJk nqE xgz xHR -nPl +uYb uYb rHm uXI @@ -114176,22 +113772,22 @@ uQF lev kNI wAG -fQr +sQx sQx xFI -nDZ +ecf vys -pNL -kWe ecf -mPE +ecf +ecf +oiu oiu peF -mAH -lev +cHZ +cHZ cHZ jdp -xSi +frO yaK pSe iBh @@ -114435,21 +114031,21 @@ nXp opE kDe dmA -hvl +iPY mOt -wpw -pYy -puJ -jgW -ndz -miz -puJ -eoV -lDu -avo +rAO +okt +rAO +rAO +rAO +rAO +okt +rAO +rAO +rAO leB -rST -lDu +vJc +vJc nfX vIR nfX @@ -114689,24 +114285,24 @@ wRn vJc qld ulZ -iSS -uLt -wpw -aQl +rAD +sRe +sQx +iPY xNu kwx -doy -hbe -doy -wpw -iBt -pCa +oVh +qmW +qmW +hqH iBt -lDu +oVh +qmW +qmW kaW lis jcs -lDu +vJc bhB xvr kkT @@ -114946,24 +114542,24 @@ wuc vJc vJc agz -agz -agz -wpw +tdl +uXM +fQr fVM orY -wpw -gpI qmW -vuI -hZn -gpI +oVh +eTB qmW -vuI -lDu -kfI -mwr +qmW +qmW +oVh +eTB +qmW +qmW +lis kYB -oLH +wuc jOZ qhx lVL @@ -115203,24 +114799,24 @@ aeu aeu vJc kdr -qmW -vuI -uXM +sRe +sRe +tdl hBR -rqu -wpw +orY qmW -nQx qmW -wpw +mzf +qmW +qmW +qmW +qmW +mzf qmW -nQx qmW -lDu -khd ckA rAL -lDu +vJc rwu roF pMT @@ -115459,25 +115055,25 @@ aeu aeu aeu vJc -qmW +gef nQx -qmW -wpw +uZk +ikq tpD aew -uXM -jhN -iNh -wRn -wpw -jhN -iXD -wRn -lDu -kfI -rZV +hqH +qmW +wtf +qmW +hqH +kaW +qmW +wtf +qmW +kaW +ckA tMW -lDu +vJc bkK xLC tnR @@ -115716,25 +115312,25 @@ aeu aeu aeu wuc -jhN -fEC -wRn -lDu +vJc +vJc +vJc +vJc osn tly -lDu -oLH -lDu -lDu -lDu -lDu -oLH -lDu -lDu -kfI -syF -mKC -lDu +vJc +vJc +vJc +vJc +vJc +vJc +vJc +vJc +vJc +vJc +pfQ +vJc +vJc wZZ ubU wIo @@ -115972,9 +115568,9 @@ aeu vku aeU aeu -vJc -wuc -vJc +aeu +aeu +aeu lDu lDu eCh @@ -115989,8 +115585,8 @@ vfK rZV wSv nzM -vOX -nrB +qoI +vfK lDu oLH lDu From 6af4bfad68421a21c91d3dff07fff2c29169958a Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 8 Apr 2024 22:34:57 +0200 Subject: [PATCH 42/59] removes stray decals and fixes a wall --- _maps/map_files/KiloStation/KiloStation.dmm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index d6959e233c12..c979115bf342 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -34901,7 +34901,6 @@ /turf/closed/wall, /area/station/security/checkpoint/supply) "liE" = ( -/obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/closed/wall/r_wall, @@ -41128,7 +41127,6 @@ }, /area/station/ai_monitored/turret_protected/ai) "nhy" = ( -/obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, /area/station/science/xenobiology) @@ -69824,9 +69822,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/brig) -"wpw" = ( -/turf/closed/wall, -/area/station/science/xenobiology) "wpD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -111461,7 +111456,7 @@ vJc vJc wuc vJc -wpw +vJc bpV liE pAx From 0a3954b6d279165ea714dcef4d7bfbd73192b2a9 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 9 Apr 2024 18:18:31 +0200 Subject: [PATCH 43/59] tiny fans + solar panels qol --- _maps/map_files/KiloStation/KiloStation.dmm | 40 +++++++++++---------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index c979115bf342..a515779fd5a8 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -5742,6 +5742,7 @@ }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/structure/fans/tiny, /turf/open/floor/iron/dark, /area/station/maintenance/fore) "bWN" = ( @@ -17262,6 +17263,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "fCe" = ( @@ -19303,11 +19305,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"gix" = ( -/obj/effect/turf_decal/box, -/obj/structure/cable, -/turf/open/floor/iron/solarpanel/airless, -/area/station/solars/starboard/aft) "giA" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -21992,6 +21989,7 @@ }, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "hee" = ( @@ -51979,6 +51977,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "qQQ" = ( @@ -59005,6 +59004,7 @@ }, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) "sWA" = ( @@ -62614,6 +62614,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/engineering/external, +/obj/structure/fans/tiny, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/fore) "udE" = ( @@ -72972,6 +72973,7 @@ dir = 8 }, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/maintenance/starboard) "xrT" = ( @@ -117719,9 +117721,9 @@ xtJ oXz psD xVm -gix jXM -gix +jXM +jXM nNb kgD kgD @@ -118233,15 +118235,15 @@ aUz fLr kgD kgD -gix -gix -gix +jXM +jXM +jXM nNb kgD kgD kgD -gix -gix +jXM +jXM acm aeo acm @@ -118746,7 +118748,7 @@ aeU cmU kgD kgD -gix +jXM kgD kgD nNb @@ -119262,12 +119264,12 @@ kgD kgD kgD kgD -gix +jXM nNb nNb nNb -gix -gix +jXM +jXM kgD kgD kgD @@ -119779,9 +119781,9 @@ kgD kgD kgD nNb -gix -gix -gix +jXM +jXM +jXM kgD kgD acm From 3aac369536074a74e3064c249c224a5c5d2a01d2 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 9 Apr 2024 19:13:51 +0200 Subject: [PATCH 44/59] new vacant commissary (old one is a maint project nao) --- _maps/map_files/KiloStation/KiloStation.dmm | 712 +++++++++++--------- 1 file changed, 382 insertions(+), 330 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index a515779fd5a8..f5ae7ff00a95 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1797,6 +1797,9 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) +"ayV" = ( +/turf/closed/wall/r_wall, +/area/station/commons/vacant_room/commissary) "ayY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4407,18 +4410,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) -"bwk" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) "bwA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5204,10 +5195,9 @@ /obj/structure/extinguisher_cabinet/directional/south, /obj/item/paper_bin, /obj/item/pen, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "bMN" = ( /obj/structure/disposalpipe/segment{ @@ -5623,7 +5613,6 @@ /turf/open/misc/asteroid/airless, /area/space/nearstation) "bUr" = ( -/obj/structure/sign/poster/contraband/random/directional/north, /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/department/security/upper) @@ -7903,14 +7892,13 @@ /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) "cDm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/grille/broken, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/hallway/primary/port) "cDH" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -8707,9 +8695,19 @@ /turf/open/floor/plating, /area/station/medical/pharmacy) "cRY" = ( -/obj/structure/sign/warning/no_smoking, -/turf/closed/wall, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/hand_labeler, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "cSg" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9715,14 +9713,8 @@ /turf/open/floor/engine/vacuum, /area/station/science/ordnance/bomb) "diA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "diB" = ( /obj/effect/turf_decal/siding/blue{ @@ -10637,6 +10629,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"duM" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "duU" = ( /obj/machinery/door/airlock/external{ name = "Ferry Shuttle Airlock" @@ -11329,13 +11331,16 @@ /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance/office) "dIx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/structure/grille/broken, -/obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/hallway/primary/port) "dIy" = ( /obj/machinery/door/airlock/grunge, /obj/structure/cable, @@ -12082,13 +12087,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "dTs" = ( /obj/effect/turf_decal/tile/red{ @@ -12208,6 +12209,13 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"dVa" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "dVb" = ( /obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder{ @@ -12404,10 +12412,12 @@ "eao" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ - id_tag = "commissarydoor"; - name = "Vacant Commissary" + id_tag = "abandonedcommissarydoor"; + name = "Abandoned Structure" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/dark, /area/station/commons/vacant_room/commissary) "eaw" = ( @@ -13039,16 +13049,9 @@ /turf/open/floor/plating, /area/station/service/chapel/funeral) "elz" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "elD" = ( /obj/machinery/vending/dinnerware, @@ -13352,12 +13355,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"eqP" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/wardrobe/mixed, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) "eqV" = ( /obj/structure/table, /obj/item/tank/jetpack/carbondioxide{ @@ -16597,6 +16594,17 @@ }, /turf/open/floor/iron/dark, /area/station/science/research) +"fsU" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/station/hallway/primary/port) "fsZ" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -17021,13 +17029,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/courtroom) -"fyi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/sign/poster/contraband/random/directional/north, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) "fyj" = ( /obj/structure/cable, /turf/closed/wall/r_wall, @@ -18920,7 +18921,6 @@ /area/station/medical/medbay/central) "gbp" = ( /obj/structure/table, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -18932,10 +18932,9 @@ pixel_x = 8; pixel_y = 2 }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "gbF" = ( /obj/machinery/door/poddoor/preopen{ @@ -20109,29 +20108,26 @@ /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) "gwW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/machinery/button/door/directional/east{ id = "commissaryshutter"; - name = "Commissary Shutter Toggle"; + name = "Abandoned Commissary Shutter Toggle"; pixel_x = 26; pixel_y = 7 }, /obj/machinery/button/door/directional/east{ - id = "commissarydoor"; - name = "Commissary Door Lock"; + id = "abandonedcommissarydoor"; + name = "Abandoned Commissary Door Lock"; normaldoorcontrol = 1; pixel_x = 26; pixel_y = -2; specialfunctions = 4 }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/turf/open/floor/iron, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "gwY" = ( /obj/structure/disposalpipe/segment{ @@ -20371,11 +20367,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock/grunge{ - id_tag = "commissarydoor"; - name = "Vacant Commissary" + id_tag = "abandonedcommissarydoor"; + name = "Abandoned Structure" }, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) "gBG" = ( @@ -21123,10 +21121,6 @@ /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "gOo" = ( -/obj/structure/sign/directions/evac{ - dir = 4; - pixel_y = -24 - }, /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -21223,20 +21217,24 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "gQi" = ( -/obj/machinery/door/airlock/external{ - name = "Prison External Airlock" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "kilo-maint-1" - }, -/obj/effect/mapping_helpers/airlock/unres{ +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/machinery/camera/directional/west{ + c_tag = "Port Hallway Vendors"; + name = "Vacant commisary" + }, +/obj/structure/closet/secure_closet/personal, +/obj/item/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, +/obj/effect/spawner/random/entertainment/drugs, +/obj/effect/spawner/random/entertainment/drugs, +/obj/item/reagent_containers/syringe/contraband/space_drugs, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "gQq" = ( /obj/machinery/computer/mecha{ dir = 1 @@ -22175,6 +22173,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark/corner{ dir = 8 }, @@ -22384,6 +22383,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/dark/corner{ dir = 8 }, @@ -24091,6 +24091,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = -24 + }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/port) "hKE" = ( @@ -24130,24 +24134,14 @@ /area/station/tcommsat/server) "hLr" = ( /obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/east, -/obj/machinery/airalarm/directional/south, /obj/item/storage/toolbox/emergency{ pixel_y = 4 }, /obj/item/wrench, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/directional/east{ - c_tag = "Vacant Commissary"; - name = "cargo camera"; - network = list("ss13","qm") - }, /obj/machinery/light_switch/directional/east, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, +/obj/machinery/light/small/broken/directional/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "hLO" = ( /obj/structure/plasticflaps, @@ -24916,13 +24910,22 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) "hXu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/structure/grille/broken, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "commissaryshutter"; + name = "Vacant Commissary Shutter" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "hXE" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -24968,6 +24971,11 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage/gas) +"hXV" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "hYa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -25047,13 +25055,16 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/execution/transfer) "hZb" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 +/obj/effect/landmark/navigate_destination/common/vaccommissary, +/obj/machinery/door/airlock{ + id_tag = "commissarydoor"; + name = "Commissary" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, -/area/station/maintenance/department/security/upper) +/area/station/commons/vacant_room/commissary) "hZd" = ( /obj/structure/flora/tree/jungle/style_random, /turf/open/floor/grass, @@ -29436,14 +29447,17 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "jsu" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/emcloset/anchored, /obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/kirbyplants{ + icon_state = "applebush" + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "jsv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29837,6 +29851,25 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"jBc" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/button/door/directional/east{ + id = "commissarydoor"; + name = "Commissary Door Lock"; + normaldoorcontrol = 1; + specialfunctions = 4; + pixel_x = 0; + pixel_y = 24 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "jBh" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -29908,14 +29941,13 @@ /turf/closed/wall, /area/station/maintenance/department/crew_quarters/bar) "jCw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, -/obj/structure/grille/broken, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "jCz" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -31269,11 +31301,21 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "jZX" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/pen, +/obj/effect/spawner/random/entertainment/drugs, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "kac" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -32438,6 +32480,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) +"kvn" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "kvo" = ( /obj/structure/table, /obj/machinery/firealarm/directional/west, @@ -35395,7 +35444,7 @@ /area/station/science/robotics/lab) "lpU" = ( /turf/closed/wall/r_wall/rust, -/area/station/maintenance/department/security/upper) +/area/station/commons/vacant_room/commissary) "lql" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/corner{ @@ -35879,10 +35928,9 @@ pixel_y = 4 }, /obj/item/hand_labeler, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "lxw" = ( /obj/effect/turf_decal/tile/purple{ @@ -36289,6 +36337,15 @@ /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/iron/dark, /area/station/service/chapel/storage) +"lEe" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "lEi" = ( /obj/effect/turf_decal/tile/neutral, /obj/item/kirbyplants, @@ -38608,11 +38665,14 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "mrT" = ( -/obj/structure/girder, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "mrW" = ( /obj/machinery/artifact_xray, /obj/machinery/light/small/directional/east, @@ -38778,12 +38838,16 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "mvf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/wardrobe/green, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "mvz" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -39960,10 +40024,10 @@ /obj/machinery/door/poddoor/shutters{ dir = 1; id = "commissaryshutter"; - name = "Vacant Commissary Shutter" + name = "Abandoned Structure" }, /obj/effect/turf_decal/delivery, -/obj/structure/noticeboard/directional/east, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "mPP" = ( @@ -40042,15 +40106,14 @@ /obj/structure/closet/secure_closet/personal{ name = "Commissary Locker" }, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron/dark, +/obj/machinery/light/small/broken/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "mQS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40264,15 +40327,19 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "mTd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/structure/rack, +/obj/item/screwdriver, +/obj/item/wrench, +/obj/item/crowbar, +/obj/item/wirecutters, +/obj/machinery/light_switch/directional/west, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "mTw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -41766,13 +41833,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid/airless, /area/space/nearstation) -"nuN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) "nuZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -42900,9 +42960,8 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "nOb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/department/security/upper) "nOc" = ( @@ -43125,7 +43184,7 @@ /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/unres{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/upper) @@ -43250,12 +43309,11 @@ /turf/open/floor/wood, /area/station/maintenance/starboard/fore) "nUC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/stool/directional/south, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "nUZ" = ( /obj/effect/turf_decal/delivery, /obj/structure/extinguisher_cabinet/directional/south, @@ -44314,21 +44372,17 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "oqv" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/obj/item/extinguisher{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/tank/internals/oxygen/red{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/clothing/mask/gas, /obj/structure/sign/poster/contraband/random/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/structure/table, +/obj/item/newspaper, +/obj/effect/spawner/random/entertainment/drugs, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "oqN" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -46976,12 +47030,13 @@ /turf/closed/wall/r_wall, /area/station/maintenance/port/aft) "pjT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/girder/displaced, -/obj/structure/grille/broken, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "pjV" = ( /obj/structure/table/wood, /obj/machinery/newscaster/directional/east, @@ -47506,6 +47561,12 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/carpet/green, /area/station/security/detectives_office) +"ppB" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/port) "ppE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47640,17 +47701,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"prW" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) "prX" = ( /obj/machinery/status_display/shuttle, /turf/closed/wall, @@ -50364,9 +50414,6 @@ /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/upper) @@ -51489,12 +51536,17 @@ /turf/open/space/basic, /area/space/nearstation) "qIW" = ( -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/random/directional/west, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/button/door/directional/east{ + id = "commissaryshutter"; + name = "Commissary Shutter Control" + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "qJf" = ( /turf/open/floor/wood, /area/station/service/bar/atrium) @@ -53327,10 +53379,11 @@ /obj/machinery/door/poddoor/shutters{ dir = 1; id = "commissaryshutter"; - name = "Vacant Commissary Shutter" + name = "Abandoned Structure" }, /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/blood/old, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "rmI" = ( @@ -53621,6 +53674,17 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +"rqI" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/office/light{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "rqJ" = ( /obj/effect/turf_decal/box, /obj/structure/cable, @@ -55452,9 +55516,14 @@ /turf/closed/wall, /area/station/service/chapel/office) "rTn" = ( -/obj/structure/sign/warning/vacuum/external, -/turf/closed/wall, -/area/station/maintenance/department/security/upper) +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "rTp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55983,12 +56052,15 @@ /turf/open/floor/plating, /area/station/cargo/warehouse) "scE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/corner{ dir = 8 }, @@ -58825,20 +58897,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"sTV" = ( -/obj/machinery/door/airlock/external{ - name = "Prison External Airlock" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "kilo-maint-1" - }, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, -/turf/open/floor/plating, -/area/station/commons/fitness/recreation) "sUq" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -60051,6 +60109,11 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/ai_monitored/security/armory) +"tnN" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "tnP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -65554,13 +65617,8 @@ /turf/open/floor/plating, /area/station/engineering/main) "vfF" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, /area/station/hallway/primary/port) "vfK" = ( /obj/effect/decal/cleanable/dirt, @@ -68012,13 +68070,9 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) "vNS" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, /area/station/hallway/primary/port) "vNT" = ( /obj/structure/lattice, @@ -69580,14 +69634,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) -"wmG" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/commons/vacant_room/commissary) "wmJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -69947,10 +69993,9 @@ /turf/open/floor/plating/plasma/rust, /area/station/maintenance/space_hut/plasmaman) "wqP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/security/upper) "wqQ" = ( @@ -70205,16 +70250,17 @@ /turf/open/floor/plating, /area/station/maintenance/department/security) "wwP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/sign/poster/contraband/random/directional/west, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/structure/sign/poster/contraband/random/directional/west, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/upper) +/obj/structure/table, +/obj/item/stack/sheet/iron/five, +/obj/item/stack/cable_coil/five, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "wwS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/depsec/medical, @@ -73754,6 +73800,12 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) +"xDv" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "xDE" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 @@ -98151,7 +98203,7 @@ seE nHS xDc rdM -sTV +xDc aGU shJ aGU @@ -98406,13 +98458,13 @@ hmo lKS lKS tUC -nbd +uJV jsu mTd gQi wwP oqv -sWB +ayV nem gME ezq @@ -98663,9 +98715,9 @@ glV uVP lsF cgm -nbd -nbd -knK +uJV +duM +tnN rTn nUC jZX @@ -98920,13 +98972,13 @@ fkL xDc aNE vKT -knK +qBs mvf -knK +kvn pjT -wqP +lEe cRY -sWB +ayV rqx oJs kUg @@ -99177,13 +99229,13 @@ lXe xDc xDc xDc -nbd -qIo +uJV +jBc qIW -qIo -nOb +dVa +tnN mrT -sWB +ayV gCu fRP inK @@ -99434,13 +99486,13 @@ uAA dLk uAA uwR -nbd +uJV hZb -nbd -eqP -nUC +uJV +dVa +rqI jCw -sWB +ayV bDu tXX rcs @@ -99693,9 +99745,9 @@ apv hoK vkC scE -nbd -knK -fyi +uJV +hXu +hXu hXu lpU sWB @@ -99948,12 +100000,12 @@ kcE qSg mkQ apv -apv -hoK +xDv +fsU gOo -nbd -nbd -nuN +uAA +uAA +uAA dIx knK bUr @@ -100209,11 +100261,11 @@ mkQ hHM vNS vfF -nbd -nbd +ppB +ppB cDm wqP -wqP +nOb nOb qnO gLS @@ -100465,9 +100517,9 @@ rxJ sgh apv apv -hoK +apv hkC -nbd +jQE knK nbd gFX @@ -111522,7 +111574,7 @@ qgz pZT rmu dTd -prW +elz bMH cuV cGm @@ -111779,10 +111831,10 @@ jNt lwT mPC gwW -bwk +elz diA gBC -sXJ +hXV ipO qZX kDg @@ -112036,7 +112088,7 @@ hNi etm qBs gbp -wmG +elz hLr cuV oQk From bb821052e407dbf3dbd674f3565849d277af2e75 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 9 Apr 2024 19:19:12 +0200 Subject: [PATCH 45/59] i forgor, oops --- _maps/map_files/KiloStation/KiloStation.dmm | 43 ++++++++------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f5ae7ff00a95..6c05a6bc0e8e 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -5198,7 +5198,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "bMN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9712,10 +9712,6 @@ }, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/bomb) -"diA" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) "diB" = ( /obj/effect/turf_decal/siding/blue{ dir = 1 @@ -12090,7 +12086,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "dTs" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -12419,7 +12415,7 @@ /obj/structure/barricade/wooden/crude, /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/dark, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "eaw" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 @@ -13048,11 +13044,6 @@ }, /turf/open/floor/plating, /area/station/service/chapel/funeral) -"elz" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) "elD" = ( /obj/machinery/vending/dinnerware, /obj/effect/turf_decal/bot, @@ -18935,7 +18926,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "gbF" = ( /obj/machinery/door/poddoor/preopen{ id = "gravity"; @@ -20128,7 +20119,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "gwY" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -24142,7 +24133,7 @@ /obj/machinery/light/small/broken/directional/east, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "hLO" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -35931,7 +35922,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "lxw" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -40029,7 +40020,7 @@ /obj/effect/turf_decal/delivery, /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "mPP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40114,7 +40105,7 @@ /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "mQS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53385,7 +53376,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, -/area/station/commons/vacant_room/commissary) +/area/station/maintenance/starboard/aft) "rmI" = ( /obj/structure/flora/grass/jungle/a/style_random, /obj/structure/flora/bush/fullgrass/style_random, @@ -111315,9 +111306,9 @@ qzv qur iNi jmE -uJV +cuV mQR -elz +hXV lxp cuV hyJ @@ -111574,7 +111565,7 @@ qgz pZT rmu dTd -elz +hXV bMH cuV cGm @@ -111831,8 +111822,8 @@ jNt lwT mPC gwW -elz -diA +hXV +alL gBC hXV ipO @@ -112086,9 +112077,9 @@ lgv khe hNi etm -qBs +fuB gbp -elz +hXV hLr cuV oQk From 30f53190dd98583d0e143841cf7f32b03125abda Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 9 Apr 2024 19:56:00 +0200 Subject: [PATCH 46/59] fix tests --- _maps/map_files/KiloStation/KiloStation.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 6c05a6bc0e8e..41d5042582be 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -20361,7 +20361,6 @@ id_tag = "abandonedcommissarydoor"; name = "Abandoned Structure" }, -/obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/structure/barricade/wooden/crude, /obj/effect/mapping_helpers/airlock/abandoned, From 87be8df09ed58986763331d74e0302ec6a14fbe5 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 9 Apr 2024 19:56:23 +0200 Subject: [PATCH 47/59] also the pipes --- _maps/map_files/KiloStation/KiloStation.dmm | 2 -- 1 file changed, 2 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 41d5042582be..c0420b1abe19 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -20355,8 +20355,6 @@ }, /area/station/hallway/primary/central/fore) "gBC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock/grunge{ id_tag = "abandonedcommissarydoor"; name = "Abandoned Structure" From d96e809c081ea34c682391d0a13462d0d488d0f4 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Tue, 16 Apr 2024 14:56:40 +0200 Subject: [PATCH 48/59] protection just in case you spawn in the upper right corner --- _maps/map_files/KiloStation/KiloStation.dmm | 22 +++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index c0420b1abe19..b12abca8978d 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -6735,6 +6735,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/plating, /area/station/cargo/warehouse) "cjR" = ( @@ -20317,6 +20318,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"gzJ" = ( +/obj/machinery/suit_storage_unit/standard_unit{ + desc = "An industrial suit storage device carrying retro space suits. Neat!"; + helmet_type = /obj/item/clothing/head/helmet/space; + suit_type = /obj/item/clothing/suit/space + }, +/turf/open/floor/carpet/green, +/area/station/cargo/warehouse) "gAp" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -24072,6 +24081,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/plating, /area/station/cargo/warehouse) "hKB" = ( @@ -35203,6 +35213,7 @@ /obj/machinery/button/crematorium/indestructible{ pixel_x = 22 }, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/security/medical) "lmA" = ( @@ -35461,6 +35472,7 @@ /obj/effect/decal/cleanable/oil, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/plating, /area/station/cargo/warehouse) "lqy" = ( @@ -37005,6 +37017,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/structure/cable, +/obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/plating, /area/station/cargo/warehouse) "lQj" = ( @@ -39109,10 +39122,6 @@ /obj/structure/transit_tube/diagonal/crossing/topleft, /turf/open/space/basic, /area/space/nearstation) -"mzU" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/showroomfloor, -/area/station/security/medical) "mAa" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -70299,6 +70308,7 @@ "wxF" = ( /obj/structure/table/wood, /obj/effect/spawner/random/maintenance, +/obj/item/knife/combat/survival, /turf/open/floor/carpet/green, /area/station/cargo/warehouse) "wxI" = ( @@ -95374,7 +95384,7 @@ crk jmw kxG pks -mzU +iIb iIb ugM ijl @@ -121750,7 +121760,7 @@ jGU itR nuf iQK -jSF +gzJ dME acm aaa From 6c14fde7bf14638afe27ead02c12f450dd271658 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 22 Apr 2024 23:26:55 +0200 Subject: [PATCH 49/59] turned vacant commissary into smithing section --- _maps/map_files/KiloStation/KiloStation.dmm | 226 +++++++++----------- 1 file changed, 107 insertions(+), 119 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index b12abca8978d..94e195c7cf9a 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1799,7 +1799,7 @@ /area/station/medical/medbay/central) "ayV" = ( /turf/closed/wall/r_wall, -/area/station/commons/vacant_room/commissary) +/area/station/smithing) "ayY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7980,6 +7980,23 @@ /obj/effect/mapping_helpers/airlock/access/any/service/janitor, /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) +"cFx" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "commissaryshutter"; + name = "Smithing Shutter" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/smithing) "cFO" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -8696,19 +8713,16 @@ /turf/open/floor/plating, /area/station/medical/pharmacy) "cRY" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/hand_labeler, -/obj/item/hand_labeler, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/structure/anvil, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/item/stack/sheet/iron/ten, +/turf/open/floor/wood, +/area/station/smithing) "cSg" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10626,16 +10640,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) -"duM" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) "duU" = ( /obj/machinery/door/airlock/external{ name = "Ferry Shuttle Airlock" @@ -12211,8 +12215,9 @@ /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/structure/cable, +/turf/open/floor/stone, +/area/station/smithing) "dVb" = ( /obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder{ @@ -21222,16 +21227,8 @@ c_tag = "Port Hallway Vendors"; name = "Vacant commisary" }, -/obj/structure/closet/secure_closet/personal, -/obj/item/storage/secure/briefcase, -/obj/item/storage/secure/briefcase, -/obj/item/storage/secure/briefcase, -/obj/effect/spawner/random/entertainment/drugs, -/obj/effect/spawner/random/entertainment/drugs, -/obj/item/reagent_containers/syringe/contraband/space_drugs, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/turf/open/floor/stone, +/area/station/smithing) "gQq" = ( /obj/machinery/computer/mecha{ dir = 1 @@ -24916,14 +24913,14 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/shutters{ dir = 4; id = "commissaryshutter"; - name = "Vacant Commissary Shutter" + name = "Smithing Shutter" }, -/obj/effect/turf_decal/delivery, /turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/area/station/smithing) "hXE" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -25053,16 +25050,16 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/execution/transfer) "hZb" = ( -/obj/effect/landmark/navigate_destination/common/vaccommissary, -/obj/machinery/door/airlock{ - id_tag = "commissarydoor"; - name = "Commissary" - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/grunge{ + name = "Blacksmithing Section" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/general, /turf/open/floor/iron/dark, -/area/station/commons/vacant_room/commissary) +/area/station/smithing) "hZd" = ( /obj/structure/flora/tree/jungle/style_random, /turf/open/floor/grass, @@ -28404,6 +28401,14 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"jaf" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners{ + dir = 1 + }, +/obj/structure/machine/assembly_bench, +/turf/open/floor/stone, +/area/station/smithing) "jam" = ( /obj/machinery/light/directional/north, /obj/machinery/medical_kiosk{ @@ -29445,17 +29450,13 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "jsu" = ( -/obj/machinery/light/small/directional/north, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/kirbyplants{ - icon_state = "applebush" - }, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/turf/open/floor/stone, +/area/station/smithing) "jsv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29857,7 +29858,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/button/door/directional/east{ id = "commissarydoor"; - name = "Commissary Door Lock"; + name = "Smithing Door Lock"; normaldoorcontrol = 1; specialfunctions = 4; pixel_x = 0; @@ -29866,8 +29867,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/turf/open/floor/stone, +/area/station/smithing) "jBh" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -29944,8 +29945,11 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/item/kirbyplants{ + icon_state = "applebush" + }, +/turf/open/floor/stone, +/area/station/smithing) "jCz" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -31299,21 +31303,13 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "jZX" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 4 +/obj/machinery/electroplater, +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/obj/item/pen, -/obj/effect/spawner/random/entertainment/drugs, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/turf/open/floor/wood, +/area/station/smithing) "kac" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -32483,8 +32479,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/turf/open/floor/stone, +/area/station/smithing) "kvo" = ( /obj/structure/table, /obj/machinery/firealarm/directional/west, @@ -35443,7 +35439,7 @@ /area/station/science/robotics/lab) "lpU" = ( /turf/closed/wall/r_wall/rust, -/area/station/commons/vacant_room/commissary) +/area/station/smithing) "lql" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/corner{ @@ -36344,8 +36340,9 @@ dir = 1 }, /obj/effect/turf_decal/box, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/structure/cable, +/turf/open/floor/stone, +/area/station/smithing) "lEi" = ( /obj/effect/turf_decal/tile/neutral, /obj/item/kirbyplants, @@ -38672,8 +38669,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/machinery/material_analyzer, +/turf/open/floor/stone, +/area/station/smithing) "mrW" = ( /obj/machinery/artifact_xray, /obj/machinery/light/small/directional/east, @@ -38843,12 +38841,11 @@ /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, -/obj/machinery/airalarm/directional/north, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/machinery/light/small/directional/north, +/turf/open/floor/stone, +/area/station/smithing) "mvz" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -40328,15 +40325,10 @@ /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, -/obj/structure/rack, -/obj/item/screwdriver, -/obj/item/wrench, -/obj/item/crowbar, -/obj/item/wirecutters, /obj/machinery/light_switch/directional/west, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/machinery/arc_forge, +/turf/open/floor/stone, +/area/station/smithing) "mTw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43308,9 +43300,9 @@ "nUC" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/stool/directional/south, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/structure/chair/office/light, +/turf/open/floor/stone, +/area/station/smithing) "nUZ" = ( /obj/effect/turf_decal/delivery, /obj/structure/extinguisher_cabinet/directional/south, @@ -44370,16 +44362,14 @@ /area/station/hallway/primary/central/fore) "oqv" = ( /obj/structure/sign/poster/contraband/random/directional/west, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners{ +/obj/machinery/airalarm/directional/south, +/obj/structure/anvil, +/obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/table, -/obj/item/newspaper, -/obj/effect/spawner/random/entertainment/drugs, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/item/stack/sheet/iron/ten, +/turf/open/floor/wood, +/area/station/smithing) "oqN" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -47032,8 +47022,9 @@ /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/structure/cable, +/turf/open/floor/stone, +/area/station/smithing) "pjV" = ( /obj/structure/table/wood, /obj/machinery/newscaster/directional/east, @@ -51088,7 +51079,7 @@ /area/station/commons/fitness/recreation) "qBs" = ( /turf/closed/wall/rust, -/area/station/commons/vacant_room/commissary) +/area/station/smithing) "qBt" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -51542,8 +51533,9 @@ id = "commissaryshutter"; name = "Commissary Shutter Control" }, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/obj/structure/cable, +/turf/open/floor/stone, +/area/station/smithing) "qJf" = ( /turf/open/floor/wood, /area/station/service/bar/atrium) @@ -53680,8 +53672,8 @@ /obj/structure/chair/office/light{ dir = 4 }, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/turf/open/floor/stone, +/area/station/smithing) "rqJ" = ( /obj/effect/turf_decal/box, /obj/structure/cable, @@ -55519,8 +55511,8 @@ dir = 4 }, /obj/effect/turf_decal/box, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/turf/open/floor/stone, +/area/station/smithing) "rTp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60109,8 +60101,8 @@ "tnN" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/turf/open/floor/stone, +/area/station/smithing) "tnP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -64545,7 +64537,7 @@ /area/station/science/genetics) "uJV" = ( /turf/closed/wall, -/area/station/commons/vacant_room/commissary) +/area/station/smithing) "uJZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/office, @@ -70252,12 +70244,8 @@ /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, -/obj/structure/table, -/obj/item/stack/sheet/iron/five, -/obj/item/stack/cable_coil/five, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) +/turf/open/floor/stone, +/area/station/smithing) "wwS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/depsec/medical, @@ -98714,7 +98702,7 @@ uVP lsF cgm uJV -duM +jsu tnN rTn nUC @@ -99487,7 +99475,7 @@ uwR uJV hZb uJV -dVa +jaf rqI jCw ayV @@ -99744,7 +99732,7 @@ hoK vkC scE uJV -hXu +cFx hXu hXu lpU From 0669d5c127830298df609b9fceb8a36648732dae Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 22 Apr 2024 23:27:46 +0200 Subject: [PATCH 50/59] small pipe changes --- _maps/map_files/KiloStation/KiloStation.dmm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 94e195c7cf9a..4a774bfb1126 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -12216,6 +12216,8 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/stone, /area/station/smithing) "dVb" = ( @@ -32474,13 +32476,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) -"kvn" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/stone, -/area/station/smithing) "kvo" = ( /obj/structure/table, /obj/machinery/firealarm/directional/west, @@ -38841,8 +38836,6 @@ /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/directional/north, /turf/open/floor/stone, /area/station/smithing) @@ -51534,6 +51527,8 @@ name = "Commissary Shutter Control" }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/stone, /area/station/smithing) "qJf" = ( @@ -98960,7 +98955,7 @@ aNE vKT qBs mvf -kvn +tnN pjT lEe cRY From 69d3fe0c33b437354da21693c92043bda10315f2 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 22 Apr 2024 23:30:25 +0200 Subject: [PATCH 51/59] adds decals back in --- _maps/map_files/KiloStation/KiloStation.dmm | 44 ++++++++++++--------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 4a774bfb1126..d8c6562fd721 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -4913,6 +4913,13 @@ /obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"bGN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/stripes{ + dir = 6 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/smithing) "bGY" = ( /obj/structure/sign/warning/engine_safety, /turf/closed/wall/r_wall, @@ -8721,6 +8728,7 @@ dir = 5 }, /obj/item/stack/sheet/iron/ten, +/obj/effect/turf_decal/bot, /turf/open/floor/wood, /area/station/smithing) "cSg" = ( @@ -17139,6 +17147,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"fzW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/stripes, +/turf/open/floor/iron/dark/textured_large, +/area/station/smithing) "fAI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -28409,6 +28422,7 @@ dir = 1 }, /obj/structure/machine/assembly_bench, +/obj/effect/turf_decal/delivery, /turf/open/floor/stone, /area/station/smithing) "jam" = ( @@ -29452,12 +29466,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "jsu" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/stone, +/turf/open/floor/iron/dark/textured_large, /area/station/smithing) "jsv" = ( /obj/structure/cable, @@ -31310,6 +31320,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, +/obj/effect/turf_decal/bot, /turf/open/floor/wood, /area/station/smithing) "kac" = ( @@ -38665,6 +38676,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/material_analyzer, +/obj/effect/turf_decal/delivery, /turf/open/floor/stone, /area/station/smithing) "mrW" = ( @@ -38832,12 +38844,11 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "mvf" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, /obj/machinery/light/small/directional/north, -/turf/open/floor/stone, +/obj/effect/turf_decal/stripes{ + dir = 5 + }, +/turf/open/floor/iron/dark/textured_large, /area/station/smithing) "mvz" = ( /obj/machinery/door/airlock/research{ @@ -40314,13 +40325,10 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "mTd" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, /obj/machinery/light_switch/directional/west, /obj/machinery/arc_forge, -/turf/open/floor/stone, +/obj/effect/turf_decal/stripes, +/turf/open/floor/iron/dark/textured_large, /area/station/smithing) "mTw" = ( /obj/effect/turf_decal/stripes/line{ @@ -40439,7 +40447,6 @@ /turf/open/floor/plating, /area/station/security/prison) "mUR" = ( -/obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/station/bitrunning/den) @@ -44361,6 +44368,7 @@ dir = 1 }, /obj/item/stack/sheet/iron/ten, +/obj/effect/turf_decal/bot, /turf/open/floor/wood, /area/station/smithing) "oqN" = ( @@ -98698,7 +98706,7 @@ lsF cgm uJV jsu -tnN +fzW rTn nUC jZX @@ -98955,7 +98963,7 @@ aNE vKT qBs mvf -tnN +bGN pjT lEe cRY From f2e9c5c61d3516309077a6813eb4a29113ffadcd Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Fri, 3 May 2024 10:44:35 +0200 Subject: [PATCH 52/59] craig my beloved --- _maps/map_files/KiloStation/KiloStation.dmm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 8dc6ca81fbc6..be01a38a8133 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -25284,12 +25284,12 @@ /turf/closed/wall/r_wall, /area/station/security/prison) "ifY" = ( -/obj/machinery/growing/soil, /obj/item/shovel/spade, /obj/item/cultivator{ pixel_x = 8 }, /obj/structure/cable, +/obj/machinery/growing/tray, /turf/open/floor/grass, /area/station/security/prison/garden) "igl" = ( @@ -55560,12 +55560,12 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/pathology) "rXF" = ( -/obj/machinery/growing/soil, /obj/item/shovel/spade, /obj/item/cultivator{ pixel_x = 9 }, /obj/machinery/status_display/evac/directional/south, +/obj/machinery/growing/tray, /turf/open/floor/grass, /area/station/security/prison/garden) "rYc" = ( @@ -57958,6 +57958,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/misc/asteroid, /area/space/nearstation) +"sIg" = ( +/mob/living/basic/pet/potty, +/turf/open/floor/glass, +/area/station/service/hydroponics) "sIo" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/computer/nanite_chamber_control, @@ -65775,7 +65779,6 @@ /obj/machinery/fishing_portal_generator, /obj/effect/turf_decal/bot/right, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/maintenance/department/bridge) "vgz" = ( @@ -110250,7 +110253,7 @@ nUl udF fba xHP -fLv +sIg rbO xhG wLC From 11e07c9bc72852b06c74996306d31b25014030ac Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 11 May 2024 14:04:47 +0200 Subject: [PATCH 53/59] updated perma kitchen, config file and one other thingy --- _maps/map_files/KiloStation/KiloStation.dmm | 1057 ++++++++++++------- config/maps.txt | 7 +- 2 files changed, 677 insertions(+), 387 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index be01a38a8133..d1956cf05a20 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -316,6 +316,12 @@ /obj/structure/cable/layer3, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat_interior) +"acA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/security/prison) "acF" = ( /obj/structure/sign/warning/radiation, /turf/closed/wall/rust, @@ -1434,9 +1440,11 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard) "arX" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/drinkingglass, /obj/structure/cable, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/security/prison/mess) "asu" = ( @@ -1590,6 +1598,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/security/prison/mess) "awa" = ( @@ -1643,16 +1653,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"awv" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "aww" = ( /obj/machinery/door/airlock/security/glass{ name = "Transferring Centre" @@ -2715,9 +2715,23 @@ /turf/open/floor/iron, /area/station/security/office) "aRH" = ( -/obj/structure/chair{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/toy/figure/prisoner{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + layer = 3.1; + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/security/prison/mess) "aRI" = ( @@ -2947,6 +2961,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron, /area/station/security/prison/garden) "aVx" = ( @@ -3179,7 +3194,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/small/directional/east, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "baK" = ( /obj/effect/decal/cleanable/dirt, @@ -3789,6 +3804,23 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) +"blW" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 10 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/security/prison) "blX" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/closed/wall, @@ -4041,6 +4073,13 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"brr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "brz" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -4915,7 +4954,6 @@ dir = 4 }, /obj/structure/sink/directional/west, -/obj/item/reagent_containers/cup/watering_can, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5058,7 +5096,8 @@ "bKj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/plating, +/obj/structure/table, +/turf/open/floor/catwalk_floor, /area/station/security/prison/mess) "bKl" = ( /obj/structure/flora/rock/pile/style_random, @@ -5239,6 +5278,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison/safe) +"bNT" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/prison) "bOn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -5785,6 +5829,10 @@ "bYl" = ( /turf/closed/wall/r_wall, /area/station/security/checkpoint/medical) +"bYq" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/glass/plasma, +/area/station/security/prison) "bYK" = ( /obj/machinery/button/flasher{ id = "visitorflash"; @@ -7233,9 +7281,16 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "cso" = ( -/obj/structure/table, -/obj/item/kitchen/fork/plastic, /obj/structure/cable, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) +"csG" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/grill, /turf/open/floor/iron/white, /area/station/security/prison/mess) "csL" = ( @@ -8450,7 +8505,7 @@ /area/space/nearstation) "cOf" = ( /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "cOp" = ( /obj/structure/sign/warning/docking, @@ -8563,6 +8618,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) +"cQY" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/security/prison) "cRq" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -8938,10 +8999,9 @@ /turf/closed/wall, /area/station/security/brig) "cXv" = ( -/obj/structure/table, -/obj/item/food/energybar, /obj/structure/cable, -/turf/open/floor/iron/white, +/obj/machinery/smartfridge, +/turf/closed/wall/r_wall, /area/station/security/prison/mess) "cXw" = ( /obj/machinery/door/airlock/maintenance{ @@ -9514,6 +9574,15 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"dgP" = ( +/obj/machinery/light/small/red/dim/directional/east, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/obj/structure/cable, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/engine, +/area/station/security/prison) "dgW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -9857,6 +9926,14 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, /turf/open/floor/iron/dark, /area/station/engineering/main) +"dmi" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/end{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/gibs/old, +/turf/open/floor/engine, +/area/station/security/prison) "dmp" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -10266,33 +10343,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "drM" = ( -/obj/structure/closet/crate, -/obj/item/reagent_containers/cup/bowl, -/obj/effect/spawner/random/contraband/prison, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/reagent_containers/cup/bowl, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/kitchen/fork/plastic, -/obj/item/storage/box/drinkingglasses, -/obj/item/kitchen/spoon/plastic, -/obj/item/kitchen/spoon/plastic, -/obj/item/kitchen/spoon/plastic, -/obj/item/knife/plastic, -/obj/item/knife/plastic, -/obj/item/knife/plastic, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/box/drinkingglasses, /obj/structure/cable, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/chair, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/security/prison/mess) "dsc" = ( @@ -10325,14 +10379,9 @@ /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "dsn" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 9; - pixel_y = 3 - }, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/item/radio/intercom/prison/directional/north, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/item/chair, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/security/prison/mess) "dsw" = ( @@ -10829,6 +10878,10 @@ /obj/item/food/cracker, /turf/open/floor/carpet/royalblue, /area/station/service/chapel/office) +"dCk" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/ballpit, +/area/station/security/prison) "dCv" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/navbeacon{ @@ -10956,6 +11009,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard) +"dEO" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/trimline/red/filled/end{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/security/prison) "dEX" = ( /turf/open/floor/iron/dark, /area/station/service/chapel/dock) @@ -12075,11 +12141,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/broken_floor, /obj/structure/sign/directions/cryo/directional/north{ pixel_x = -32 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "dYy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12847,6 +12912,9 @@ "ekp" = ( /turf/open/floor/plating/airless, /area/station/maintenance/disposal/incinerator) +"ekH" = ( +/turf/open/floor/glass/plasma, +/area/station/security/prison) "ekL" = ( /turf/closed/wall/rust, /area/station/service/kitchen/coldroom) @@ -13696,12 +13764,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) -"ezC" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating/rust, -/area/station/security/prison) "ezV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, @@ -13884,13 +13946,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard) -"eCu" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating/rust, -/area/station/security/prison) "eCy" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, @@ -14566,10 +14621,9 @@ /turf/open/floor/iron, /area/station/security/brig) "eOh" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/red, -/obj/structure/reagent_dispensers/servingdish, -/turf/open/floor/iron/white, +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/station/security/prison/mess) "eOj" = ( /obj/structure/cable, @@ -14891,14 +14945,9 @@ /turf/open/floor/iron/dark, /area/station/service/chapel) "eUd" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/book/manual/chef_recipes, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/table, +/obj/structure/reagent_dispensers/servingdish, /turf/open/floor/iron/white, /area/station/security/prison/mess) "eUk" = ( @@ -15506,6 +15555,11 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"ffc" = ( +/obj/structure/frame, +/obj/machinery/light/small/red/dim/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/security/prison) "ffi" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/green{ @@ -15735,6 +15789,19 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/maintenance/department/medical/pathology) +"fiq" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/security/prison) "fix" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -15849,6 +15916,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) +"fke" = ( +/obj/structure/cable, +/obj/structure/frame/computer{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/prison) "fkw" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -16072,6 +16147,10 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"fnx" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/security/prison) "fnL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16121,10 +16200,14 @@ /turf/open/space/basic, /area/space/nearstation) "fov" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, /obj/machinery/status_display/ai/directional/east, +/obj/machinery/door/airlock{ + name = "Prison Kitchen" + }, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/security/prison/mess) "foB" = ( @@ -16779,7 +16862,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/effect/mapping_helpers/burnt_floor, /mob/living/carbon/human/species/monkey/dukeman, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "fxY" = ( /obj/effect/decal/cleanable/blood/old, @@ -18362,7 +18445,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "fVF" = ( -/obj/effect/spawner/structure/window, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/medical/medbay/central) "fVO" = ( @@ -18388,10 +18471,15 @@ /turf/open/floor/iron, /area/station/security/brig) "fWk" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/structure/cable, +/obj/structure/closet/crate, +/obj/item/food/grown/onion, +/obj/item/food/grown/onion, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/breadslice/plain, +/obj/item/food/breadslice/plain, +/obj/item/food/breadslice/plain, +/obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) "fWq" = ( @@ -18855,6 +18943,10 @@ }, /turf/open/floor/wood, /area/station/security/detectives_office) +"gdW" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "gel" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -19120,6 +19212,11 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tcomms) +"giQ" = ( +/obj/structure/frame, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/prison) "giR" = ( /obj/structure/table/glass, /obj/item/folder/white, @@ -19414,6 +19511,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/security/prison) "gos" = ( @@ -19834,6 +19932,13 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard) +"guV" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/security/prison) "gva" = ( /obj/structure/grille, /turf/closed/wall/r_wall/rust, @@ -19939,6 +20044,13 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/science/lab) +"gxP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/small/directional/south, +/turf/open/floor/catwalk_floor, +/area/station/security/prison) "gxR" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, @@ -20236,6 +20348,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"gDp" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "gDu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -20386,11 +20505,10 @@ /turf/open/floor/iron, /area/station/security/courtroom) "gFL" = ( -/obj/structure/table, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/rice, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/chair{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/security/prison/mess) "gFO" = ( @@ -20881,16 +20999,9 @@ /turf/open/floor/iron/dark, /area/station/security/processing) "gOG" = ( -/obj/structure/closet/crate, -/obj/item/food/breadslice/plain, -/obj/item/food/breadslice/plain, -/obj/item/food/breadslice/plain, -/obj/item/food/grown/potato, -/obj/item/food/grown/potato, -/obj/item/food/grown/onion, -/obj/item/food/grown/onion, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/table, /turf/open/floor/iron/white, /area/station/security/prison/mess) "gPv" = ( @@ -21490,8 +21601,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/iron, /area/station/security/prison) "gYE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21802,6 +21913,11 @@ }, /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) +"hfK" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "hfP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -21896,7 +22012,7 @@ "hhp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "hhE" = ( /obj/item/kirbyplants{ @@ -22328,6 +22444,13 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"hmM" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/decal/cleanable/piss_stain, +/turf/open/ballpit, +/area/station/security/prison) "hmO" = ( /turf/closed/wall, /area/station/security/processing) @@ -22841,9 +22964,6 @@ /turf/open/floor/wood/parquet, /area/station/service/bar/backroom) "hxd" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, /obj/item/trash/cheesie, /obj/item/trash/syndi_cakes, /turf/open/floor/iron/white, @@ -23805,6 +23925,21 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"hLW" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/storage) +"hMc" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Prison Recreation"; + network = list("ss13","prison") + }, +/obj/machinery/light/small/red/dim/directional/west, +/obj/structure/kitchenspike, +/obj/effect/mob_spawn/corpse/human/damaged, +/obj/effect/turf_decal/bot/right, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/prison) "hMf" = ( /obj/structure/table/reinforced, /obj/structure/desk_bell{ @@ -24353,10 +24488,14 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "hTz" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -3 }, -/obj/machinery/newscaster/directional/west, +/obj/item/storage/fancy/egg_box, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/security/prison/mess) "hTB" = ( @@ -25088,9 +25227,6 @@ /turf/open/floor/iron/dark, /area/station/medical/office) "idq" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -25644,6 +25780,12 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"iml" = ( +/obj/structure/kitchenspike, +/obj/effect/decal/cleanable/piss_stain, +/obj/effect/mob_spawn/corpse/human/damaged, +/turf/open/ballpit, +/area/station/security/prison) "imo" = ( /obj/structure/sign/directions/science{ dir = 4; @@ -27178,12 +27320,10 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "iJy" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/station/security/prison/mess) "iJM" = ( @@ -27581,7 +27721,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison/garden) "iQn" = ( /obj/effect/turf_decal/tile/neutral{ @@ -29361,7 +29501,7 @@ dir = 1 }, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "jsc" = ( /obj/machinery/light_switch/directional/east{ @@ -30424,7 +30564,7 @@ /turf/closed/wall/r_wall, /area/station/security/detectives_office) "jKZ" = ( -/obj/machinery/vending/sustenance, +/obj/item/radio/intercom/prison/directional/north, /turf/open/floor/iron/white, /area/station/security/prison/mess) "jLk" = ( @@ -30994,6 +31134,14 @@ "jUU" = ( /turf/closed/wall/rust, /area/station/medical/morgue) +"jUX" = ( +/obj/effect/decal/cleanable/blood/gibs/old, +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/security/prison) "jVA" = ( /obj/structure/table, /obj/item/paper_bin, @@ -31349,6 +31497,7 @@ c_tag = "Prison Labor"; network = list("ss13","prison") }, +/obj/machinery/firealarm/directional/north, /turf/open/floor/plating, /area/station/security/prison) "kbK" = ( @@ -31573,6 +31722,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"khg" = ( +/obj/machinery/light/small/red/dim/directional/east, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/ballpit, +/area/station/security/prison) "khm" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/toolbox/mechanical/old, @@ -31636,6 +31790,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/prison) "kiZ" = ( @@ -31731,7 +31888,10 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 6 + }, +/turf/open/floor/iron, /area/station/security/prison) "kll" = ( /obj/machinery/computer/mech_bay_power_console{ @@ -34763,6 +34923,24 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"ljM" = ( +/obj/effect/decal/cleanable/piss_stain, +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 10 + }, +/obj/effect/turf_decal/caution, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/security/prison) "lkl" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, @@ -34877,9 +35055,7 @@ "lmr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/door/airlock{ - name = "Prison Kitchen" - }, +/obj/machinery/newscaster/directional/west, /turf/open/floor/iron/white, /area/station/security/prison/mess) "lmA" = ( @@ -37423,9 +37599,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) "mes" = ( -/obj/structure/table, -/obj/item/storage/bag/tray/cafeteria, /obj/structure/cable, +/obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) "meA" = ( @@ -38084,10 +38259,11 @@ /turf/open/floor/plating, /area/station/cargo/warehouse) "moc" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, /obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sink/kitchen/directional/west, /turf/open/floor/iron/white, /area/station/security/prison/mess) "mod" = ( @@ -38621,6 +38797,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/closet/crate/hydroponics, +/obj/effect/spawner/random/food_or_drink/seed{ + spawn_all_loot = 1; + spawn_random_offset = 1 + }, +/obj/effect/spawner/random/contraband/prison, /turf/open/floor/iron, /area/station/security/prison/garden) "mzp" = ( @@ -39462,6 +39644,14 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/engineering/atmos) +"mOi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "mOz" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -39857,8 +40047,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "mVf" = ( /obj/structure/disposalpipe/segment{ @@ -40244,8 +40433,9 @@ /turf/closed/wall/r_wall, /area/station/security/courtroom) "nbC" = ( -/obj/effect/turf_decal/trimline/red/filled/line, /obj/item/radio/intercom/prison/directional/south, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/deepfryer, /turf/open/floor/iron/white, /area/station/security/prison/mess) "nbH" = ( @@ -40281,12 +40471,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) -"nbO" = ( -/obj/structure/table, -/obj/structure/cable, -/obj/item/food/sausage, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "nbR" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -40583,8 +40767,8 @@ /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "ngI" = ( -/obj/machinery/light/small/directional/north, /obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/security/prison) "ngY" = ( @@ -40772,6 +40956,10 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/commons/fitness/recreation) +"nlp" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/security/prison) "nlq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41078,6 +41266,13 @@ /obj/item/knife/combat/survival, /turf/open/floor/carpet/green, /area/station/cargo/warehouse) +"nqE" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/old, +/turf/open/ballpit, +/area/station/security/prison) "nqM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42916,7 +43111,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/lockers) "nZU" = ( -/obj/effect/spawner/structure/window, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/medical/treatment_center) "oak" = ( @@ -44662,7 +44857,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison/safe) "oCF" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -45790,12 +45985,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/security/prison/mess) -"oWI" = ( -/obj/structure/table/reinforced, -/obj/structure/reagent_dispensers/servingdish, -/turf/open/floor/iron/white, +/turf/open/floor/catwalk_floor, /area/station/security/prison/mess) "oXa" = ( /obj/effect/turf_decal/tile/blue{ @@ -46472,6 +46662,12 @@ dir = 4 }, /area/station/hallway/primary/port) +"piT" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/trimline/red/filled/line, +/turf/open/floor/engine, +/area/station/security/prison) "piW" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -47670,11 +47866,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/cargo/warehouse) -"pCP" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/spawner/random/trash/cigbutt, -/turf/open/floor/plating, -/area/station/security/prison) "pCQ" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/grass, @@ -48167,7 +48358,7 @@ /area/station/commons/fitness/recreation) "pKm" = ( /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison/shower) "pKt" = ( /obj/effect/turf_decal/stripes/line{ @@ -48211,11 +48402,12 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "pKQ" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, /obj/machinery/light/directional/east, -/obj/machinery/computer/security/telescreen/entertainment/directional/east, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/station/security/prison/mess) "pKR" = ( @@ -48239,7 +48431,7 @@ }, /obj/item/stack/package_wrap, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "pLl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -48622,6 +48814,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"pQm" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/gibs/old, +/turf/open/floor/engine, +/area/station/security/prison) "pQn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49965,6 +50165,12 @@ "qlC" = ( /turf/closed/wall/rust, /area/station/maintenance/fore) +"qlS" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "qlV" = ( /obj/effect/turf_decal/stripes, /obj/effect/decal/cleanable/greenglow, @@ -50646,9 +50852,6 @@ /turf/open/floor/iron, /area/station/cargo/storage) "qxD" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, /obj/structure/chair/stool/directional/south, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -50807,7 +51010,7 @@ "qAg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "qAn" = ( /obj/machinery/door/firedoor, @@ -52050,8 +52253,14 @@ /obj/machinery/holopad, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"qVG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/security/prison) "qVJ" = ( /obj/structure/cable, /obj/effect/landmark/start/hangover, @@ -52143,7 +52352,7 @@ /obj/machinery/plate_press, /obj/machinery/light/small/directional/south, /obj/item/radio/intercom/directional/south, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "qWS" = ( /obj/effect/spawner/structure/window/reinforced, @@ -52522,6 +52731,8 @@ "rdo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/security/prison/mess) "rdp" = ( @@ -52686,7 +52897,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "rfb" = ( /obj/structure/disposalpipe/segment, @@ -53982,12 +54193,16 @@ /turf/open/floor/iron, /area/station/commons/storage/primary) "rxW" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, /obj/effect/decal/cleanable/vomit/old, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/table, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 9; + pixel_y = 3 + }, +/obj/item/book/manual/chef_recipes, /turf/open/floor/iron/white, /area/station/security/prison/mess) "ryn" = ( @@ -54661,6 +54876,10 @@ /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/chapel) +"rJT" = ( +/obj/structure/frame, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/security/prison) "rKa" = ( /obj/effect/spawner/structure/window/hollow/reinforced/directional{ dir = 10 @@ -55028,9 +55247,32 @@ /turf/open/floor/iron/dark, /area/station/security/medical) "rOC" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, +/obj/structure/closet/crate, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/item/reagent_containers/cup/bowl, +/obj/effect/spawner/random/contraband/prison, +/obj/item/reagent_containers/cup/bowl, +/obj/item/knife/plastic, +/obj/item/knife/plastic, +/obj/item/knife/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/fork/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/item/kitchen/spoon/plastic, +/obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) "rOJ" = ( @@ -55670,6 +55912,12 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/science/research) +"saI" = ( +/obj/structure/kitchenspike, +/obj/effect/mob_spawn/corpse/human/damaged, +/obj/effect/turf_decal/bot/right, +/turf/open/floor/iron/dark/textured_large, +/area/station/security/prison) "saT" = ( /obj/machinery/light_switch/directional/south, /obj/structure/cable, @@ -56247,6 +56495,10 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) +"shY" = ( +/obj/effect/decal/cleanable/blood/gibs/old, +/turf/open/floor/plating, +/area/station/security/prison) "shZ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56562,7 +56814,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison/garden) "smQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -56712,24 +56964,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) -"soZ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - layer = 3.1; - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/toy/figure/prisoner{ - pixel_x = 3; - pixel_y = 6 - }, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "spi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57071,6 +57305,7 @@ /area/station/command/heads_quarters/cmo) "ssF" = ( /obj/structure/cable, +/obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/iron, /area/station/security/prison) "ssI" = ( @@ -57389,7 +57624,16 @@ "sza" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating/rust, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/effect/turf_decal/caution/red{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, /area/station/security/prison) "szg" = ( /obj/machinery/computer/telecomms/monitor, @@ -57398,12 +57642,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) -"szK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating/rust, -/area/station/security/prison) "szL" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -57442,7 +57680,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "sAv" = ( /turf/closed/wall/r_wall, @@ -58001,9 +58239,6 @@ /area/station/engineering/atmos/storage/gas) "sIF" = ( /obj/machinery/vending/cola/red, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, /obj/machinery/light/directional/north, /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -58306,6 +58541,13 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"sMp" = ( +/obj/effect/turf_decal/trimline/red/filled/corner, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/security/prison) "sME" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60279,6 +60521,10 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"tpJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/security/prison/mess) "tpY" = ( /obj/machinery/vending/autodrobe/all_access, /obj/structure/noticeboard/directional/west, @@ -60715,6 +60961,20 @@ }, /turf/open/floor/iron, /area/station/security/processing) +"txM" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "[PH] BITRUNNER DEN" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/locked, +/obj/structure/cable, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/structure/barricade/wooden/crude, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/security/prison) "tya" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /obj/effect/decal/cleanable/blood/old, @@ -61079,6 +61339,20 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/station/cargo/drone_bay) +"tDR" = ( +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/gibs/old, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/security/prison) "tDT" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/south, @@ -62113,9 +62387,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "tWA" = ( -/obj/structure/table, /obj/structure/cable, -/obj/item/food/spiderleg, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison/mess) "tWL" = ( @@ -62482,8 +62756,9 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "ubN" = ( -/obj/effect/turf_decal/trimline/red/filled/line, /obj/structure/cable, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/oven/range, /turf/open/floor/iron/white, /area/station/security/prison/mess) "ubU" = ( @@ -63886,6 +64161,10 @@ /obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/port/lesser) +"uzF" = ( +/obj/effect/turf_decal/trimline/red/filled/end, +/turf/open/floor/engine, +/area/station/security/prison) "uzQ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -64481,12 +64760,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) -"uJn" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "uJE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -66303,6 +66576,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"vpn" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/corner{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/security/prison) "vps" = ( /obj/structure/sign/warning/electric_shock, /turf/closed/wall/r_wall, @@ -67623,6 +67906,13 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall, /area/station/maintenance/starboard/aft) +"vGx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/catwalk_floor, +/area/station/security/prison) "vGP" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -68424,9 +68714,7 @@ "vRB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison/mess) "vRK" = ( @@ -69397,7 +69685,7 @@ /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai_upload) "wfJ" = ( -/obj/effect/spawner/structure/window, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/medical/cryo) "wfR" = ( @@ -69753,8 +70041,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "wkP" = ( /obj/structure/weightmachine/weightlifter, @@ -70220,9 +70507,15 @@ /turf/open/floor/plating, /area/station/maintenance/department/security) "wre" = ( -/obj/structure/table, -/obj/machinery/microwave, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/item/chair{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/south, /turf/open/floor/iron/white, /area/station/security/prison/mess) "wrp" = ( @@ -70293,6 +70586,10 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) +"wtl" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/ballpit, +/area/station/security/prison) "wtt" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -71346,9 +71643,15 @@ /turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "wMH" = ( -/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/griddle, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"wMR" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/security/prison) "wMY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -72756,13 +73059,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/storage) -"xky" = ( -/obj/structure/sink/kitchen/directional/east{ - desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; - name = "old sink" - }, -/turf/open/floor/plating, -/area/station/security/prison) "xkP" = ( /obj/structure/table/wood, /obj/item/storage/photo_album{ @@ -73792,12 +74088,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"xAQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/security/prison) "xAW" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/delivery, @@ -74009,13 +74299,18 @@ /turf/open/floor/plating, /area/station/security/prison) "xDE" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, /obj/machinery/camera/directional/south{ c_tag = "Prison Cafeteria"; network = list("ss13","prison") }, +/obj/structure/table, +/obj/machinery/microwave, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/machinery/light/directional/south, /turf/open/floor/iron/white, /area/station/security/prison/mess) "xDG" = ( @@ -74136,10 +74431,6 @@ }, /turf/open/misc/asteroid/airless, /area/space/nearstation) -"xGN" = ( -/obj/structure/cable, -/turf/open/floor/plating/rust, -/area/station/security/prison) "xGQ" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/air, @@ -74230,10 +74521,9 @@ /area/station/engineering/atmos) "xIJ" = ( /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/table, +/obj/structure/reagent_dispensers/servingdish, /turf/open/floor/iron/white, /area/station/security/prison/mess) "xJc" = ( @@ -74650,6 +74940,11 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/engine, /area/station/science/xenobiology) +"xSd" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/security/prison) "xSn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -75600,9 +75895,7 @@ /turf/open/floor/iron, /area/station/command/bridge) "ygt" = ( -/obj/structure/chair{ - dir = 8 - }, +/obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) "ygA" = ( @@ -75818,7 +76111,7 @@ "yjM" = ( /obj/machinery/plate_press, /obj/machinery/light/small/directional/south, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/security/prison) "yjV" = ( /obj/machinery/computer/crew{ @@ -79705,13 +79998,13 @@ aaa aaa aaa aaa +aeU +coy +aeU aaa aaa -aaa -aaa -aaa -aaa -aaa +aeU +aeU aaa aaa aaa @@ -79962,13 +80255,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aUz +aeU +aeU +aeu +aeu +aeu +aUz aaa aaa aaa @@ -80216,17 +80509,17 @@ aeU aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sAv +lrq +sAv +bNT +bNT +bNT +sAv +lrq +lrq +aeU +aeU aaa aaa aaa @@ -80473,18 +80766,18 @@ mWy mWy mWy mWy +sAv +saI +hMc +saI +dmi +rJT +ffc +rJT +lrq +coy aeU aeU -aeU -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -80729,8 +81022,16 @@ nKO mWy vUO esv -mWy -ifQ +isS +lrq +dEO +tDR +blW +vpn +cQY +sMp +uzF +bNT aeU aeU aeU @@ -80819,14 +81120,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (20,1,1) = {" aaa @@ -80987,11 +81280,17 @@ pbx gSc isS xUB -sAv -aeU -aeU -aeU +lrq +nqE +hmM +fiq +ekH +ekH +piT +fke +bNT aeU +aUz aeU aaa aaa @@ -81078,12 +81377,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (21,1,1) = {" aaa @@ -81244,18 +81537,18 @@ oQv dxf mJA eEi -mWy +sAv +dCk +wtl +fiq +bYq +ekH +wMR +giQ +bNT aeU -coy aeU aeU -aeu -aeu -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -81502,17 +81795,17 @@ kvU mTM mRm sAv -aUz -aeU -aeU -aeu -aeu -aeu +iml +khg +ljM +pQm +guV +dgP +giQ +sAv aeu -aaa -aaa -aaa -aaa +aeU +coy aaa aaa aaa @@ -81759,9 +82052,12 @@ sHX mTM oNf lrq -mWy -mWy -mWy +sAv +sAv +txM +sAv +sAv +sAv sAv sAv aeu @@ -81852,9 +82148,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa "} (24,1,1) = {" aaa @@ -82010,19 +82303,22 @@ dXW aDD aDD hkF -mqC +fnx cUw pSN hhp -aDD +shY clR -mqC -aDD +xSd +jUX sza kiW mWy aeu aeu +aeu +aeu +aUz aeU aaa aaa @@ -82109,9 +82405,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa "} (25,1,1) = {" aaa @@ -82262,18 +82555,18 @@ juJ ffx ffx nbN -kkV -kkV -eCu -kkV -kkV +acA +acA +baG +vGx +acA goj -kkV +vGx baG mUA -kkV gYA -goj +gYA +gYA gYA kkV ssF @@ -82282,8 +82575,8 @@ aeu aUz aeU aeU -aaa -aaa +aeU +aeU aaa aaa aaa @@ -82527,11 +82820,11 @@ aes dWG sAv sAv -xGN +cOf gyb gyb xlA -pCP +cUw sAm wkP mWy @@ -82789,7 +83082,7 @@ ajw ajw gyb aDD -kkV +acA sAv sAv aeU @@ -83046,7 +83339,7 @@ xlA xlA aDD jYo -kkV +gxP sAv aeU aeU @@ -83303,7 +83596,7 @@ xlA xlA aDD wBf -kkV +acA myp jYh jYh @@ -83560,7 +83853,7 @@ bMw xlA gyb mqC -ezC +acA iQg smC smC @@ -83815,9 +84108,9 @@ mWy glo jsI xlA -xlA +qVG aDD -kkV +acA myp jYh jYh @@ -84330,7 +84623,7 @@ mTJ tMu lhv twX -mqC +nlp jhP sAv sAv @@ -84588,7 +84881,7 @@ kYP pKm rPm cOf -kkV +acA dAu qWN sAv @@ -84845,7 +85138,7 @@ lPU tns twX jYo -ezC +acA jrT pLi mWy @@ -85102,7 +85395,7 @@ twX nQK twX kbC -kkV +acA avs yjM sAv @@ -85355,8 +85648,8 @@ aaa aaa mWy huK -szK -xAQ +wkN +wkN wkN reX fxV @@ -85612,13 +85905,13 @@ aaa aaa mWy qAg -kkV +acA dHe jYo aDD -kkV +acA sAv -xky +aDD sAv sAv ifQ @@ -85872,7 +86165,7 @@ dWG oCE dWG dWG -saW +gdW oWG lmr bKj @@ -86131,9 +86424,9 @@ xZn eJN aAu avT -gSF +tpJ dsn -oSG +gDp drM tPH aeU @@ -86386,11 +86679,11 @@ eXX mbh oUS eJN -saW +gdW rdo -tPH +gdW gFL -oSG +gDp wre mEg cmU @@ -86644,8 +86937,8 @@ mbh wVI eJN saW -rdo -tPH +mOi +tpJ eUd oSG xIJ @@ -86901,11 +87194,11 @@ fQO dWG dWG jKZ -rdo +brr gSF -soZ eOh -oWI +eOh +gSF tPH aeU cmU @@ -87157,7 +87450,7 @@ wKG vmq pfO sJD -uJn +saW vRB hTz rOC @@ -87415,7 +87708,7 @@ kPd tpd sJD hxd -rdo +vRB cso tWA arX @@ -87672,9 +87965,9 @@ kPd hCK mMy sIF -rdo -ygt -ygt +vRB +qlS +hfK ygt wMH tPH @@ -87929,10 +88222,10 @@ kPd mvF jsV idq -rdo -aRH -aRH +vRB aRH +hfK +ygt nbC gSF cmU @@ -88188,9 +88481,9 @@ vAa qxD qVF cXv -nbO +tWA mes -ubN +csG tPH aeU aqQ @@ -88443,7 +88736,7 @@ iOR mvF agy iJy -awv +vRB fov moc pKQ @@ -95852,7 +96145,7 @@ nin tbA vmW stj -jop +hLW rfe bAA kfP @@ -96366,7 +96659,7 @@ lvw jCc nin fGE -jop +hLW cFu dRS rfb @@ -96623,7 +96916,7 @@ pTF nin nin spT -jop +hLW hDY bsA aOw diff --git a/config/maps.txt b/config/maps.txt index 575904db534d..2a42a84bcde3 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -25,6 +25,8 @@ map deltastation endmap map kilostation + maxplayers 40 + votable endmap map icebox @@ -42,17 +44,12 @@ map northstar votable endmap - map runtimestation endmap map multiz_debug endmap -map oshan - votable -endmap - map boxstation minplayers 25 votable From d021a72080227f09f7b90a6e0ed0f5f7d0bab1f9 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 11 May 2024 14:08:43 +0200 Subject: [PATCH 54/59] fix linters --- _maps/map_files/KiloStation/KiloStation.dmm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index d1956cf05a20..7c069ec0c079 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -60963,9 +60963,8 @@ /area/station/security/processing) "txM" = ( /obj/machinery/door/airlock/highsecurity{ - name = "[PH] BITRUNNER DEN" + name = "Bitrunner Den" }, -/obj/structure/cable, /obj/effect/mapping_helpers/airlock/locked, /obj/structure/cable, /obj/effect/decal/cleanable/blood/tracks{ From 863da56118c8051671a690aecb32de1a55131f51 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 11 May 2024 14:14:40 +0200 Subject: [PATCH 55/59] another one --- _maps/map_files/KiloStation/KiloStation.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 7c069ec0c079..1ff7ad3021f9 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -14019,7 +14019,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "eEi" = ( -/obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, @@ -21219,6 +21218,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/security/prison) "gSe" = ( @@ -68926,6 +68926,7 @@ "vUO" = ( /obj/item/canvas/nineteen_nineteen, /obj/structure/easel, +/obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/security/prison) "vUY" = ( @@ -75124,7 +75125,6 @@ pixel_y = 4 }, /obj/machinery/light/small/directional/south, -/obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/security/prison) "xUP" = ( From a3fad74ce7b52b1d9e2db0218d004581c7e8fb5b Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 11 May 2024 18:46:58 +0200 Subject: [PATCH 56/59] perma botany edits --- _maps/map_files/KiloStation/KiloStation.dmm | 60 +++++++++++++-------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 1ff7ad3021f9..ffb6c6c71fcf 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -2961,7 +2961,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron, /area/station/security/prison/garden) "aVx" = ( @@ -4957,6 +4956,19 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/closet/crate/hydroponics, +/obj/item/seeds/tree, +/obj/item/paper/guides/jobs/hydroponics, +/obj/item/seeds/onion, +/obj/item/seeds/garlic, +/obj/item/seeds/potato, +/obj/item/seeds/tomato, +/obj/item/seeds/carrot, +/obj/item/seeds/grass, +/obj/item/seeds/ambrosia, +/obj/item/seeds/wheat, +/obj/item/seeds/pumpkin, +/obj/effect/spawner/random/contraband/prison, /turf/open/floor/iron, /area/station/security/prison/garden) "bHR" = ( @@ -7832,18 +7844,9 @@ c_tag = "Prison Botany"; network = list("ss13","prison") }, -/obj/structure/closet/crate/hydroponics, -/obj/effect/spawner/random/contraband/prison, -/obj/item/seeds/pumpkin, -/obj/item/seeds/wheat, -/obj/item/seeds/ambrosia, -/obj/item/seeds/grass, -/obj/item/seeds/carrot, -/obj/item/seeds/tomato, -/obj/item/seeds/potato, -/obj/item/seeds/garlic, -/obj/item/seeds/onion, -/obj/item/paper/guides/jobs/hydroponics, +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, /turf/open/floor/iron, /area/station/security/prison/garden) "cEM" = ( @@ -24490,12 +24493,20 @@ "hTz" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/red/opposingcorners, -/obj/item/reagent_containers/condiment/rice, +/obj/item/reagent_containers/condiment/rice{ + pixel_y = 6 + }, /obj/item/reagent_containers/condiment/flour{ pixel_x = -3 }, -/obj/item/storage/fancy/egg_box, /obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/sugar{ + pixel_x = 7 + }, +/obj/item/storage/fancy/egg_box, /turf/open/floor/iron/white, /area/station/security/prison/mess) "hTB" = ( @@ -26192,6 +26203,11 @@ pixel_y = 3 }, /obj/structure/flora/bush/sparsegrass/style_random, +/obj/item/reagent_containers/cup/watering_can, +/obj/item/reagent_containers/cup/watering_can{ + pixel_x = 5; + pixel_y = 5 + }, /turf/open/floor/grass, /area/station/security/prison/garden) "irO" = ( @@ -38797,12 +38813,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/closet/crate/hydroponics, -/obj/effect/spawner/random/food_or_drink/seed{ - spawn_all_loot = 1; - spawn_random_offset = 1 - }, -/obj/effect/spawner/random/contraband/prison, /turf/open/floor/iron, /area/station/security/prison/garden) "mzp" = ( @@ -48646,6 +48656,14 @@ /obj/structure/flora/grass/jungle/b/style_random, /obj/structure/flora/bush/flowers_yw/style_random, /obj/item/plant_analyzer, +/obj/item/plant_analyzer{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/secateurs, +/obj/item/secateurs{ + pixel_y = -5 + }, /turf/open/floor/grass, /area/station/security/prison/garden) "pOq" = ( From 9e87f8d97367ace8bcd173ee1c3d4853e9f7b797 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Sat, 11 May 2024 20:27:58 +0200 Subject: [PATCH 57/59] adds the book --- _maps/map_files/KiloStation/KiloStation.dmm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ffb6c6c71fcf..87cdb208e6aa 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -4969,6 +4969,7 @@ /obj/item/seeds/wheat, /obj/item/seeds/pumpkin, /obj/effect/spawner/random/contraband/prison, +/obj/item/botanical_lexicon, /turf/open/floor/iron, /area/station/security/prison/garden) "bHR" = ( @@ -15374,6 +15375,7 @@ /obj/effect/turf_decal/trimline/green/end{ dir = 8 }, +/obj/item/botanical_lexicon, /turf/open/floor/iron, /area/station/service/hydroponics) "fbm" = ( From e4c8f31b6313b677cc3eaf1f5211e039eee6d6d6 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Wed, 22 May 2024 22:08:05 +0200 Subject: [PATCH 58/59] fixes before a round starts on it --- _maps/map_files/KiloStation/KiloStation.dmm | 68 ++++++++++++--------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 7a15898bc332..102cbf95d504 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -18193,6 +18193,16 @@ }, /turf/open/floor/engine, /area/station/security/prison) +"fMV" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/security/brig) "fNe" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -19003,6 +19013,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "gbF" = ( @@ -21847,6 +21858,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/item/kirbyplants{ + icon_state = "plant-02"; + pixel_y = 3 + }, /turf/open/floor/iron, /area/station/security/processing) "gXG" = ( @@ -25915,10 +25930,6 @@ /turf/open/floor/iron, /area/station/security/brig) "ihu" = ( -/obj/item/kirbyplants{ - icon_state = "plant-02"; - pixel_y = 3 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -45450,6 +45461,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "oGO" = ( @@ -51076,6 +51088,11 @@ /obj/structure/flora/rock/style_random, /turf/open/misc/asteroid/lowpressure, /area/space/nearstation) +"qvt" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/brig) "qvG" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/cable, @@ -57960,11 +57977,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/security/processing) -"sAD" = ( -/obj/machinery/light/directional/east, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/hallway/secondary/exit/departure_lounge) "sAR" = ( /obj/structure/table, /obj/item/stack/sheet/cardboard{ @@ -66627,7 +66639,7 @@ /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/security/upper) "vqs" = ( @@ -94148,7 +94160,7 @@ uSa vpC bOy dwx -plj +qvt mrB rMl pon @@ -94660,8 +94672,8 @@ pXu dVy bKw rnc -rnc -rnc +cXh +cXh rnc rnc bmi @@ -94919,7 +94931,7 @@ ovY vpC iNZ dwx -plj +qvt mjG crk enU @@ -95431,8 +95443,8 @@ iJk mWx gQS rnc -rnc -rnc +cXh +cXh rnc rnc vVt @@ -95690,7 +95702,7 @@ pbu vpC wpg dwx -plj +qvt sOi crk jmw @@ -96202,8 +96214,8 @@ rdA mWx tug rnc -rnc -rnc +cXh +cXh rnc rnc xex @@ -96461,7 +96473,7 @@ tkZ vpC hph bwB -plj +qvt qKS wDs iva @@ -96471,7 +96483,7 @@ hAP hAP hAP hAP -ocz +fMV dZA lYX ijl @@ -96973,8 +96985,8 @@ cCW mWx vOw rnc -rnc -rnc +cXh +cXh rnc rnc omQ @@ -97232,7 +97244,7 @@ ovY vpC dnL bwB -plj +qvt nKu yld jmw @@ -97744,8 +97756,8 @@ izh fHI osA rnc -rnc -rnc +cXh +cXh rnc rnc jzu @@ -98003,7 +98015,7 @@ pbu vpC iXM bwB -plj +qvt rcJ iTM rxi @@ -117278,7 +117290,7 @@ cQb vOW cnD oGz -sAD +gWF bnN kdO oXm From 0faf073596b524943e1f3780e0622edd3e7706c1 Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Thu, 23 May 2024 13:12:29 +0200 Subject: [PATCH 59/59] improved solars, made a certain person a bit more visible, more drone dispensers (preloaded too) --- _maps/map_files/KiloStation/KiloStation.dmm | 178 +++++++++++--------- 1 file changed, 94 insertions(+), 84 deletions(-) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 102cbf95d504..d3fc31af7541 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1379,7 +1379,7 @@ "ari" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/aft) "arl" = ( /turf/closed/wall/r_wall, @@ -7248,8 +7248,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/aft) "cpZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -8072,8 +8071,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/aft) "cGP" = ( /turf/closed/wall/r_wall, @@ -9729,7 +9727,7 @@ network = list("ss13","engine") }, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/aft) "diU" = ( /obj/effect/turf_decal/bot, @@ -10158,8 +10156,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/fore) "doU" = ( /obj/effect/spawner/structure/window/reinforced, @@ -14239,7 +14236,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) "eGW" = ( -/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -14249,7 +14245,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/solarpanel_small, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/aft) "eGY" = ( /obj/effect/spawner/structure/window/reinforced, @@ -16087,7 +16085,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/aft) "fjz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16110,8 +16108,7 @@ }, /obj/item/radio/intercom/directional/north, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/fore) "fjX" = ( /obj/machinery/door/firedoor, @@ -16711,8 +16708,7 @@ /obj/machinery/status_display/evac/directional/north, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/aft) "fun" = ( /obj/structure/cable, @@ -18098,7 +18094,6 @@ /turf/open/floor/iron/dark, /area/station/maintenance/central) "fLD" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/power/terminal{ dir = 8 }, @@ -18112,8 +18107,9 @@ /obj/machinery/airalarm/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/solarpanel_small, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/fore) "fLH" = ( /obj/effect/decal/cleanable/blood/old, @@ -19584,6 +19580,12 @@ }, /turf/open/space/basic, /area/space/nearstation) +"gkz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/drone_dispenser/preloaded, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "gkC" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -20100,8 +20102,7 @@ "gtj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/fore) "gtq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20547,8 +20548,7 @@ }, /obj/effect/landmark/generic_maintenance_landmark, /obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/aft) "gAP" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -20881,6 +20881,7 @@ /obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_x = -10 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "gGx" = ( @@ -22689,7 +22690,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/fore) "hkW" = ( /obj/structure/plasticflaps/opaque, @@ -23014,6 +23015,14 @@ }, /turf/open/floor/grass, /area/station/science/genetics) +"hpE" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) "hpG" = ( /obj/effect/turf_decal/box, /obj/machinery/power/solar{ @@ -27357,6 +27366,7 @@ /obj/structure/cable, /obj/structure/sign/poster/contraband/random/directional/west, /obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard) "iCr" = ( @@ -30793,7 +30803,6 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "jHR" = ( -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -30804,8 +30813,8 @@ anchored = 1; dir = 4 }, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/obj/effect/turf_decal/bot, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/aft) "jHT" = ( /obj/structure/extinguisher_cabinet/directional/west, @@ -31609,7 +31618,7 @@ "jUa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, -/obj/structure/closet/firecloset, +/obj/machinery/drone_dispenser/preloaded, /turf/open/floor/plating, /area/station/maintenance/port/fore) "jUz" = ( @@ -33859,7 +33868,7 @@ "kLS" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, -/obj/machinery/drone_dispenser, +/obj/machinery/drone_dispenser/preloaded, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "kMe" = ( @@ -35395,8 +35404,7 @@ /obj/structure/sign/warning/xeno_mining/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/fore) "ljL" = ( /obj/machinery/door/airlock/grunge{ @@ -35682,7 +35690,6 @@ id = "forestarboard"; name = "Starboard Bow Solar Control" }, -/obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -35690,8 +35697,8 @@ /obj/structure/sign/warning/vacuum/external/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/obj/effect/turf_decal/bot, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/fore) "lqN" = ( /obj/effect/turf_decal/tile/neutral{ @@ -37295,8 +37302,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/aft) "lQw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -37939,6 +37945,7 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "mcs" = ( @@ -38997,8 +39004,7 @@ "mui" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/aft) "mux" = ( /obj/structure/disposalpipe/segment{ @@ -39603,8 +39609,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/fore) "mEW" = ( /obj/effect/turf_decal/tile/purple{ @@ -40609,8 +40614,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/fore) "mUs" = ( /obj/effect/turf_decal/stripes/corner{ @@ -44031,8 +44035,7 @@ /obj/structure/sign/warning/vacuum/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/aft) "ofA" = ( /obj/structure/window/reinforced/spawner/directional/south, @@ -44624,7 +44627,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/fore) "orz" = ( /obj/structure/cable, @@ -44831,8 +44834,7 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/aft) "ouV" = ( /obj/effect/turf_decal/stripes/line, @@ -45712,6 +45714,16 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/wood, /area/station/service/library) +"oJZ" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) "oKm" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -46720,7 +46732,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/fore) "pct" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -47321,10 +47333,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"plj" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/security/brig) "pll" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47574,7 +47582,7 @@ dir = 5 }, /obj/machinery/light/small/directional/north, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/aft) "pnG" = ( /obj/effect/spawner/structure/window, @@ -50862,7 +50870,7 @@ /obj/machinery/status_display/evac/directional/north, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/aft) "qrv" = ( /obj/effect/turf_decal/tile/red{ @@ -52039,6 +52047,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) +"qLr" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) "qLB" = ( /obj/structure/sign/departments/holy, /turf/closed/wall, @@ -53583,8 +53596,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/fore) "rih" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56374,8 +56386,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/fore) "sbq" = ( /turf/open/floor/carpet/green, @@ -59738,6 +59749,7 @@ /obj/structure/table/wood/fancy, /obj/machinery/microwave, /obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig) "tck" = ( @@ -62056,7 +62068,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/fore) "tOq" = ( /obj/effect/decal/cleanable/blood/old, @@ -64727,7 +64739,7 @@ /obj/structure/chair/office{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/aft) "uJE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -65769,7 +65781,6 @@ id = "aftport"; name = "Port Quarter Solar Control" }, -/obj/effect/turf_decal/bot, /obj/structure/sign/warning/vacuum/external/directional/west, /obj/effect/decal/cleanable/dirt, /obj/machinery/status_display/evac/directional/north, @@ -65778,8 +65789,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/obj/effect/turf_decal/bot, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/fore) "vdK" = ( /obj/structure/flora/bush/pale/style_random{ @@ -66222,7 +66233,6 @@ /turf/open/floor/iron/dark, /area/station/maintenance/starboard/aft) "vkJ" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/power/terminal{ dir = 4 }, @@ -66231,8 +66241,9 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate/solarpanel_small, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/fore) "vkL" = ( /obj/structure/railing{ @@ -68597,7 +68608,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/fore) "vOW" = ( /turf/closed/wall, @@ -71082,8 +71093,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/fore) "wFa" = ( /obj/effect/decal/cleanable/dirt, @@ -73120,7 +73130,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/port/aft) "xlo" = ( /obj/effect/mapping_helpers/broken_floor, @@ -75739,7 +75749,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/solars/starboard/aft) "ydX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -98279,7 +98289,7 @@ yif aPF tiY nzW -nzW +hpE nzW qEI aOe @@ -98535,8 +98545,8 @@ lqn dIq cXh rnc -plj -plj +qvt +qvt rnc mav aOe @@ -98794,10 +98804,10 @@ ura rnc kUP kUP -plj -ocz +qvt +oJZ gGt -aOe +qLr dtF dzS wNn @@ -99051,7 +99061,7 @@ jVA rnc pfI kUP -plj +qvt ocz vJy aOe @@ -99565,7 +99575,7 @@ myc rnc lrm kUP -plj +qvt ocz iCI aOe @@ -99822,10 +99832,10 @@ lPu rnc kUP kUP -plj -ocz +qvt +oJZ tcj -aOe +qLr onX rhd rhd @@ -100077,8 +100087,8 @@ gCS gCS gCS qkh -plj -plj +qvt +qvt rnc afS aOe @@ -113705,7 +113715,7 @@ gmB iFa cAq oQk -oQk +gkz cuV kHs rbp