diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm index f9341cc38e7..3870424d5d1 100644 --- a/_maps/RandomZLevels/mothership_astrum.dmm +++ b/_maps/RandomZLevels/mothership_astrum.dmm @@ -625,9 +625,7 @@ /obj/structure/table/abductor, /obj/machinery/button/door{ id = "lootlock"; - name = "Equipment Lock"; - normaldoorcontrol = 0; - specialfunctions = 1 + name = "Equipment Lock" }, /turf/open/floor/mineral/abductor, /area/awaymission/mothership_astrum/halls) @@ -2025,9 +2023,7 @@ "Eq" = ( /obj/machinery/button/door{ id = "lobolock"; - name = "Lobotomite Testing Lockdown"; - normaldoorcontrol = 0; - specialfunctions = 1 + name = "Lobotomite Testing Lockdown" }, /obj/structure/table/abductor, /turf/open/floor/plating/abductor, @@ -2627,10 +2623,6 @@ /turf/open/floor/plating/abductor, /area/awaymission/mothership_astrum/halls) "KF" = ( -/obj/structure/sign/plaques/deempisi{ - pixel_x = -28; - pixel_y = -4 - }, /obj/machinery/button/door{ id = "barShutters"; name = "bar shutters"; diff --git a/_maps/map_files/Blueshift/BlueShift.dmm b/_maps/map_files/Blueshift/BlueShift.dmm index 0819c52061e..caaeb0e73a3 100644 --- a/_maps/map_files/Blueshift/BlueShift.dmm +++ b/_maps/map_files/Blueshift/BlueShift.dmm @@ -74612,9 +74612,6 @@ /obj/effect/turf_decal/tile/bar, /obj/machinery/vending/boozeomat, /obj/machinery/light/directional/north, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 26 - }, /turf/open/floor/iron, /area/service/bar) "kXU" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index f3048f56ffe..c8b70d7f403 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -9943,14 +9943,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/cargo/miningoffice) -"bFF" = ( -/obj/structure/window/reinforced/plasma/spawner/west{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "bFL" = ( /turf/closed/wall/r_wall, /area/security/warden) @@ -28112,19 +28104,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/engineering/break_room) -"dDF" = ( -/obj/structure/noticeboard/directional/east, -/obj/machinery/camera{ - c_tag = "Science - Robotics Lab"; - dir = 8; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/robotics/lab) "dDI" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -38662,6 +38641,17 @@ }, /turf/open/floor/iron, /area/security/prison) +"fCQ" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/wood/fancy, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "fDa" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -40250,6 +40240,14 @@ }, /turf/open/floor/iron, /area/service/hydroponics/garden/abandoned) +"gdk" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "gds" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42724,6 +42722,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/hallway/primary/central/aft) +"gPr" = ( +/obj/structure/noticeboard/directional/east, +/obj/machinery/camera{ + c_tag = "Science - Robotics Lab"; + dir = 8; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/science/robotics/lab) "gPw" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -42790,17 +42801,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/grimy, /area/commons/vacant_room/office) -"gRd" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/wood/fancy, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "gRl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -48624,16 +48624,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall, /area/engineering/main) -"ixt" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/mob/living/basic/cockroach, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "ixv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49725,14 +49715,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/security/checkpoint/customs) -"iOb" = ( -/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) "iOi" = ( /obj/machinery/cell_charger, /obj/structure/table/reinforced, @@ -49924,6 +49906,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/service/library) +"iRe" = ( +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/service/bar) "iRw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/blobstart, @@ -49981,6 +49969,26 @@ dir = 1 }, /area/commons/locker) +"iSB" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/mob/living/simple_animal/sloth/citrus, +/turf/open/floor/iron, +/area/cargo/qm) "iSG" = ( /obj/structure/sign/poster/contraband/random, /turf/closed/wall, @@ -50034,6 +50042,22 @@ }, /turf/open/floor/iron/dark, /area/engineering/atmos) +"iTw" = ( +/obj/structure/bed/dogbed/renault, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/newscaster/directional/south, +/mob/living/simple_animal/pet/fox/renault, +/turf/open/floor/iron/dark, +/area/command/heads_quarters/captain) "iTz" = ( /obj/machinery/computer/cargo/request{ dir = 4 @@ -52351,6 +52375,17 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron, /area/engineering/break_room) +"jGJ" = ( +/obj/machinery/door/window{ + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/table/wood/fancy, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "jGK" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -52840,14 +52875,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) -"jOi" = ( -/obj/structure/window/reinforced/plasma/spawner/west{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "jOj" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -54918,17 +54945,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/secondary/entry) -"ksU" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/table/wood/fancy, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "ksX" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -56690,17 +56706,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/service/abandoned_gambling_den) -"kTf" = ( -/obj/machinery/door/window{ - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/table/wood/fancy, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "kTl" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -61625,6 +61630,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/maintenance/starboard/aft) +"mmM" = ( +/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 + }, +/mob/living/basic/cockroach, +/turf/open/floor/plating, +/area/maintenance/port/aft) "mmQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66695,6 +66710,14 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) +"nKc" = ( +/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) "nKs" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -73111,18 +73134,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/security/warden) -"pFC" = ( -/obj/structure/bed/dogbed/runtime, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/mob/living/simple_animal/pet/cat/runtime, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/command/heads_quarters/cmo) "pFD" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -73447,22 +73458,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"pKi" = ( -/obj/structure/bed/dogbed/renault, -/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 - }, -/mob/living/simple_animal/pet/fox/renault, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron/dark, -/area/command/heads_quarters/captain) "pKR" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/purple{ @@ -78742,6 +78737,17 @@ }, /turf/open/floor/iron, /area/security/prison) +"rhJ" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/table/wood/fancy, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "rhZ" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood, @@ -87231,6 +87237,14 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/cargo/storage) +"tLS" = ( +/obj/structure/window/reinforced/plasma/spawner/west{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "tLT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/nanotrasen{ @@ -87888,6 +87902,14 @@ }, /turf/open/floor/iron, /area/cargo/office) +"tVX" = ( +/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) "tWu" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -88693,26 +88715,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/engineering/main) -"ulM" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/mob/living/simple_animal/sloth/citrus, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/cargo/qm) "ume" = ( /obj/machinery/door/window/brigdoor{ dir = 1; @@ -94573,14 +94575,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"vUU" = ( -/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) "vVc" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -100123,6 +100117,18 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/service/abandoned_gambling_den) +"xBp" = ( +/obj/structure/bed/dogbed/runtime, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/obj/structure/disposalpipe/segment, +/mob/living/simple_animal/pet/cat/runtime, +/turf/open/floor/iron, +/area/command/heads_quarters/cmo) "xBy" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/purple{ @@ -123183,9 +123189,9 @@ aTe cnP kuB qzf -iOb -vUU -iOb +nKc +tVX +nKc qzf qzf qzf @@ -123443,7 +123449,7 @@ qzf rgQ tii wrL -bFF +gdk lBd lZd hfD @@ -123700,7 +123706,7 @@ hWu rgQ uqa wrL -jOi +tLS vyP eZx hfD @@ -123957,7 +123963,7 @@ qzf rgQ tii wrL -bFF +gdk lYR tKt nYt @@ -135252,7 +135258,7 @@ eXA bWD aaI nJo -ksU +rhJ mFG mfh lxk @@ -135509,7 +135515,7 @@ eXA cNT bYO nJo -kTf +jGJ ttd mFG tqz @@ -135766,7 +135772,7 @@ eXA bWD bYO nJo -gRd +fCQ ybZ ybZ lxk @@ -137115,7 +137121,7 @@ dfm dfm dfm dOM -ixt +mmM dSF dOM wfC @@ -138807,7 +138813,7 @@ bAY alf heA cgp -heA +aXI aXI aXI aXI @@ -139064,7 +139070,7 @@ iXT alf hFM gMU -unM +iRe guN stu pqt @@ -140443,7 +140449,7 @@ dyd dzK dAO dCv -dDF +gPr dEN dGd dHA @@ -142956,7 +142962,7 @@ glH glH jLq qqj -pKi +iTw glH sfH bXb @@ -146865,7 +146871,7 @@ ivY loW nSm txo -pFC +xBp stU pxA qfr @@ -148068,7 +148074,7 @@ suJ viJ pxq kKx -ulM +iSB lhS qIO oBs diff --git a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm index 092e28d1fcd..9fc55cd45a1 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm @@ -196,15 +196,6 @@ /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, @@ -5912,14 +5903,6 @@ }, /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{ @@ -7712,6 +7695,11 @@ /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, @@ -7719,6 +7707,11 @@ /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, @@ -8743,6 +8736,13 @@ /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,6 +10554,16 @@ }, /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{ @@ -11666,18 +11676,6 @@ /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, @@ -18572,13 +18570,6 @@ }, /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, @@ -18758,6 +18749,15 @@ }, /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/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,6 +23998,10 @@ }, /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{ @@ -31031,6 +31035,14 @@ }, /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, @@ -32877,6 +32889,11 @@ /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, @@ -36242,6 +36259,12 @@ /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{ @@ -36586,11 +36609,6 @@ }, /turf/open/floor/iron, /area/engineering/storage) -"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; @@ -38935,10 +38953,6 @@ /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 @@ -39176,6 +39190,10 @@ /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, @@ -39753,6 +39771,14 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) +"fuC" = ( +/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) "fuF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -40213,6 +40239,12 @@ /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, @@ -41095,14 +41127,6 @@ /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, @@ -41642,6 +41666,13 @@ /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" @@ -41729,6 +41760,11 @@ }, /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, @@ -42912,6 +42948,13 @@ /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{ @@ -44097,6 +44140,10 @@ /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{ @@ -44650,13 +44697,6 @@ }, /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, @@ -44908,11 +44948,6 @@ /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, @@ -45083,6 +45118,10 @@ /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, @@ -47471,11 +47510,6 @@ }, /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 @@ -50403,13 +50437,6 @@ /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, @@ -53172,11 +53199,6 @@ }, /turf/open/floor/iron, /area/cargo/storage) -"jHV" = ( -/obj/structure/table/wood, -/obj/machinery/computer/secure_data/laptop, -/turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain) "jHY" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -53233,6 +53255,15 @@ 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{ @@ -53291,15 +53322,6 @@ /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, @@ -53437,10 +53459,6 @@ /obj/machinery/power/apc/auto_name/east, /turf/open/floor/iron/white, /area/medical/virology) -"jLq" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain) "jLJ" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -56374,6 +56392,11 @@ }, /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!"; @@ -56832,6 +56855,17 @@ /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 @@ -59197,6 +59231,10 @@ }, /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, @@ -60320,6 +60358,10 @@ }, /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 @@ -60533,6 +60575,12 @@ /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, @@ -61287,17 +61335,6 @@ }, /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, @@ -62001,12 +62038,6 @@ }, /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!"; @@ -62210,6 +62241,15 @@ }, /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/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, @@ -68198,6 +68238,10 @@ }, /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 @@ -69639,14 +69683,6 @@ /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/carpet/executive, -/area/command/heads_quarters/captain) "otC" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, @@ -70880,6 +70916,14 @@ }, /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, @@ -73936,12 +73980,6 @@ }, /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/carpet/executive, -/area/command/heads_quarters/captain) "pGD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -74012,6 +74050,29 @@ }, /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, @@ -74294,6 +74355,14 @@ /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/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "pLD" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/camera{ @@ -74401,10 +74470,6 @@ /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/carpet/executive, -/area/command/heads_quarters/captain) "pOb" = ( /obj/structure/table/glass, /obj/machinery/light/directional/east, @@ -75568,14 +75633,6 @@ /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 @@ -76277,10 +76334,6 @@ /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/carpet/executive, -/area/command/heads_quarters/captain) "qqB" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -77278,6 +77331,13 @@ }, /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, @@ -79216,6 +79276,16 @@ /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, @@ -79486,12 +79556,6 @@ /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, @@ -80569,12 +80633,6 @@ /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/carpet/executive, -/area/command/heads_quarters/captain) "rAg" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -81461,6 +81519,12 @@ /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, @@ -85079,29 +85143,6 @@ /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/carpet/executive, -/area/command/heads_quarters/captain) "sPQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -86347,10 +86388,6 @@ }, /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 @@ -87908,15 +87945,6 @@ /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{ @@ -88843,17 +88871,6 @@ /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, @@ -89322,6 +89339,12 @@ /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{ @@ -90222,10 +90245,6 @@ /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 @@ -90764,6 +90783,17 @@ }, /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{ @@ -92452,16 +92482,6 @@ }, /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, @@ -93640,6 +93660,12 @@ }, /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{ @@ -94312,6 +94338,18 @@ }, /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{ @@ -94525,11 +94563,6 @@ /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, @@ -94947,12 +94980,6 @@ /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"; @@ -95292,6 +95319,10 @@ /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 @@ -97018,13 +97049,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/engineering/main) -"wrb" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/blueshield, -/turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain) "wrg" = ( /obj/machinery/vending/boozeomat, /obj/machinery/status_display/evac/directional/north, @@ -97052,10 +97076,6 @@ }, /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 @@ -97422,13 +97442,6 @@ }, /turf/open/floor/iron, /area/cargo/storage) -"wvX" = ( -/obj/structure/sign/nanotrasen{ - pixel_x = -32; - pixel_y = 32 - }, -/turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain) "wwA" = ( /obj/structure/table/glass, /obj/item/folder/blue, @@ -99892,6 +99905,12 @@ /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{ @@ -100341,10 +100360,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/aisat/exterior) -"xtC" = ( -/obj/item/radio/intercom/directional/south, -/turf/open/floor/carpet/executive, -/area/command/heads_quarters/captain) "xub" = ( /obj/structure/window/reinforced{ dir = 4 @@ -100973,16 +100988,6 @@ }, /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, @@ -123745,11 +123750,11 @@ otP vNO aTe rNb -ezC +dUC qzf -aUH -fTW -aUH +fuC +pLz +fuC qzf qzf qzf @@ -124002,12 +124007,12 @@ otP vNO eyE vZy -tGP -tii -rgQ +jIM +fll +lPB qzE -wrL -jJm +lMb +mmY lBd lZd hnW @@ -124259,12 +124264,12 @@ otP vNO wTm rKr -hhS -hWu -rgQ -uqa -wrL -aaL +bni +kGd +lPB +hkZ +lMb +cIc vyP eZx hnW @@ -124516,12 +124521,12 @@ otP vNO eyE iDn -cGf -tii -rgQ +qFb +fll +lPB qzE -wrL -jJm +lMb +mmY lYR tKt jBK @@ -124773,12 +124778,12 @@ otP lON lgs oZO -hdi -tii -tii -tSQ -fgG -fgG +bwL +fll +fll +uwW +gTZ +gTZ qzf qzf hdp @@ -125032,9 +125037,9 @@ vzm oZO idx qzf -uWq +ree qzE -qfy +oJv qzf pEZ pEZ @@ -125289,9 +125294,9 @@ xPF aCW lAe qzf -vDy -lZo -fgG +gem +kMr +gTZ qzf axV axV @@ -125545,11 +125550,11 @@ xPF xPF oZO oni -mkl -iMT -xEG -bQA -vJj +vob +gxM +bJT +vzy +ubb mef mef tQl @@ -139371,7 +139376,7 @@ xMe alf heA gje -heA +aXI aXI aXI aXI @@ -139628,7 +139633,7 @@ iXT alf hFM wtr -unM +xni ddc stu pqt @@ -143518,9 +143523,9 @@ oOD gdT glH glH -jLq -qqj -pGB +nZw +vOw +euh glH sfH bXb @@ -143774,10 +143779,10 @@ xTi oOD iUx glH -pNO -wvX -wrb -xtC +lsg +gaT +rOd +dgU glH glH glH @@ -144031,10 +144036,10 @@ xTi oOD vfg glH -otq -rAf -jHV -sPJ +dLL +fCg +bmS +pHv sXr jpd wQc diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index 4061f90d1c5..c8464823e68 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -2455,6 +2455,7 @@ /obj/item/vending_refill/cigarette, /obj/machinery/light/small/directional/east, /obj/structure/table/wood, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron, /area/service/bar) "mC" = ( @@ -5850,8 +5851,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/machinery/status_display/evac/directional/south, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = -32 + }, /turf/open/floor/iron, /area/service/bar) "Cx" = ( @@ -7836,8 +7839,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/mob/living/carbon/human/species/monkey/punpun, /obj/structure/table/wood, +/mob/living/carbon/human/species/monkey/punpun, /turf/open/floor/iron, /area/service/bar) "Ls" = ( @@ -9142,12 +9145,12 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /mob/living/simple_animal/bot/secbot/beepsky{ desc = "Powered by the tears and sweat of laborers."; name = "Prison Ofitser" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/mine/laborcamp/security) "Rx" = ( @@ -9508,6 +9511,7 @@ dir = 1 }, /obj/machinery/light/small/directional/east, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/stone, /area/service/bar/atrium) "Te" = ( @@ -10001,7 +10005,6 @@ }, /obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/service/bar) "Vs" = ( diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above_skyrat.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above_skyrat.dmm index 3aa80397f42..a753390a1d8 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above_skyrat.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above_skyrat.dmm @@ -8422,8 +8422,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/obj/machinery/status_display/evac/directional/south, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = -32 + }, /turf/open/floor/iron, /area/service/bar) "Cy" = ( @@ -10925,8 +10927,8 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, -/mob/living/carbon/human/species/monkey/punpun, /obj/structure/table/wood, +/mob/living/carbon/human/species/monkey/punpun, /turf/open/floor/iron, /area/service/bar) "Lm" = ( @@ -13245,6 +13247,7 @@ dir = 1 }, /obj/machinery/light/small/directional/east, +/obj/machinery/status_display/evac/directional/east, /turf/open/floor/stone, /area/service/bar/atrium) "Te" = ( @@ -13928,7 +13931,6 @@ }, /obj/machinery/duct, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/service/bar) "Vp" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 60159e43644..b2a7b63bb5a 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -5775,16 +5775,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/hallway/primary/fore) -"aAF" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/robotics/lab) "aAI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -9658,30 +9648,6 @@ }, /turf/open/floor/iron/dark, /area/medical/virology) -"aVL" = ( -/obj/machinery/camera{ - c_tag = "Medical Operating Theater A"; - dir = 1; - name = "medical camera"; - network = list("ss13","medical") - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clipboard{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/medical/surgery) "aVQ" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -13951,15 +13917,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/central) -"bun" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/simple_animal/pet/fox/renault, -/obj/machinery/button/door/directional/south{ - id = "captain_escape"; - name = "Tactical Relocation Toggle" - }, -/turf/open/floor/wood, -/area/command/heads_quarters/captain) "bux" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -27534,17 +27491,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/medical/paramedic) -"dgP" = ( -/obj/structure/window/reinforced/plasma{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "dhc" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -27659,6 +27605,13 @@ icon_state = "platingdmg3" }, /area/maintenance/fore) +"dhN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/spawner/random/structure/crate, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/port) "dhR" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -29321,17 +29274,6 @@ }, /turf/open/floor/iron, /area/engineering/main) -"dRm" = ( -/obj/structure/window/reinforced/plasma{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "dRs" = ( /obj/effect/turf_decal/delivery, /obj/machinery/pipedispenser/disposal, @@ -35219,23 +35161,6 @@ /obj/item/trash/syndi_cakes, /turf/open/floor/iron/white, /area/security/prison) -"gfH" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/north, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/stack/pipe_cleaner_coil/random, -/obj/item/rcl/pre_loaded, -/obj/item/storage/crayons, -/obj/item/storage/crayons, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/service/library) "gfK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -36849,12 +36774,29 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) +"gMF" = ( +/obj/structure/bookcase/random/religion, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "gNg" = ( /obj/effect/turf_decal/bot, /obj/machinery/power/emitter, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/engineering/main) +"gNA" = ( +/obj/structure/bed/dogbed/renault, +/obj/machinery/button/door/directional/south{ + id = "captain_escape"; + name = "Tactical Relocation Toggle" + }, +/mob/living/simple_animal/pet/fox/renault, +/turf/open/floor/wood, +/area/command/heads_quarters/captain) "gNH" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -40431,6 +40373,12 @@ icon_state = "platingdmg1" }, /area/maintenance/fore) +"igd" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/airless, +/area/engineering/main) "ige" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42353,6 +42301,17 @@ }, /turf/open/floor/iron, /area/cargo/office) +"iQP" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "iQR" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -42610,20 +42569,6 @@ icon_state = "platingdmg1" }, /area/maintenance/fore) -"iTZ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/mob/living/simple_animal/bot/cleanbot/medbay, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/medical/storage) "iUa" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43174,6 +43119,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port) +"jdw" = ( +/obj/structure/easel, +/obj/effect/turf_decal/bot, +/obj/item/canvas/twentythree_twentythree, +/obj/item/airlock_painter, +/turf/open/floor/iron/dark, +/area/service/library) "jdN" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44028,6 +43980,16 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) +"jvz" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Airlock"; + req_access_txt = "24" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engineering/atmos) "jvE" = ( /obj/machinery/door/airlock/external{ name = "External Airlock"; @@ -44528,13 +44490,6 @@ /obj/effect/spawner/random/decoration/carpet, /turf/open/floor/iron, /area/security/prison) -"jId" = ( -/obj/structure/easel, -/obj/effect/turf_decal/bot, -/obj/item/canvas/twentythree_twentythree, -/obj/item/airlock_painter, -/turf/open/floor/iron/dark, -/area/service/library) "jIo" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -44808,6 +44763,17 @@ }, /turf/open/floor/iron/dark, /area/service/chapel/office) +"jNA" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "jNB" = ( /obj/structure/tank_dispenser, /obj/effect/turf_decal/delivery, @@ -45208,6 +45174,16 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) +"jVh" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/robotics/lab) "jVm" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -46486,13 +46462,6 @@ icon_state = "platingdmg1" }, /area/maintenance/starboard) -"ksR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/spawner/random/structure/crate, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/port) "ksT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47151,6 +47120,17 @@ }, /turf/open/floor/engine, /area/engineering/supermatter/room) +"kDe" = ( +/obj/machinery/light/directional/north, +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole{ + pixel_y = 5 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "kDm" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -47257,6 +47237,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/command/bridge) +"kFx" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/mob/living/simple_animal/bot/cleanbot/medbay, +/turf/open/floor/iron/dark, +/area/medical/storage) "kFz" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/bot, @@ -47654,20 +47648,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/grass, /area/service/chapel) -"kLn" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/vending/games, -/obj/effect/turf_decal/bot_white, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/radio/intercom/directional/east, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/service/library) "kLr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -47907,6 +47887,30 @@ icon_state = "platingdmg3" }, /area/maintenance/starboard) +"kQf" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/water_source/puddle, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/mob/living/carbon/human/species/monkey, +/obj{ + name = "---Merge conflict marker---" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/water_source/puddle, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light_switch/directional/south, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/grass, +/area/science/genetics) "kQp" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -48110,6 +48114,20 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/engineering/atmos) +"kTa" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/vending/games, +/obj/effect/turf_decal/bot_white, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/radio/intercom/directional/east, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "kTl" = ( /obj/machinery/power/port_gen/pacman, /obj/item/stack/sheet/mineral/plasma{ @@ -48444,17 +48462,6 @@ /obj/effect/decal/remains/human, /turf/open/floor/plating, /area/cargo/warehouse) -"kZp" = ( -/obj/machinery/light/directional/north, -/obj/structure/table/wood, -/obj/machinery/computer/libraryconsole{ - pixel_y = 5 - }, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/service/library) "kZq" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -50558,17 +50565,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/service/chapel) -"lRa" = ( -/obj/structure/window/reinforced/plasma{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "lRf" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/chef_order{ @@ -50820,12 +50816,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/cargo/storage) -"lUX" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/engineering/atmos) "lVq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -51054,6 +51044,29 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard) +"lYQ" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/button/door/directional/south{ + id = "custodialwagon"; + name = "Custodial Bay Toggle"; + req_access_txt = "26'" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/mob/living/simple_animal/bot/cleanbot{ + auto_patrol = 1; + icon_state = "cleanbot1"; + name = "Mopficcer Sweepsky" + }, +/turf/open/floor/iron, +/area/hallway/primary/starboard) "lYT" = ( /obj/machinery/door/airlock/external{ name = "External Airlock"; @@ -52316,12 +52329,6 @@ }, /turf/open/floor/iron/dark, /area/commons/vacant_room/commissary) -"mwX" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/robotics/lab) "mwZ" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow, @@ -52712,6 +52719,12 @@ }, /turf/open/floor/iron/dark, /area/service/bar/atrium) +"mCx" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/robotics/lab) "mCS" = ( /obj/effect/turf_decal/stripes/end, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -53139,6 +53152,17 @@ /obj/structure/cable, /turf/open/floor/circuit/red/telecomms, /area/tcommsat/server) +"mKB" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "mKE" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -54092,18 +54116,6 @@ }, /turf/open/floor/iron/dark, /area/commons/storage/primary) -"ndz" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/water_source/puddle, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/carbon/human/species/monkey, -/turf/open/floor/grass, -/area/science/genetics) "ndE" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/tower, @@ -56295,6 +56307,23 @@ icon_state = "panelscorched" }, /area/maintenance/port/aft) +"oar" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/north, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/stack/pipe_cleaner_coil/random, +/obj/item/rcl/pre_loaded, +/obj/item/storage/crayons, +/obj/item/storage/crayons, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "oaA" = ( /obj/structure/lattice/catwalk, /turf/open/floor/plating/airless, @@ -56593,6 +56622,22 @@ icon_state = "panelscorched" }, /area/maintenance/starboard) +"ohj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/structure/reagent_dispensers/beerkeg{ + pixel_y = 5 + }, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = -32 + }, +/turf/open/floor/iron/dark, +/area/service/bar) "ohr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, @@ -59399,12 +59444,6 @@ icon_state = "panelscorched" }, /area/ai_monitored/command/storage/satellite) -"pim" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating/airless, -/area/engineering/main) "piF" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68208,6 +68247,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/medical/surgery) +"sny" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "snB" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -72256,29 +72306,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/fore) -"tTo" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/stripes/corner, -/mob/living/simple_animal/bot/cleanbot{ - auto_patrol = 1; - icon_state = "cleanbot1"; - name = "Mopficcer Sweepsky" - }, -/obj/machinery/button/door/directional/south{ - id = "custodialwagon"; - name = "Custodial Bay Toggle"; - req_access_txt = "26'" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/hallway/primary/starboard) "tTB" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -75054,22 +75081,6 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/rust, /area/command/heads_quarters/hos) -"vaY" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/table/wood, -/obj/structure/reagent_dispensers/beerkeg{ - pixel_y = 5 - }, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_y = -30 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "vbp" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -76064,14 +76075,6 @@ }, /turf/open/floor/iron, /area/command/teleporter) -"vtN" = ( -/obj/structure/bookcase/random/religion, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/sign/painting/library{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/service/library) "vtT" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -77700,17 +77703,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood, /area/service/bar) -"vYO" = ( -/obj/structure/window/reinforced/plasma{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "vZl" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -79814,16 +79806,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) -"wRO" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engineering/atmos) "wRX" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/carpspawn, @@ -80536,6 +80518,30 @@ }, /turf/open/floor/plating/asteroid, /area/space/nearstation) +"xcX" = ( +/obj/machinery/camera{ + c_tag = "Medical Operating Theater A"; + dir = 1; + name = "medical camera"; + network = list("ss13","medical") + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical, +/obj/item/clipboard{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/medical/surgery) "xdf" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/neutral, @@ -83765,6 +83771,12 @@ /obj/machinery/light/broken/directional/west, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) +"ymi" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/engineering/atmos) (1,1,1) = {" aaa @@ -100344,7 +100356,7 @@ aRP aTk nJS tiX -ksR +dhN skO rbF amA @@ -101107,7 +101119,7 @@ vEl mkY wMM vte -iTZ +kFx eRK dsd pgJ @@ -102655,7 +102667,7 @@ iSA aVC sns aZu -aVL +xcX aVC nTA rDL @@ -108055,13 +108067,13 @@ mjX nEu gUd thp -vtN +gMF fau iRt oIr eyj sim -jId +jdw pHZ dfF sim @@ -108312,13 +108324,13 @@ duf pes mRD sim -kZp +kDe rZe kxy dXx gXK sim -gfH +oar pkU pBc thp @@ -109597,7 +109609,7 @@ qCn uxJ kyH sim -kLn +kTa hUi jXf fyv @@ -110627,7 +110639,7 @@ wAO fDo pmd dyi -vaY +ohj wAO bpq bRY @@ -115780,7 +115792,7 @@ iyc vgz rJI nMC -bun +gNA lih lih bOZ @@ -116589,8 +116601,8 @@ iVw wlK iVw iVw -wRO -lUX +jvz +ymi iVw ygU aDU @@ -116847,7 +116859,7 @@ gNg rJb qGy jJi -pim +igd eHf ozk aDU @@ -118902,9 +118914,9 @@ dTq eAV gOw eux -dRm -dgP -dRm +jNA +mKB +jNA qkL jts wRB @@ -119930,9 +119942,9 @@ kyz qkL qoR opS -vYO -lRa -vYO +sny +iQP +sny qkL dlF wRB @@ -120118,7 +120130,7 @@ atq aXe aqU auk -mwX +mCx xFs bFj bbQ @@ -120370,12 +120382,12 @@ xvD iTj aXU bdb -ndz +kQf bah otz jSc wWz -aAF +jVh rfZ lzk aZS @@ -120928,7 +120940,7 @@ bAz bEg put rXt -tTo +lYQ hNK bmT oRw diff --git a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm index e717623dfe8..105afcd0be3 100644 --- a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm +++ b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm @@ -36991,15 +36991,6 @@ /obj/item/hand_labeler, /turf/open/floor/iron/dark, /area/command/teleporter) -"dby" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "dbz" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -38141,15 +38132,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/security/prison) -"dFJ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "dFU" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -44900,6 +44882,14 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron, /area/cargo/storage) +"gPn" = ( +/obj/structure/bookcase/random/religion, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "gQs" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - CO2"; @@ -51432,6 +51422,17 @@ /obj/item/clothing/mask/gas, /turf/open/floor/iron/dark, /area/engineering/supermatter/room) +"jPQ" = ( +/obj/machinery/light/directional/north, +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole{ + pixel_y = 5 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "jQf" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - N2O"; @@ -53878,17 +53879,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/grass, /area/service/chapel) -"kLn" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/vending/games, -/obj/effect/turf_decal/bot_white, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/dark, -/area/service/library) "kLr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -54399,15 +54389,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/hallway/primary/fore) -"kVo" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "kVv" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/radiation, @@ -54575,14 +54556,6 @@ /obj/effect/decal/remains/human, /turf/open/floor/plating, /area/cargo/warehouse) -"kZp" = ( -/obj/machinery/light/directional/north, -/obj/structure/table/wood, -/obj/machinery/computer/libraryconsole{ - pixel_y = 5 - }, -/turf/open/floor/iron/dark, -/area/service/library) "kZq" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -55637,6 +55610,15 @@ "lCl" = ( /turf/open/floor/iron/dark, /area/command/bridge) +"lCH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "lCS" = ( /obj/structure/dresser, /obj/machinery/light/small/directional/south, @@ -56437,22 +56419,6 @@ /obj/item/stack/cable_coil/five, /turf/open/floor/plating, /area/cargo/warehouse) -"lXn" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/table/wood, -/obj/structure/reagent_dispensers/beerkeg{ - pixel_y = 5 - }, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_y = -30 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "lXq" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -62711,6 +62677,15 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/maintenance/port/fore) +"oTR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "oTZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -63095,6 +63070,20 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/misc_lab) +"pbz" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/vending/games, +/obj/effect/turf_decal/bot_white, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/radio/intercom/directional/east, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "pbW" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -68825,15 +68814,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/cargo/warehouse) -"rzN" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "rAp" = ( /obj/structure/weightmachine/weightlifter, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -76274,6 +76254,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engineering/break_room) +"uTG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "uTP" = ( /obj/machinery/camera{ c_tag = "Xenobiology Cell 6"; @@ -77153,6 +77142,15 @@ }, /turf/open/floor/plating, /area/command/heads_quarters/rd) +"vlZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "vmf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -77509,16 +77507,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/command/heads_quarters/cmo) -"vtN" = ( -/obj/structure/bookcase/random/religion, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/sign/barsign{ - pixel_y = 32; - req_access = null; - req_access_txt = "25" - }, -/turf/open/floor/iron/dark, -/area/service/library) "vtT" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -78059,6 +78047,22 @@ }, /turf/open/floor/iron, /area/security/prison) +"vGW" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/structure/reagent_dispensers/beerkeg{ + pixel_y = 5 + }, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = -32 + }, +/turf/open/floor/iron/dark, +/area/service/bar) "vHh" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -108152,7 +108156,7 @@ tgW nEu gUd thp -vtN +gPn gCH iRt oIr @@ -108409,7 +108413,7 @@ duf pes mRD sim -kZp +jPQ sKl kxy dXx @@ -109694,7 +109698,7 @@ qCn uxJ kyH sim -kLn +pbz hUi jXf fyv @@ -110724,7 +110728,7 @@ wAO fDo pmd dyi -lXn +vGW wAO bpq bRY @@ -118999,9 +119003,9 @@ ddt eAV gOw eux -kVo -dFJ -kVo +uTG +vlZ +uTG qkL ets eCC @@ -120027,9 +120031,9 @@ dlR qkL qoR opS -rzN -dby -rzN +lCH +oTR +lCH qkL lUR eCC diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ff53793da7d..789650370a3 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2038,12 +2038,6 @@ /obj/machinery/atmospherics/components/trinary/filter/flipped, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) -"apX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/radiation, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "aqe" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/drinkingglass{ @@ -4732,6 +4726,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/cargo/miningoffice) +"aQC" = ( +/obj/structure/window/reinforced/plasma, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "aQF" = ( /obj/structure/bed, /obj/item/bedsheet/dorms, @@ -4775,15 +4776,6 @@ "aRA" = ( /turf/closed/wall, /area/hallway/secondary/entry) -"aRB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "aRE" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -7385,14 +7377,6 @@ /obj/machinery/power/apc/auto_name/south, /turf/open/floor/plating, /area/maintenance/port) -"byb" = ( -/obj/machinery/power/apc/auto_name/north, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "byo" = ( /obj/structure/closet, /obj/item/clothing/gloves/color/fyellow, @@ -7785,14 +7769,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, /turf/open/floor/iron/dark, /area/engineering/atmos) -"bDe" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ - dir = 6 - }, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "bDt" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -8666,13 +8642,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/primary/central) -"bOJ" = ( -/obj/effect/spawner/random/structure/crate, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/fore) "bON" = ( /obj/structure/sign/warning/securearea{ pixel_x = -32 @@ -9021,10 +8990,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"bUL" = ( -/obj/machinery/telecomms/server/presets/security, -/turf/open/floor/circuit/telecomms/mainframe, -/area/tcommsat/server) "bUT" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/enzyme{ @@ -10028,6 +9993,13 @@ /obj/machinery/telecomms/server/presets/supply, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) +"chJ" = ( +/obj/machinery/door/airlock/medical{ + name = "Medical Cold Room"; + req_access_txt = "5" + }, +/turf/open/floor/iron, +/area/medical/coldroom) "chR" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -10088,14 +10060,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) -"cjk" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/power/apc/auto_name/east, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/maintenance/starboard/secondary) "cjw" = ( /obj/structure/table/glass, /obj/item/retractor, @@ -11776,6 +11740,12 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) +"cAa" = ( +/obj/structure/cable, +/obj/item/kirbyplants/random, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/construction/storage_wing) "cAd" = ( /obj/structure/window/reinforced{ dir = 8 @@ -13099,35 +13069,6 @@ }, /turf/open/floor/iron/kitchen_coldroom, /area/medical/coldroom) -"cNj" = ( -/obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/cultivator, -/obj/item/clothing/head/chefhat, -/obj/item/storage/box/lights/mixed, -/obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/cultivator, -/obj/item/clothing/head/chefhat, -/obj/machinery/camera{ - c_tag = "Service - Starboard"; - dir = 4 - }, -/obj/item/storage/box/lights/mixed, -/obj/effect/spawner/random/maintenance, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "cNu" = ( /obj/machinery/door/airlock/hatch{ name = "Secure Pen"; @@ -13261,6 +13202,26 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) +"cOK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/box/drinkingglasses, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/closet/crate, +/obj/item/storage/box/drinkingglasses, +/obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "cOM" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -13288,6 +13249,12 @@ /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) +"cOZ" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/aft) "cPa" = ( /obj/structure/chair{ dir = 8 @@ -13867,15 +13834,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"cVt" = ( -/obj/structure/window/reinforced/plasma{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "cVx" = ( /obj/docking_port/stationary{ dir = 8; @@ -14163,17 +14121,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/commons/locker) -"cYS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/science/research) "cYT" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -14260,6 +14207,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/command/heads_quarters/rd) +"dan" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, +/turf/closed/wall, +/area/maintenance/starboard) "day" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -15068,6 +15019,13 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/maintenance/port/fore) +"dnv" = ( +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "dny" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plating{ @@ -16184,25 +16142,6 @@ }, /turf/open/floor/engine, /area/science/misc_lab/range) -"dFC" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) -"dFG" = ( -/obj/structure/table/wood/fancy/royalblue, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, -/turf/open/floor/carpet/royalblue, -/area/service/library) "dGK" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -16777,6 +16716,15 @@ icon_state = "platingdmg2" }, /area/maintenance/disposal) +"dRr" = ( +/obj/machinery/firealarm/directional/east, +/obj/structure/chair/office/light, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "dRv" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -17136,12 +17084,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/science/research) -"dWU" = ( -/obj/machinery/power/port_gen/pacman, -/obj/structure/cable, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "dXG" = ( /obj/structure/table, /obj/item/stack/wrapping_paper, @@ -17692,15 +17634,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) -"ehJ" = ( -/obj/effect/spawner/random/maintenance, -/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/plating, -/area/maintenance/port/fore) "ehQ" = ( /obj/structure/window/reinforced, /obj/structure/table, @@ -18381,6 +18314,21 @@ /obj/machinery/keycard_auth/directional/east, /turf/open/floor/wood, /area/command/heads_quarters/captain/private) +"ete" = ( +/obj/machinery/camera{ + c_tag = "Science Hallway - Admin"; + dir = 1; + network = list("ss13","rd") + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/science/research) "eti" = ( /obj/machinery/light/directional/west, /obj/machinery/light_switch/directional/west, @@ -19299,9 +19247,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"eIv" = ( -/turf/closed/wall, -/area/service/janitor) "eII" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/structure/window/reinforced{ @@ -20852,6 +20797,15 @@ dir = 1 }, /area/command/gateway) +"fiM" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "fiR" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;27" @@ -22351,15 +22305,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/medical/medbay/central) -"fHy" = ( -/obj/effect/spawner/random/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "fHF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/window/southright{ @@ -22566,6 +22511,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"fLz" = ( +/obj/structure/window/reinforced/plasma, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "fLN" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/corner{ @@ -23345,6 +23297,12 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/hallway/primary/central) +"fZW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/radiation, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "gaa" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -23408,19 +23366,6 @@ }, /turf/open/floor/iron/dark, /area/engineering/atmos) -"gaP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/cryo) "gbu" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/two, @@ -23887,6 +23832,16 @@ }, /turf/open/floor/iron, /area/maintenance/starboard) +"gjx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light_switch/directional/west, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "gjG" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -25486,6 +25441,15 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/hallway/primary/aft) +"gPJ" = ( +/obj/effect/spawner/random/maintenance, +/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/plating, +/area/maintenance/port/fore) "gPT" = ( /turf/closed/wall/r_wall, /area/medical/coldroom) @@ -25832,6 +25796,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/service/chapel) +"gXI" = ( +/obj/machinery/vending/boozeomat, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = -28 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/iron, +/area/service/bar) "gXL" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -26261,6 +26237,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/port) +"hfK" = ( +/turf/closed/wall, +/area/service/janitor) "hfX" = ( /obj/effect/decal/cleanable/oil, /obj/structure/cable, @@ -26531,6 +26510,17 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/virology) +"hkw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/science/research) "hkA" = ( /obj/structure/cable, /obj/machinery/holopad, @@ -27115,6 +27105,32 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/service/chapel/office) +"huT" = ( +/obj/item/reagent_containers/spray/plantbgone{ + pixel_y = 3 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 13; + pixel_y = 5 + }, +/obj/item/watertank, +/obj/item/grenade/chem_grenade/antiweed, +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/hydroponics) "hva" = ( /obj/machinery/door_timer{ id = "Cell 3"; @@ -27699,18 +27715,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"hHX" = ( -/obj/machinery/vending/boozeomat, -/obj/structure/sign/plaques/deempisi{ - pixel_y = -28 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron, -/area/service/bar) "hIa" = ( /obj/structure/chair, /obj/effect/landmark/start/chaplain, @@ -27875,6 +27879,15 @@ "hKH" = ( /turf/closed/wall/mineral/plastitanium, /area/commons/fitness/recreation) +"hLa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/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/engineering/gravity_generator) "hLg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/white, @@ -28743,25 +28756,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/fore) -"icp" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/button/door/directional/south{ - id = "roboticsprivacy2"; - name = "Robotics Privacy Control"; - req_access_txt = "29" - }, -/turf/open/floor/iron/dark, -/area/science/robotics/lab) "icG" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -28864,6 +28858,14 @@ /obj/effect/landmark/start/head_of_security, /turf/open/floor/wood, /area/command/heads_quarters/hos) +"idW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "iej" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -29557,6 +29559,14 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/maintenance/starboard) +"iqO" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ + dir = 6 + }, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "iri" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -30664,6 +30674,15 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) +"iMH" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "iMR" = ( /obj/structure/table, /obj/item/stack/package_wrap{ @@ -31086,14 +31105,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"iVh" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "iVt" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -32000,6 +32011,14 @@ }, /turf/open/floor/iron, /area/security/warden) +"joN" = ( +/obj/machinery/power/apc/auto_name/north, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "joX" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -32896,26 +32915,6 @@ }, /turf/open/floor/iron/white, /area/security/prison) -"jEP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/box/drinkingglasses, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/closet/crate, -/obj/item/storage/box/drinkingglasses, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/service) "jEX" = ( /obj/machinery/seed_extractor, /turf/open/floor/plating, @@ -33270,15 +33269,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"jMv" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "jMF" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -33782,6 +33772,10 @@ }, /turf/open/floor/iron/dark, /area/medical/morgue) +"jXH" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "jXL" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, @@ -35659,10 +35653,6 @@ /obj/machinery/duct, /turf/open/floor/iron/cafeteria, /area/service/kitchen) -"kFz" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "kGc" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -36436,17 +36426,6 @@ /obj/structure/grille, /turf/open/floor/plating, /area/maintenance/aft) -"kVh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/closet/crate, -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/maintenance, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/cargo/warehouse) "kVr" = ( /obj/machinery/door/window/brigdoor/security/holding{ id = "Holding Cell"; @@ -37358,6 +37337,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/security/prison) +"lmu" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/eastleft{ + name = "Kitchen Delivery"; + req_access_txt = "28" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/airalarm/kitchen_cold_room{ + pixel_y = 24 + }, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/service/kitchen/coldroom) "lmx" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron, @@ -38039,15 +38035,6 @@ /obj/item/storage/crayons, /turf/open/floor/iron, /area/commons/storage/art) -"lzA" = ( -/obj/structure/window/reinforced/plasma{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "lzN" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -38815,18 +38802,23 @@ /obj/structure/reagent_dispensers/plumbed/storage, /turf/open/floor/iron/white, /area/medical/chemistry) -"lPb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/closed/wall, -/area/service/janitor) "lPh" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, /turf/open/floor/iron/dark, /area/security/checkpoint/medical) +"lPp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/closet/crate, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/cargo/warehouse) "lPG" = ( /obj/effect/landmark/start/station_engineer, /obj/structure/cable, @@ -39068,6 +39060,10 @@ }, /turf/open/floor/iron, /area/science/xenobiology) +"lVM" = ( +/obj/machinery/telecomms/server/presets/security, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) "lVV" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, /turf/open/floor/iron/dark, @@ -39364,6 +39360,14 @@ }, /turf/open/floor/iron, /area/engineering/atmos) +"lZJ" = ( +/obj/machinery/light/small/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "lZK" = ( /obj/machinery/shower{ dir = 8 @@ -39878,6 +39882,18 @@ "mhf" = ( /turf/open/floor/iron/showroomfloor, /area/maintenance/starboard/secondary) +"mhh" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/turf/open/floor/carpet/royalblue, +/area/service/library) "mhk" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -40212,15 +40228,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/cargo/miningoffice) -"mnY" = ( -/obj/machinery/firealarm/directional/east, -/obj/structure/chair/office/light, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "mob" = ( /obj/structure/sink{ dir = 8; @@ -40283,21 +40290,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/port) -"mpI" = ( -/obj/machinery/camera{ - c_tag = "Science Hallway - Admin"; - dir = 1; - network = list("ss13","rd") - }, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/science/research) "mpM" = ( /obj/structure/barricade/wooden, /obj/structure/girder, @@ -41071,6 +41063,15 @@ icon_state = "platingdmg2" }, /area/maintenance/fore) +"mFW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "mFZ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/mousetraps{ @@ -41500,6 +41501,13 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall, /area/commons/toilet/auxiliary) +"mMd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/thermomachine/heater{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "mMX" = ( /obj/structure/chair{ dir = 1 @@ -41714,14 +41722,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/service/cafeteria) -"mPy" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/delivery, -/obj/structure/closet/secure_closet/atmospherics, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "mPK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41883,6 +41883,14 @@ }, /turf/open/floor/iron/cafeteria, /area/service/kitchen) +"mTe" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "mTh" = ( /obj/structure/closet/emcloset, /obj/structure/disposalpipe/segment{ @@ -42444,13 +42452,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron/white, /area/science/xenobiology) -"naF" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/medical/virology) "naM" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/secure{ @@ -43487,6 +43488,25 @@ /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/iron/dark, /area/engineering/atmos) +"nti" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/button/door/directional/south{ + id = "roboticsprivacy2"; + name = "Robotics Privacy Control"; + req_access_txt = "29" + }, +/turf/open/floor/iron/dark, +/area/science/robotics/lab) "ntx" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/engine/o2, @@ -43729,6 +43749,18 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/maintenance/starboard) +"nxh" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "nxp" = ( /obj/structure/table/wood, /obj/machinery/computer/security/telescreen/entertainment/directional/west, @@ -44023,6 +44055,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/aft) +"nDs" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Gravity Generator Room"; + req_access_txt = "19;23" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "nDM" = ( /obj/structure/fireaxecabinet/directional/south, /obj/item/paper_bin{ @@ -45213,6 +45257,14 @@ /obj/structure/grille/broken, /turf/open/space/basic, /area/space/nearstation) +"nYX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/east, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/maintenance/starboard/secondary) "nZb" = ( /obj/machinery/computer/slot_machine{ pixel_y = 2 @@ -45444,6 +45496,19 @@ /obj/machinery/atmospherics/components/trinary/filter, /turf/open/floor/plating, /area/maintenance/starboard) +"ocg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/medical/cryo) "oci" = ( /obj/structure/bed, /obj/item/clothing/suit/straight_jacket, @@ -46304,32 +46369,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/science/robotics/lab) -"osa" = ( -/obj/item/reagent_containers/spray/plantbgone{ - pixel_y = 3 - }, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 13; - pixel_y = 5 - }, -/obj/item/watertank, -/obj/item/grenade/chem_grenade/antiweed, -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/sign/poster/official/random{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/service/hydroponics) "osc" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2, @@ -47514,6 +47553,14 @@ }, /turf/open/floor/iron, /area/commons/locker) +"oQE" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "oQJ" = ( /obj/machinery/door/airlock/medical/glass{ name = "Hydroponics"; @@ -48195,6 +48242,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/corner, /area/hallway/secondary/entry) +"pcJ" = ( +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/port/fore) "pdh" = ( /obj/structure/chair{ dir = 1 @@ -48881,6 +48934,12 @@ /obj/item/mop, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"ppu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/closed/wall, +/area/service/janitor) "ppz" = ( /obj/machinery/vending/boozeomat/all_access, /obj/effect/decal/cleanable/cobweb, @@ -49407,13 +49466,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) -"pxR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/binary/thermomachine/heater{ - dir = 4 - }, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "pxX" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/newscaster/directional/south, @@ -49830,6 +49882,12 @@ }, /turf/open/floor/iron, /area/engineering/main) +"pFr" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "pFA" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -50160,13 +50218,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/medical/treatment_center) -"pLb" = ( -/obj/structure/window/reinforced/plasma, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "pLc" = ( /obj/structure/chair, /turf/open/floor/iron/grimy, @@ -50737,14 +50788,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) -"pVT" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "pVX" = ( /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/freezer, @@ -51695,12 +51738,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) -"qlY" = ( -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/port/fore) "qmf" = ( /obj/structure/table, /obj/machinery/recharger{ @@ -51733,15 +51770,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, /area/science/research) -"qmL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/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/engineering/gravity_generator) "qmS" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plating, @@ -54890,14 +54918,6 @@ /obj/structure/rack, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"rxr" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "rxz" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/bot, @@ -55760,13 +55780,6 @@ /obj/structure/cable, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/medical/coldroom) -"rOi" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "rOn" = ( /obj/structure/table/wood, /obj/item/hand_tele, @@ -56745,16 +56758,6 @@ }, /turf/open/floor/iron, /area/service/hydroponics) -"seO" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/virology) "seP" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -57016,13 +57019,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"sjt" = ( -/obj/machinery/door/airlock/medical{ - name = "Medical Cold Room"; - req_access_txt = "5" - }, -/turf/open/floor/iron, -/area/medical/coldroom) "sjF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57121,6 +57117,14 @@ /obj/effect/landmark/blobstart, /turf/open/floor/engine/cult, /area/service/library) +"smb" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "sme" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -57936,6 +57940,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/command/bridge) +"sCj" = ( +/obj/structure/window/reinforced/plasma{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "sCl" = ( /obj/structure/lattice/catwalk, /obj/structure/chair/stool/bar/directional/south, @@ -58629,23 +58642,6 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/engine, /area/engineering/supermatter/room) -"sPQ" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/eastleft{ - name = "Kitchen Delivery"; - req_access_txt = "28" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/airalarm/kitchen_cold_room{ - pixel_y = 24 - }, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/service/kitchen/coldroom) "sQe" = ( /obj/machinery/sparker/directional/north{ id = "Xenobio" @@ -60302,13 +60298,6 @@ }, /turf/open/floor/iron, /area/science/xenobiology) -"tsT" = ( -/obj/structure/window/reinforced/plasma, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "tsX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -60443,16 +60432,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/science/genetics) -"tuI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light_switch/directional/west, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "tuP" = ( /turf/closed/wall, /area/cargo/miningoffice) @@ -60748,18 +60727,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/cargo/storage) -"tzQ" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "tzW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, @@ -61190,12 +61157,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/engineering/break_room) -"tIb" = ( -/obj/effect/spawner/random/maintenance, -/obj/machinery/power/apc/auto_name/north, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/aft) "tIr" = ( /obj/machinery/door/window/brigdoor/security/cell{ id = "Cell 3"; @@ -61590,6 +61551,15 @@ icon_state = "panelscorched" }, /area/space/nearstation) +"tPJ" = ( +/obj/structure/window/reinforced/plasma{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "tPR" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -61692,18 +61662,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/starboard/secondary) -"tRH" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Gravity Generator Room"; - req_access_txt = "19;23" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "tRX" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -61745,6 +61703,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"tSJ" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/virology) "tSO" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -62908,12 +62876,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/maintenance/aft) -"uqX" = ( -/obj/structure/cable, -/obj/item/kirbyplants/random, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron, -/area/construction/storage_wing) "urh" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/structure/cable, @@ -63283,10 +63245,6 @@ }, /turf/open/floor/plating, /area/engineering/storage_shared) -"uwU" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/starboard) "uwX" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law{ @@ -65054,6 +65012,13 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/medical/storage) +"veE" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/virology) "veJ" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable, @@ -67400,6 +67365,19 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/wood, /area/service/library) +"vVn" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/structure/window/reinforced, +/obj/machinery/door/window{ + dir = 8; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/sign/painting/library_secure{ + pixel_x = 32 + }, +/turf/open/floor/carpet/royalblue, +/area/service/library) "vVo" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -68138,13 +68116,6 @@ "wkj" = ( /turf/open/floor/iron/dark, /area/engineering/atmos) -"wkk" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/holopad, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "wkv" = ( /obj/structure/railing{ dir = 8 @@ -68991,6 +68962,13 @@ }, /turf/open/floor/iron, /area/engineering/main) +"wBx" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "wBP" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -69006,14 +68984,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/engineering/storage/tech) -"wBX" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/engineering/gravity_generator) "wCc" = ( /obj/machinery/light/directional/west, /obj/machinery/airalarm/directional/west, @@ -69458,6 +69428,35 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/commons/dorms) +"wJF" = ( +/obj/structure/rack, +/obj/item/clothing/mask/gas, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/cultivator, +/obj/item/clothing/head/chefhat, +/obj/item/storage/box/lights/mixed, +/obj/structure/rack, +/obj/item/clothing/mask/gas, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/cultivator, +/obj/item/clothing/head/chefhat, +/obj/machinery/camera{ + c_tag = "Service - Starboard"; + dir = 4 + }, +/obj/item/storage/box/lights/mixed, +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/hallway/secondary/service) "wJM" = ( /obj/machinery/light_switch/directional/east, /obj/structure/cable, @@ -70091,19 +70090,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/security/brig) -"wTW" = ( -/obj/structure/table/wood/fancy/royalblue, -/obj/structure/window/reinforced, -/obj/machinery/door/window{ - dir = 8; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, -/turf/open/floor/carpet/royalblue, -/area/service/library) "wTZ" = ( /obj/machinery/shower{ dir = 4 @@ -71789,6 +71775,13 @@ }, /turf/open/floor/grass, /area/service/hydroponics/garden) +"xzX" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/holopad, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/iron, +/area/engineering/gravity_generator) "xzZ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -72117,6 +72110,13 @@ }, /turf/open/floor/iron/white, /area/medical/cryo) +"xFO" = ( +/obj/effect/spawner/random/structure/crate, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/fore) "xGa" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/wood, @@ -88760,7 +88760,7 @@ hhQ fTJ nbk dPi -naF +veE wxS tlA iew @@ -89017,7 +89017,7 @@ hJT nxD hkv nEK -seO +tSJ nsX yhM qby @@ -92272,7 +92272,7 @@ dnF dnk aRG rQt -bOJ +xFO dnk uqE dne @@ -92607,7 +92607,7 @@ dux ejb kUo ilb -sjt +chJ xfb asc uPR @@ -92786,11 +92786,11 @@ qmS oaS dou dne -ehJ +gPJ doJ dne dne -qlY +pcJ doJ aRG dnk @@ -94086,7 +94086,7 @@ qmo erH uCS sYe -kVh +lPp bqh sHw fBH @@ -94130,7 +94130,7 @@ qQS alK lUJ olq -gaP +ocg tqf aiX mRw @@ -94596,7 +94596,7 @@ ucI cXC aEH aEH -uqX +cAa uwx mVk rFS @@ -94679,7 +94679,7 @@ wCc lJX cHy bTs -tIb +cOZ cMo bTs ivO @@ -95393,8 +95393,8 @@ dCD sQf lCP eMW -dFG -wTW +mhh +vVn oMN oMN xls @@ -97508,7 +97508,7 @@ hEd pzV fRx cpz -tzQ +nxh bTs cFQ vBI @@ -103142,7 +103142,7 @@ eHX smS uqQ rVb -icp +nti cDi qmv ipr @@ -106708,7 +106708,7 @@ eSv jrj exS tZf -hHX +gXI uRF kvC ibl @@ -107458,7 +107458,7 @@ uxz tEQ ngq dnh -jMv +fiM dnh svi czL @@ -107512,7 +107512,7 @@ gUB nhL sGS ipr -cYS +hkw nOc jcD nOc @@ -108026,7 +108026,7 @@ xnS uDv qcO ipr -mpI +ete nOc bBv nOc @@ -108512,7 +108512,7 @@ ggE hyy qEj ruR -jEP +cOK iri oQJ bQP @@ -109028,7 +109028,7 @@ upb rnj bKl oXQ -cNj +wJF xVl mqS sYq @@ -109514,7 +109514,7 @@ pyb dnh dnh dnh -fHy +iMH dnh aaa aaa @@ -109811,7 +109811,7 @@ ovj nrS aSB dvN -cjk +nYX qrB qrB nhS @@ -111088,7 +111088,7 @@ qbY xVl dKp rhw -osa +huT alq rxV alq @@ -111595,7 +111595,7 @@ bEH nER gDt eLr -sPQ +lmu crV alq iay @@ -112376,11 +112376,11 @@ bpp teN apc lNs -uwU -lPb -eIv -eIv -eIv +dan +ppu +hfK +hfK +hfK ovj arh cmb @@ -112634,10 +112634,10 @@ apc oCR lNs mKO -pxR +mMd aaX -apX -mPy +fZW +lZJ ovj ovj ovj @@ -112894,7 +112894,7 @@ tSb adk afQ ejw -bDe +iqO oeB orT uAj @@ -115656,10 +115656,10 @@ bTT jyv mQn kEv -qmL -tuI -tRH -aRB +hLa +gjx +nDs +mFW cMF rUg sKe @@ -115914,7 +115914,7 @@ sqk xTq kEv jRw -wBX +oQE rzR vZC kXz @@ -116171,7 +116171,7 @@ wEK aia wHT jRw -wkk +xzX rzR dqT nED @@ -116428,8 +116428,8 @@ qvB szy kEv xro -rxr -iVh +idW +smb dqT xYr dqT @@ -116684,9 +116684,9 @@ iPU qRx sKk kEv -rOi -kFz -dFC +wBx +jXH +dnv dqT nkh dqT @@ -116699,11 +116699,11 @@ qLO gsg ugD toS -tsT +fLz jrn toS mNF -lzA +sCj cuj kBa jqt @@ -116941,9 +116941,9 @@ rzR rzR rzR rzR -byb -kFz -dWU +joN +jXH +pFr dqT tIU dqT @@ -116956,11 +116956,11 @@ aGS gsg iYv wST -pLb +aQC jrn ctk mNF -cVt +tPJ wST ifR jqt @@ -117198,8 +117198,8 @@ aaa aaa aaa kEv -pVT -mnY +mTe +dRr lud dqT jNT @@ -117213,11 +117213,11 @@ aGS kuT ugD toS -tsT +fLz jrn toS mNF -lzA +sCj toS kBa xVP @@ -128298,7 +128298,7 @@ sbk bGd bGd bGd -bUL +lVM bCD gfU gfU diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm index 4829fcc566f..759a1352fb1 100644 --- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm +++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm @@ -10637,6 +10637,13 @@ icon_state = "platingdmg1" }, /area/maintenance/starboard/secondary) +"cjp" = ( +/obj/structure/window/reinforced/plasma, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "cjw" = ( /obj/structure/table/glass, /obj/item/retractor, @@ -31043,6 +31050,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/grass, /area/medical/virology) +"iTx" = ( +/obj/structure/window/reinforced/plasma{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "iTy" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/firealarm/directional/south, @@ -36565,13 +36581,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"kXA" = ( -/obj/structure/window/reinforced/plasma, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "kXP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -39751,6 +39760,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) +"mec" = ( +/obj/structure/window/reinforced/plasma{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "mee" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -39877,13 +39895,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/engine/n2o, /area/engineering/atmos) -"mfL" = ( -/obj/structure/window/reinforced/plasma, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "mfM" = ( /turf/open/floor/engine/co2, /area/engineering/atmos) @@ -41185,15 +41196,6 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron, /area/commons/dorms) -"mDk" = ( -/obj/structure/window/reinforced/plasma{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "mDo" = ( /obj/structure/table/wood, /obj/item/cigbutt/cigarbutt{ @@ -44319,18 +44321,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/fore) -"nFR" = ( -/obj/machinery/vending/boozeomat, -/obj/structure/sign/plaques/deempisi{ - pixel_y = -28 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron, -/area/service/bar) "nGb" = ( /obj/structure/cable, /obj/machinery/holopad, @@ -55322,6 +55312,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) +"rBa" = ( +/obj/machinery/vending/boozeomat, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar, +/obj/item/radio/intercom/directional/west, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = -28 + }, +/turf/open/floor/iron, +/area/service/bar) "rBd" = ( /obj/machinery/plate_press, /obj/effect/turf_decal/bot, @@ -57726,6 +57728,13 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/science/research) +"sux" = ( +/obj/structure/window/reinforced/plasma, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "suE" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -68958,15 +68967,6 @@ /obj/item/hfr_box/body/fuel_input, /turf/open/floor/iron, /area/engineering/atmos) -"wqR" = ( -/obj/structure/window/reinforced/plasma{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "wrf" = ( /obj/structure/closet/secure_closet/quartermaster, /obj/machinery/airalarm/directional/north, @@ -107403,7 +107403,7 @@ eSv jrj exS tZf -nFR +rBa uRF kvC ibl @@ -117394,11 +117394,11 @@ qLO gsg ugD toS -mfL +sux jrn toS mNF -mDk +mec cuj rnl jqt @@ -117651,11 +117651,11 @@ vbt gsg iYv wST -kXA +cjp jrn ctk mNF -wqR +iTx wST mzw jqt @@ -117908,11 +117908,11 @@ vbt kuT ugD toS -mfL +sux jrn toS mNF -mDk +mec toS rnl xVP diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index f9cb8187ab5..a8a2f2e904e 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -8377,15 +8377,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/mineral/titanium/blue, /area/commons/toilet) -"aJB" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 9 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/service/hydroponics) "aJC" = ( /turf/closed/wall, /area/service/bar) @@ -10011,27 +10002,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"aPw" = ( -/obj/machinery/disposal/bin, -/obj/structure/sign/plaques/deempisi{ - pixel_x = -28; - pixel_y = -4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/button/door{ - id = "barShutters"; - name = "bar shutters"; - pixel_x = 4; - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/turf/open/floor/iron, -/area/service/bar) "aPx" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/iron, @@ -25435,12 +25405,6 @@ }, /turf/open/floor/plating, /area/science/mixing) -"bLk" = ( -/obj/machinery/mass_driver/ordnance{ - dir = 4 - }, -/turf/open/floor/plating, -/area/science/mixing) "bLl" = ( /obj/machinery/door/poddoor/massdriver_ordnance, /obj/structure/fans/tiny, @@ -35070,15 +35034,6 @@ }, /turf/open/floor/engine, /area/engineering/supermatter) -"cEv" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 8 - }, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "cEw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -35091,15 +35046,6 @@ }, /turf/open/floor/engine, /area/engineering/supermatter) -"cEy" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 4 - }, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "cEz" = ( /obj/structure/cable, /turf/open/floor/engine, @@ -35190,15 +35136,6 @@ }, /turf/open/floor/engine, /area/engineering/main) -"cFe" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 5 - }, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "cFf" = ( /obj/machinery/power/apc/auto_name/east, /obj/structure/cable, @@ -35206,15 +35143,6 @@ dir = 9 }, /area/science/research) -"cFh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 9 - }, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "cFi" = ( /obj/machinery/camera{ c_tag = "Research Division South"; @@ -36435,6 +36363,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) +"cUl" = ( +/obj/machinery/mass_driver/ordnance{ + dir = 4 + }, +/turf/open/floor/plating, +/area/science/mixing) "cUN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -37536,6 +37470,15 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/science/mixing) +"ebz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 8 + }, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "ecg" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/trimline/yellow/filled/end{ @@ -42246,6 +42189,26 @@ icon_state = "wood-broken2" }, /area/maintenance/port/aft) +"iNi" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/button/door{ + id = "barShutters"; + name = "bar shutters"; + pixel_x = 4; + pixel_y = 28 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/service/bar) "iNn" = ( /obj/machinery/camera{ c_tag = "Kitchen Cold Room" @@ -44405,6 +44368,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/commons/locker) +"kBj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 4 + }, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "kBu" = ( /turf/closed/wall/r_wall, /area/space/nearstation) @@ -44598,6 +44570,15 @@ }, /turf/open/floor/iron/dark, /area/service/chapel) +"kIM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 5 + }, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "kJc" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46666,15 +46647,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/starboard) -"mPH" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 4 - }, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "mQo" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -53958,6 +53930,15 @@ }, /turf/open/floor/iron/dark, /area/security/courtroom) +"tKD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 4 + }, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "tKG" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, @@ -54418,15 +54399,6 @@ }, /turf/open/floor/iron/dark, /area/engineering/gravity_generator) -"uij" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 8 - }, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "uio" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -56812,6 +56784,15 @@ "woJ" = ( /turf/open/floor/carpet, /area/security/prison) +"woP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 9 + }, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "wpa" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/iron, @@ -57865,6 +57846,15 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"xgZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 8 + }, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "xhN" = ( /obj/structure/table/wood, /obj/item/toy/crayon/spraycan, @@ -58166,6 +58156,15 @@ /obj/effect/turf_decal/trimline/darkblue/filled/line, /turf/open/floor/iron/dark, /area/security/office) +"xuG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 9 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/service/hydroponics) "xuM" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -87595,9 +87594,9 @@ cqf cqD cMD crs -uij -cEv -cFe +ebz +xgZ +kIM cMD cFM czE @@ -88623,9 +88622,9 @@ cqi cMD cAP crv -mPH -cEy -cFh +kBj +tKD +woP cMD cFM czE @@ -95747,7 +95746,7 @@ aKQ aLU aNu aJC -aPw +iNi aQc leX aSZ @@ -99340,7 +99339,7 @@ aNP hFi pIW aIj -aJB +xuG aKD aMs aIp @@ -110431,7 +110430,7 @@ qCr bHv bIW bKf -bLk +cUl bEs bNC cOe diff --git a/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm b/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm index 9687f7dd5e3..cd411bec442 100644 --- a/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm +++ b/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm @@ -3624,20 +3624,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/security/warden) -"ahw" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/light, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/fore) "ahx" = ( /obj/structure/sign/poster/official/random, /turf/closed/wall, @@ -9194,26 +9180,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/ai_monitored/turret_protected/aisat/atmos) -"atZ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/sign/warning/securearea{ - name = "EMERGENCY STORAGE"; - pixel_y = -32 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/light/small, -/obj/structure/closet/firecloset, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore) "aua" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -21063,14 +21029,6 @@ }, /turf/open/floor/plating, /area/science/lab) -"aYL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/central) "aYM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -32967,6 +32925,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/hallway/primary/starboard) +"bNV" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/service/bar) "bOb" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -52815,6 +52788,37 @@ "cWK" = ( /turf/closed/wall, /area/commons/storage/primary) +"cXh" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/barman_recipes{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/pen, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/requests_console/directional/east{ + department = "Bar"; + departmentType = 2; + name = "Bar Requests Console"; + receive_ore_updates = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "bar_1"; + name = "Bar Shutters Toggle"; + req_access_txt = "25" + }, +/turf/open/floor/iron/dark, +/area/service/bar) "cXD" = ( /obj/structure/sign/poster/contraband/red_rum, /turf/closed/wall/rust, @@ -52950,6 +52954,18 @@ "dbG" = ( /turf/closed/wall, /area/command/bridge) +"dcp" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot_white, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/iron/dark, +/area/service/bar) "dcO" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -53101,6 +53117,28 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/dark, /area/engineering/storage/tech) +"dfW" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/light/directional/north, +/obj/structure/sign/barsign{ + pixel_y = 32; + req_access = null; + req_access_txt = "25" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/service/bar) "dgl" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible{ @@ -53299,6 +53337,16 @@ }, /turf/open/floor/iron/dark, /area/service/library) +"dlX" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/service/bar) "dmf" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -53782,16 +53830,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engineering/break_room) -"dzZ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/machinery/computer/libraryconsole{ - pixel_y = 5 - }, -/turf/open/floor/iron/dark, -/area/service/library) "dAk" = ( /obj/structure/table/reinforced, /obj/item/storage/secure/briefcase{ @@ -54301,13 +54339,6 @@ }, /turf/open/floor/iron/dark, /area/service/chapel) -"dTh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/wood, -/area/service/library) "dTz" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -56251,6 +56282,24 @@ /obj/machinery/power/tracker, /turf/open/floor/iron/solarpanel, /area/solars/port/aft) +"ePH" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/item/storage/box/matches{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/lighter{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/lighter, +/obj/machinery/newscaster/security_unit/directional/south, +/turf/open/floor/iron/dark, +/area/service/bar) "eRf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 6 @@ -56314,21 +56363,6 @@ }, /turf/open/floor/iron/dark, /area/service/chapel/office) -"eRD" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, -/obj/item/radio/intercom{ - pixel_y = 22 - }, -/obj/machinery/restaurant_portal/bar, -/turf/open/floor/iron/dark, -/area/service/bar) "eRF" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -56344,6 +56378,12 @@ }, /turf/open/floor/iron/showroomfloor, /area/service/kitchen) +"eRW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet/green, +/area/service/library) "eSe" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -57530,44 +57570,6 @@ }, /turf/open/floor/iron/dark, /area/cargo/miningoffice) -"fAQ" = ( -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/structure/table, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, -/obj/machinery/camera{ - c_tag = "Bar Counter"; - dir = 8; - name = "bar camera" - }, -/turf/open/floor/iron/dark, -/area/service/bar) -"fAW" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 5 - }, -/obj/effect/landmark/start/bartender, -/turf/open/floor/iron/dark, -/area/service/bar) "fBf" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -57585,17 +57587,6 @@ /obj/machinery/atmospherics/components/trinary/mixer/airmix, /turf/open/floor/iron, /area/engineering/atmos) -"fBr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/turf/open/floor/wood, -/area/service/library) "fBs" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -58200,32 +58191,18 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/dark, /area/cargo/warehouse) -"fMQ" = ( -/obj/machinery/chem_dispenser/drinks{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/table, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "fNk" = ( /obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide{ dir = 1 }, /turf/open/floor/engine/co2, /area/engineering/atmos) +"fNp" = ( +/obj/structure/bookcase/random/fiction, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/service/bar) "fNS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, @@ -58262,17 +58239,6 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/iron/showroomfloor, /area/service/kitchen) -"fOY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "fPg" = ( /obj/structure/closet/crate/coffin, /obj/effect/decal/cleanable/dirt, @@ -58920,6 +58886,15 @@ /obj/item/trash/syndi_cakes, /turf/open/floor/iron/white, /area/security/prison) +"gfA" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/vending/wardrobe/bar_wardrobe, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/service/bar) "gfK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -59254,6 +59229,13 @@ icon_state = "platingdmg3" }, /area/maintenance/port) +"gqn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/service/bar) "grD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -59710,21 +59692,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/service/hydroponics) -"gCH" = ( -/obj/effect/turf_decal/tile/neutral, +"gCR" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 +/obj/structure/table/wood, +/obj/structure/reagent_dispensers/beerkeg{ + pixel_y = 5 + }, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = -32 }, -/obj/structure/cable, -/obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, -/area/service/library) +/area/service/bar) "gCX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -59746,6 +59729,19 @@ }, /turf/open/floor/iron, /area/engineering/atmos) +"gDE" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/chem_master/condimaster{ + desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; + name = "BrewMaster 2199" + }, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/iron/dark, +/area/service/bar) "gDI" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -60178,33 +60174,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/cargo/warehouse) -"gSd" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/book/manual/wiki/barman_recipes{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/pen, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/requests_console{ - department = "Bar"; - departmentType = 2; - name = "Bar RC"; - pixel_x = 30; - receive_ore_updates = 1 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "gSf" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input, /turf/open/floor/engine/plasma, @@ -60312,6 +60281,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/engineering/supermatter/room) +"gWr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/librarian, +/obj/structure/chair/office{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet/green, +/area/service/library) "gWG" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -60385,10 +60364,6 @@ }, /turf/open/floor/iron/white, /area/security/prison) -"gZz" = ( -/obj/machinery/status_display/evac, -/turf/closed/wall, -/area/service/bar) "haI" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -60572,18 +60547,6 @@ /obj/effect/landmark/start/research_director, /turf/open/floor/iron/showroomfloor, /area/command/heads_quarters/rd) -"hdT" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/wrench, -/obj/item/crowbar/red, -/turf/open/floor/iron/dark, -/area/service/bar) "hev" = ( /obj/effect/turf_decal/bot, /obj/machinery/food_cart, @@ -60877,6 +60840,18 @@ /mob/living/simple_animal/sloth/citrus, /turf/open/floor/iron, /area/cargo/sorting) +"hpH" = ( +/obj/machinery/door/window/northright{ + base_state = "left"; + dir = 8; + icon_state = "left"; + name = "Library Desk Door"; + req_access_txt = "37" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/carpet/green, +/area/service/library) "hqd" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -60941,17 +60916,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/ocean) -"hsT" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/libraryscanner, -/obj/effect/turf_decal/bot_white, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/east, -/turf/open/floor/iron/dark, -/area/service/library) "htt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ @@ -61017,6 +60981,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/commons/locker) +"htR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/turf/open/floor/wood, +/area/service/library) "htY" = ( /obj/machinery/button/door{ id = "Arrival Shuttle Bay"; @@ -61182,26 +61153,6 @@ }, /turf/open/floor/engine, /area/engineering/supermatter/room) -"hxo" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/item/storage/box/matches{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/lighter{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/lighter, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "hxp" = ( /obj/effect/turf_decal/delivery, /obj/structure/table, @@ -62081,6 +62032,22 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/engine, /area/engineering/gravity_generator) +"hVG" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/closet/secure_closet/bar{ + req_access_txt = "25" + }, +/obj/item/flashlight/lantern, +/obj/machinery/firealarm/directional/east, +/obj/structure/mirror/directional/south, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/service/bar) "hWH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible{ dir = 4 @@ -62510,21 +62477,6 @@ /obj/item/storage/firstaid/regular, /turf/open/floor/iron, /area/commons/locker) -"ikH" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/chem_master/condimaster{ - desc = "Used to separate out liquids - useful for purifying botanical extracts. Also dispenses condiments."; - name = "BrewMaster 2199" - }, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "ikV" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -62720,6 +62672,16 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) +"iqi" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/service/bar) "iqu" = ( /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -62868,6 +62830,16 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) +"itl" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/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/library) "itn" = ( /turf/closed/wall/r_wall/rust, /area/ai_monitored/command/nuke_storage) @@ -62963,18 +62935,6 @@ }, /turf/open/floor/iron/dark, /area/security/office) -"ive" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/vending/wardrobe/bar_wardrobe, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "ivg" = ( /obj/machinery/computer/bank_machine, /obj/structure/sign/warning/securearea{ @@ -63443,17 +63403,6 @@ }, /turf/open/floor/iron/grimy, /area/security/prison/safe) -"iHB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/service/bar) "iHI" = ( /turf/closed/wall/rust, /area/cargo/storage) @@ -63516,6 +63465,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/cargo/sorting) +"iJk" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/photocopier, +/obj/effect/turf_decal/bot_white, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark, +/area/service/library) "iKn" = ( /turf/closed/wall/r_wall/rust, /area/engineering/gravity_generator) @@ -63561,6 +63520,17 @@ /obj/effect/turf_decal/bot/left, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) +"iMi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 5 + }, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "iMj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line, @@ -63656,13 +63626,6 @@ }, /turf/open/floor/iron, /area/commons/fitness/recreation) -"iNJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/service/library) "iNK" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -64635,30 +64598,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"jrD" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sign/barsign{ - pixel_y = 32; - req_access = null; - req_access_txt = "25" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "jsf" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -64700,20 +64639,6 @@ }, /turf/open/floor/iron/dark, /area/service/bar) -"jsK" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 10 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/dark, -/area/service/bar) "jtd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -65080,17 +65005,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/service/chapel/office) -"jFU" = ( -/obj/structure/bookcase/random/fiction, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/wood, -/area/service/bar) "jGo" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -65224,20 +65138,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/command/teleporter) -"jKN" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/effect/landmark/start/bartender, -/turf/open/floor/iron/dark, -/area/service/bar) "jKQ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -65378,17 +65278,6 @@ }, /turf/open/floor/iron/dark, /area/service/chapel/office) -"jNZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "jOe" = ( /obj/machinery/power/solar{ id = "aftport"; @@ -65418,6 +65307,15 @@ "jOT" = ( /turf/open/floor/iron, /area/service/hydroponics) +"jPy" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/public/glass{ + name = "Bar" + }, +/turf/open/floor/iron/dark, +/area/service/bar) "jPA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -65432,6 +65330,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/security/office) +"jPH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/service/bar) "jQf" = ( /obj/machinery/camera{ c_tag = "Atmospherics Tank - N2O"; @@ -65750,6 +65654,24 @@ }, /turf/open/floor/iron/dark, /area/service/chapel/office) +"jWe" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/item/radio/intercom/directional/south, +/obj/item/storage/box/rubbershot{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/gun/ballistic/shotgun/doublebarrel{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/service/bar) "jWM" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral, @@ -65853,6 +65775,20 @@ }, /turf/open/floor/plating, /area/engineering/supermatter/room) +"jZq" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/vending/games, +/obj/effect/turf_decal/bot_white, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/radio/intercom/directional/east, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "jZJ" = ( /turf/closed/wall, /area/cargo/office) @@ -66142,18 +66078,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/cargo/warehouse) -"kgR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 10 - }, -/obj/effect/landmark/start/librarian, -/obj/structure/chair/office{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/turf/open/floor/carpet/green, -/area/service/library) "khe" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -67246,6 +67170,19 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/surgery) +"kGT" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/machinery/computer/bookmanagement{ + pixel_y = 5 + }, +/obj/machinery/light/directional/east, +/obj/machinery/bounty_board/directional/east, +/turf/open/floor/iron/dark, +/area/service/library) "kHY" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -67602,20 +67539,6 @@ }, /turf/open/floor/iron/dark, /area/command/bridge) -"kSE" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "kSG" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -67768,17 +67691,6 @@ icon_state = "panelscorched" }, /area/maintenance/port) -"kVo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 5 - }, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "kVv" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/radiation, @@ -69288,6 +69200,17 @@ }, /turf/open/floor/iron/dark, /area/engineering/break_room) +"lGG" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/service/library) "lGO" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -69627,20 +69550,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron, /area/command/gateway) -"lQZ" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark, -/area/service/bar) "lRg" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69680,6 +69589,24 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall, /area/command/gateway) +"lSr" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/south, +/turf/open/floor/iron/dark, +/area/service/bar) "lSB" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -69817,22 +69744,6 @@ /obj/item/stack/cable_coil/five, /turf/open/floor/plating, /area/cargo/warehouse) -"lXn" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/table/wood, -/obj/structure/reagent_dispensers/beerkeg{ - pixel_y = 5 - }, -/obj/structure/sign/poster/contraband/red_rum{ - pixel_y = -30 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "lXq" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -70043,6 +69954,26 @@ }, /turf/open/floor/iron, /area/engineering/atmos) +"meM" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/sign/warning/securearea{ + name = "EMERGENCY STORAGE"; + pixel_y = -32 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/obj/structure/closet/firecloset, +/turf/open/floor/iron/dark, +/area/hallway/primary/fore) "meS" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -70458,6 +70389,11 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"moW" = ( +/obj/structure/bookcase/random/nonfiction, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood, +/area/service/bar) "mpb" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -70703,6 +70639,14 @@ "mwh" = ( /turf/open/floor/iron/showroomfloor, /area/medical/surgery) +"mwW" = ( +/obj/structure/bookcase/random/religion, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "mxy" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -70902,6 +70846,28 @@ icon_state = "panelscorched" }, /area/security/prison) +"mBg" = ( +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/table, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/camera{ + c_tag = "Bar Counter"; + dir = 8; + name = "bar camera" + }, +/turf/open/floor/iron/dark, +/area/service/bar) "mBj" = ( /obj/structure/table, /obj/machinery/recharger, @@ -70942,24 +70908,6 @@ /obj/effect/landmark/start/janitor, /turf/open/floor/iron, /area/service/janitor) -"mBE" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/machinery/computer/bookmanagement{ - pixel_y = 5 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/bounty_board{ - dir = 8; - pixel_x = 32 - }, -/turf/open/floor/iron/dark, -/area/service/library) "mBN" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -71356,17 +71304,31 @@ /obj/machinery/atmospherics/components/unary/bluespace_sender, /turf/open/floor/iron/dark, /area/engineering/atmos) -"mKV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 4 +"mKE" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/area/engineering/supermatter) +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_x = 2; + pixel_y = 8 + }, +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ + pixel_x = 2; + pixel_y = 10 + }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/directional/east, +/obj/item/holosign_creator/robot_seat/bar, +/turf/open/floor/iron/dark, +/area/service/bar) "mLg" = ( /obj/structure/table, /obj/item/paper_bin, @@ -72588,6 +72550,28 @@ /obj/machinery/power/apc/auto_name/north, /turf/open/floor/iron/dark, /area/cargo/miningoffice) +"nzY" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/wrench, +/obj/item/crowbar/red, +/obj/machinery/camera{ + c_tag = "Bar Storage"; + dir = 5; + name = "bar camera" + }, +/turf/open/floor/iron/dark, +/area/service/bar) +"nAb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/service/library) "nAu" = ( /obj/effect/turf_decal/delivery, /obj/structure/reagent_dispensers/fueltank, @@ -73184,6 +73168,11 @@ }, /turf/open/floor/iron, /area/cargo/qm) +"nPg" = ( +/obj/structure/bookcase/random/adult, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/service/library) "nPn" = ( /obj/structure/table/wood, /obj/effect/spawner/random/maintenance, @@ -73398,22 +73387,6 @@ }, /turf/open/floor/plating, /area/cargo/warehouse) -"nUG" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/table/wood, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/vending_refill/cigarette, -/obj/item/hand_labeler, -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "nUS" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -73512,18 +73485,6 @@ /obj/item/hand_labeler, /turf/open/floor/iron/dark, /area/engineering/break_room) -"nVO" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/photocopier, -/obj/effect/turf_decal/bot_white, -/obj/structure/extinguisher_cabinet{ - pixel_y = -28 - }, -/turf/open/floor/iron/dark, -/area/service/library) "nVV" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -73654,6 +73615,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/engineering/atmos) +"nYd" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/fore) "nYl" = ( /obj/structure/closet/crate/coffin, /obj/effect/decal/cleanable/dirt, @@ -73782,20 +73757,6 @@ /obj/machinery/air_sensor/atmos/mix_tank, /turf/open/floor/engine/vacuum, /area/engineering/atmos) -"odm" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/iron/dark, -/area/service/library) "odw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -74437,6 +74398,10 @@ icon_state = "panelscorched" }, /area/maintenance/port) +"otf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/service/library) "oth" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -74763,26 +74728,6 @@ }, /turf/open/floor/iron/dark, /area/service/bar/atrium) -"oEl" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/south, -/turf/open/floor/iron/dark, -/area/service/bar) "oEv" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ @@ -75101,6 +75046,17 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/hos) +"oLL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "oLS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -75274,34 +75230,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/maintenance/port) -"oPW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/closet/secure_closet/bar{ - req_access_txt = "25" - }, -/obj/item/flashlight/lantern, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/obj/machinery/camera{ - c_tag = "Bar Storage"; - dir = 1; - name = "bar camera" - }, -/obj/structure/mirror{ - pixel_y = -32 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "oQD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light{ @@ -76873,6 +76801,16 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) +"pHB" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/bartender, +/turf/open/floor/iron/dark, +/area/service/bar) "pHJ" = ( /obj/effect/turf_decal/bot, /obj/structure/sign/warning/fire{ @@ -77083,6 +77021,17 @@ }, /turf/closed/wall/rust, /area/maintenance/disposal/incinerator) +"pOI" = ( +/obj/machinery/light/directional/north, +/obj/structure/table/wood, +/obj/machinery/computer/libraryconsole{ + pixel_y = 5 + }, +/obj/structure/sign/painting/library{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/service/library) "pPr" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -77206,6 +77155,27 @@ icon_state = "panelscorched" }, /area/maintenance/disposal/incinerator) +"pTz" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/radio/intercom/directional/north, +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/iron/dark, +/area/service/bar) +"pTE" = ( +/obj/structure/table/wood, +/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/dark, +/area/service/bar) "pTR" = ( /obj/effect/turf_decal/bot, /obj/machinery/computer/station_alert, @@ -77636,15 +77606,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/service/kitchen) -"qeY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/wood, -/area/service/bar) "qfk" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -77821,25 +77782,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/commons/fitness/recreation) -"qlW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "qmz" = ( /obj/structure/closet/secure_closet/research_director, /obj/effect/turf_decal/delivery, @@ -78947,6 +78889,13 @@ }, /turf/open/floor/iron/dark, /area/commons/storage/primary) +"qPz" = ( +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/carpet/green, +/area/service/library) "qPA" = ( /obj/structure/closet/crate/coffin, /obj/effect/decal/cleanable/dirt, @@ -79122,6 +79071,18 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/cargo/sorting) +"qSc" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/libraryscanner, +/obj/effect/turf_decal/bot_white, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/east, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/service/library) "qSu" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -79396,16 +79357,6 @@ icon_state = "panelscorched" }, /area/maintenance/port) -"rcg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/wood, -/area/service/bar) "rcL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -80202,19 +80153,6 @@ /obj/machinery/light, /turf/open/floor/engine, /area/engineering/supermatter/room) -"rxO" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "rxS" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -80282,17 +80220,6 @@ /obj/structure/drain/big, /turf/open/floor/plating, /area/cargo/warehouse) -"rzN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 9 - }, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "rAp" = ( /obj/structure/weightmachine/weightlifter, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -80649,19 +80576,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark, /area/engineering/main) -"rKx" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/machinery/door/airlock/public/glass{ - name = "Bar" - }, -/turf/open/floor/iron/dark, -/area/service/bar) "rKN" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -80816,6 +80730,17 @@ /obj/structure/cable, /turf/open/floor/carpet/royalblue, /area/command/heads_quarters/captain) +"rSt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 9 + }, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "rSA" = ( /obj/machinery/power/port_gen/pacman, /obj/structure/sign/warning/electricshock{ @@ -80926,14 +80851,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/engineering/supermatter) -"rUL" = ( -/obj/structure/bookcase/random/nonfiction, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, -/turf/open/floor/wood, -/area/service/bar) "rUT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -81032,20 +80949,6 @@ "rWU" = ( /turf/closed/wall, /area/service/theater) -"rXo" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/library) "rXp" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -81602,13 +81505,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/ai_monitored/command/nuke_storage) -"skJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/wood, -/area/service/bar) "slN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -82377,6 +82273,17 @@ }, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) +"sGA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "sGP" = ( /obj/structure/chair{ dir = 1 @@ -82510,20 +82417,6 @@ "sKf" = ( /turf/closed/wall/r_wall, /area/security/interrogation) -"sKl" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/library) "sKy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 5 @@ -82693,6 +82586,17 @@ /obj/item/toy/beach_ball/holoball, /turf/open/floor/iron, /area/security/prison) +"sOu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/engineering/supermatter) "sOE" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -82890,30 +82794,6 @@ }, /turf/open/floor/iron/dark, /area/command/heads_quarters/captain) -"sVz" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/item/kirbyplants{ - icon_state = "plant-17"; - pixel_x = 8; - pixel_y = 3 - }, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = 40 - }, -/obj/machinery/button/door{ - id = "bar_1"; - name = "Bar Shutters Toggle"; - pixel_x = 24; - pixel_y = 24; - req_access_txt = "25" - }, -/mob/living/carbon/human/species/monkey/punpun, -/turf/open/floor/iron/dark, -/area/service/bar) "sVH" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -83105,6 +82985,17 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/security/office) +"tbQ" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/service/library) "tbU" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -83150,36 +83041,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/command/heads_quarters/hos) -"tfb" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/storage/fancy/cigarettes/cigars{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = 2; - pixel_y = 8 - }, -/obj/item/storage/fancy/cigarettes/cigars/cohiba{ - pixel_x = 2; - pixel_y = 10 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/holosign_creator/robot_seat/bar, -/turf/open/floor/iron/dark, -/area/service/bar) "tfm" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -83245,20 +83106,6 @@ }, /turf/open/floor/plating/ocean, /area/ocean) -"tgW" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark, -/area/service/bar) "thk" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/blue, @@ -83928,26 +83775,17 @@ }, /turf/open/floor/iron/showroomfloor, /area/service/kitchen) -"tBE" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +"tBn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/circuit/green{ + luminosity = 2 }, -/obj/structure/table/wood, -/obj/item/radio/intercom{ - pixel_y = -28 - }, -/obj/item/storage/box/rubbershot{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/gun/ballistic/shotgun/doublebarrel{ - pixel_y = 5 - }, -/turf/open/floor/iron/dark, -/area/service/bar) +/area/engineering/supermatter) "tBQ" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/grassybush, @@ -84070,21 +83908,6 @@ "tEb" = ( /turf/closed/wall/r_wall, /area/command/heads_quarters/captain) -"tEl" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, -/obj/machinery/newscaster{ - pixel_x = 30 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "tEA" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -84483,20 +84306,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, /area/maintenance/port) -"tOK" = ( -/obj/machinery/door/window/northright{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Library Desk Door"; - req_access_txt = "37" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/carpet/green, -/area/service/library) "tOO" = ( /obj/machinery/light/small{ dir = 1 @@ -84847,6 +84656,11 @@ "tZe" = ( /turf/closed/wall, /area/service/chapel) +"tZm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/service/library) "tZn" = ( /obj/machinery/hydroponics/soil, /obj/item/shovel/spade, @@ -84872,14 +84686,6 @@ }, /turf/open/floor/plating/ocean_plating, /area/maintenance/disposal/incinerator) -"tZO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/turf/open/floor/carpet/green, -/area/service/library) "uaG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{ dir = 4 @@ -85439,17 +85245,6 @@ /obj/item/clothing/glasses/hud/health, /turf/open/floor/iron/showroomfloor, /area/command/heads_quarters/cmo) -"uoL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/start/hangover, -/turf/open/floor/wood, -/area/service/bar) "upL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 8 @@ -85483,6 +85278,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/cargo/sorting) +"uql" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/wood, +/area/service/library) "ura" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -85990,14 +85790,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/cargo/storage) -"uFt" = ( -/obj/structure/bookcase/random/adult, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -24 - }, -/turf/open/floor/iron/dark, -/area/service/library) "uFx" = ( /obj/effect/turf_decal/box/corners{ dir = 8 @@ -86221,13 +86013,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) -"uIR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/wood, -/area/service/library) "uIV" = ( /obj/machinery/firealarm{ dir = 1; @@ -87650,16 +87435,6 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/command/heads_quarters/cmo) -"vtN" = ( -/obj/structure/bookcase/random/religion, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/sign/barsign{ - pixel_y = 32; - req_access = null; - req_access_txt = "25" - }, -/turf/open/floor/iron/dark, -/area/service/library) "vtT" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -88557,17 +88332,6 @@ }, /turf/open/floor/plating, /area/cargo/office) -"vSX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/engineering/supermatter) "vTw" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -88769,17 +88533,6 @@ }, /turf/open/floor/plating, /area/cargo/warehouse) -"vXi" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot_white, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/service/bar) "vXv" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/ywflowers, @@ -89543,15 +89296,6 @@ }, /turf/open/floor/iron/dark, /area/commons/fitness/recreation) -"wuG" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/obj/machinery/light_switch{ - pixel_y = -24 - }, -/turf/open/floor/carpet/green, -/area/service/library) "wuJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -89696,12 +89440,6 @@ /obj/machinery/power/emitter, /turf/open/floor/iron/dark, /area/engineering/main) -"wBC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/wood, -/area/service/library) "wBI" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, @@ -89913,6 +89651,19 @@ luminosity = 2 }, /area/engineering/storage/tech) +"wGR" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/machinery/newscaster/security_unit/directional/east, +/turf/open/floor/iron/dark, +/area/service/bar) "wHt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -91602,6 +91353,21 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/hos) +"xAL" = ( +/obj/machinery/chem_dispenser/drinks{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/airalarm/directional/south, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/service/bar) "xAY" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -91623,28 +91389,6 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) -"xBP" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/item/clipboard, -/obj/item/camera_film{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/camera_film, -/obj/machinery/newscaster{ - pixel_x = 30 - }, -/obj/machinery/camera{ - c_tag = "Library"; - dir = 8; - name = "bar camera" - }, -/turf/open/floor/iron/dark, -/area/service/library) "xCw" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/blue{ @@ -91768,6 +91512,26 @@ /obj/structure/cable, /turf/open/floor/iron, /area/security/prison) +"xGR" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/clipboard, +/obj/item/camera_film{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/camera_film, +/obj/machinery/newscaster/security_unit/directional/east, +/obj/machinery/camera{ + c_tag = "Library"; + dir = 8; + name = "bar camera" + }, +/turf/open/floor/iron/dark, +/area/service/library) "xHc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -91876,6 +91640,13 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/ai_monitored/command/storage/eva) +"xKr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood, +/area/service/bar) "xKt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 10 @@ -91938,6 +91709,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/cargo/warehouse) +"xLH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/service/bar) "xLR" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -92041,6 +91817,16 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/hallway/primary/fore) +"xPj" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Library" + }, +/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/library) "xPl" = ( /obj/effect/turf_decal/bot, /obj/machinery/disposal/bin, @@ -92064,6 +91850,19 @@ /obj/structure/beebox, /turf/open/floor/grass, /area/service/chapel) +"xQv" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/kirbyplants{ + icon_state = "plant-17"; + pixel_x = 8; + pixel_y = 3 + }, +/mob/living/carbon/human/species/monkey/punpun, +/turf/open/floor/iron/dark, +/area/service/bar) "xQw" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -92312,19 +92111,6 @@ /obj/machinery/newscaster, /turf/closed/wall/r_wall, /area/security/prison) -"xWw" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/vending/games, -/obj/effect/turf_decal/bot_white, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/turf/open/floor/iron/dark, -/area/service/library) "xXg" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -92608,6 +92394,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port) +"yfI" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/table/wood, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/vending_refill/cigarette, +/obj/item/hand_labeler, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/dark, +/area/service/bar) "yfO" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -116942,17 +116740,17 @@ yjT eMe aKK aJi -ahw +nYd +wAO wAO -gZz luW wAO -rKx +jPy tsn wAO sim sim -rXo +xPj vPi sim nwx @@ -117203,16 +117001,16 @@ wAO wAO dJZ fiu -jFU -tgW +fNp +iqi nEu -rUL +moW thp -vtN -gCH +mwW +lGG iRt -uFt -nVO +nPg +iJk sim jId pHZ @@ -117457,19 +117255,19 @@ aGI aKN cfa wAO -eRD +pTz svU quC tPt -rxO +duf pes mRD sim -dzZ -sKl +pOI +itl kxy dXx -odm +tbQ sim ftI sWX @@ -117716,17 +117514,17 @@ cfa luW kQw eVf -iHB +gqn duf -lQZ +iqi qgX nEu qLE iRt -fBr +htR uwS -iNJ -dTh +uql +tZm qld lXq ohj @@ -117973,16 +117771,16 @@ aQM pbW kZA kTU -rcg +jPH sdL eKh dPh kXs nwx eaD -uIR +nAb pBd -tOK +hpH jlg sim sim @@ -118230,17 +118028,17 @@ aRc pbW fdr wwj -qeY +xLH scy jsI wVq eSe nwx uTl -wBC +otf nqA -tZO -wuG +eRW +qPz sim nya pSN @@ -118487,7 +118285,7 @@ cfa luW tnC jXX -uoL +xKr vYE uNl vYE @@ -118496,7 +118294,7 @@ qLE lPI jPA etE -kgR +gWr muH uYe tSu @@ -118742,19 +118540,19 @@ eMe aLb lzo wAO -jrD +dfW jzQ -qlW +bNV rVV qCn uxJ -oEl +lSr sim -xWw +jZq hUi -xBP -mBE -hsT +xGR +kGT +qSc twQ uwX iwW @@ -119001,10 +118799,10 @@ cfa wAO vJI iaL -kSE +pTE pxE mij -hxo +ePH wAO vSx wAO @@ -119258,15 +119056,15 @@ cfa fhH sNY lxO -jKN +pHB xYI -fAW +pHB lrG uwD -nUG -hdT +yfI +nzY mYk -ive +gfA wAO aLl bud @@ -119513,17 +119311,17 @@ cDV aLc cgc tBQ -vXi -sVz +dcp +xQv pes kYi -jsK +dlX duf vhR mlj -skJ +xLH egB -tBE +jWe vSx aLD buj @@ -119769,18 +119567,18 @@ ago bdf aLd aRY -gZz wAO -gSd -tfb +wAO +cXh +mKE xYg -fAQ -fMQ +mBg +xAL wAO -ikH +gDE pmd dyi -lXn +gCR wAO bpq buj @@ -120026,7 +119824,7 @@ ago aZs aLn bei -atZ +meM vSx wAO wAO @@ -120034,10 +119832,10 @@ aYJ wAO vSx vSx -tEl +wGR nEu nEu -oPW +hVG wAO aLQ buB @@ -120287,7 +120085,7 @@ aPo aRX bdC aVz -aYL +bdC bpq amg wAO @@ -128055,9 +127853,9 @@ rxB eAV gOw wyL -vSX -jNZ -kVo +tBn +sGA +iMi qkL fvI pEy @@ -129083,9 +128881,9 @@ dgl qkL qoR xDn -fOY -mKV -rzN +oLL +sOu +rSt qkL voR pEy diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 1fb6185c3ce..bc15de953b3 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -2210,15 +2210,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/white, /area/science/research) -"alL" = ( -/obj/structure/window/reinforced/plasma{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "alP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -2228,6 +2219,20 @@ "alW" = ( /turf/closed/wall, /area/commons/storage/tools) +"alZ" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/door/window{ + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "ame" = ( /obj/structure/tank_dispenser, /obj/effect/turf_decal/bot{ @@ -2345,6 +2350,21 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/security/checkpoint/supply) +"amC" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/door/window{ + dir = 1; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/turf/open/floor/carpet, +/area/service/library) "amD" = ( /turf/open/floor/iron, /area/commons/storage/primary) @@ -4550,27 +4570,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/white, /area/science/xenobiology) -"ava" = ( -/obj/effect/turf_decal/trimline/neutral/filled/arrow_ccw, -/obj/structure/sign/directions/supply{ - dir = 4; - pixel_y = -28 - }, -/obj/structure/sign/directions/security{ - dir = 1; - pixel_y = -34 - }, -/obj/structure/sign/directions/command{ - dir = 1; - pixel_y = -40 - }, -/obj/machinery/light/directional/south, -/obj/structure/sign/directions/vault{ - dir = 1; - pixel_y = -22 - }, -/turf/open/floor/iron, -/area/hallway/primary/tram/left) "avc" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -4726,6 +4725,15 @@ }, /turf/open/floor/carpet, /area/commons/dorms) +"avN" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "avO" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /turf/open/floor/iron, @@ -4776,25 +4784,6 @@ /obj/effect/landmark/observer_start, /turf/open/floor/iron, /area/hallway/primary/tram/center) -"avW" = ( -/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw, -/obj/structure/sign/directions/evac{ - dir = 4; - pixel_y = -28 - }, -/obj/structure/sign/directions/medical{ - pixel_y = -34 - }, -/obj/structure/sign/directions/engineering{ - pixel_y = -40 - }, -/obj/machinery/light/directional/south, -/obj/structure/sign/directions/upload{ - dir = 4; - pixel_y = -22 - }, -/turf/open/floor/iron, -/area/hallway/primary/tram/center) "avX" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -5575,6 +5564,20 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/vault, /area/hallway/primary/tram/left) +"azz" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/door/window{ + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/service/library) "azA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/freezer, @@ -6260,33 +6263,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/security/checkpoint/escape) -"aDv" = ( -/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw{ - dir = 1 - }, -/obj/structure/sign/directions/supply{ - dir = 4; - pixel_y = 28 - }, -/obj/structure/sign/directions/security{ - dir = 8; - pixel_y = 34 - }, -/obj/structure/sign/directions/command{ - dir = 8; - pixel_y = 40 - }, -/obj/machinery/light/directional/north, -/obj/structure/sign/directions/vault{ - dir = 8; - pixel_y = 22 - }, -/obj/effect/landmark/start/hangover, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/tram/center) "aDw" = ( /obj/structure/sign/poster/official/report_crimes{ pixel_y = -32 @@ -7510,13 +7486,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/commons/dorms) -"aHZ" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 6 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron, -/area/science/robotics/lab) "aIc" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -8121,6 +8090,21 @@ /obj/machinery/navbeacon/wayfinding/bar, /turf/open/floor/iron, /area/hallway/primary/tram/center) +"aOt" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/door/window{ + dir = 1; + name = "Secure Art Exhibition"; + req_access_txt = "37" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/turf/open/floor/carpet, +/area/service/library) "aOv" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -9679,12 +9663,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"bcN" = ( -/obj/structure/sign/directions/engineering{ - pixel_y = 40 - }, -/turf/closed/wall/r_wall, -/area/command/teleporter) "bcU" = ( /obj/machinery/door/airlock/mining{ name = "Ore Silo Access"; @@ -10557,6 +10535,19 @@ }, /turf/open/floor/iron/white, /area/science/research) +"btJ" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = 28 + }, +/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/service/bar) "btO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10639,15 +10630,6 @@ }, /turf/open/floor/plating, /area/science/research) -"bwd" = ( -/obj/structure/window/reinforced/plasma{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "bwg" = ( /obj/machinery/button/door/incinerator_vent_atmos_aux{ pixel_x = -8; @@ -10858,6 +10840,13 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/commons/toilet/restrooms) +"bzB" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/science/robotics/lab) "bzF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{ dir = 8 @@ -11417,21 +11406,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/science/mixing) -"bOw" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/door/window{ - dir = 1; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/sign/painting/library_secure{ - pixel_y = -32 - }, -/turf/open/floor/carpet, -/area/service/library) "bOz" = ( /mob/living/simple_animal/hostile/retaliate/goat{ name = "Pete" @@ -11914,19 +11888,6 @@ }, /turf/open/floor/iron/freezer, /area/science/research) -"bYZ" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/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/service/bar) "bZi" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot, @@ -20762,21 +20723,6 @@ }, /turf/open/floor/iron, /area/maintenance/tram/left) -"fqD" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/door/window{ - dir = 1; - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/sign/painting/library_secure{ - pixel_y = -32 - }, -/turf/open/floor/carpet, -/area/service/library) "fqJ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -22287,6 +22233,13 @@ }, /turf/open/floor/plating, /area/maintenance/tram/mid) +"fSC" = ( +/obj/machinery/icecream_vat, +/obj/machinery/airalarm/kitchen_cold_room{ + pixel_y = 24 + }, +/turf/open/floor/iron/showroomfloor, +/area/service/kitchen/coldroom) "fSF" = ( /turf/open/floor/plating/elevatorshaft, /area/security/prison) @@ -25126,6 +25079,33 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) +"gXJ" = ( +/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw{ + dir = 1 + }, +/obj/structure/sign/directions/supply{ + dir = 4; + pixel_y = 28 + }, +/obj/structure/sign/directions/security{ + dir = 8; + pixel_y = 34 + }, +/obj/structure/sign/directions/command{ + dir = 8; + pixel_y = 40 + }, +/obj/machinery/light/directional/north, +/obj/structure/sign/directions/vault{ + dir = 8; + pixel_y = 22 + }, +/obj/effect/landmark/start/hangover, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/tram/center) "gYh" = ( /obj/machinery/computer/operating{ dir = 8 @@ -28419,13 +28399,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/science/lab) -"imK" = ( -/obj/machinery/icecream_vat, -/obj/machinery/airalarm/kitchen_cold_room{ - pixel_y = 24 - }, -/turf/open/floor/iron/showroomfloor, -/area/service/kitchen/coldroom) "imM" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -29853,15 +29826,6 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/white, /area/science/research) -"iLp" = ( -/obj/structure/window/reinforced/plasma{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "iLD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -31407,6 +31371,30 @@ "jqQ" = ( /turf/open/floor/engine, /area/engineering/supermatter/room) +"jrd" = ( +/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw{ + dir = 1 + }, +/obj/structure/sign/directions/supply{ + dir = 4; + pixel_y = 28 + }, +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = 34 + }, +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = 40 + }, +/obj/machinery/light/directional/north, +/obj/structure/sign/directions/vault{ + dir = 1; + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/tram/left) "jre" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Chemistry Maintenance"; @@ -38642,15 +38630,6 @@ }, /turf/open/floor/iron, /area/command/heads_quarters/ce) -"mpn" = ( -/obj/structure/window/reinforced/plasma{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "mpr" = ( /obj/effect/turf_decal/trimline/green/corner, /obj/effect/turf_decal/trimline/green/corner{ @@ -39696,6 +39675,27 @@ }, /turf/open/floor/iron/white, /area/medical/pharmacy) +"mNY" = ( +/obj/effect/turf_decal/trimline/neutral/filled/arrow_ccw, +/obj/structure/sign/directions/supply{ + dir = 4; + pixel_y = -28 + }, +/obj/structure/sign/directions/security{ + dir = 1; + pixel_y = -34 + }, +/obj/structure/sign/directions/command{ + dir = 1; + pixel_y = -40 + }, +/obj/machinery/light/directional/south, +/obj/structure/sign/directions/vault{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/iron, +/area/hallway/primary/tram/left) "mOo" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 9 @@ -41220,6 +41220,15 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/service/kitchen) +"nxE" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "nxG" = ( /obj/effect/turf_decal/trimline/white/filled/corner{ dir = 1 @@ -45148,20 +45157,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/science/genetics) -"oXg" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/door/window{ - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "oXj" = ( /obj/effect/turf_decal/siding/thinplating, /obj/machinery/light/small/directional/west, @@ -46022,30 +46017,6 @@ /obj/item/radio, /turf/open/floor/plating/airless, /area/mine/explored) -"pov" = ( -/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw{ - dir = 1 - }, -/obj/structure/sign/directions/supply{ - dir = 4; - pixel_y = 28 - }, -/obj/structure/sign/directions/security{ - dir = 1; - pixel_y = 34 - }, -/obj/structure/sign/directions/command{ - dir = 1; - pixel_y = 40 - }, -/obj/machinery/light/directional/north, -/obj/structure/sign/directions/vault{ - dir = 1; - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/primary/tram/left) "poO" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -47684,6 +47655,15 @@ /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/iron, /area/security/checkpoint/escape) +"pVb" = ( +/obj/structure/window/reinforced/plasma{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "pVe" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -49317,6 +49297,15 @@ }, /turf/open/floor/iron, /area/ai_monitored/command/storage/eva) +"qDf" = ( +/obj/structure/window/reinforced/plasma{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "qDT" = ( /obj/structure/chair/office{ dir = 8 @@ -50152,6 +50141,25 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/white, /area/medical/medbay/central) +"qUB" = ( +/obj/effect/turf_decal/trimline/neutral/filled/arrow_cw, +/obj/structure/sign/directions/evac{ + dir = 4; + pixel_y = -28 + }, +/obj/structure/sign/directions/medical{ + pixel_y = -34 + }, +/obj/structure/sign/directions/engineering{ + pixel_y = -40 + }, +/obj/machinery/light/directional/south, +/obj/structure/sign/directions/upload{ + dir = 4; + pixel_y = -22 + }, +/turf/open/floor/iron, +/area/hallway/primary/tram/center) "qUO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -57643,6 +57651,12 @@ }, /turf/open/floor/plating, /area/maintenance/tram/right) +"tSw" = ( +/obj/structure/sign/directions/engineering{ + pixel_y = 40 + }, +/turf/closed/wall/r_wall, +/area/command/teleporter) "tSC" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -64783,20 +64797,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/main) -"wME" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/door/window{ - name = "Secure Art Exhibition"; - req_access_txt = "37" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/sign/painting/library_secure{ - pixel_y = 32 - }, -/turf/open/floor/carpet, -/area/service/library) "wNa" = ( /obj/effect/landmark/start/depsec/engineering, /obj/structure/chair/office, @@ -87520,7 +87520,7 @@ aEc aEc dhe aCa -oXg +alZ lDT kAc aFN @@ -87530,7 +87530,7 @@ kQF aFN aFN xTs -fqD +aOt aKl aKl aKl @@ -87777,7 +87777,7 @@ aMK aEc dhe aCa -wME +azz lDT hqP sLF @@ -87787,7 +87787,7 @@ xTs xTs xTs xTs -bOw +amC aCa anD alI @@ -98863,9 +98863,9 @@ eeA oms wKG roS -iLp -alL -iLp +pVb +nxE +pVb wKG qMI mlb @@ -99891,9 +99891,9 @@ cps wKG oAv roS -mpn -bwd -mpn +qDf +avN +qDf wKG jqb gNU @@ -101106,7 +101106,7 @@ lYO amK vif jZY -imK +fSC nIq xos jZY @@ -101372,7 +101372,7 @@ aKt acU amm aej -bYZ +btJ iFb reZ ayI @@ -153812,7 +153812,7 @@ kzH eFM xWF aDN -bcN +tSw acE anG awF @@ -155356,7 +155356,7 @@ iMZ hKt kYm auX -ava +mNY anG axX vUA @@ -155364,7 +155364,7 @@ azB qbg axX anG -pov +jrd aEH aJV asq @@ -165644,7 +165644,7 @@ xJA kpr tlq avn -aDv +gXJ aFf aGi aFD @@ -167178,7 +167178,7 @@ frk xwL xwL aOk -avW +qUB avn tlq pss @@ -174398,7 +174398,7 @@ qwW fuC npC aHT -aHZ +bzB dyg lSU nBt diff --git a/_maps/map_files/tramstation/tramstation_skyrat.dmm b/_maps/map_files/tramstation/tramstation_skyrat.dmm index b3ab8eaf636..9d2000924a6 100644 --- a/_maps/map_files/tramstation/tramstation_skyrat.dmm +++ b/_maps/map_files/tramstation/tramstation_skyrat.dmm @@ -19754,6 +19754,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/service/library) +"ema" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "emk" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -20130,6 +20137,13 @@ }, /turf/open/floor/plating, /area/maintenance/central) +"esg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "ess" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25163,6 +25177,19 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/cargo/storage) +"gDm" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_y = 28 + }, +/turf/open/floor/iron, +/area/service/bar) "gDu" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -29697,13 +29724,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"ivV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "iwb" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, @@ -31475,13 +31495,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/central/secondary) -"jdd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/east, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "jdj" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -31520,13 +31533,6 @@ /obj/structure/girder, /turf/open/floor/plating, /area/mine/explored) -"jef" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/grounding_rod/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "jek" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -44426,13 +44432,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine/air, /area/engineering/atmos) -"oyb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/obj/structure/window/reinforced/plasma/spawner/west, -/obj/machinery/power/tesla_coil/anchored, -/turf/open/floor/engine, -/area/engineering/supermatter) "oyh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46002,19 +46001,6 @@ }, /turf/open/floor/iron/white, /area/medical/surgery) -"pdf" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/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/service/bar) "pdu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -63653,6 +63639,13 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit) +"wqo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/west, +/obj/machinery/power/tesla_coil/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "wrm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/status_display/ai/directional/north, @@ -66901,6 +66894,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/maintenance/tram/right) +"xEQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/obj/structure/window/reinforced/plasma/spawner/east, +/obj/machinery/power/grounding_rod/anchored, +/turf/open/floor/engine, +/area/engineering/supermatter) "xFn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -90878,7 +90878,7 @@ aKt acU amm aej -pdf +gDm nFq reZ ayI @@ -98649,9 +98649,9 @@ hAq oms wKG nfK -jdd -ivV -jdd +esg +xEQ +esg wKG jgj aMF @@ -99677,9 +99677,9 @@ wnZ wKG oAv nfK -oyb -jef -oyb +wqo +ema +wqo wKG knR pKQ diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 14fa7c50d07..63bb46763a5 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -1222,7 +1222,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "oH" = ( -/obj/structure/sign/plaques/deempisi{ +/obj/structure/sign/picture_frame/portrait{ pixel_y = 28 }, /obj/item/kirbyplants{ @@ -2269,7 +2269,7 @@ /area/shuttle/escape) "zU" = ( /obj/structure/dresser, -/obj/structure/sign/plaques/deempisi{ +/obj/structure/sign/picture_frame/portrait{ pixel_y = 28 }, /turf/open/floor/iron/grimy, diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 82dee2958bc..4b635445df4 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -26,6 +26,9 @@ require only minor tweaks. #define SPACERUIN_MAP_EDGE_PAD 15 +/// Special map path value for custom adminloaded stations. +#define CUSTOM_MAP_PATH "custom" + // traits // boolean - marks a level as having that property if present #define ZTRAIT_CENTCOM "CentCom" diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index d81fea9f367..72b987c44a2 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -343,7 +343,7 @@ Used by the AI doomsday and the self-destruct nuke. #undef INIT_ANNOUNCE // Custom maps are removed after station loading so the map files does not persist for no reason. - if(config.map_path == "custom") + if(config.map_path == CUSTOM_MAP_PATH) fdel("_maps/custom/[config.map_file]") // And as the file is now removed set the next map to default. next_map_config = load_map_config(default_to_box = TRUE) diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index 7d7a98049aa..8a3ca5ba516 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -264,6 +264,19 @@ SUBSYSTEM_DEF(persistence) if(fexists(frame_path)) return json_decode(file2text(frame_path)) +/// Removes the identifier of a persitent photo frame from the json. +/datum/controller/subsystem/persistence/proc/RemovePhotoFrame(identifier) + var/frame_path = file("data/photo_frames.json") + if(!fexists(frame_path)) + return + + var/frame_json = json_decode(file2text(frame_path)) + frame_json -= identifier + + frame_json = json_encode(frame_json) + fdel(frame_path) + WRITE_FILE(frame_path, frame_json) + /datum/controller/subsystem/persistence/proc/LoadPhotoPersistence() var/album_path = file("data/photo_albums.json") var/frame_path = file("data/photo_frames.json") diff --git a/code/game/atoms.dm b/code/game/atoms.dm index ea9f1e8323f..ff0cbd5476e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -212,8 +212,8 @@ * the Atom subsystem intialization, or if the atom is being loaded from the map template. * If the item is being created at runtime any time after the Atom subsystem is intialized then * it's false. - * - * The mapload argument occupies the same position as loc when Initialize() is called by New(). + * + * The mapload argument occupies the same position as loc when Initialize() is called by New(). * loc will no longer be needed after it passed New(), and thus it is being overwritten * with mapload at the end of atom/New() before this proc (atom/Initialize()) is called. * @@ -683,8 +683,6 @@ /atom/proc/examine_more(mob/user) . = list() SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE_MORE, user, .) - if(!LAZYLEN(.)) // lol ..length - return list(span_notice("You examine [src] closer, but find nothing of interest...")) /** * Updates the appearence of the icon diff --git a/code/game/objects/structures/plaques/static_plaques.dm b/code/game/objects/structures/plaques/static_plaques.dm index 54e0a2d37cc..0e497d93f15 100644 --- a/code/game/objects/structures/plaques/static_plaques.dm +++ b/code/game/objects/structures/plaques/static_plaques.dm @@ -133,9 +133,3 @@ /obj/structure/sign/plaques/kiddie/perfect_drone name = "\improper 'Perfect Drone' sign" desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the incorruptible cyborg servants of tomorrow, available today." - -/obj/structure/sign/plaques/deempisi - name = "\improper Mr. Deempisi portrait" - desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'" - icon_state = "monkey_painting" - custom_materials = list(/datum/material/wood = 2000) //The same as /obj/structure/sign/picture_frame diff --git a/code/modules/admin/verbs/maprotation.dm b/code/modules/admin/verbs/maprotation.dm index a21117ea011..c02d1df70a7 100644 --- a/code/modules/admin/verbs/maprotation.dm +++ b/code/modules/admin/verbs/maprotation.dm @@ -80,7 +80,7 @@ continue VM.shuttles[s] = shuttle - VM.map_path = "custom" + VM.map_path = CUSTOM_MAP_PATH VM.map_file = "[map_file]" VM.config_filename = "data/next_map.json" var/json_value = list( diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index dcb76a07440..5edb2bf45a3 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -480,6 +480,8 @@ handle_eye_contact(examinify) else result = examinify.examine_more(src) + if(!length(result)) + result += span_notice("You examine [src] closer, but find nothing of interest...") else result = examinify.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist? diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index ffe6c6b58e9..ac1ad6ddf7a 100644 --- a/code/modules/photography/photos/frame.dm +++ b/code/modules/photography/photos/frame.dm @@ -67,6 +67,8 @@ custom_materials = list(/datum/material/wood = 2000) var/obj/item/photo/framed var/persistence_id + var/del_id_on_destroy = FALSE + var/art_value = OK_ART var/can_decon = TRUE #define FRAME_DEFINE(id) /obj/structure/sign/picture_frame/##id/persistence_id = #id @@ -77,7 +79,7 @@ /obj/structure/sign/picture_frame/Initialize(mapload, dir, building) . = ..() - AddElement(/datum/element/art, OK_ART) + AddElement(/datum/element/art, art_value) LAZYADD(SSpersistence.photo_frames, src) if(dir) setDir(dir) @@ -87,6 +89,8 @@ /obj/structure/sign/picture_frame/Destroy() LAZYREMOVE(SSpersistence.photo_frames, src) + if(persistence_id && del_id_on_destroy) + SSpersistence.RemovePhotoFrame(persistence_id) return ..() /obj/structure/sign/picture_frame/proc/get_photo_id() @@ -110,11 +114,9 @@ update_appearance() /obj/structure/sign/picture_frame/examine(mob/user) - if(in_range(src, user) && framed) - framed.show(user) - return list() - else - return ..() + . = ..() + if(in_range(src, user)) + framed?.show(user) /obj/structure/sign/picture_frame/attackby(obj/item/I, mob/user, params) if(can_decon && (I.tool_behaviour == TOOL_SCREWDRIVER || I.tool_behaviour == TOOL_WRENCH)) @@ -126,8 +128,9 @@ else if(I.tool_behaviour == TOOL_WIRECUTTER && framed) framed.forceMove(drop_location()) - framed = null user.visible_message(span_warning("[user] cuts away [framed] from [src]!")) + framed = null + update_appearance() return else if(istype(I, /obj/item/photo)) @@ -172,6 +175,65 @@ desc = "A photo frame to commemorate crewmembers that distinguished themselves in the line of duty. WARNING: unauthorized tampering will be severely punished." can_decon = FALSE +/// This used to be a plaque portrait of a monkey. Now it's been revamped into something more. +/obj/structure/sign/picture_frame/portrait + icon_state = "frame-monkey" + can_decon = FALSE + art_value = GOOD_ART + var/portrait_name + var/portrait_state + var/portrait_desc + +/obj/structure/sign/picture_frame/portrait/Initialize() + . = ..() + switch(rand(1,4)) + if(1) // Deempisi + name = "\improper Mr. Deempisi portrait" + icon_state = "frame-monkey" + desc = "Under the portrait a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'" + if(2) // A fruit + name = "picture of a fruit" + icon_state = "frame-fruit" + desc = "Ceci n'est pas une orange." + if(3) // Rat + name = "\improper Tom portrait" + desc = "Jerry the cat is still not amused." + icon_state = "frame-rat" + if(4) // Ratvar + name = "portrait of the imprisoned god" + desc = "Under the portrait a plaque reads: 'In loving memory of Ratvar, ancient powerful entity and rival of Nar'Sie, \ + ultimately struck down by NT bluespace artillery at the hands of Outpost 17 crew. Rust in peace.'" // common core lore. + icon_state = "frame-ratvar" + portrait_name = name + portrait_state = icon_state + portrait_desc = desc + +/obj/structure/sign/picture_frame/portrait/update_name(updates) + if(framed) + name = initial(name) + else + name = portrait_name + return ..() + +/obj/structure/sign/picture_frame/portrait/update_icon_state(updates) + . = ..() + if(framed) + icon_state = "frame-overlay" + else + icon_state = portrait_state + +/obj/structure/sign/picture_frame/portrait/update_desc(updates) + . = ..() + if(framed) + desc = "Every time you look it makes you laugh." + else + desc = portrait_desc + +/obj/structure/sign/picture_frame/portrait/examine_more(mob/user) + . = ..() + if(!framed) + . += span_notice("The frame and the picture are glued together, but you guess you could slip a photo between the two.") + //persistent frames, make sure the same ID doesn't appear more than once per map /obj/structure/sign/picture_frame/showroom/one persistence_id = "frame_showroom1" @@ -184,3 +246,13 @@ /obj/structure/sign/picture_frame/showroom/four persistence_id = "frame_showroom4" + +/obj/structure/sign/picture_frame/portrait/bar + persistence_id = "frame_bar" + del_id_on_destroy = TRUE + +///Generates a persistence id unique to the current map. Every bar should feel a little bit different after all. +/obj/structure/sign/picture_frame/portrait/bar/Initialize() + if(SSmapping.config.map_path != CUSTOM_MAP_PATH) //skip adminloaded custom maps. + persistence_id = "frame_bar_[SSmapping.config.map_name]" + return ..() diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index c3c2c6a7028..3b1310ed53a 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ