diff --git a/_maps/map_files/Blueshift/BlueShift.dmm b/_maps/map_files/Blueshift/BlueShift.dmm index b68b57b1f07..b760520cdbc 100644 --- a/_maps/map_files/Blueshift/BlueShift.dmm +++ b/_maps/map_files/Blueshift/BlueShift.dmm @@ -2686,14 +2686,8 @@ /area/security/prison/garden) "avB" = ( /obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ - dir = 9 - }, -/turf/open/floor/iron, -/area/security/courtroom) +/turf/closed/wall, +/area/service/salon) "avG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/painting/library{ @@ -5183,6 +5177,18 @@ }, /turf/open/floor/wood, /area/security/prison/mess) +"aOt" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/port) "aOu" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5875,6 +5881,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science) +"aUM" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/service/salon) "aUN" = ( /obj/machinery/door/airlock/maintenance_hatch{ req_access_txt = "19" @@ -15869,12 +15887,22 @@ /turf/open/floor/wood, /area/security/detectives_office/private_investigators_office) "csu" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "42" +/obj/machinery/door/airlock/public{ + name = "Massage Parlour" }, -/turf/open/floor/plating, -/area/maintenance/port/central) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/service/salon) "csw" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -21575,6 +21603,13 @@ }, /turf/open/floor/plating, /area/maintenance/fore/upper) +"dhe" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/maintenance/two, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/maintenance/port/central) "dhh" = ( /obj/effect/spawner/random/trash/mess, /obj/structure/cable, @@ -22581,12 +22616,13 @@ /turf/open/floor/iron, /area/security/prison/workout) "doK" = ( -/obj/structure/chair{ - dir = 8 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple, +/obj/structure/bed/pod, /turf/open/floor/iron, -/area/security/courtroom) +/area/service/salon) "doM" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes, @@ -25880,12 +25916,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ - dir = 4 - }, +/obj/structure/table/wood, +/obj/item/storage/fancy/donut_box, /turf/open/floor/wood, /area/security/courtroom) "dMV" = ( @@ -26004,12 +26036,15 @@ /turf/open/floor/iron/white, /area/science) "dNS" = ( -/obj/structure/chair{ - dir = 8 +/obj/structure/table/reinforced/rglass, +/obj/item/hairbrush, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/purple, +/obj/item/lipstick/random, /turf/open/floor/iron, -/area/security/courtroom) +/area/service/salon) "dNT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, @@ -26022,12 +26057,10 @@ /turf/open/floor/iron/grimy, /area/command/heads_quarters/captain) "dNW" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ - dir = 6 + dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /turf/open/floor/wood, /area/security/courtroom) "dNX" = ( @@ -39028,6 +39061,16 @@ /obj/structure/flora/ausbushes/grassybush, /turf/open/floor/grass, /area/hallway/primary/central) +"fIP" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/start/barber, +/turf/open/floor/iron, +/area/service/salon) "fJa" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/hydronutrients, @@ -49682,6 +49725,13 @@ }, /turf/open/floor/wood, /area/service/chapel) +"hoI" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/service/salon) "hoJ" = ( /obj/structure/closet/crate/grave, /obj/effect/turf_decal/weather/sand{ @@ -49705,6 +49755,15 @@ }, /turf/open/floor/iron, /area/science/xenobiology) +"hoT" = ( +/obj/structure/table/reinforced/rglass, +/obj/structure/mirror/directional/east, +/obj/item/reagent_containers/dropper, +/obj/item/hairbrush/comb{ + pixel_y = 10 + }, +/turf/open/floor/wood, +/area/service/salon) "hoY" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/tile/yellow{ @@ -50527,13 +50586,6 @@ /obj/machinery/navbeacon/wayfinding, /turf/open/floor/iron/white, /area/medical/medbay/central) -"huE" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/wood, -/area/service/lawoffice) "huF" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, @@ -54871,6 +54923,18 @@ }, /turf/open/floor/plating, /area/maintenance/fore) +"hZT" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/flora/grass/jungle, +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass, +/area/hallway/primary/central) "hZY" = ( /turf/closed/wall, /area/science) @@ -64936,6 +65000,9 @@ /area/maintenance/port) "jBS" = ( /obj/machinery/vending/coffee, +/obj/machinery/camera{ + c_tag = "Courtroom - Jury Backroom" + }, /turf/open/floor/wood, /area/security/courtroom) "jBV" = ( @@ -68439,6 +68506,9 @@ }, /turf/open/floor/carpet, /area/maintenance/fore/upper) +"kbP" = ( +/turf/closed/wall, +/area/service/salon) "kbV" = ( /obj/effect/turf_decal/delivery, /obj/structure/grille/broken, @@ -73107,15 +73177,18 @@ /turf/open/floor/iron, /area/security/courtroom) "kLC" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/security_space_law, -/obj/machinery/camera{ - c_tag = "Courtroom - Jury Backroom" +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/table/reinforced/rglass, +/obj/machinery/firealarm/directional/west, +/obj/item/book/fish_catalog, +/obj/machinery/camera{ + c_tag = "Salon - Massage Parlour" }, -/obj/machinery/light/small/directional/north, -/obj/machinery/newscaster/directional/north, /turf/open/floor/iron, -/area/security/courtroom) +/area/service/salon) "kLD" = ( /obj/structure/table/reinforced, /obj/item/phone{ @@ -75753,10 +75826,12 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/newscaster/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/barber{ + pixel_y = 25 + }, /turf/open/floor/iron, /area/hallway/primary/port) "lgO" = ( @@ -84194,12 +84269,6 @@ /obj/item/poster/wanted/missing, /turf/open/floor/iron/dark, /area/security/office) -"mud" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/turf/open/floor/wood, -/area/hallway/primary/central) "mue" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/bot, @@ -84685,10 +84754,6 @@ dir = 1 }, /area/engineering/atmos/upper) -"mwr" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating, -/area/maintenance/port/central) "mwt" = ( /obj/effect/turf_decal/stripes/box, /obj/structure/marker_beacon/burgundy, @@ -88663,11 +88728,21 @@ /turf/open/floor/engine, /area/science/xenobiology) "ndk" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light_switch/directional/south, +/obj/machinery/dryer{ + dir = 4; + pixel_x = -6; + pixel_y = -6 + }, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ - dir = 4 + dir = 5 }, /turf/open/floor/iron, -/area/security/courtroom) +/area/service/salon) "ndq" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -93308,6 +93383,10 @@ dir = 1 }, /area/engineering/atmos) +"nLt" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/service/salon) "nLy" = ( /obj/machinery/door/poddoor/massdriver_trash, /turf/open/floor/plating, @@ -94179,11 +94258,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/upper) -"nSi" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/turf/open/floor/plating, -/area/maintenance/port/central) "nSl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -97125,6 +97199,15 @@ }, /turf/open/floor/iron/white, /area/science/genetics) +"oqY" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/closet/secure_closet/barber, +/obj/machinery/light/warm/directional/north, +/turf/open/floor/iron, +/area/service/salon) "ora" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -97729,14 +97812,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/camera{ c_tag = "Leisure Hallway - Far Starboard"; name = "hallway camera" }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/iron, /area/hallway/primary/port) "owi" = ( @@ -98977,18 +99059,6 @@ /obj/machinery/power/apc/auto_name/east, /turf/open/floor/plating, /area/maintenance/department/electrical) -"oFk" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/flora/grass/jungle, -/obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/grass, -/area/hallway/primary/central) "oFl" = ( /obj/structure/window/reinforced, /obj/structure/chair/sofa/bench/left{ @@ -102853,6 +102923,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/hallway/primary/port) "pkQ" = ( @@ -106426,6 +106497,17 @@ /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/department/medical) +"pKT" = ( +/obj/structure/table/reinforced/rglass, +/obj/structure/mirror/directional/east, +/obj/item/reagent_containers/spray/barbers_aid{ + pixel_x = 6 + }, +/obj/item/razor{ + pixel_x = -6 + }, +/turf/open/floor/wood, +/area/service/salon) "pKV" = ( /obj/effect/turf_decal/stripes/box, /obj/machinery/processor, @@ -108421,11 +108503,19 @@ /turf/open/floor/iron/dark, /area/security/office) "qdu" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ - dir = 9 + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, /turf/open/floor/iron, -/area/security/courtroom) +/area/service/salon) "qdx" = ( /obj/structure/chair{ dir = 4 @@ -110793,6 +110883,13 @@ }, /turf/open/floor/iron, /area/command/bridge) +"qvR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/wood, +/area/service/lawoffice) "qvT" = ( /obj/structure/ladder, /turf/open/floor/plating/airless, @@ -114556,6 +114653,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/medical/virology) +"raH" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/hedge, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "raJ" = ( /obj/structure/barricade/security/ctf, /obj/structure/window/reinforced/tinted, @@ -115006,13 +115110,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/maintenance/department/medical) -"reh" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/security/courtroom) "rez" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/effect/turf_decal/bot, @@ -116701,6 +116798,21 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/commons/fitness/locker_room) +"rqc" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, +/area/hallway/primary/central) "rqj" = ( /obj/machinery/computer/med_data/laptop, /obj/structure/table/reinforced, @@ -116940,21 +117052,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/construction/engineering) -"rry" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/wood, -/area/hallway/primary/central) "rrC" = ( /obj/item/soap/nanotrasen, /obj/machinery/light/small/directional/south, @@ -119260,6 +119357,19 @@ /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, /turf/open/floor/wood/tile, /area/service/abandoned_gambling_den) +"rJU" = ( +/obj/machinery/power/apc/auto_name/east, +/obj/structure/cable, +/obj/structure/table/reinforced/rglass, +/obj/item/reagent_containers/dropper/precision{ + pixel_x = -7 + }, +/obj/item/lipstick/random, +/obj/item/reagent_containers/spray/quantum_hair_dye{ + pixel_x = 6 + }, +/turf/open/floor/wood, +/area/service/salon) "rJV" = ( /turf/open/openspace/airless, /area/space/nearstation) @@ -119702,6 +119812,19 @@ dir = 8 }, /area/security/prison/visit) +"rOp" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/vending/barbervend, +/obj/machinery/firealarm/directional/west, +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera{ + c_tag = "Salon" + }, +/turf/open/floor/iron, +/area/service/salon) "rOr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -126148,6 +126271,9 @@ dir = 4 }, /obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/security/courtroom) "sLU" = ( @@ -136541,13 +136667,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) -"ulw" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/hedge, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "ulx" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/fueltank, @@ -141648,6 +141767,17 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, /turf/open/openspace, /area/maintenance/department/medical/central) +"uXM" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/service/salon) "uXP" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/structure/cable, @@ -147041,6 +147171,12 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/cargo/storage) +"vME" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/wood, +/area/hallway/primary/central) "vMH" = ( /obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ dir = 10 @@ -148321,10 +148457,21 @@ /turf/open/floor/wood/parquet, /area/service/theater) "vYh" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/start/barber, /turf/open/floor/iron, -/area/security/courtroom) +/area/service/salon) "vYj" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 9 @@ -148785,6 +148932,15 @@ }, /turf/open/floor/iron, /area/commons/vacant_room/commissary) +"wbI" = ( +/obj/structure/chair/barber_chair{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/service/salon) "wbK" = ( /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ dir = 4 @@ -152875,6 +153031,16 @@ dir = 1 }, /area/science/research) +"wHN" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron, +/area/hallway/primary/port) "wHQ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -153501,6 +153667,20 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/science/explab) +"wNk" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron, +/area/service/salon) "wNm" = ( /obj/machinery/door/airlock/medical{ name = "Surgery A"; @@ -155660,13 +155840,6 @@ /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/iron/dark, /area/service/hydroponics/upper) -"xdV" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/security/courtroom) "xea" = ( /obj/structure/window, /obj/machinery/modular_computer/console/preset/cargochat/service{ @@ -161226,6 +161399,21 @@ }, /turf/open/floor/iron, /area/commons/fitness/recreation) +"xUi" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Barbershop" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/service/salon) "xUj" = ( /obj/item/stack/sheet/cardboard, /obj/structure/cable, @@ -255422,7 +255610,7 @@ fAc fAc fAc qdW -lKP +lGY dNW xMu vPd @@ -255934,11 +256122,11 @@ xEO whc tAA oJi -euD -reh -xdV +kbP +kbP +kbP avB -euD +kbP yak lPW oUf @@ -256191,11 +256379,11 @@ xEO cxg lKP lKP -euD +kbP kLC vYh ndk -euD +kbP rfT lPW pkP @@ -256448,12 +256636,12 @@ xYT aHN aHN aHN -euD +kbP dNS doK qdu -euD -yak +kbP +wHN lPW hiJ rbZ @@ -256705,11 +256893,11 @@ kly sit cOu mvo -euD -euD -euD +kbP +kbP +kbP csu -euD +kbP lgL lPW oUf @@ -256962,11 +257150,11 @@ tGz wQm tDw lKP -euD -qNC -uDI -rpe -oiI +kbP +rOp +aUM +uXM +nLt yak jmh fOA @@ -257219,13 +257407,13 @@ fAc sit fnp gAu -euD -kfu -rpe -rpe -eck -yak -lPW +kbP +oqY +fIP +wNk +xUi +aOt +eYV oUf rxU oyg @@ -257476,11 +257664,11 @@ fAc uMW euD euD -euD -rpe -rpe -bSR -oiI +kbP +wbI +hoI +wbI +nLt ovT lPW oUf @@ -257733,18 +257921,18 @@ gLp euD euD nQd -pLl -rpe -pFI -tYr -oiI +kbP +hoT +rJU +pKT +kbP iJn jEL mDi rbZ rxU rxU -huE +qvR tKA rxU rxU @@ -257989,9 +258177,9 @@ uvs dNK rRB euD -rpe -rpe -mwr +aHZ +aXQ +aXQ dbb tqv dbb @@ -258246,7 +258434,7 @@ ehj khc gkd euD -rgd +rpe rpe tfj dbb @@ -258255,8 +258443,8 @@ mZW cYm dKZ iOb -ulw -mud +raH +vME tak sTL xQO @@ -258504,17 +258692,17 @@ nNj bWp eck rpe -rpe -ezx +rgd +dhe dbb xPI iCl cYm uAK iOb -ulw +raH kVh -oFk +hZT sTL xQO gZw @@ -258760,20 +258948,20 @@ kKa aHN aHN euD -aHZ +bSR rpe -nSi +tYr dbb cFc huy ugZ dKZ iOb -ulw +raH kVh iHi piW -rry +rqc miZ xkH qIQ diff --git a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm index c0de5e2fc2b..1151b085b60 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm @@ -196,6 +196,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/maintenance/port/fore) +"aaL" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/engineering/supermatter) "aaO" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5903,6 +5912,14 @@ }, /turf/open/floor/iron, /area/security/prison) +"aUH" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "aUK" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -7695,11 +7712,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/security/checkpoint/escape) -"bmS" = ( -/obj/structure/table/wood, -/obj/machinery/computer/secure_data/laptop, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "bne" = ( /obj/structure/rack, /obj/effect/spawner/random/clothing/costume, @@ -7707,11 +7719,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/maintenance/port/fore) -"bni" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "bnn" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -8736,13 +8743,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"bwL" = ( -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/color_adapter{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "bwT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -10554,16 +10554,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"bJT" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "Engine Cooling Bypass" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "bKd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ @@ -11676,6 +11666,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/service/lawoffice) +"bQA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/button/door/directional/west{ + id = "engsm"; + name = "Radiation Shutters Control"; + req_access_txt = "10" + }, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "bQG" = ( /obj/structure/reflector/box, /turf/open/floor/plating, @@ -15122,6 +15124,13 @@ /obj/machinery/newscaster/security_unit/directional/west, /turf/open/floor/iron, /area/security/brig) +"cgQ" = ( +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains1" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/service/salon) "cgR" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/red, @@ -17794,8 +17803,8 @@ "cwL" = ( /obj/structure/table/wood, /obj/item/paper_bin, -/obj/structure/cable, /obj/effect/turf_decal/tile/blue, +/obj/structure/cable, /turf/open/floor/iron, /area/hallway/secondary/command) "cwM" = ( @@ -17803,8 +17812,8 @@ dir = 1 }, /obj/effect/landmark/start/assistant, -/obj/structure/cable, /obj/effect/turf_decal/tile/blue, +/obj/structure/cable, /turf/open/floor/iron, /area/hallway/secondary/command) "cwN" = ( @@ -17953,10 +17962,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron, /area/hallway/secondary/command) "cyv" = ( /obj/effect/turf_decal/tile/neutral, +/obj/structure/sign/barber{ + pixel_y = -26 + }, /turf/open/floor/iron, /area/hallway/secondary/command) "cyD" = ( @@ -18570,6 +18583,13 @@ }, /turf/open/floor/iron, /area/maintenance/port) +"cGf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "cGi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -18749,15 +18769,6 @@ }, /turf/open/floor/iron/dark, /area/maintenance/starboard/fore) -"cIc" = ( -/obj/structure/window/reinforced/plasma/spawner/west{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/engine, -/area/engineering/supermatter) "cIh" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -23998,10 +24009,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"dgU" = ( -/obj/item/radio/intercom/directional/south, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "dgV" = ( /obj/machinery/chem_dispenser, /obj/effect/turf_decal/stripes/line{ @@ -31034,14 +31041,6 @@ }, /turf/open/floor/plating/airless, /area/science/test_area) -"dLL" = ( -/obj/machinery/disposal/bin, -/obj/machinery/light_switch/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "dLP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, @@ -32888,11 +32887,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) -"dUC" = ( -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "dUO" = ( /obj/machinery/vending/wallmed/directional/west, /obj/structure/disposalpipe/segment, @@ -36258,12 +36252,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/grimy, /area/service/library) -"euh" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "eui" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -36608,6 +36596,19 @@ }, /turf/open/floor/iron, /area/engineering/storage) +"ezz" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/airlock/public/glass{ + name = "Barbershop" + }, +/turf/open/floor/iron, +/area/service/salon) +"ezC" = ( +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "ezU" = ( /obj/machinery/conveyor{ dir = 4; @@ -36740,14 +36741,8 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "eBv" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "corporatelounge"; - name = "Corporate Lounge Shutters" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/command/corporate_showroom) +/turf/closed/wall, +/area/service/salon) "eBF" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -37710,18 +37705,16 @@ /turf/open/floor/iron, /area/science/mixing) "ePQ" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/clothing/under/rank/centcom/commander, -/obj/item/clothing/head/centhat{ - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); - desc = "A replica hat of a Central Commander's attire. It has a small tag on it saying, 'It's good to be emperor.'"; - name = "Replica CentCom hat" +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/chair/office/light{ + dir = 4 }, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "ePT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -38951,6 +38944,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/brig) +"fgG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "fgO" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -39188,10 +39185,6 @@ /obj/structure/table/wood, /turf/open/floor/iron/grimy, /area/service/abandoned_gambling_den/secondary) -"fll" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, -/area/engineering/supermatter) "flq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -39769,14 +39762,6 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) -"fuC" = ( -/obj/structure/window/reinforced/plasma/spawner/west{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "fuF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -39939,11 +39924,18 @@ /turf/open/floor/iron, /area/engineering/storage) "fwF" = ( -/obj/structure/chair/comfy/black{ - 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/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/machinery/door/airlock/public{ + name = "Massage Parlour" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/service/salon) "fxd" = ( /obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron/cafeteria, @@ -40237,12 +40229,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/commons/locker) -"fCg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "fCh" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall, @@ -41128,6 +41114,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/service/theater/abandoned) +"fTW" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "fUc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/event_spawn, @@ -41667,13 +41661,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/medical/pharmacy) -"gaT" = ( -/obj/structure/sign/nanotrasen{ - pixel_x = -32; - pixel_y = 32 - }, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "gbd" = ( /turf/open/floor/wood{ icon_state = "wood-broken2" @@ -41761,11 +41748,6 @@ }, /turf/open/floor/iron/grimy, /area/service/library) -"gem" = ( -/obj/structure/sign/warning/radiation, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/closed/wall/r_wall, -/area/engineering/supermatter) "gep" = ( /obj/machinery/light/directional/east, /obj/effect/decal/cleanable/dirt, @@ -42949,13 +42931,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/engineering/break_room) -"gxM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "gxR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -42989,18 +42964,14 @@ }, /area/commons/toilet/restrooms) "gyL" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/toy/gun, -/obj/item/clothing/head/beret/sec{ - armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); - desc = "A replica beret resembling that of a special operations officer under Nanotrasen."; - name = "replica officer's beret" +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/structure/cable, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/service/salon) "gyT" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall, @@ -44098,12 +44069,6 @@ "gTm" = ( /turf/open/floor/iron/dark, /area/service/library/abandoned) -"gTt" = ( -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/pen, -/turf/open/floor/carpet, -/area/command/corporate_showroom) "gTB" = ( /obj/machinery/power/solar{ id = "aftstarboard"; @@ -44141,10 +44106,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/treatment_center) -"gTZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/closed/wall/r_wall, -/area/engineering/supermatter) "gUo" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -44266,6 +44227,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"gVU" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/service/salon) "gWm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -44627,12 +44597,15 @@ /turf/open/floor/iron, /area/engineering/gravity_generator) "hbl" = ( -/obj/structure/bookcase, -/obj/structure/sign/nanotrasen{ - pixel_y = 32 +/obj/structure/bed/pod, +/obj/machinery/light/warm/directional/north, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/service/salon) "hbp" = ( /obj/structure/bed, /obj/item/bedsheet/black, @@ -44698,6 +44671,13 @@ }, /turf/open/floor/iron/grimy, /area/command/heads_quarters/captain) +"hdi" = ( +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/pipe/color_adapter{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "hdj" = ( /obj/machinery/photocopier, /obj/machinery/light/directional/east, @@ -44949,6 +44929,11 @@ /obj/machinery/power/apc/auto_name/east, /turf/open/floor/iron/dark, /area/security/interrogation) +"hhS" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "hia" = ( /obj/item/kirbyplants/random, /obj/machinery/status_display/ai/directional/east, @@ -45119,10 +45104,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/cargo/storage) -"hkZ" = ( -/obj/machinery/power/supermatter_crystal/engine, -/turf/open/floor/engine, -/area/engineering/supermatter) "hlc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -47283,6 +47264,16 @@ /obj/structure/sign/warning/nosmoking, /turf/closed/wall/r_wall, /area/science/xenobiology) +"hTR" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/barber_chair{ + dir = 4 + }, +/turf/open/floor/iron, +/area/service/salon) "hTS" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -47511,6 +47502,11 @@ }, /turf/open/floor/iron, /area/engineering/main) +"hWu" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/plating, +/area/engineering/supermatter) "hWy" = ( /obj/machinery/computer/atmos_control/tank/nitrous_tank{ dir = 4 @@ -48423,12 +48419,6 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/engineering/break_room) -"iiL" = ( -/obj/item/kirbyplants/random, -/obj/machinery/light/directional/south, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) "iiN" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -49192,12 +49182,13 @@ /turf/open/floor/plating, /area/maintenance/port) "iss" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "isC" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow{ @@ -50438,6 +50429,13 @@ /obj/item/storage/crayons, /turf/open/floor/iron, /area/security/prison) +"iMT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "iNf" = ( /obj/machinery/light/directional/south, /obj/structure/dresser, @@ -52311,13 +52309,15 @@ /turf/open/floor/iron/dark, /area/science/mixing) "jug" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/table/wood/shuttle_bar, +/obj/item/lipstick/random, +/turf/open/floor/iron, +/area/service/salon) "jup" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/tile/neutral{ @@ -52903,10 +52903,23 @@ /turf/open/floor/iron, /area/commons/fitness/recreation) "jDJ" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/power/apc/auto_name/east, /obj/structure/cable, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/reagent_containers/dropper/precision{ + pixel_x = -7 + }, +/obj/item/lipstick/random, +/obj/item/reagent_containers/spray/quantum_hair_dye{ + pixel_x = 6 + }, +/turf/open/floor/iron, +/area/service/salon) "jDK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown{ @@ -53203,6 +53216,11 @@ }, /turf/open/floor/iron, /area/cargo/storage) +"jHV" = ( +/obj/structure/table/wood, +/obj/machinery/computer/secure_data/laptop, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "jHY" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -53259,15 +53277,6 @@ heat_capacity = 1e+006 }, /area/maintenance/port) -"jIM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/color_adapter{ - dir = 4 - }, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "jIO" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/sign/warning/securearea{ @@ -53326,6 +53335,15 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, /area/service/chapel/office) +"jJm" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/engine, +/area/engineering/supermatter) "jJq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53463,6 +53481,10 @@ /obj/machinery/power/apc/auto_name/east, /turf/open/floor/iron/white, /area/medical/virology) +"jLq" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "jLJ" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -54928,11 +54950,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"kiV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/command/corporate_showroom) "kjh" = ( /obj/structure/closet/firecloset, /obj/machinery/light/small/directional/west, @@ -56062,6 +56079,10 @@ }, /turf/open/floor/iron, /area/hallway/primary/central/fore) +"kAe" = ( +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/hallway/secondary/command) "kAj" = ( /obj/structure/table/wood, /obj/item/soap/nanotrasen, @@ -56214,18 +56235,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/grimy, /area/service/library) -"kCz" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Corporate Lounge"; - req_access_txt = "19" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "showroom" - }, -/turf/open/floor/wood, -/area/command/corporate_showroom) "kCA" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56396,11 +56405,6 @@ }, /turf/open/floor/iron/white, /area/hallway/primary/central/aft) -"kGd" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/plating, -/area/engineering/supermatter) "kGs" = ( /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; @@ -56708,10 +56712,17 @@ /turf/open/floor/iron/dark, /area/commons/fitness/recreation) "kJW" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/west, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/dryer{ + dir = 4; + pixel_x = -6; + pixel_y = -6 + }, +/turf/open/floor/iron, +/area/service/salon) "kKa" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -56859,17 +56870,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/commons/fitness/recreation) -"kMr" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber"; - req_one_access_txt = "10;24" - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "kMB" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -59235,10 +59235,6 @@ }, /turf/open/floor/iron, /area/cargo/storage) -"lsg" = ( -/obj/machinery/vending/boozeomat, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "lsy" = ( /obj/structure/cable, /turf/closed/wall, @@ -59309,13 +59305,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/iron/dark, /area/science/mixing) -"ltm" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/wood, -/area/command/corporate_showroom) "ltn" = ( /obj/structure/chair/stool/directional/south, /obj/effect/turf_decal/tile/neutral{ @@ -59800,12 +59789,20 @@ /turf/open/floor/iron, /area/engineering/main) "lAV" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/toy/figure/dsquad, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 + }, +/obj/structure/mirror/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/service/salon) "lBd" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/engine, @@ -60362,10 +60359,6 @@ }, /turf/open/floor/iron/dark, /area/command/bridge) -"lMb" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/engine, -/area/engineering/supermatter) "lMm" = ( /obj/structure/window/reinforced{ dir = 4 @@ -60451,11 +60444,20 @@ /turf/open/floor/wood, /area/service/library/abandoned) "lNS" = ( -/obj/structure/table/wood, -/obj/item/storage/secure/briefcase, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/mirror/directional/east, +/obj/item/reagent_containers/spray/barbers_aid{ + pixel_x = 6 + }, +/obj/item/razor{ + pixel_x = -6 + }, +/turf/open/floor/iron, +/area/service/salon) "lOa" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -60579,12 +60581,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/central) -"lPB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "lPG" = ( /obj/structure/table, /obj/item/paper_bin, @@ -61339,6 +61335,17 @@ }, /turf/open/floor/iron/dark, /area/engineering/main) +"lZo" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber"; + req_one_access_txt = "10;24" + }, +/turf/open/floor/engine, +/area/engineering/supermatter) "lZt" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/light/small/directional/north, @@ -62042,6 +62049,12 @@ }, /turf/open/floor/engine/n2o, /area/engineering/atmos) +"mkl" = ( +/obj/machinery/light/directional/west, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "mkz" = ( /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; @@ -62245,15 +62258,6 @@ }, /turf/open/floor/iron, /area/command/heads_quarters/cmo) -"mmY" = ( -/obj/structure/window/reinforced/plasma/spawner/west{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/engine, -/area/engineering/supermatter) "mnr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/plasticflaps/opaque, @@ -62815,11 +62819,19 @@ /turf/open/floor/plating, /area/service/theater/abandoned) "mue" = ( -/obj/structure/chair/comfy/brown{ +/obj/machinery/light/warm/directional/west, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/item/kirbyplants/random, +/obj/machinery/button/curtain{ + id = "barbershopcurtains"; + pixel_x = -25; + pixel_y = -24 + }, +/turf/open/floor/iron, +/area/service/salon) "mui" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -63182,6 +63194,9 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/barber{ + pixel_y = 25 + }, /turf/open/floor/iron, /area/hallway/primary/central/aft) "mAt" = ( @@ -65105,6 +65120,15 @@ }, /turf/open/floor/iron, /area/command/heads_quarters/cmo) +"neH" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "nfl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -66370,11 +66394,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "nxt" = ( -/obj/structure/chair/comfy/black{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron, +/area/service/salon) "nxv" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -66769,16 +66795,15 @@ /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "nDO" = ( -/obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ - pixel_x = 3 +/obj/machinery/holopad, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/item/clothing/mask/cigarette/cigar/havana{ - pixel_x = -3 - }, -/obj/item/clothing/mask/cigarette/cigar, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "nDV" = ( /obj/effect/landmark/blobstart, /obj/structure/disposalpipe/segment{ @@ -67165,6 +67190,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/commons/toilet/restrooms) +"nIS" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "nIV" = ( /turf/closed/wall, /area/service/janitor) @@ -68084,6 +68119,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/security/prison/safe) +"nXc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains" + }, +/turf/open/floor/plating, +/area/service/salon) "nXu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -68242,16 +68284,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/central/fore) -"nZw" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "nZB" = ( -/obj/structure/chair/comfy/brown{ - dir = 8 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/sofa/bench/right{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "nZN" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -69045,20 +69090,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"okN" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Corporate Lounge"; - req_access_txt = "19" - }, -/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/cyclelink_helper_multi{ - cycle_id = "showroom" - }, -/turf/open/floor/wood, -/area/command/corporate_showroom) "okV" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -69687,6 +69718,14 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/hallway/primary/central/aft) +"otq" = ( +/obj/machinery/disposal/bin, +/obj/machinery/light_switch/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "otC" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, @@ -70920,14 +70959,6 @@ }, /turf/open/floor/iron/dark, /area/service/bar) -"oJv" = ( -/obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Gas to Chamber" - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "oJz" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/bowl, @@ -73984,6 +74015,12 @@ }, /turf/open/floor/iron/dark, /area/engineering/gravity_generator) +"pGB" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/simple_animal/pet/fox/renault, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "pGD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -74054,29 +74091,6 @@ }, /turf/open/floor/iron, /area/cargo/office) -"pHv" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/flashlight/lamp/green{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/item/reagent_containers/food/drinks/bottle/kahlua{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_y = 2 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = 7; - pixel_y = -4 - }, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "pHy" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -74359,14 +74373,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/command/gateway) -"pLz" = ( -/obj/structure/window/reinforced/plasma/spawner/west{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "pLD" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/camera{ @@ -74474,6 +74480,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/commons/fitness/recreation) +"pNO" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "pOb" = ( /obj/structure/table/glass, /obj/machinery/light/directional/east, @@ -74830,12 +74840,14 @@ /turf/open/floor/iron/white, /area/medical/virology) "pTc" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/whiskey, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/closet/secure_closet/barber, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/service/salon) "pTl" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -75107,8 +75119,15 @@ /turf/open/floor/iron/dark, /area/command/bridge) "pXL" = ( -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "pYc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -75637,6 +75656,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/service/hydroponics) +"qfy" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Gas to Chamber" + }, +/turf/open/floor/engine, +/area/engineering/supermatter) "qfA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -76138,11 +76165,16 @@ /area/medical/virology) "qmP" = ( /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/barber, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/turf/open/floor/iron, +/area/service/salon) "qnd" = ( /obj/effect/landmark/blobstart, /obj/structure/disposalpipe/segment{ @@ -76338,6 +76370,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/command/heads_quarters/hos) +"qqj" = ( +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "qqB" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -76534,6 +76570,17 @@ }, /turf/open/floor/iron/dark, /area/command/bridge) +"qtE" = ( +/obj/machinery/light/warm/directional/north, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/barber_chair{ + dir = 4 + }, +/turf/open/floor/iron, +/area/service/salon) "qtR" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -77335,13 +77382,6 @@ }, /turf/open/floor/iron/white, /area/service/kitchen) -"qFb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "qFk" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/coffee, @@ -77744,7 +77784,7 @@ /turf/open/floor/iron, /area/security/prison/safe) "qKx" = ( -/obj/machinery/power/energy_accumulator/tesla_coil, +/obj/machinery/power/tesla_coil, /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/engineering/main) @@ -77988,30 +78028,19 @@ /turf/open/floor/iron/dark, /area/commons/locker) "qNK" = ( -/obj/machinery/camera{ - c_tag = "Bridge - Corporate Lounge"; - name = "command camera" - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/effect/turf_decal/tile/purple, +/obj/machinery/vending/barbervend, +/obj/machinery/button/curtain{ + id = "barbershopcurtains"; + pixel_x = -25; + pixel_y = 24 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/sign/picture_frame/showroom/one{ - pixel_x = -8; - pixel_y = 32 - }, -/obj/structure/sign/picture_frame/showroom/two{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/command/corporate_showroom) +/turf/open/floor/iron, +/area/service/salon) "qNM" = ( /obj/structure/chair/office{ dir = 4 @@ -78027,9 +78056,9 @@ /obj/structure/chair/comfy/black{ dir = 1 }, -/obj/structure/cable, /obj/effect/turf_decal/tile/blue, /obj/effect/landmark/start/hangover, +/obj/structure/cable, /turf/open/floor/iron, /area/hallway/secondary/command) "qOe" = ( @@ -78539,10 +78568,13 @@ /turf/open/floor/iron, /area/engineering/atmos) "qUi" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/service/salon) "qUo" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -78849,14 +78881,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/engineering/main) -"qYi" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet, -/area/command/corporate_showroom) "qYo" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -78877,12 +78901,15 @@ /turf/open/floor/wood, /area/command/heads_quarters/captain) "qYx" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/table/wood/shuttle_bar, +/obj/item/book/fish_catalog, +/turf/open/floor/iron, +/area/service/salon) "qYD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -79280,16 +79307,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/service/library/abandoned) -"ree" = ( -/obj/machinery/airalarm/engine{ - pixel_y = 23 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Gas to Filter" - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "ren" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, @@ -79560,6 +79577,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/service/bar/atrium) +"rgQ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/engine, +/area/engineering/supermatter) "rgU" = ( /obj/machinery/disposal/bin, /obj/effect/decal/cleanable/dirt, @@ -80640,6 +80663,12 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/hallway/primary/central/fore) +"rAf" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "rAg" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -81526,12 +81555,6 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/engineering/supermatter/room) -"rOd" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "rOx" = ( /obj/structure/rack, /obj/item/storage/belt/utility, @@ -81544,6 +81567,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/commons/storage/tools) +"rOQ" = ( +/obj/effect/spawner/structure/window, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains" + }, +/turf/open/floor/plating, +/area/service/salon) "rPb" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral{ @@ -84878,13 +84910,12 @@ }, /area/hallway/secondary/service) "sLi" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "corporatelounge"; - name = "Corporate Lounge Shutters" +/obj/effect/spawner/structure/window, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains" }, /turf/open/floor/plating, -/area/command/corporate_showroom) +/area/service/salon) "sLr" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow{ @@ -85150,6 +85181,29 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard/aft) +"sPJ" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/reagent_containers/food/drinks/bottle/kahlua{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = 7; + pixel_y = -4 + }, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "sPQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -85369,7 +85423,7 @@ /turf/open/floor/iron, /area/cargo/warehouse) "sTy" = ( -/obj/machinery/power/energy_accumulator/tesla_coil, +/obj/machinery/power/tesla_coil, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Engineering - Secure Storage"; @@ -86235,6 +86289,13 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/command/heads_quarters/rd) +"tfu" = ( +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains1" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/service/salon) "tfD" = ( /turf/open/floor/iron{ heat_capacity = 1e+006 @@ -86395,6 +86456,10 @@ }, /turf/open/floor/iron/white, /area/command/heads_quarters/rd) +"tii" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "tim" = ( /obj/structure/window/reinforced{ dir = 4 @@ -86654,9 +86719,15 @@ /turf/open/floor/iron, /area/hallway/primary/central/aft) "tmP" = ( -/obj/structure/cable, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/structure/table/reinforced/rglass, +/obj/item/hairbrush, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/lipstick/random, +/turf/open/floor/iron, +/area/service/salon) "tmW" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -87952,6 +88023,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/command/teleporter) +"tGP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/color_adapter{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "tGU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bodycontainer/morgue{ @@ -88878,6 +88958,17 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/engineering/main) +"tSQ" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber"; + req_one_access_txt = "10;24" + }, +/turf/open/floor/engine, +/area/engineering/supermatter) "tSS" = ( /obj/machinery/light/directional/north, /obj/structure/tank_holder/extinguisher, @@ -88923,26 +89014,16 @@ /turf/open/floor/iron/dark, /area/engineering/transit_tube) "tUe" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/camera{ + c_tag = "Salon" + }, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/sign/picture_frame/showroom/three{ - pixel_x = -8; - pixel_y = 32 - }, -/obj/structure/sign/picture_frame/showroom/four{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/sofa/bench/right, +/turf/open/floor/iron, +/area/service/salon) "tUm" = ( /obj/structure/table, /obj/item/clipboard, @@ -89346,12 +89427,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/hallway/secondary/entry) -"ubb" = ( -/obj/machinery/light/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "ubm" = ( /obj/structure/chair/stool/directional/west, /obj/effect/turf_decal/tile/neutral{ @@ -90252,6 +90327,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/commons/fitness/recreation) +"uqa" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/open/floor/engine, +/area/engineering/supermatter) "uqc" = ( /obj/structure/chair/office{ dir = 8 @@ -90790,17 +90869,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central/aft) -"uwW" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber"; - req_one_access_txt = "10;24" - }, -/turf/open/floor/engine, -/area/engineering/supermatter) "uwX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ @@ -90962,19 +91030,6 @@ }, /turf/open/floor/iron, /area/commons/fitness/recreation) -"uyT" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Corporate Lounge"; - req_access_txt = "19" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "showroom" - }, -/turf/open/floor/wood, -/area/command/corporate_showroom) "uzg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -91971,11 +92026,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/service/abandoned_gambling_den) -"uOP" = ( -/obj/structure/table/wood, -/obj/item/paicard, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) "uOU" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/tile/red{ @@ -92489,6 +92539,16 @@ }, /turf/open/floor/iron, /area/engineering/supermatter/room) +"uWq" = ( +/obj/machinery/airalarm/engine{ + pixel_y = 23 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Gas to Filter" + }, +/turf/open/floor/engine, +/area/engineering/supermatter) "uWy" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -92501,10 +92561,13 @@ /turf/open/floor/iron, /area/cargo/storage) "uWH" = ( -/obj/structure/table/wood, -/obj/item/storage/photo_album, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/structure/bed/pod, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "uWQ" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -92657,9 +92720,12 @@ /turf/open/floor/iron/dark, /area/command/heads_quarters/ce) "vav" = ( -/obj/machinery/holopad, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "vaz" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line, @@ -92850,6 +92916,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/engineering/main) +"vdJ" = ( +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/service/bar) "vdK" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line{ @@ -93388,8 +93460,18 @@ /turf/open/space/basic, /area/space/nearstation) "vkd" = ( -/turf/closed/wall/r_wall, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Barbershop" + }, +/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, +/area/service/salon) "vko" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -93667,12 +93749,6 @@ }, /turf/open/floor/iron, /area/cargo/miningoffice) -"vob" = ( -/obj/machinery/light/directional/west, -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "vox" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor_switch/oneway{ @@ -94335,6 +94411,14 @@ }, /turf/open/floor/iron, /area/engineering/supermatter/room) +"vzn" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/sofa/bench/left, +/turf/open/floor/iron, +/area/service/salon) "vzu" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -94345,18 +94429,6 @@ }, /turf/open/floor/iron, /area/commons/fitness/recreation) -"vzy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/button/door/directional/west{ - id = "engsm"; - name = "Radiation Shutters Control"; - req_access_txt = "10" - }, -/turf/open/floor/iron, -/area/engineering/supermatter/room) "vzF" = ( /obj/item/kirbyplants/random, /obj/item/toy/plush/snakeplushie{ @@ -94570,6 +94642,11 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/wood, /area/command/heads_quarters/captain) +"vDy" = ( +/obj/structure/sign/warning/radiation, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/engineering/supermatter) "vDG" = ( /obj/machinery/meter, /obj/machinery/light/directional/east, @@ -94782,19 +94859,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/service/chapel/office) -"vGQ" = ( -/obj/machinery/light_switch/directional/south{ - pixel_x = 6 - }, -/obj/item/kirbyplants/random, -/obj/machinery/light/directional/south, -/obj/machinery/button/door/directional/south{ - id = "corporatelounge"; - name = "Corporate Lounge Shutters"; - pixel_x = -6 - }, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) "vHf" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -94987,6 +95051,12 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /turf/open/space, /area/engineering/atmos) +"vJj" = ( +/obj/machinery/light/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "vJu" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Circuits Lab Maintenance"; @@ -95326,10 +95396,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"vOw" = ( -/obj/machinery/photocopier, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "vOG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -96460,10 +96526,17 @@ /turf/open/floor/iron, /area/security/prison) "whq" = ( -/obj/structure/table/wood, -/obj/item/lighter, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/sofa/bench/left{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "whP" = ( /obj/machinery/power/solar_control{ dir = 4; @@ -97056,6 +97129,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/engineering/main) +"wrb" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "wrg" = ( /obj/machinery/vending/boozeomat, /obj/machinery/status_display/evac/directional/north, @@ -97083,6 +97162,10 @@ }, /turf/open/floor/iron/grimy, /area/security/detectives_office) +"wrL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/engine, +/area/engineering/supermatter) "wrV" = ( /obj/structure/sign/poster/official/work_for_a_future{ pixel_x = 32 @@ -97449,6 +97532,13 @@ }, /turf/open/floor/iron, /area/cargo/storage) +"wvX" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = -32; + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "wwA" = ( /obj/structure/table/glass, /obj/item/folder/blue, @@ -97479,6 +97569,15 @@ }, /turf/open/floor/iron, /area/engineering/atmos) +"wwS" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/start/barber, +/turf/open/floor/iron, +/area/service/salon) "wwY" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -98049,10 +98148,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/engineering/storage/tech) -"wHk" = ( -/obj/structure/sign/warning/electricshock, -/turf/closed/wall/r_wall, -/area/command/corporate_showroom) "wHq" = ( /obj/machinery/hydroponics/constructable, /obj/structure/sign/nanotrasen{ @@ -99623,17 +99718,18 @@ /turf/open/floor/plating, /area/commons/toilet/auxiliary) "xiK" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/structure/showcase/machinery/implanter{ - layer = 2.7; - pixel_y = 4 +/obj/effect/turf_decal/tile/purple, +/obj/structure/mirror/directional/east, +/obj/item/reagent_containers/dropper, +/obj/item/hairbrush/comb{ + pixel_y = 10 }, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/turf/open/floor/iron, +/area/service/salon) "xiQ" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=engi1"; @@ -99881,15 +99977,20 @@ /turf/open/floor/iron, /area/maintenance/port/fore) "xmS" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +/obj/structure/chair/office/light{ dir = 4 }, -/obj/structure/showcase/mecha/marauder, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/button/curtain{ + id = "barbershopcurtains1"; + pixel_x = -25; + pixel_y = 24 + }, +/turf/open/floor/iron, +/area/service/salon) "xmT" = ( /obj/structure/window/reinforced{ dir = 8 @@ -99912,12 +100013,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/engineering/transit_tube) -"xni" = ( -/obj/structure/sign/picture_frame/portrait/bar{ - pixel_x = -32 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "xnj" = ( /obj/machinery/light/directional/south, /obj/machinery/computer/station_alert{ @@ -100367,6 +100462,10 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/aisat/exterior) +"xtC" = ( +/obj/item/radio/intercom/directional/south, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "xub" = ( /obj/structure/window/reinforced{ dir = 4 @@ -100995,6 +101094,16 @@ }, /turf/open/floor/iron/dark, /area/engineering/transit_tube) +"xEG" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Engine Cooling Bypass" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/engineering/supermatter/room) "xET" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -101601,20 +101710,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/commons/fitness/recreation) -"xOF" = ( -/obj/structure/fireplace, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/command/corporate_showroom) "xOM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, @@ -102198,12 +102293,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/security/checkpoint/escape) -"xZz" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/command/corporate_showroom) "xZJ" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -102716,6 +102805,20 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/dark, /area/service/abandoned_gambling_den) +"yhy" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/hairbrush, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/lipstick/random, +/obj/machinery/camera{ + c_tag = "Salon - Massage Parlour"; + dir = 8 + }, +/turf/open/floor/iron, +/area/service/salon) "yhE" = ( /obj/structure/table/wood, /obj/item/instrument/violin, @@ -123757,11 +123860,11 @@ otP vNO aTe rNb -dUC +ezC qzf -fuC -pLz -fuC +aUH +fTW +aUH qzf qzf qzf @@ -124014,12 +124117,12 @@ otP vNO eyE vZy -jIM -fll -lPB +tGP +tii +rgQ qzE -lMb -mmY +wrL +jJm lBd lZd hnW @@ -124271,12 +124374,12 @@ otP vNO wTm rKr -bni -kGd -lPB -hkZ -lMb -cIc +hhS +hWu +rgQ +uqa +wrL +aaL vyP eZx hnW @@ -124528,12 +124631,12 @@ otP vNO eyE iDn -qFb -fll -lPB +cGf +tii +rgQ qzE -lMb -mmY +wrL +jJm lYR tKt jBK @@ -124785,12 +124888,12 @@ otP lON lgs oZO -bwL -fll -fll -uwW -gTZ -gTZ +hdi +tii +tii +tSQ +fgG +fgG qzf qzf hdp @@ -125044,9 +125147,9 @@ vzm oZO idx qzf -ree +uWq qzE -oJv +qfy qzf pEZ pEZ @@ -125301,9 +125404,9 @@ xPF aCW lAe qzf -gem -kMr -gTZ +vDy +lZo +fgG qzf axV axV @@ -125557,11 +125660,11 @@ xPF xPF oZO oni -vob -gxM -bJT -vzy -ubb +mkl +iMT +xEG +bQA +vJj mef mef tQl @@ -139640,7 +139743,7 @@ iXT alf hFM wtr -xni +vdJ ddc stu pqt @@ -140726,7 +140829,7 @@ oaQ cqZ aad aad -eBv +tfu xmS kJW lAV @@ -140983,12 +141086,12 @@ cub cqY cqZ cqZ -vkd +eBv hbl -ltm +wwS pXL uWH -wHk +cgQ fbT bMR ayd @@ -141240,12 +141343,12 @@ cuc udD oaQ cyt -kCz -tmP +cgQ +yhy qUi +neH tmP -tmP -kCz +eBv hUA iuh ayd @@ -141496,13 +141599,13 @@ eTr cud cvt cwL -oaQ +cyt +eBv +eBv eBv -pXL -qYi fwF -iiL -vkd +eBv +eBv mpQ kCj qfq @@ -141754,10 +141857,10 @@ cue cvu cwM sfh -vkd +eBv qNK pTc -gTt +neH mue sLi gic @@ -142011,9 +142114,9 @@ nwG kUO cwN cyu -vkd -xOF +ezz iss +gVU nDO vav sLi @@ -142268,12 +142371,12 @@ cug pjU qOd cyv -vkd +eBv tUe qYx whq nxt -sLi +eBv mAq bvi eBN @@ -142524,12 +142627,12 @@ mMQ cuh gqq cwP -jlX -eBv -pXL +kAe +sLi +vzn jug nZB -vGQ +neH vkd nbQ rrD @@ -142782,12 +142885,12 @@ lYQ rJU rRG xNT -okN -xZz -xZz -kiV -kiV -uyT +rOQ +neH +nIS +neH +vav +eBv qle sYX dUV @@ -143039,12 +143142,12 @@ cuj cqY cqZ cqZ -vkd -hbl +eBv +qtE qmP -pXL -uOP -wHk +hTR +vav +sLi anN pFL dUV @@ -143296,12 +143399,12 @@ jlX cqZ aad aad -eBv +nXc xiK jDJ lNS gyL -eBv +sLi tnm irp dUV @@ -143530,9 +143633,9 @@ oOD gdT glH glH -nZw -vOw -euh +jLq +qqj +pGB glH sfH bXb @@ -143786,10 +143889,10 @@ xTi oOD iUx glH -lsg -gaT -rOd -dgU +pNO +wvX +wrb +xtC glH glH glH @@ -144043,10 +144146,10 @@ xTi oOD vfg glH -dLL -fCg -bmS -pHv +otq +rAf +jHV +sPJ sXr jpd wQc diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm index 033fafbe382..4bfa332402d 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm @@ -101,15 +101,6 @@ /obj/item/gun/energy/laser/practice, /turf/open/floor/iron/dark, /area/security/range) -"aaT" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/cigarette_pack, -/obj/item/lighter/greyscale{ - pixel_x = 4; - pixel_y = 2 - }, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) "aaV" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 4 @@ -288,10 +279,6 @@ c_tag = "Security - Infirmary"; dir = 6 }, -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, /turf/open/floor/iron/white, /area/security/brig) "ace" = ( @@ -306,10 +293,6 @@ /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/security/office) "acf" = ( @@ -437,12 +420,6 @@ /area/security/range) "adB" = ( /obj/machinery/iv_drip, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/sign/departments/medbay/alt{ - pixel_x = 32 - }, /turf/open/floor/iron/white, /area/security/brig) "adC" = ( @@ -451,7 +428,6 @@ /obj/item/clothing/suit/bomb_suit/security, /obj/item/clothing/head/bomb_hood/security, /obj/item/clothing/head/bomb_hood/security, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/security/office) "adH" = ( @@ -482,17 +458,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"aej" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/obj/machinery/light/small/directional/east, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/starboard) +"aeq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet, +/area/service/library) "aer" = ( /obj/structure/tank_dispenser/oxygen, /turf/open/floor/iron/dark, @@ -534,9 +504,6 @@ /obj/item/reagent_containers/glass/bottle/multiver, /obj/item/reagent_containers/syringe, /obj/structure/table/glass, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, /turf/open/floor/iron/white, /area/security/brig) "afr" = ( @@ -547,9 +514,6 @@ "afu" = ( /obj/item/healthanalyzer, /obj/structure/table/glass, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, /turf/open/floor/iron/white, /area/security/brig) "afx" = ( @@ -574,9 +538,6 @@ /area/security/brig) "afz" = ( /obj/machinery/door/window, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, /turf/open/floor/iron/white, /area/security/brig) "afB" = ( @@ -584,24 +545,6 @@ dir = 2 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/blue/filled/line, -/turf/open/floor/iron/white, -/area/security/brig) -"afG" = ( -/obj/structure/window/reinforced, -/obj/structure/rack, -/obj/item/storage/firstaid/regular{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/firstaid/regular, -/obj/item/storage/firstaid/brute{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, /turf/open/floor/iron/white, /area/security/brig) "afK" = ( @@ -736,9 +679,6 @@ /obj/structure/bodycontainer/morgue{ dir = 8 }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, /turf/open/floor/iron/white, /area/security/brig) "aih" = ( @@ -779,9 +719,6 @@ pixel_y = 3 }, /obj/structure/table/glass, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, /turf/open/floor/iron/white, /area/security/brig) "ajn" = ( @@ -872,6 +809,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/machinery/light/small/directional/west, /obj/machinery/camera{ c_tag = "Security - Cell Two"; dir = 4 @@ -947,9 +885,6 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/small/directional/west{ - dir = 4 - }, /turf/open/floor/iron, /area/security/brig) "ale" = ( @@ -1079,7 +1014,7 @@ pixel_x = -24 }, /obj/effect/landmark/start/lawyer, -/turf/open/floor/carpet/black, +/turf/open/floor/wood, /area/service/lawoffice) "ami" = ( /obj/machinery/computer/prisoner/management{ @@ -1213,9 +1148,6 @@ }, /obj/structure/closet/secure_closet/security_medic, /obj/machinery/light/directional/east, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, /turf/open/floor/iron/white, /area/security/brig) "ane" = ( @@ -1567,15 +1499,6 @@ "apS" = ( /turf/open/floor/carpet, /area/security/detectives_office) -"apW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/public/glass{ - name = "Art Gallery" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/sepia, -/area/service/library) "aqc" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1646,7 +1569,6 @@ req_access_txt = "63" }, /obj/machinery/button/flasher{ - id = "brigentry"; pixel_x = -6; pixel_y = -3 }, @@ -1688,17 +1610,6 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/small/directional/west{ - dir = 4 - }, -/obj/machinery/door_timer{ - id = "solitary1"; - pixel_x = 32 - }, -/obj/machinery/door_timer{ - id = "solitary1"; - pixel_x = 32 - }, /turf/open/floor/iron, /area/security/brig) "arb" = ( @@ -1791,9 +1702,6 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/small/directional/west{ - dir = 4 - }, /turf/open/floor/iron, /area/security/brig) "asp" = ( @@ -2349,6 +2257,7 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "awX" = ( +/obj/machinery/flasher/directional/east, /obj/effect/turf_decal/tile/blue/darkblue{ dir = 4 }, @@ -2359,11 +2268,6 @@ c_tag = "Security - Entrance"; dir = 8 }, -/obj/machinery/flasher{ - id = "brigentry"; - pixel_x = 23; - pixel_y = -23 - }, /turf/open/floor/iron, /area/security/brig) "awZ" = ( @@ -2439,6 +2343,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/fore) +"axA" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) "axC" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2497,13 +2409,6 @@ /obj/item/trash/cheesie, /turf/open/floor/plating, /area/maintenance/fore) -"ayh" = ( -/obj/structure/closet/firecloset, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/stripes/corner, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "ayk" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -2552,11 +2457,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/machinery/flasher{ - id = "Cell 1"; - pixel_x = 23; - pixel_y = -23 - }, /turf/open/floor/iron, /area/security/brig) "ayx" = ( @@ -2771,6 +2671,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"aAv" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating/catwalk_floor, +/area/maintenance/starboard/fore) "aAw" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -3080,22 +2986,6 @@ "aFa" = ( /turf/open/floor/iron/white, /area/medical/storage) -"aFc" = ( -/obj/structure/table/wood, -/obj/item/paper{ - pixel_x = 8; - pixel_y = 7 - }, -/obj/item/pen{ - pixel_x = 9; - pixel_y = 7 - }, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/service/library) "aFe" = ( /obj/structure/chair/stool/directional/west, /obj/effect/landmark/start/assistant, @@ -3199,10 +3089,7 @@ /obj/item/flashlight/lamp/green{ pixel_y = 7 }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 5 - }, -/turf/open/floor/carpet/black, +/turf/open/floor/wood, /area/service/lawoffice) "aGg" = ( /obj/structure/reagent_dispensers/fueltank, @@ -3219,6 +3106,11 @@ /obj/machinery/bluespace_vendor/north, /turf/open/floor/iron, /area/hallway/primary/central) +"aGp" = ( +/obj/structure/sign/warning/docking, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "aGE" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -3327,6 +3219,9 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"aHJ" = ( +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "aHM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3418,12 +3313,6 @@ /obj/machinery/rnd/server/master, /turf/open/openspace/icemoon, /area/science/server) -"aIu" = ( -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/wood, -/area/service/library) "aIF" = ( /obj/structure/rack, /obj/structure/window/reinforced{ @@ -3879,6 +3768,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) +"aNa" = ( +/turf/closed/wall, +/area/hallway/secondary/exit/departure_lounge) "aNb" = ( /obj/machinery/holopad, /turf/open/floor/iron, @@ -3965,6 +3857,28 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/maintenance/department/medical) +"aOb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) +"aOc" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/reagent_dispensers/peppertank/directional/north, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "aOe" = ( /obj/item/beacon, /obj/machinery/camera{ @@ -4084,16 +3998,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"aOG" = ( -/obj/machinery/camera{ - c_tag = "Departure Lounge East"; - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "aOY" = ( /obj/structure/chair/comfy/beige{ dir = 1 @@ -4106,6 +4010,28 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/science/robotics/lab) +"aPq" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) +"aPs" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/item/restraints/handcuffs, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "aPt" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -4197,6 +4123,22 @@ /obj/structure/cable, /turf/open/floor/plating, /area/command/heads_quarters/hos) +"aQE" = ( +/obj/structure/chair, +/obj/structure/chair, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) +"aQF" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "aQG" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 @@ -4291,6 +4233,17 @@ "aRK" = ( /turf/open/floor/iron, /area/command/heads_quarters/ce) +"aRL" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/door/airlock/command/glass{ + name = "Emergency EVA Storage"; + red_alert_access = 1; + req_access_txt = "18"; + safety_mode = 1 + }, +/turf/open/floor/iron/textured, +/area/hallway/secondary/exit/departure_lounge) "aRY" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -4313,6 +4266,13 @@ "aSg" = ( /turf/open/floor/plating, /area/maintenance/port) +"aST" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "aSX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4321,12 +4281,57 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) +"aSZ" = ( +/obj/structure/rack, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/tank/internals/emergency_oxygen{ + pixel_y = 3 + }, +/obj/item/tank/internals/emergency_oxygen, +/obj/structure/sign/warning/coldtemp{ + pixel_x = -32 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/open/floor/iron/white, +/area/hallway/secondary/exit/departure_lounge) "aTh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) +"aTk" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) +"aTn" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) +"aTo" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Escape Airlock"; + safety_mode = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "aTq" = ( /obj/structure/cable, /obj/effect/landmark/start/security_sergeant, @@ -4346,18 +4351,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) -"aUa" = ( -/turf/open/floor/iron/dark/smooth_edge, -/area/service/chapel) -"aUi" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/door/window{ - dir = 1 - }, -/turf/open/floor/iron, -/area/security/brig) "aUn" = ( /obj/effect/turf_decal/siding/yellow/end{ dir = 8 @@ -4405,6 +4398,21 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/aft) +"aUL" = ( +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/sign/poster/random{ + pixel_x = -32 + }, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "aUM" = ( /obj/machinery/camera{ c_tag = "Arrivals Bay 2"; @@ -4503,6 +4511,12 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"aVX" = ( +/obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/east, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "aVZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4626,7 +4640,6 @@ dir = 4 }, /obj/machinery/airalarm/directional/north, -/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/security/brig) "aXX" = ( @@ -4718,6 +4731,22 @@ "aYV" = ( /turf/open/floor/iron, /area/hallway/primary/starboard) +"aZj" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Chapel" + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/exit/departure_lounge) +"aZk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "aZO" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -4754,6 +4783,14 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"bar" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "bax" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -4767,6 +4804,21 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) +"baE" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera{ + c_tag = "Departure Lounge West"; + dir = 5 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) "baF" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ @@ -4925,6 +4977,36 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"bcx" = ( +/obj/machinery/camera{ + c_tag = "Starboard Primary Hallway 5" + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/hallway/primary/starboard) +"bcz" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) +"bcA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) +"bcC" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "bcD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -5017,6 +5099,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) +"bdp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/random{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "bds" = ( /obj/machinery/camera{ c_tag = "Starboard Primary Hallway 4"; @@ -5050,6 +5140,20 @@ }, /turf/open/floor/iron, /area/cargo/office) +"bdz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) +"bdA" = ( +/obj/structure/table, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "bdC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5114,17 +5218,6 @@ /obj/item/clothing/under/color/rainbow, /turf/open/floor/plating, /area/maintenance/port) -"bdY" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "bea" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -5241,6 +5334,12 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors) +"beJ" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "beK" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -5478,6 +5577,31 @@ "bgc" = ( /turf/closed/wall/r_wall, /area/science/lab) +"bge" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/obj/structure/closet/crate/bin, +/obj/effect/spawner/random/trash/food_packaging, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) +"bgf" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/newscaster/directional/south, +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/exit/departure_lounge) +"bgg" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/exit/departure_lounge) "bgh" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/stripes/line{ @@ -6065,10 +6189,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"bji" = ( -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating, -/area/maintenance/port) "bjl" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -6265,15 +6385,6 @@ }, /turf/open/floor/iron/white, /area/science/research) -"bku" = ( -/obj/effect/landmark/start/hangover, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "bkw" = ( /obj/machinery/camera{ c_tag = "Starboard Primary Hallway 2" @@ -6371,6 +6482,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/central/secondary) +"ble" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/bed/pod, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/service/salon) "bli" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -7153,18 +7274,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/hallway/primary/central) -"bqC" = ( -/obj/structure/railing, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/service/chapel) "bqF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -7887,14 +7996,6 @@ }, /turf/open/floor/iron/white, /area/maintenance/department/medical/morgue) -"buE" = ( -/obj/machinery/light/directional/north, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/iron/dark, -/area/service/chapel) -"buF" = ( -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) "buG" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/blue{ @@ -8293,6 +8394,15 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors) +"bwp" = ( +/obj/structure/disposalpipe/sorting/mail{ + sortType = 12 + }, +/obj/structure/rack, +/obj/effect/spawner/random/clothing/gloves, +/obj/item/clothing/suit/toggle/labcoat, +/turf/open/floor/plating, +/area/maintenance/starboard) "bws" = ( /obj/machinery/computer/chef_order{ dir = 4 @@ -8552,21 +8662,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron/freezer, /area/commons/toilet) -"byb" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/item/stack/sheet/iron/twenty, -/obj/structure/table, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "byf" = ( /turf/closed/wall/r_wall, /area/science/server) @@ -8950,13 +9045,6 @@ }, /turf/open/floor/iron/dark, /area/science/genetics) -"bAT" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "bBg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/atmospheric_technician, @@ -9068,26 +9156,11 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"bBA" = ( -/obj/machinery/light/directional/north, -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "bBD" = ( /turf/open/floor/iron/white/side{ dir = 9 }, /area/science/research) -"bBJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "bBM" = ( /obj/structure/grille, /turf/open/floor/plating/asteroid/snow/icemoon, @@ -9982,12 +10055,8 @@ /turf/open/floor/iron/white, /area/medical/cryo) "bIl" = ( -/obj/machinery/door/airlock/external{ - name = "Security Snowmobiles"; - req_access_txt = "63" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "secsnowmobile" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, /turf/open/floor/iron/dark, /area/security/brig) @@ -10297,7 +10366,7 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/machinery/power/grounding_rod/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "bKr" = ( @@ -10909,24 +10978,11 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/ai_monitored/command/storage/eva) -"bPu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "bPF" = ( +/obj/machinery/door/window/eastleft{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/eastright{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, /turf/open/floor/iron/white, /area/security/brig) "bPI" = ( @@ -11024,7 +11080,13 @@ /turf/open/floor/iron/white, /area/science/genetics) "bQt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/door/airlock/external{ + name = "Security Snowmobiles"; + req_access_txt = "63" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "secsnowmobile" + }, /turf/open/floor/iron/dark, /area/security/brig) "bQD" = ( @@ -11335,8 +11397,8 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "bSL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 }, /turf/open/floor/iron/dark, /area/security/brig) @@ -12740,11 +12802,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"cfr" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "cfu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12769,7 +12826,7 @@ /obj/effect/turf_decal/tile/blue/darkblue{ dir = 8 }, -/obj/machinery/vending/cigarette, +/obj/item/kirbyplants/random, /turf/open/floor/iron, /area/hallway/primary/fore) "cfV" = ( @@ -12888,6 +12945,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/solars/port/aft) +"chV" = ( +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/hallway/primary/starboard) "cir" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12897,6 +12960,17 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"ciC" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/obj/effect/spawner/random/vending/snackvend, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "ciF" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, @@ -12951,13 +13025,6 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, /area/maintenance/starboard/aft) -"cjH" = ( -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/service/library) "cjI" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -13229,6 +13296,16 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"cpd" = ( +/obj/structure/railing, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/service/chapel) "cpt" = ( /obj/structure/closet/secure_closet/hydroponics, /obj/effect/turf_decal/siding/thinplating/dark, @@ -13555,6 +13632,11 @@ }, /turf/open/floor/iron/grimy, /area/ai_monitored/turret_protected/aisat_interior) +"ctR" = ( +/obj/structure/table, +/obj/effect/spawner/random/trash/food_packaging, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "ctS" = ( /obj/structure/cable, /turf/open/floor/iron/grimy, @@ -13908,14 +13990,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) -"cvD" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/service/chapel) "cvI" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -14072,14 +14146,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/science/storage) -"cxb" = ( -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/security/brig) "cxc" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -14126,6 +14192,17 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) +"cyh" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Security Escape Airlock"; + req_access_txt = "2"; + safety_mode = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "cyl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -14135,6 +14212,25 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) +"cyp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) +"cyr" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Cargo Escape Airlock"; + safety_mode = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "cyt" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -14192,11 +14288,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"cyN" = ( -/obj/item/kirbyplants/random, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "cyU" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -14277,12 +14368,6 @@ /area/maintenance/disposal) "cAN" = ( /obj/effect/landmark/start/security_medic, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, /turf/open/floor/iron/white, /area/security/brig) "cAQ" = ( @@ -14342,6 +14427,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) +"cBl" = ( +/obj/structure/chair, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "cBr" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/bot, @@ -14775,23 +14864,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/engineering/supermatter/room) -"cJR" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/computer/secure_data{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/obj/machinery/firealarm/directional/west, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "cKr" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 4 @@ -14908,12 +14980,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/medical/storage) -"cMi" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "cMn" = ( /obj/structure/grille, /turf/open/floor/plating{ @@ -14936,11 +15002,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"cNp" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/service/library) "cNr" = ( /obj/effect/turf_decal/trimline/blue/corner, /obj/effect/turf_decal/trimline/blue/corner, @@ -15104,20 +15165,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"cQI" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "Escape Airlock"; - safety_mode = 1 - }, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 32 - }, -/obj/machinery/navbeacon/wayfinding/dockesc, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "cQJ" = ( /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, @@ -15153,22 +15200,12 @@ /turf/open/floor/iron, /area/cargo/miningdock) "cSq" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/effect/turf_decal/trimline/darkblue/filled/line{ + dir = 6 + }, /obj/structure/cable, -/obj/structure/rack, -/obj/effect/turf_decal/tile/blue/darkblue, -/obj/effect/turf_decal/tile/blue/darkblue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/darkblue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/darkblue{ - dir = 4 - }, -/obj/item/storage/toolbox/electrical{ - pixel_y = 8 - }, -/obj/item/storage/toolbox/drone, /turf/open/floor/iron, /area/security/brig) "cSE" = ( @@ -15184,6 +15221,17 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/commons/storage/mining) +"cTi" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/machinery/light/small/directional/west, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/starboard) "cTE" = ( /obj/machinery/computer/shuttle/mining{ dir = 8 @@ -15224,16 +15272,6 @@ "cUa" = ( /turf/closed/wall/r_wall, /area/command/teleporter) -"cUf" = ( -/obj/structure/railing, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/service/chapel) "cUi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15316,15 +15354,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/service/hydroponics) -"cWi" = ( -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/wood, -/area/service/library) "cWz" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 @@ -15426,6 +15455,15 @@ }, /turf/closed/wall/r_wall, /area/maintenance/department/medical) +"cZY" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Holding Area"; + req_access_txt = "2" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "cZZ" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -15471,9 +15509,6 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/iron/freezer, /area/service/kitchen/coldroom) -"dbt" = ( -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) "dbu" = ( /obj/structure/table, /obj/item/folder/red{ @@ -15589,15 +15624,6 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"ddd" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) "ddj" = ( /turf/open/floor/iron, /area/engineering/break_room) @@ -15643,6 +15669,17 @@ }, /turf/open/floor/iron/cafeteria, /area/service/kitchen) +"deP" = ( +/obj/structure/mirror/directional/west, +/obj/structure/table/reinforced/rglass, +/obj/item/razor{ + pixel_x = -6 + }, +/obj/item/reagent_containers/spray/barbers_aid{ + pixel_x = 6 + }, +/turf/open/floor/iron, +/area/service/salon) "deT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15677,8 +15714,8 @@ /turf/open/floor/plating, /area/medical/medbay/central) "dfx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/light/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/security/office) "dfM" = ( @@ -15715,16 +15752,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/science/xenobiology) -"dgS" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Chapel Maintenance"; - req_one_access_txt = "12;22" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "dgW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/power/apc/auto_name/east, @@ -15749,6 +15776,13 @@ /obj/item/flashlight, /turf/open/floor/iron/dark, /area/ai_monitored/command/storage/eva) +"dhG" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Chapel" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/sepia, +/area/service/library) "dhK" = ( /obj/structure/chair/office/light{ dir = 4 @@ -15761,6 +15795,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/engineering/main) +"dif" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "dis" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15836,6 +15879,17 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"djZ" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/table/reinforced/rglass, +/obj/structure/window, +/obj/item/hairbrush, +/obj/item/lipstick/random, +/turf/open/floor/iron, +/area/service/salon) "dka" = ( /obj/structure/girder, /obj/structure/grille, @@ -16009,19 +16063,8 @@ /turf/open/floor/plating, /area/construction) "drh" = ( -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = 5 - }, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_x = 10 - }, -/obj/structure/rack, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/security/brig) +/turf/open/floor/plating/snowed, +/area/icemoon/surface/outdoors) "drO" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, @@ -16187,16 +16230,19 @@ "dyq" = ( /turf/closed/wall, /area/cargo/office) +"dyz" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/turf/open/floor/wood, +/area/service/library) "dyC" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/hallway/primary/central) "dyG" = ( +/obj/effect/turf_decal/trimline/darkblue/filled/corner, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 4 - }, /turf/open/floor/iron, /area/security/brig) "dyK" = ( @@ -16239,31 +16285,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/engineering/storage/tech) -"dzS" = ( -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/effect/spawner/random/structure/table_fancy, -/turf/open/floor/wood, -/area/service/library) "dAn" = ( +/obj/machinery/door/airlock/security{ + id_tag = "solitary2"; + name = "Solitary Cell 2"; + req_access_txt = "2" + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/brigdoor/security/cell{ - dir = 4; - id = "soli 2"; - name = "Solitary Cell 2" - }, -/obj/effect/turf_decal/trimline/darkblue/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/blue, /area/security/brig) "dAw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16292,12 +16322,6 @@ }, /turf/open/floor/iron, /area/engineering/main) -"dAY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "dBu" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -16382,6 +16406,7 @@ /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 1 }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 @@ -16460,17 +16485,20 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/iron/freezer, /area/commons/toilet/locker) -"dFI" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/wood{ +"dFz" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/turf/open/floor/wood, -/area/service/library) +/obj/machinery/door/airlock/external{ + name = "Escape Airlock"; + safety_mode = 1 + }, +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 32 + }, +/obj/machinery/navbeacon/wayfinding/dockesc, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "dFW" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -16507,6 +16535,14 @@ "dGF" = ( /turf/closed/wall/r_wall, /area/science/mixing/chamber) +"dGK" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/service/library) "dHg" = ( /obj/structure/closet/crate, /obj/effect/turf_decal/siding/blue{ @@ -16654,14 +16690,10 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/plating, /area/engineering/atmos) -"dLo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, +"dLk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/hallway/secondary/exit/departure_lounge) "dLV" = ( /obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron, @@ -16681,13 +16713,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) -"dMZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood, -/area/service/library) "dNm" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -16746,19 +16771,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/hallway/primary/aft) -"dOm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Escape" - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "dOw" = ( /obj/machinery/bluespace_vendor/south, /turf/open/floor/iron, @@ -16943,11 +16955,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/service/hydroponics/garden) -"dVP" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/service/library) "dVS" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -16959,10 +16966,6 @@ icon_state = "platingdmg1" }, /area/maintenance/aft) -"dWq" = ( -/obj/machinery/light/small/directional/west, -/turf/open/openspace, -/area/service/chapel) "dWG" = ( /obj/structure/window/reinforced{ dir = 1 @@ -16979,6 +16982,12 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/command/bridge) +"dWU" = ( +/obj/structure/chair/stool/directional/east{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "dXf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/west, @@ -17089,20 +17098,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/engineering/storage/tech) -"dZf" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/service/library) -"dZu" = ( -/obj/item/radio/intercom/directional/east, -/obj/machinery/light/directional/east, -/obj/machinery/camera{ - c_tag = "Library Art Gallery"; - dir = 8 - }, -/turf/open/floor/wood, -/area/service/library) "dZz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed, @@ -17110,11 +17105,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/machinery/flasher{ - id = "Cell 2"; - pixel_x = 23; - pixel_y = -23 - }, /turf/open/floor/iron, /area/security/brig) "dZC" = ( @@ -17347,19 +17337,6 @@ }, /turf/open/floor/iron, /area/cargo/office) -"egV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sign/poster/random{ - pixel_y = 32 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) -"ehf" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/table, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "ehm" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ dir = 8 @@ -17463,11 +17440,11 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) "ekj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/structure/sign/warning/securearea{ + pixel_x = 32 }, -/turf/open/floor/iron/dark, -/area/security/brig) +/turf/open/floor/plating/snowed, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "eko" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/darkblue/filled/line{ @@ -17483,17 +17460,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/brigofficer) +"ekv" = ( +/obj/structure/sign/poster/random{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/service/chapel) "ekI" = ( /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/fore) -"ekK" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "ekN" = ( /mob/living/carbon/human/species/monkey, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -17520,12 +17496,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"elQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/security/brig) "emg" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -17649,16 +17619,13 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"eqc" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood, -/area/service/library) "eqC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/machinery/light/small/directional/west, /obj/machinery/camera{ c_tag = "Security - Cell Three"; dir = 4 @@ -17706,15 +17673,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/smooth_half, /area/maintenance/department/medical) -"esw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "esy" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -17823,6 +17781,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/hallway/primary/starboard) +"evE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/service/library) "evV" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/cafeteria, @@ -17854,15 +17819,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/freezer, /area/commons/toilet/locker) -"ewW" = ( -/obj/structure/railing{ - dir = 8 +"ewX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/public/glass{ + name = "Art Gallery" }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) +/obj/machinery/door/firedoor, +/turf/open/floor/iron/sepia, +/area/service/library) "exe" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -18000,15 +17965,6 @@ }, /turf/open/floor/iron/cafeteria, /area/service/kitchen) -"eBr" = ( -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/wood, -/area/service/library) "eBB" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -18022,6 +17978,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/command/bridge) +"eCs" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/machinery/navbeacon/wayfinding/library, +/turf/open/floor/wood, +/area/service/library) "eCu" = ( /obj/machinery/power/apc/auto_name/south, /obj/structure/cable, @@ -18048,15 +18013,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/engineering/atmos) -"eCM" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "eDN" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 5 @@ -18133,6 +18089,14 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/service/hydroponics) +"eHf" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "eHi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -18152,6 +18116,12 @@ /obj/machinery/power/apc/auto_name/south, /turf/open/floor/iron, /area/service/hydroponics/garden) +"eIf" = ( +/obj/machinery/navbeacon/wayfinding/chapel, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/hallway/primary/starboard) "eIl" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -18212,6 +18182,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) +"eJv" = ( +/obj/structure/sign/barber{ + pixel_x = -13 + }, +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "eJz" = ( /turf/closed/wall/r_wall, /area/security/warden) @@ -18244,11 +18223,6 @@ "eKT" = ( /turf/open/openspace/icemoon, /area/maintenance/starboard/fore) -"eLF" = ( -/obj/machinery/light/directional/east, -/obj/machinery/newscaster/directional/east, -/turf/open/floor/wood, -/area/service/library) "eLP" = ( /obj/machinery/light_switch/directional/north, /turf/open/floor/circuit, @@ -18276,6 +18250,22 @@ }, /turf/open/floor/iron, /area/engineering/main) +"eMg" = ( +/obj/structure/table/wood, +/obj/item/paper{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 9; + pixel_y = 7 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/service/library) "eMm" = ( /obj/machinery/camera{ c_tag = "Arrivals Escape Pod 1"; @@ -18549,10 +18539,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"eWo" = ( -/obj/structure/chair, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) "eWw" = ( /obj/structure/table/reinforced, /obj/item/storage/secure/briefcase, @@ -18588,9 +18574,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/engineering/supermatter/room) -"eXU" = ( -/turf/open/openspace, -/area/service/chapel) "eYk" = ( /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, @@ -18728,6 +18711,10 @@ "fbm" = ( /turf/open/floor/iron, /area/command/heads_quarters/rd) +"fbs" = ( +/obj/machinery/light/small/directional/east, +/turf/open/openspace, +/area/service/chapel) "fbB" = ( /obj/machinery/conveyor{ dir = 4; @@ -18761,20 +18748,6 @@ "fcF" = ( /turf/closed/wall, /area/engineering/atmos/project) -"fcG" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/service/chapel) "fcH" = ( /obj/machinery/vending/wardrobe/chef_wardrobe, /obj/structure/sign/poster/random{ @@ -18782,6 +18755,15 @@ }, /turf/open/floor/iron/cafeteria, /area/service/kitchen) +"fcM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "fdf" = ( /obj/machinery/power/apc/auto_name/west, /obj/machinery/camera{ @@ -18952,6 +18934,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/medical/surgery) +"fgA" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/service/library) "fgB" = ( /obj/machinery/airalarm/directional/east, /obj/structure/table, @@ -18979,20 +18966,11 @@ /obj/effect/landmark/blobstart, /turf/open/floor/grass, /area/maintenance/starboard/aft) -"fhb" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plating/catwalk_floor, -/area/maintenance/starboard/fore) "fhn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 4 - }, /turf/open/floor/iron, /area/security/brig) "fhF" = ( @@ -19013,6 +18991,16 @@ "fhM" = ( /turf/closed/wall, /area/security/processing) +"fhV" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/barber_chair{ + dir = 8 + }, +/turf/open/floor/iron, +/area/service/salon) "fif" = ( /obj/structure/cable, /obj/structure/chair{ @@ -19264,8 +19252,7 @@ "fro" = ( /obj/machinery/door/firedoor, /obj/machinery/door_timer{ - id = "soli 2"; - name = "Solitary 2 Timer"; + id = "solitary2"; pixel_x = 32 }, /obj/effect/turf_decal/trimline/darkblue/filled/line{ @@ -19275,14 +19262,15 @@ /turf/open/floor/iron, /area/security/brig) "frw" = ( +/obj/effect/turf_decal/trimline/darkblue/filled/line{ + dir = 1 + }, /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/darkblue/filled/corner{ - dir = 1 - }, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/security/brig) "frz" = ( @@ -19341,7 +19329,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/firealarm/directional/north, /turf/open/floor/iron/dark, /area/security/brig) "ftr" = ( @@ -19432,6 +19419,7 @@ "fvz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/hallway/primary/central) "fwq" = ( @@ -19459,18 +19447,23 @@ /turf/open/floor/plating, /area/maintenance/department/medical) "fwI" = ( +/obj/machinery/door/airlock/security{ + id_tag = "solitary1"; + name = "Solitary Cell 1"; + req_access_txt = "2" + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/brigdoor/security/cell{ - dir = 4; - id = "soli 1"; - name = "Solitary Cell 1" - }, -/obj/effect/turf_decal/trimline/darkblue/filled/warning{ +/turf/open/floor/iron/dark/blue, +/area/security/brig) +"fwJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood{ dir = 8 }, -/turf/open/floor/iron, -/area/security/brig) +/turf/open/floor/wood, +/area/service/library) "fwV" = ( /obj/structure/table/glass, /obj/item/cultivator, @@ -19566,18 +19559,6 @@ dir = 1 }, /area/hallway/secondary/entry) -"fyW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "fzn" = ( /obj/structure/chair/stool/directional/east, /turf/open/floor/iron, @@ -19587,18 +19568,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/closed/wall/r_wall, /area/engineering/supermatter) -"fzM" = ( -/obj/structure/railing{ - dir = 5 +"fzC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "fzZ" = ( /turf/closed/wall, /area/command/teleporter) @@ -19642,11 +19617,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/medical/medbay/central) -"fBq" = ( -/obj/effect/landmark/start/hangover, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/wood, -/area/service/library) "fBB" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = -32 @@ -19667,8 +19637,22 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"fCj" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 + }, +/turf/open/floor/iron, +/area/service/salon) "fCr" = ( /obj/structure/railing/corner, +/obj/effect/turf_decal/trimline/darkblue/filled/line{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -19695,7 +19679,11 @@ /turf/open/floor/iron, /area/service/hydroponics) "fCY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ +/obj/machinery/door/airlock/external{ + name = "Security External Airlock"; + req_access_txt = "63" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /turf/open/floor/iron/dark, @@ -19731,6 +19719,15 @@ /obj/structure/closet/secure_closet/psychology, /turf/open/floor/iron/white, /area/medical/psychology) +"fDT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/event_spawn, +/obj/item/beacon, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "fEk" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19747,14 +19744,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/hallway/secondary/service) -"fFu" = ( -/obj/machinery/computer/pod/old/mass_driver_controller/chapelgun{ - pixel_x = 24 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 1 - }, -/area/service/chapel) "fFw" = ( /obj/machinery/door/airlock{ name = "Hydroponics Backroom"; @@ -19788,13 +19777,6 @@ }, /turf/open/floor/engine, /area/engineering/supermatter/room) -"fGF" = ( -/obj/machinery/light/small/directional/east, -/obj/structure/sign/poster/random{ - pixel_x = 32 - }, -/turf/open/floor/wood, -/area/service/library) "fGH" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -19868,6 +19850,14 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/command/nuke_storage) +"fIS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "fIU" = ( /obj/machinery/monkey_recycler, /obj/structure/cable, @@ -19980,15 +19970,7 @@ /turf/open/floor/iron/white, /area/science/lab) "fMj" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/blue/darkblue, -/obj/effect/turf_decal/tile/blue/darkblue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/darkblue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/darkblue{ +/obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 4 }, /turf/open/floor/iron, @@ -20138,12 +20120,6 @@ }, /turf/open/floor/plating, /area/cargo/sorting) -"fQP" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) "fQU" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20357,6 +20333,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/medical/medbay/aft) +"fUp" = ( +/obj/structure/sign/painting/library{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/service/library) "fUJ" = ( /obj/machinery/light/directional/north, /obj/structure/sign/warning/electricshock{ @@ -20428,20 +20411,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"fVM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/bed, -/obj/item/bedsheet, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/flasher{ - id = "Cell 3"; - pixel_x = 23; - pixel_y = -23 - }, -/turf/open/floor/iron, -/area/security/brig) "fWc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20608,11 +20577,6 @@ /obj/item/trash/semki, /turf/open/floor/iron, /area/maintenance/port/fore) -"gaR" = ( -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, -/area/service/chapel) "gaT" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -20722,6 +20686,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"geI" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port) "geQ" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -20854,6 +20825,15 @@ /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall, /area/engineering/main) +"gjt" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/wood, +/area/service/library) "gjy" = ( /obj/structure/table, /obj/machinery/light/directional/east, @@ -21092,26 +21072,8 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/directional/east, -/obj/machinery/flasher/directional/north{ - id = "soli 3" - }, /turf/open/floor/iron/dark/blue, /area/security/brig) -"gpU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - id = "commissaryshutter"; - name = "Vacant Commissary Shutter" - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "gqr" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/structure/table, @@ -21124,6 +21086,15 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/security/office) +"gqL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/salon) "grh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21320,6 +21291,20 @@ }, /turf/open/floor/iron/large, /area/service/kitchen/diner) +"gvN" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Departure Lounge Holding Area"; + dir = 6 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "gvO" = ( /obj/structure/table/greyscale, /obj/effect/turf_decal/siding/white{ @@ -21345,11 +21330,6 @@ }, /turf/open/floor/plating/asteroid/snow/standard_air, /area/science/research) -"gws" = ( -/obj/effect/spawner/random/structure/crate_abandoned, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/smooth, -/area/maintenance/starboard/fore) "gxf" = ( /obj/structure/table, /obj/item/stamp, @@ -21362,11 +21342,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/command/heads_quarters/captain) -"gxs" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "gxu" = ( /obj/machinery/airalarm/directional/north, /obj/structure/rack, @@ -21442,6 +21417,10 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/command/nuke_storage) +"gzE" = ( +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/maintenance/starboard) "gzQ" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -21465,26 +21444,6 @@ icon_state = "platingdmg3" }, /area/maintenance/starboard/aft) -"gAs" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/engineering{ - name = "Utilities Room"; - req_one_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) -"gAR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/sepia, -/area/service/library) "gBj" = ( /obj/effect/spawner/random/trash/mess, /obj/machinery/light/small/built/directional/south, @@ -21499,6 +21458,17 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/commons/dorms) +"gBF" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/shoes/winterboots, +/turf/open/floor/iron/white, +/area/hallway/secondary/exit/departure_lounge) "gBO" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Stbd"; @@ -21534,18 +21504,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"gCS" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/service/chapel) "gDC" = ( /obj/machinery/firealarm/directional/south, /obj/structure/disposalpipe/segment{ @@ -21605,6 +21563,12 @@ icon_state = "platingdmg3" }, /area/maintenance/starboard/fore) +"gFs" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "gFv" = ( /obj/machinery/hydroponics/soil, /turf/open/floor/grass, @@ -21660,6 +21624,16 @@ "gGl" = ( /turf/closed/wall/r_wall, /area/command/meeting_room) +"gGr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "gGZ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ @@ -21716,19 +21690,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/science/storage) -"gJk" = ( -/obj/structure/chair/office, -/obj/machinery/camera{ - c_tag = "Library North" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, -/turf/open/floor/wood, -/area/service/library) "gJz" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{ dir = 8 @@ -21782,6 +21743,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/fore) +"gKT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/turf/open/floor/plating, +/area/maintenance/port) "gKX" = ( /obj/structure/chair/stool/directional/north, /obj/effect/landmark/start/janitor, @@ -21793,6 +21763,18 @@ }, /turf/open/floor/iron/dark, /area/science/research) +"gLh" = ( +/obj/structure/railing, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/service/chapel) "gLi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -21810,20 +21792,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, /turf/open/floor/iron/white, /area/science/mixing) -"gLy" = ( -/obj/vehicle/ridden/atv/snowmobile/snowcurity{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 1 - }, -/obj/item/key/security, -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 32 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/security/brig) "gLH" = ( /obj/machinery/door/airlock/external{ name = "External Access"; @@ -21834,15 +21802,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"gMb" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 +"gMe" = ( +/turf/open/floor/iron/dark/side{ + dir = 1 }, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/turf/open/floor/iron, /area/hallway/primary/starboard) "gMf" = ( /obj/machinery/light_switch/directional/east, @@ -21859,32 +21822,9 @@ }, /turf/open/floor/plating, /area/engineering/atmos) -"gMt" = ( -/obj/structure/noticeboard/directional/west, -/turf/open/floor/engine/cult, -/area/service/library) "gMv" = ( /turf/closed/mineral/random/snow, /area/icemoon/surface/outdoors) -"gMI" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/table, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "gMR" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/darkblue/filled/line{ @@ -21909,12 +21849,6 @@ icon_state = "panelscorched" }, /area/maintenance/starboard/aft) -"gNp" = ( -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors) "gNt" = ( /obj/structure/toilet{ dir = 4 @@ -22039,6 +21973,16 @@ }, /turf/open/floor/iron, /area/command/heads_quarters/rd) +"gQR" = ( +/obj/structure/chair/office, +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/service/library) "gRd" = ( /obj/effect/turf_decal/plaque{ icon_state = "L12" @@ -22047,6 +21991,12 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/hallway/primary/central) +"gRe" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "gRQ" = ( /obj/structure/bed/dogbed/runtime, /mob/living/simple_animal/pet/cat/runtime, @@ -22079,6 +22029,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria, /area/service/kitchen) +"gTb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "gTp" = ( /obj/machinery/power/apc/auto_name/west, /obj/structure/disposalpipe/segment, @@ -22106,14 +22064,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria, /area/command/heads_quarters/rd) -"gVI" = ( -/obj/effect/landmark/start/hangover, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "gVQ" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 1 @@ -22135,15 +22085,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/electrical) -"gWA" = ( -/obj/machinery/camera{ - c_tag = "Library South"; - dir = 8 - }, -/obj/structure/displaycase/trophy, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/wood/parquet, -/area/service/library) "gWQ" = ( /obj/structure/sign/poster/random{ pixel_x = -32 @@ -22262,6 +22203,16 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/security/brig) +"gZV" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Cargo Escape Airlock"; + safety_mode = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "gZY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -22276,13 +22227,6 @@ icon_state = "panelscorched" }, /area/maintenance/port/aft) -"hbE" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark, -/area/service/chapel) "hbM" = ( /obj/machinery/light/directional/south, /obj/machinery/rnd/production/techfab/department/security, @@ -22371,14 +22315,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/commons/locker) -"heD" = ( -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - 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, -/area/security/brig) "heF" = ( /turf/open/floor/iron/freezer, /area/service/kitchen/coldroom) @@ -22386,6 +22322,17 @@ /obj/structure/closet/secure_closet/cytology, /turf/open/floor/glass/reinforced, /area/science/xenobiology) +"heT" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/barber_chair{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/service/salon) "hfD" = ( /obj/machinery/light/directional/west, /obj/machinery/camera{ @@ -22422,23 +22369,6 @@ dir = 10 }, /area/science/research) -"hgp" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/button/door/directional/east{ - id = "commissaryshutter"; - name = "Commissary Shutter Control" - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "hgT" = ( /obj/effect/landmark/start/librarian, /obj/structure/chair/office, @@ -22507,9 +22437,6 @@ /obj/structure/table, /turf/open/floor/carpet, /area/cargo/qm) -"hki" = ( -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "hkE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/landmark/event_spawn, @@ -22673,16 +22600,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/hallway/primary/starboard) -"hqA" = ( -/obj/structure/chair/office, -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/service/library) "hqS" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -22769,10 +22686,6 @@ c_tag = "Security - East"; dir = 8 }, -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 2 - }, /turf/open/floor/iron, /area/security/brig) "hsa" = ( @@ -22845,24 +22758,6 @@ }, /turf/open/floor/engine/n2, /area/engineering/atmos) -"huA" = ( -/obj/structure/table, -/obj/machinery/firealarm/directional/north, -/obj/item/stack/sheet/iron/five, -/obj/item/circuitboard/machine/paystand, -/obj/item/stack/cable_coil/five, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "huD" = ( /obj/structure/railing/corner{ dir = 8 @@ -22899,6 +22794,10 @@ /obj/machinery/bookbinder, /turf/open/floor/wood, /area/service/library) +"hwg" = ( +/obj/structure/noticeboard/directional/west, +/turf/open/floor/engine/cult, +/area/service/library) "hwl" = ( /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/tile/blue, @@ -22984,6 +22883,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"hAe" = ( +/obj/machinery/computer/pod/old/mass_driver_controller/chapelgun{ + pixel_x = 24 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, +/area/service/chapel) "hAl" = ( /turf/closed/wall, /area/service/chapel) @@ -23028,6 +22935,11 @@ /obj/item/coin/silver, /turf/open/floor/iron, /area/commons/dorms) +"hBI" = ( +/obj/structure/table, +/obj/item/implant/radio, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "hBT" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -23114,6 +23026,17 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/maintenance/port/fore) +"hDz" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/service/library) "hDA" = ( /obj/structure/industrial_lift, /obj/structure/railing{ @@ -23157,21 +23080,6 @@ /obj/effect/landmark/start/cook, /turf/open/floor/iron/cafeteria, /area/service/kitchen) -"hEw" = ( -/obj/effect/spawner/random/entertainment/arcade{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/sign/poster/random{ - pixel_x = -32 - }, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) "hFn" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped{ dir = 4 @@ -23233,6 +23141,18 @@ }, /turf/open/floor/plating, /area/cargo/miningdock) +"hGA" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "hGN" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating/snowed/icemoon, @@ -23380,14 +23300,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/port/aft) -"hLq" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/iron/chapel{ - dir = 8 - }, -/area/service/chapel) "hLN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/chair{ @@ -23445,21 +23357,12 @@ }, /turf/open/floor/wood/parquet, /area/service/bar/atrium) -"hOP" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 +"hOR" = ( +/obj/structure/chair/pew/left{ + dir = 1 }, -/obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2"; - safety_mode = 1 - }, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) -"hOQ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "hPk" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -23475,10 +23378,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/command/bridge) -"hPp" = ( -/obj/machinery/airalarm/directional/west, -/turf/open/floor/wood, -/area/service/library) "hPX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23505,13 +23404,6 @@ /obj/structure/chair/sofa/left, /turf/open/floor/carpet/blue, /area/medical/psychology) -"hQZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/darkblue/filled/warning{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/brig) "hRf" = ( /obj/structure/ladder, /obj/machinery/light/small/directional/east, @@ -23577,12 +23469,10 @@ "hSM" = ( /turf/closed/wall/r_wall, /area/command/heads_quarters/ce) -"hTp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +"hTm" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/service/salon) "hTC" = ( /obj/machinery/portable_atmospherics/canister, /obj/structure/extinguisher_cabinet/directional/east, @@ -23594,6 +23484,16 @@ "hTM" = ( /turf/closed/wall, /area/commons/dorms) +"hTR" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/exit/departure_lounge) "hTU" = ( /turf/closed/wall/r_wall, /area/medical/cryo) @@ -23650,6 +23550,14 @@ }, /turf/open/floor/iron, /area/science/mixing) +"hVx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "hVE" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/engine, @@ -23696,19 +23604,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"hXc" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/spawner/random/entertainment/arcade{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) "hXf" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -23816,12 +23711,6 @@ "iaJ" = ( /turf/closed/wall/r_wall, /area/maintenance/starboard) -"iaN" = ( -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/starboard) "iaU" = ( /obj/machinery/camera{ c_tag = "Tech Storage" @@ -24061,16 +23950,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/engineering/main) -"ifA" = ( -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 8 - }, -/obj/vehicle/ridden/atv/snowmobile/snowcurity{ - dir = 4 - }, -/obj/item/key/security, -/turf/open/floor/iron/dark, -/area/security/brig) "ifB" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/effect/spawner/structure/window/reinforced/plasma, @@ -24112,6 +23991,18 @@ /obj/item/clothing/suit/hooded/wintercoat, /turf/open/floor/iron, /area/commons/storage/mining) +"ihf" = ( +/obj/structure/mirror/directional/west, +/obj/structure/table/reinforced/rglass, +/obj/item/hairbrush/comb{ + pixel_y = 10 + }, +/obj/item/reagent_containers/dropper, +/obj/machinery/dryer{ + pixel_y = 14 + }, +/turf/open/floor/iron, +/area/service/salon) "ihs" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -24121,12 +24012,10 @@ /obj/machinery/vending/tool, /turf/open/floor/iron, /area/engineering/break_room) -"ihH" = ( -/obj/item/wrench, -/obj/item/screwdriver, -/obj/structure/rack, -/turf/open/floor/plating, -/area/commons/vacant_room/commissary) +"ihB" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "ihM" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 9 @@ -24146,6 +24035,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/science/storage) +"iiS" = ( +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark, +/area/service/chapel) "ijO" = ( /obj/structure/railing{ dir = 4 @@ -24162,25 +24055,16 @@ }, /turf/open/floor/iron/checker, /area/engineering/break_room) -"ikn" = ( -/obj/structure/rack, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/shovel, -/obj/item/flashlight, -/obj/item/flashlight, -/obj/machinery/camera{ - c_tag = "Departure Lounge Emergency EVA"; - dir = 6 - }, -/obj/item/radio/off, -/turf/open/floor/iron/white, -/area/hallway/secondary/exit/departure_lounge) "ikr" = ( /obj/structure/table, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/smooth, /area/maintenance/starboard/fore) +"ikt" = ( +/obj/effect/spawner/random/structure/crate_abandoned, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/smooth, +/area/maintenance/starboard/fore) "ikw" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -24190,6 +24074,11 @@ /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/medical/medbay/central) +"ikx" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/service/library) "ikC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/button/door/directional/north{ @@ -24199,21 +24088,6 @@ }, /turf/open/floor/iron/cafeteria, /area/service/kitchen) -"ikD" = ( -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/effect/spawner/random/structure/table_fancy, -/turf/open/floor/wood, -/area/service/library) "ila" = ( /obj/structure/table, /obj/item/ai_module/reset, @@ -24277,6 +24151,12 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron/white, /area/science/genetics) +"inF" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/stripes/line, +/obj/effect/landmark/start/hangover/closet, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "inO" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 @@ -24410,15 +24290,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white, /area/medical/medbay) -"irh" = ( -/obj/structure/sign/painting/library{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/wood, -/area/service/library) "iri" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 4 @@ -24454,6 +24325,15 @@ }, /turf/open/floor/iron, /area/cargo/storage) +"isp" = ( +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/wood, +/area/service/library) "isx" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -24596,6 +24476,23 @@ }, /turf/open/floor/iron, /area/science/mixing) +"iwz" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/computer/secure_data{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/firealarm/directional/west, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "iwH" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -24650,6 +24547,11 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/aft) +"iyI" = ( +/obj/machinery/light/directional/east, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/wood, +/area/service/library) "izd" = ( /obj/item/assembly/signaler{ pixel_y = 8 @@ -24811,6 +24713,19 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/white, /area/science/lab) +"iET" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/spawner/random/entertainment/arcade{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "iEU" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, @@ -24913,9 +24828,8 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) -"iHy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, +"iHD" = ( +/obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "iHG" = ( @@ -24946,6 +24860,17 @@ /obj/effect/turf_decal/tile/blue/darkblue, /turf/open/floor/iron, /area/hallway/primary/fore) +"iIO" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/service/chapel) "iIT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -24963,14 +24888,6 @@ }, /turf/open/floor/plating, /area/cargo/storage) -"iJf" = ( -/obj/effect/landmark/start/assistant, -/obj/structure/chair/pew{ - dir = 1 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) "iJh" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -25099,6 +25016,12 @@ }, /turf/open/floor/iron/dark, /area/commons/fitness) +"iMW" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/service/library) "iNC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25252,6 +25175,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/science/mixing) +"iTm" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "iTR" = ( /obj/machinery/camera{ c_tag = "Gateway"; @@ -25265,47 +25197,12 @@ /obj/item/paper/pamphlet/gateway, /turf/open/floor/iron, /area/command/gateway) -"iUh" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/table, -/obj/item/storage/toolbox/emergency, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/reagent_dispensers/peppertank/directional/north, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "iUo" = ( /obj/structure/table/wood, /obj/item/camera_film, /obj/item/camera_film, /turf/open/floor/wood, /area/service/library) -"iUM" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/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/commons/vacant_room/commissary) "iUO" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25319,6 +25216,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/science/mixing) +"iVe" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "iVm" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -25390,10 +25293,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron/checker, /area/engineering/break_room) -"iWJ" = ( -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "iWV" = ( /turf/closed/wall, /area/command/heads_quarters/hop) @@ -25456,12 +25355,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/science/mixing) -"iZE" = ( -/obj/machinery/light/directional/east, -/obj/item/radio/intercom/directional/east, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "iZI" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, @@ -25488,6 +25381,10 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/iron, /area/maintenance/starboard/fore) +"jbu" = ( +/obj/machinery/light/small/directional/west, +/turf/open/openspace, +/area/service/chapel) "jbJ" = ( /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Maintenance"; @@ -25515,6 +25412,11 @@ }, /turf/open/floor/iron, /area/science/xenobiology) +"jcX" = ( +/obj/machinery/light/directional/north, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark, +/area/service/chapel) "jdu" = ( /obj/structure/table, /obj/item/reagent_containers/glass/beaker, @@ -25542,6 +25444,18 @@ /obj/effect/spawner/random/maintenance/four, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"jeg" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/table/reinforced/rglass, +/obj/item/reagent_containers/dropper/precision{ + pixel_x = -7 + }, +/obj/item/reagent_containers/spray/quantum_hair_dye{ + pixel_x = 6 + }, +/obj/item/lipstick/random, +/turf/open/floor/iron, +/area/service/salon) "jei" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet2"; @@ -25762,17 +25676,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/virology) -"jko" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) "jkC" = ( /obj/machinery/camera{ c_tag = "Atmospherics Waste Tank" @@ -25796,6 +25699,18 @@ }, /turf/open/floor/iron, /area/engineering/main) +"jlj" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "jly" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -25877,6 +25792,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/commons/cryopods) +"jmU" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/service/chapel) "jmY" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -25999,6 +25919,7 @@ /obj/effect/turf_decal/trimline/darkblue/filled/corner{ dir = 1 }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 9 @@ -26028,9 +25949,6 @@ /obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, /obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, /turf/open/floor/iron/white, /area/security/brig) "jsw" = ( @@ -26065,28 +25983,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"jsI" = ( -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) -"jsP" = ( -/obj/structure/sign/painting/library_private{ - pixel_y = 32 - }, -/obj/structure/table/wood, -/obj/item/clothing/under/suit/red, -/obj/item/candle{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/candle{ - pixel_x = 8; - pixel_y = 4 - }, -/turf/open/floor/engine/cult, -/area/service/library) "jtf" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -26124,6 +26020,14 @@ }, /turf/open/floor/iron/dark, /area/medical/medbay/central) +"jtu" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/service/chapel) "jtT" = ( /obj/structure/sign/warning/electricshock{ pixel_y = -32 @@ -26159,15 +26063,6 @@ }, /turf/open/floor/iron/white, /area/maintenance/port/fore) -"jvL" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = 32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating, -/area/service/chapel) "jvW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/open/floor/iron/dark, @@ -26190,6 +26085,10 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) +"jwB" = ( +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "jxx" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -26237,15 +26136,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) -"jym" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "jyF" = ( /obj/machinery/dna_scannernew, /turf/open/floor/iron/dark, @@ -26285,11 +26175,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"jBf" = ( -/obj/effect/landmark/start/hangover, -/obj/effect/landmark/event_spawn, -/turf/open/floor/carpet, -/area/service/library) "jBs" = ( /obj/machinery/door/window/eastright{ base_state = "left"; @@ -26301,6 +26186,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/commons/fitness) +"jBL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "jBY" = ( /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/dirt, @@ -26331,10 +26222,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/science/genetics) -"jCM" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall, -/area/commons/vacant_room/commissary) "jCV" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -26482,30 +26369,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/engineering/engine_smes) -"jFM" = ( -/obj/structure/table, -/obj/item/implant/radio, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) -"jFP" = ( -/obj/item/radio/intercom/directional/west, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/service/chapel) -"jFS" = ( -/obj/machinery/door/airlock{ - id_tag = "commissarydoor"; - name = "Commissary" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/commons/vacant_room/commissary) "jGf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -26519,14 +26382,6 @@ /obj/item/clothing/head/fedora, /turf/open/floor/iron/large, /area/service/kitchen/diner) -"jGR" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/light/small/directional/east, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/wood, -/area/service/library) "jGZ" = ( /obj/structure/table, /obj/item/flashlight/lamp{ @@ -26651,6 +26506,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/science/storage) +"jMs" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/barber, +/turf/open/floor/iron, +/area/service/salon) "jMW" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -26716,13 +26579,6 @@ }, /turf/open/floor/iron, /area/science/misc_lab) -"jOI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "jOQ" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 8 @@ -26884,11 +26740,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/command/teleporter) -"jTi" = ( -/obj/machinery/skill_station, -/obj/machinery/bounty_board/directional/north, -/turf/open/floor/wood, -/area/service/library) "jTp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -26910,13 +26761,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"jUa" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "jUs" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -26952,13 +26796,6 @@ }, /turf/open/floor/iron/dark/corner, /area/engineering/atmos) -"jUV" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port) "jUW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27193,6 +27030,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engineering/atmos/project) +"kaN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/service/library) "kaO" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ color = "#ff0000"; @@ -27207,15 +27052,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"kbd" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/service/chapel) "kbh" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -27273,6 +27109,10 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"kcN" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "kcR" = ( /obj/structure/noticeboard/directional/east, /turf/open/floor/wood, @@ -27345,6 +27185,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) +"keP" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/asteroid/snow/standard_air, +/area/hallway/secondary/exit/departure_lounge) "keQ" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall, @@ -27371,6 +27215,15 @@ }, /turf/open/floor/iron, /area/cargo/storage) +"kgg" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/light/directional/east, +/obj/machinery/camera{ + c_tag = "Library Art Gallery"; + dir = 8 + }, +/turf/open/floor/wood, +/area/service/library) "kgj" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/tile/neutral{ @@ -27481,6 +27334,10 @@ "kiC" = ( /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) +"kiP" = ( +/obj/machinery/newscaster/directional/west, +/turf/open/floor/wood, +/area/service/library) "kjD" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/brown{ @@ -27522,6 +27379,13 @@ /obj/item/trash/waffles, /turf/open/floor/plating, /area/maintenance/port/aft) +"kkQ" = ( +/obj/structure/railing/corner, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/service/chapel) "klb" = ( /obj/machinery/door/window/brigdoor/security/cell/northright{ req_access_txt = "63" @@ -27644,6 +27508,13 @@ }, /turf/open/floor/iron/dark/blue, /area/security/brig) +"kmP" = ( +/obj/structure/filingcabinet, +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/service/library) "kmT" = ( /obj/structure/railing{ dir = 8 @@ -27692,9 +27563,6 @@ }, /turf/open/floor/iron/white, /area/medical/cryo) -"koL" = ( -/turf/closed/wall/ice, -/area/icemoon/surface/outdoors) "koY" = ( /obj/machinery/light/directional/west, /obj/structure/cable, @@ -27748,6 +27616,21 @@ /obj/item/shovel/spade, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"kqw" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/item/stack/sheet/iron/twenty, +/obj/structure/table, +/obj/item/stack/sheet/glass{ + amount = 20; + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "kqF" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -27795,33 +27678,21 @@ }, /turf/open/floor/iron, /area/engineering/main) -"kui" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/wood, -/area/service/library) "kul" = ( -/obj/machinery/light/directional/east, -/obj/structure/table, -/obj/machinery/recharger, -/obj/effect/turf_decal/tile/blue/darkblue, -/obj/effect/turf_decal/tile/blue/darkblue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/darkblue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/darkblue{ +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 4 }, +/obj/machinery/light/directional/east, /turf/open/floor/iron, /area/security/brig) +"kut" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "kuy" = ( /obj/structure/table, /obj/item/electronics/apc, @@ -27855,6 +27726,12 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"kvl" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/icemoon/surface/outdoors) "kvq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -27875,6 +27752,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/cargo/qm) +"kvK" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/service/library) "kwd" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/mug/coco{ @@ -27978,12 +27862,12 @@ }, /turf/open/floor/iron/white, /area/science/genetics) -"kxN" = ( -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 1 +"kyl" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 4 }, /turf/open/floor/iron/dark, -/area/security/brig) +/area/hallway/primary/central) "kyo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -28122,6 +28006,7 @@ dir = 4 }, /obj/effect/landmark/event_spawn, +/obj/machinery/light/small/directional/west, /obj/machinery/camera{ c_tag = "Security - Cell One"; dir = 4 @@ -28171,15 +28056,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/security/brig) -"kEz" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) "kEF" = ( /obj/structure/table, /obj/item/radio/off, @@ -28407,23 +28283,6 @@ }, /turf/open/floor/wood, /area/command/meeting_room) -"kKi" = ( -/obj/structure/rack, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_y = 3 - }, -/obj/item/tank/internals/emergency_oxygen, -/obj/structure/sign/warning/coldtemp{ - pixel_x = -32 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/iron/white, -/area/hallway/secondary/exit/departure_lounge) "kKS" = ( /obj/effect/turf_decal/tile/blue/darkblue{ dir = 1 @@ -28483,26 +28342,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/science/mixing) -"kMq" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/power/apc/auto_name/south, -/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/commons/vacant_room/commissary) "kMK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28522,6 +28361,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/security/brig) +"kNl" = ( +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole, +/turf/open/floor/wood, +/area/service/library) "kNx" = ( /obj/machinery/smartfridge, /turf/closed/wall, @@ -28551,23 +28395,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/engineering/main) -"kPi" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) -"kPn" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/obj/effect/spawner/random/vending/snackvend, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +"kOy" = ( +/obj/machinery/status_display/evac/directional/east, +/turf/open/openspace, +/area/service/chapel) "kPF" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -28914,11 +28745,20 @@ }, /turf/open/floor/engine, /area/engineering/supermatter/room) -"lcY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +"lcU" = ( +/obj/effect/landmark/start/hangover, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/wood, +/area/service/library) +"ldf" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/service/chapel) "ldg" = ( /obj/structure/table/glass, /obj/item/stock_parts/manipulator, @@ -29046,6 +28886,14 @@ }, /turf/open/floor/iron/smooth, /area/maintenance/starboard/fore) +"lfw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/service/chapel) "lfM" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -29064,33 +28912,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/security/brig) -"lgA" = ( -/obj/machinery/status_display/evac/directional/west, -/turf/open/openspace, -/area/service/chapel) "lhk" = ( /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/hallway/primary/central) -"lhr" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/button/door/directional/east{ - id = "commissarydoor"; - name = "Commissary Door Lock"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "lhu" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -29175,6 +29000,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/command/gateway) +"ljT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) +"lkg" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Art Gallery" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/sepia, +/area/service/library) "lkw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -29223,6 +29059,13 @@ }, /turf/open/floor/iron, /area/engineering/atmos/project) +"lmp" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood, +/area/service/library) "lmt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29353,6 +29196,17 @@ }, /turf/open/floor/iron/freezer, /area/commons/toilet/locker) +"lqE" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/service/chapel) "lqO" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/light/directional/south, @@ -29413,16 +29267,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/engineering/main) -"lsr" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Chapel" - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/white/corner, -/area/hallway/secondary/exit/departure_lounge) "lsu" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/iron, @@ -29561,6 +29405,9 @@ }, /turf/open/floor/iron, /area/command/heads_quarters/hop) +"lwl" = ( +/turf/closed/wall/r_wall, +/area/hallway/secondary/exit/departure_lounge) "lwt" = ( /obj/item/kirbyplants{ icon_state = "plant-10" @@ -29581,6 +29428,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/commons/toilet) +"lxb" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Escape" + }, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/exit/departure_lounge) "lxr" = ( /obj/structure/table, /obj/item/assembly/prox_sensor{ @@ -29718,6 +29575,7 @@ /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 8 }, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -29750,6 +29608,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) +"lzK" = ( +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood, +/area/service/library) "lAg" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -29764,9 +29630,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"lAv" = ( -/turf/open/floor/carpet/green, -/area/service/library) "lAy" = ( /obj/machinery/door/firedoor, /obj/machinery/status_display/evac/directional/east, @@ -29861,12 +29724,6 @@ }, /turf/open/floor/plating, /area/construction/mining/aux_base) -"lCC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "lCG" = ( /obj/machinery/conveyor{ dir = 4; @@ -29945,6 +29802,12 @@ }, /turf/open/floor/plating, /area/cargo/storage) +"lDR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "lDW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -30010,20 +29873,10 @@ }, /turf/open/floor/iron, /area/cargo/sorting) -"lGa" = ( -/obj/structure/displaycase/trophy, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/wood/parquet, -/area/service/library) "lGj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/plating/snowed/icemoon, /area/engineering/supermatter/room) -"lGs" = ( -/obj/structure/table, -/obj/effect/spawner/random/trash/food_packaging, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) "lHi" = ( /obj/structure/cable, /obj/structure/railing, @@ -30034,11 +29887,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"lHp" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "lIn" = ( /obj/machinery/door/airlock{ id_tag = "Dorm4"; @@ -30084,10 +29932,7 @@ /obj/item/folder/blue, /obj/item/folder/red, /obj/item/folder/yellow, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/carpet/black, +/turf/open/floor/wood, /area/service/lawoffice) "lJZ" = ( /obj/structure/disposalpipe/segment{ @@ -30189,12 +30034,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/hallway/primary/starboard) -"lMS" = ( -/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, -/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "lNd" = ( /obj/machinery/door/airlock/external{ name = "Port Docking Bay 1"; @@ -30203,6 +30042,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/hallway/secondary/entry) +"lNg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "lNj" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -30258,6 +30105,11 @@ dir = 1 }, /area/hallway/secondary/entry) +"lOT" = ( +/obj/structure/chair, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "lPn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /turf/closed/wall/r_wall, @@ -30307,6 +30159,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/cargo/miningdock) +"lQK" = ( +/obj/structure/railing/corner, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/service/chapel) "lQP" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -30373,13 +30232,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/command/bridge) -"lSJ" = ( -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/service/library) "lST" = ( /obj/structure/table, /obj/machinery/recharger, @@ -30484,6 +30336,11 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"lUy" = ( +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/service/chapel) "lUA" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -30619,6 +30476,23 @@ }, /turf/open/floor/iron, /area/security/brig) +"lXL" = ( +/obj/machinery/power/apc/auto_name/south, +/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/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/salon) "lXP" = ( /obj/structure/rack, /obj/item/clothing/suit/hazardvest, @@ -30644,14 +30518,6 @@ "lYu" = ( /turf/open/floor/iron, /area/commons/locker) -"lYK" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Chapel" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/sepia, -/area/service/library) "lZm" = ( /obj/machinery/washing_machine, /obj/machinery/light/directional/south, @@ -30703,6 +30569,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/medical/storage) +"mas" = ( +/obj/machinery/door/morgue{ + name = "Private Study"; + req_access_txt = "37" + }, +/turf/open/floor/engine/cult, +/area/service/library) "maG" = ( /obj/structure/table, /obj/item/stack/sheet/plasteel{ @@ -30865,6 +30738,15 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, /area/engineering/main) +"mek" = ( +/obj/machinery/camera{ + c_tag = "Library South"; + dir = 8 + }, +/obj/structure/displaycase/trophy, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/wood/parquet, +/area/service/library) "meo" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -30977,13 +30859,6 @@ /obj/machinery/meter/atmos/layer4, /turf/open/floor/plating, /area/maintenance/department/medical) -"mhL" = ( -/obj/structure/table/wood, -/obj/item/camera, -/obj/item/taperecorder, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/engine/cult, -/area/service/library) "mhN" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/structure/window, @@ -31053,12 +30928,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/command/gateway) +"mjd" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "mje" = ( /obj/machinery/door/airlock{ name = "Private Restroom" }, /turf/open/floor/iron/freezer, /area/medical/break_room) +"mjl" = ( +/obj/structure/displaycase/trophy, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/wood/parquet, +/area/service/library) "mju" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, @@ -31120,15 +31005,6 @@ /obj/effect/turf_decal/arrows, /turf/open/floor/iron, /area/cargo/office) -"mlD" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Holding Area"; - req_access_txt = "2" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "mmc" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -31159,12 +31035,6 @@ }, /turf/open/floor/iron, /area/service/hydroponics) -"mmt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "mmB" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -31227,6 +31097,11 @@ }, /turf/open/floor/iron, /area/commons/fitness) +"mpc" = ( +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/service/chapel) "mpm" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -31513,6 +31388,16 @@ }, /turf/open/floor/plating, /area/cargo/miningdock) +"mzH" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/west, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) "mzO" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/tile/yellow{ @@ -31540,17 +31425,24 @@ /turf/open/floor/plating, /area/maintenance/port) "mAm" = ( -/obj/machinery/door/airlock/external{ - name = "Security Snowmobiles"; - req_access_txt = "63" +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = 5 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "secsnowmobile" +/obj/item/tank/internals/emergency_oxygen/engi{ + pixel_x = 10 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/rack, /turf/open/floor/iron/dark, /area/security/brig) +"mAw" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/chair/pew{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "mAD" = ( /obj/machinery/light/directional/west, /obj/machinery/portable_atmospherics/pump, @@ -31606,6 +31498,20 @@ "mBK" = ( /turf/open/floor/iron/grimy, /area/security/detectives_office) +"mBM" = ( +/obj/structure/window/reinforced, +/obj/structure/rack, +/obj/item/storage/firstaid/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/brute{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/open/floor/iron/white, +/area/security/brig) "mBO" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow, @@ -31761,17 +31667,6 @@ "mEl" = ( /turf/closed/wall, /area/security/brig/upper) -"mER" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/service/chapel) "mFs" = ( /obj/effect/turf_decal/tile/blue/darkblue{ dir = 1 @@ -31807,6 +31702,9 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/command/nuke_storage) +"mGF" = ( +/turf/open/openspace, +/area/service/chapel) "mGX" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -31882,6 +31780,17 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/commons/cryopods) +"mIk" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/engineering{ + name = "Utilities Room"; + req_one_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "mIq" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -32235,6 +32144,16 @@ }, /turf/open/floor/iron, /area/command/bridge) +"mQH" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen/invisible, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/engine/cult, +/area/service/library) "mQP" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -32332,10 +32251,6 @@ }, /turf/open/floor/plating, /area/cargo/sorting) -"mUu" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "mUD" = ( /turf/closed/wall, /area/science/genetics) @@ -32434,12 +32349,6 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/aft) -"mXG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/chapel) "mXU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -32461,14 +32370,6 @@ }, /turf/open/floor/iron/dark, /area/engineering/supermatter/room) -"mYr" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) "mYv" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -32589,14 +32490,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white, /area/medical/medbay) -"nbH" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/obj/effect/landmark/event_spawn, -/turf/open/floor/wood, -/area/service/library) "nbT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -32726,18 +32619,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, /area/commons/storage/primary) -"neV" = ( -/obj/structure/railing{ - dir = 9 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) "nfg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -32749,6 +32630,12 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/wood, /area/service/library) +"nfn" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "nfA" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/radiation, @@ -32777,20 +32664,12 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/commons/dorms) -"nfX" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/maintenance/starboard) "ngg" = ( /obj/machinery/meter, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /turf/open/floor/iron/dark/red, /area/security/execution/education) -"ngm" = ( -/obj/machinery/light/small/directional/east, -/turf/open/openspace, -/area/service/chapel) "ngo" = ( /turf/closed/wall/r_wall, /area/maintenance/department/medical/morgue) @@ -32839,6 +32718,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/commons/storage/mining) +"nhr" = ( +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/service/chapel) "nhI" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon{ @@ -32906,6 +32794,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/engineering/supermatter/room) +"njr" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating/catwalk_floor, +/area/maintenance/starboard/fore) "njE" = ( /obj/structure/table/wood, /obj/item/pen/red{ @@ -32918,6 +32813,17 @@ }, /turf/open/floor/carpet/red, /area/commons/vacant_room/office) +"njV" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/vending/barbervend, +/turf/open/floor/iron, +/area/service/salon) "njW" = ( /obj/structure/table/reinforced, /obj/item/wrench, @@ -32938,6 +32844,12 @@ "nka" = ( /turf/open/openspace, /area/science/xenobiology) +"nke" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "nkz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32975,6 +32887,19 @@ /obj/structure/cable, /turf/open/floor/iron/freezer, /area/commons/toilet) +"nlx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Escape" + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "nlN" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -33005,8 +32930,12 @@ /turf/open/floor/iron/white, /area/science/xenobiology) "nlR" = ( +/obj/effect/turf_decal/trimline/darkblue/filled/line{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -33072,9 +33001,6 @@ /obj/structure/bed/pod, /obj/machinery/iv_drip, /obj/item/bedsheet/blue, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, /turf/open/floor/iron/white, /area/security/brig) "nns" = ( @@ -33089,21 +33015,12 @@ /obj/structure/rack, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"nnS" = ( -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 1 +"nnT" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/table, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/item/restraints/handcuffs, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) +/turf/open/floor/wood, +/area/service/library) "nnU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -33210,6 +33127,10 @@ /obj/structure/bookcase/random/fiction, /turf/open/floor/wood, /area/service/library) +"nqS" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "nqV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33232,15 +33153,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/engineering/supermatter/room) -"nrT" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "nrW" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -33292,6 +33204,13 @@ }, /turf/open/floor/iron, /area/construction/mining/aux_base) +"nsr" = ( +/obj/structure/table/glass, +/obj/item/storage/fancy/candle_box, +/turf/open/floor/iron/chapel{ + dir = 4 + }, +/area/service/chapel) "nsA" = ( /obj/structure/table, /obj/machinery/light/small/directional/east, @@ -33391,14 +33310,24 @@ /turf/open/floor/engine, /area/science/genetics) "nxk" = ( -/obj/machinery/door/window/eastleft{ +/obj/machinery/door/window/eastright{ dir = 8 }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, /turf/open/floor/iron/white, /area/security/brig) +"nxv" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/barber, +/obj/machinery/button/curtain{ + id = "barbershopcurtains1"; + pixel_x = 25; + pixel_y = 24 + }, +/turf/open/floor/iron, +/area/service/salon) "nxB" = ( /turf/open/floor/plating, /area/engineering/atmos) @@ -33512,12 +33441,6 @@ }, /turf/open/floor/iron/dark, /area/command/heads_quarters/cmo) -"nAo" = ( -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/structure/closet, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "nAv" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, @@ -33527,31 +33450,14 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/hallway/primary/central) -"nBj" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "nBv" = ( /obj/machinery/light/directional/east, /turf/open/openspace, /area/science/xenobiology) -"nBS" = ( -/obj/structure/chair/stool/directional/east{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "nBZ" = ( /obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/iron, /area/engineering/atmos) -"nCb" = ( -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood, -/area/service/library) "nCf" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/stripes/line, @@ -33571,12 +33477,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/white, /area/science/mixing) -"nCE" = ( -/obj/structure/chair/pew/left{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) "nCI" = ( /obj/machinery/door/airlock{ id_tag = "Dorm5"; @@ -33611,12 +33511,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/command/heads_quarters/captain) -"nDj" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/security/brig) "nDB" = ( /obj/structure/railing/corner{ dir = 8 @@ -33681,6 +33575,14 @@ }, /turf/open/floor/iron/cafeteria, /area/commons/locker) +"nFt" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/obj/effect/landmark/event_spawn, +/turf/open/floor/wood, +/area/service/library) "nFv" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -33762,17 +33664,8 @@ name = "Law Office Requests Console" }, /obj/machinery/light/directional/west, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/turf/open/floor/carpet/black, +/turf/open/floor/wood, /area/service/lawoffice) -"nHr" = ( -/obj/machinery/navbeacon/wayfinding/chapel, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/hallway/primary/starboard) "nHv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -33785,14 +33678,6 @@ /obj/structure/barricade/wooden/snowed, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) -"nHX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "nId" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -33844,6 +33729,27 @@ /obj/structure/cable, /turf/open/floor/iron, /area/ai_monitored/command/storage/eva) +"nJn" = ( +/obj/structure/destructible/cult/tome, +/obj/item/book/codex_gigas, +/obj/machinery/light/small/directional/south, +/obj/machinery/computer/security/telescreen/entertainment/directional/east, +/turf/open/floor/engine/cult, +/area/service/library) +"nJs" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, +/turf/open/floor/iron, +/area/service/salon) "nKm" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -33943,12 +33849,6 @@ }, /turf/open/floor/plating, /area/cargo/storage) -"nOe" = ( -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/hallway/primary/starboard) "nOl" = ( /obj/structure/window/reinforced{ dir = 8 @@ -34138,19 +34038,10 @@ /turf/open/floor/iron/dark, /area/engineering/engine_smes) "nSO" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera{ - c_tag = "Departure Lounge West"; - dir = 5 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, +/turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "nTm" = ( /obj/machinery/light/directional/south, @@ -34237,12 +34128,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"nXa" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "nXm" = ( /obj/machinery/firealarm/directional/south, /obj/structure/table, @@ -34346,13 +34231,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/command/heads_quarters/hop) -"oaf" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "oak" = ( /obj/structure/sign/warning/electricshock{ pixel_y = -32 @@ -34364,11 +34242,29 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) +"oaz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "oaB" = ( /obj/structure/rack, /obj/item/screwdriver, /turf/open/floor/plating, /area/maintenance/aft) +"oaL" = ( +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/effect/spawner/random/structure/table_fancy, +/turf/open/floor/wood, +/area/service/library) "obc" = ( /obj/machinery/vending/access/command, /turf/open/floor/wood, @@ -34386,13 +34282,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/hallway/primary/central) -"obE" = ( -/obj/structure/destructible/cult/tome, -/obj/item/book/codex_gigas, -/obj/machinery/light/small/directional/south, -/obj/machinery/computer/security/telescreen/entertainment/directional/east, -/turf/open/floor/engine/cult, -/area/service/library) "obK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34415,18 +34304,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"ocG" = ( -/obj/structure/table/glass, -/obj/item/food/grown/harebell{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/food/grown/harebell{ - pixel_y = 3 - }, -/obj/item/food/grown/harebell, -/turf/open/floor/iron/chapel, -/area/service/chapel) "ocJ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating{ @@ -34457,6 +34334,10 @@ /obj/effect/turf_decal/tile/red/full, /turf/open/floor/iron/large, /area/service/kitchen/diner) +"odQ" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "oeD" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -34493,6 +34374,19 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/security/office) +"ogu" = ( +/obj/structure/chair/office, +/obj/machinery/camera{ + c_tag = "Library North" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/wood, +/area/service/library) "ogv" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -34663,6 +34557,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/white, /area/maintenance/port/fore) +"olF" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/engine/cult, +/area/service/library) "omf" = ( /turf/open/floor/plating, /area/cargo/miningdock) @@ -34786,6 +34686,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/command/gateway) +"orc" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/service/chapel) "orh" = ( /obj/effect/turf_decal/tile/red/full, /obj/effect/turf_decal/siding/white{ @@ -34846,10 +34758,6 @@ /obj/item/flashlight/lamp, /turf/open/floor/iron/grimy, /area/commons/vacant_room/office) -"orS" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "osi" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -34860,6 +34768,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/command/nuke_storage) +"osm" = ( +/obj/machinery/modular_computer/console/preset/curator{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/wood, +/area/service/library) "osq" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -34942,6 +34857,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/cargo/storage) +"ouU" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) "ouX" = ( /obj/structure/closet/secure_closet/personal, /obj/machinery/airalarm/directional/east, @@ -35022,13 +34946,6 @@ }, /turf/open/floor/engine, /area/engineering/supermatter/room) -"owu" = ( -/obj/structure/chair/pew/right{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) "owx" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -35081,6 +34998,15 @@ }, /turf/open/floor/iron, /area/engineering/atmos) +"oyD" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/service/library) +"oyV" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood, +/area/service/library) "ozf" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance/two, @@ -35163,15 +35089,8 @@ /turf/open/floor/wood, /area/command/heads_quarters/captain) "oCp" = ( -/obj/machinery/door/airlock/external{ - name = "Security External Airlock"; - req_access_txt = "63" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/office) +/turf/open/floor/plating/snowed, +/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "oCr" = ( /obj/structure/closet/secure_closet/personal{ anchored = 1 @@ -35223,11 +35142,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"oDa" = ( -/obj/structure/table/glass, -/obj/item/storage/book/bible, -/turf/open/floor/iron/chapel, -/area/service/chapel) "oDi" = ( /obj/structure/window/reinforced{ dir = 1 @@ -35281,6 +35195,11 @@ /obj/machinery/light/built/directional/west, /turf/open/floor/iron/white, /area/maintenance/port/fore) +"oFx" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/table, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "oFI" = ( /obj/structure/ladder, /turf/open/floor/plating, @@ -35346,11 +35265,10 @@ /turf/open/floor/wood, /area/hallway/secondary/service) "oHv" = ( -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/key/security, +/obj/item/key/security, +/obj/item/key/security, +/obj/structure/rack, /turf/open/floor/iron/dark, /area/security/brig) "oHS" = ( @@ -35437,14 +35355,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/engineering/supermatter/room) -"oKn" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/newscaster/directional/south, -/obj/effect/spawner/random/vending/colavend, -/turf/open/floor/iron/white/corner, -/area/hallway/secondary/exit/departure_lounge) "oKp" = ( /turf/open/openspace, /area/medical/cryo) @@ -35474,6 +35384,22 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) +"oKL" = ( +/obj/structure/sign/painting/library_private{ + pixel_y = 32 + }, +/obj/structure/table/wood, +/obj/item/clothing/under/suit/red, +/obj/item/candle{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/candle{ + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/engine/cult, +/area/service/library) "oLd" = ( /obj/structure/table, /obj/structure/table, @@ -35493,6 +35419,16 @@ }, /turf/open/floor/iron, /area/ai_monitored/command/storage/eva) +"oLC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/salon) "oLK" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, @@ -35629,10 +35565,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/command/bridge) -"oNQ" = ( -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "oNY" = ( /obj/effect/landmark/start/brigoff, /obj/structure/window/reinforced{ @@ -35671,13 +35603,6 @@ "oOH" = ( /turf/closed/wall, /area/cargo/miningdock) -"oPe" = ( -/obj/effect/turf_decal/tile/blue/darkblue{ - dir = 8 - }, -/obj/effect/spawner/random/vending/snackvend, -/turf/open/floor/iron, -/area/hallway/primary/fore) "oPz" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/delivery, @@ -35836,17 +35761,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/medical/medbay/aft) -"oUW" = ( -/obj/structure/rack, -/obj/item/clothing/suit/hooded/wintercoat{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/suit/hooded/wintercoat, -/obj/item/clothing/shoes/winterboots, -/obj/item/clothing/shoes/winterboots, -/turf/open/floor/iron/white, -/area/hallway/secondary/exit/departure_lounge) "oUZ" = ( /obj/structure/closet/emcloset, /obj/machinery/light/small/directional/north, @@ -35899,6 +35813,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/command/bridge) +"oWR" = ( +/obj/item/kirbyplants/random, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "oXn" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating{ @@ -35969,6 +35888,13 @@ /obj/structure/closet/radiation, /turf/open/floor/iron, /area/engineering/main) +"pbq" = ( +/obj/machinery/photocopier, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/turf/open/floor/wood, +/area/service/library) "pbB" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; @@ -36108,6 +36034,16 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/command/teleporter) +"pfA" = ( +/obj/structure/table/wood, +/obj/item/camera, +/obj/item/taperecorder, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/engine/cult, +/area/service/library) +"pfQ" = ( +/turf/open/floor/carpet/green, +/area/service/library) "pfZ" = ( /obj/machinery/computer/gateway_control, /turf/open/floor/iron, @@ -36123,16 +36059,6 @@ }, /turf/open/floor/iron, /area/cargo/storage) -"pgY" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "Cargo Escape Airlock"; - safety_mode = 1 - }, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "phz" = ( /obj/effect/turf_decal/trimline/blue/end{ dir = 1 @@ -36249,14 +36175,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"pjT" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood, -/area/service/library) "pjV" = ( /obj/item/bedsheet, /obj/structure/bed, @@ -36287,13 +36205,6 @@ }, /turf/closed/wall, /area/maintenance/starboard) -"pkR" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Chapel" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/sepia, -/area/service/library) "ple" = ( /mob/living/carbon/human/species/monkey, /turf/open/floor/engine, @@ -36302,31 +36213,13 @@ /obj/item/trash/pistachios, /turf/open/floor/plating, /area/maintenance/aft) +"plT" = ( +/turf/closed/wall, +/area/service/salon) "plW" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron, /area/hallway/primary/starboard) -"pmn" = ( -/obj/structure/table, -/obj/machinery/newscaster/directional/north, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/pen, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "pmp" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -36470,13 +36363,22 @@ roundstart_template = /datum/map_template/shuttle/labour/box; width = 9 }, -/turf/open/floor/plating/snowed/smoothed/icemoon, +/turf/open/floor/plating/snowed, /area/icemoon/surface/outdoors) "ppt" = ( /obj/effect/landmark/start/hangover, /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/wood/parquet, /area/service/bar/atrium) +"ppE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/sepia, +/area/service/library) "ppI" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot_blue, @@ -36726,16 +36628,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) -"pus" = ( -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/brig) "put" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, @@ -36810,12 +36702,6 @@ }, /turf/open/floor/iron, /area/service/hydroponics/garden) -"pvr" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "pvH" = ( /obj/structure/table, /obj/item/stack/sheet/iron/fifty, @@ -36887,6 +36773,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/cargo/miningdock) +"pwW" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/service/chapel) "pxo" = ( /obj/structure/reagent_dispensers/fueltank, /obj/structure/disposalpipe/segment{ @@ -36894,6 +36792,20 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"pxt" = ( +/obj/structure/table/wood, +/obj/machinery/computer/bookmanagement, +/obj/machinery/light_switch/directional/north, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/wood, +/area/service/library) +"pxD" = ( +/obj/effect/spawner/structure/window, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains" + }, +/turf/open/floor/plating, +/area/service/salon) "pxG" = ( /obj/structure/railing, /obj/effect/turf_decal/trimline/darkblue/filled/line{ @@ -36913,7 +36825,7 @@ /turf/closed/wall, /area/service/janitor) "pxL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/security/brig) "pxS" = ( @@ -36933,16 +36845,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"pyg" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen/invisible, -/obj/machinery/newscaster/directional/east, -/turf/open/floor/engine/cult, -/area/service/library) "pyr" = ( /obj/effect/turf_decal/bot, /obj/effect/landmark/secequipment, @@ -36995,15 +36897,6 @@ /obj/structure/fluff/fokoff_sign, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) -"pAI" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "pAR" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -37066,21 +36959,6 @@ }, /turf/open/floor/plating, /area/science/xenobiology) -"pCs" = ( -/obj/effect/landmark/blobstart, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating/catwalk_floor, -/area/maintenance/starboard/fore) -"pCH" = ( -/obj/structure/sign/poster/random{ - pixel_x = -32 - }, -/turf/open/floor/iron/dark, -/area/service/chapel) "pCT" = ( /obj/structure/table, /obj/item/storage/belt/utility, @@ -37121,15 +36999,8 @@ /turf/open/floor/iron/freezer, /area/commons/toilet) "pDn" = ( -/obj/vehicle/ridden/atv/snowmobile/snowcurity{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 9 - }, -/obj/item/key/security, -/turf/open/floor/iron/dark, -/area/security/brig) +/turf/open/chasm/icemoon, +/area/icemoon/surface/outdoors) "pDu" = ( /obj/effect/turf_decal/bot, /obj/structure/frame/machine{ @@ -37197,6 +37068,12 @@ }, /turf/open/floor/iron/dark, /area/security/processing) +"pFj" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "pFC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37224,6 +37101,15 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"pFI" = ( +/obj/effect/landmark/blobstart, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/catwalk_floor, +/area/maintenance/starboard/fore) "pFO" = ( /obj/machinery/camera{ c_tag = "Holodeck - Fore"; @@ -37258,6 +37144,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/construction) +"pGI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/salon) "pGJ" = ( /obj/structure/flora/junglebush, /turf/open/floor/grass, @@ -37448,6 +37346,39 @@ /obj/effect/spawner/random/maintenance/seven, /turf/open/floor/plating, /area/construction) +"pMQ" = ( +/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/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/button/curtain{ + id = "barbershopcurtains"; + pixel_x = 25; + pixel_y = -24 + }, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/salon) +"pMS" = ( +/obj/structure/table/glass, +/obj/item/food/grown/harebell{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/food/grown/harebell{ + pixel_y = 3 + }, +/obj/item/food/grown/harebell, +/turf/open/floor/iron/chapel, +/area/service/chapel) "pNq" = ( /obj/machinery/light_switch/directional/north{ pixel_x = 4 @@ -37491,6 +37422,12 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/commons/dorms) +"pNE" = ( +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "pNH" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, @@ -37745,26 +37682,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"pUg" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Vacant Commissary"; - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "pUi" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -37811,6 +37728,15 @@ /obj/item/storage/dice, /turf/open/floor/iron, /area/commons/dorms) +"pVz" = ( +/obj/structure/sign/warning/vacuum/external{ + pixel_x = 32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "pVJ" = ( /obj/machinery/power/shieldwallgen, /obj/structure/window/reinforced{ @@ -38072,6 +37998,11 @@ }, /turf/open/floor/iron/white, /area/science/research) +"qdu" = ( +/obj/item/radio/intercom/directional/west, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/service/library) "qdC" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/chair, @@ -38185,6 +38116,13 @@ /obj/item/clothing/suit/hooded/wintercoat, /turf/open/floor/iron, /area/commons/storage/mining) +"qgx" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/salon) "qgI" = ( /obj/machinery/disposal/bin, /obj/machinery/airalarm/directional/north, @@ -38225,13 +38163,6 @@ }, /turf/open/floor/iron, /area/commons/locker) -"qif" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Art Gallery" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/sepia, -/area/service/library) "qii" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -38285,6 +38216,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria, /area/hallway/secondary/entry) +"qks" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood, +/area/service/library) "qkP" = ( /obj/machinery/computer/rdconsole{ dir = 1 @@ -38341,6 +38283,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) +"qlS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/blobstart, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "qlY" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -38353,6 +38302,15 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"qmm" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "qmL" = ( /obj/effect/turf_decal/siding/white, /obj/machinery/firealarm/directional/south, @@ -38391,9 +38349,6 @@ /turf/open/floor/iron/dark, /area/engineering/supermatter/room) "qnS" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, /turf/open/floor/iron/white, /area/security/brig) "qnW" = ( @@ -38468,17 +38423,6 @@ }, /turf/open/floor/iron, /area/commons/storage/mining) -"qpl" = ( -/obj/item/storage/secure/safe/directional/south, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/commons/vacant_room/commissary) "qpn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38515,6 +38459,14 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/service/hydroponics) +"qqS" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/carpet, +/area/service/library) "qqV" = ( /obj/machinery/camera{ c_tag = "Aft Port Solar Access"; @@ -38641,13 +38593,6 @@ /obj/structure/chair/sofa/corp/left, /turf/open/floor/wood, /area/hallway/secondary/service) -"quE" = ( -/obj/structure/railing/corner, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/service/chapel) "quZ" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ @@ -38655,6 +38600,13 @@ }, /turf/open/floor/iron, /area/cargo/storage) +"qvk" = ( +/obj/structure/table/wood, +/obj/machinery/libraryscanner, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/service/library) "qvL" = ( /obj/item/trash/syndi_cakes, /turf/open/floor/plating, @@ -38669,15 +38621,6 @@ }, /turf/open/floor/plating, /area/engineering/main) -"qwv" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) "qwz" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -38703,10 +38646,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron, /area/security/brig/upper) -"qyN" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "qyX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -38716,11 +38655,6 @@ }, /turf/open/floor/plating, /area/science/xenobiology) -"qze" = ( -/obj/machinery/power/apc/auto_name/north, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/chapel) "qzi" = ( /obj/structure/railing/corner{ dir = 4 @@ -38901,9 +38835,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/hallway/primary/central) -"qEX" = ( -/turf/closed/wall, -/area/commons/vacant_room/commissary) "qFz" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -38915,23 +38846,6 @@ /obj/item/crowbar/red, /turf/open/floor/glass/reinforced, /area/science/xenobiology) -"qFP" = ( -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) -"qGA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/service/library) "qGB" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -38975,10 +38889,7 @@ /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, /obj/item/book/manual/wiki/security_space_law, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/carpet/black, +/turf/open/floor/wood, /area/service/lawoffice) "qHg" = ( /obj/item/radio/intercom/directional/south, @@ -39084,10 +38995,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/command/teleporter) -"qKH" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "qLu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39139,11 +39046,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/engineering/atmos) -"qMP" = ( -/obj/machinery/disposal/bin, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "qMQ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -39189,6 +39091,12 @@ }, /turf/open/floor/wood, /area/command/meeting_room) +"qNW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/service/chapel) "qOM" = ( /obj/structure/lattice, /turf/open/floor/plating/asteroid/snow/icemoon, @@ -39223,6 +39131,12 @@ /obj/structure/cable, /turf/open/floor/wood, /area/commons/vacant_room/office) +"qPd" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "qPg" = ( /obj/structure/plaque/static_plaque/golden/commission/icebox{ pixel_y = 29 @@ -39253,6 +39167,13 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, /area/cargo/office) +"qPA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "qPT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -39339,15 +39260,6 @@ /obj/structure/closet/secure_closet/personal, /turf/open/floor/iron, /area/commons/locker) -"qRt" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_x = 32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "qRz" = ( /obj/structure/tank_holder/extinguisher, /obj/effect/turf_decal/stripes/line{ @@ -39356,6 +39268,16 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"qSc" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light/warm/directional/north, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/service/salon) "qSf" = ( /obj/structure/chair/office, /turf/open/floor/iron/cafeteria, @@ -39376,11 +39298,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/white, /area/medical/virology) -"qSQ" = ( -/obj/structure/sign/warning/docking, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "qTm" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/wood{ @@ -39596,13 +39513,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/hallway/primary/central) -"qZU" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/wood, -/area/service/library) "raD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/structure/disposalpipe/segment, @@ -39661,6 +39571,16 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/white, /area/medical/break_room) +"rdF" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Chapel Maintenance"; + req_one_access_txt = "12;22" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "rdG" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/disposalpipe/segment{ @@ -39672,6 +39592,9 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/on, /turf/open/floor/iron, /area/security/execution/education) +"rdP" = ( +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "rdV" = ( /obj/machinery/computer/secure_data, /turf/open/floor/carpet, @@ -39691,14 +39614,6 @@ }, /turf/open/floor/iron, /area/maintenance/port/fore) -"reB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/service/library) "rfb" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 @@ -39824,6 +39739,16 @@ }, /turf/open/floor/iron, /area/cargo/storage) +"rjL" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "rjP" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39977,16 +39902,6 @@ dir = 1 }, /area/hallway/secondary/service) -"rnI" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "Cargo Escape Airlock"; - safety_mode = 1 - }, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "rnV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/table, @@ -40224,10 +40139,6 @@ }, /turf/open/floor/iron/cafeteria, /area/command/heads_quarters/rd) -"rux" = ( -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/maintenance/starboard) "ruy" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -40309,17 +40220,14 @@ /turf/open/floor/iron/white, /area/medical/virology) "rvI" = ( +/obj/machinery/door/airlock/security{ + id_tag = "solitary3"; + name = "Solitary Cell 3"; + req_access_txt = "2" + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/brigdoor/security/cell{ - dir = 4; - id = "soli 3"; - name = "Solitary Cell 3" - }, -/obj/effect/turf_decal/trimline/darkblue/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron, +/turf/open/floor/iron/dark/blue, /area/security/brig) "rvR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40327,6 +40235,9 @@ /obj/structure/cable, /turf/open/floor/wood/parquet, /area/service/bar/atrium) +"rvZ" = ( +/turf/open/floor/engine/cult, +/area/service/library) "rwo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/portables_connector/visible, @@ -40343,6 +40254,12 @@ /obj/effect/spawner/random/techstorage/rnd_secure_all, /turf/open/floor/iron, /area/engineering/storage/tech) +"rwx" = ( +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/structure/closet, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "rwz" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -40357,6 +40274,22 @@ /obj/item/storage/box/mousetraps, /turf/open/floor/iron, /area/service/janitor) +"rxK" = ( +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, +/area/service/library) +"ryp" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Barbershop" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/service/salon) "ryN" = ( /obj/machinery/atmospherics/components/binary/pump/on{ name = "Waste In" @@ -40499,13 +40432,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/science/genetics) -"rAT" = ( -/obj/machinery/modular_computer/console/preset/curator{ - dir = 8 - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/wood, -/area/service/library) "rBd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{ dir = 1 @@ -40533,20 +40459,15 @@ /obj/structure/grille, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"rCr" = ( -/obj/effect/turf_decal/tile/neutral{ +"rCw" = ( +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/purple, +/obj/structure/table/reinforced/rglass, +/obj/item/hairbrush, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "rCB" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -40667,10 +40588,6 @@ /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass, /area/maintenance/starboard/aft) -"rFh" = ( -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, -/area/maintenance/starboard) "rFl" = ( /obj/machinery/computer/security/mining, /obj/effect/turf_decal/tile/brown, @@ -40744,18 +40661,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"rHe" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Escape" - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) "rHB" = ( /obj/machinery/door/airlock/engineering{ name = "Auxillary Base Construction"; @@ -40794,13 +40699,6 @@ }, /turf/open/floor/iron/dark, /area/commons/storage/mining) -"rHV" = ( -/obj/effect/turf_decal/tile/blue/darkblue{ - dir = 8 - }, -/obj/machinery/vending/coffee, -/turf/open/floor/iron, -/area/hallway/primary/fore) "rIp" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/darkblue/filled/line, @@ -40853,6 +40751,16 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, /area/cargo/office) +"rJG" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) "rJN" = ( /obj/structure/sign/poster/official/random{ pixel_x = 32 @@ -40973,6 +40881,15 @@ }, /turf/open/floor/iron/white, /area/science/research) +"rNw" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) "rND" = ( /obj/structure/displaycase/labcage, /obj/effect/turf_decal/stripes/end{ @@ -41099,25 +41016,20 @@ /obj/machinery/vending/wardrobe/curator_wardrobe, /turf/open/floor/engine/cult, /area/service/library) -"rRO" = ( -/obj/structure/disposalpipe/trunk/multiz/down, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) +"rRJ" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/service/salon) "rSa" = ( /obj/item/storage/box, /turf/open/floor/plating{ icon_state = "panelscorched" }, /area/maintenance/port) -"rSe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "rSg" = ( /obj/structure/table, /obj/item/folder/blue, @@ -41179,15 +41091,6 @@ /obj/structure/barricade/wooden/crude/snow, /turf/open/floor/wood, /area/maintenance/space_hut/cabin) -"rUf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/service/library) "rUv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41262,6 +41165,10 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/command/nuke_storage) +"rWS" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/service/library) "rXf" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -41288,11 +41195,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/maintenance/department/medical) -"rXS" = ( -/obj/item/radio/intercom/directional/west, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood, -/area/service/library) "rYd" = ( /obj/machinery/power/apc/auto_name/south, /obj/structure/cable, @@ -41350,22 +41252,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engineering/main) -"rZB" = ( -/obj/structure/chair, +"rZt" = ( +/obj/structure/chair/pew/right{ + dir = 1 + }, /obj/effect/landmark/start/hangover, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "rZM" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/rack, /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/maintenance/aft) -"saa" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "saj" = ( /obj/machinery/camera{ c_tag = "Dormitory Toilets"; @@ -41394,6 +41293,15 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"sbs" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/service/library) "sbG" = ( /turf/open/openspace, /area/service/hydroponics) @@ -41417,6 +41325,10 @@ dir = 5 }, /area/science/research) +"scx" = ( +/obj/machinery/status_display/evac/directional/west, +/turf/open/openspace, +/area/service/chapel) "scD" = ( /obj/machinery/disposal/bin, /obj/machinery/light_switch/directional/east, @@ -41467,11 +41379,6 @@ /obj/effect/turf_decal/tile/purple/half, /turf/open/floor/iron/white/textured_edge, /area/security/checkpoint/science) -"sfc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/carpet, -/area/service/library) "sfg" = ( /obj/structure/table, /obj/item/multitool/circuit{ @@ -41582,9 +41489,6 @@ dir = 1 }, /area/security/execution/education) -"sgD" = ( -/turf/open/floor/iron/dark/smooth_half, -/area/service/chapel) "sgI" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -41630,20 +41534,9 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) -"shq" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/door/airlock/command/glass{ - name = "Emergency EVA Storage"; - red_alert_access = 1; - req_access_txt = "18"; - safety_mode = 1 - }, -/turf/open/floor/iron/textured, -/area/hallway/secondary/exit/departure_lounge) "shw" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom/directional/south, @@ -41674,22 +41567,6 @@ "shJ" = ( /turf/open/floor/iron/dark, /area/security/processing) -"shP" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) -"sir" = ( -/obj/machinery/light/small/directional/east, -/obj/structure/rack, -/obj/item/poster/random_contraband, -/obj/effect/spawner/random/maintenance/two, -/turf/open/floor/plating, -/area/maintenance/port) "sis" = ( /obj/structure/table, /obj/item/flashlight/lamp{ @@ -41842,6 +41719,15 @@ }, /turf/open/floor/iron, /area/engineering/main) +"slE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/salon) "slV" = ( /obj/effect/turf_decal/trimline/darkblue/filled/line{ dir = 4 @@ -41889,6 +41775,9 @@ }, /turf/closed/wall/r_wall, /area/engineering/atmos) +"snl" = ( +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "snp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -42059,14 +41948,6 @@ }, /turf/open/floor/iron, /area/cargo/storage) -"sse" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/chapel) "ssw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -42077,14 +41958,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/dark, /area/engineering/supermatter/room) -"ssV" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "stc" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/iron, @@ -42187,13 +42060,6 @@ /obj/structure/filingcabinet, /turf/open/floor/iron/grimy, /area/commons/vacant_room/office) -"swz" = ( -/obj/structure/sign/painting/library{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/service/library) "swA" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -42245,19 +42111,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/engineering/supermatter/room) -"syx" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 +"syC" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 }, -/turf/open/floor/carpet, -/area/service/library) +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/service/chapel) "syN" = ( /obj/structure/window/reinforced/plasma{ dir = 4 }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/machinery/power/tesla_coil/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "syO" = ( @@ -42283,6 +42150,15 @@ }, /turf/open/floor/iron, /area/cargo/storage) +"sAc" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "sAm" = ( /obj/structure/window/reinforced{ dir = 1; @@ -42306,6 +42182,17 @@ }, /turf/open/floor/iron, /area/cargo/sorting) +"sAq" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Security Escape Airlock"; + req_access_txt = "2"; + safety_mode = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "sAy" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -42474,14 +42361,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/maintenance/aft) -"sFd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood, -/area/service/library) "sFh" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 8 @@ -42518,16 +42397,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) -"sFG" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/turf/open/floor/engine/cult, -/area/service/library) -"sGg" = ( -/obj/machinery/status_display/evac/directional/east, -/turf/open/openspace, -/area/service/chapel) "sGk" = ( /obj/effect/landmark/observer_start, /obj/effect/turf_decal/plaque{ @@ -42583,19 +42452,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, /turf/open/floor/iron, /area/engineering/atmos) +"sIV" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "sIZ" = ( /turf/open/floor/plating{ icon_state = "platingdmg1" }, /area/maintenance/starboard/fore) -"sJp" = ( -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/turf/open/floor/wood, -/area/service/library) "sJq" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42612,6 +42479,19 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/command/heads_quarters/ce) +"sKa" = ( +/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 = 10 + }, +/obj/effect/spawner/structure/window, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains" + }, +/turf/open/floor/plating, +/area/service/salon) "sKl" = ( /obj/machinery/door/firedoor, /obj/structure/railing/corner{ @@ -42722,22 +42602,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"sMx" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/closet/secure_closet/personal, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/item/storage/secure/briefcase, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "sMI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -42748,26 +42612,23 @@ }, /turf/open/floor/iron/white, /area/maintenance/port/fore) +"sMO" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/machinery/light/small/directional/east, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/starboard) "sMZ" = ( /obj/structure/kitchenspike, /obj/item/stack/sheet/leather, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron, /area/maintenance/starboard/fore) -"sNb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) -"sNl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/window/eastright{ - dir = 1 - }, -/turf/open/floor/iron, -/area/security/brig) "sNt" = ( /obj/structure/tank_holder/extinguisher{ pixel_y = 8 @@ -42877,10 +42738,6 @@ /obj/item/storage/box/shipping, /turf/open/floor/iron, /area/commons/storage/art) -"sPX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "sQp" = ( /obj/machinery/airalarm/directional/north, /obj/structure/disposalpipe/segment{ @@ -42895,16 +42752,13 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/science/robotics/lab) -"sQw" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 +"sQM" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/sign/poster/random{ + pixel_x = 32 }, -/obj/machinery/door/airlock/external{ - name = "Escape Airlock"; - safety_mode = 1 - }, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) +/turf/open/floor/wood, +/area/service/library) "sRY" = ( /obj/structure/sign/warning/securearea{ pixel_x = 32 @@ -42949,6 +42803,16 @@ }, /turf/open/floor/wood/parquet, /area/service/bar/atrium) +"sST" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "sSV" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/light/directional/east, @@ -43010,13 +42874,6 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"sVa" = ( -/obj/structure/table/wood, -/obj/machinery/computer/bookmanagement, -/obj/machinery/light_switch/directional/north, -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/wood, -/area/service/library) "sVk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -43097,17 +42954,6 @@ }, /turf/open/floor/iron, /area/maintenance/port/fore) -"sXq" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/landmark/start/hangover/closet, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) -"sXs" = ( -/turf/closed/wall, -/area/hallway/secondary/exit/departure_lounge) "sXQ" = ( /turf/open/openspace, /area/service/kitchen) @@ -43156,13 +43002,6 @@ }, /turf/open/floor/iron/dark/corner, /area/engineering/atmos) -"sYP" = ( -/obj/machinery/door/morgue{ - name = "Private Study"; - req_access_txt = "37" - }, -/turf/open/floor/engine/cult, -/area/service/library) "sZe" = ( /obj/machinery/atmospherics/components/binary/pump/off/general, /obj/machinery/door/window/brigdoor{ @@ -43385,13 +43224,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/security/range) -"tfi" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/camera{ - c_tag = "Chapel Mass Driver" - }, -/turf/open/floor/iron/dark, -/area/service/chapel) "tfk" = ( /obj/machinery/computer/security/hos, /obj/structure/cable, @@ -43449,13 +43281,6 @@ /obj/item/wrench, /turf/open/floor/plating, /area/maintenance/port/aft) -"the" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "thg" = ( /obj/structure/chair/office{ dir = 1 @@ -43502,20 +43327,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/wood, /area/command/meeting_room) -"tji" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Departure Lounge Holding Area"; - dir = 6 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "tjm" = ( /obj/item/stack/sheet/plasteel{ amount = 10 @@ -43540,21 +43351,6 @@ icon_state = "wood-broken5" }, /area/maintenance/aft) -"tju" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/structure/table, -/obj/item/newspaper, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "tjz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -43647,6 +43443,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"tla" = ( +/obj/structure/sign/painting/library{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/wood, +/area/service/library) +"tlu" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/bed/pod, +/obj/structure/window, +/turf/open/floor/iron, +/area/service/salon) "tlW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -43715,16 +43529,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/commons/dorms) -"tmP" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/corner, -/area/hallway/secondary/exit/departure_lounge) "tmU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -43910,6 +43714,11 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/commons/storage/emergency/port) +"trl" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "trL" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -43918,9 +43727,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/directional/east, -/obj/machinery/flasher/directional/north{ - id = "soli 2" - }, /turf/open/floor/iron/dark/blue, /area/security/brig) "tst" = ( @@ -44046,16 +43852,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/hallway/primary/starboard) -"tvu" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plating, -/area/maintenance/starboard) "tvI" = ( /obj/structure/table, /obj/item/kitchen/knife, @@ -44193,13 +43989,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/engineering/break_room) -"tAl" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating/catwalk_floor, -/area/maintenance/starboard/fore) "tAD" = ( /obj/structure/railing, /obj/structure/chair/plastic{ @@ -44501,6 +44290,18 @@ }, /turf/open/floor/iron, /area/engineering/atmos) +"tIU" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/sign/poster/contraband/random{ + pixel_x = 32 + }, +/turf/open/floor/plating/catwalk_floor, +/area/maintenance/starboard/fore) "tJa" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -44529,15 +44330,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/security/range) -"tJK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/landmark/event_spawn, -/obj/item/beacon, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "tKl" = ( /obj/structure/cable, /obj/structure/railing, @@ -44587,27 +44379,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "tLb" = ( -/obj/structure/rack/shelf, -/obj/item/clothing/suit/hooded/wintercoat/security{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/item/clothing/suit/hooded/wintercoat/security{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/clothing/suit/hooded/wintercoat/security{ - pixel_y = 12 - }, -/obj/item/clothing/suit/hooded/wintercoat/security/peacekeeper{ - pixel_x = 12 - }, -/obj/item/clothing/suit/hooded/wintercoat/security/peacekeeper{ - pixel_x = 6 - }, -/obj/item/clothing/suit/hooded/wintercoat/security/peacekeeper, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/vehicle/ridden/atv/snowmobile/snowcurity{ + dir = 4 }, /turf/open/floor/iron/dark, /area/security/brig) @@ -44649,13 +44422,6 @@ /obj/item/analyzer, /turf/open/floor/iron, /area/commons/storage/primary) -"tMl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) "tMv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44713,11 +44479,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/command/heads_quarters/cmo) -"tOe" = ( -/obj/structure/table/wood, -/obj/machinery/computer/libraryconsole, -/turf/open/floor/wood, -/area/service/library) "tOu" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -44797,15 +44558,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"tQK" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/wood, -/area/service/library) "tQW" = ( /obj/machinery/door/airlock/external{ name = "Common Mining Shuttle Bay" @@ -44817,8 +44569,7 @@ /area/hallway/secondary/entry) "tQX" = ( /obj/machinery/door_timer{ - id = "soli 3"; - name = "Solitary 3 Timer"; + id = "solitary3"; pixel_x = 32 }, /obj/effect/turf_decal/trimline/darkblue/filled/line{ @@ -44888,15 +44639,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/engineering/atmos) -"tTe" = ( -/obj/structure/disposalpipe/sorting/mail{ - sortType = 12 - }, -/obj/structure/rack, -/obj/effect/spawner/random/clothing/gloves, -/obj/item/clothing/suit/toggle/labcoat, -/turf/open/floor/plating, -/area/maintenance/starboard) "tTk" = ( /obj/structure/table, /obj/machinery/requests_console/directional/east{ @@ -44954,6 +44696,9 @@ /obj/machinery/light/directional/north, /turf/open/openspace, /area/science/xenobiology) +"tVj" = ( +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "tVo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44992,11 +44737,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/wood, /area/service/library) -"tVM" = ( -/obj/structure/cable, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "tWh" = ( /obj/effect/turf_decal/siding/white{ dir = 6 @@ -45048,19 +44788,6 @@ }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) -"tXN" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "tXP" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -45094,6 +44821,18 @@ }, /turf/open/floor/iron/dark, /area/command/gateway) +"tYE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Escape" + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) "tYS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -45230,6 +44969,14 @@ /obj/item/clothing/neck/stethoscope, /turf/open/floor/iron, /area/medical/medbay/central) +"ucd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/service/library) "uce" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -45458,6 +45205,15 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"uhu" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/service/library) "uhM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -45670,19 +45426,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port) -"umQ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "umY" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/vending/wardrobe/science_wardrobe, @@ -45726,9 +45469,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/directional/east, -/obj/machinery/flasher/directional/north{ - name = "soli 1" - }, /turf/open/floor/iron/dark/blue, /area/security/brig) "uop" = ( @@ -45740,12 +45480,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/security/warden) -"uoM" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/stripes/line, -/obj/effect/landmark/start/hangover/closet, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "upj" = ( /obj/machinery/power/apc/auto_name/north, /obj/structure/cable, @@ -45764,16 +45498,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) -"upR" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) "upT" = ( /obj/structure/sign/warning/nosmoking, /turf/closed/wall, @@ -45790,11 +45514,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"uqs" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/plating, -/area/commons/vacant_room/commissary) "uqG" = ( /obj/machinery/door/window/eastright{ dir = 1; @@ -45809,10 +45528,6 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/security/office) "uqR" = ( @@ -45907,13 +45622,6 @@ }, /turf/open/floor/iron, /area/science/storage) -"usy" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/light/directional/north{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/brig) "usL" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 @@ -45971,14 +45679,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"uut" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/item/kirbyplants/random, -/obj/machinery/computer/security/telescreen/entertainment/directional/south, -/turf/open/floor/iron/white/corner, -/area/hallway/secondary/exit/departure_lounge) "uvd" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -46007,6 +45707,10 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/command/bridge) +"uvA" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/maintenance/starboard) "uvN" = ( /obj/structure/table/wood, /obj/item/phone{ @@ -46160,6 +45864,14 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) +"uyx" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Chapel" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/sepia, +/area/service/library) "uyz" = ( /obj/structure/table, /obj/structure/table, @@ -46330,11 +46042,11 @@ /turf/open/floor/iron, /area/commons/fitness) "uBR" = ( +/obj/effect/turf_decal/trimline/darkblue/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/trimline/darkblue/filled/line, /turf/open/floor/iron, /area/security/brig) "uBW" = ( @@ -46394,10 +46106,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/engineering/supermatter) -"uDk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/security/office) "uDp" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable, @@ -46441,13 +46149,6 @@ }, /turf/closed/wall/r_wall, /area/engineering/supermatter/room) -"uEj" = ( -/obj/machinery/photocopier, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/turf/open/floor/wood, -/area/service/library) "uEt" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46458,10 +46159,6 @@ /obj/machinery/status_display/ai/directional/west, /turf/open/floor/engine, /area/engineering/supermatter/room) -"uEv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/security/brig) "uEz" = ( /obj/structure/cable, /turf/open/floor/plating{ @@ -46513,15 +46210,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) -"uGk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "uGw" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -46582,6 +46270,19 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/office) +"uIm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/engineering/supermatter) "uIq" = ( /obj/structure/railing{ dir = 4 @@ -46594,6 +46295,22 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/cafeteria, /area/service/kitchen) +"uIu" = ( +/obj/item/storage/secure/safe/directional/south, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/closet/secure_closet/barber, +/turf/open/floor/iron, +/area/service/salon) "uIv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46624,12 +46341,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/security/brig) -"uKr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "uKv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -46718,11 +46429,6 @@ dir = 10 }, /area/science/xenobiology) -"uPt" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/turf/open/floor/wood, -/area/service/library) "uPx" = ( /obj/structure/table, /obj/item/circular_saw, @@ -46746,6 +46452,11 @@ /obj/structure/closet/secure_closet/captains, /turf/open/floor/carpet, /area/command/heads_quarters/captain) +"uRp" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "uRz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/siding/wood{ @@ -46850,10 +46561,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"uTM" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating/asteroid/snow/standard_air, -/area/hallway/secondary/exit/departure_lounge) "uTV" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, @@ -46885,10 +46592,6 @@ "uUP" = ( /turf/open/floor/carpet, /area/maintenance/space_hut/cabin) -"uVg" = ( -/obj/item/trash/energybar, -/turf/open/floor/plating, -/area/maintenance/port) "uVv" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Port to Fuel Pipe" @@ -46937,13 +46640,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/commons/fitness) -"uXy" = ( -/obj/structure/railing/corner, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/service/chapel) "uXM" = ( /obj/machinery/power/apc/auto_name/south, /obj/structure/cable, @@ -47081,15 +46777,6 @@ /obj/structure/window/reinforced/spawner/north, /turf/open/floor/plating/snowed/icemoon, /area/maintenance/port/aft) -"vbH" = ( -/obj/machinery/camera{ - c_tag = "Starboard Primary Hallway 5" - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/starboard) "vck" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -47215,8 +46902,7 @@ /area/maintenance/starboard/fore) "vgl" = ( /obj/machinery/door_timer{ - id = "soli 1"; - name = "Solitary 1 Timer"; + id = "solitary1"; pixel_x = 32 }, /obj/effect/turf_decal/trimline/darkblue/filled/line{ @@ -47300,15 +46986,8 @@ dir = 8 }, /obj/machinery/light/directional/south, -/obj/item/kirbyplants/random, /turf/open/floor/iron, /area/hallway/primary/fore) -"vix" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "viz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -47327,17 +47006,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/commons/cryopods) -"viD" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/obj/machinery/light/small/directional/west, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/starboard) "viF" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue/darkblue{ @@ -47388,6 +47056,14 @@ /obj/item/flashlight/lamp/green, /turf/open/floor/carpet/red, /area/commons/vacant_room/office) +"vjN" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/light/small/directional/east, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/wood, +/area/service/library) "vjW" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -47454,6 +47130,16 @@ /obj/structure/flora/tree/dead, /turf/open/floor/plating/asteroid/snow/standard_air, /area/science/research) +"vmS" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Escape Airlock"; + safety_mode = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/exit/departure_lounge) "vnb" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/corner{ @@ -47521,6 +47207,10 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"vqm" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard) "vqw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -47600,12 +47290,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/medical/surgery/room_b) -"vsC" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/glass/reinforced, -/area/hallway/primary/starboard) "vsE" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 @@ -47621,8 +47305,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/security/office) "vsR" = ( @@ -47637,6 +47319,9 @@ /obj/machinery/holopad/secure, /turf/open/floor/iron, /area/security/brig) +"vtr" = ( +/turf/open/floor/iron/dark/smooth_half, +/area/service/chapel) "vts" = ( /obj/structure/bed, /obj/item/clothing/suit/straight_jacket, @@ -47711,18 +47396,6 @@ icon_state = "panelscorched" }, /area/maintenance/starboard/fore) -"vvx" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/service/chapel) "vvy" = ( /obj/structure/chair/stool/directional/west, /turf/open/floor/plating, @@ -47821,13 +47494,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /turf/open/floor/iron, /area/engineering/atmos) -"vxN" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) "vxU" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/blue{ @@ -48026,10 +47692,10 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/office) -"vDp" = ( -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/dark, -/area/service/chapel) +"vDB" = ( +/obj/effect/spawner/random/structure/tank_holder, +/turf/open/floor/plating, +/area/maintenance/starboard) "vDD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48234,6 +47900,14 @@ }, /turf/open/floor/iron, /area/engineering/atmos) +"vIZ" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron/chapel{ + dir = 8 + }, +/area/service/chapel) "vJp" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/closet/toolcloset, @@ -48319,7 +47993,6 @@ /area/medical/medbay/aft) "vLz" = ( /obj/structure/bed/roller, -/obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/security/brig) "vLE" = ( @@ -48404,13 +48077,6 @@ "vOB" = ( /turf/closed/wall, /area/engineering/supermatter/room) -"vOL" = ( -/obj/structure/filingcabinet, -/obj/machinery/power/apc/auto_name/north, -/obj/structure/cable, -/obj/machinery/light/small/directional/west, -/turf/open/floor/wood, -/area/service/library) "vOZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -48463,14 +48129,6 @@ }, /turf/open/floor/iron, /area/science/mixing) -"vPY" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "vQv" = ( /obj/structure/cable, /turf/open/floor/plating{ @@ -48490,16 +48148,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/engineering/main) -"vQK" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/west, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) "vQL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48532,19 +48180,6 @@ /obj/machinery/computer/security/mining, /turf/open/floor/iron, /area/cargo/miningdock) -"vRv" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Escape" - }, -/turf/open/floor/iron/white/corner, -/area/hallway/secondary/exit/departure_lounge) -"vRM" = ( -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "vRS" = ( /obj/machinery/modular_computer/console/preset/id{ dir = 1 @@ -48569,12 +48204,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "vSp" = ( -/obj/structure/table/wood, -/obj/machinery/libraryscanner, -/obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood, -/area/service/library) +/obj/structure/disposalpipe/trunk/multiz/down, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "vSD" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -48628,12 +48261,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"vUq" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "vUy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -48677,6 +48304,13 @@ icon_state = "panelscorched" }, /area/maintenance/port/aft) +"vVy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, +/turf/open/floor/iron/sepia, +/area/service/library) "vVA" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ @@ -48720,10 +48354,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/security/brig) -"vXP" = ( -/obj/effect/spawner/random/structure/tank_holder, -/turf/open/floor/plating, -/area/maintenance/starboard) "vYa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48748,8 +48378,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/hallway/primary/central) -"vYI" = ( -/obj/structure/cable, +"vYx" = ( +/obj/structure/closet/firecloset, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/stripes/corner, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "vYW" = ( @@ -48767,16 +48400,6 @@ }, /turf/open/floor/engine, /area/engineering/supermatter/room) -"vZi" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "Escape Airlock"; - safety_mode = 1 - }, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "vZC" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/random/maintenance, @@ -48812,20 +48435,20 @@ }, /turf/open/floor/iron, /area/science/xenobiology) +"wak" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/cigarette_pack, +/obj/item/lighter/greyscale{ + pixel_x = 4; + pixel_y = 2 + }, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "waH" = ( /obj/machinery/photocopier, /obj/machinery/airalarm/directional/west, -/turf/open/floor/carpet/black, -/area/service/lawoffice) -"waP" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/machinery/navbeacon/wayfinding/library, /turf/open/floor/wood, -/area/service/library) +/area/service/lawoffice) "wbd" = ( /obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet/directional/west, @@ -48840,6 +48463,15 @@ /obj/structure/curtain, /turf/open/floor/iron/freezer, /area/command/heads_quarters/captain) +"wbk" = ( +/obj/machinery/light/directional/north, +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "wbl" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49030,8 +48662,25 @@ /turf/open/floor/iron, /area/engineering/main) "wdQ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/rack/shelf, +/obj/item/clothing/suit/hooded/wintercoat/security{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/item/clothing/suit/hooded/wintercoat/security{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/clothing/suit/hooded/wintercoat/security{ + pixel_y = 12 + }, +/obj/item/clothing/suit/hooded/wintercoat/security/peacekeeper{ + pixel_x = 12 + }, +/obj/item/clothing/suit/hooded/wintercoat/security/peacekeeper{ + pixel_x = 6 + }, +/obj/item/clothing/suit/hooded/wintercoat/security/peacekeeper, /turf/open/floor/iron/dark, /area/security/brig) "weo" = ( @@ -49056,6 +48705,36 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/office) +"wfc" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west, +/obj/machinery/dryer{ + dir = 4; + pixel_x = -6; + pixel_y = -6 + }, +/turf/open/floor/iron, +/area/service/salon) +"wfe" = ( +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/effect/spawner/random/structure/table_fancy, +/turf/open/floor/wood, +/area/service/library) "wfk" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -49133,11 +48812,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"whs" = ( -/obj/structure/table, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) "whM" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -49223,9 +48897,6 @@ /obj/structure/lattice, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/surface/outdoors) -"wjT" = ( -/turf/open/floor/engine/cult, -/area/service/library) "wkk" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/meter, @@ -49293,6 +48964,11 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"wlJ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "wlS" = ( /obj/machinery/door/airlock/medical/glass{ name = "Hydroponics"; @@ -49341,11 +49017,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/command/gateway) -"wnx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/hallway/secondary/exit/departure_lounge) "wnK" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ @@ -49471,6 +49142,9 @@ /obj/item/stack/sheet/glass/fifty, /turf/open/floor/iron, /area/engineering/atmos/project) +"wrB" = ( +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/surface/outdoors) "wsh" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -49647,14 +49321,6 @@ "wxV" = ( /turf/closed/wall/r_wall, /area/command/gateway) -"wys" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/iron/chapel{ - dir = 1 - }, -/area/service/chapel) "wyt" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/iron/freezer, @@ -49666,12 +49332,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engineering/atmos/project) -"wzU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "wzX" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters"; @@ -49856,13 +49516,17 @@ /obj/item/hand_labeler, /turf/open/floor/iron/white, /area/medical/pharmacy) +"wEa" = ( +/obj/structure/cable, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "wEd" = ( /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/darkblue/filled/corner, /turf/open/floor/iron, /area/security/brig) "wEo" = ( @@ -49953,16 +49617,16 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron, /area/maintenance/department/electrical) -"wGY" = ( -/obj/structure/sign/warning/securearea{ - pixel_x = 32 - }, -/turf/open/floor/plating/snowed/smoothed/icemoon, -/area/icemoon/surface/outdoors) "wHc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria, /area/command/heads_quarters/rd) +"wHe" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "wHl" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49972,6 +49636,15 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"wHo" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "wHs" = ( /obj/structure/railing{ dir = 1 @@ -50034,13 +49707,18 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/port) +"wJg" = ( +/obj/effect/landmark/start/hangover, +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet, +/area/service/library) "wJi" = ( /obj/structure/window/reinforced/plasma{ dir = 8 }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/machinery/power/grounding_rod/anchored, /turf/open/floor/engine, /area/engineering/supermatter) "wJm" = ( @@ -50059,6 +49737,11 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"wJz" = ( +/obj/machinery/skill_station, +/obj/machinery/bounty_board/directional/north, +/turf/open/floor/wood, +/area/service/library) "wJF" = ( /obj/item/paper_bin{ pixel_x = -3; @@ -50079,6 +49762,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/science/genetics) +"wKL" = ( +/obj/effect/spawner/structure/window, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains1" + }, +/turf/open/floor/plating, +/area/service/salon) "wKQ" = ( /obj/machinery/light/directional/east, /obj/structure/sign/poster/official/random{ @@ -50196,14 +49886,6 @@ /mob/living/simple_animal/hostile/lizard/wags_his_tail, /turf/open/floor/iron, /area/service/janitor) -"wOC" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "wOE" = ( /obj/structure/sign/warning/radiation, /turf/closed/wall/r_wall, @@ -50339,6 +50021,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"wRp" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/cafeteria, +/area/hallway/secondary/exit/departure_lounge) "wRD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50370,13 +50059,6 @@ /obj/structure/cable, /turf/open/floor/plastic, /area/hallway/secondary/service) -"wRZ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "wSa" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/blue, @@ -50642,10 +50324,11 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"wXu" = ( -/obj/structure/chair, -/obj/structure/chair, -/turf/open/floor/iron/cafeteria, +"wXs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) "wXA" = ( /obj/structure/cable, @@ -50663,13 +50346,21 @@ "wXS" = ( /turf/closed/wall/r_wall, /area/command/heads_quarters/hop) -"wYy" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" +"wYc" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark/side{ + dir = 1 }, -/turf/open/floor/iron/sepia, -/area/service/library) +/area/hallway/primary/starboard) +"wYY" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/hallway/secondary/exit/departure_lounge) "wZe" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/door/poddoor/preopen{ @@ -50684,22 +50375,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/maintenance/port) -"wZs" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/crowbar, -/obj/item/wirecutters, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "wZJ" = ( /obj/structure/table/glass, /obj/item/restraints/handcuffs/cable/zipties, @@ -50798,22 +50473,6 @@ }, /turf/open/floor/iron, /area/maintenance/starboard/fore) -"xcT" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 32 - }, -/turf/open/floor/plating/catwalk_floor, -/area/maintenance/starboard/fore) -"xdh" = ( -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "xdv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /turf/open/floor/iron, @@ -50928,19 +50587,13 @@ "xgg" = ( /turf/open/floor/iron, /area/commons/storage/art) -"xgn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +"xgk" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera{ + c_tag = "Chapel Mass Driver" }, -/obj/structure/cable, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/engineering/supermatter) +/turf/open/floor/iron/dark, +/area/service/chapel) "xgw" = ( /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/white, @@ -50981,8 +50634,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/machinery/firealarm/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/security/office) "xhI" = ( @@ -51133,15 +50786,6 @@ }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) -"xlk" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen/fountain, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "xlv" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/plating, @@ -51175,17 +50819,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/supply) -"xlY" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "Security Escape Airlock"; - req_access_txt = "2"; - safety_mode = 1 - }, -/turf/open/floor/plating, -/area/hallway/secondary/exit/departure_lounge) "xmL" = ( /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/freezer, @@ -51196,13 +50829,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"xmX" = ( -/obj/structure/table/glass, -/obj/item/storage/fancy/candle_box, -/turf/open/floor/iron/chapel{ - dir = 4 - }, -/area/service/chapel) "xna" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -51240,6 +50866,16 @@ }, /turf/open/floor/iron/white, /area/science/mixing) +"xok" = ( +/obj/machinery/camera{ + c_tag = "Departure Lounge East"; + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "xon" = ( /obj/machinery/door/firedoor, /obj/machinery/camera{ @@ -51394,17 +51030,6 @@ /obj/structure/cable, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors) -"xrZ" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/service/chapel) "xse" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -51497,15 +51122,6 @@ dir = 6 }, /area/science/research) -"xuc" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/airalarm/directional/south, -/obj/structure/closet/crate/bin, -/obj/effect/spawner/random/trash/food_packaging, -/turf/open/floor/iron/cafeteria, -/area/hallway/secondary/exit/departure_lounge) "xun" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/ai_all, @@ -51554,6 +51170,13 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/white, /area/medical/medbay/aft) +"xwk" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "xwl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ @@ -51591,6 +51214,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/electrical) +"xxb" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen/fountain, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "xxe" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -51643,6 +51275,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/office) +"xyn" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/service/chapel) "xyN" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 8; @@ -51670,20 +51316,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) -"xzs" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light_switch/directional/west, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "xzt" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -51729,6 +51361,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/cargo/office) +"xAN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/hallway/secondary/exit/departure_lounge) "xAV" = ( /turf/closed/wall, /area/security/brig) @@ -51746,16 +51383,12 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/security/brig) "xBn" = ( /obj/structure/cable, /turf/open/floor/iron, /area/commons/dorms) -"xBy" = ( -/turf/closed/wall/r_wall, -/area/hallway/secondary/exit/departure_lounge) "xBH" = ( /obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/trimline/green/filled/line, @@ -51771,6 +51404,9 @@ /obj/structure/flora/grass/green, /turf/open/floor/plating/asteroid/snow/standard_air, /area/science/research) +"xCD" = ( +/turf/closed/wall/ice, +/area/icemoon/surface/outdoors) "xCR" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -51835,6 +51471,32 @@ }, /turf/open/floor/engine, /area/engineering/supermatter/room) +"xFs" = ( +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/structure/window{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Salon" + }, +/turf/open/floor/iron, +/area/service/salon) +"xFy" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/starboard) "xFL" = ( /obj/structure/disposalpipe/junction/flip{ dir = 8 @@ -51863,6 +51525,20 @@ }, /turf/open/floor/iron, /area/engineering/atmos) +"xGR" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/shovel, +/obj/item/flashlight, +/obj/item/flashlight, +/obj/machinery/camera{ + c_tag = "Departure Lounge Emergency EVA"; + dir = 6 + }, +/obj/item/radio/off, +/turf/open/floor/iron/white, +/area/hallway/secondary/exit/departure_lounge) "xGS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/directional/west, @@ -51905,13 +51581,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood, /area/commons/dorms) -"xHL" = ( -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/hallway/secondary/exit/departure_lounge) "xHX" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/tile/neutral{ @@ -52074,14 +51743,6 @@ /obj/item/clothing/mask/gas, /turf/open/floor/iron, /area/engineering/atmos) -"xLo" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/carpet, -/area/service/library) "xLr" = ( /turf/open/floor/wood, /area/hallway/secondary/service) @@ -52224,11 +51885,13 @@ /obj/structure/railing, /turf/open/floor/plating, /area/maintenance/department/medical) +"xRl" = ( +/obj/structure/table/glass, +/obj/item/storage/book/bible, +/turf/open/floor/iron/chapel, +/area/service/chapel) "xRw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/darkblue/filled/line{ - dir = 4 - }, /turf/open/floor/iron, /area/security/brig) "xRU" = ( @@ -52353,11 +52016,6 @@ /obj/structure/cable, /turf/open/floor/iron/freezer, /area/service/kitchen/coldroom) -"xVA" = ( -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/hallway/primary/starboard) "xVB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ @@ -52397,6 +52055,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/commons/dorms) +"xXc" = ( +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/service/library) "xXl" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -52422,18 +52087,6 @@ "xXp" = ( /turf/closed/wall, /area/medical/break_room) -"xXA" = ( -/obj/structure/railing, -/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/darkblue/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/brig) "xXP" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/wall, @@ -52488,25 +52141,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/medical/surgery) +"yaO" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron/chapel{ + dir = 1 + }, +/area/service/chapel) "yaX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/commons/locker) -"ybQ" = ( -/obj/machinery/newscaster/directional/west, -/turf/open/floor/wood, -/area/service/library) "ybV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/iron, /area/cargo/storage) -"ybY" = ( -/obj/effect/decal/cleanable/dirt, -/turf/closed/wall, -/area/commons/vacant_room/commissary) "ybZ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -52714,10 +52367,6 @@ /obj/machinery/light/directional/west, /turf/open/openspace, /area/science/xenobiology) -"yhQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/security/office) "yhS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -52813,6 +52462,9 @@ /obj/structure/table/greyscale, /turf/open/floor/iron/large, /area/service/kitchen/diner) +"yjv" = ( +/turf/open/floor/iron/dark/smooth_edge, +/area/service/chapel) "yjw" = ( /obj/machinery/light/directional/east, /obj/machinery/disposal/bin, @@ -75181,12 +74833,12 @@ aPL ldi upj wtM -aPz -bji -sir -uVg -aSg -jUV +plT +plT +plT +plT +plT +geI wZp aPz aPz @@ -75399,20 +75051,20 @@ aaV aaR abE bQM -dbt -wGY boP boP boP boP boP -dbt -dbt -dbt boP -dbt +boP +drh +drh +drh +boP +drh pps -dbt +drh boP boP boP @@ -75438,14 +75090,14 @@ rBh ldi sSi pEo -aPz -aPz -aPz -aPz -aPz -xrz -aPz -aPz +plT +ihf +jeg +deP +plT +gKT +plT +plT fQM tel fQM @@ -75657,7 +75309,7 @@ vCy aVn bQM oCp -kQs +ekj boP boP boP @@ -75695,14 +75347,14 @@ oZI oZI oZI oZI -qEX -ihH -wZs -rCr -xzs -pUg -uqs -jCM +plT +fhV +jMs +heT +fCj +oLC +wfc +hTm fbB tel mUo @@ -75914,7 +75566,7 @@ aLs abd bQM fCY -xHA +kQs boP boP boP @@ -75952,14 +75604,14 @@ oZI ykY mzO fQp -qEX -sMx -wOC -ssV -ssV -fyW -gMI -qEX +plT +qSc +fIS +hVx +wHo +pGI +njV +plT qos lfk kRL @@ -76209,14 +75861,14 @@ oMA ewl jIw flW -qEX -pmn -jUa -lHp -dLo -pAI -qpl -qEX +plT +xFs +aST +nJs +qgx +gqL +uIu +plT pPD xxr roq @@ -76409,7 +76061,7 @@ gQb gQb gQb gQb -blq +pDn gQb gQb gQb @@ -76466,14 +76118,14 @@ xkf qra iZJ xkS -qEX -huA -jUa -jUa -wRZ -eCM -kMq -qEX +plT +ble +rRJ +tlu +qgx +slE +lXL +plT jJX kHP kIT @@ -76664,10 +76316,10 @@ gQb gQb gQb gQb -blq +pDn gQb -blq -blq +pDn +pDn gQb gQb boP @@ -76684,8 +76336,8 @@ tJF vCy nlT abJ -sDK -uDk +liB +liB dfx xho ajs @@ -76723,14 +76375,14 @@ oMA wVe fNY qMs -qEX -tju -tXN -umQ -hgp -lhr -iUM -qEX +plT +rCw +nxv +djZ +aST +qgx +pMQ +plT emT lFU kIT @@ -76921,10 +76573,10 @@ gQb gQb gQb gQb -blq -blq -blq -blq +pDn +pDn +pDn +pDn gQb gQb boP @@ -76943,7 +76595,7 @@ bQM bQM ace adC -yhQ +liB sDK pPB xHA @@ -76980,14 +76632,14 @@ oZI pDc jNa pBs -qEX -qEX -gpU -gpU -qEX -ybY -jFS -jCM +plT +plT +wKL +plT +pxD +ryp +sKa +hTm fwA sAm lTT @@ -77178,11 +76830,11 @@ gQb gQb gQb gQb -blq -blq -blq -blq -blq +pDn +pDn +pDn +pDn +pDn gQb xrp xrp @@ -77237,14 +76889,14 @@ oZI oMA oMA oMA -qEX +plT bCA -orS -orS -qyN -qMP -pvr -qEX +rdP +eJv +kyl +rdP +sIV +plT tel tel nRi @@ -77435,12 +77087,12 @@ gQb gQb gQb gQb -blq -blq +pDn +pDn dlC -blq -blq -blq +pDn +pDn +pDn xrp pyH sjW @@ -77692,12 +77344,12 @@ gQb gQb gQb gQb -blq -blq +pDn +pDn jlI -blq -blq -blq +pDn +pDn +pDn aQB rdV iYl @@ -77948,13 +77600,13 @@ gQb gQb gQb gQb -blq -blq -blq +pDn +pDn +pDn ooX -blq -blq -blq +pDn +pDn +pDn aQB tfk rCT @@ -78205,13 +77857,13 @@ gQb gQb gQb gQb -blq -blq +pDn +pDn pWU bHr lSi -blq -blq +pDn +pDn aQB vqW wTP @@ -78462,13 +78114,13 @@ gQb gQb gQb gQb -blq -blq +pDn +pDn tkt tnq mcr -blq -blq +pDn +pDn xrp vPG vrd @@ -78719,7 +78371,7 @@ gQb gQb gQb gQb -blq +pDn amG fei fei @@ -79008,7 +78660,7 @@ asw lgf jGf pUB -pus +gVQ cxz dNU mBK @@ -79265,7 +78917,7 @@ lgf oXx srF pUB -pus +gVQ cxz eZw scD @@ -79521,7 +79173,7 @@ pUB aex pUB pUB -pUB +xAV dDD pYR azu @@ -79777,7 +79429,7 @@ lAH wlv fQd wlv -cxb +wlv lyx jrB cxz @@ -80032,7 +79684,7 @@ gle wEd xRw fhn -hQZ +xRw dyG slV uKo @@ -80271,7 +79923,7 @@ ifl sZe vxb amG -dbz +sNO yhW yhW yhW @@ -80289,7 +79941,7 @@ tdT uBR kul fMj -uEv +yag cSq atz atz @@ -80904,7 +80556,7 @@ dTq fje fsb hZR -xgn +uIm uDd fsb gbv @@ -81810,11 +81462,11 @@ boP boP atz tLb -drh -pDn -ifA +tLb +tLb +atz frw -edV +bSL edV edV bTY @@ -82065,15 +81717,15 @@ boP boP boP boP -atz -bSL -ekj -kxN bQt +edV +edV +edV +atz nlR pxL -elQ -edV +pxL +bIl tAD yhW yhW @@ -82320,13 +81972,13 @@ gQb boP boP boP -dbt -atz -atz -atz -atz -gLy +boP +boP +bQt edV +edV +edV +bQt fCr uzE wPF @@ -82577,14 +82229,14 @@ gQb boP boP boP -dbt -bIl -usy +boP +boP +atz wdQ mAm oHv -heD -xXA +atz +dbz yhW yhW yhW @@ -82834,8 +82486,8 @@ gQb boP boP boP -dbt -atz +boP +boP atz atz atz @@ -83373,8 +83025,8 @@ lyU xPk rIp xAV -bLQ -bLQ +xAV +xAV atz vub cIs @@ -84144,8 +83796,8 @@ rRc nfO wvL xAV -bLQ -bLQ +xAV +xAV atz kJE cIs @@ -84915,12 +84567,12 @@ wHs nfO anO xAV -bLQ -bLQ +xAV +xAV atz kJE lyT -rHV +xpk ahn aqj ahn @@ -85177,7 +84829,7 @@ amr bLQ rDm auB -oPe +xpk ahn aqj ahn @@ -85430,7 +85082,7 @@ nfO hyC alc lgf -fVM +dZz bLQ oVL auB @@ -85677,7 +85329,7 @@ oBz rQf oBz oBz -aUi +oBz oBz pcn oBz @@ -85686,8 +85338,8 @@ aji nfO ajn xAV -bLQ -bLQ +xAV +xAV atz eFx nsA @@ -85934,7 +85586,7 @@ jfz jfz jfz jfz -sNl +jfz jfz bUr jfz @@ -86966,7 +86618,7 @@ xAV nnr adB cAN -nDj +qnS afz kqr fmx @@ -87481,7 +87133,7 @@ gZt atz aib anc -afG +mBM bgv gMR xAV @@ -95228,9 +94880,9 @@ alP alP alP alP -gMb +rjL koY -vUq +pFj bdl bdl bcj @@ -95480,9 +95132,9 @@ alP alP hvI iyq -uPt +dyz iyq -nCb +rxK iyq pXx hpQ @@ -95731,10 +95383,10 @@ alP xyN sgI alP -vOL -ybQ -hPp -rXS +kmP +kiP +oyV +qdu siL pTQ siL @@ -95742,10 +95394,10 @@ nqI siL vKY pXx -egV +bdp bci -vPY -vPY +bar +bar bci dYh bfU @@ -95989,18 +95641,18 @@ aEa mbT wRm dFX -tQK -nbH -cNp +gjt +nFt +fgA siL pTQ siL -tOe +kNl siL vKY pXx -gAR -wYy +ppE +vVy pXx pXx kAE @@ -96245,7 +95897,7 @@ aCC vYa alP alP -gJk +ogu dTn vMz thg @@ -96255,10 +95907,10 @@ nhQ hKw nhQ nhQ -xLo -reB -lSJ -pjT +qqS +ucd +kvK +dGK pXx aYV cOV @@ -96502,7 +96154,7 @@ alP aED alP wcH -hqA +gQR chP vMz thg @@ -96513,7 +96165,7 @@ nhQ hKw nhQ nhQ -sfc +aeq nhQ tVI pXx @@ -96752,27 +96404,27 @@ aBF alP mdr alP -rRO -fhb +vSp +aAv ocm alP aED alP -jTi -qGA +wJz +kaN laM pQk qIn siL -lGa -dVP -lGa +mjl +ikx +mjl siL fKz -waP -sfc +eCs +aeq nhQ -aFc +eMg hyo aYV ykz @@ -97009,17 +96661,17 @@ atw alP rCp alP -lMS -pCs -gws +gRe +pFI +ikt alP aED alP -jGR -dFI -rUf -qZU -eqc +vjN +hDz +sbs +lmp +rWS siL siL siL @@ -97027,7 +96679,7 @@ siL siL siL csr -sfc +aeq nhQ csr pXx @@ -97266,31 +96918,31 @@ aqy alP awJ alP -cfr -xcT -tAl -gAs +uRp +tIU +njr +mIk aEa alP pXx -apW -qif +ewX +lkg pXx pXx -uEj -lGa -fGF -gWA +pbq +mjl +sQM +mek siL siL oOj -sfc +aeq kuN mXU hyo rmv ykz -oNQ +jwB bfV hKu cHM @@ -97529,10 +97181,10 @@ alP alP apl alP -cWi -sFd -dMZ -sJp +isp +fwJ +evE +lzK pXx pXx pXx @@ -97546,7 +97198,7 @@ nhQ len pXx bcq -bPu +gGr bcq bfV bfV @@ -97779,26 +97431,26 @@ hin alP alP anf -nAo -ehf +rwx +oFx apE awF anf apl alP -cjH -lAv -lAv -swz +xXc +pfQ +pfQ +fUp pXx cnF -gMt +hwg rRH pXx nfk siL gZl -jBf +wJg nhQ dRT hyo @@ -98036,28 +97688,28 @@ alP alP hhu anf -the +qlS arI arI arI arI apl alP -cjH -lAv -lAv -swz +xXc +pfQ +pfQ +fUp pXx -jsP -sFG -wjT -sYP +oKL +olF +rvZ +mas siL hgT -vSp -syx -syx -kui +qvk +iMW +iMW +qks pXx bga ykz @@ -98298,22 +97950,22 @@ anf apE auD anf -bBJ +nke alP -eBr -lAv -lAv -irh +uhu +pfQ +pfQ +tla pXx -mhL -pyg -obE +pfA +mQH +nJn pXx -sVa -rAT +pxt +osm pXx -pkR -lYK +dhG +uyx pXx pXx aYV @@ -98555,12 +98207,12 @@ atw apE aoQ anf -bBJ +nke alP -aIu -lAv -lAv -fBq +nnT +pfQ +pfQ +lcU pXx pXx pXx @@ -98569,9 +98221,9 @@ pXx pXx pXx pXx -vvx -cUf -eXU +orc +cpd +mGF bHW aYV ykz @@ -98811,26 +98463,26 @@ xwX avo alP alP -nBS -wzU +dWU +jBL alP -aIu +nnT siL siL -dZf +oyD hyo -eXU -dWq -eXU -eXU -lgA -eXU -dWq -eXU -eXU -eXU +mGF +jbu +mGF +mGF +scx +mGF +jbu +mGF +mGF +mGF hAl -vbH +bcx ykz aYV nIS @@ -99068,26 +98720,26 @@ gWs avN biJ alP -xlk -wzU +xxb +jBL alP -dZu -ikD -dzS -eLF +kgg +wfe +oaL +iyI hyo -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -viD -xVA +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +cTi +gMe isY duo aFp @@ -99326,25 +98978,25 @@ auJ iBZ alP alP -dgS +rdF alP pXx pXx pXx pXx pXx -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -neV -ewW -vsC -xVA +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +jlj +qmm +nfn +gMe ykz aYV kld @@ -99582,26 +99234,26 @@ aDL aHf bbk asB -pCH -mXG -uXy -gCS -xrZ +ekv +qNW +kkQ +pwW +iIO bHW -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -qwv -nCE -buF -xVA +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +dif +hOR +tVj +gMe ykz gdd bfX @@ -99839,26 +99491,26 @@ dsF dnS aAz asB -qze -sse -kbd -eXU -eXU +mpc +lfw +ldf +mGF +mGF bHW -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -qwv -iJf -buF -nHr +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +dif +mAw +tVj +eIf ykz aYV xXm @@ -100096,26 +99748,26 @@ xzt wGT asB asB -buE -hbE -quE -eXU -eXU +jcX +syC +lQK +mGF +mGF bHW -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -qwv -owu -buF -nOe +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +dif +rZt +tVj +wYc ykz aYV bfX @@ -100353,26 +100005,26 @@ auJ luo iBZ asB -tfi -gaR -cvD -mER -mER +xgk +lUy +jtu +lqE +lqE hAl hAl hAl -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -fzM -kEz -fQP -xVA +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +hGA +xFy +qPd +gMe sqp aYV bgb @@ -100610,26 +100262,26 @@ oLd cUM vDQ asB -aUa -sgD -fFu +yjv +vtr +hAe vIb vIb -jFP -vDp +jmU +iiS bHW -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -eXU -aej -xVA +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +mGF +sMO +gMe ykz shF bgc @@ -100870,25 +100522,25 @@ asB hAl wAq hAl -wys -hLq -wys -hLq +yaO +vIZ +yaO +vIZ bHW -eXU -ngm -eXU -eXU -sGg -eXU -ngm -eXU -eXU -eXU +mGF +fbs +mGF +mGF +kOy +mGF +fbs +mGF +mGF +mGF hAl -iaN +chV iKz -saa +trl bgc sDt biW @@ -101125,23 +100777,23 @@ blq blq aER hAl -jvL +nhr eBB -xmX -ocG +nsr +pMS rCe -oDa -xBy -xBy -xBy -xBy -xBy -sXs -sXs -sXs -fcG -bqC -eXU +xRl +lwl +lwl +lwl +lwl +lwl +aNa +aNa +aNa +xyn +gLh +mGF bHW nPA ykz @@ -101388,22 +101040,22 @@ eBB eBB eBB eBB -xBy -ikn -kKi -oUW -xBy -hXc -hEw -sXs -lsr -lsr -sXs -sXs -rHe -dOm -vRv -xBy +lwl +xGR +aSZ +gBF +lwl +iET +aUL +aNa +aZj +aZj +aNa +aNa +tYE +nlx +lxb +lwl iaJ iaJ iaJ @@ -101645,26 +101297,26 @@ blq blq blq blq -iHy -hTp -mmt -vix -iHy -jko -mYr -qFP -mYr -mYr -vQK -nSO -tMl -jym -nXa -xuc +mjd +aOb +iVe +wXs +mjd +aTk +axA +rNw +axA +axA +mzH +baE +bcA +bdz +beJ +bge bky -vXP -nfX -rFh +vDB +uvA +gzE iaJ bnr bon @@ -101902,22 +101554,22 @@ blq blq blq blq -iHy -byb -iZE -tVM -shq -upR -vYI -lcY -jsI -uKr -bku -uGk -gVI -nrT -bAT -tmP +mjd +kqw +aVX +wEa +aRL +rJG +kcN +oaz +pNE +aZk +iTm +fcM +bcz +sAc +aPq +hTR bhH kyZ kyZ @@ -102159,22 +101811,22 @@ blq blq blq blq -xBy -xBy -xBy -xBy -xBy -shP -vYI -vxN -eWo -mUu -uTM -nHX -kPi -eWo -vRM -uut +lwl +lwl +lwl +lwl +lwl +ouU +kcN +wRp +cBl +ihB +keP +lNg +bcC +cBl +aHJ +bgg bky bky bky @@ -102416,27 +102068,27 @@ blq blq blq blq -xBy -iUh -nnS -cJR -xBy -ddd -vYI -kPi -rZB -mUu -uTM -nHX -kPi -rZB -vRM -oKn -sXs +lwl +aOc +aPs +iwz +lwl +wYY +kcN +bcC +lOT +ihB +keP +lNg +bcC +lOT +aHJ +bgf +aNa gMv bky -tvu -tTe +sST +bwp vqI iaJ bQr @@ -102673,26 +102325,26 @@ blq blq blq blq -xBy -tji -vRM -bdY -xBy -xHL -vYI -jFM -lGs -gxs -uTM -esw -aaT -whs -vRM -kPn -sXs +lwl +gvN +aHJ +aQF +lwl +aTn +kcN +hBI +ctR +wlJ +keP +cyp +wak +bdA +aHJ +ciC +aNa gMv bky -rux +vqm bky fnh iaJ @@ -102930,23 +102582,23 @@ blq blq blq blq -iHy -oaf -vRM -nXa -iHy -vRM -vYI -kPi -rZB -mUu -uTM -nHX -kPi -eWo -vRM -cyN -sXs +mjd +xwk +aHJ +beJ +mjd +aHJ +kcN +bcC +lOT +ihB +keP +lNg +bcC +cBl +aHJ +oWR +aNa gMv bky blP @@ -103187,24 +102839,24 @@ blq blq blq pjX -iHy -bBA -wnx -sNb -mlD -vYI -vYI -kPi -eWo -mUu -uTM -nHX -vxN -wXu -vRM -ayh -sXs -koL +mjd +wbk +xAN +lDR +cZY +kcN +kcN +bcC +cBl +ihB +keP +lNg +wRp +aQE +aHJ +vYx +aNa +xCD bky blR bky @@ -103444,23 +103096,23 @@ blq blq boP pjX -iHy -oaf -cMi -dAY -iHy -vRM -vRM -hOQ -sPX -jOI -tJK -rSe -nBj -vRM -vRM -uoM -qKH +mjd +xwk +fzC +wHe +mjd +aHJ +aHJ +ljT +dLk +qPA +fDT +gTb +gFs +aHJ +aHJ +inF +nqS pjX bky cyC @@ -103701,23 +103353,23 @@ boP boP boP pjX -iHy -ekK -lCC -vRM -iHy -vRM -lCC -lCC -lCC -aOG -lCC -vRM -qRt -vRM -lCC -sXq -qKH +mjd +kut +nSO +aHJ +mjd +aHJ +nSO +nSO +nSO +xok +nSO +aHJ +pVz +aHJ +nSO +eHf +nqS pjX pjX pjX @@ -103954,27 +103606,27 @@ boP boP boP boP -dbt -dbt +wrB +wrB boP pjX -iHy -iHy -iHy -hOP -iHy -cQI -qKH -qKH -qKH -qKH -qKH -vZi -qKH -pgY -qKH -qKH -qKH +mjd +mjd +mjd +cyh +mjd +dFz +nqS +nqS +nqS +nqS +nqS +aTo +nqS +cyr +nqS +nqS +nqS pjX boP boP @@ -104217,24 +103869,24 @@ boP pjX pjX pjX -qKH -hki -qKH -hki -qKH +nqS +snl +nqS +snl +nqS pjX -gNp +kvl pjX -qKH -hki -qKH -hki -qKH +nqS +snl +nqS +snl +nqS pjX pjX pjX boP -dbt +wrB boP boP boP @@ -104469,24 +104121,24 @@ boP boP boP boP -dbt +wrB boP boP boP boP -qKH -hki -qKH -hki -qKH +nqS +snl +nqS +snl +nqS boP boP boP -qKH -hki -qKH -hki -qKH +nqS +snl +nqS +snl +nqS boP boP boP @@ -104495,7 +104147,7 @@ boP boP boP boP -dbt +wrB boP bky btp @@ -104729,28 +104381,28 @@ boP boP boP boP -dbt +wrB boP -qKH -iWJ -qKH -xdh -qKH +nqS +iHD +nqS +odQ +nqS boP boP boP -qKH -iWJ -qKH -xdh -qKH +nqS +iHD +nqS +odQ +nqS boP boP boP boP boP boP -dbt +wrB boP boP boP @@ -104988,19 +104640,19 @@ boP boP boP boP -qKH -hki -qKH -hki -qKH +nqS +snl +nqS +snl +nqS boP boP boP -qKH -hki -qKH -hki -qKH +nqS +snl +nqS +snl +nqS boP boP boP @@ -105245,19 +104897,19 @@ boP boP boP boP -qKH -xlY -qSQ -sQw -qKH +nqS +sAq +aGp +vmS +nqS boP boP boP -qKH -sQw -qSQ -rnI -qKH +nqS +vmS +aGp +gZV +nqS boP boP boP diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm index 96ad9daa063..7624f634284 100644 --- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm +++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm @@ -3840,6 +3840,13 @@ /obj/structure/filingcabinet, /turf/open/floor/iron/grimy, /area/security/detectives_office) +"aGA" = ( +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains1" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/service/salon) "aGE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9422,6 +9429,8 @@ icon_state = "L11" }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) "bVm" = ( @@ -10105,6 +10114,16 @@ }, /turf/open/floor/iron/white, /area/medical/office) +"cdw" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/salon) "cdy" = ( /obj/structure/cable, /obj/effect/landmark/start/medical_doctor, @@ -12065,6 +12084,15 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/medical/medbay/central) +"cvt" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/closet/secure_closet/barber, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/service/salon) "cvA" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet2"; @@ -13446,11 +13474,6 @@ }, /turf/open/floor/circuit/telecomms/server, /area/science/server) -"cJY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/wood, -/area/command/corporate_showroom) "cKw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -15676,10 +15699,15 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "doK" = ( -/obj/effect/landmark/event_spawn, /obj/structure/cable, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/table/wood/shuttle_bar, +/obj/item/lipstick/random, +/turf/open/floor/iron, +/area/service/salon) "doO" = ( /obj/machinery/vending/hydronutrients, /obj/machinery/light/directional/north, @@ -17269,11 +17297,17 @@ /turf/open/floor/iron, /area/construction/mining/aux_base) "dOr" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/west, -/obj/structure/cable, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/dryer{ + dir = 4; + pixel_x = -6; + pixel_y = -6 + }, +/turf/open/floor/iron, +/area/service/salon) "dOx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit/green, @@ -18830,17 +18864,16 @@ /turf/open/floor/iron/white, /area/science/mixing) "eqO" = ( -/obj/machinery/light_switch/directional/north, -/obj/machinery/light/small/directional/north, -/obj/structure/table/wood, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/under/suit/black_really, -/obj/item/clothing/glasses/sunglasses, /obj/machinery/camera{ - c_tag = "Corporate Showroom" + c_tag = "Salon" }, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/sofa/bench/right, +/turf/open/floor/iron, +/area/service/salon) "ero" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -19465,15 +19498,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/science/mixing) -"eCo" = ( -/obj/structure/showcase/machinery/tv{ - dir = 1; - pixel_x = 2; - pixel_y = 3 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet, -/area/command/corporate_showroom) "eCr" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -20112,14 +20136,15 @@ /turf/open/floor/iron/solarpanel/airless, /area/solars/port/fore) "eMC" = ( -/obj/structure/sign/plaques/kiddie/perfect_drone{ - pixel_y = 32 +/obj/structure/bed/pod, +/obj/machinery/light/warm/directional/north, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/structure/table/wood, -/obj/item/storage/backpack/duffelbag/drone, -/obj/structure/window/reinforced, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/service/salon) "eMK" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -20827,6 +20852,20 @@ }, /turf/open/floor/iron, /area/engineering/main) +"eWu" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/hairbrush, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/lipstick/random, +/obj/machinery/camera{ + c_tag = "Salon - Massage Parlour"; + dir = 8 + }, +/turf/open/floor/iron, +/area/service/salon) "eWz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -22633,11 +22672,15 @@ /turf/open/floor/iron, /area/science/xenobiology) "fEL" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/holopad, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "fEM" = ( /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/misc/assistantformal, @@ -22804,12 +22847,6 @@ dir = 8 }, /area/hallway/primary/central) -"fHS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/turf/open/floor/wood, -/area/command/corporate_showroom) "fJd" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -22822,19 +22859,20 @@ /turf/open/floor/iron, /area/security/prison) "fJr" = ( -/obj/item/bodypart/chest/robot{ - pixel_x = -2; - pixel_y = 2 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/item/bodypart/head/robot{ - pixel_x = 3; - pixel_y = 2 +/obj/effect/turf_decal/tile/purple, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 }, -/obj/structure/table/wood, -/obj/machinery/airalarm/directional/west, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/structure/mirror/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/service/salon) "fJu" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -23305,13 +23343,17 @@ /turf/open/floor/iron/textured, /area/medical/medbay/central) "fRN" = ( -/obj/structure/table/wood, -/obj/item/toy/plush/carpplushie{ - color = "red"; - name = "\improper Nanotrasen wildlife department space carp plushie" +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/sofa/bench/left{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "fSm" = ( /obj/structure/table, /obj/item/storage/firstaid/brute, @@ -23542,10 +23584,18 @@ /turf/open/floor/plating, /area/maintenance/starboard) "fWT" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken3" +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/area/command/corporate_showroom) +/obj/machinery/door/airlock/public{ + name = "Massage Parlour" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/service/salon) "fWV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -23694,15 +23744,18 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/medical) "gag" = ( -/obj/structure/window/reinforced, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/showcase/machinery/implanter{ - layer = 2.7; - pixel_y = 4 +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/structure/mirror/directional/east, +/obj/item/reagent_containers/dropper, +/obj/item/hairbrush/comb{ + pixel_y = 10 + }, +/turf/open/floor/iron, +/area/service/salon) "gai" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24733,6 +24786,13 @@ /obj/item/barcodescanner, /turf/open/space/basic, /area/space/nearstation) +"gvK" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains" + }, +/turf/open/floor/plating, +/area/service/salon) "gvN" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/disposal/bin, @@ -25634,9 +25694,15 @@ /turf/closed/wall/mineral/plastitanium, /area/security/prison) "gMj" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "gMA" = ( /obj/structure/window/reinforced{ dir = 1; @@ -26461,11 +26527,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) -"hfX" = ( -/obj/effect/decal/cleanable/oil, -/obj/structure/cable, -/turf/open/floor/wood, -/area/command/corporate_showroom) "hfY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -28470,6 +28531,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/space_hut) +"hUi" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/service/salon) "hUs" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/neutral{ @@ -28784,16 +28854,12 @@ /area/service/lawoffice) "ibe" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Corporate Showroom"; - req_access_txt = "19" - }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "showroom" +/obj/machinery/door/airlock/public/glass{ + name = "Barbershop" }, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/turf/open/floor/iron, +/area/service/salon) "ibl" = ( /obj/machinery/airalarm/directional/south, /obj/item/stack/package_wrap{ @@ -29316,23 +29382,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) -"imx" = ( -/obj/structure/table/wood, -/obj/structure/sign/picture_frame/showroom/one{ - pixel_x = -8; - pixel_y = 32 - }, -/obj/structure/sign/picture_frame/showroom/two{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/turf/open/floor/wood, -/area/command/corporate_showroom) "imB" = ( /obj/machinery/exodrone_launcher, /turf/open/floor/plating, @@ -29493,19 +29542,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/commons/vacant_room/office) -"iov" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/bluespace_vendor/north, -/turf/open/floor/iron, -/area/hallway/primary/central) "ioR" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 5 @@ -31448,7 +31484,6 @@ icon_state = "L1" }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/central) "jbX" = ( @@ -34351,10 +34386,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/bluespace_vendor/north, /turf/open/floor/iron, /area/hallway/primary/central) "kgl" = ( @@ -35718,14 +35753,13 @@ /turf/open/floor/iron/dark/corner, /area/engineering/atmos) "kHr" = ( -/obj/structure/table/wood, -/obj/item/storage/secure/briefcase{ - desc = "A large briefcase with a digital locking system, and the Nanotrasen logo emblazoned on the sides."; - name = "\improper Nanotrasen-brand secure briefcase exhibit"; - pixel_y = 2 +/obj/structure/bed/pod, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "kHF" = ( /obj/machinery/door/poddoor{ id = "SecJusticeChamber"; @@ -37944,18 +37978,6 @@ /obj/machinery/power/apc/auto_name/west, /turf/open/floor/carpet, /area/service/chapel) -"lvR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Corporate Showroom"; - req_access_txt = "19" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "showroom" - }, -/turf/open/floor/wood, -/area/command/corporate_showroom) "lvY" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/iron, @@ -38023,9 +38045,6 @@ }, /turf/open/floor/iron/white, /area/medical/treatment_center) -"lxb" = ( -/turf/closed/wall, -/area/command/gateway) "lxj" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -38181,9 +38200,15 @@ /turf/open/space/basic, /area/space/nearstation) "lAF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/structure/table/reinforced/rglass, +/obj/item/hairbrush, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/lipstick/random, +/turf/open/floor/iron, +/area/service/salon) "lBi" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -38198,6 +38223,21 @@ /mob/living/simple_animal/hostile/lizard/wags_his_tail, /turf/open/floor/plating, /area/service/janitor) +"lBG" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/barber{ + pixel_y = 25 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "lBT" = ( /turf/open/floor/grass, /area/service/hydroponics/garden) @@ -38548,18 +38588,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/construction/storage_wing) -"lIj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Corporate Showroom"; - req_access_txt = "19" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "showroom" - }, -/turf/open/floor/wood, -/area/command/corporate_showroom) "lIl" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -38687,8 +38715,18 @@ /turf/open/floor/iron, /area/hallway/secondary/service) "lLe" = ( -/turf/closed/wall/r_wall, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Barbershop" + }, +/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, +/area/service/salon) "lLl" = ( /obj/structure/table, /obj/item/book/manual/wiki/cooking_to_serve_man, @@ -39222,12 +39260,23 @@ /turf/open/floor/plating, /area/maintenance/starboard) "lWB" = ( -/obj/item/cigbutt, /obj/machinery/light/small/directional/east, -/obj/structure/cable, /obj/machinery/power/apc/auto_name/east, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/structure/cable, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/reagent_containers/dropper/precision{ + pixel_x = -7 + }, +/obj/item/lipstick/random, +/obj/item/reagent_containers/spray/quantum_hair_dye{ + pixel_x = 6 + }, +/turf/open/floor/iron, +/area/service/salon) "lWC" = ( /obj/machinery/light/small/directional/west, /obj/machinery/navbeacon{ @@ -39452,21 +39501,14 @@ /turf/open/floor/plating, /area/maintenance/port) "lZu" = ( -/obj/item/book/manual/wiki/security_space_law{ - name = "space law"; - pixel_y = 2 - }, -/obj/item/toy/gun, -/obj/item/restraints/handcuffs, -/obj/structure/table/wood, -/obj/item/clothing/head/collectable/hos{ - name = "novelty HoS hat" - }, /obj/machinery/firealarm/directional/east, -/obj/machinery/light/small/directional/east, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/service/salon) "lZB" = ( /obj/structure/table, /obj/item/aicard, @@ -39604,9 +39646,13 @@ /turf/open/floor/iron/dark, /area/command/heads_quarters/ce) "maG" = ( -/obj/structure/cable, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/service/salon) "maH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -40846,6 +40892,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/service/theater) +"mxn" = ( +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains1" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/service/salon) "mxo" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -41200,19 +41253,19 @@ /turf/open/floor/iron, /area/commons/dorms) "mDo" = ( -/obj/structure/table/wood, -/obj/item/cigbutt/cigarbutt{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/machinery/light/directional/north, /obj/item/radio/intercom/directional/north, -/obj/item/reagent_containers/food/drinks/mug{ - pixel_x = -4; - pixel_y = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/machinery/vending/barbervend, +/obj/machinery/button/curtain{ + id = "barbershopcurtains"; + pixel_x = -25; + pixel_y = 24 + }, +/turf/open/floor/iron, +/area/service/salon) "mDG" = ( /obj/effect/turf_decal/trimline/purple/corner{ dir = 1 @@ -41289,6 +41342,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron/white, /area/science/xenobiology) +"mEu" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "mEX" = ( /obj/machinery/bookbinder, /turf/open/floor/wood, @@ -41511,22 +41572,13 @@ /turf/open/floor/iron, /area/hallway/primary/port) "mJk" = ( -/obj/item/storage/box/matches{ - pixel_x = -2; - pixel_y = 3 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = 4; - pixel_y = 1 - }, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/clothing/mask/cigarette/cigar/cohiba, -/obj/structure/table/wood, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/iron, +/area/service/salon) "mJm" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -42124,12 +42176,6 @@ }, /turf/open/floor/iron/white, /area/science/cytology) -"mTW" = ( -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/crap, -/obj/structure/table/wood, -/turf/open/floor/carpet, -/area/command/corporate_showroom) "mTX" = ( /obj/machinery/conveyor{ dir = 1; @@ -46509,6 +46555,15 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"otI" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/landmark/start/barber, +/turf/open/floor/iron, +/area/service/salon) "otK" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -47056,26 +47111,6 @@ "oEu" = ( /turf/open/floor/engine/n2, /area/engineering/atmos) -"oEA" = ( -/obj/item/disk/data{ - pixel_x = 9; - pixel_y = -1 - }, -/obj/item/disk/tech_disk{ - pixel_x = -2; - pixel_y = -3 - }, -/obj/item/disk/design_disk{ - name = "component design disk"; - pixel_y = 6 - }, -/obj/structure/table/wood, -/obj/item/toy/talking/ai{ - name = "\improper Nanotrasen-brand toy AI"; - pixel_y = 6 - }, -/turf/open/floor/carpet, -/area/command/corporate_showroom) "oEG" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -47554,20 +47589,20 @@ /turf/open/floor/plating, /area/maintenance/starboard) "oNq" = ( -/obj/structure/table/wood, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/item/poster/random_official, -/obj/structure/cable, -/obj/machinery/button/door/directional/east{ - id = "corporate_privacy"; - name = "corporate showroom shutters control"; - req_access_txt = "19" +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/structure/mirror/directional/east, +/obj/item/reagent_containers/spray/barbers_aid{ + pixel_x = 6 + }, +/obj/item/razor{ + pixel_x = -6 + }, +/turf/open/floor/iron, +/area/service/salon) "oNF" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;22;25;37;38;46" @@ -49939,12 +49974,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/medical/treatment_center) -"pGf" = ( -/obj/structure/cable, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/command/corporate_showroom) "pGk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50077,7 +50106,6 @@ icon_state = "L13" }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/central) @@ -50598,21 +50626,13 @@ /turf/open/floor/iron, /area/cargo/sorting) "pSg" = ( -/obj/structure/table/wood, -/obj/structure/sign/picture_frame/showroom/three{ - pixel_x = -8; - pixel_y = 32 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/structure/sign/picture_frame/showroom/four{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/item/paicard{ - desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; - name = "\improper Nanotrasen-brand personal AI device exhibit" - }, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/sofa/bench/left, +/turf/open/floor/iron, +/area/service/salon) "pSm" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -51930,19 +51950,6 @@ /obj/structure/marker_beacon/burgundy, /turf/open/space/basic, /area/space/nearstation) -"quu" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/central) "quD" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -53438,9 +53445,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "qUy" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/service/salon) "qUM" = ( /turf/open/floor/carpet/red, /area/cargo/qm) @@ -53701,10 +53712,6 @@ }, /turf/open/floor/iron/white, /area/security/prison) -"ram" = ( -/obj/structure/sign/warning/securearea, -/turf/closed/wall/r_wall, -/area/command/corporate_showroom) "rap" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt, @@ -53963,14 +53970,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) -"rfW" = ( -/obj/structure/showcase/machinery/microwave{ - dir = 1; - pixel_y = 2 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet, -/area/command/corporate_showroom) "rgj" = ( /obj/machinery/door/window{ name = "Captain's Desk"; @@ -55087,12 +55086,20 @@ }, /area/maintenance/starboard/fore) "rxh" = ( -/obj/item/toy/beach_ball/branded{ - pixel_y = 7 +/obj/machinery/light/warm/directional/west, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/structure/table/wood, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/item/kirbyplants/random, +/obj/machinery/button/curtain{ + id = "barbershopcurtains"; + pixel_x = -25; + pixel_y = -24 + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron, +/area/service/salon) "rxr" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -55819,13 +55826,16 @@ /turf/open/floor/wood, /area/command/heads_quarters/captain/private) "rLA" = ( -/obj/structure/showcase/perfect_employee, -/obj/structure/sign/plaques/kiddie/perfect_man{ - pixel_y = 32 +/obj/machinery/light/warm/directional/north, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/structure/window/reinforced, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/barber_chair{ + dir = 4 + }, +/turf/open/floor/iron, +/area/service/salon) "rLG" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -56230,9 +56240,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) -"rTb" = ( -/turf/closed/wall, -/area/command/teleporter) "rTj" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -56526,6 +56533,20 @@ /obj/effect/turf_decal/siding, /turf/open/floor/iron, /area/science/lab) +"rXK" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + 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, +/turf/open/floor/iron, +/area/hallway/primary/central) "rXP" = ( /obj/structure/sign/poster/random{ pixel_y = 32 @@ -56717,11 +56738,6 @@ /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/service/kitchen) -"sbY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/command/corporate_showroom) "scf" = ( /obj/machinery/light/directional/east, /obj/machinery/firealarm/directional/east, @@ -57431,8 +57447,15 @@ /turf/open/floor/iron/dark, /area/engineering/supermatter/room) "soZ" = ( -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/barber_chair{ + dir = 4 + }, +/turf/open/floor/iron, +/area/service/salon) "spg" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating, @@ -57848,6 +57871,19 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"swv" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/sofa/bench/right{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "swE" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -57901,14 +57937,8 @@ /turf/open/floor/plating, /area/maintenance/aft) "sxQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "corporate_privacy"; - name = "showroom shutters" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/command/corporate_showroom) +/turf/closed/wall, +/area/service/salon) "syo" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -58317,10 +58347,15 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "sHe" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/open/floor/wood, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/table/wood/shuttle_bar, +/obj/item/book/fish_catalog, +/turf/open/floor/iron, +/area/service/salon) "sHp" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -59213,15 +59248,6 @@ /obj/structure/window/reinforced/spawner, /turf/open/floor/iron/dark/smooth_large, /area/hallway/secondary/entry) -"sWz" = ( -/obj/structure/showcase/mecha/marauder, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/command/corporate_showroom) "sWD" = ( /obj/machinery/firealarm/directional/west, /obj/structure/table/wood, @@ -60262,16 +60288,16 @@ /turf/open/floor/iron, /area/science/xenobiology) "tre" = ( -/obj/structure/table/wood, /obj/structure/extinguisher_cabinet/directional/west, -/obj/item/folder/blue, -/obj/item/clothing/head/collectable/hop{ - name = "novelty HoP hat" +/obj/structure/chair/office/light{ + dir = 4 }, -/obj/machinery/light/small/directional/west, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "trj" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -61662,19 +61688,6 @@ }, /turf/open/space, /area/space/nearstation) -"tQv" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/showcase/machinery/cloning_pod{ - layer = 4; - pixel_x = 2; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/command/corporate_showroom) "tQy" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -64931,6 +64944,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) +"uVX" = ( +/obj/effect/spawner/structure/window, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains" + }, +/turf/open/floor/plating, +/area/service/salon) "uWa" = ( /obj/item/storage/bag/trash, /obj/machinery/airalarm/directional/west, @@ -64989,6 +65009,15 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/cargo/sorting) +"uXl" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/salon) "uXp" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -65301,6 +65330,18 @@ /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/iron, /area/engineering/main) +"vdX" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/barber, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/service/salon) "vec" = ( /obj/item/flashlight{ pixel_x = 1; @@ -66765,12 +66806,20 @@ /turf/open/space/basic, /area/space/nearstation) "vDF" = ( -/obj/structure/window/reinforced, -/obj/structure/showcase/mecha/ripley, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/button/curtain{ + id = "barbershopcurtains1"; + pixel_x = -25; + pixel_y = 24 + }, +/turf/open/floor/iron, +/area/service/salon) "vDJ" = ( /obj/structure/sign/poster/official/cleanliness{ pixel_x = 32 @@ -71900,6 +71949,9 @@ dir = 8 }, /obj/effect/landmark/start/hangover, +/obj/structure/sign/barber{ + pixel_y = -26 + }, /turf/open/floor/iron, /area/hallway/secondary/command) "xuf" = ( @@ -73481,14 +73533,12 @@ /turf/open/floor/iron/white, /area/security/prison) "xWA" = ( -/obj/machinery/nuclearbomb/beer{ - pixel_x = 2; - pixel_y = 6 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/structure/table/wood, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/command/corporate_showroom) +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "xWD" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -100217,9 +100267,9 @@ hzu nAK hzu hzu -rTb -rTb -rTb +hzu +hzu +hzu hzu cFl aWf @@ -100472,7 +100522,7 @@ cRq bBz aaf aaf -sxQ +aGA vDF dOr fJr @@ -100729,12 +100779,12 @@ axo bzR bBz bBz -lLe +sxQ eMC -hfX +otI gMj kHr -ram +mxn bTG aWf imr @@ -100986,13 +101036,13 @@ cRq xdS bGG bJO -sxQ -sWz +mxn +eWu maG -cJY +uXl lAF -lIj -quu +sxQ +bTQ jbJ vJX bXN @@ -101243,12 +101293,12 @@ bEP bGH rtw bJO -lLe -imx -fHS +sxQ +sxQ +sxQ fWT -rfW -lLe +sxQ +sxQ rvo bVf xAp @@ -101500,12 +101550,12 @@ pLg bGI bGH bJP -lLe -mDo -maG -mTW -rxh sxQ +mDo +cvt +uXl +rxh +uVX bTQ bVg xNJ @@ -101758,11 +101808,11 @@ ntr bIj bJQ ibe -maG -maG +mEu +mEu fEL -xWA -sxQ +cdw +uVX bTQ bVh eiA @@ -102014,13 +102064,13 @@ wxT qNt bGH xub -lLe +sxQ eqO sHe fRN mJk sxQ -bTQ +lBG bVi qox bXV @@ -102271,13 +102321,13 @@ bEP bGH bGH bJP -lLe +uVX pSg doK -gMj -eCo +swv +uXl lLe -iov +rXK bVj rAY fUR @@ -102528,12 +102578,12 @@ bFd fAq bIk bJP -sxQ -tQv -pGf +uVX +xWA +hUi qUy -sbY -lvR +xWA +sxQ kgk pIT vXu @@ -102785,12 +102835,12 @@ goq bzR bBz bBz -lLe +sxQ rLA -sHe +vdX soZ -oEA -ram +xWA +uVX bUb aWf imr @@ -103042,12 +103092,12 @@ bFd bBz aaf aaf -sxQ +gvK gag lWB oNq lZu -sxQ +uVX bUb aWf imr @@ -103300,10 +103350,10 @@ iLp iLp tZe iLp -lxb -lxb -lxb -lxb +iLp +iLp +iLp +iLp iLp fEb aWf diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 0f598f20e18..6d5e259f768 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -2971,28 +2971,19 @@ /turf/open/floor/plating, /area/security/processing) "aqW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light_switch{ - pixel_x = -27 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Vacant Commissary"; - dir = 4 +/obj/effect/turf_decal/tile/purple, +/obj/structure/sink{ + dir = 4; + pixel_x = -12 }, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "aqY" = ( /obj/structure/railing{ dir = 4 @@ -3575,6 +3566,12 @@ dir = 8 }, /area/commons/dorms) +"atk" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central) "atl" = ( /obj/structure/cable, /turf/open/floor/plating/airless, @@ -4233,12 +4230,14 @@ }, /area/commons/fitness) "avr" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/bed/pod, +/obj/structure/window, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "avs" = ( /turf/open/floor/plating/airless, /area/solars/starboard/fore) @@ -5853,13 +5852,13 @@ /turf/open/floor/plating, /area/maintenance/department/electrical) "aAB" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "aAC" = ( /obj/structure/sign/warning/docking, /turf/closed/wall/r_wall, @@ -6394,16 +6393,17 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aCB" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "aCC" = ( /obj/machinery/door/poddoor/preopen{ id = "maint1" @@ -12600,28 +12600,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/closed/wall, +/area/service/salon) "aYg" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/construction) "aYi" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/structure/rack, -/obj/item/crowbar, -/obj/item/wirecutters, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/barber, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "aYj" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon/burgundy, @@ -12980,13 +12972,13 @@ /turf/open/floor/iron, /area/science/storage) "aYZ" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "aZb" = ( /obj/machinery/camera{ c_tag = "Bar South"; @@ -13527,8 +13519,12 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/turf/closed/wall, -/area/commons/vacant_room/commissary) +/obj/effect/spawner/structure/window, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains" + }, +/turf/open/floor/plating, +/area/service/salon) "baW" = ( /obj/structure/window/reinforced/spawner/east, /obj/effect/turf_decal/stripes/line{ @@ -13539,16 +13535,15 @@ /turf/open/floor/iron, /area/science/xenobiology) "baX" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "baZ" = ( /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, @@ -13785,40 +13780,24 @@ /turf/open/floor/iron/cafeteria, /area/commons/locker) "bbQ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "bbR" = ( /turf/open/floor/iron, /area/cargo/office) -"bbT" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "bbU" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -14082,34 +14061,28 @@ /turf/open/floor/engine, /area/science/genetics) "bcG" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 9 }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) -"bcH" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) +"bcH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "bcK" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -14187,7 +14160,7 @@ "bcV" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, -/area/commons/vacant_room/commissary) +/area/service/salon) "bcW" = ( /obj/item/stack/rods, /obj/structure/lattice, @@ -14399,10 +14372,14 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/machinery/light/directional/south, /obj/item/storage/secure/safe/directional/south, -/turf/open/floor/plating, -/area/commons/vacant_room/commissary) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/closet/secure_closet/barber, +/turf/open/floor/iron, +/area/service/salon) "bdF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -25534,8 +25511,17 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/open/floor/plating, -/area/commons/vacant_room/commissary) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/dryer{ + dir = 4; + pixel_x = -6; + pixel_y = -6 + }, +/turf/open/floor/iron, +/area/service/salon) "bLH" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/yellow{ @@ -36544,6 +36530,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/security/prison) +"deo" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/iron, +/area/service/salon) "dev" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -37673,6 +37666,14 @@ }, /turf/open/floor/iron/goonplaque, /area/hallway/secondary/entry) +"epc" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/holopad, +/turf/open/floor/iron, +/area/service/salon) "epk" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -39041,6 +39042,18 @@ }, /turf/open/floor/iron/dark/telecomms, /area/science/server) +"fJu" = ( +/obj/item/radio/intercom/directional/west, +/obj/structure/table/reinforced/rglass, +/obj/item/reagent_containers/dropper/precision{ + pixel_x = -7 + }, +/obj/item/reagent_containers/spray/quantum_hair_dye{ + pixel_x = 6 + }, +/obj/item/lipstick/random, +/turf/open/floor/iron, +/area/service/salon) "fJv" = ( /obj/item/radio/intercom/directional/east{ name = "prison intercom"; @@ -39409,20 +39422,17 @@ /turf/open/floor/iron/white, /area/medical/virology) "fYH" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, /obj/machinery/power/apc/auto_name/south, /obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "fZk" = ( /obj/structure/table, /obj/item/storage/toolbox/drone, @@ -39942,18 +39952,16 @@ /turf/open/space/basic, /area/science/mixing/chamber) "gES" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/table/reinforced/rglass, +/obj/structure/window, +/obj/item/hairbrush, +/obj/item/lipstick/random, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "gFs" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, @@ -42290,6 +42298,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"iSB" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/landmark/start/barber, +/obj/machinery/button/curtain{ + id = "barbershopcurtains1"; + pixel_x = 25; + pixel_y = 24 + }, +/turf/open/floor/iron, +/area/service/salon) "iSP" = ( /obj/structure/closet/secure_closet/contraband/armory, /obj/effect/spawner/random/maintenance/three, @@ -42975,21 +42996,14 @@ /turf/open/floor/iron/textured, /area/security/prison) "jwX" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/table, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/vending/barbervend, +/obj/machinery/light/warm/directional/south, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "jxt" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/turf_decal/bot, @@ -43490,6 +43504,17 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/plating/airless, /area/solars/starboard/aft) +"jRF" = ( +/obj/structure/mirror/directional/west, +/obj/structure/table/reinforced/rglass, +/obj/item/razor{ + pixel_x = -6 + }, +/obj/item/reagent_containers/spray/barbers_aid{ + pixel_x = 6 + }, +/turf/open/floor/iron, +/area/service/salon) "jSG" = ( /obj/structure/closet/secure_closet/hop, /turf/open/floor/wood, @@ -44802,19 +44827,6 @@ }, /turf/open/floor/iron/smooth, /area/ai_monitored/security/armory) -"kWe" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "kWk" = ( /obj/structure/chair/stool/bar, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -45464,30 +45476,6 @@ }, /turf/open/floor/iron/smooth_large, /area/hallway/secondary/service) -"lHR" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "commissarydoor"; - name = "Commissary Door Lock"; - normaldoorcontrol = 1; - pixel_x = 26; - pixel_y = -6; - specialfunctions = 4 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "lHY" = ( /obj/structure/table, /obj/item/clothing/gloves/color/orange, @@ -47172,11 +47160,6 @@ /turf/open/floor/iron, /area/cargo/office) "nrB" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/hallway/primary/central) "nsl" = ( @@ -47376,19 +47359,16 @@ /turf/open/floor/iron/dark, /area/science/cytology) "nzH" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/barber_chair{ dir = 8 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/item/radio/intercom/directional/west, +/obj/effect/landmark/start/hangover, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "nAp" = ( /turf/open/floor/iron/dark, /area/service/chapel) @@ -47405,19 +47385,22 @@ /turf/open/floor/iron/dark, /area/security/processing) "nCP" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/cable, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light_switch/directional/south, +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/button/curtain{ + id = "barbershopcurtains"; + pixel_x = 25; + pixel_y = -24 + }, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "nCT" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, @@ -47953,13 +47936,17 @@ /turf/open/floor/iron, /area/commons/fitness) "nXi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/closed/wall, -/area/commons/vacant_room/commissary) +/obj/machinery/door/airlock/public/glass{ + name = "Barbershop" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/service/salon) "nXH" = ( /obj/machinery/door/firedoor, /obj/effect/landmark/start/hangover, @@ -48289,7 +48276,12 @@ /turf/open/floor/plating, /area/security/prison) "orS" = ( -/obj/effect/turf_decal/delivery, +/obj/structure/sign/barber{ + pixel_x = -13 + }, +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/hallway/primary/central) "orT" = ( @@ -48393,21 +48385,15 @@ /turf/open/floor/iron, /area/science/xenobiology) "ouv" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/item/storage/secure/briefcase, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light/warm/directional/north, +/obj/item/kirbyplants/random, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "ouy" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; @@ -48821,12 +48807,6 @@ }, /turf/closed/wall/r_wall, /area/science/misc_lab) -"oPj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/closed/wall, -/area/commons/vacant_room/commissary) "oQa" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig Control"; @@ -49472,14 +49452,13 @@ /area/medical/chemistry) "pvk" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock{ - id_tag = "commissarydoor"; - name = "Commissary" - }, -/obj/machinery/door/firedoor, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/commons/vacant_room/commissary) +/obj/effect/spawner/structure/window, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains" + }, +/turf/open/floor/plating, +/area/service/salon) "pvP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -49743,10 +49722,19 @@ /turf/open/floor/grass, /area/maintenance/starboard/aft) "pIc" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/structure/window, +/obj/structure/window{ + dir = 8 + }, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "pIS" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -49827,23 +49815,15 @@ /turf/open/floor/iron/dark, /area/security/checkpoint/science) "pNh" = ( -/obj/structure/table, -/obj/item/stack/sheet/iron/five, -/obj/item/circuitboard/machine/paystand, -/obj/item/stack/cable_coil/five, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/purple, +/obj/structure/bed/pod, +/obj/effect/landmark/start/hangover, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "pOe" = ( /obj/structure/table, /obj/item/assembly/signaler, @@ -50539,10 +50519,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/security/prison) -"qyN" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) "qyT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52513,20 +52489,12 @@ /turf/open/floor/iron, /area/hallway/primary/central) "swH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/spawner/structure/window, +/obj/structure/curtain/cloth/fancy/mechanical{ + id = "barbershopcurtains1" }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - id = "commissaryshutter"; - name = "Vacant Commissary Shutter" - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/turf/open/floor/plating, +/area/service/salon) "sxl" = ( /obj/structure/rack, /obj/effect/spawner/random/prison, @@ -53081,7 +53049,7 @@ /area/maintenance/port/aft) "tav" = ( /turf/closed/wall, -/area/commons/vacant_room/commissary) +/area/service/salon) "tax" = ( /obj/structure/filingcabinet/employment, /turf/open/floor/wood, @@ -53441,26 +53409,22 @@ /turf/open/floor/iron/dark, /area/commons/cryopods) "tqp" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/machinery/newscaster/directional/north, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 4 +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/office/light{ + dir = 4 }, -/obj/item/pen, -/obj/effect/turf_decal/tile/brown{ +/obj/structure/window{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/newscaster/directional/north, -/obj/machinery/light/directional/north, +/obj/machinery/camera{ + c_tag = "Salon" + }, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "tqy" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55139,28 +55103,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"uTi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "commissaryshutter"; - name = "Commissary Shutter Control"; - pixel_x = 26; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "uTo" = ( /obj/structure/table, /obj/item/stack/license_plates/empty/fifty, @@ -56525,20 +56467,14 @@ /turf/open/floor/iron/dark, /area/security/office) "wbV" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/structure/table, -/obj/item/newspaper, +/obj/effect/turf_decal/tile/purple, +/obj/structure/table/reinforced/rglass, +/obj/item/hairbrush, /turf/open/floor/iron, -/area/commons/vacant_room/commissary) +/area/service/salon) "wdA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ dir = 8 @@ -57037,10 +56973,6 @@ }, /turf/open/floor/iron, /area/science/xenobiology) -"wBR" = ( -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/maintenance/port) "wCp" = ( /obj/structure/reagent_dispensers/beerkeg, /obj/effect/decal/cleanable/dirt, @@ -58118,11 +58050,15 @@ /turf/open/floor/iron/white, /area/medical/medbay/lobby) "xtO" = ( -/obj/item/wrench, -/obj/item/screwdriver, -/obj/structure/rack, -/turf/open/floor/plating, -/area/commons/vacant_room/commissary) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/chair/barber_chair{ + dir = 8 + }, +/turf/open/floor/iron, +/area/service/salon) "xuc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -58556,6 +58492,18 @@ }, /turf/open/floor/wood, /area/security/prison) +"xPm" = ( +/obj/structure/mirror/directional/west, +/obj/structure/table/reinforced/rglass, +/obj/item/hairbrush/comb{ + pixel_y = 10 + }, +/obj/item/reagent_containers/dropper, +/obj/machinery/dryer{ + pixel_y = 14 + }, +/turf/open/floor/iron, +/area/service/salon) "xPq" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -81358,10 +81306,10 @@ aPL aPK hkT aTI -aPK -bji -wBR -aSg +tav +tav +tav +tav aYf bbU hSa @@ -81616,10 +81564,10 @@ aPK aSm aTK tav -tav -tav -tav -oPj +xPm +fJu +jRF +aYf oXE tav tav @@ -82388,7 +82336,7 @@ aSt jiK tav tqp -avr +deo pIc baX bcH @@ -82645,10 +82593,10 @@ aSc hSc tav pNh +epc avr -avr -bbT -bbT +baX +deo fYH tav aZH @@ -82902,10 +82850,10 @@ aSa aSr tav wbV -kWe +iSB gES -uTi -lHR +baX +deo nCP tav beA @@ -83160,7 +83108,7 @@ aTP tav tav swH -swH +tav baU nXi pvk @@ -83416,9 +83364,9 @@ aSs aSs tav bCA +nrB orS -orS -qyN +atk nrB rbC tav diff --git a/code/__DEFINES/~skyrat_defines/access.dm b/code/__DEFINES/~skyrat_defines/access.dm new file mode 100644 index 00000000000..353cc7e64e4 --- /dev/null +++ b/code/__DEFINES/~skyrat_defines/access.dm @@ -0,0 +1 @@ +#define ACCESS_BARBER 73 diff --git a/code/datums/quirks/neutral.dm b/code/datums/quirks/neutral.dm index 06b6357451b..d28584444c4 100644 --- a/code/datums/quirks/neutral.dm +++ b/code/datums/quirks/neutral.dm @@ -348,6 +348,7 @@ ) ) +/* SKYRAT EDIT REMOVAL /datum/quirk/item_quirk/colorist name = "Colorist" desc = "You like carrying around a hair dye spray to quickly apply color patterns to your hair." @@ -357,3 +358,4 @@ /datum/quirk/item_quirk/colorist/add_unique() give_item_to_holder(/obj/item/dyespray, list(LOCATION_BACKPACK = ITEM_SLOT_BACKPACK, LOCATION_HANDS = ITEM_SLOT_HANDS)) +*/ diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 619a13790e1..a848d5783b4 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -2,7 +2,7 @@ gender = PLURAL name = "red lipstick" desc = "A generic brand of lipstick." - icon = 'icons/obj/items_and_weapons.dmi' + icon = 'modular_skyrat/modules/salon/icons/items.dmi' //SKYRAT EDIT CHANGE icon_state = "lipstick" w_class = WEIGHT_CLASS_TINY var/colour = "red" @@ -100,7 +100,7 @@ span_notice("You wipe off [target]'s lipstick.")) target.update_lips(null) - +/* SKYRAT EDIT REMOVAL /obj/item/razor name = "electric razor" desc = "The latest and greatest power razor born from the science of shaving." @@ -231,3 +231,4 @@ ..() else ..() +*/ diff --git a/code/game/objects/items/dyekit.dm b/code/game/objects/items/dyekit.dm index f70ad945e8a..1a12d4e1027 100644 --- a/code/game/objects/items/dyekit.dm +++ b/code/game/objects/items/dyekit.dm @@ -5,6 +5,8 @@ icon = 'icons/obj/dyespray.dmi' icon_state = "dyespray" + var/uses = 10 //SKYRAT EDIT ADDITION + /obj/item/dyespray/attack_self(mob/user) dye(user) @@ -22,6 +24,10 @@ /obj/item/dyespray/proc/dye(mob/target) if(!ishuman(target)) return + + if(!uses) //SKYRAT EDIT ADDITION + return //SKYRAT EDIT ADDITION + var/mob/living/carbon/human/human_target = target var/new_grad_style = input(usr, "Choose a color pattern:", "Character Preference") as null|anything in GLOB.hair_gradients_list @@ -39,3 +45,12 @@ return playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5) human_target.update_hair() + + //SKYRAT EDIT ADDITION + uses-- + +/obj/item/dyespray/examine(mob/user) + . = ..() + . += "It has [uses] uses left." + + //SKYRAT EDIT END diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 01f4e2cb413..4f263a12479 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -29,7 +29,7 @@ . = ..() if(icon_state == "mirror_broke" && !broken) atom_break(null, mapload) - +/* SKYRAT EDIT REMOVAL /obj/structure/mirror/attack_hand(mob/user, list/modifiers) . = ..() if(.) @@ -63,7 +63,7 @@ H.hairstyle = new_style H.update_hair() - +*/ /obj/structure/mirror/examine_status(mob/user) if(broken) return list()// no message spam diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm index 48197a2cd4f..a89e39a379d 100644 --- a/code/modules/cargo/goodies.dm +++ b/code/modules/cargo/goodies.dm @@ -138,13 +138,13 @@ desc = "The most important thing you could possibly spend your hard-earned money on." cost = PAYCHECK_EASY * 4 contains = list(/obj/item/toy/plush/beeplushie) - +/* SKYRAT EDIT REMOVAL /datum/supply_pack/goody/dyespray name = "Hair Dye Spray" desc = "A cool spray to dye your hair with awesome colors!" cost = PAYCHECK_EASY * 2 contains = list(/obj/item/dyespray) - +*/ /datum/supply_pack/goody/beach_ball name = "Beach Ball" // uses desc from item diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index d352956ccce..1b2c4c16f3b 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -26,7 +26,6 @@ /obj/item/skillchip/ceramic_master = 2, /obj/item/skillchip/fishing_master = 2, /obj/item/skillchip/useless_adapter=5, - /obj/item/dyespray=3, /obj/item/razor=3, ) //SKYRAT EDIT: Adds Ceramic, Glassblowing, and Fishing Skillchips diff --git a/config/jobs.txt b/config/jobs.txt index 0a8913a06c9..cdf9f0c0209 100644 --- a/config/jobs.txt +++ b/config/jobs.txt @@ -29,6 +29,7 @@ Bartender=1,1 Cook=2,1 Botanist=3,2 Janitor=2,1 +Barber=1,1 Clown=1,1 Mime=1,1 diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index bdb3ae61c1a..dc234253248 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -149,3 +149,13 @@ ACCESS_MAINT_TUNNELS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP) config_job = "brigoff" + +/datum/id_trim/job/barber + assignment = "Barber" + trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi' + trim_state = "trim_barber" + extra_access = list() + minimal_access = list(ACCESS_THEATRE, ACCESS_MAINT_TUNNELS, ACCESS_BARBER) + config_job = "barber" + template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS) + job = /datum/job/barber diff --git a/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm b/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm index 35e4bec1ee7..d9f3ee1bf61 100644 --- a/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm +++ b/modular_skyrat/master_files/code/game/objects/items/hhmirror.dm @@ -8,29 +8,7 @@ . = ..() if(.) return - if(ishuman(user)) - var/mob/living/carbon/human/H = user - //see code/modules/mob/dead/new_player/preferences.dm at approx line 545 for comments! - //this is largely copypasted from there. - - //handle facial hair (if necessary) - if(H.gender != FEMALE) - var/new_style = input(user, "Select a facial hair style", "Grooming") as null|anything in GLOB.facial_hairstyles_list - if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return //no tele-grooming - if(new_style) - H.facial_hairstyle = new_style - else - H.facial_hairstyle = "Shaved" - - //handle normal hair - var/new_style = input(user, "Select a hair style", "Grooming") as null|anything in GLOB.hairstyles_list - if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return //no tele-grooming - if(new_style) - H.hairstyle = new_style - - H.update_hair() + to_chat(user, span_notice("Damn, that hairstyle be looking skewed, maybe head to the barber for a change?")) /obj/item/hhmirror/fullmagic name = "Full Handheld Magic Mirror" diff --git a/modular_skyrat/master_files/icons/obj/card.dmi b/modular_skyrat/master_files/icons/obj/card.dmi index 9fbe2f311d1..be422923e05 100644 Binary files a/modular_skyrat/master_files/icons/obj/card.dmi and b/modular_skyrat/master_files/icons/obj/card.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/closet.dmi b/modular_skyrat/master_files/icons/obj/closet.dmi index 011bbd84802..4faaa3a260a 100644 Binary files a/modular_skyrat/master_files/icons/obj/closet.dmi and b/modular_skyrat/master_files/icons/obj/closet.dmi differ diff --git a/modular_skyrat/modules/hairbrush/code/hairbrush.dm b/modular_skyrat/modules/hairbrush/code/hairbrush.dm index 2e870fb04e9..08391e0443a 100644 --- a/modular_skyrat/modules/hairbrush/code/hairbrush.dm +++ b/modular_skyrat/modules/hairbrush/code/hairbrush.dm @@ -35,7 +35,7 @@ return // Do 1 brute to their head if they're bald. Should've been more careful. - if(human_target.hairstyle == "Bald") + if(human_target.hairstyle == "Bald" || human_target.hairstyle == "Skinhead" && is_species(human_target, /datum/species/human)) //It can be assumed most anthros have hair on them! human_target.visible_message(span_warning("[usr] scrapes the bristles uncomfortably over [human_target]'s scalp."), span_warning("You scrape the bristles uncomfortably over [human_target]'s scalp.")) head.receive_damage(1) return diff --git a/modular_skyrat/modules/salon/code/area.dm b/modular_skyrat/modules/salon/code/area.dm new file mode 100644 index 00000000000..d1930568921 --- /dev/null +++ b/modular_skyrat/modules/salon/code/area.dm @@ -0,0 +1,3 @@ +/area/service/salon + name = "\improper Salon" + icon_state = "bar" diff --git a/modular_skyrat/modules/salon/code/barber.dm b/modular_skyrat/modules/salon/code/barber.dm new file mode 100644 index 00000000000..fc77b9f653e --- /dev/null +++ b/modular_skyrat/modules/salon/code/barber.dm @@ -0,0 +1,67 @@ +/datum/job/barber + title = "Barber" + department_head = list("Head of Personnel") + faction = FACTION_STATION + total_positions = 2 + spawn_positions = 2 + supervisors = "the head of personnel" + selection_color = "#bbe291" + exp_granted_type = EXP_TYPE_CREW + + outfit = /datum/outfit/job/barber + plasmaman_outfit = /datum/outfit/plasmaman + + paycheck = PAYCHECK_EASY + paycheck_department = ACCOUNT_SRV + display_order = JOB_DISPLAY_ORDER_BARTENDER + bounty_types = CIV_JOB_BASIC + departments_list = list( + /datum/job_department/service, + ) + + family_heirlooms = list(/obj/item/hairbrush/comb, /obj/item/razor) + + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS + + +/datum/outfit/job/barber + name = "Barber" + jobtype = /datum/job/barber + + glasses = /obj/item/clothing/glasses/sunglasses + belt = /obj/item/pda + ears = /obj/item/radio/headset/headset_srv + uniform = /obj/item/clothing/under/rank/barber + shoes = /obj/item/clothing/shoes/laceup + id_trim = /datum/id_trim/job/barber + +/obj/structure/closet/secure_closet/barber + name = "Barber's locker" + icon_state = "barber" + icon = 'modular_skyrat/master_files/icons/obj/closet.dmi' + req_access = list(ACCESS_BARBER) + +/obj/structure/closet/secure_closet/barber/PopulateContents() + new /obj/item/clothing/mask/surgical(src) // These three are here, so the barber can pick and choose what he's painting. + new /obj/item/clothing/under/rank/medical/doctor/blue(src) + new /obj/item/clothing/suit/apron/surgical(src) + new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/under/rank/civilian/lawyer/purpsuit(src) + new /obj/item/clothing/suit/toggle/lawyer/purple(src) + new /obj/item/razor(src) + new /obj/item/straight_razor(src) + new /obj/item/hairbrush/comb(src) + new /obj/item/scissors(src) + new /obj/item/fur_dyer(src) + new /obj/item/hair_dye(src) + new /obj/item/dyespray(src) + new /obj/item/storage/box/lipsticks(src) + new /obj/item/reagent_containers/spray/quantum_hair_dye(src) + new /obj/item/reagent_containers/spray/barbers_aid(src) + new /obj/item/reagent_containers/spray/cleaner(src) + new /obj/item/reagent_containers/glass/rag(src) + new /obj/item/storage/firstaid(src) + +/obj/effect/landmark/start/barber + name = "Barber" + icon_state = "Bartender" diff --git a/modular_skyrat/modules/salon/code/barber_chair.dm b/modular_skyrat/modules/salon/code/barber_chair.dm new file mode 100644 index 00000000000..ba5c73cc7f8 --- /dev/null +++ b/modular_skyrat/modules/salon/code/barber_chair.dm @@ -0,0 +1,5 @@ +/obj/structure/chair/barber_chair + name = "barbers chair" + desc = "You sit in this, and your hair shall be cut." + icon = 'modular_skyrat/modules/salon/icons/chair.dmi' + icon_state = "barber_chair" diff --git a/modular_skyrat/modules/salon/code/barbervend.dm b/modular_skyrat/modules/salon/code/barbervend.dm new file mode 100644 index 00000000000..37c5105866e --- /dev/null +++ b/modular_skyrat/modules/salon/code/barbervend.dm @@ -0,0 +1,32 @@ +/obj/machinery/vending/barbervend + name = "Fab-O-Vend" + desc = "It would seem it vends dyes, and other stuff to make you pretty." + icon = 'modular_skyrat/modules/salon/icons/vendor.dmi' + icon_state = "barbervend" + product_slogans = "Spread the colour, like butter, onto toast... Onto their hair.; Sometimes, I dream about dyes...; Paint 'em up and call me Mr. Painter.; Look brother, I'm a vendomat, I solve practical problems." + product_ads = "Cut 'em all!; To sheds!; Hair be gone!; Prettify!; Beautify!" + req_access = list(ACCESS_BARBER) + refill_canister = /obj/item/vending_refill/barbervend + products = list( + /obj/item/reagent_containers/spray/quantum_hair_dye = 3, + /obj/item/reagent_containers/spray/baldium = 3, + /obj/item/reagent_containers/spray/barbers_aid = 3, + /obj/item/hair_dye = 3, + /obj/item/dyespray = 5, + /obj/item/hairbrush = 3, + /obj/item/hairbrush/comb = 3, + /obj/item/fur_dyer = 1, + ) + premium = list( + /obj/item/scissors = 3, + /obj/item/reagent_containers/spray/super_barbers_aid = 3, + /obj/item/storage/box/lipsticks = 3, + /obj/item/reagent_containers/dropper/precision = 1, + /obj/item/lipstick/quantum = 1, + /obj/item/razor = 1, + /obj/item/storage/box/perfume = 1, + ) + +/obj/item/vending_refill/barbervend + name = "barber vend resupply" + diff --git a/modular_skyrat/modules/salon/code/clothing.dm b/modular_skyrat/modules/salon/code/clothing.dm new file mode 100644 index 00000000000..7f745a673fe --- /dev/null +++ b/modular_skyrat/modules/salon/code/clothing.dm @@ -0,0 +1,6 @@ +/obj/item/clothing/under/rank/barber + desc = "A fancy pink shirt paired with light-catching white pants. Yet to be blood- and puke-stained." + name = "barber's uniform" + icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/uniform.dmi' + icon_state = "barber" diff --git a/modular_skyrat/modules/salon/code/fur_dyer.dm b/modular_skyrat/modules/salon/code/fur_dyer.dm new file mode 100644 index 00000000000..6a268d81878 --- /dev/null +++ b/modular_skyrat/modules/salon/code/fur_dyer.dm @@ -0,0 +1,128 @@ +#define COLOR_MODE_SPECIFIC "Specific Marking" +#define COLOR_MODE_GENERAL "General Color" + +/obj/item/fur_dyer + name = "electric fur dyer" + desc = "Dye that is capable of recoloring fur in a mostly permanent way." + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "fur_sprayer" + w_class = WEIGHT_CLASS_TINY + + var/mode = COLOR_MODE_SPECIFIC + +/obj/item/fur_dyer/Initialize(mapload) + . = ..() + AddComponent(/datum/component/cell) + +/obj/item/fur_dyer/attack_self(mob/user, modifiers) + . = ..() + if(mode == COLOR_MODE_SPECIFIC) + mode = COLOR_MODE_GENERAL + else + mode = COLOR_MODE_SPECIFIC + + balloon_alert(user, "Set to [mode]!") + +/obj/item/fur_dyer/attack(mob/living/M, mob/living/user, params) + if(!ishuman(M)) + return ..() + + var/mob/living/carbon/human/target_human = M + + switch(mode) + if(COLOR_MODE_SPECIFIC) + dye_marking(target_human, user) + if(COLOR_MODE_GENERAL) + dye_general(target_human, user) + +/obj/item/fur_dyer/proc/dye_general(mob/living/carbon/human/target_human, mob/living/user) + var/selected_mutant_color = tgui_alert(user, "Please select which mutant color you'd like to change", "Select Color", list("One", "Two", "Three")) + + if(!selected_mutant_color) + return + + if(!(item_use_power(power_use_amount, user, TRUE) & COMPONENT_POWER_SUCCESS)) + to_chat(user, span_danger("A red light blinks!")) + return + + var/selected_color = input( + user, + "Select marking color", + null, + COLOR_WHITE, + ) as color | null + + if(!selected_color) + return + + selected_color = sanitize_hexcolor(selected_color) + + visible_message(span_notice("[user] starts to masterfully paint [target_human]!")) + + if(do_after(user, 20 SECONDS, target_human)) + switch(selected_mutant_color) + if("One") + target_human.dna.features["mcolor"] = selected_color + if("Two") + target_human.dna.features["mcolor1"] = selected_color + if("Three") + target_human.dna.features["mcolor2"] = selected_color + + target_human.regenerate_icons() + item_use_power(power_use_amount, user) + + visible_message(span_notice("[user] finishes painting [target_human]!")) + + playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE) + + +/obj/item/fur_dyer/proc/dye_marking(mob/living/carbon/human/target_human, mob/living/user) + + var/list/list/current_markings = target_human.dna.body_markings.Copy() + + if(!current_markings.len) + to_chat(user, span_danger("[target_human] has no markings!")) + return + + if(!(item_use_power(power_use_amount, user, TRUE) & COMPONENT_POWER_SUCCESS)) + to_chat(user, span_danger("A red light blinks!")) + return + + var/selected_marking_area = user.zone_selected + + if(!current_markings[selected_marking_area]) + to_chat(user, span_danger("[target_human] has no bodymarkings on this limb!")) + return + + var/selected_marking_id = tgui_input_list(user, "Please select which marking you'd like to color!", "Select marking", current_markings[selected_marking_area]) + + if(!selected_marking_id) + return + + var/selected_color = input( + user, + "Select marking color", + null, + COLOR_WHITE, + ) as color | null + + if(!selected_color) + return + + selected_color = sanitize_hexcolor(selected_color) + + visible_message(span_notice("[user] starts to masterfully paint [target_human]!")) + + if(do_after(user, 20 SECONDS, target_human)) + current_markings[selected_marking_area][selected_marking_id] = selected_color + + target_human.dna.body_markings = current_markings.Copy() + + target_human.regenerate_icons() + + item_use_power(power_use_amount, user) + + visible_message(span_notice("[user] finishes painting [target_human]!")) + + playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE) + diff --git a/modular_skyrat/modules/salon/code/hand_dryer.dm b/modular_skyrat/modules/salon/code/hand_dryer.dm new file mode 100644 index 00000000000..c376d2fe10c --- /dev/null +++ b/modular_skyrat/modules/salon/code/hand_dryer.dm @@ -0,0 +1,29 @@ +/obj/machinery/dryer + name = "hand dryer" + desc = "The Breath Of Lizads-3000, an experimental dryer." + icon = 'modular_skyrat/modules/salon/icons/dryer.dmi' + icon_state = "dryer" + density = FALSE + anchored = TRUE + var/busy = FALSE + +/obj/machinery/dryer/attack_hand(mob/user) + if(iscyborg(user) || isAI(user)) + return + + if(!can_interact(user)) + return + + if(busy) + to_chat(user, span_warning("Someone's already drying here.")) + return + + to_chat(user, span_notice("You start drying your hands.")) + playsound(src, 'modular_skyrat/modules/salon/sound/drying.ogg', 50) + add_fingerprint(user) + busy = TRUE + if(do_after(user, 4 SECONDS, src)) + busy = FALSE + user.visible_message("[user] dried their hands using \the [src].") + else + busy = FALSE diff --git a/modular_skyrat/modules/salon/code/misc_items.dm b/modular_skyrat/modules/salon/code/misc_items.dm new file mode 100644 index 00000000000..65406df5a01 --- /dev/null +++ b/modular_skyrat/modules/salon/code/misc_items.dm @@ -0,0 +1,222 @@ + +/obj/item/storage/box/lipsticks + name = "lipstick box" + +/obj/item/storage/box/lipsticks/PopulateContents() + ..() + new /obj/item/lipstick(src) + new /obj/item/lipstick/purple(src) + new /obj/item/lipstick/jade(src) + new /obj/item/lipstick/black(src) + +/obj/item/lipstick/quantum + name = "Quantum Lipstick" + +/obj/item/lipstick/quantum/attack(mob/M, mob/user) + if(!open || !ismob(M)) + return + + if(!ishuman(M)) + to_chat(user, span_warning("Where are the lips on that?")) + return + + var/new_color = input( + user, + "Select lipstick color", + null, + COLOR_WHITE, + ) as color | null + + var/mob/living/carbon/human/target = M + if(target.is_mouth_covered()) + to_chat(user, span_warning("Remove [ target == user ? "your" : "[target.p_their()]" ] mask!")) + return + if(target.lip_style) //if they already have lipstick on + to_chat(user, span_warning("You need to wipe off the old lipstick first!")) + return + + if(target == user) + user.visible_message(span_notice("[user] does [user.p_their()] lips with \the [src]."), \ + span_notice("You take a moment to apply \the [src]. Perfect!")) + target.update_lips("lipstick", new_color, lipstick_trait) + return + + user.visible_message(span_warning("[user] begins to do [target]'s lips with \the [src]."), \ + span_notice("You begin to apply \the [src] on [target]'s lips...")) + if(!do_after(user, 2 SECONDS, target = target)) + return + user.visible_message(span_notice("[user] does [target]'s lips with \the [src]."), \ + span_notice("You apply \the [src] on [target]'s lips.")) + target.update_lips("lipstick", new_color, lipstick_trait) + +/obj/item/hairbrush/comb + name = "comb" + desc = "A rather simple tool, used to straighten out hair and knots in it." + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "blackcomb" + +/obj/item/hairstyle_preview_magazine + name = "hip hairstyles magazine" + desc = "A magazine featuring a magnitude of hairsytles!" + +/obj/item/hairstyle_preview_magazine/ui_interact(mob/user, datum/tgui/ui) + . = ..() + // A simple GUI with a list of hairstyles and a view, so people can choose a hairstyle! + +/obj/effect/decal/cleanable/hair + name = "hair cuttings" + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "cut_hair" + +/obj/item/razor + name = "electric razor" + desc = "The latest and greatest power razor born from the science of shaving." + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "razor" + flags_1 = CONDUCT_1 + w_class = WEIGHT_CLASS_TINY + +/obj/item/razor/suicide_act(mob/living/carbon/user) + user.visible_message(span_suicide("[user] begins shaving [user.p_them()]self without the razor guard! It looks like [user.p_theyre()] trying to commit suicide!")) + shave(user, BODY_ZONE_PRECISE_MOUTH) + shave(user, BODY_ZONE_HEAD)//doesnt need to be BODY_ZONE_HEAD specifically, but whatever + return BRUTELOSS + +/obj/item/razor/proc/shave(mob/living/carbon/human/H, location = BODY_ZONE_PRECISE_MOUTH) + if(location == BODY_ZONE_PRECISE_MOUTH) + H.facial_hairstyle = "Shaved" + else + H.hairstyle = "Bald" + + H.update_hair() + playsound(loc, 'sound/items/welder2.ogg', 20, TRUE) + + +/obj/item/razor/attack(mob/M, mob/living/user) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + var/location = user.zone_selected + if((location in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_HEAD)) && !H.get_bodypart(BODY_ZONE_HEAD)) + to_chat(user, span_warning("[H] doesn't have a head!")) + return + if(location == BODY_ZONE_PRECISE_MOUTH) + if(!(FACEHAIR in H.dna.species.species_traits)) + to_chat(user, span_warning("There is no facial hair to shave!")) + return + if(!get_location_accessible(H, location)) + to_chat(user, span_warning("The mask is in the way!")) + return + if(H.facial_hairstyle == "Shaved") + to_chat(user, span_warning("Already clean-shaven!")) + return + + if(H == user) //shaving yourself + user.visible_message(span_notice("[user] starts to shave [user.p_their()] facial hair with [src]."), \ + span_notice("You take a moment to shave your facial hair with [src]...")) + if(do_after(user, 50, target = H)) + user.visible_message(span_notice("[user] shaves [user.p_their()] facial hair clean with [src]."), \ + span_notice("You finish shaving with [src]. Fast and clean!")) + shave(H, location) + else + user.visible_message(span_warning("[user] tries to shave [H]'s facial hair with [src]."), \ + span_notice("You start shaving [H]'s facial hair...")) + if(do_after(user, 50, target = H)) + user.visible_message(span_warning("[user] shaves off [H]'s facial hair with [src]."), \ + span_notice("You shave [H]'s facial hair clean off.")) + shave(H, location) + else if(location == BODY_ZONE_HEAD) + if(!(HAIR in H.dna.species.species_traits)) + to_chat(user, span_warning("There is no hair to shave!")) + return + if(!get_location_accessible(H, location)) + to_chat(user, span_warning("The headgear is in the way!")) + return + if(H.hairstyle == "Bald" || H.hairstyle == "Balding Hair" || H.hairstyle == "Skinhead") + to_chat(user, span_warning("There is not enough hair left to shave!")) + return + + if(H == user) //shaving yourself + user.visible_message(span_notice("[user] starts to shave [user.p_their()] head with [src]."), \ + span_notice("You start to shave your head with [src]...")) + if(do_after(user, 5, target = H)) + user.visible_message(span_notice("[user] shaves [user.p_their()] head with [src]."), \ + span_notice("You finish shaving with [src].")) + shave(H, location) + else + var/turf/H_loc = H.loc + user.visible_message(span_warning("[user] tries to shave [H]'s head with [src]!"), \ + span_notice("You start shaving [H]'s head...")) + if(do_after(user, 50, target = H)) + if(H_loc == H.loc) + user.visible_message(span_warning("[user] shaves [H]'s head bald with [src]!"), \ + span_notice("You shave [H]'s head bald.")) + shave(H, location) + else + ..() + else + ..() + +/obj/structure/sign/barber + name = "barbershop sign" + desc = "A glowing red-blue-white stripe you won't mistake for any other!" + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "barber" + +/obj/item/storage/box/perfume + name = "box of perfumes" + +/obj/item/storage/box/perfume/PopulateContents() + new /obj/item/perfume/cologne(src) + new /obj/item/perfume/wood(src) + new /obj/item/perfume/rose(src) + new /obj/item/perfume/jasmine(src) + new /obj/item/perfume/mint(src) + new /obj/item/perfume/vanilla(src) + new /obj/item/perfume/pear(src) + new /obj/item/perfume/strawberry(src) + new /obj/item/perfume/cherry(src) + new /obj/item/perfume/amber(src) + +/obj/item/hair_dye + name = "colored hair dye spray" + desc = "A spray to dye your hair any color you'd like." + w_class = WEIGHT_CLASS_TINY + icon = 'icons/obj/dyespray.dmi' + icon_state = "dyespray" + + var/uses = 10 + +/obj/item/hair_dye/attack_self(mob/user) + dye(user) + +/obj/item/hair_dye/pre_attack(atom/target, mob/living/user, params) + dye(target) + return ..() + +/obj/item/hair_dye/proc/dye(mob/target) + if(!ishuman(target)) + return + + if(!uses) + return + + var/mob/living/carbon/human/human_target = target + + var/new_color = input(usr, "Choose a hair color:", "Character Preference","#"+human_target.hair_color) as color|null + + if(!new_color) + return + + human_target.hair_color = sanitize_hexcolor(new_color) + to_chat(human_target, span_notice("You start applying the hair dye...")) + if(!do_after(usr, 3 SECONDS, target)) + return + playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5) + human_target.update_hair() + + uses-- + +/obj/item/hair_dye/examine(mob/user) + . = ..() + . += "It has [uses] uses left." + diff --git a/modular_skyrat/modules/salon/code/pipette.dm b/modular_skyrat/modules/salon/code/pipette.dm new file mode 100644 index 00000000000..84b27f480b6 --- /dev/null +++ b/modular_skyrat/modules/salon/code/pipette.dm @@ -0,0 +1,9 @@ +/obj/item/reagent_containers/dropper/precision + name = "pipette" + desc = "A high precision pippette. Holds 1 unit." + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "pipette1" + amount_per_transfer_from_this = 1 + possible_transfer_amounts = list(0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1) + volume = 1 + w_class = WEIGHT_CLASS_TINY diff --git a/modular_skyrat/modules/salon/code/scissors.dm b/modular_skyrat/modules/salon/code/scissors.dm new file mode 100644 index 00000000000..0ae64187607 --- /dev/null +++ b/modular_skyrat/modules/salon/code/scissors.dm @@ -0,0 +1,64 @@ +/obj/item/scissors + name = "barbers scissors" + desc = "Some say a barbers best tool is his electric razor, that is not the case. These are used to cut hair in a professional way!" + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "scissors" + w_class = WEIGHT_CLASS_TINY + sharpness = SHARP_EDGED + +/obj/item/scissors/attack(mob/living/attacked_mob, mob/living/user, params) + if(!ishuman(attacked_mob)) + return + + var/mob/living/carbon/human/target_human = attacked_mob + + if(target_human.hairstyle == "Bald" && target_human.facial_hairstyle == "Shaved") + balloon_alert(user, "What hair? They have none!") + return + + if(user.zone_selected != BODY_ZONE_HEAD) + return ..() + + var/selected_part = tgui_alert(user, "Please select which part of [target_human] you would like to sculpt!", "It's sculpting time!", list("Hair", "Facial Hair", "Cancel")) + + if(!selected_part || selected_part == "Cancel") + return + + if(selected_part == "Hair") + if(!target_human.hairstyle == "Bald" && target_human.head) + balloon_alert(user, "They have no hair to cut!") + return + + var/hair_id = tgui_input_list(user, "Please select what hairstyle you'd like to sculpt!", "Select masterpiece", GLOB.hairstyles_list) + + if(hair_id == "Bald") + to_chat(target_human, span_danger("[user] seems to be cutting all your hair off!")) + + to_chat(user, span_notice("You begin to masterfully sculpt [target_human]'s hair!")) + + playsound(target_human, 'modular_skyrat/modules/salon/sound/haircut.ogg', 100) + + if(do_after(user, 1 MINUTES, target_human)) + target_human.hairstyle = hair_id + target_human.update_hair() + balloon_alert_to_viewers("[user] successfully cuts [target_human]'s hair!") + new /obj/effect/decal/cleanable/hair(get_turf(src)) + else + if(!target_human.facial_hairstyle == "Shaved" && target_human.wear_mask) + balloon_alert(user, "They have no facial hair to cut!") + return + + var/facial_hair_id = tgui_input_list(user, "Please select what facial hairstyle you'd like to sculpt!", "Select masterpiece", GLOB.facial_hairstyles_list) + + if(facial_hair_id == "Shaved") + to_chat(target_human, span_danger("[user] seems to be cutting all your facial hair off!")) + + to_chat(user, "You begin to masterfully sculpt [target_human]'s facial hair!") + + playsound(target_human, 'modular_skyrat/modules/salon/sound/haircut.ogg', 100) + + if(do_after(user, 20 SECONDS, target_human)) + target_human.facial_hairstyle = facial_hair_id + target_human.update_hair() + balloon_alert_to_viewers("[user] successfully cuts [target_human]'s facial hair!") + new /obj/effect/decal/cleanable/hair(get_turf(src)) diff --git a/modular_skyrat/modules/salon/code/sprays.dm b/modular_skyrat/modules/salon/code/sprays.dm new file mode 100644 index 00000000000..8625c332bf6 --- /dev/null +++ b/modular_skyrat/modules/salon/code/sprays.dm @@ -0,0 +1,39 @@ +/obj/item/reagent_containers/spray/quantum_hair_dye + name = "quantum hair dye" + desc = "Changes hair colour RANDOMLY! Don't forget to read the label!" + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "hairspraywhite" + amount_per_transfer_from_this = 1 + possible_transfer_amounts = list(5,10) + list_reagents = list(/datum/reagent/hair_dye = 30) + volume = 50 + +/obj/item/reagent_containers/spray/baldium + name = "baldium spray" + desc = "Causes baldness, exessive use may cause customer disatisfaction." + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "hairremoval" + amount_per_transfer_from_this = 1 + possible_transfer_amounts = list(5,10) + list_reagents = list(/datum/reagent/baldium = 30) + volume = 50 + +/obj/item/reagent_containers/spray/barbers_aid + name = "barbers aid" + desc = "Causes rapid hair and facial hair growth!" + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "hairaccelerator" + amount_per_transfer_from_this = 1 + possible_transfer_amounts = list(5,10) + list_reagents = list(/datum/reagent/barbers_aid = 50) + volume = 50 + +/obj/item/reagent_containers/spray/super_barbers_aid + name = "super barbers aid" + desc = "Causes SUPER rapid hair and facial hair growth!" + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "hairaccelerator" + amount_per_transfer_from_this = 1 + possible_transfer_amounts = list(5,10) + list_reagents = list(/datum/reagent/concentrated_barbers_aid = 30) + volume = 50 diff --git a/modular_skyrat/modules/salon/code/straight_razor.dm b/modular_skyrat/modules/salon/code/straight_razor.dm new file mode 100644 index 00000000000..d1d66de0563 --- /dev/null +++ b/modular_skyrat/modules/salon/code/straight_razor.dm @@ -0,0 +1,57 @@ +/obj/item/straight_razor + name = "straight razor" + desc = "A very sharp blade, mostly used for shaving faces..." + icon = 'modular_skyrat/modules/salon/icons/items.dmi' + icon_state = "straight_razor" + force = 12 + throw_speed = 3 + throw_range = 9 + w_class = WEIGHT_CLASS_TINY + attack_verb_simple = list("cut", "stabbed", "chebbed") + sharpness = SHARP_EDGED + hitsound = 'sound/weapons/bladeslice.ogg' + wound_bonus = 10 + bare_wound_bonus = 15 + tool_behaviour = TOOL_KNIFE + +/obj/item/straight_razor/proc/shave(mob/living/carbon/human/H) + H.facial_hairstyle = "Shaved" + H.update_hair() + playsound(loc, 'sound/items/unsheath.ogg', 20, TRUE) + +/obj/item/straight_razor/attack(mob/M, mob/living/user) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + var/location = user.zone_selected + if(location == BODY_ZONE_PRECISE_MOUTH && !H.get_bodypart(BODY_ZONE_HEAD)) + to_chat(user, span_warning("[H] doesn't have a head!")) + return + if(location == BODY_ZONE_PRECISE_MOUTH) + if(!(FACEHAIR in H.dna.species.species_traits)) + to_chat(user, span_warning("There is no facial hair to shave!")) + return + if(!get_location_accessible(H, location)) + to_chat(user, span_warning("The mask is in the way!")) + return + if(H.facial_hairstyle == "Shaved") + to_chat(user, span_warning("Already clean-shaven!")) + return + + if(H == user) //shaving yourself + user.visible_message(span_notice("[user] starts to shave [user.p_their()] facial hair with [src]."), \ + span_notice("You take a moment to shave your facial hair with [src]...")) + if(do_after(user, 10 SECONDS, target = H)) + user.visible_message(span_notice("[user] shaves [user.p_their()] facial hair clean with [src]."), \ + span_notice("You finish shaving with [src]. Fast and clean!")) + shave(H) + else + user.visible_message(span_warning("[user] tries to shave [H]'s facial hair with [src]."), \ + span_notice("You start shaving [H]'s facial hair...")) + if(do_after(user, 10 SECONDS, target = H)) + user.visible_message(span_warning("[user] shaves off [H]'s facial hair with [src]."), \ + span_notice("You shave [H]'s facial hair clean off.")) + shave(H) + else + ..() + else + ..() diff --git a/modular_skyrat/modules/salon/icons/chair.dmi b/modular_skyrat/modules/salon/icons/chair.dmi new file mode 100644 index 00000000000..189f33d1396 Binary files /dev/null and b/modular_skyrat/modules/salon/icons/chair.dmi differ diff --git a/modular_skyrat/modules/salon/icons/dryer.dmi b/modular_skyrat/modules/salon/icons/dryer.dmi new file mode 100644 index 00000000000..ab02432a8b0 Binary files /dev/null and b/modular_skyrat/modules/salon/icons/dryer.dmi differ diff --git a/modular_skyrat/modules/salon/icons/items.dmi b/modular_skyrat/modules/salon/icons/items.dmi new file mode 100644 index 00000000000..7edbc40bc3f Binary files /dev/null and b/modular_skyrat/modules/salon/icons/items.dmi differ diff --git a/modular_skyrat/modules/salon/icons/mixer.dmi b/modular_skyrat/modules/salon/icons/mixer.dmi new file mode 100644 index 00000000000..9539c195976 Binary files /dev/null and b/modular_skyrat/modules/salon/icons/mixer.dmi differ diff --git a/modular_skyrat/modules/salon/icons/vendor.dmi b/modular_skyrat/modules/salon/icons/vendor.dmi new file mode 100644 index 00000000000..62b6cbe0c5b Binary files /dev/null and b/modular_skyrat/modules/salon/icons/vendor.dmi differ diff --git a/modular_skyrat/modules/salon/sound/drying.ogg b/modular_skyrat/modules/salon/sound/drying.ogg new file mode 100644 index 00000000000..0f977fb90ba Binary files /dev/null and b/modular_skyrat/modules/salon/sound/drying.ogg differ diff --git a/modular_skyrat/modules/salon/sound/haircut.ogg b/modular_skyrat/modules/salon/sound/haircut.ogg new file mode 100644 index 00000000000..160bfc36941 Binary files /dev/null and b/modular_skyrat/modules/salon/sound/haircut.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 28f11bd6a10..ab570241772 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -173,6 +173,7 @@ #include "code\__DEFINES\dcs\helpers.dm" #include "code\__DEFINES\dcs\signals.dm" #include "code\__DEFINES\research\anomalies.dm" +#include "code\__DEFINES\~skyrat_defines\access.dm" #include "code\__DEFINES\~skyrat_defines\ambitions.dm" #include "code\__DEFINES\~skyrat_defines\ammo_defines.dm" #include "code\__DEFINES\~skyrat_defines\augment.dm" @@ -4914,6 +4915,18 @@ #include "modular_skyrat\modules\roboclothes\code\vending\wardrobes.dm" #include "modular_skyrat\modules\rod-stopper\code\immovable_skyrat.dm" #include "modular_skyrat\modules\rod-stopper\code\rodstopper.dm" +#include "modular_skyrat\modules\salon\code\area.dm" +#include "modular_skyrat\modules\salon\code\barber.dm" +#include "modular_skyrat\modules\salon\code\barber_chair.dm" +#include "modular_skyrat\modules\salon\code\barbervend.dm" +#include "modular_skyrat\modules\salon\code\clothing.dm" +#include "modular_skyrat\modules\salon\code\fur_dyer.dm" +#include "modular_skyrat\modules\salon\code\hand_dryer.dm" +#include "modular_skyrat\modules\salon\code\misc_items.dm" +#include "modular_skyrat\modules\salon\code\pipette.dm" +#include "modular_skyrat\modules\salon\code\scissors.dm" +#include "modular_skyrat\modules\salon\code\sprays.dm" +#include "modular_skyrat\modules\salon\code\straight_razor.dm" #include "modular_skyrat\modules\sec_haul\code\guns\ammo.dm" #include "modular_skyrat\modules\sec_haul\code\guns\bullets.dm" #include "modular_skyrat\modules\sec_haul\code\guns\gun_spawns.dm" diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/jobs/jobs/barber.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/jobs/jobs/barber.ts new file mode 100644 index 00000000000..e690e7e063f --- /dev/null +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/jobs/jobs/barber.ts @@ -0,0 +1,11 @@ +import { Job } from "../base"; +import { Service } from "../departments"; + +const Barber: Job = { + name: "Barber", + description: "Run your salon and meet the crews sanitary needs, such as hair cutting, massaging and more!", + department: Service, + alt_titles: ["Salon Manager", "Salon Technician", "Stylist", "Colorist"], +}; + +export default Barber;