diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 301d9601a0a8..0f0bde6c3c1a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -27,8 +27,8 @@ # Multiple Owners # Maptainers -/_maps/ @Jolly-66 @Zergspower -/modular_nova/modules/mapping @Jolly-66 @Zergspower +/_maps/ @Jolly-66 @Zergspower @sqnztb +/modular_nova/modules/mapping @Jolly-66 @Zergspower @sqnztb # Expensive files that touching basically always cause performance problems ## Init times diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index 388c907b2529..39a4d8c4d961 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -27,7 +27,7 @@ jobs: touch dmdoc/.nojekyll echo codedocs.tgstation13.org > dmdoc/CNAME - name: Deploy - uses: JamesIves/github-pages-deploy-action@v4.6.8 + uses: JamesIves/github-pages-deploy-action@v4.6.9 with: branch: gh-pages clean: true diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index 01a03c38a443..24b00e17d786 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -12561,6 +12561,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/status_display/evac/directional/south, +/obj/structure/cable, /turf/open/floor/iron/dark/corner, /area/station/commons/dorms) "dKn" = ( @@ -12965,6 +12966,7 @@ /obj/machinery/light/warm/directional/west, /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/dorms) "dQe" = ( @@ -15520,8 +15522,7 @@ "ezd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/window/spawner/directional/south, -/obj/effect/spawner/structure/electrified_grille, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/central) "ezq" = ( @@ -16258,7 +16259,6 @@ /area/station/security/courtroom) "eKl" = ( /obj/effect/spawner/random/trash/moisture_trap, -/obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/aft) "eKm" = ( @@ -42799,6 +42799,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark/corner, /area/station/commons/dorms) "mpS" = ( @@ -81011,6 +81012,7 @@ /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, /area/station/hallway/primary/port) "xwo" = ( @@ -177912,7 +177914,7 @@ crh tPF aAm wUS -jNS +agJ gfP gfP gfP diff --git a/_maps/map_files/SerenityStation/SerenityStation.dmm b/_maps/map_files/SerenityStation/SerenityStation.dmm index 660034297e21..e148db621774 100644 --- a/_maps/map_files/SerenityStation/SerenityStation.dmm +++ b/_maps/map_files/SerenityStation/SerenityStation.dmm @@ -27070,7 +27070,6 @@ /turf/open/floor/iron, /area/station/maintenance/department/crew_quarters/dorms) "hKw" = ( -/obj/machinery/pdapainter/engineering, /obj/structure/cable, /obj/machinery/requests_console/directional/north{ department = "Head of Security's Desk"; @@ -27079,6 +27078,7 @@ /obj/effect/mapping_helpers/requests_console/assistance, /obj/effect/mapping_helpers/requests_console/information, /obj/effect/mapping_helpers/requests_console/announcement, +/obj/machinery/pdapainter/security, /turf/open/floor/wood/large, /area/station/command/heads_quarters/hos) "hKJ" = ( @@ -32272,7 +32272,6 @@ /obj/machinery/door/airlock/mining{ name = "Drone Bay" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/door/firedoor, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32283,6 +32282,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/iron, /area/station/cargo/drone_bay) "jjl" = ( @@ -36000,6 +36000,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"klt" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) "klu" = ( /obj/effect/turf_decal/trimline/green/corner{ dir = 4 @@ -38714,7 +38721,6 @@ /obj/machinery/door/airlock/mining/glass{ name = "Cargo Breakroom" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -38724,6 +38730,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/iron, /area/station/cargo/miningoffice) "lct" = ( @@ -52525,12 +52532,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/visit) -"plo" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 10 - }, -/turf/closed/wall, -/area/station/cargo/sorting) "plp" = ( /turf/open/floor/plating, /area/station/maintenance/department/eva/abandoned) @@ -65648,7 +65649,6 @@ /obj/machinery/door/airlock/mining{ name = "Mining Dock" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65656,6 +65656,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/iron, /area/station/cargo/miningoffice) "tfP" = ( @@ -77345,10 +77346,10 @@ /obj/machinery/rnd/production/techfab/department/cargo, /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/trimline/brown/filled/corner{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/sorting) "wuG" = ( @@ -81758,9 +81759,6 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/aft) "xNO" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, /obj/machinery/camera/directional/south{ c_tag = "Supply - Customs Office"; network = list("ss13","prison") @@ -81770,6 +81768,9 @@ name = "Markus's bed" }, /mob/living/basic/pet/dog/markus, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 10 + }, /turf/open/floor/iron, /area/station/cargo/sorting) "xNU" = ( @@ -173690,7 +173691,7 @@ hAc aHS gII xNO -plo +mbf mbf mbf mbf @@ -173946,7 +173947,7 @@ oWv hul hul rpL -hul +klt wuA tDh vMb diff --git a/_maps/map_files/Snowglobe/snowglobe.dmm b/_maps/map_files/Snowglobe/snowglobe.dmm index 3610367be3fc..4e69cbec2866 100644 --- a/_maps/map_files/Snowglobe/snowglobe.dmm +++ b/_maps/map_files/Snowglobe/snowglobe.dmm @@ -129,11 +129,11 @@ "abO" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, /turf/open/floor/iron/edge, /area/station/hallway/primary) "abP" = ( @@ -156,15 +156,26 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "acy" = ( -/obj/effect/landmark/start/paramedic, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ - dir = 1 +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/emergency{ + pixel_y = 10; + pixel_x = 5 }, -/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/white, -/area/station/medical/paramedic) +/obj/item/lightreplacer{ + pixel_y = 8; + pixel_x = -4 + }, +/obj/item/airlock_painter/decal{ + pixel_y = -1; + pixel_x = 1 + }, +/obj/item/airlock_painter/decal/tile{ + pixel_y = -7 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/station/commons/storage/primary) "acz" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -453,10 +464,10 @@ "afF" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/plating, /area/station/hallway/primary/port) "afG" = ( @@ -695,6 +706,28 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/gamer_lair) +"aiu" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/flashes{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/storage/box/evidence{ + pixel_x = 7; + pixel_y = 12 + }, +/obj/effect/turf_decal/trimline/white/line{ + dir = 5 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/station/security/lockers) "aiv" = ( /obj/machinery/disposal/bin, /obj/machinery/status_display/ai/directional/east, @@ -769,10 +802,9 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/green/filled/warning{ - dir = 1 +/turf/open/floor/iron/corner{ + dir = 4 }, -/turf/open/floor/iron/edge, /area/station/hallway/primary/port) "ajr" = ( /obj/structure/fence/cut/large, @@ -1098,7 +1130,7 @@ /turf/open/openspace/icemoon, /area/icemoon/surface/outdoors/nospawn) "anv" = ( -/obj/effect/turf_decal/trimline/yellow/line{ +/obj/effect/turf_decal/trimline/green/line{ dir = 8 }, /turf/open/floor/iron, @@ -1217,13 +1249,6 @@ dir = 4 }, /area/station/ai_monitored/security/armory) -"apf" = ( -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/trimline/white/line{ - dir = 9 - }, -/turf/open/floor/iron/dark/smooth_corner, -/area/station/security/lockers) "apl" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -1265,18 +1290,23 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/aftstarboardhall) "apG" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/dark_blue{ dir = 8 }, -/obj/effect/turf_decal/tile/dark_blue/anticorner{ +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue/half{ dir = 4 }, -/obj/machinery/suit_storage_unit/medical, -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/box/blue, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/iron/white/smooth_corner{ - dir = 8 +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 }, /area/station/medical/paramedic) "apP" = ( @@ -1319,10 +1349,15 @@ }, /area/station/science/xenobiology) "aqu" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/smooth_edge, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/paramedic) "aqw" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/machinery/vending/hydroseeds, @@ -1832,11 +1867,6 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) -"awd" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "awe" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -1953,12 +1983,12 @@ /area/station/maintenance/gamer_lair) "axp" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, /obj/machinery/camera/autoname/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, /turf/open/floor/iron/edge, /area/station/hallway/primary) "axr" = ( @@ -2359,14 +2389,6 @@ }, /turf/open/floor/carpet/red, /area/station/security/office) -"aBZ" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/edge{ - dir = 8 - }, -/area/station/hallway/primary/starboard) "aCd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2484,6 +2506,7 @@ }, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore) "aEG" = ( @@ -2666,10 +2689,10 @@ /area/station/ai_monitored/security/armory) "aHe" = ( /obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/service/library/artgallery) "aHq" = ( @@ -2852,15 +2875,16 @@ /turf/open/floor/glass/icemoon, /area/icemoon/surface/outdoors/nospawn) "aJx" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/effect/turf_decal/siding/dark{ dir = 4 }, -/obj/machinery/firealarm/directional/east, -/obj/structure/chair/sofa/bench/right{ - dir = 8; - pixel_x = 5 +/obj/effect/turf_decal/siding/dark{ + dir = 8 }, -/turf/open/floor/iron, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "aJy" = ( /obj/effect/turf_decal/siding/wood, @@ -2985,10 +3009,10 @@ /turf/open/floor/iron/dark/smooth_corner, /area/station/security/brig) "aLs" = ( -/obj/effect/turf_decal/trimline/yellow/line, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/edge{ dir = 1 }, @@ -3009,6 +3033,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Casino That Kills You If You Lose" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/bloodcasino) "aLZ" = ( @@ -3315,8 +3340,9 @@ "aQO" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, -/turf/open/floor/iron/dark/side, -/area/station/commons/storage/primary) +/obj/structure/chair/stool/bar/directional/west, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "aQR" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood{ @@ -3340,9 +3366,6 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/aftstarboardhall) "aRa" = ( -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, @@ -3364,6 +3387,9 @@ pixel_y = 23; dir = 2 }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, /turf/open/floor/iron/edge, /area/station/hallway/primary/port) "aRd" = ( @@ -3378,10 +3404,12 @@ /area/station/service/chapel/storage) "aRl" = ( /obj/structure/cable, -/obj/machinery/door/airlock/gold/glass, /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/bathroom{ + name = "Restroom" + }, /turf/open/floor/iron/dark/smooth_half{ dir = 8 }, @@ -4357,6 +4385,7 @@ name = "Abandoned Therapists Office" }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_psych) "beQ" = ( @@ -4442,11 +4471,16 @@ "bfP" = ( /obj/effect/turf_decal/trimline/purple/filled/warning, /obj/structure/table/reinforced, -/obj/machinery/fax{ - fax_name = "Research Division"; - name = "Research Division Fax Machine"; +/obj/item/radio{ pixel_y = 3 }, +/obj/effect/spawner/random/bureaucracy/pen{ + pixel_x = 6 + }, +/obj/item/radio{ + pixel_x = -4; + pixel_y = 7 + }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/lab) "bfR" = ( @@ -4625,6 +4659,19 @@ dir = 4 }, /area/station/commons/lounge) +"bji" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary) "bjm" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -4825,8 +4872,10 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/fore) "bmd" = ( -/obj/machinery/recharge_station, -/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, /turf/open/floor/iron/dark/smooth_large, /area/station/security/breakroom) "bmk" = ( @@ -5151,15 +5200,11 @@ /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 1 }, -/obj/structure/drain, -/obj/machinery/shower/directional/south, -/obj/effect/turf_decal/box/white/corners{ - color = "#D381C9" - }, /obj/effect/turf_decal/box/white/corners{ color = "#D381C9"; dir = 8 }, +/obj/structure/closet/firecloset, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, @@ -5495,6 +5540,7 @@ "bvo" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/wrestle) "bvq" = ( @@ -6178,13 +6224,6 @@ dir = 8 }, /area/station/maintenance/abandon_cafeteria/hydro) -"bFd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/herringbone, -/area/station/hallway/primary) "bFf" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -6305,6 +6344,7 @@ /area/station/security/brig) "bHk" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore) "bHx" = ( @@ -6656,6 +6696,13 @@ /obj/structure/table, /turf/open/floor/circuit, /area/station/common/night_club) +"bMl" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_y = 7 + }, +/turf/open/floor/carpet, +/area/station/service/cafeteria) "bMn" = ( /obj/structure/sign/departments/virology/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6671,6 +6718,13 @@ }, /turf/open/floor/glass/reinforced, /area/station/engineering/atmos/hallway) +"bMF" = ( +/obj/effect/turf_decal/trimline/white/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/security/lockers) "bMM" = ( /turf/open/floor/iron/dark/smooth_edge{ dir = 8 @@ -7024,7 +7078,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/security/brig) +/area/station/security/warden) "bSh" = ( /obj/effect/turf_decal/trimline/blue/corner, /turf/open/floor/iron, @@ -7574,6 +7628,23 @@ }, /turf/open/floor/iron, /area/station/hallway/primary) +"bZY" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/dark/corner, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary/starboard) "bZZ" = ( /turf/closed/wall/r_wall, /area/station/engineering/engine_smes) @@ -7697,10 +7768,6 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/aftporthall) "cbx" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/trimline/white/line{ dir = 10 @@ -7782,8 +7849,14 @@ /area/station/maintenance/abandon_holding_cell) "cct" = ( /obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/maintenance/department/security/brig) +/obj/effect/turf_decal/trimline/white/line{ + dir = 6 + }, +/obj/structure/closet/secure_closet/warden, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/station/security/warden) "ccy" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/line, @@ -7868,17 +7941,15 @@ }, /area/station/medical/storage) "cdz" = ( -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 +/obj/machinery/vending/tool, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark/side{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) +/area/station/commons/storage/primary) "cdC" = ( /obj/structure/chair/plastic{ dir = 1 @@ -7923,6 +7994,11 @@ dir = 1 }, /area/station/hallway/secondary/service) +"cei" = ( +/obj/effect/turf_decal/box/red, +/obj/machinery/suit_storage_unit/security, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "cer" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -8272,14 +8348,12 @@ /turf/open/water/overlay, /area/station/hallway/floor2) "cjk" = ( -/obj/structure/closet/secure_closet/warden, -/obj/effect/turf_decal/trimline/white/line{ - dir = 6 - }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 1 +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Brig Closet" }, -/area/station/security/warden) +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/security/brig) "cjy" = ( /obj/effect/landmark/start/hangover, /obj/structure/cable, @@ -8637,6 +8711,7 @@ "cnS" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/ordnance_maint) "coa" = ( @@ -8888,7 +8963,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, -/obj/structure/closet/emcloset, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, @@ -9583,6 +9657,11 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/west, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light_switch/directional/west{ + pixel_y = -12 + }, /turf/open/floor/iron/dark/smooth_corner, /area/station/security/lockers) "cCW" = ( @@ -9909,7 +9988,6 @@ }, /area/station/ai_monitored/turret_protected/aisat/foyer) "cHi" = ( -/obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 }, @@ -9943,6 +10021,14 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white/small, /area/station/common/pool) +"cHA" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance_hatch, +/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/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) "cHG" = ( /turf/open/floor/iron/dark/side, /area/station/cargo/storage) @@ -10215,19 +10301,21 @@ }, /area/station/security/office) "cKA" = ( -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 +/obj/structure/table/reinforced, +/obj/structure/sign/calendar/directional/north, +/obj/item/storage/toolbox/electrical{ + pixel_y = 7; + pixel_x = 1 }, -/obj/effect/turf_decal/tile/dark_blue/anticorner{ - dir = 8 +/obj/item/storage/toolbox/mechanical{ + pixel_y = -5; + pixel_x = 2 }, -/obj/structure/sign/poster/official/help_others/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/smooth_corner{ - dir = 4 +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 1 }, -/area/station/medical/paramedic) +/area/station/commons/storage/primary) "cKF" = ( /obj/structure/table, /turf/open/floor/plating, @@ -10242,6 +10330,7 @@ "cKO" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "cKU" = ( @@ -10251,6 +10340,7 @@ /obj/effect/turf_decal/trimline/white/line{ dir = 1 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, @@ -10297,21 +10387,18 @@ }, /area/station/command/teleporter) "cLJ" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/closet/firecloset, +/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 + }, /turf/open/floor/iron, -/area/station/maintenance/department/science/ordnance_maint) +/area/station/commons/storage/primary) "cLX" = ( /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/iron, /area/station/maintenance/aft) -"cLZ" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance_hatch, -/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/cargo) "cMa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10383,6 +10470,7 @@ /obj/effect/turf_decal/stripes{ dir = 5 }, +/obj/effect/spawner/random/armory/bulletproof_helmet, /turf/open/floor/iron/dark/smooth_corner{ dir = 8 }, @@ -10525,15 +10613,6 @@ dir = 4 }, /area/station/science/lab) -"cPp" = ( -/obj/structure/secure_safe/directional/north, -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 1 - }, -/area/station/security/warden) "cPs" = ( /turf/open/floor/iron/dark/corner{ dir = 8 @@ -11188,6 +11267,13 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/recreation) +"cYn" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/station/commons/storage/primary) "cYv" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/incident_display/delam/directional/south, @@ -11297,6 +11383,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/herringbone, /area/station/hallway/primary) "cZY" = ( @@ -11543,6 +11630,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Abandoned Arcade" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_arcade) "dee" = ( @@ -11591,7 +11679,7 @@ "dfG" = ( /obj/structure/dresser, /obj/machinery/light_switch/directional/north{ - pixel_x = 12 + pixel_x = -12 }, /obj/machinery/button/curtain{ id = "dormscurtain3"; @@ -11618,6 +11706,10 @@ /area/icemoon/underground/explored/graveyard) "dfZ" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "roboticsprivacy"; + name = "Robotics Shutters" + }, /turf/open/floor/plating, /area/station/science/robotics) "dgr" = ( @@ -11661,6 +11753,7 @@ /area/station/maintenance/department/engine/atmos) "dgX" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/law) "dhd" = ( @@ -11710,16 +11803,20 @@ /turf/open/floor/plating, /area/station/maintenance/condemned_med) "dhO" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, -/area/station/medical/medbay/central) +/area/station/medical/paramedic) "dhP" = ( /obj/item/radio/intercom/directional/south, /turf/open/floor/carpet, @@ -11932,19 +12029,12 @@ /turf/open/floor/iron/dark/side, /area/station/ai_monitored/turret_protected/aisat/hallway) "dkq" = ( -/obj/machinery/light_switch/directional/north, -/obj/structure/table/reinforced, -/obj/item/flashlight/lamp{ - pixel_y = 11; - pixel_x = 3 - }, -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 1 - }, -/area/station/security/warden) +/obj/effect/turf_decal/bot_blue, +/obj/structure/closet/secure_closet/security/sec, +/obj/item/clothing/mask/balaclava, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, +/turf/open/floor/iron/smooth_large, +/area/station/security/lockers) "dkv" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -12377,24 +12467,6 @@ dir = 6 }, /area/station/service/chapel/storage) -"dqg" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 4 - }, -/obj/structure/chair/sofa/right{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/medical/paramedic) "dqq" = ( /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, @@ -12566,7 +12638,6 @@ }, /area/station/hallway/primary) "dtA" = ( -/obj/machinery/camera/autoname/directional/west, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/white/line{ dir = 8 @@ -12753,15 +12824,6 @@ }, /turf/open/floor/plating, /area/station/commons/dorms/room6) -"dwz" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 1 - }, -/area/station/security/lockers) "dwA" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -12859,7 +12921,6 @@ }, /area/station/security/prison/visit) "dyh" = ( -/obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, @@ -12926,6 +12987,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 9 }, +/obj/structure/cable, /turf/open/floor/iron/herringbone, /area/station/hallway/primary/port) "dzj" = ( @@ -13631,14 +13693,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/ce) -"dIz" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 5 - }, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/medical/paramedic) "dIG" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/table, @@ -14097,6 +14151,10 @@ "dOU" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/left/directional/north{ + name = "Danger: Conveyor Access"; + req_access = list("maint_tunnels") + }, /turf/open/floor/plating, /area/station/maintenance/disposal) "dOY" = ( @@ -14133,11 +14191,8 @@ /turf/open/floor/iron, /area/station/maintenance/fore/greater) "dPl" = ( -/obj/structure/toilet{ - color = "#d4af37"; - name = "Gilded toilet" - }, /obj/machinery/light_switch/directional/north, +/obj/structure/toilet, /turf/open/floor/iron/dark/diagonal, /area/station/command/heads_quarters/hos) "dPo" = ( @@ -14379,6 +14434,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"dSw" = ( +/obj/structure/table/reinforced, +/obj/item/dest_tagger, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 1; + pixel_y = 10 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 6; + pixel_y = 7 + }, +/turf/open/floor/iron/dark/side, +/area/station/commons/storage/primary) "dSx" = ( /obj/structure/railing/wooden_fence{ dir = 9 @@ -14406,11 +14474,6 @@ }, /turf/open/floor/iron/dark/smooth_edge, /area/station/science/genetics) -"dTp" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/carpet/red, -/area/station/security/warden) "dTr" = ( /obj/effect/turf_decal/trimline/green/corner{ dir = 8 @@ -14863,8 +14926,12 @@ /obj/effect/turf_decal/trimline/white/line{ dir = 9 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, /turf/open/floor/iron/dark/smooth_corner, -/area/station/security/brig) +/area/station/security/warden) "dYY" = ( /obj/effect/spawner/random/entertainment/arcade{ dir = 8 @@ -15007,6 +15074,14 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/storage) +"ebp" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) "ebu" = ( /obj/item/radio/intercom/directional/south, /turf/open/floor/circuit, @@ -15391,6 +15466,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/department/crew_quarters/bar) +"egV" = ( +/obj/structure/reagent_anvil, +/turf/open/floor/stone, +/area/station/service/forge) "egW" = ( /obj/item/chair/wood, /turf/open/floor/wood, @@ -15437,8 +15516,14 @@ "ehR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/station/commons/storage/primary) +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "ehT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15485,11 +15570,11 @@ /turf/open/floor/iron/checker, /area/station/security/prison/mess) "ejr" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/central) "ejw" = ( @@ -15799,6 +15884,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/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "env" = ( @@ -15890,7 +15976,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, -/area/station/commons/storage/primary) +/area/station/service/cafeteria) "eoh" = ( /turf/closed/wall, /area/station/commons/storage/art) @@ -15902,10 +15988,12 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "eoV" = ( -/obj/machinery/light/directional/east, /obj/effect/turf_decal/trimline/white/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, @@ -16432,20 +16520,11 @@ }, /area/station/science/robotics/lab) "evB" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue{ +/obj/structure/cable, +/turf/open/floor/iron/dark/side{ dir = 4 }, -/obj/effect/turf_decal/tile/dark_blue/half, -/obj/machinery/computer/crew{ - dir = 1 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/white/smooth_edge, -/area/station/medical/paramedic) +/area/station/commons/storage/primary) "evI" = ( /obj/machinery/ntnet_relay, /turf/open/floor/circuit, @@ -16684,11 +16763,10 @@ /area/station/command/bridge) "eyK" = ( /obj/structure/cable, -/obj/machinery/vending/security, -/obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, /area/station/security/lockers) "eyL" = ( /obj/structure/chair/wood{ @@ -17021,6 +17099,29 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/gamer_lair) +"eEu" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/obj/structure/table/reinforced, +/obj/item/food/donut/plain{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/storage/fancy/coffee_cart_rack{ + pixel_x = 8; + pixel_y = 2 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/security/breakroom) +"eEz" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "eEE" = ( /obj/machinery/light/small/directional/east, /obj/structure/table, @@ -17041,6 +17142,11 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"eFe" = ( +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/commons/storage/primary) "eFg" = ( /obj/structure/chair/wood{ dir = 4 @@ -17057,12 +17163,14 @@ "eFx" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, +/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/armory, /obj/machinery/door/airlock/security/glass{ - name = "Security Desk" + name = "Brig Control" }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/smooth_large, -/area/station/security/brig) +/area/station/security/warden) "eFC" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 10 @@ -17441,17 +17549,6 @@ dir = 8 }, /area/station/ai_monitored/command/nuke_storage) -"eLv" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/white/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, -/area/station/security/breakroom) "eLy" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -17474,6 +17571,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Abandoned Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) "eLX" = ( @@ -17710,25 +17808,7 @@ /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 10 }, -/obj/item/folder{ - pixel_x = -5; - pixel_y = 13 - }, -/obj/item/paper_bin{ - pixel_y = 18; - pixel_x = 6 - }, -/obj/item/radio{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/effect/spawner/random/bureaucracy/pen{ - pixel_x = 6 - }, -/obj/item/radio{ - pixel_y = 3 - }, -/obj/structure/table/reinforced, +/obj/machinery/rnd/production/circuit_imprinter/department/science, /turf/open/floor/iron/dark/smooth_large, /area/station/science/lab) "eOu" = ( @@ -17748,7 +17828,7 @@ /area/station/maintenance/coffin_supply) "eOK" = ( /obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/yellow/line{ +/obj/effect/turf_decal/trimline/green/line{ dir = 8 }, /turf/open/floor/iron, @@ -17940,17 +18020,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plastic, /area/station/commons/fitness/locker_room) -"eRN" = ( -/obj/effect/landmark/start/paramedic, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) "eRX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17963,6 +18032,17 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/smooth_large, /area/station/security/checkpoint/engineering) +"eSh" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/security/breakroom) "eSk" = ( /obj/structure/cable, /obj/structure/sign/warning/electric_shock/directional/east, @@ -18194,11 +18274,11 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "eVX" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/bot_blue, -/obj/item/clothing/mask/balaclava, -/turf/open/floor/iron/smooth_large, +/obj/structure/table/reinforced, +/obj/item/mod/module/plasma_stabilizer, +/obj/item/mod/module/thermal_regulator, +/obj/item/mod/module/signlang_radio, +/turf/open/floor/iron/dark, /area/station/security/lockers) "eWc" = ( /obj/machinery/light/directional/south, @@ -18461,18 +18541,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"eZj" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/dark_blue/half, -/obj/machinery/door/airlock/medical/glass{ - name = "Paramedic Dispatch Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/smooth_half, -/area/station/medical/paramedic) "eZk" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/edge{ @@ -18597,6 +18665,16 @@ dir = 10 }, /area/station/service/chapel) +"fbf" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/security/brig) "fbl" = ( /obj/effect/turf_decal/trimline/green/filled/corner, /turf/open/floor/iron/corner, @@ -18612,20 +18690,6 @@ }, /turf/open/floor/wood/tile, /area/station/service/library) -"fbH" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Employee Entrance" - }, -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/turf/open/floor/iron/white/smooth_half{ - dir = 8 - }, -/area/station/medical/medbay/central) "fbJ" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/filled/corner{ @@ -18832,6 +18896,13 @@ dir = 10 }, /obj/machinery/firealarm/directional/south, +/obj/machinery/button/door/directional/north{ + id = "roboticsprivacy"; + name = "Robotics Privacy Controls"; + pixel_x = -24; + req_access = list("robotics"); + pixel_y = -24 + }, /turf/open/floor/iron/dark/smooth_corner{ dir = 4 }, @@ -18932,21 +19003,18 @@ /turf/open/floor/iron/smooth_large, /area/station/cargo/miningoffice) "fgD" = ( -/obj/structure/chair/sofa/corp/left{ - dir = 4 - }, /obj/machinery/light_switch/directional/west, /turf/open/floor/carpet/red, /area/station/security/breakroom) "fgF" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/status_display/evac/directional/south, -/obj/structure/chair/sofa/bench/left{ - dir = 1; - pixel_x = 5; - pixel_y = 0 +/obj/effect/turf_decal/siding/dark, +/obj/effect/turf_decal/siding/dark{ + dir = 1 }, -/turf/open/floor/iron, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "fgH" = ( /obj/structure/cable, @@ -19086,6 +19154,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/herringbone, /area/station/hallway/primary/port) "fik" = ( @@ -19416,11 +19485,15 @@ /turf/open/floor/iron/dark/diagonal, /area/station/security/office) "flT" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/carpet/red, -/area/station/security/warden) +/obj/effect/turf_decal/trimline/white/line{ + dir = 5 + }, +/obj/structure/table/reinforced, +/obj/machinery/coffeemaker, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 8 + }, +/area/station/security/breakroom) "fmd" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -19550,6 +19623,28 @@ "foG" = ( /turf/open/floor/iron/checker, /area/mine/laborcamp) +"foU" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/lights/tubes{ + pixel_y = 7; + pixel_x = 5 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/item/light/tube, +/obj/item/light/tube{ + pixel_y = 3 + }, +/obj/item/storage/box/lights/mixed{ + pixel_x = -12; + pixel_y = 6 + }, +/obj/item/light/tube{ + pixel_y = 6 + }, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/station/commons/storage/primary) "foX" = ( /obj/machinery/modular_computer/preset/command{ dir = 8 @@ -19757,12 +19852,13 @@ /turf/open/floor/iron/dark, /area/station/engineering/storage) "fsa" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/smooth_edge, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 + }, +/obj/effect/landmark/start/paramedic, +/turf/open/floor/iron/white, +/area/station/medical/paramedic) "fsb" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -20190,19 +20286,16 @@ /turf/open/openspace/icemoon, /area/icemoon/surface/outdoors/nospawn) "fxX" = ( -/obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/trimline/white/line{ - dir = 10 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 + dir = 8 }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 4 +/obj/structure/cable, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 }, -/area/station/security/brig) +/area/station/security/warden) "fxY" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark, @@ -20665,6 +20758,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "fEo" = ( @@ -20762,6 +20856,17 @@ }, /turf/open/floor/grass, /area/station/commons/dorms/room4) +"fFs" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/security/breakroom) "fFt" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 1 @@ -20840,6 +20945,16 @@ }, /turf/open/floor/engine, /area/station/engineering/atmospherics_engine) +"fFZ" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 4 + }, +/obj/machinery/vending/security, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/security/lockers) "fGb" = ( /obj/machinery/light/floor, /obj/structure/chair/pew/left{ @@ -20854,6 +20969,7 @@ /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 6 }, +/obj/machinery/vending/wardrobe/science_wardrobe, /turf/open/floor/iron/dark/smooth_edge, /area/station/science/lab) "fGp" = ( @@ -20996,8 +21112,8 @@ /turf/open/floor/iron/white/small, /area/station/common/pool) "fIf" = ( -/turf/open/floor/iron/dark/side, -/area/station/commons/storage/primary) +/turf/open/floor/carpet, +/area/station/service/cafeteria) "fIm" = ( /turf/open/floor/plating, /area/station/maintenance/aft) @@ -21103,6 +21219,7 @@ "fJy" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos/lesser) "fJG" = ( @@ -21326,19 +21443,12 @@ /turf/open/floor/iron/dark/smooth_corner, /area/station/security/office) "fMQ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/smooth_edge{ +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ dir = 1 }, +/obj/structure/chair/sofa/right, +/turf/open/floor/iron/white, /area/station/medical/paramedic) "fNe" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -21505,6 +21615,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) "fPK" = ( @@ -21556,19 +21667,22 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/cargo/miningstairs) "fQh" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/electrical{ - pixel_y = 7; - pixel_x = 1 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = -5; - pixel_x = 2 - }, -/turf/open/floor/iron/dark/side{ - dir = 9 +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/soymilk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/cup/glass/bottle/juice/cream, +/obj/item/reagent_containers/cup/glass/bottle/juice/cream, +/obj/item/reagent_containers/cup/glass/ice, +/obj/item/reagent_containers/cup/glass/ice, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/structure/sign/chalkboard_menu{ + pixel_y = 32 }, -/area/station/commons/storage/primary) +/obj/structure/closet/secure_closet/freezer/fridge/all_access, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "fQk" = ( /obj/structure/table, /obj/item/storage/crayons{ @@ -22254,10 +22368,12 @@ /turf/open/floor/iron/white/smooth_large, /area/station/medical/treatment_center) "gaF" = ( -/obj/machinery/vending/tool, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark/diagonal, -/area/station/commons/storage/primary) +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "gaI" = ( /obj/structure/cable, /obj/effect/spawner/random/trash/crushed_can, @@ -22701,29 +22817,11 @@ }, /turf/open/floor/iron/dark, /area/station/science/xenobiology) -"ggj" = ( -/obj/machinery/newscaster/directional/south, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/trimline/white/line, -/turf/open/floor/iron/dark/smooth_edge, -/area/station/security/warden) "ggl" = ( /obj/machinery/holopad/secure, /obj/effect/landmark/start/captain, /turf/open/floor/iron/diagonal, /area/station/command/bridge) -"ggo" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/white/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 8 - }, -/area/station/security/breakroom) "ggx" = ( /obj/machinery/light/directional/east, /obj/structure/chair/wood{ @@ -22735,13 +22833,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/checker, /area/station/commons/lounge) -"ggD" = ( -/obj/effect/landmark/start/warden, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/carpet/red, -/area/station/security/warden) "ggF" = ( /turf/closed/wall/r_wall, /area/station/medical/cryo) @@ -22759,6 +22850,7 @@ location = "UH2"; codes_txt = "patrol;next_patrol=UH2A" }, +/obj/structure/railing/corner, /turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "ggZ" = ( @@ -22832,14 +22924,20 @@ /turf/open/floor/plating, /area/station/maintenance/department/science/ordnance_maint_lesser) "ghR" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ +/obj/effect/turf_decal/tile/dark_blue/half, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/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/white, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 8; + pixel_x = 5 + }, +/obj/structure/sign/poster/official/help_others/directional/south, +/turf/open/floor/iron/white/smooth_edge, /area/station/medical/paramedic) "ghX" = ( /obj/machinery/holopad, @@ -23560,11 +23658,11 @@ /area/station/maintenance/aft) "gtl" = ( /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, /area/station/commons/arrivalsshop) "gtw" = ( @@ -24000,12 +24098,8 @@ }, /area/station/cargo/storage) "gyf" = ( -/obj/structure/table/reinforced, -/obj/item/stack/cable_coil/five, -/obj/item/stack/cable_coil/five{ - pixel_y = 5 - }, /obj/effect/turf_decal/trimline/white/line, +/obj/structure/cable, /turf/open/floor/iron/dark/smooth_edge, /area/station/security/breakroom) "gyj" = ( @@ -24517,8 +24611,12 @@ "gEW" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "Brig Shutters" + }, /turf/open/floor/plating, -/area/station/security/brig) +/area/station/security/warden) "gFd" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -24826,10 +24924,14 @@ /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) "gIQ" = ( -/turf/open/floor/iron/dark/side{ - dir = 6 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/area/station/commons/storage/primary) +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "gJf" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/eighties, @@ -25072,21 +25174,8 @@ /turf/open/floor/engine, /area/station/science/robotics/lab) "gMj" = ( -/obj/structure/table/reinforced, -/obj/item/assembly/flash/handheld{ - pixel_x = -5; - pixel_y = 0 - }, -/obj/item/radio{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/effect/turf_decal/trimline/white/line{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, +/obj/effect/turf_decal/trimline/white/corner, +/turf/open/floor/iron/dark, /area/station/security/breakroom) "gMp" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ @@ -25487,6 +25576,15 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) +"gRW" = ( +/obj/effect/turf_decal/siding/dark, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary) "gRY" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 4 @@ -25766,6 +25864,10 @@ "gVK" = ( /turf/open/floor/carpet/purple, /area/station/science/lab) +"gVM" = ( +/obj/structure/closet/wardrobe/grey, +/turf/open/floor/plating, +/area/station/maintenance/department/security/brig) "gVP" = ( /obj/structure/cable, /turf/open/floor/engine, @@ -25803,6 +25905,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/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_wrestle) "gWA" = ( @@ -26067,20 +26170,6 @@ }, /turf/open/floor/iron/dark/smooth_half, /area/station/security/checkpoint/engineering) -"hab" = ( -/obj/structure/closet/secure_closet/wall{ - pixel_x = 30 - }, -/obj/item/mod/module/thermal_regulator, -/obj/item/mod/module/signlang_radio, -/obj/item/mod/module/plasma_stabilizer, -/obj/effect/turf_decal/trimline/white/line{ - dir = 5 - }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 8 - }, -/area/station/security/lockers) "hal" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -26406,7 +26495,6 @@ /area/station/hallway/secondary/entry) "heS" = ( /obj/effect/landmark/start/security_officer, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/white/line{ dir = 8 }, @@ -26479,6 +26567,7 @@ "hfR" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/security) "hgb" = ( @@ -26567,29 +26656,13 @@ dir = 8 }, /area/station/engineering/storage/tech) -"hii" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/medical/paramedic) "hil" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 1 - }, -/obj/machinery/recharge_station, -/obj/effect/turf_decal/bot_blue, -/turf/open/floor/iron/white/smooth_edge{ +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ dir = 1 }, +/obj/structure/chair/sofa/middle, +/turf/open/floor/iron/white, /area/station/medical/paramedic) "hin" = ( /obj/structure/cable, @@ -26646,13 +26719,17 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"hjf" = ( -/obj/effect/turf_decal/trimline/white/line, -/obj/machinery/computer/security{ - dir = 1 +"hjo" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Gear Room" }, -/turf/open/floor/iron/dark/smooth_edge, -/area/station/security/brig) +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/lockers) "hjr" = ( /obj/effect/turf_decal/siding/dark, /obj/structure/disposalpipe/segment{ @@ -26800,6 +26877,7 @@ }, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) "hkD" = ( @@ -26812,25 +26890,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/smooth_large, /area/station/security/medical) -"hkI" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 8 - }, -/obj/machinery/newscaster/directional/west, -/obj/item/climbing_hook, -/obj/item/climbing_hook{ - pixel_y = 4; - pixel_x = -6 - }, -/obj/structure/table/reinforced, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/medical/paramedic) "hkN" = ( /obj/effect/turf_decal/siding/brown{ dir = 4 @@ -26866,11 +26925,15 @@ }, /area/station/security/execution/transfer) "hlh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_y = 7 }, -/turf/open/floor/iron, -/area/station/commons/storage/primary) +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "hlx" = ( /obj/machinery/newscaster/directional/west, /turf/open/floor/circuit, @@ -27404,8 +27467,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/brig) +"hsH" = ( +/obj/machinery/status_display/evac/directional/east, +/obj/structure/chair/sofa/bench/left{ + dir = 8; + pixel_x = 5 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "hsK" = ( -/obj/machinery/vending/dorms, /obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27430,7 +27503,7 @@ /obj/machinery/cryopod{ dir = 1 }, -/obj/machinery/status_display/ai/directional/east, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/corner{ dir = 1 }, @@ -27519,6 +27592,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/herringbone, /area/station/hallway/floor2) +"htK" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "roboticsprivacy"; + name = "Robotics Shutters" + }, +/turf/open/floor/plating, +/area/station/hallway/primary/starboard) "htR" = ( /obj/structure/curtain/cloth, /turf/open/floor/iron/freezer, @@ -28151,10 +28232,13 @@ }, /area/station/medical/patients_rooms/room_a) "hCJ" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/tree/jungle/small{ + pixel_y = -12; + pixel_x = -48 }, -/turf/open/floor/iron/herringbone, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/grass, /area/station/hallway/primary/starboard) "hDb" = ( /obj/machinery/newscaster/directional/south, @@ -28202,6 +28286,13 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/edge, /area/station/hallway/primary/fore) +"hDE" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary/port) "hDJ" = ( /turf/open/floor/iron/stairs/medium, /area/station/science/research) @@ -28314,11 +28405,13 @@ /obj/effect/turf_decal/trimline/white/line{ dir = 5 }, -/obj/effect/landmark/start/security_officer, +/obj/machinery/computer/security{ + dir = 8 + }, /turf/open/floor/iron/dark/smooth_corner{ dir = 8 }, -/area/station/security/brig) +/area/station/security/warden) "hFa" = ( /obj/effect/turf_decal/siding/wideplating_new/light{ dir = 1 @@ -28441,10 +28534,15 @@ }, /area/mine/laborcamp) "hGQ" = ( -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 }, -/area/station/medical/medbay/central) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/medical/paramedic) "hHb" = ( /obj/structure/ore_box, /turf/open/floor/plating/snowed/smoothed/icemoon, @@ -28724,6 +28822,7 @@ /area/station/common/cryopods) "hLt" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "hLC" = ( @@ -28828,17 +28927,9 @@ }, /area/station/command/bridge) "hMX" = ( -/obj/item/radio/intercom/directional/east, -/obj/machinery/computer/security{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/white/line{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, -/area/station/security/warden) +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/plating, +/area/station/maintenance/department/security/brig) "hMY" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/light/directional/south, @@ -28877,6 +28968,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/small, /area/station/common/nightclubbooth1) +"hNA" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/edge, +/area/station/science/lobby) "hNH" = ( /obj/item/kirbyplants/random, /obj/effect/mapping_helpers/requests_console/supplies, @@ -28989,10 +29088,18 @@ /turf/open/floor/plating, /area/station/maintenance/department/science/ordnance_maint_lesser) "hPs" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/plating, -/area/station/maintenance/department/security/brig) +/obj/effect/turf_decal/trimline/white/line{ + dir = 4 + }, +/obj/machinery/airalarm/directional/east, +/mob/living/basic/pet/dog/pug/mcgriff, +/obj/structure/bed/dogbed/mcgriff{ + anchored = 1 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/security/warden) "hPt" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 5 @@ -29139,6 +29246,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/abandon_arcade) +"hRg" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/security/warden) "hRh" = ( /obj/structure/chair/office{ dir = 1 @@ -29397,6 +29513,10 @@ }, /turf/open/floor/grass, /area/station/hallway/primary/starboard) +"hVE" = ( +/obj/structure/lattice, +/turf/open/openspace/icemoon, +/area/station/maintenance/disposal) "hVL" = ( /obj/structure/cable, /obj/machinery/power/smes, @@ -29858,17 +29978,22 @@ /turf/open/floor/iron/white/smooth_half, /area/station/science/xenobiology) "iaZ" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east, /obj/structure/disposalpipe/junction/yjunction{ dir = 8 }, +/obj/machinery/suit_storage_unit/medical, +/obj/effect/turf_decal/tile/dark_blue/anticorner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/box/blue, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white/smooth_corner{ dir = 8 }, -/area/station/medical/medbay/central) +/area/station/medical/paramedic) "ibe" = ( /obj/structure/window/reinforced/tinted/spawner/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30323,20 +30448,6 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library/artgallery) -"ihl" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue/half, -/obj/structure/chair/sofa/middle{ - dir = 1 - }, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron/white/smooth_edge, -/area/station/medical/paramedic) "ihr" = ( /obj/machinery/telecomms/processor/preset_three, /obj/effect/turf_decal/siding/yellow{ @@ -30366,11 +30477,16 @@ /obj/effect/turf_decal/siding/dark/corner{ dir = 8 }, -/obj/effect/turf_decal/siding/dark/corner, /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "ihJ" = ( @@ -30601,24 +30717,6 @@ dir = 1 }, /area/station/command/secure_bunker) -"ikr" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/turf/open/floor/iron/herringbone, -/area/station/hallway/primary) -"ikN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/holopad, -/turf/open/floor/carpet/red, -/area/station/security/warden) "ilk" = ( /obj/structure/flora/ocean/seaweed{ pixel_y = 12 @@ -30697,6 +30795,17 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron/white/smooth_large, /area/station/engineering/atmos/pumproom) +"imz" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 + }, +/obj/machinery/computer/crew{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/security/warden) "imA" = ( /obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 4; @@ -31293,6 +31402,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "ity" = ( @@ -31456,7 +31566,7 @@ /obj/machinery/door/airlock/maintenance_hatch{ name = "Cargo Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/service/chapel) "ivX" = ( @@ -31788,10 +31898,13 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/white/smooth_half{ dir = 8 }, -/area/station/medical/medbay/central) +/area/station/medical/paramedic) "iBg" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -32022,19 +32135,9 @@ /turf/open/floor/iron/white/smooth_large, /area/station/medical/treatment_center) "iEX" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue/half, -/obj/machinery/computer/records/medical{ - dir = 1 - }, -/obj/structure/sign/calendar/directional/south, -/turf/open/floor/iron/white/smooth_edge, -/area/station/medical/paramedic) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "iFn" = ( /obj/structure/rack/shelf, /obj/machinery/light/directional/north, @@ -32288,6 +32391,17 @@ dir = 8 }, /area/station/engineering/atmospherics_engine) +"iIa" = ( +/obj/machinery/computer/prisoner/management{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/white/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/security/warden) "iIb" = ( /obj/effect/landmark/start/shaft_miner, /turf/open/floor/iron/smooth_large, @@ -32439,18 +32553,6 @@ "iKo" = ( /turf/open/floor/carpet/red, /area/station/security/courtroom) -"iKx" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/medical/paramedic) "iKA" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -32524,8 +32626,7 @@ /turf/open/floor/plating, /area/station/commons/dorms/room1) "iKZ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/warning{ +/obj/effect/turf_decal/trimline/green/filled/warning/corner{ dir = 4 }, /turf/open/floor/iron/edge{ @@ -32673,7 +32774,7 @@ }, /obj/item/pen{ pixel_y = 0; - pixel_x = -5 + pixel_x = 5 }, /obj/item/reagent_containers/spray/quantum_hair_dye{ pixel_y = 21; @@ -32705,11 +32806,24 @@ /turf/open/floor/iron, /area/station/maintenance/law) "iNn" = ( -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/suit_storage_unit/security, -/obj/effect/turf_decal/box/red, -/turf/open/floor/iron/smooth_large, -/area/station/security/lockers) +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/table/reinforced, +/obj/item/folder/red{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/folder/red{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_y = 1; + pixel_x = 3 + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/station/security/warden) "iNp" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/stripes{ @@ -32776,6 +32890,11 @@ "iOo" = ( /turf/open/floor/plating, /area/mine/laborcamp/security) +"iOt" = ( +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/commons/storage/primary) "iOF" = ( /obj/structure/cable, /obj/machinery/door/airlock/atmos/glass, @@ -32883,23 +33002,6 @@ }, /turf/open/floor/wood/tile, /area/station/commons/dorms) -"iPE" = ( -/obj/structure/table/reinforced, -/obj/item/assembly/flash/handheld{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/effect/turf_decal/trimline/white/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 8 - }, -/area/station/security/warden) "iPG" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Cargo Maintenance" @@ -33267,6 +33369,17 @@ /obj/item/electronics/apc, /turf/open/floor/plating, /area/station/commons/vacant_room) +"iUR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/white/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/security/brig) "iUT" = ( /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) @@ -33312,14 +33425,12 @@ /turf/open/floor/stone, /area/station/commons/dorms/room5) "iVK" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - pixel_y = 7 - }, /obj/effect/turf_decal/trimline/white/line{ dir = 6 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, /area/station/security/breakroom) "iVN" = ( /obj/effect/landmark/start/head_of_security, @@ -33422,10 +33533,8 @@ /turf/open/floor/plating, /area/station/maintenance/fore/greater) "iXv" = ( -/obj/structure/reagent_forge, -/obj/machinery/newscaster/directional/north, -/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/item/radio/intercom/directional/west, /turf/open/floor/stone, /area/station/service/forge) "iXy" = ( @@ -33566,10 +33675,10 @@ }, /area/mine/laborcamp) "iYV" = ( -/obj/effect/turf_decal/trimline/yellow/line{ +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/green/line{ dir = 8 }, -/obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary) "iYX" = ( @@ -33608,10 +33717,12 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "iZs" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/commons/storage/primary) +/obj/structure/chair/stool/bar/directional/west, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "iZw" = ( /obj/machinery/holopad, /turf/open/floor/iron/dark/diagonal, @@ -33956,6 +34067,7 @@ /area/station/maintenance/hiddengarden) "jen" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/hallway/primary/starboard) "jeo" = ( @@ -34083,6 +34195,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos/lesser) "jgo" = ( @@ -34572,7 +34685,7 @@ /area/station/command/heads_quarters/ce) "jmg" = ( /obj/machinery/light/directional/south, -/obj/effect/turf_decal/trimline/yellow/line, +/obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/edge{ dir = 1 }, @@ -34649,18 +34762,6 @@ dir = 4 }, /area/station/science/robotics/mechbay) -"jnO" = ( -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/recharger{ - pixel_y = 8; - pixel_x = 5 - }, -/obj/structure/table/reinforced, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) "jnP" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark, @@ -34726,12 +34827,12 @@ /area/station/science/xenobiology) "jon" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 4 - }, /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/trimline/green/line{ + dir = 4 + }, /turf/open/floor/iron/edge{ dir = 8 }, @@ -34959,6 +35060,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "Brig Shutters" + }, /turf/open/floor/plating, /area/station/security/brig) "jrA" = ( @@ -34974,10 +35079,7 @@ /area/station/service/library) "jsj" = ( /obj/structure/table/reinforced, -/obj/item/storage/box/emps{ - pixel_y = 8; - pixel_x = 5 - }, +/obj/machinery/dish_drive/bullet, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) "jsF" = ( @@ -35073,6 +35175,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/black, /area/station/security/office) +"jtQ" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary) +"juc" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/reagent_crafting_bench, +/turf/open/floor/stone, +/area/station/service/forge) "juf" = ( /obj/item/flashlight, /turf/open/floor/plating, @@ -35219,6 +35338,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "jwY" = ( @@ -35270,6 +35390,10 @@ dir = 1 }, /area/station/engineering/atmospherics_engine) +"jyg" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/iron/dark/side, +/area/station/commons/storage/primary) "jyi" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -35617,9 +35741,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/service/theatre, /turf/open/floor/plating, /area/station/service/greenroom) "jCp" = ( @@ -36429,6 +36553,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/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "jLL" = ( @@ -36533,6 +36658,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_psych) "jNn" = ( @@ -36608,6 +36734,10 @@ /obj/machinery/mass_driver/trash{ dir = 8 }, +/obj/machinery/door/window/left/directional/east{ + name = "Mass Driver"; + req_access = list("maint_tunnels") + }, /turf/open/floor/plating, /area/station/maintenance/disposal) "jOv" = ( @@ -37019,6 +37149,19 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/heads_quarters/blueshield) +"jTP" = ( +/obj/effect/turf_decal/trimline/white/line, +/obj/item/radio/intercom/directional/south, +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 1 + }, +/obj/item/storage/toolbox/electrical{ + pixel_y = 7; + pixel_x = 1 + }, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/security/warden) "jTQ" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -37105,6 +37248,10 @@ dir = 1 }, /area/station/medical/chemistry) +"jUA" = ( +/obj/effect/landmark/start/warden, +/turf/open/floor/carpet/red, +/area/station/security/warden) "jUP" = ( /obj/machinery/computer/station_alert{ dir = 4 @@ -37288,6 +37435,16 @@ }, /turf/open/floor/iron/checker, /area/mine/laborcamp) +"jXt" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 6 + }, +/obj/machinery/recharge_station, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/station/security/lockers) "jXv" = ( /obj/structure/sign/poster/official/wtf_is_co2/directional/north, /turf/open/openspace, @@ -37472,11 +37629,17 @@ /turf/open/floor/plating, /area/station/maintenance/condemned_med) "kaU" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/iron/dark/side{ - dir = 8 +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -6; + pixel_y = 9 }, -/area/station/commons/storage/primary) +/obj/item/storage/box/drinkingglasses{ + pixel_x = 8; + pixel_y = 2 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "kbb" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -37643,7 +37806,7 @@ /turf/open/floor/iron/dark/smooth_edge{ dir = 8 }, -/area/station/security/brig) +/area/station/security/warden) "kdr" = ( /turf/open/floor/iron, /area/station/hallway/primary/forestarboardhall) @@ -37974,6 +38137,21 @@ dir = 1 }, /area/station/medical/virology) +"khL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary/starboard) "khO" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -38053,8 +38231,13 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 }, -/obj/machinery/rnd/production/circuit_imprinter/department/science, /obj/structure/sign/poster/official/safety_eye_protection/directional/east, +/obj/structure/table/reinforced, +/obj/machinery/fax{ + fax_name = "Research Division"; + name = "Research Division Fax Machine"; + pixel_y = 3 + }, /turf/open/floor/iron/dark/smooth_corner{ dir = 8 }, @@ -38199,17 +38382,13 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "kkI" = ( -/obj/structure/table/reinforced, /obj/machinery/light_switch/directional/north, -/obj/item/storage/toolbox/emergency{ - pixel_y = 7; - pixel_x = 8 - }, -/obj/item/dest_tagger, -/turf/open/floor/iron/dark/side{ - dir = 5 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/station/commons/storage/primary) +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "kkL" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/spawner/random/trash/mess, @@ -38254,6 +38433,7 @@ /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/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) "klK" = ( @@ -38283,6 +38463,7 @@ /obj/effect/landmark/navigate_destination/disposals, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/disposal) "kma" = ( @@ -38394,10 +38575,13 @@ /turf/open/floor/wood, /area/station/commons/fitness/recreation) "kmW" = ( -/turf/open/floor/iron/dark/side{ - dir = 4 +/obj/structure/table/wood, +/obj/item/food/muffin/berry{ + pixel_x = 2; + pixel_y = -1 }, -/area/station/commons/storage/primary) +/turf/open/floor/carpet, +/area/station/service/cafeteria) "kmX" = ( /obj/effect/turf_decal/tile/dark_green/opposingcorners, /obj/structure/disposalpipe/segment{ @@ -38425,7 +38609,7 @@ /obj/machinery/light/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/yellow/corner{ +/obj/effect/turf_decal/trimline/green/corner{ dir = 1 }, /turf/open/floor/iron/edge, @@ -38623,6 +38807,7 @@ }, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/bloodcasino) "kqA" = ( @@ -38642,15 +38827,6 @@ /obj/machinery/meter, /turf/open/floor/iron/large, /area/station/engineering/atmos) -"kqJ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/edge{ - dir = 8 - }, -/area/station/hallway/primary/port) "kqL" = ( /turf/closed/wall/r_wall, /area/station/medical/medbay/aft) @@ -38778,6 +38954,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Old Garden" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "ksE" = ( @@ -38814,10 +38991,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/wood/large, /area/station/security/prison) -"ksK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet/red, -/area/station/security/warden) "ksL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38840,6 +39013,7 @@ "ksZ" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "kto" = ( @@ -38955,6 +39129,10 @@ }, /turf/open/floor/carpet/red, /area/station/security/office) +"kuH" = ( +/obj/structure/table, +/turf/open/floor/stone, +/area/station/service/forge) "kuJ" = ( /obj/machinery/door/airlock{ name = "Front Desk" @@ -39311,6 +39489,10 @@ dir = 4 }, /area/station/cargo/miningfoundry) +"kyT" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/service/cafeteria) "kyX" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -39375,29 +39557,9 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/secondary/recreation) "kzD" = ( -/obj/machinery/light/directional/east, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/trimline/white/line{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/storage/box/evidence{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/item/storage/box/flashes{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/storage/box/trackimp{ - pixel_x = 9 - }, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -7; - pixel_y = -4 - }, +/obj/structure/cable, /turf/open/floor/iron/dark/smooth_edge{ - dir = 4 + dir = 1 }, /area/station/security/lockers) "kzG" = ( @@ -39443,8 +39605,12 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, -/obj/machinery/vending/wardrobe/science_wardrobe, /obj/machinery/light_switch/directional/east, +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/folder{ + pixel_y = 7 + }, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, @@ -39499,7 +39665,7 @@ }, /area/station/hallway/primary/aft) "kAJ" = ( -/obj/effect/turf_decal/trimline/yellow/line{ +/obj/effect/turf_decal/trimline/green/line{ dir = 1 }, /turf/open/floor/iron/edge, @@ -39977,7 +40143,6 @@ dir = 8 }, /obj/machinery/light/directional/west, -/obj/machinery/door/firedoor, /obj/structure/sign/directions/cryo/directional/west{ dir = 2; pixel_x = -32; @@ -40228,6 +40393,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/law) +"kJS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "Brig Shutters" + }, +/turf/open/floor/plating, +/area/station/security/warden) "kKl" = ( /obj/item/kirbyplants/random, /obj/structure/sign/poster/official/help_others/directional/north, @@ -40498,16 +40671,19 @@ /turf/open/floor/iron/white/small, /area/station/common/pool) "kNL" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 8 +/obj/structure/table/reinforced, +/obj/item/radio/intercom/directional/north, +/obj/machinery/cell_charger{ + pixel_y = 4 }, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 4 +/obj/item/inducer{ + pixel_y = 5; + pixel_x = -4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/commons/storage/primary) "kNT" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_red/filled/line, @@ -40544,12 +40720,16 @@ }, /turf/open/floor/iron/edge, /area/station/hallway/primary/foreporthall) +"kOj" = ( +/obj/effect/landmark/start/assistant, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "kOr" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 9 }, /obj/machinery/light/small/directional/north, -/obj/structure/closet/firecloset, /turf/open/floor/iron/dark/smooth_corner, /area/station/science/lab) "kOH" = ( @@ -40667,6 +40847,15 @@ dir = 1 }, /area/station/security/prison/rec) +"kPY" = ( +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/station/hallway/primary/starboard) "kQe" = ( /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/rubble, @@ -40696,6 +40885,11 @@ /obj/effect/turf_decal/vg_decals/atmos/oxygen, /turf/open/floor/engine/o2, /area/station/engineering/atmos) +"kQF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "kQK" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -40815,10 +41009,16 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/fore) "kSq" = ( -/obj/machinery/vending/assist, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark/diagonal, -/area/station/commons/storage/primary) +/obj/structure/chair/sofa/corp/left{ + color = "#DE3A3A"; + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "kSv" = ( /obj/machinery/door/airlock/bathroom{ name = "Restroom" @@ -41125,15 +41325,16 @@ /turf/open/floor/iron, /area/station/hallway/floor2) "kWP" = ( +/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/holopad, -/turf/open/floor/iron/dark, -/area/station/security/brig) +/turf/open/floor/carpet/red, +/area/station/security/warden) "kXj" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/law) "kXk" = ( @@ -41321,6 +41522,9 @@ /obj/structure/flora/bush/flowers_br, /turf/open/floor/grass, /area/station/hallway/primary) +"lay" = ( +/turf/open/floor/iron/dark, +/area/station/security/lockers) "laD" = ( /obj/structure/shipping_container/deforest, /turf/open/floor/iron/smooth_edge{ @@ -41359,14 +41563,15 @@ /turf/open/floor/iron/edge, /area/station/ai_monitored/command/storage/eva) "lbr" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, /obj/effect/landmark/start/hangover, -/turf/open/floor/iron/white/side{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 }, -/area/station/medical/medbay/central) +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "lbC" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Antechamber" @@ -41460,6 +41665,7 @@ /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_kitchen_upper) "lcQ" = ( @@ -41688,6 +41894,7 @@ }, /obj/item/multitool, /obj/structure/sign/calendar/directional/north, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/science/robotics) "lgw" = ( @@ -41695,6 +41902,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "lgA" = ( @@ -42011,12 +42219,12 @@ "lkt" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/law) "lku" = ( @@ -42221,24 +42429,6 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) -"lnP" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 4 - }, -/obj/machinery/suit_storage_unit/medical, -/obj/effect/turf_decal/box/blue, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/medical/paramedic) "lnS" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -42588,29 +42778,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"lsE" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/security_space_law{ - pixel_y = 6; - pixel_x = 4 - }, -/obj/item/paper_bin/carbon{ - pixel_x = -12; - pixel_y = 7 - }, -/obj/item/pen{ - pixel_y = 7; - pixel_x = -8 - }, -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 1 - }, -/area/station/security/warden) "lsM" = ( /obj/structure/table/reinforced, /obj/item/radio{ @@ -42792,8 +42959,9 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/aft) "lvb" = ( -/obj/effect/turf_decal/siding/dark, -/turf/open/floor/iron/herringbone, +/obj/structure/flora/bush/flowers_pp/style_random, +/obj/structure/flora/bush/ferny/style_random, +/turf/open/floor/grass, /area/station/hallway/primary/starboard) "lvf" = ( /obj/structure/ore_vent/starter_resources{ @@ -42953,6 +43121,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/security) "lya" = ( @@ -43056,6 +43225,14 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark/smooth_edge, /area/station/science/robotics) +"lAc" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/left/directional/east{ + req_access = list("science"); + name = "Science Front Desk" + }, +/turf/open/floor/plating, +/area/station/science/lab) "lAf" = ( /obj/structure/cable, /obj/effect/landmark/navigate_destination/tcomms, @@ -43239,15 +43416,6 @@ dir = 1 }, /area/station/security/checkpoint/engineering) -"lBX" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/edge{ - dir = 8 - }, -/area/station/hallway/primary/starboard) "lCi" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -43313,6 +43481,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "lCI" = ( @@ -43554,6 +43723,19 @@ dir = 4 }, /area/station/security/brig) +"lFS" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary/starboard) "lFT" = ( /obj/machinery/modular_computer/preset/id{ dir = 4 @@ -43933,6 +44115,10 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/department/science/ordnance_maint_lesser) +"lNa" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "lNb" = ( /obj/structure/flora/bush/flowers_pp/style_3, /turf/open/floor/grass, @@ -44301,6 +44487,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Abandoned Holding Cells" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore) "lRZ" = ( @@ -44329,7 +44516,10 @@ /area/station/common/cryopods) "lSe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/stone, +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/edge, /area/station/hallway/primary/port) "lSg" = ( /obj/structure/cable, @@ -44490,9 +44680,6 @@ /obj/effect/turf_decal/trimline/white/line{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, @@ -44845,6 +45032,10 @@ dir = 8 }, /area/station/command/secure_bunker) +"mai" = ( +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/turf/closed/wall/r_wall, +/area/station/security/interrogation) "mav" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -45231,16 +45422,25 @@ /area/station/security/execution/transfer) "mhe" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor/left/directional/south{ - name = "Security Desk"; - req_access = list("security") - }, /obj/machinery/door/firedoor, /obj/machinery/door/window/left/directional/north{ name = "Security Front Desk" }, +/obj/item/paper_bin/carbon, +/obj/item/pen{ + pixel_y = 0; + pixel_x = 5 + }, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "Brig Shutters" + }, +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Brig Control Desk"; + req_access = list("armory") + }, /turf/open/floor/plating, -/area/station/security/brig) +/area/station/security/warden) "mhh" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -45258,11 +45458,23 @@ dir = 4 }, /area/station/security/checkpoint/engineering) +"mhz" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/food/butterbiscuit, +/turf/open/floor/iron/edge{ + dir = 4 + }, +/area/station/hallway/primary/port) "mhG" = ( -/obj/effect/turf_decal/trimline/yellow/line, /obj/structure/chair/sofa/bench/left{ dir = 1 }, +/obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/edge{ dir = 1 }, @@ -45687,20 +45899,9 @@ /turf/open/floor/iron/dark, /area/station/service/barber/spa) "mmd" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue/anticorner, -/obj/structure/chair/sofa/corner{ - dir = 8 - }, -/obj/structure/closet/generic/wall{ - pixel_x = 30 - }, -/turf/open/floor/iron/white/smooth_corner{ - dir = 1 - }, -/area/station/medical/paramedic) +/obj/effect/spawner/random/trash/grille_or_waste, +/turf/open/floor/iron, +/area/station/maintenance/department/science/ordnance_maint) "mmq" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/white{ @@ -45771,6 +45972,11 @@ /obj/effect/turf_decal/siding/dark{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark/corner, +/obj/structure/railing/below_trees, /turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "mnf" = ( @@ -45818,6 +46024,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/aftporthall) +"mnT" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/effect/spawner/random/food_or_drink/donkpockets{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/white/smooth_corner, +/area/station/medical/paramedic) "mnZ" = ( /obj/machinery/light/small/directional/north, /obj/structure/toilet, @@ -45829,10 +46049,9 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet/auxiliary) "mol" = ( -/obj/effect/landmark/navigate_destination/tools, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/commons/storage/primary) +/obj/structure/chair/stool/bar/directional/west, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "mov" = ( /obj/machinery/camera/autoname/directional/south{ network = list("ss13","minisat") @@ -45871,13 +46090,10 @@ /obj/machinery/door/airlock/maintenance{ name = "Abandoned Wrestling Ring" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_wrestle) "moX" = ( -/obj/machinery/coffeemaker/impressa{ - pixel_y = 5; - pixel_x = 2 - }, /obj/structure/table, /obj/machinery/light/directional/north, /turf/open/floor/iron/dark/diagonal, @@ -46465,11 +46681,11 @@ /area/station/service/chapel) "mxR" = ( /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/law) "mxU" = ( @@ -46721,6 +46937,9 @@ "mAL" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/foreporthall) +"mAM" = ( +/turf/open/floor/stone, +/area/station/service/forge) "mAQ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/edge{ @@ -47068,6 +47287,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/service/chapel) "mGe" = ( @@ -47099,6 +47319,7 @@ /obj/machinery/door/airlock/maintenance_hatch{ name = "Virology Trash" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "mGx" = ( @@ -47243,12 +47464,54 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/cargo/miningoffice) "mIB" = ( -/obj/structure/reagent_dispensers/watertank, /obj/machinery/light/floor, -/turf/open/floor/iron/dark/side{ - dir = 10 +/obj/item/storage/box/coffeepack/robusta{ + pixel_x = -4; + pixel_y = -4 }, -/area/station/commons/storage/primary) +/obj/structure/closet/crate{ + name = "Cafe Kit" + }, +/obj/item/storage/box/coffeepack/robusta{ + pixel_x = -2 + }, +/obj/item/coffee_cartridge{ + pixel_x = 6 + }, +/obj/item/coffee_cartridge{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/storage/box/coffeepack{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/box/coffeepack{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/plate/oven_tray{ + pixel_y = 4 + }, +/obj/item/clothing/suit/apron/chef{ + name = "Jim Norton's Quebecois Coffee apron" + }, +/obj/item/clothing/head/soft/green{ + color = "#00a62e"; + desc = "It's a baseball hat in a tastefull green colour."; + name = "Jim Norton's Quebecois Coffee cap" + }, +/obj/item/paper{ + default_raw_text = "Jim Norton's Quebecois Coffee. You see, in 2265 the Quebecois had finally had enough of Canada's shit, and went to the one place that wasn't corrupted by Canuckistan.Je vais au seul endroit qui n'a pas ??? corrompu par les Canadiens ... ESPACE."; + name = "Coffee Shop"; + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/coffeepot{ + pixel_y = 21 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "mIR" = ( /obj/machinery/computer/camera_advanced/xenobio{ dir = 1 @@ -47611,19 +47874,17 @@ }, /area/station/hallway/primary) "mOm" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/white/side{ +/obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 }, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "mOE" = ( /obj/machinery/door/airlock/maintenance{ name = "Old Sci" @@ -47801,6 +48062,11 @@ dir = 8 }, /area/station/hallway/primary/foreporthall) +"mRK" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "mSg" = ( /obj/structure/rack, /obj/item/wirecutters{ @@ -48010,6 +48276,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) "mVn" = ( @@ -48123,23 +48390,9 @@ /obj/structure/closet, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"mWS" = ( -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/structure/table, -/turf/open/floor/plating, -/area/station/maintenance/department/science/ordnance_maint) "mXb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/corner, +/obj/structure/flora/bush/flowers_yw/style_random, +/turf/open/floor/grass, /area/station/hallway/primary/starboard) "mXe" = ( /obj/structure/sign/poster/official/periodic_table/directional/north, @@ -48991,6 +49244,15 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/diagonal, /area/station/commons/fitness/locker_room) +"nla" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 1 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/science/lab) "nlg" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -49101,6 +49363,10 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "roboticsprivacy"; + name = "Robotics Shutters" + }, /turf/open/floor/iron/dark/smooth_half{ dir = 8 }, @@ -49248,6 +49514,7 @@ "nop" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "nor" = ( @@ -49423,11 +49690,17 @@ /turf/closed/wall/r_wall, /area/station/engineering/atmos) "nqB" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/landmark/start/hangover, -/turf/open/floor/iron/edge{ +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ dir = 8 }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "nqR" = ( /obj/effect/turf_decal/trimline/purple/filled/line, @@ -49456,6 +49729,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos/lesser) "nrn" = ( @@ -49713,12 +49987,6 @@ }, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) -"nub" = ( -/obj/machinery/suit_storage_unit/security, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/box/red, -/turf/open/floor/iron/smooth_large, -/area/station/security/lockers) "nug" = ( /obj/machinery/light_switch/directional/south, /obj/structure/disposalpipe/segment{ @@ -49784,17 +50052,6 @@ }, /turf/open/floor/grass, /area/station/hallway/primary/forestarboardhall) -"nvt" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/security/glass{ - name = "Gear Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/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/smooth_large, -/area/station/security/lockers) "nvx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49995,13 +50252,13 @@ /turf/open/floor/carpet, /area/station/security/detectives_office) "nxE" = ( -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 - }, /obj/structure/chair/sofa/bench/left{ dir = 4; pixel_x = -5 }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 8 + }, /turf/open/floor/iron, /area/station/hallway/primary) "nxH" = ( @@ -50116,6 +50373,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_cafeteria) "nyJ" = ( @@ -50137,6 +50395,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "nza" = ( @@ -50415,6 +50674,8 @@ dir = 4 }, /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/herringbone, /area/station/hallway/primary) "nDc" = ( @@ -50599,9 +50860,14 @@ /turf/open/floor/iron/grimy, /area/station/maintenance/hiddenlibrary) "nFy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /obj/effect/turf_decal/siding/dark{ - dir = 5 + dir = 1 }, +/obj/effect/turf_decal/siding/dark, +/obj/structure/railing/below_trees, /turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "nFF" = ( @@ -50667,8 +50933,6 @@ /turf/open/floor/carpet/royalblue, /area/station/commons/dorms/room4) "nGD" = ( -/obj/structure/reagent_crafting_bench, -/obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -50713,6 +50977,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "nGZ" = ( @@ -50735,23 +51000,23 @@ /area/station/service/kitchen/diner) "nHG" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 4 - }, /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/green/line{ + dir = 4 + }, /turf/open/floor/iron/edge{ dir = 8 }, /area/station/hallway/primary/port) "nHL" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/green/line{ + dir = 1 + }, /turf/open/floor/iron/edge, /area/station/hallway/primary) "nHM" = ( @@ -50892,6 +51157,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/security/prison) +"nJy" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/bot_white, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark/side, +/area/station/commons/storage/primary) "nJC" = ( /obj/structure/flora/rock/pile/jungle/style_5, /obj/structure/flora/rock/pile/jungle/large, @@ -51038,10 +51310,12 @@ "nLl" = ( /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, -/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/storage/primary) +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "nLo" = ( /obj/machinery/digital_clock/directional/south, /obj/effect/turf_decal/tile/blue/anticorner{ @@ -51274,6 +51548,7 @@ location = "UH21"; codes_txt = "patrol;next_patrol=UH22" }, +/obj/structure/cable, /turf/open/floor/iron/herringbone, /area/station/hallway/primary/port) "nOd" = ( @@ -51390,14 +51665,16 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "nPj" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/effect/turf_decal/siding/dark{ dir = 6 }, -/obj/structure/chair/sofa/bench/corner{ - dir = 8; - pixel_x = 5 +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 }, -/turf/open/floor/iron, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "nPl" = ( /obj/structure/cable, @@ -51817,6 +52094,7 @@ }, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/lower) "nUj" = ( @@ -52016,6 +52294,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/machinery/door/window/left/directional/south{ + name = "Danger: Conveyor Access"; + req_access = list("maint_tunnels") + }, /turf/open/floor/plating, /area/station/maintenance/disposal) "nXH" = ( @@ -52276,6 +52558,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "oaL" = ( @@ -52405,17 +52688,10 @@ /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/hallway) "ocI" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/computer/crew{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/white/line{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, -/area/station/security/warden) +/mob/living/basic/mothroach, +/obj/structure/chair/comfy/beige, +/turf/open/floor/plating, +/area/station/maintenance/department/security/brig) "ocN" = ( /turf/open/floor/plating, /area/station/maintenance/disposal) @@ -52706,19 +52982,28 @@ /turf/open/floor/iron/dark/side, /area/station/ai_monitored/turret_protected/aisat/hallway) "ohb" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ +/obj/structure/disposalpipe/segment, +/obj/machinery/suit_storage_unit/medical, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue/half{ dir = 4 }, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/box/blue, /turf/open/floor/iron/white/smooth_edge{ dir = 4 }, -/area/station/medical/medbay/central) +/area/station/medical/paramedic) "ohd" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "ohh" = ( @@ -52880,6 +53165,7 @@ /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/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "oja" = ( @@ -52929,18 +53215,9 @@ /turf/open/floor/iron/smooth_large, /area/station/cargo/storage) "ojH" = ( -/obj/machinery/camera/autoname/directional/east, -/obj/machinery/computer/prisoner/management{ - dir = 8 - }, /obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/trimline/white/line{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, -/area/station/security/warden) +/turf/closed/wall/r_wall, +/area/station/security/lockers) "ojI" = ( /obj/machinery/camera/autoname/directional/south{ network = list("ss13","prison") @@ -53029,6 +53306,18 @@ }, /turf/open/floor/iron/corner, /area/station/hallway/primary/forestarboardhall) +"okA" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary) "okB" = ( /obj/structure/urinal/directional/west, /obj/effect/landmark/start/hangover, @@ -53185,16 +53474,6 @@ }, /turf/open/floor/plating, /area/station/service/bar) -"ome" = ( -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) "omj" = ( /obj/structure/cable, /obj/machinery/airalarm/directional/north, @@ -53269,18 +53548,13 @@ /turf/open/floor/iron, /area/station/hallway/secondary/command) "oou" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/electrical{ - pixel_y = 13; +/obj/structure/table, +/obj/machinery/coffeemaker/impressa{ + pixel_y = 5; pixel_x = 2 }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/commons/storage/primary) +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "oox" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ @@ -53586,7 +53860,7 @@ /area/station/maintenance/aft) "osG" = ( /turf/closed/wall, -/area/station/commons/storage/primary) +/area/station/service/cafeteria) "osT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, @@ -54095,6 +54369,7 @@ }, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos/lesser) "oAO" = ( @@ -54412,17 +54687,20 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/port) "oFV" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/machinery/door/airlock/medical/glass{ - name = "Paramedic Dispatch Room" +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/electrical{ + pixel_y = 7; + pixel_x = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/smooth_half{ - dir = 8 +/obj/item/storage/toolbox/mechanical{ + pixel_y = -5; + pixel_x = 2 }, -/area/station/medical/paramedic) +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/commons/storage/primary) "oGf" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/closed/wall/r_wall, @@ -54487,6 +54765,16 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/storage) +"oGY" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/station/security/lockers) "oHa" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/engine, @@ -54511,6 +54799,24 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/wood, /area/station/maintenance/hiddenlibrary) +"oHs" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/structure/table, +/obj/machinery/light/directional/north, +/obj/item/forging/billow{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/forging/tongs{ + pixel_x = 0; + pixel_y = 4 + }, +/obj/item/forging/hammer{ + pixel_x = 5; + pixel_y = -2 + }, +/turf/open/floor/stone, +/area/station/service/forge) "oHt" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plating, @@ -54520,7 +54826,8 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Brig Entrance" + name = "Brig Entrance"; + id_tag = "outerbrig" }, /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /obj/machinery/door/firedoor, @@ -55638,40 +55945,9 @@ /turf/open/floor/iron/white/small, /area/station/medical/virology) "oWv" = ( -/obj/structure/sign/chalkboard_menu{ - pixel_y = 32 - }, /obj/machinery/status_display/evac/directional/west, -/obj/structure/closet/crate{ - name = "Cafe Kit" - }, -/obj/item/plate/oven_tray{ - pixel_y = 4 - }, -/obj/item/storage/box/coffeepack{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/box/coffeepack{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/coffeepot{ - pixel_y = 21 - }, -/obj/item/coffee_cartridge{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/coffee_cartridge{ - pixel_x = 6 - }, -/obj/item/storage/box/coffeepack/robusta{ - pixel_x = -2 - }, -/obj/item/storage/box/coffeepack/robusta{ - pixel_x = -4; - pixel_y = -4 +/obj/structure/closet/secure_closet/personal{ + name = "Commissary Locker" }, /turf/open/floor/iron/dark/diagonal, /area/station/commons/vacant_room/commissary) @@ -55746,6 +56022,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/smooth_edge, /area/station/medical/chemistry) +"oXy" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary/starboard) "oXC" = ( /obj/structure/table, /turf/open/floor/iron, @@ -55923,17 +56213,25 @@ /turf/open/floor/iron/dark, /area/station/common/night_club) "oZD" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, /obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, -/area/station/medical/medbay/central) +/area/station/medical/paramedic) "oZE" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -56048,6 +56346,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/coffin_supply) "pbz" = ( @@ -56477,11 +56776,19 @@ /obj/item/pushbroom, /turf/open/floor/iron, /area/station/maintenance/department/engineering/engine_aft_port) +"pgk" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/commons/storage/primary) "pgs" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) "pgw" = ( @@ -56639,7 +56946,6 @@ "pig" = ( /obj/machinery/camera/autoname/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/west, /turf/open/floor/stone, /area/station/service/forge) "pio" = ( @@ -56775,10 +57081,10 @@ /turf/open/floor/iron/white/smooth_large, /area/station/engineering/atmos/pumproom) "pkQ" = ( -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 5 - }, /obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, /turf/open/floor/iron/corner{ dir = 8 }, @@ -56811,6 +57117,12 @@ dir = 4 }, /area/station/hallway/floor2) +"plc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/station/security/breakroom) "plk" = ( /obj/machinery/computer/gateway_control{ dir = 8 @@ -57074,9 +57386,13 @@ /turf/open/floor/iron/dark, /area/station/science/genetics) "ppd" = ( -/obj/machinery/vending/wardrobe/sec_wardrobe, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, /area/station/security/lockers) "ppf" = ( /obj/effect/turf_decal/siding/wood{ @@ -57168,15 +57484,15 @@ /turf/open/floor/iron, /area/station/commons/fitness) "ppW" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Security Desk" - }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/security/armory, +/obj/machinery/door/airlock/security/glass{ + name = "Brig Control" + }, /turf/open/floor/iron/dark, /area/station/security/office) "pqd" = ( @@ -57799,24 +58115,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/department/engine/atmos) -"pAZ" = ( -/obj/structure/table/reinforced, -/obj/item/inducer{ - pixel_y = 5; - pixel_x = -4 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 1; - pixel_y = 10 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 6; - pixel_y = 7 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/commons/storage/primary) "pBc" = ( /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -58018,14 +58316,6 @@ /obj/effect/spawner/random/trash/box, /turf/open/floor/iron/cafeteria, /area/station/maintenance/abandon_cafeteria) -"pDN" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/hallway/primary/starboard) "pDU" = ( /obj/machinery/status_display/ai/directional/east, /turf/open/floor/circuit, @@ -58092,6 +58382,9 @@ "pFy" = ( /turf/closed/wall/r_wall, /area/station/security/prison/mess) +"pFF" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/science/ordnance_maint) "pFI" = ( /obj/structure/chair/sofa/left/maroon{ dir = 1 @@ -58215,13 +58508,13 @@ /turf/open/floor/eighties, /area/station/maintenance/abandon_arcade) "pHT" = ( -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 - }, /obj/structure/chair/sofa/bench/right{ dir = 4; pixel_x = -5 }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 8 + }, /turf/open/floor/iron, /area/station/hallway/primary) "pHU" = ( @@ -58306,6 +58599,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/chapel) +"pIK" = ( +/obj/machinery/rnd/production/circuit_imprinter/department/science, +/turf/closed/wall/r_wall, +/area/station/science/lab) "pIL" = ( /obj/effect/turf_decal/tile/dark_green{ dir = 1 @@ -58325,9 +58622,16 @@ /turf/closed/wall/r_wall, /area/station/maintenance/department/medical) "pIZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 + }, +/obj/effect/landmark/start/paramedic, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/area/station/medical/paramedic) "pJb" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes{ @@ -58872,18 +59176,6 @@ }, /turf/open/floor/iron/large, /area/station/ai_monitored/turret_protected/ai_upload) -"pSd" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/herringbone, -/area/station/hallway/primary) "pSg" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -58939,17 +59231,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/common/night_club) -"pSJ" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/dark_blue/anticorner{ - dir = 1 - }, -/obj/machinery/microwave{ - pixel_y = 8 - }, -/obj/structure/table/reinforced, -/turf/open/floor/iron/white/smooth_corner, -/area/station/medical/paramedic) "pSM" = ( /obj/structure/toilet{ dir = 4 @@ -58966,12 +59247,22 @@ /turf/open/floor/iron, /area/station/engineering/atmos/hallway) "pSV" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger{ +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/rag{ pixel_y = 4 }, -/turf/open/floor/iron, -/area/station/commons/storage/primary) +/obj/item/reagent_containers/cup/glass/coffee/colonial{ + pixel_y = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -10; + pixel_y = 10 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "pSW" = ( /obj/structure/window/spawner/directional/west, /obj/effect/turf_decal/siding/wideplating{ @@ -59074,11 +59365,11 @@ /area/station/cargo/sorting) "pUF" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/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/trimline/green/line{ + dir = 4 + }, /turf/open/floor/iron/edge{ dir = 8 }, @@ -59174,6 +59465,7 @@ /area/station/medical/medbay/central) "pWu" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical) "pWv" = ( @@ -59182,6 +59474,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"pWw" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary/starboard) "pWH" = ( /obj/structure/table, /obj/item/radio/intercom/directional/west, @@ -59435,12 +59743,15 @@ /turf/closed/wall, /area/station/maintenance/department/security/brig) "qan" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/smooth_edge, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/paramedic) "qat" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/trimline/white/filled/warning{ @@ -59704,16 +60015,6 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/maintenance/department/security/brig) -"qfa" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Paramedic Dispatch Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/turf/open/floor/iron/white/smooth_half{ - dir = 8 - }, -/area/station/medical/paramedic) "qfj" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/white/line, @@ -59830,6 +60131,11 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/storage) +"qgH" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/science/xenobiology) "qgK" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -60082,18 +60388,22 @@ /area/station/engineering/atmos/office) "qlB" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, /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/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, -/area/station/medical/medbay/central) +/area/station/medical/paramedic) "qlG" = ( /obj/structure/sink/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -60282,7 +60592,7 @@ /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, -/area/station/security/brig) +/area/station/security/warden) "qnC" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 6 @@ -60908,6 +61218,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Abandoned Arcade" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_arcade) "qvV" = ( @@ -61608,6 +61919,10 @@ }, /turf/open/floor/iron/smooth_large, /area/station/service/hydroponics) +"qGr" = ( +/obj/structure/cable, +/turf/open/floor/carpet/black, +/area/station/security/breakroom) "qGy" = ( /obj/structure/railing{ dir = 10 @@ -61910,6 +62225,7 @@ /area/station/science/lab) "qKb" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos/lesser) "qKe" = ( @@ -62169,10 +62485,14 @@ }, /obj/machinery/light/directional/east, /obj/machinery/camera/autoname/directional/east, +/obj/machinery/computer/records/security{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/prison/directional/east, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, -/area/station/security/brig) +/area/station/security/warden) "qNq" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/structure/window/reinforced, @@ -62500,7 +62820,6 @@ /obj/effect/turf_decal/trimline/white/filled/line{ dir = 9 }, -/obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron/corner, /area/station/hallway/secondary/entry) "qSz" = ( @@ -62527,7 +62846,7 @@ "qTk" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, -/area/station/commons/storage/primary) +/area/station/service/cafeteria) "qTU" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/warning{ @@ -62569,20 +62888,15 @@ /turf/closed/wall/r_wall, /area/station/maintenance/department/engineering/engie_aft_starboard) "qUx" = ( -/obj/structure/table/reinforced, -/obj/item/lightreplacer{ - pixel_y = 8; - pixel_x = -4 - }, -/obj/item/airlock_painter/decal{ - pixel_y = -7; - pixel_x = 1 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/obj/item/airlock_painter/decal/tile{ - pixel_y = -14 +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 }, -/turf/open/floor/iron/dark/diagonal, -/area/station/commons/storage/primary) +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "qUz" = ( /obj/machinery/status_display/supply, /turf/closed/wall/r_wall, @@ -62756,6 +63070,17 @@ dir = 8 }, /area/station/science/xenobiology) +"qWn" = ( +/obj/machinery/light/directional/east, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/white/line{ + dir = 6 + }, +/obj/machinery/microwave{ + pixel_y = 7 + }, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/security/breakroom) "qWs" = ( /obj/structure/rack, /obj/effect/spawner/random/armory/riot_armor, @@ -62765,6 +63090,7 @@ /obj/effect/turf_decal/stripes{ dir = 9 }, +/obj/effect/spawner/random/armory/riot_helmet, /turf/open/floor/iron/dark/smooth_corner, /area/station/ai_monitored/security/armory) "qWt" = ( @@ -62801,6 +63127,11 @@ dir = 4 }, /area/station/hallway/primary/aftporthall) +"qWL" = ( +/obj/effect/turf_decal/trimline/white/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/security/lockers) "qXc" = ( /obj/structure/table/wood, /obj/structure/window/spawner/directional/west, @@ -62923,7 +63254,6 @@ /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 6 }, -/obj/machinery/camera/autoname/directional/south, /obj/structure/sign/departments/genetics/directional/south, /obj/structure/disposaloutlet{ dir = 8; @@ -63421,24 +63751,34 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "rhc" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, /obj/effect/turf_decal/tile/dark_blue/half{ - dir = 1 + dir = 8 }, -/obj/item/radio/intercom/directional/north, +/obj/machinery/newscaster/directional/west, +/obj/structure/table/reinforced, /obj/item/emergency_bed{ - pixel_x = 7; + pixel_x = -7; pixel_y = 15 }, /obj/item/emergency_bed{ - pixel_x = -7; + pixel_x = 7; pixel_y = 15 }, +/obj/item/wheelchair, +/obj/item/climbing_hook{ + pixel_y = 14; + pixel_x = 3 + }, +/obj/item/climbing_hook{ + pixel_y = 14; + pixel_x = -3 + }, +/obj/item/wheelchair{ + pixel_y = 5 + }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/white/smooth_edge{ - dir = 1 + dir = 8 }, /area/station/medical/paramedic) "rhd" = ( @@ -63506,21 +63846,11 @@ }, /area/station/science/explab) "rix" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/table/reinforced, -/obj/item/taperecorder{ - pixel_y = 6; - pixel_x = -3 - }, -/obj/item/inspector{ - pixel_y = 5; - pixel_x = 17 - }, -/obj/effect/turf_decal/trimline/white/line{ - dir = 9 - }, -/turf/open/floor/iron/dark/smooth_corner, -/area/station/security/warden) +/obj/effect/turf_decal/bot_blue, +/obj/structure/closet/secure_closet/security/sec, +/obj/item/clothing/mask/balaclava, +/turf/open/floor/iron/smooth_large, +/area/station/security/lockers) "riL" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 4 @@ -63698,6 +64028,9 @@ dir = 1 }, /area/station/ai_monitored/security/armory) +"rkZ" = ( +/turf/open/openspace/icemoon, +/area/station/maintenance/disposal) "rld" = ( /obj/effect/spawner/random/trash/hobo_squat, /turf/open/floor/plating, @@ -63799,6 +64132,7 @@ dir = 1 }, /obj/structure/sign/departments/science/alt/directional/north, +/obj/machinery/vending/modularpc, /turf/open/floor/iron, /area/station/science/lobby) "rmR" = ( @@ -63904,19 +64238,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/security/brig) -"rnL" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/trackimp{ - pixel_x = -1; - pixel_y = 6 - }, -/obj/effect/turf_decal/trimline/white/line{ - dir = 10 - }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 4 - }, -/area/station/security/warden) "roa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64171,6 +64492,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore) "rtj" = ( @@ -64191,13 +64513,11 @@ /turf/open/floor/iron/large, /area/station/cargo/storage) "rtI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/area/station/commons/storage/primary) +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "rtL" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -64662,11 +64982,13 @@ /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "rBj" = ( -/obj/effect/turf_decal/trimline/white/line, -/obj/structure/table/reinforced, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark/smooth_edge, -/area/station/security/brig) +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination{ + location = "Warden's Office" + }, +/turf/open/floor/carpet/red, +/area/station/security/warden) "rBm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -64750,6 +65072,16 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/security/brig) +"rCu" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe, +/obj/effect/turf_decal/trimline/white/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 1 + }, +/area/station/security/lockers) "rCw" = ( /obj/structure/bed/double{ dir = 1 @@ -64758,7 +65090,7 @@ dir = 1 }, /obj/machinery/light_switch/directional/north{ - pixel_x = 12 + pixel_x = -12 }, /obj/machinery/newscaster/directional/west, /obj/machinery/button/door/directional/north{ @@ -65058,6 +65390,14 @@ /obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"rGW" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/security/breakroom) "rHa" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/engine, @@ -65080,11 +65420,17 @@ /turf/open/floor/wood/tile, /area/station/command/heads_quarters/nt_rep) "rHB" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, -/turf/open/floor/iron/white/smooth_corner{ - dir = 4 +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 }, -/area/station/medical/medbay/central) +/obj/structure/table/reinforced, +/obj/machinery/microwave{ + pixel_y = 8 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/paramedic) "rHD" = ( /obj/machinery/light/directional/north, /obj/structure/secure_safe/directional/north, @@ -65224,10 +65570,15 @@ /turf/open/floor/plating, /area/station/maintenance/abandon_art_studio) "rJL" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/effect/turf_decal/bot_blue, -/obj/item/clothing/mask/balaclava, -/turf/open/floor/iron/smooth_large, +/obj/effect/turf_decal/trimline/white/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, /area/station/security/lockers) "rKa" = ( /obj/structure/transit_tube/horizontal{ @@ -65350,6 +65701,18 @@ /obj/structure/railing/wooden_fence, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"rMo" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science/ordnance_maint) "rMp" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -65516,13 +65879,11 @@ /turf/open/floor/wood/tile, /area/station/commons/dorms) "rPm" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/dark_blue/half, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/machinery/door/airlock/medical/glass{ - name = "Paramedic Dispatch Room" +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/iron/white/smooth_half, +/turf/open/floor/iron/white, /area/station/medical/paramedic) "rPr" = ( /obj/effect/spawner/random/structure/chair_maintenance, @@ -65803,12 +66164,13 @@ }, /area/station/cargo/miningfoyer) "rSv" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/bot_blue, -/obj/item/clothing/mask/balaclava, -/turf/open/floor/iron/smooth_large, +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/clothing/head/cone{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/iron/dark, /area/station/security/lockers) "rSz" = ( /turf/open/floor/iron/diagonal, @@ -65878,24 +66240,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/herringbone, /area/station/hallway/primary/foreporthall) -"rST" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 4 - }, -/obj/structure/chair/sofa/middle{ - dir = 8 - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/medical/paramedic) "rSU" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -66075,12 +66419,13 @@ /turf/open/floor/plating, /area/station/maintenance/wrestle) "rUW" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, /turf/open/floor/iron/edge{ dir = 8 }, @@ -66328,7 +66673,6 @@ /turf/open/floor/iron/dark/diagonal, /area/station/common/night_club) "rXb" = ( -/obj/structure/table/reinforced, /obj/item/stack/cable_coil{ pixel_y = 3 }, @@ -66349,6 +66693,7 @@ /obj/item/book/manual/wiki/research_and_development{ pixel_x = 8 }, +/obj/structure/table/reinforced, /turf/open/floor/iron/dark/smooth_large, /area/station/science/lab) "rXg" = ( @@ -66414,8 +66759,8 @@ }, /area/station/medical/pharmacy) "rXS" = ( -/obj/effect/turf_decal/trimline/green/filled/warning{ - dir = 8 +/obj/effect/turf_decal/trimline/green/filled/warning/corner{ + dir = 1 }, /turf/open/floor/iron, /area/station/hallway/primary) @@ -66453,10 +66798,10 @@ /turf/open/floor/iron/edge, /area/station/hallway/primary) "rYq" = ( -/obj/effect/turf_decal/trimline/yellow/line, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/edge{ dir = 1 }, @@ -66668,22 +67013,16 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/port) "sbg" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/security{ - name = "Warden's Quarters" +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 }, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination{ - location = "Warden's Office" +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 }, -/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/brig, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/warden) +/area/station/security/breakroom) "sbh" = ( /obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) "sbq" = ( @@ -67027,6 +67366,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/herringbone, /area/station/hallway/primary) "sgc" = ( @@ -67087,9 +67427,9 @@ /area/station/maintenance/department/engine/atmos/lesser) "sgW" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/green/corner, /turf/open/floor/iron/corner, /area/station/hallway/primary/port) "shh" = ( @@ -67166,6 +67506,15 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/engineering/atmos/pumproom) +"sig" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/space_up{ + pixel_y = 10; + pixel_x = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/maintenance/department/security/brig) "sih" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -67192,6 +67541,8 @@ /obj/machinery/door/airlock/maintenance_hatch, /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/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) "siy" = ( @@ -67200,14 +67551,13 @@ /turf/open/floor/iron/dark/smooth_edge, /area/station/science/robotics) "siL" = ( -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ +/obj/machinery/vending/assist, +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark/side{ dir = 1 }, -/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/white, -/area/station/medical/paramedic) +/area/station/commons/storage/primary) "siO" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 8 @@ -67234,6 +67584,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) "sje" = ( @@ -67343,14 +67694,14 @@ "skC" = ( /obj/structure/cable, /obj/machinery/door/airlock/multi_tile/public/glass{ - name = "Primary Tool Storage" + name = "Cafe" }, /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, /turf/open/floor/iron/dark, -/area/station/commons/storage/primary) +/area/station/service/cafeteria) "skH" = ( /obj/structure/chair/sofa/corp{ dir = 1 @@ -67429,6 +67780,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 10 }, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 8 + }, /turf/open/floor/iron, /area/station/hallway/primary/foreporthall) "slK" = ( @@ -67887,16 +68241,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/white/smooth_large, /area/station/medical/chemistry) -"srI" = ( -/obj/machinery/newscaster/directional/east, -/obj/machinery/camera/autoname/directional/east, -/obj/effect/turf_decal/trimline/white/line{ - dir = 6 - }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 1 - }, -/area/station/security/lockers) "srJ" = ( /obj/structure/window/reinforced/fulltile, /obj/structure/flora/bush/flowers_br/style_3, @@ -68177,10 +68521,10 @@ /area/station/maintenance/abandon_wrestle) "suW" = ( /obj/structure/rack, -/obj/effect/spawner/random/armory/riot_helmet, /obj/effect/turf_decal/box/red/corners{ dir = 1 }, +/obj/item/clothing/suit/hooded/ablative, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) "suY" = ( @@ -68325,15 +68669,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/brig) -"swO" = ( -/obj/effect/turf_decal/siding/dark, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/herringbone, -/area/station/hallway/primary) "swT" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/smooth_edge{ @@ -68406,9 +68741,8 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) "syj" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/condiment/sugar, /obj/machinery/light_switch/directional/north, +/obj/structure/table, /turf/open/floor/iron/dark/diagonal, /area/station/commons/vacant_room/commissary) "syk" = ( @@ -68521,6 +68855,7 @@ /area/station/hallway/primary/starboard) "szj" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) "szn" = ( @@ -68548,6 +68883,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical) "szG" = ( @@ -68591,26 +68927,30 @@ }, /area/station/cargo/miningfoyer) "sAq" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/obj/machinery/digital_clock/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/white/smooth_corner, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/white/smooth_edge{ + dir = 1 + }, +/area/station/medical/paramedic) "sAv" = ( -/obj/structure/cable, /obj/effect/turf_decal/trimline/white/line{ - dir = 8 + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark/smooth_edge{ - dir = 8 + dir = 1 }, -/area/station/security/warden) +/area/station/security/breakroom) "sAx" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -68733,18 +69073,15 @@ /turf/open/floor/iron, /area/station/ai_monitored/turret_protected/aisat/foyer) "sBN" = ( -/obj/machinery/light/directional/east, -/obj/machinery/computer/records/security{ - dir = 8 - }, -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/trimline/white/line{ - dir = 4 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 +/obj/structure/table, +/obj/machinery/computer/arcade/orion_trail{ + desc = "For gamers only. Casuals need not apply."; + icon_screen = "library"; + icon_state = "oldcomp"; + name = "Gamer Computer" }, -/area/station/security/warden) +/turf/open/floor/iron, +/area/station/maintenance/department/security/brig) "sBU" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -69128,6 +69465,12 @@ dir = 8 }, /area/station/medical/medbay/aft) +"sGY" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/security/breakroom) "sHg" = ( /obj/structure/table/reinforced, /obj/item/papercutter{ @@ -69350,6 +69693,32 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) +"sJJ" = ( +/obj/machinery/light_switch/directional/west, +/obj/structure/table/reinforced, +/obj/item/assembly/flash/handheld{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/restraints/handcuffs, +/turf/open/floor/iron/dark/smooth_corner, +/area/station/security/warden) +"sJQ" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/structure/closet/secure_closet/medical1, +/turf/open/floor/iron/white/smooth_corner{ + dir = 4 + }, +/area/station/medical/paramedic) "sJR" = ( /obj/structure/rack, /turf/open/floor/plating, @@ -69446,37 +69815,17 @@ /turf/open/floor/iron/edge, /area/station/hallway/floor2) "sLD" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, /obj/effect/turf_decal/tile/dark_blue/half{ - dir = 1 - }, -/obj/structure/rack/shelf, -/obj/machinery/light_switch/directional/north, -/obj/item/storage/box/syringes{ - pixel_y = -3; - pixel_x = 2 - }, -/obj/item/holosign_creator/medical/treatment_zone{ - pixel_y = 3; - pixel_x = 6 - }, -/obj/item/holosign_creator/medical/treatment_zone{ - pixel_y = 6; - pixel_x = 4 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_x = -7 + dir = 4 }, -/obj/item/clothing/glasses/hud/health{ - pixel_x = -5; - pixel_y = 4 +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 }, -/turf/open/floor/iron/white/smooth_edge{ +/obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/chair/sofa/left, +/turf/open/floor/iron/white, /area/station/medical/paramedic) "sLG" = ( /obj/effect/turf_decal/siding/wood{ @@ -69537,6 +69886,7 @@ name = "Old Medbay" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/lower) "sMI" = ( @@ -69749,6 +70099,7 @@ }, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "sPC" = ( @@ -69838,6 +70189,8 @@ dir = 4 }, /obj/effect/turf_decal/trimline/white/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_edge, /area/station/security/brig) "sQG" = ( @@ -70014,20 +70367,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth_large, /area/station/cargo/miningfoyer) -"sUp" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, +"sUr" = ( /obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/herringbone, -/area/station/hallway/primary/starboard) +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "sUt" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/machinery/power/apc/auto_name/directional/south, @@ -70329,12 +70676,16 @@ "sYU" = ( /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /obj/machinery/door/airlock/security/glass{ - name = "Brig Entrance" + name = "Brig Entrance"; + id_tag = "outerbrig" }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brigentrance" }, +/obj/machinery/flasher/directional/north{ + id = "secentranceflasher" + }, /turf/open/floor/iron/dark/smooth_corner{ dir = 8 }, @@ -70361,6 +70712,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"sZg" = ( +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","medbay") + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/commons/storage/primary) "sZn" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -70457,14 +70819,14 @@ /area/station/commons/lounge) "taK" = ( /obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/corner{ - 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/trimline/green/corner{ + dir = 4 + }, /turf/open/floor/iron/corner{ dir = 4 }, @@ -70474,10 +70836,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/green/filled/warning{ - dir = 1 +/turf/open/floor/iron/corner{ + dir = 4 }, -/turf/open/floor/iron/edge, /area/station/hallway/primary/port) "taO" = ( /obj/machinery/suit_storage_unit/atmos, @@ -70611,6 +70972,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "tcX" = ( @@ -70625,10 +70987,10 @@ /area/icemoon/underground/explored/graveyard) "tdt" = ( /obj/structure/rack, -/obj/effect/spawner/random/armory/bulletproof_helmet, /obj/effect/turf_decal/box/red/corners{ dir = 4 }, +/obj/item/gun/energy/temperature/security, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) "tdz" = ( @@ -70774,12 +71136,9 @@ /turf/open/floor/iron, /area/station/security/prison/rec) "tfP" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/white/line{ +/obj/effect/turf_decal/trimline/white/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, @@ -70814,13 +71173,13 @@ /turf/open/floor/iron, /area/station/hallway/secondary/command) "tge" = ( -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 - }, /obj/structure/chair/sofa/bench{ dir = 4; pixel_x = -5 }, +/obj/effect/turf_decal/trimline/green/line{ + dir = 8 + }, /turf/open/floor/iron, /area/station/hallway/primary) "tgt" = ( @@ -70837,6 +71196,7 @@ "tgN" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "tgR" = ( @@ -71064,6 +71424,14 @@ dir = 4 }, /area/station/security/prison) +"tkl" = ( +/obj/machinery/newscaster/directional/north, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/station/security/lockers) "tkn" = ( /obj/machinery/light/floor, /obj/machinery/firealarm/directional/north, @@ -71239,6 +71607,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/edge, /area/station/hallway/floor2) +"tme" = ( +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Primary Tool Storage"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, +/area/station/commons/storage/primary) "tmk" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron, @@ -71311,6 +71693,12 @@ dir = 1 }, /area/station/medical/pharmacy) +"tnr" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "tnw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -71425,6 +71813,9 @@ /area/station/security/office) "toB" = ( /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/carpet/black, /area/station/security/breakroom) "toC" = ( @@ -71544,8 +71935,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos/lesser) "tqc" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, /turf/open/floor/iron/edge{ @@ -71943,6 +72333,10 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"twl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "twq" = ( /obj/item/storage/box/monkeycubes{ pixel_y = 10; @@ -72026,16 +72420,6 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) -"txS" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/green/filled/warning/corner{ - dir = 1 - }, -/turf/open/floor/iron/edge, -/area/station/hallway/primary) "tyb" = ( /obj/structure/stairs/north, /turf/open/floor/iron, @@ -72172,6 +72556,12 @@ /obj/structure/table/wood/poker, /turf/open/floor/plating, /area/station/maintenance/bloodcasino) +"tzZ" = ( +/obj/machinery/newscaster/directional/north, +/obj/structure/reagent_forge, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/stone, +/area/station/service/forge) "tAc" = ( /obj/effect/turf_decal/tile/blue/half, /obj/machinery/newscaster/directional/south, @@ -72585,6 +72975,7 @@ "tEH" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/law) "tFd" = ( @@ -72877,7 +73268,7 @@ /turf/open/floor/iron/white/smooth_half{ dir = 8 }, -/area/station/medical/medbay/central) +/area/station/medical/paramedic) "tIm" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/chair{ @@ -73010,12 +73401,11 @@ /turf/open/floor/plating, /area/station/maintenance/abandon_arcade) "tJP" = ( -/obj/effect/turf_decal/trimline/yellow/line, -/obj/machinery/newscaster/directional/south, /obj/machinery/camera/autoname/directional/south, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/edge{ dir = 1 }, @@ -73543,6 +73933,12 @@ dir = 4 }, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +"tQl" = ( +/obj/effect/turf_decal/trimline/white/line, +/obj/machinery/status_display/evac/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/security/breakroom) "tQn" = ( /turf/open/floor/iron/edge{ dir = 8 @@ -73661,22 +74057,11 @@ /turf/open/floor/plating, /area/station/maintenance/department/cargo) "tRV" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue/half, -/obj/structure/chair/sofa/left{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","medbay") - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/south, -/turf/open/floor/iron/white/smooth_edge, -/area/station/medical/paramedic) +/obj/machinery/door/airlock/maintenance_hatch, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/science/ordnance_maint) "tRY" = ( /turf/closed/wall, /area/station/maintenance/abandon_exam) @@ -74034,6 +74419,7 @@ /obj/effect/turf_decal/trimline/white/line{ dir = 4 }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, @@ -74129,10 +74515,13 @@ "tYq" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/trimline/white/line{ - dir = 10 + dir = 8 }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 }, /area/station/security/lockers) "tYt" = ( @@ -74238,30 +74627,9 @@ /turf/open/floor/plating, /area/station/common/night_club) "uaq" = ( -/obj/structure/table/reinforced, -/obj/item/folder/red{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/folder/red{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_y = 1; - pixel_x = 3 - }, -/obj/effect/turf_decal/trimline/white/line, -/turf/open/floor/iron/dark/smooth_edge, -/area/station/security/warden) -"uar" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 8 - }, -/area/station/security/warden) +/obj/item/radio/intercom/directional/east, +/turf/closed/wall/r_wall, +/area/station/security/breakroom) "uaz" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -74443,15 +74811,6 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/wood, /area/station/service/newsroom) -"ucC" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) "ucF" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -74596,8 +74955,11 @@ /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/dark/side, -/area/station/commons/storage/primary) +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "ueM" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -74741,10 +75103,15 @@ /turf/closed/wall/r_wall, /area/station/command/gateway) "ugW" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ +/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/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 }, -/obj/item/radio/intercom/directional/east, /turf/open/floor/iron/edge{ dir = 8 }, @@ -75121,6 +75488,10 @@ /obj/machinery/power/turbine/inlet_compressor, /turf/open/floor/engine, /area/station/engineering/atmospherics_engine) +"umS" = ( +/obj/effect/landmark/start/science_guard, +/turf/open/floor/iron/dark, +/area/station/science/lab) "unh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -75363,27 +75734,16 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/cargo/sorting) "urz" = ( -/obj/structure/table/reinforced, -/obj/item/light/tube, -/obj/item/light/tube{ - pixel_y = 3 - }, -/obj/item/light/tube{ - pixel_y = 6 - }, -/obj/item/storage/box/lights/mixed{ - pixel_x = 4; - pixel_y = 0 +/obj/structure/chair/sofa/corp/right{ + color = "#DE3A3A"; + dir = 8 }, -/obj/item/storage/box/lights/tubes{ - pixel_y = 7; - pixel_x = 5 +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/requests_console/auto_name/directional/east, -/turf/open/floor/iron/dark/diagonal, -/area/station/commons/storage/primary) +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "urD" = ( /obj/effect/spawner/random/entertainment/arcade{ dir = 4 @@ -75589,17 +75949,40 @@ /turf/open/floor/plating, /area/station/maintenance/department/science/ordnance_maint_lesser) "utH" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 6 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +/obj/structure/rack/shelf, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/iron/white/smooth_corner{ - dir = 1 +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 }, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/item/storage/box/syringes{ + pixel_y = -3; + pixel_x = 2 + }, +/obj/item/holosign_creator/medical/treatment_zone{ + pixel_y = 6; + pixel_x = 4 + }, +/obj/item/holosign_creator/medical/treatment_zone{ + pixel_y = 3; + pixel_x = 6 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_x = -7 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/medical/paramedic) "utI" = ( /obj/effect/turf_decal/trimline/purple/filled/warning, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -76524,11 +76907,11 @@ /area/station/command/meeting_room/council) "uHv" = ( /obj/machinery/door/airlock/multi_tile/public/glass{ - name = "Primary Tool Storage" + name = "Cafe" }, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, -/area/station/commons/storage/primary) +/area/station/service/cafeteria) "uHw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -76575,6 +76958,13 @@ dir = 4 }, /area/station/science/robotics/lab) +"uHP" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Old Sci" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/condemned_sci) "uHU" = ( /obj/structure/chair/comfy{ color = "#596479"; @@ -76825,24 +77215,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) -"uLT" = ( -/obj/structure/table, -/obj/machinery/light/directional/north, -/obj/item/forging/billow{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/forging/tongs{ - pixel_x = 0; - pixel_y = 4 - }, -/obj/item/forging/hammer{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/stone, -/area/station/service/forge) "uMo" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /turf/open/floor/iron/edge{ @@ -76942,6 +77314,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/ordnance_maint_lesser) "uNA" = ( @@ -76976,7 +77349,8 @@ /area/station/maintenance/department/engine/atmos/lesser) "uOn" = ( /obj/machinery/door/airlock/security/glass{ - name = "Security Office" + name = "Security Office"; + id_tag = "innerbrig" }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/security/general, @@ -77042,10 +77416,14 @@ /turf/open/floor/iron/freezer, /area/station/command/heads_quarters/ce) "uOY" = ( -/obj/machinery/suit_storage_unit/security, -/obj/effect/turf_decal/box/red, -/turf/open/floor/iron/smooth_large, -/area/station/security/lockers) +/obj/effect/turf_decal/trimline/white/line{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/security/warden) "uPa" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood{ @@ -77143,17 +77521,12 @@ /turf/open/floor/grass, /area/station/security/prison/garden) "uQt" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/white/line, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/computer/records/security{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/turf/open/floor/iron/dark/smooth_edge, -/area/station/security/brig) +/turf/open/floor/carpet/red, +/area/station/security/warden) "uQx" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 @@ -77389,6 +77762,11 @@ /obj/structure/cable, /turf/open/floor/cult, /area/station/maintenance/condemnedroom) +"uUO" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/fore/greater) "uUP" = ( /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -77696,6 +78074,7 @@ }, /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/engineering/maintenance, /turf/open/floor/iron/large, /area/station/engineering/atmos) "uYO" = ( @@ -77720,20 +78099,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/atmos/hfr_room) -"uZb" = ( -/obj/structure/bed/dogbed/mcgriff{ - anchored = 1 - }, -/mob/living/basic/pet/dog/pug/mcgriff, -/obj/machinery/status_display/ai/directional/north, -/obj/machinery/computer/security/telescreen/prison/directional/east, -/obj/effect/turf_decal/trimline/white/line{ - dir = 5 - }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 8 - }, -/area/station/security/warden) "uZi" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/dark_blue{ @@ -78098,10 +78463,8 @@ /turf/open/floor/iron/herringbone, /area/station/hallway/primary/starboard) "vdB" = ( -/obj/machinery/door/airlock/bathroom{ - name = "Restroom" - }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/gold/glass, /turf/open/floor/iron/freezer, /area/station/command/heads_quarters/captain/private) "vdG" = ( @@ -78301,10 +78664,10 @@ /area/icemoon/underground/explored) "vgd" = ( /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/yellow/line, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/edge{ dir = 1 }, @@ -79119,12 +79482,12 @@ /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) "vqS" = ( -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/green/corner{ + dir = 8 + }, /turf/open/floor/iron/edge{ dir = 1 }, @@ -79304,10 +79667,10 @@ /area/station/hallway/primary/starboard) "vtz" = ( /obj/machinery/light/directional/south, -/obj/effect/turf_decal/trimline/yellow/line, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/edge{ dir = 1 }, @@ -79357,6 +79720,18 @@ }, /turf/open/floor/wood, /area/station/service/bar/backroom) +"vuS" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/computer/records/medical{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_corner{ + dir = 1 + }, +/area/station/medical/paramedic) "vuT" = ( /obj/structure/ladder, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -79504,10 +79879,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/green/filled/warning{ - dir = 1 +/turf/open/floor/iron/corner{ + dir = 4 }, -/turf/open/floor/iron/edge, /area/station/hallway/primary/port) "vxk" = ( /obj/effect/spawner/random/structure/crate, @@ -79558,8 +79932,33 @@ }, /area/station/command/heads_quarters/cmo) "vxA" = ( -/turf/open/floor/iron/dark, -/area/station/security/brig) +/obj/structure/table/reinforced, +/obj/machinery/button/flasher{ + id = "secentranceflasher"; + name = "Brig Entrance Flasher"; + pixel_y = -3; + req_access = list("security") + }, +/obj/machinery/button/door{ + desc = "A door remote control switch for the interior brig doors."; + id = "innerbrig"; + name = "Brig Interior Door Control"; + normaldoorcontrol = 1; + pixel_x = -6; + pixel_y = 7; + req_access = list("security") + }, +/obj/machinery/button/door{ + desc = "A door remote control switch for the exterior brig doors."; + id = "outerbrig"; + name = "Brig Exterior Door Control"; + normaldoorcontrol = 1; + pixel_x = 6; + pixel_y = 7; + req_access = list("security") + }, +/turf/open/floor/carpet/red, +/area/station/security/warden) "vxT" = ( /obj/effect/turf_decal/box/white{ color = "#9FED58" @@ -79712,14 +80111,11 @@ /turf/open/floor/carpet/black, /area/station/security/office) "vAl" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning, -/turf/open/floor/iron/white/side{ +/obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/area/station/medical/medbay/central) +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "vAm" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -79810,11 +80206,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/forestarboardhall) "vBN" = ( -/obj/structure/disposalpipe/junction, -/turf/open/floor/iron/dark/side{ - dir = 1 +/obj/structure/disposalpipe/junction/flip{ + dir = 2 }, -/area/station/commons/storage/primary) +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "vBO" = ( /turf/closed/mineral/random/snow/high_chance, /area/icemoon/underground/explored) @@ -79969,6 +80366,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Coffin Room" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/coffin_supply) "vDK" = ( @@ -80020,6 +80418,7 @@ /obj/machinery/door/airlock/maintenance_hatch, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore/greater) "vEW" = ( @@ -80208,6 +80607,7 @@ /area/station/science/robotics) "vGE" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/aft) "vGH" = ( @@ -80397,6 +80797,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical) "vJb" = ( @@ -80428,9 +80829,28 @@ /turf/open/floor/plating, /area/station/commons/vacant_room) "vJl" = ( -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark/side, -/area/station/commons/storage/primary) +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/bottle/syrup_bottle/liqueur{ + pixel_x = -8; + pixel_y = 16 + }, +/obj/item/reagent_containers/cup/bottle/syrup_bottle/korta_nectar{ + pixel_y = 16 + }, +/obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel{ + pixel_x = 9; + pixel_y = 16 + }, +/obj/item/storage/fancy/coffee_condi_display{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/wood/parquet, +/area/station/service/cafeteria) "vJn" = ( /turf/closed/wall/r_wall, /area/station/cargo/storage) @@ -80530,10 +80950,10 @@ }, /area/station/medical/medbay/central) "vKv" = ( -/obj/effect/turf_decal/trimline/yellow/line, /obj/structure/chair/sofa/bench/right{ dir = 1 }, +/obj/effect/turf_decal/trimline/green/line, /turf/open/floor/iron/edge{ dir = 1 }, @@ -80735,6 +81155,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/dark/smooth_half{ dir = 8 }, @@ -80828,6 +81249,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"vOe" = ( +/obj/effect/turf_decal/trimline/white/line, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/security/warden) "vOn" = ( /obj/structure/trash_pile, /turf/open/floor/iron, @@ -80840,12 +81265,13 @@ }, /area/station/service/bar) "vOs" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/smooth_edge, -/area/station/medical/medbay/central) +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/holopad, +/turf/open/floor/iron/white, +/area/station/medical/paramedic) "vOx" = ( /obj/structure/table, /obj/item/storage/box/fireworks{ @@ -81018,18 +81444,6 @@ dir = 8 }, /area/station/engineering/storage) -"vRU" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/turf/open/floor/iron/herringbone, -/area/station/hallway/primary) "vRW" = ( /obj/effect/turf_decal/siding/white/end{ dir = 1 @@ -81046,11 +81460,10 @@ }, /area/mine/laborcamp/security) "vSe" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 }, -/obj/effect/landmark/start/hangover, -/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/edge{ dir = 8 }, @@ -81184,7 +81597,9 @@ /turf/open/floor/iron/white/smooth_half, /area/station/engineering/main) "vTW" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning/corner{ +/obj/machinery/door/firedoor, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, /turf/open/floor/iron/edge{ @@ -81267,12 +81682,12 @@ }, /area/station/commons/fitness) "vVv" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 1 +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Brig Control Desk"; + req_access = list("armory") }, +/turf/open/floor/plating, /area/station/security/lockers) "vVw" = ( /obj/item/radio/intercom/directional/east, @@ -81546,16 +81961,21 @@ /area/station/command/bridge) "vZD" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor/right/directional/south{ - req_access = list("security"); - name = "Security Front Desk" - }, /obj/machinery/door/firedoor, /obj/machinery/door/window/right/directional/north{ name = "Security Front Desk" }, +/obj/item/book/manual/wiki/security_space_law, +/obj/machinery/door/poddoor/preopen{ + id = "briglockdown"; + name = "Brig Shutters" + }, +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Brig Control Desk"; + req_access = list("armory") + }, /turf/open/floor/plating, -/area/station/security/brig) +/area/station/security/warden) "vZL" = ( /obj/item/radio/intercom/directional/west, /obj/machinery/light/directional/west, @@ -81608,6 +82028,7 @@ /area/station/maintenance/port/aft) "waM" = ( /obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "waO" = ( @@ -81695,6 +82116,7 @@ /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/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore) "wbZ" = ( @@ -81776,18 +82198,6 @@ "wcY" = ( /turf/closed/wall, /area/station/maintenance/abandon_psych) -"wda" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/dark_blue/half{ - dir = 1 - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 1 - }, -/area/station/medical/paramedic) "wde" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -82114,9 +82524,16 @@ /turf/open/floor/plating, /area/station/commons/dorms/room7) "whN" = ( -/obj/structure/table, -/turf/open/floor/plating, -/area/station/maintenance/department/science/ordnance_maint) +/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 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/commons/storage/primary) "wim" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -82207,14 +82624,6 @@ "wiV" = ( /turf/open/floor/iron/smooth_large, /area/mine/laborcamp) -"wjg" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/white/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/smooth_edge, -/area/station/security/lockers) "wjl" = ( /obj/structure/closet/secure_closet/personal, /obj/item/towel, @@ -82297,13 +82706,6 @@ /obj/structure/table/wood, /turf/open/floor/wood/tile, /area/station/service/lawoffice) -"wka" = ( -/obj/structure/closet/secure_closet/security/sec, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/bot_blue, -/obj/item/clothing/mask/balaclava, -/turf/open/floor/iron/smooth_large, -/area/station/security/lockers) "wko" = ( /obj/structure/sign/warning/cold_temp, /turf/closed/wall/r_wall, @@ -82376,10 +82778,10 @@ }, /area/station/hallway/primary/fore) "wkT" = ( -/obj/structure/chair/sofa/corp{ +/obj/machinery/airalarm/directional/west, +/obj/structure/chair/sofa/corp/left{ dir = 4 }, -/obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/red, /area/station/security/breakroom) "wkY" = ( @@ -82870,9 +83272,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/commons/arrivalsshop) -"wsw" = ( -/turf/open/floor/iron, -/area/station/commons/storage/primary) "wsx" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -83566,6 +83965,19 @@ }, /turf/open/floor/wood/tile, /area/station/service/theater) +"wAK" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/chair/sofa/bench{ + dir = 8; + pixel_x = 5 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "wAN" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -83939,15 +84351,11 @@ /area/station/science/robotics/mechbay) "wFv" = ( /obj/machinery/light/directional/north, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/commons/storage/primary) +/obj/machinery/door/window/left/directional/east, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/carpet, +/area/station/service/cafeteria) "wFy" = ( /obj/effect/turf_decal/siding/yellow{ dir = 5 @@ -84047,11 +84455,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white/small, /area/station/common/pool) -"wGX" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/trimline/white/line, -/turf/open/floor/iron/dark/smooth_edge, -/area/station/security/warden) "wHa" = ( /turf/open/floor/iron/edge{ dir = 4 @@ -84541,7 +84944,6 @@ dir = 1 }, /obj/machinery/airalarm/directional/north, -/obj/effect/landmark/start/science_guard, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, @@ -84741,7 +85143,10 @@ /turf/open/floor/iron/dark, /area/station/common/night_club) "wQn" = ( -/turf/open/floor/stone, +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/edge, /area/station/hallway/primary/port) "wQo" = ( /turf/open/floor/light/colour_cycle/dancefloor_a, @@ -84778,6 +85183,17 @@ }, /turf/open/floor/iron/large, /area/station/cargo/storage) +"wQx" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/chair/sofa/bench/right{ + dir = 8; + pixel_x = 5 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "wQD" = ( /obj/machinery/plate_press{ pixel_y = -3 @@ -85115,6 +85531,21 @@ dir = 4 }, /area/station/cargo/bitrunning/den) +"wVp" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction/flip{ + dir = 2 + }, +/turf/open/floor/iron/herringbone, +/area/station/hallway/primary/starboard) "wVs" = ( /obj/structure/window/reinforced/fulltile, /obj/structure/flora/bush/flowers_br/style_random, @@ -85140,17 +85571,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white/smooth_edge, /area/station/medical/break_room) -"wVy" = ( -/obj/effect/landmark/start/paramedic, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/paramedic) "wVD" = ( /turf/open/floor/carpet, /area/station/command/bridge) @@ -85445,6 +85865,7 @@ name = "Graveyard" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/service/chapel) "wZi" = ( @@ -85712,11 +86133,11 @@ }, /area/station/engineering/engine_smes) "xdt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 +/obj/effect/spawner/random/trash/garbage{ + spawn_scatter_radius = 1 }, -/turf/open/floor/carpet/red, -/area/station/security/warden) +/turf/open/floor/plating, +/area/station/maintenance/department/security/brig) "xdE" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -85801,9 +86222,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/green/filled/warning/corner{ - dir = 4 - }, /turf/open/floor/iron/corner{ dir = 4 }, @@ -86439,12 +86857,17 @@ }, /area/station/service/theater) "xmw" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ +/obj/effect/turf_decal/tile/dark_blue/half, +/obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/machinery/computer/crew{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_edge, /area/station/medical/paramedic) "xmz" = ( /obj/machinery/light/floor, @@ -86654,6 +87077,24 @@ dir = 1 }, /area/station/cargo/miningfoyer) +"xoO" = ( +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/recharge_station, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue/half{ + dir = 4 + }, +/obj/effect/turf_decal/bot_blue, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/medical/paramedic) "xoT" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -86664,14 +87105,18 @@ /area/station/hallway/floor2) "xpd" = ( /obj/structure/cable, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/white/line{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, -/area/station/security/brig) +/area/station/security/warden) "xpj" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -86755,18 +87200,9 @@ }, /area/station/security/corrections_officer) "xqo" = ( -/obj/effect/turf_decal/tile/dark_blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/dark_blue/anticorner{ - dir = 8 - }, -/obj/structure/closet/secure_closet/medical1, -/obj/machinery/status_display/ai/directional/south, -/turf/open/floor/iron/white/smooth_corner{ - dir = 4 - }, -/area/station/medical/paramedic) +/obj/effect/landmark/navigate_destination/tools, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "xqp" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -86824,10 +87260,6 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/command/storage/eva) -"xrl" = ( -/obj/structure/reagent_anvil, -/turf/open/floor/stone, -/area/station/hallway/primary/port) "xro" = ( /obj/structure/table, /obj/item/clothing/glasses/meson{ @@ -87126,6 +87558,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/security) "xvf" = ( @@ -87157,10 +87590,6 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/hallway) -"xvt" = ( -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "xvv" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/wideplating, @@ -87441,8 +87870,8 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/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, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, @@ -87637,6 +88066,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_cafeteria) "xBy" = ( @@ -88482,19 +88912,19 @@ /turf/open/floor/eighties/red, /area/station/commons/fitness/recreation) "xNm" = ( -/obj/machinery/light/directional/west, +/obj/effect/turf_decal/trimline/white/line, /obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/item/restraints/handcuffs{ - pixel_y = 14 - }, -/obj/effect/turf_decal/trimline/white/line{ - dir = 8 +/obj/machinery/newscaster/directional/south, +/obj/item/radio{ + pixel_x = 7; + pixel_y = 4 }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 8 +/obj/item/assembly/flash/handheld{ + pixel_x = -5; + pixel_y = 0 }, -/area/station/security/warden) +/turf/open/floor/iron/dark/smooth_edge, +/area/station/security/breakroom) "xNp" = ( /obj/structure/cable, /obj/structure/table, @@ -88600,6 +89030,11 @@ dir = 1 }, /area/station/medical/medbay/central) +"xOV" = ( +/obj/effect/turf_decal/trimline/white/line, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark/smooth_edge, +/area/station/security/lockers) "xOW" = ( /obj/structure/cable, /turf/open/floor/iron/large, @@ -88739,6 +89174,7 @@ }, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/condemned_sci) "xQO" = ( @@ -88754,12 +89190,11 @@ "xQS" = ( /obj/structure/cable, /obj/machinery/holopad, -/obj/effect/turf_decal/trimline/white/corner{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, -/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/security/lockers) "xQV" = ( /obj/structure/table, @@ -89025,9 +89460,8 @@ }, /area/station/medical/chemistry) "xUz" = ( -/turf/open/floor/iron/edge{ - dir = 1 - }, +/obj/structure/flora/bush/flowers_br/style_random, +/turf/open/floor/grass, /area/station/hallway/primary/starboard) "xUB" = ( /obj/machinery/hydroponics/constructable, @@ -90060,6 +90494,7 @@ /obj/structure/disposalpipe/segment, /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/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "yiC" = ( @@ -90225,7 +90660,10 @@ "ylb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/stone, +/obj/effect/turf_decal/trimline/green/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/edge, /area/station/hallway/primary/port) "ylo" = ( /obj/structure/cable, @@ -175742,7 +176180,7 @@ owd owd owd owd -cLZ +cHA owd idh eYO @@ -177037,7 +177475,7 @@ pZX pVV lZY gkX -cLZ +ebp tko xEq kXA @@ -187337,7 +187775,7 @@ cvj kCo qcP dBa -qzM +eEz vsX gBt vBO @@ -193708,7 +194146,7 @@ lgE lgE eUw guU -fIL +uUO vUe icF oHg @@ -196082,7 +196520,7 @@ vsX dCO qMa dCO -mOE +uHP tza tza rhm @@ -197822,7 +198260,7 @@ vUe kcn oHg oHg -fIL +uUO oHg oHg bsx @@ -206887,7 +207325,7 @@ bLd psW oTT aYD -hLt +qgH fap tPn tPn @@ -237668,9 +238106,9 @@ dKk dKk dKk otf -ewt -lVM -ewt +hVE +rkZ +hVE vMu vMu dKk @@ -237925,9 +238363,9 @@ dKk dKk dKk otf -ewt -ocN -ewt +hVE +rkZ +hVE vMu vMu dKk @@ -238182,9 +238620,9 @@ dKk dKk dKk otf -ewt -ocN -ewt +hVE +rkZ +hVE vMu vMu dKk @@ -238440,7 +238878,7 @@ dKk otf ewt ewt -ocN +lVM ewt ewt vMu @@ -244605,7 +245043,7 @@ bTu bTu bTu bTu -bTu +mai bmd ayV bsm @@ -244863,11 +245301,11 @@ dtA cvM pwT icY -pwT -ggo +fFs +rGW heS -pwT -pwT +eSh +rGW cbx ugo qQX @@ -245124,9 +245562,9 @@ roa roa roa toB -hby +qGr gyf -ugo +sGY aed vch qeX @@ -245373,14 +245811,14 @@ saW mwj vrU tBx -eLv +mJA tXD eoV qgl mls lUG tfP -mJA +plc gMj iVK ugo @@ -245630,17 +246068,17 @@ saW ioz peA sRn -nvt sRn sRn -jZq -jZq -jZq +hjo +sRn +sRn +sRn sbg -jZq -jZq -jZq -jZq +hby +tQl +ugo +ugo mza vch qaj @@ -245884,20 +246322,20 @@ lgl nKE fCC vIO -sRn -sRn +vIO +vIO sRn cCO tYq rJL -jZq +oGY rix -uar +sRn sAv -iPE +hby xNm -rnL -jZq +ugo +vch qQX ouj urV @@ -245906,7 +246344,7 @@ eMh eMh vbd cVr -cVr +mhz jMt owv czv @@ -246141,26 +246579,26 @@ vIO vIO ppW vIO -sRn +sJJ iNn -apf +sRn xQS -xbD -rJL -jZq +cei +mRK +qWL dkq -cEY +sRn flT -cEY -cEY +eEu +qWn uaq -jZq +vch mza qQX afF rSq dzi -hal +hDE nNU eeK wAe @@ -246380,7 +246818,7 @@ iWS cdh cdh bnH -cdh +iUR dbs cEL woQ @@ -246398,22 +246836,22 @@ bRZ dYO kdq fxX -sRn +hRg uOY -dwz +sRn eyK -wjg +cei rSv -jZq -lsE -dTp -ggD -ikN -ksK -ggj -jZq -mza +qWL +rix +sRn +ugo +ugo +ugo +ugo vch +mza +vXN urV dyh wec @@ -246637,7 +247075,7 @@ iaa hsF sCM ylZ -xtX +fbf qVT xtX sDc @@ -246655,25 +247093,25 @@ eFx xpd kWP uQt -sRn -uOY +cEY +vOe vVv ppd -xbD +cei eVX -jZq -cPp -mEU -cEY -cEY +bMF +rix +sRn +gVM +sig xdt -wGX -jZq +qaj +vch bte -vXN +cKF urV cHi -kqJ +guX iKZ xex pmk @@ -246909,38 +247347,38 @@ sYU jrv oHB gEW -pkh +imz vxA rBj -sRn -nub -hab +cEY +vOe +vVv kzD -srI -wka -jZq -uZb +cei +mRK +xbD +rix ojH sBN ocI hMX cjk -jZq +vch qQX -cKF ltO ltO ltO +mAM wQn ajm fjl vKO jmg osG -awE -awE -awE -awE +kyT +kyT +kyT +kyT osG aRa uyo @@ -247167,25 +247605,25 @@ fTJ nWQ mhe qnw -vxA -hjf -sRn -sRn -sRn +jUA +mEU +cEY +jTP sRn +tkl +lay +lay +xOV sRn sRn -jZq -jZq -jZq -jZq -jZq -jZq -jZq -jZq +qaj +qaj +qaj +qaj +vch qQX -sWN ltO +tzZ iXv pig lSe @@ -247193,12 +247631,12 @@ ajm fjl vKO mhG -awE +osG fQh oou kaU mIB -awE +kyT kAJ fjl gCl @@ -247425,37 +247863,37 @@ chN vZD hEZ qNj -kLa +iIa hPs cct -fiz -vch -gUL -gUL -vch -vch +sRn +aiu +fFZ +rCu +jXt +sRn qQX qQX cvt -aed +qQX qQX mza qQX -vch ltO -uLT +oHs waV -xrl +egV +wQn vxh fjl vKO vKv -awE -pAZ -wsw -wsw +osG fIf -awE +fIf +fIf +fIf +kyT kAJ fjl gCl @@ -247679,8 +248117,8 @@ bHf srp huO tYL -bHf -iMz +jZq +kJS llx llx llx @@ -247698,8 +248136,8 @@ vch qeX elS sed -vch ltO +juc nGD vUt ylb @@ -247955,10 +248393,10 @@ sbh vbR vbR vbR -vbR ltO ltO ltO +kuH wQn taN mdl @@ -248217,7 +248655,7 @@ qke guj uUP rXS -txS +axP jzK ylJ vgd @@ -248480,7 +248918,7 @@ vWU vtz osG kkI -kmW +bMl kmW gIQ qTk @@ -248735,12 +249173,12 @@ cwk xBL vWU aLs -awE +kyT qUx urz kSq gaF -awE +kyT axp eLy kQj @@ -248992,11 +249430,11 @@ xZd rxK vWU aLs -awE -awE +kyT +kyT osG -awE -awE +osG +kyT osG nHL eKs @@ -250017,7 +250455,7 @@ guj mCg eMV xBL -swO +gRW vnT liX uzc @@ -250789,10 +251227,10 @@ eiW hwx nnf qIW -ikr -vRU +bji +jtQ hjG -pSd +okA rxP sAP pbN @@ -251563,7 +252001,7 @@ qGy nnC fDs eKs -gvi +ulk jQp gvA lEo @@ -252334,7 +252772,7 @@ tsF tsF jwq xBL -bFd +ulk pzw hwx cyQ @@ -261848,7 +262286,7 @@ mXy ipt mIh kHB -jvD +kPY jvD jvD jvD @@ -262102,13 +262540,13 @@ aQy yjI ggO ihA +pWw +bZY rhb -rhb -sUp -rhb -nNv +oXy nNv nNv +wVp nNv rhb rhb @@ -262360,10 +262798,10 @@ ipo mnb lvb mXb +lFS nQw -lBX vTW -aBZ +tqc vSe ugW tqc @@ -262618,12 +263056,12 @@ nFy hCJ xUz fgF -ePv -dIz -hii -ePv -etY -pDN +lNa +hmD +awE +iOt +tme +awE hmD twu uSy @@ -262871,16 +263309,16 @@ xJz sXI aQy btv -qmU +khL nqB aJx nPj -ePv -qfa +lNa +hmD oFV -ePv +eFe whN -sIs +pgk hmD ygC xGE @@ -263130,14 +263568,14 @@ uXb mOm lbr vAl -ePv -ePv -ePv -ucC +wQx +wAK +hsH +hmD kNL -ePv +twl cLJ -wtQ +jyg hmD kLH fqQ @@ -263152,7 +263590,7 @@ cJt ang oZk dDd -fhz +hNA eBD xub gOH @@ -263386,18 +263824,18 @@ bwY uXb tIi iAV -fbH ePv -pSJ -hkI -iKx -cKA +uWS ePv ePv -jWp +ePv +cKA +kOj +sUr +sZg hmD -jpU -jpU +htK +htK nmV cJt cJt @@ -263644,14 +264082,14 @@ weS sAq hGQ rHB -uWS +mnT rhc -upZ -upZ +ePv +ePv cdz xqo -ePv -wtQ +tnr +nJy kJk ezI nnk @@ -263902,13 +264340,13 @@ oZD pIZ aqu rPm -wda upZ -wVy +sJQ +ePv siL iEX -ePv -wAP +kQF +dSw kJk muN eez @@ -264156,16 +264594,16 @@ ycV bwA gzJ dhO -xvt +hGQ fsa -eZj +rPm fMQ ghR -ome +ePv acy evB -ePv -wtQ +cYn +foU kJk nwW yca @@ -264177,7 +264615,7 @@ vLu kBv gzG rkl -pDk +lAc gah uPw pDk @@ -264413,16 +264851,16 @@ ycV bwA jEC dhO -awd +pIZ vOs -uWS +rPm hil xmw -eRN -upZ -tRV ePv -sIs +pFF +tRV +pFF +pFF kJk pjq azE @@ -264670,16 +265108,16 @@ ycV mGx qVd qlB -ycV +hGQ qan -uWS +rPm sLD -xmw -upZ -jnO -ihl +vuS ePv -sIs +pNh +wtQ +wtQ +wtQ kJk bdQ ufa @@ -264929,13 +265367,13 @@ mmK iaZ ohb utH -uWS +xoO apG -lnP -dqg -rST -mmd ePv +ePv +pNh +mmd +pFF yar kJk cpd @@ -264950,7 +265388,7 @@ nsA tWf xzm ews -qJM +wYm svW day day @@ -265189,10 +265627,10 @@ abi hpZ ePv ePv -ePv -ePv -ePv -ePv +rMo +pNh +mmd +pFF dNJ kJk cIS @@ -265446,7 +265884,7 @@ nLo hpZ ejQ aVD -mWS +pNh pbm qvH lYe @@ -265464,7 +265902,7 @@ uMD dqG wNV gEs -wYm +umS wYm wYm wYm @@ -266490,7 +266928,7 @@ sPC qOO snN nKI -aLS +nla sEi fwP jKm @@ -267522,7 +267960,7 @@ xOk vYw sgG uSv -uSv +pIK uSv uSv uSv diff --git a/_maps/nova/automapper/automapper_config.toml b/_maps/nova/automapper/automapper_config.toml index a631a131fed3..64365411d10f 100644 --- a/_maps/nova/automapper/automapper_config.toml +++ b/_maps/nova/automapper/automapper_config.toml @@ -433,6 +433,14 @@ required_map = "wawastation.dmm" coordinates = [83, 92, 1] trait_name = "Station" +# Wawastation TG-shenanigan removals. +[templates.wawastation_asteroidbluecell] +map_files = ["wawastation_asteroidbluecell.dmm"] +directory = "_maps/nova/automapper/templates/wawastation/" +required_map = "wawastation.dmm" +coordinates = [142, 95, 2] +trait_name = "Station" + # SNOWGLOBE STATION MAP EDITS # Icecats Camp Lower Level - Snowglobe [templates.snowglobe_icecats_lower] @@ -448,4 +456,4 @@ map_files = ["icemoon_underground_icewalker_upper.dmm"] directory = "_maps/RandomRuins/IceRuins/nova/" required_map = "snowglobe.dmm" coordinates = [202, 16, 2] -trait_name = "Station" \ No newline at end of file +trait_name = "Station" diff --git a/_maps/nova/automapper/templates/metastation/metastation_arrivals.dmm b/_maps/nova/automapper/templates/metastation/metastation_arrivals.dmm index fc238d37eddb..d59fd42adff1 100644 --- a/_maps/nova/automapper/templates/metastation/metastation_arrivals.dmm +++ b/_maps/nova/automapper/templates/metastation/metastation_arrivals.dmm @@ -621,11 +621,6 @@ }, /turf/open/space/basic, /area/space) -"uw" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/hallway/secondary/entry) "uy" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -2732,9 +2727,9 @@ FF (21,1,1) = {" ki zd -uw -uw -uw +aJ +aJ +aJ FF FF FF diff --git a/_maps/nova/automapper/templates/wawastation/wawastation_asteroidbluecell.dmm b/_maps/nova/automapper/templates/wawastation/wawastation_asteroidbluecell.dmm new file mode 100644 index 000000000000..8afda89d1701 --- /dev/null +++ b/_maps/nova/automapper/templates/wawastation/wawastation_asteroidbluecell.dmm @@ -0,0 +1,8 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/misc/asteroid, +/area/station/asteroid) + +(1,1,1) = {" +a +"} diff --git a/_maps/shuttles/nova/cargo_nova_delta.dmm b/_maps/shuttles/nova/cargo_nova_delta.dmm index 3c36152a8dfa..59c9de74441f 100644 --- a/_maps/shuttles/nova/cargo_nova_delta.dmm +++ b/_maps/shuttles/nova/cargo_nova_delta.dmm @@ -179,12 +179,12 @@ /area/shuttle/supply) "UC" = ( /obj/machinery/button/door/directional/west{ - id = "cargoload"; + id = "QMLoaddoor2"; name = "Loading Doors"; pixel_y = -8 }, /obj/machinery/button/door/directional/west{ - id = "cargounload"; + id = "QMLoaddoor"; name = "Loading Doors"; pixel_y = 8 }, diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 5b737c77a862..89dc45f74a4c 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -53,7 +53,7 @@ var/last_found ///Flags SecBOTs use on what to check on targets when arresting, and whether they should announce it to security/handcuff their target - var/security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET | SECBOT_CHECK_WEAPONS // NOVA EDIT CHANGE - Original: var/security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET + var/security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET // Selections: SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_IDS | SECBOT_CHECK_WEAPONS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET ///On arrest, charges the violator this much. If they don't have that much in their account, they will get beaten instead diff --git a/html/changelogs/AutoChangeLog-pr-4593.yml b/html/changelogs/AutoChangeLog-pr-4593.yml new file mode 100644 index 000000000000..6406929ec58d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4593.yml @@ -0,0 +1,4 @@ +author: "FlufflesTheDog" +delete-after: True +changes: + - bugfix: "The escape menu buttons no longer overlap" \ No newline at end of file diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml index 64e5bb99cbe4..9827e34a96f4 100644 --- a/html/changelogs/archive/2024-11.yml +++ b/html/changelogs/archive/2024-11.yml @@ -67,3 +67,40 @@ - map: cleaned up the ouroboros medical department's floor decals and lights - bugfix: ouroboros surgery shutters are now linked to their buttons - bugfix: you can now climb the staircase to the paramedic dispatch room on ouroboros +2024-11-09: + ZeroInside: + - rscadd: Added animation for TheMarkedOne's trophy cape. + - bugfix: Fixed an issue with TheMarkedOne's trophy cape sprite, where the front + view scarf was 1 pixel higher than needed. + sqnztb: + - bugfix: metastation arrivals no longer has extra windows. +2024-11-13: + Hardly: + - map: 'Ouroboros: Fixes a floating lamp in southern maintenance' +2024-11-14: + OrbisAnima: + - qol: Beepsky no longer starts with the check weaponry setting on (so no more evil + beepsky by default) (TG default) +2024-11-15: + Draggeru: + - rscadd: Adds a donator item for thedragmeme +2024-11-17: + GoldenAlpharex: + - bugfix: Felinids are no longer allergic to wagging their tails. + Hardly: + - bugfix: 'SerenityStation: Gave HoS the correct ID painter.' + - bugfix: 'SerenityStation: Fixed the decals in cargo creeping it''s way into the + walls.' + - map: Cargo Technicians can now access the drone bay without mining access. + - map: 'Snowglobe: Overhauls warden quarters and paramedic dispatch' + - map: 'Snowglobe: Moves tool storage to south of medbay while turning the room + itself into a cafe' + - map: 'Snowglobe: Armory no longer gets contraband in the armory' + - map: 'Snowglobe: Plenty of smaller fixes and changes such as pipe additions,' + - map: 'Snowglobe: Adds gaming mothroach room' + sqnztb: + - map: snowglobe cryo - status display swapped to a fire alarm. + - bugfix: doors for the delta style shuttle work again. + - map: ouroboros has a slightly more robust powernet + - map: removed the trapped bluespace cell from wawa's asteroid area. + - balance: medical technician kit's bonesaw is significantly less lethal now. diff --git a/modular_nova/master_files/icons/donator/mob/clothing/suit.dmi b/modular_nova/master_files/icons/donator/mob/clothing/suit.dmi index 341362cd1e8a..0d0ca6d17cea 100644 Binary files a/modular_nova/master_files/icons/donator/mob/clothing/suit.dmi and b/modular_nova/master_files/icons/donator/mob/clothing/suit.dmi differ diff --git a/modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi b/modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi index d2d85363482d..7e285090f678 100644 Binary files a/modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi and b/modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi differ diff --git a/modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi b/modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi index 0d6afb7ed2c5..024b8ae5ea69 100644 Binary files a/modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi and b/modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi differ diff --git a/modular_nova/master_files/icons/donator/obj/clothing/suits.dmi b/modular_nova/master_files/icons/donator/obj/clothing/suits.dmi index ee6a7f7aca96..34059e5f7025 100644 Binary files a/modular_nova/master_files/icons/donator/obj/clothing/suits.dmi and b/modular_nova/master_files/icons/donator/obj/clothing/suits.dmi differ diff --git a/modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm index 6a53b4d57c79..71adc2c11b51 100644 --- a/modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -242,6 +242,28 @@ var/mob/wearer = loc wearer.update_body() +//Donation reward for Thedragmeme +//Have I reached suspiciously wealthy furry status yet? /j +/obj/item/clothing/under/sweater_dress + name = "virgin killer sweater" + desc = "A meticulously knitted sweater that shows off ALL the right places. This is BARELY considered work attire." + worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/suit.dmi' + icon = 'modular_nova/master_files/icons/donator/obj/clothing/suits.dmi' + lefthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi' + righthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi' + icon_state = "virginslayer" + inhand_icon_state = "virginslayer" + +/obj/item/clothing/suit/jacket/bomber_donor + name = "old hoodie" + desc = "A somewhat well worn jacket, appears to be way too big considering who owns it." + icon = 'modular_nova/master_files/icons/donator/obj/clothing/suits.dmi' + worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/suit.dmi' + lefthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi' + righthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi' + icon_state = "bomber" + inhand_icon_state = "bomber" + //Donation reward for Thedragmeme, gift for ActualVanguard /obj/item/clothing/neck/padded/security name = "vanguard cloak" diff --git a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm index 55d5d346879e..e5c793dac53c 100644 --- a/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/modular_nova/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -52,6 +52,8 @@ icon = 'modular_nova/master_files/icons/mob/sprite_accessory/tails.dmi' icon_state = "cat" color_src = USE_ONE_COLOR + recommended_species = list(SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_MAMMAL, SPECIES_GHOUL) + organ_type = /obj/item/organ/external/tail/cat /datum/sprite_accessory/tails/human/monkeyColorable icon = 'modular_nova/master_files/icons/mob/sprite_accessory/tails.dmi' diff --git a/modular_nova/modules/deforest_medical_items/code/storage_items.dm b/modular_nova/modules/deforest_medical_items/code/storage_items.dm index 3358985bfdac..da0304b46e40 100644 --- a/modular_nova/modules/deforest_medical_items/code/storage_items.dm +++ b/modular_nova/modules/deforest_medical_items/code/storage_items.dm @@ -422,7 +422,7 @@ /obj/item/scalpel = 1, /obj/item/hemostat = 1, /obj/item/retractor = 1, - /obj/item/circular_saw/field_medic = 1, + /obj/item/circular_saw/field_medic/lowforce = 1, /obj/item/bonesetter = 1, /obj/item/cautery = 1, /obj/item/surgical_drapes = 1, diff --git a/modular_nova/modules/escape_menu/code/escape_menu_nova.dm b/modular_nova/modules/escape_menu/code/escape_menu_nova.dm index 7f84f3bd620c..f41bafef8b29 100644 --- a/modular_nova/modules/escape_menu/code/escape_menu_nova.dm +++ b/modular_nova/modules/escape_menu/code/escape_menu_nova.dm @@ -6,7 +6,7 @@ /* hud_owner = */ src, src, "OPFOR", - /* offset = */ 3, + /* offset = */ 5, CALLBACK(src, PROC_REF(home_opfor)), ) ) @@ -17,7 +17,7 @@ /* hud_owner = */ src, src, "Ghost", - /* offset = */ 4, + /* offset = */ 6, CALLBACK(src, PROC_REF(home_ghost)), ) ) @@ -28,7 +28,7 @@ /* hud_owner = */ src, src, "Respawn", - /* offset = */ 5, + /* offset = */ 7, CALLBACK(src, PROC_REF(home_respawn)), ) ) diff --git a/modular_nova/modules/exp_corps/code/gear.dm b/modular_nova/modules/exp_corps/code/gear.dm index 5b3126b24cdf..7d8b3b297f7a 100644 --- a/modular_nova/modules/exp_corps/code/gear.dm +++ b/modular_nova/modules/exp_corps/code/gear.dm @@ -44,6 +44,9 @@ throw_range = 3 w_class = WEIGHT_CLASS_SMALL +/obj/item/circular_saw/field_medic/lowforce + force = 9 + //Pointman's riot shield. Fixable with 1 plasteel, crafting recipe for broken shield /obj/item/shield/riot/pointman name = "pointman shield" diff --git a/modular_nova/modules/gladiator/icons/berserk_suit.dmi b/modular_nova/modules/gladiator/icons/berserk_suit.dmi index bf2aa2e86b9f..ab43fb77cca7 100644 Binary files a/modular_nova/modules/gladiator/icons/berserk_suit.dmi and b/modular_nova/modules/gladiator/icons/berserk_suit.dmi differ diff --git a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index c522d63a971d..eabda435e33a 100644 --- a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -23,6 +23,16 @@ item_path = /obj/item/clothing/under/padded ckeywhitelist = list("thedragmeme") +/datum/loadout_item/under/jumpsuit/sweater_dress + name = "Virgin Killer Sweater" + item_path = /obj/item/clothing/under/sweater_dress + ckeywhitelist = list("thedragmeme") + +/datum/loadout_item/suit/bomber_donor + name = "Old Hoodie" + item_path = /obj/item/clothing/suit/jacket/bomber_donor + ckeywhitelist = list("thedragmeme") + /datum/loadout_item/under/jumpsuit/paddedunder/alt name = "Feathered Serenity Dress" item_path = /obj/item/clothing/under/padded/alt