diff --git a/.github/guides/VISUALS.md b/.github/guides/VISUALS.md index 9c385ee8765fd..a56d9f17677d5 100644 --- a/.github/guides/VISUALS.md +++ b/.github/guides/VISUALS.md @@ -404,6 +404,9 @@ There are a few snowflake layers that can be used to accomplish niche goals, alo Floating layers will float "up" the chain of things they're being drawn onto, until they find a real layer. They'll then offset off of that. +Adding `TOPDOWN_LAYER` (actual value `10000`) to another layer forces the appearance into topdown rendering, locally disabling [side map](#side_map-check-the-main-page-too). +We can think of this as applying to planes, since we don't want it interlaying with other non topdown objects. + This allows us to keep relative layer differences while not needing to make all sources static. Often very useful. ## Planes diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 216111097fe51..e379cade75a2f 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -74,6 +74,7 @@ jobs: run: | bash tools/ci/check_grep.sh bash skyrat/tools/skyrat_check_grep.sh # SKYRAT EDIT ADDITION - checking modular_skyrat code + bash modular_zzplurt/tools/ci/splurt_check_grep.sh # SPLURT EDIT ADDITION - checking modular_zzplurt code - name: Ticked File Enforcement if: steps.linter-setup.conclusion == 'success' && !cancelled() run: | diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml index 6511f34062559..4fa5bb5a6819a 100644 --- a/.github/workflows/compile_changelogs.yml +++ b/.github/workflows/compile_changelogs.yml @@ -51,4 +51,4 @@ jobs: if: steps.value_holder.outputs.ACTIONS_ENABLED uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.BUBBERBOT_PAT }} + github_token: ${{ secrets.BUBBERBOT_PAT || secrets.GITHUB_TOKEN}} diff --git a/README.md b/README.md index d5a055a2cde68..af6a52b8bc89a 100644 --- a/README.md +++ b/README.md @@ -23,13 +23,11 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th ## Contribution Rules and Guidelines **1. Do Not Be A Dick** -- The S.P.L.U.R.T. main repository is run by and contributed by volunteers. You are not entitled to our time and energy. We reserve the right to permanently remove anyone who does not show both our contributor's and maintainer's common decency. +- The S.P.L.U.R.T. main repository is run by and contributed by volunteers. Please be considerate with the people who help maintain our codebase. We reserve the right to permanently remove anyone who does not show both our contributors and maintainers common decency. **2. Modularization Standards Will be Upheld** - This codebase is a active downstream to Bubberstation with frequent upstream merges. -- Modularization must be strictly upheld for code stability. (Ask a maintainer if you have any questions!) -- Basically, **try to edit Modular Splurt files first** Then ``//SPLURT EDIT`` comments on any core files (TG, Skyrat, or Bubberstation) for trackability. -- This is a place for when more concrete guidelines are created. +- Modularization is key to attain code stability, please read our [modularization guide](./modular_zzplurt/readme.md) for more information, or ask any of our maintainers in our discord. **3. The Licensing is Non-negotiable** - You are free to take, redistribute, modify, and readapt any code or commit found on this repository. @@ -42,7 +40,7 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th - You are entitled to credit yourself with comments and you are entitled to waive the attribution requirement choosing not to be identified as the creator if you wish. - If you do not like how your assets were modified or used, it is required that the other person [remove the attribution information upon request](https://wiki.creativecommons.org/wiki/License_Versions#Licensors_may_request_removal_of_attribution). - Modifications or adaptions must disclose the source, the author, and [any changes you've made](https://wiki.creativecommons.org/wiki/License_Versions#Modifications_and_adaptations_must_be_indicated). -- Goonstation code is incompatible with this codebase and will not be accepted. +- Goonstation code is incompatible with this codebase due to its licensing. *Credit: [Goonstation contribution guidelines](https://hackmd.io/@goonstation/docs/%2F%40goonstation%2Fcontribute#What-if-I-change-my-mind-about-my-contributions-being-published)* diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm index 1a12daf1c6bb4..2e500943b6430 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm @@ -25,9 +25,8 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/components/tank/air{ - dir = 8; - piping_layer = 4 +/obj/machinery/atmospherics/components/tank/air/layer4{ + dir = 8 }, /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating/icemoon, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm index d4ebe90811fb2..851cfe35548b6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_phonebooth.dmm @@ -23,9 +23,8 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/components/tank/air{ - dir = 8; - piping_layer = 4 +/obj/machinery/atmospherics/components/tank/air/layer4{ + dir = 8 }, /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating/lavaland_atmos, diff --git a/_maps/RandomRuins/SpaceRuins/phonebooth.dmm b/_maps/RandomRuins/SpaceRuins/phonebooth.dmm index 9f766e42f850b..2eb0698ebbfd5 100644 --- a/_maps/RandomRuins/SpaceRuins/phonebooth.dmm +++ b/_maps/RandomRuins/SpaceRuins/phonebooth.dmm @@ -23,9 +23,8 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, -/obj/machinery/atmospherics/components/tank/air{ - dir = 8; - piping_layer = 4 +/obj/machinery/atmospherics/components/tank/air/layer4{ + dir = 8 }, /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/plating/airless, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm index 74a0cca2ccf2f..a195e19014190 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/ghostship.dmm @@ -18,6 +18,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/unpowered) +"dj" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/template_noop, +/area/template_noop) "eL" = ( /obj/machinery/portable_atmospherics/canister/freon{ name = "Coolant canister" @@ -108,7 +113,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "iF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/template_noop, /area/template_noop) "ja" = ( @@ -148,7 +153,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "jL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/closed/wall/r_wall{ color = "#7a9ee0" }, @@ -267,6 +272,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/unpowered) +"oX" = ( +/obj/effect/decal/fakelattice/passthru, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/closed/wall/mineral/titanium/spaceship/nodiagonal{ + color = "#8ab1ec" + }, +/area/ruin/unpowered) "pw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -280,7 +292,7 @@ /turf/open/floor/plating, /area/ruin/unpowered) "qW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/closed/wall/mineral/titanium/spaceship/nodiagonal{ color = "#8ab1ec" }, @@ -504,8 +516,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4; - piping_layer = 1 + dir = 4 }, /turf/open/floor/plating, /area/ruin/unpowered) @@ -752,8 +763,7 @@ name = "Fuel canister" }, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4; - piping_layer = 1 + dir = 4 }, /turf/open/floor/plating, /area/ruin/unpowered) @@ -799,7 +809,7 @@ /obj/machinery/power/shuttle_engine/heater{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/closed/wall/mineral/titanium/spaceship/nodiagonal{ color = "#8ab1ec" }, @@ -1216,8 +1226,8 @@ hf fM Xr qW -fo -xP +oX +dj tz tz TW @@ -1237,8 +1247,8 @@ MY KR Uw pD -jL -qW +Xr +tz iF qW tz diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/salvagepost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/salvagepost.dmm index b1a875ecf83a2..227f2961a21b3 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/salvagepost.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/salvagepost.dmm @@ -73,7 +73,7 @@ /area/ruin/powered) "ej" = ( /obj/item/assembly/signaler/anomaly/grav, -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/plating/plasma, /area/template_noop) "eI" = ( @@ -625,8 +625,7 @@ name = "Fuel canister" }, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8; - piping_layer = 1 + dir = 8 }, /turf/open/floor/plating/plasma, /area/template_noop) @@ -652,7 +651,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/plating/plasma, /area/template_noop) "Gf" = ( @@ -765,7 +764,7 @@ /turf/open/floor/plating/airless, /area/template_noop) "Lx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/plating/plasma, /area/template_noop) "LC" = ( @@ -969,7 +968,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible/layer1, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/plating/plasma, /area/template_noop) "Uz" = ( diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index a5ef3ea151a80..b59228b713690 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -22,6 +22,10 @@ "ae" = ( /turf/closed/mineral/snowmountain, /area/awaymission/snowdin/cave/mountain) +"ag" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/closed/wall/ice, +/area/awaymission/snowdin/post/cavern1) "ah" = ( /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/wall/ice, @@ -171,114 +175,12 @@ /obj/item/paper/fluff/awaymissions/snowdin/research_feed, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/research) -"aQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"aR" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/landmark/awaystart, -/obj/item/bedsheet/purple, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "aS" = ( /turf/closed/wall, /area/awaymission/snowdin/post/dorm) -"aT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/bedsheet/purple, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"aU" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "aV" = ( /turf/closed/wall/rust, /area/awaymission/snowdin/post/dorm) -"aW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"aX" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/landmark/awaystart, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"aY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"aZ" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/bedsheet/orange, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"ba" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/sign/poster/contraband/kudzu/directional/north, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"bb" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/landmark/awaystart, -/obj/item/paper/crumpled/ruins/snowdin/dontdeadopeninside, -/obj/item/bedsheet/green, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "bc" = ( /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/dark, @@ -298,18 +200,6 @@ "bh" = ( /turf/closed/indestructible/rock/snow/ice, /area/awaymission/snowdin/cave/cavern) -"bi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "bj" = ( /obj/effect/decal/remains/human, /turf/open/misc/asteroid/snow, @@ -324,17 +214,6 @@ }, /turf/open/floor/iron/white, /area/awaymission/snowdin/post) -"bl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 - }, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "bn" = ( /obj/structure/barricade/sandbags, /obj/effect/turf_decal/weather/snow/corner{ @@ -384,34 +263,15 @@ /obj/structure/spider/stickyweb, /turf/open/floor/iron/freezer, /area/awaymission/snowdin/post/kitchen) -"bw" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 +"bz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 }, -/obj/structure/kitchenspike, -/turf/open/floor/iron/freezer, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/kitchen/fork, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/awaymission/snowdin/post/kitchen) -"bx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"bA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "bB" = ( /obj/item/stack/sheet/mineral/plastitanium, /turf/open/misc/asteroid/snow, @@ -424,21 +284,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"bD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/sink/directional/west, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/hydro) "bE" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/awaymission/snowdin/post/research) -"bF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/research) "bG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -452,37 +309,17 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/engineering) -"bH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 +"bK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 10 }, +/obj/effect/landmark/awaystart, /obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/iron, -/area/awaymission/snowdin/post/research) -"bI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/research) -"bJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/research) +/area/awaymission/snowdin/post/gateway) "bL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/spider/stickyweb, @@ -493,15 +330,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/freezer, /area/awaymission/snowdin/post/kitchen) -"bN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/spider/stickyweb, -/turf/open/floor/iron/freezer, -/area/awaymission/snowdin/post/kitchen) "bO" = ( /obj/structure/rack, /obj/item/storage/toolbox/electrical, @@ -512,84 +340,6 @@ /obj/structure/flora/tree/pine/xmas, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) -"bQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/airlock{ - id_tag = "snowdindormresearch3"; - name = "Jouslen McGee's Private Quarters" - }, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"bR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/airlock{ - id_tag = "snowdindormresearch2"; - name = "Elizabeth Queef's Private Quarters" - }, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"bS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/airlock{ - id_tag = "snowdindormresearch1"; - name = "Jacob Ullman's Private Quarters" - }, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"bT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/airlock{ - id_tag = "snowdindormhydro2"; - name = "Rachel Migro's Private Quarters" - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"bU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/airlock{ - id_tag = "snowdindormhydro1"; - name = "Katherine Esterdeen's Private Quarters" - }, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"bV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/firedoor, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/research) "bW" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, @@ -612,16 +362,6 @@ /obj/structure/spider/stickyweb, /turf/open/floor/iron/freezer, /area/awaymission/snowdin/post/kitchen) -"cc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/kitchenspike, -/obj/structure/spider/stickyweb, -/turf/open/floor/iron/freezer, -/area/awaymission/snowdin/post/kitchen) "cd" = ( /turf/closed/wall, /area/awaymission/snowdin/post/kitchen) @@ -649,15 +389,6 @@ /obj/structure/table, /turf/open/floor/iron, /area/awaymission/snowdin/post/kitchen) -"cl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/kitchen) "cm" = ( /obj/effect/spawner/random/exotic/antag_gear, /turf/open/misc/asteroid/snow/ice, @@ -672,19 +403,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) -"cp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) "cq" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -694,15 +412,6 @@ "cr" = ( /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) -"cs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) "ct" = ( /obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, @@ -711,35 +420,10 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) -"cu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) "cv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) -"cw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) "cx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -747,17 +431,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) -"cy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) "cz" = ( /obj/machinery/door/airlock/public/glass{ name = "Research Desks" @@ -768,18 +441,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/research) -"cA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/research) "cB" = ( /turf/open/floor/iron, /area/awaymission/snowdin/post/research) @@ -792,6 +453,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) +"cE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "cF" = ( /obj/item/shard, /obj/effect/decal/cleanable/blood/old, @@ -812,127 +482,6 @@ /obj/structure/spider/stickyweb, /turf/open/floor/iron/freezer, /area/awaymission/snowdin/post/kitchen) -"cI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/spider/stickyweb, -/turf/open/floor/iron/freezer, -/area/awaymission/snowdin/post/kitchen) -"cJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/airlock{ - name = "Freezer" - }, -/obj/structure/barricade/wooden, -/obj/structure/spider/stickyweb, -/turf/open/floor/iron/freezer, -/area/awaymission/snowdin/post/kitchen) -"cK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/kitchen) -"cL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/kitchen/fork, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/kitchen) -"cN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/kitchen) -"cO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/kitchen) -"cP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/holopad, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/kitchen) -"cQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/kitchen) -"cR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/kitchen) -"cS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/food/egg_smudge, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/kitchen) "cT" = ( /obj/item/stack/sheet/mineral/wood, /turf/open/floor/plating/snowed, @@ -945,187 +494,10 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) -"cV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"cW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"cX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"cY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"cZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/item/trash/can, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"da" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"db" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"dd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"de" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"df" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"dg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/public/glass{ - name = "Research Desks" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/research) -"dh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/research) -"di" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/research) -"dj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/research) +"dc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/closed/wall/ice, +/area/awaymission/snowdin/post/cavern2) "dk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -1161,17 +533,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/kitchen) -"dt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/food/flour, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/kitchen) "du" = ( /obj/machinery/deepfryer, /obj/effect/decal/cleanable/dirt, @@ -1231,6 +592,10 @@ /obj/structure/table, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) +"dI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) "dJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1243,17 +608,6 @@ "dK" = ( /turf/closed/wall, /area/awaymission/snowdin/post) -"dL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) "dM" = ( /turf/closed/wall/rust, /area/awaymission/snowdin/post) @@ -1324,17 +678,6 @@ }, /turf/open/floor/carpet, /area/awaymission/snowdin/post/dorm) -"eb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/sign/poster/contraband/lusty_xenomorph/directional/east, -/obj/structure/table/wood, -/obj/item/paper_bin, -/turf/open/floor/carpet, -/area/awaymission/snowdin/post/dorm) "ec" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -1353,32 +696,16 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) -"eh" = ( -/obj/structure/bed, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 +"eg" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 8 }, -/obj/effect/landmark/awaystart, -/obj/item/bedsheet/red, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) +/turf/open/floor/plating/snowed/cavern, +/area/awaymission/snowdin/post/mining_main/mechbay) "ei" = ( /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/wall, /area/awaymission/snowdin/post) -"ej" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) "ek" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -1389,6 +716,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post) +"em" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock{ + name = "Custodial Closet" + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/awaymission/snowdin/post/custodials) "eo" = ( /turf/open/misc/ice/smooth, /area/awaymission/snowdin/outside) @@ -1432,18 +770,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/snowdin/post/kitchen) -"ez" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/kitchen) "eB" = ( /obj/effect/decal/cleanable/food/flour, /turf/open/floor/plating, @@ -1490,6 +816,18 @@ "eL" = ( /turf/closed/mineral/plasma/ice, /area/awaymission/snowdin/cave/cavern) +"eM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/storage/box{ + name = "box of donkpockets" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/kitchen) "eN" = ( /obj/structure/dresser, /turf/open/floor/carpet, @@ -1499,99 +837,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/awaymission/snowdin/post/dorm) -"eP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/awaymission/snowdin/post/dorm) "eQ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) -"eR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"eS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"eT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/airlock{ - id_tag = "snowdindormsec"; - name = "James Reed's Private Quarters" - }, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"eU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"eV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/trash/cheesie, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) -"eW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/trash/cheesie, -/turf/open/floor/wood, -/area/awaymission/snowdin/post/dorm) "eX" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/random, @@ -1620,17 +871,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/research) -"fd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 +"fc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/carpet, +/area/awaymission/snowdin/post/dorm) "fe" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/turf_decal/bot_white, @@ -1655,22 +902,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/messhall) -"fj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/airlock/public/glass{ - name = "Kitchen" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, -/obj/machinery/door/firedoor, -/obj/structure/barricade/wooden/crude, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/kitchen) "fk" = ( /obj/machinery/smartfridge, /turf/open/floor/iron, @@ -1723,17 +954,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) -"fu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) "fw" = ( /obj/machinery/sleeper{ dir = 4 @@ -1743,19 +963,6 @@ }, /turf/open/floor/iron/white, /area/awaymission/snowdin/post) -"fx" = ( -/obj/item/reagent_containers/blood, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/awaymission/snowdin/post) "fy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -1781,6 +988,16 @@ /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) +"fE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "fF" = ( /turf/open/floor/iron, /area/awaymission/snowdin/post/gateway) @@ -1826,16 +1043,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) -"fQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/hydro) "fR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -1850,18 +1057,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/hydro) -"fV" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/hydro) "fW" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/post/hydro) @@ -1906,29 +1101,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) -"gh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/carpet, -/area/awaymission/snowdin/post/dorm) -"gi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) "gj" = ( /obj/machinery/power/shuttle_engine/propulsion/left{ dir = 4 @@ -1955,69 +1127,6 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave/mountain) -"gm" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/closet/crate, -/obj/item/clothing/shoes/winterboots, -/obj/item/clothing/suit/hooded/wintercoat, -/obj/item/clothing/suit/hooded/wintercoat, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"gn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/awaymission/snowdin/post) -"go" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/awaymission/snowdin/post) -"gp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/awaymission/snowdin/post) -"gq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 10; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/awaymission/snowdin/post) "gr" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -2082,18 +1191,6 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) -"gF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/hydro) "gG" = ( /obj/machinery/hydroponics/constructable, /turf/open/floor/plating, @@ -2116,16 +1213,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) -"gL" = ( -/obj/structure/sink/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/hydro) "gM" = ( /obj/item/stack/cable_coil{ amount = 1 @@ -2158,6 +1245,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) +"gR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "gS" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -2184,87 +1277,13 @@ "gW" = ( /turf/closed/mineral/diamond/ice, /area/awaymission/snowdin/cave/cavern) -"gZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/can, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"ha" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, +"hf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"hb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/airlock/maintenance{ - name = "Misc Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"hc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"hd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"he" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/closet/crate/preopen, -/obj/item/clothing/shoes/winterboots, -/obj/item/clothing/shoes/winterboots, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) +/area/awaymission/snowdin/post) "hg" = ( /obj/item/shard, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -2298,13 +1317,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/snowdin/post/gateway) -"ho" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4 - }, -/turf/closed/wall/ice, -/area/awaymission/snowdin/post/mining_main/mechbay) "hp" = ( /obj/item/chair, /turf/open/floor/iron/cafeteria, @@ -2349,6 +1361,13 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/hydro) +"hx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "hy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -2359,14 +1378,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) -"hA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/hydro) "hB" = ( /obj/structure/lattice/catwalk, /obj/effect/turf_decal/weather/snow, @@ -2414,62 +1425,6 @@ }, /turf/open/floor/carpet, /area/awaymission/snowdin/post/dorm) -"hI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet, -/area/awaymission/snowdin/post/dorm) -"hJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/airlock{ - id_tag = "snowdindormcap"; - name = "Overseer's Private Quarters" - }, -/turf/open/floor/carpet, -/area/awaymission/snowdin/post/dorm) -"hK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"hL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) "hM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor, @@ -2485,35 +1440,6 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"hO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/awaymission/snowdin/post) -"hP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) "hQ" = ( /obj/structure/window/spawner/directional/south, /obj/effect/decal/cleanable/dirt, @@ -2532,16 +1458,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/snowdin/post/gateway) -"hT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/landmark/awaystart, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "hU" = ( /obj/structure/window/spawner/directional/south, /turf/open/floor/iron, @@ -2550,14 +1466,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) -"hW" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) "hX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/biogenerator, @@ -2566,16 +1474,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/hydro) -"hY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/hydro) "hZ" = ( /obj/item/gun/ballistic/rifle/boltaction, /obj/item/ammo_box/strilka310, @@ -2591,15 +1489,6 @@ /obj/structure/fireaxecabinet/directional/north, /turf/open/floor/plating, /area/awaymission/snowdin/post/secpost) -"ib" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/hydro) "ic" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/closed/wall/ice, @@ -2656,143 +1545,6 @@ temperature = 120 }, /area/awaymission/snowdin/cave/cavern) -"io" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"ip" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) -"iq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"ir" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"is" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/public/glass{ - name = "Dorms" - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) -"it" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"iu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"iv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) -"iw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 10; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/sign/departments/medbay/directional/north, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) "ix" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -2818,32 +1570,6 @@ /obj/effect/landmark/awaystart, /turf/open/floor/iron, /area/awaymission/snowdin/post/gateway) -"iB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, -/obj/effect/landmark/awaystart, -/obj/machinery/holopad, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) -"iC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/landmark/awaystart, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "iD" = ( /obj/structure/table, /obj/item/crowbar, @@ -2861,14 +1587,6 @@ /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) -"iH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) "iI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/seed_extractor, @@ -2884,17 +1602,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) -"iL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/hydro) "iM" = ( /obj/structure/lattice/catwalk, /obj/effect/turf_decal/weather/snow, @@ -2902,119 +1609,16 @@ /obj/structure/cable, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/outside) -"iN" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/cobweb, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) -"iP" = ( -/obj/machinery/light/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) -"iQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) -"iR" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Garage" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/iron, +"iW" = ( +/turf/open/floor/plating, /area/awaymission/snowdin/post/garage) -"iS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +"iX" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) -"iT" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) -"iU" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Garage" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, /turf/open/floor/iron, /area/awaymission/snowdin/post/garage) -"iV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 10; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) -"iW" = ( -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) "iZ" = ( /obj/item/clothing/head/cone, /obj/effect/light_emitter{ @@ -3037,22 +1641,6 @@ }, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/cave) -"jd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/box{ - name = "box of donkpockets" - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/kitchen) "je" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -3069,17 +1657,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) -"jh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/dorm) "ji" = ( /obj/effect/light_emitter{ name = "cave light"; @@ -3119,49 +1696,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"jp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) -"jq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) -"jr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) "js" = ( /turf/open/floor/plating, /area/awaymission/snowdin/post) @@ -3178,19 +1712,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/awaymission/snowdin/post/gateway) -"jv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/landmark/awaystart, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "jw" = ( /obj/structure/table, /obj/item/paper/pamphlet/gateway, @@ -3213,28 +1734,6 @@ /obj/item/trash/candle, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) -"jz" = ( -/obj/structure/table, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/kitchen/fork, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) -"jB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/sink/directional/west, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/hydro) "jC" = ( /obj/structure/lattice/catwalk, /obj/effect/turf_decal/weather/snow, @@ -3253,19 +1752,6 @@ /obj/structure/cable, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/outside) -"jE" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/landmark/awaystart, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) "jF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -3286,25 +1772,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/garage) -"jJ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) -"jK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) "jL" = ( /obj/vehicle/ridden/atv, /turf/open/floor/plating, @@ -3314,6 +1781,14 @@ /obj/item/storage/toolbox/mechanical/old, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) +"jN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/broken/directional/east, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "jO" = ( /mob/living/basic/blankbody{ desc = "It's Jacob Ullman, but their flesh has an ashy texture, and their face is featureless save an eerie smile."; @@ -3324,18 +1799,6 @@ temperature = 120 }, /area/awaymission/snowdin/cave/cavern) -"jP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/airlock{ - name = "Bathroom" - }, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) "jQ" = ( /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/wall, @@ -3343,6 +1806,11 @@ "jR" = ( /turf/closed/wall/rust, /area/awaymission/snowdin/post/custodials) +"jS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "jT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -3354,17 +1822,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/snowdin/post) -"jV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) "jW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -3383,20 +1840,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/awaymission/snowdin/post/gateway) -"jZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "snowdin_gate" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/gateway) "ka" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -3405,15 +1848,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/messhall) -"kc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/messhall) "kd" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron/cafeteria, @@ -3431,50 +1865,6 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/awaymission/snowdin/post/hydro) -"kh" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) -"ki" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) -"kj" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) -"kk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) "kl" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, @@ -3491,6 +1881,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) +"ko" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "kr" = ( /obj/structure/fence{ dir = 4 @@ -3504,90 +1903,6 @@ "ku" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/cave/mountain) -"kv" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) -"kw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 - }, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) -"kx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/shower/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) -"ky" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock{ - name = "Showers" - }, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) -"kz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) -"kA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) -"kB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) "kF" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -3600,6 +1915,17 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post) +"kH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/door/airlock/security{ + name = "Security Checkpoint" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/secpost) "kI" = ( /obj/machinery/light/directional/north, /turf/open/floor/plating, @@ -3613,22 +1939,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post) -"kK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) "kL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -3681,17 +1991,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/outside) -"kU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) "kV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -3717,30 +2016,11 @@ /obj/structure/table/reinforced, /turf/open/floor/iron, /area/awaymission/snowdin/post/garage) -"kZ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) "la" = ( /obj/machinery/light/small/directional/north, /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) -"lb" = ( -/obj/machinery/light/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) "lc" = ( /obj/vehicle/ridden/atv, /obj/effect/decal/cleanable/oil, @@ -3750,19 +2030,14 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) -"lf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, +"lg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/awaymission/snowdin/post/custodials) "lh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -3770,14 +2045,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) -"lj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 +"li" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 5 }, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) "lk" = ( /obj/machinery/holopad, @@ -3787,308 +2061,6 @@ "ll" = ( /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/custodials) -"lm" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/mop_bucket/janitorialcart, -/obj/item/mop, -/turf/open/floor/iron/dark, -/area/awaymission/snowdin/post/custodials) -"lo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/snowdin_station_sign/up, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"lp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/snowdin_station_sign/up/two, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"lq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/snowdin_station_sign/up/three, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"lr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/snowdin_station_sign/up/four, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"ls" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/snowdin_station_sign/up/five, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"lt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/snowdin_station_sign/up/six, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"lu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/snowdin_station_sign/up/seven, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"lv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"lw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"lx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"ly" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Mess Hall" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) -"lz" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/messhall) -"lA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/messhall) -"lB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) -"lC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) -"lD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) -"lE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/public/glass{ - name = "Hydroponics" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) -"lF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/hydro) -"lG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/hydro) -"lH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/hydro) -"lI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/hydro) "lJ" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -4098,96 +2070,22 @@ /obj/item/paper/crumpled/ruins/snowdin/foreshadowing, /turf/open/floor/wood, /area/awaymission/snowdin/post/dorm) -"lK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/hydro) -"lL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/hydro) -"lM" = ( -/obj/machinery/door/airlock/external/glass/ruin, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) "lN" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) -"lO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) -"lP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, +"lS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) -"lQ" = ( -/obj/machinery/door/airlock{ - name = "Mechanic's Quarters" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 + dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, /turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) -"lR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) +/area/awaymission/snowdin/post/dorm) "lU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -4228,80 +2126,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/custodials) -"mb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/awaymission/snowdin/post/custodials) -"mc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock{ - name = "Custodial Closet" - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/awaymission/snowdin/post/custodials) -"md" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"me" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"mf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/snowdin_station_sign, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) "mg" = ( /obj/effect/turf_decal/snowdin_station_sign/two, /obj/effect/decal/cleanable/dirt, @@ -4346,16 +2170,6 @@ }, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) -"mo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) "mp" = ( /obj/structure/fence/door{ dir = 4 @@ -4404,15 +2218,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/outside) -"my" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 10; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) "mz" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -4437,6 +2242,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/snowdin/post/garage) +"mD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/snowdin_station_sign/up/three, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "mE" = ( /obj/structure/table, /turf/open/floor/iron/dark, @@ -4449,29 +2265,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/custodials) -"mI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) -"mJ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) "mK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4498,21 +2291,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/awaymission/snowdin/post/messhall) -"mP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/iron/cafeteria, -/area/awaymission/snowdin/post/messhall) "mQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -4529,15 +2307,6 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) -"mT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/garage) "mU" = ( /obj/structure/rack, /obj/item/clothing/suit/hooded/wintercoat, @@ -4567,6 +2336,12 @@ /obj/structure/barricade/wooden/snowed, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) +"mZ" = ( +/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "na" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/post/custodials) @@ -4588,86 +2363,31 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"ne" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"nf" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) "ng" = ( /obj/structure/flora/grass/both/style_random, /obj/structure/flora/tree/pine/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) -"nh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 +"nl" = ( +/obj/effect/baseturf_helper/asteroid/snow, +/turf/closed/wall, +/area/awaymission/snowdin/post/engineering) +"nm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/iron/white, /area/awaymission/snowdin/post) -"ni" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, +"nn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"nj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) -"nk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 10; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating, +/obj/structure/cable, +/turf/open/floor/iron, /area/awaymission/snowdin/post) -"nl" = ( -/obj/effect/baseturf_helper/asteroid/snow, -/turf/closed/wall, -/area/awaymission/snowdin/post/engineering) "no" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -4675,17 +2395,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/engineering) -"np" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) "nq" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -4759,11 +2468,28 @@ "nF" = ( /turf/closed/wall/rust, /area/awaymission/snowdin/post/secpost) +"nG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/research) "nH" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/awaymission/snowdin/post/secpost) +"nI" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/awaystart, +/obj/item/bedsheet/purple, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "nJ" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -4779,15 +2505,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/awaymission/snowdin/post) -"nM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) "nN" = ( /turf/closed/wall, /area/awaymission/snowdin/post/engineering) @@ -4810,16 +2527,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/engineering) -"nR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) "nS" = ( /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) @@ -4852,6 +2559,16 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/awaymission/snowdin/post/hydro) +"nZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/sign/departments/medbay/directional/north, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "oa" = ( /obj/effect/light_emitter{ name = "outdoor light"; @@ -4866,19 +2583,6 @@ "oc" = ( /turf/closed/wall, /area/awaymission/snowdin/post/secpost) -"of" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/secpost) "og" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -4912,36 +2616,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) -"on" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) -"oo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) -"op" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) "or" = ( /obj/structure/table, /obj/item/cultivator, @@ -4956,6 +2630,11 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) +"ot" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "ou" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -5002,52 +2681,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/snowdin/post/secpost) -"oD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/secpost) -"oE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/secpost) -"oF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/secpost) -"oG" = ( -/obj/structure/table, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/secpost) "oH" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -5066,31 +2699,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post) -"oK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"oL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) "oM" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5104,15 +2712,6 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) -"oO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/engineering) "oP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -5199,6 +2798,12 @@ /obj/machinery/microwave, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/cavern2) +"pi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/hydro) "pj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -5266,29 +2871,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/snowdin/post) -"ps" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) -"pt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) "pu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5298,18 +2880,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) -"pv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ - dir = 8 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/engineering) "pw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ dir = 8 @@ -5406,14 +2976,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/awaymission/snowdin/post) -"pQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) "pR" = ( /obj/structure/closet/emcloset, /obj/item/clothing/suit/hooded/wintercoat, @@ -5426,17 +2988,6 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) -"pT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ - dir = 5 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/engineering) "pU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ dir = 8 @@ -5590,43 +3141,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"qs" = ( -/obj/machinery/door/airlock/external/glass/ruin, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/barricade/wooden/crude, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) -"qt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 8 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/engineering) -"qu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) "qv" = ( /obj/machinery/atmospherics/components/binary/volume_pump{ name = "Air Mix To Turbine Mix" @@ -5689,10 +3203,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/custodials) -"qF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, -/turf/closed/wall/ice, -/area/awaymission/snowdin/post/cavern2) "qG" = ( /obj/machinery/door/airlock{ name = "Private Quarters" @@ -5728,20 +3238,17 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"qP" = ( -/obj/effect/turf_decal/stripes/line{ +"qO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plating, -/area/awaymission/snowdin/post/engineering) -"qQ" = ( +/area/awaymission/snowdin/post/garage) +"qP" = ( /obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 + dir = 10 }, /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) @@ -5822,13 +3329,6 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) -"rd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1; - piping_layer = 4 - }, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/cavern2) "re" = ( /obj/machinery/door/airlock/external/glass/ruin, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -5840,6 +3340,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern2) +"rg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "rh" = ( /obj/structure/window/spawner/directional/south, /turf/open/floor/engine/cult, @@ -5849,17 +3357,13 @@ /obj/structure/table, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/cavern2) -"rk" = ( -/obj/structure/rack, +"rj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"rm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 9; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, +"rk" = ( +/obj/structure/rack, /turf/open/floor/plating, /area/awaymission/snowdin/post) "rn" = ( @@ -5871,14 +3375,6 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"ro" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/turf/closed/wall/ice, -/area/awaymission/snowdin/post/engineering) "rp" = ( /turf/closed/wall/r_wall, /area/awaymission/snowdin/post/engineering) @@ -5942,6 +3438,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern2) +"rC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "rE" = ( /obj/machinery/conveyor{ dir = 10; @@ -5968,20 +3472,6 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post) -"rI" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/light_emitter{ - name = "cave light"; - set_cap = 3; - set_luminosity = 6 - }, -/turf/open/floor/plating/snowed/smoothed, -/area/awaymission/snowdin/post/engineering) "rJ" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -6176,6 +3666,19 @@ }, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) +"sq" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) +"sr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/messhall) "ss" = ( /obj/structure/cable, /turf/open/floor/engine/cult, @@ -6196,6 +3699,29 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) +"sv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/closed/wall/ice, +/area/awaymission/snowdin/post/mining_main/mechbay) +"sw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) +"sx" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/awaystart, +/obj/item/paper/crumpled/ruins/snowdin/dontdeadopeninside, +/obj/item/bedsheet/green, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "sz" = ( /obj/machinery/door/poddoor{ id = "snowdinturbinegas"; @@ -6264,6 +3790,17 @@ }, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/outside) +"sL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/storage/box{ + name = "box of donkpockets" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/kitchen) "sN" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -6327,6 +3864,12 @@ }, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/outside) +"sW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "sX" = ( /obj/item/disk/holodisk/snowdin/ripjacob, /obj/structure/cable, @@ -6404,12 +3947,24 @@ }, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/outside) +"tn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/research) "tp" = ( /turf/closed/wall/mineral/snow, /area/awaymission/snowdin/cave/cavern) "tq" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/outside) +"tr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "ts" = ( /obj/structure/flora/tree/dead/style_random, /obj/effect/light_emitter{ @@ -6465,6 +4020,18 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) +"tO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/item/storage/medkit/o2{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/awaymission/snowdin/post) "tQ" = ( /obj/machinery/light/small/directional/south, /obj/structure/sign/nanotrasen{ @@ -6476,6 +4043,39 @@ /obj/structure/barricade/wooden/snowed, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) +"tT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) +"tU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) +"tW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) +"tX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/snowdin_station_sign/up/two, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "tY" = ( /turf/closed/wall, /area/awaymission/snowdin/post/cavern1) @@ -6499,6 +4099,12 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/awaymission/snowdin/post/cavern1) +"ud" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "ue" = ( /turf/open/floor/wood, /area/awaymission/snowdin/post/cavern1) @@ -6512,6 +4118,11 @@ }, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) +"uj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "uk" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, @@ -6548,25 +4159,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) -"ut" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/table, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) +"uv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/closet/crate, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "ux" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -6615,6 +4215,10 @@ "uI" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/post/cavern1) +"uJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "uK" = ( /obj/structure/cable, /mob/living/basic/skeleton/plasmaminer, @@ -6647,6 +4251,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) +"uT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/snowdin_station_sign/up/six, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "uU" = ( /obj/item/chair, /turf/open/floor/iron, @@ -6658,6 +4271,16 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) +"uW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock{ + name = "Showers" + }, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "uY" = ( /obj/docking_port/stationary{ dir = 4; @@ -6713,6 +4336,16 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) +"vg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/snowdin_station_sign/up/four, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "vh" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 @@ -6781,10 +4414,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/awaymission/snowdin/post/dorm) -"vt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/cavern1) "vu" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -6801,23 +4430,6 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) -"vy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) -"vA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, -/turf/closed/wall/ice, -/area/awaymission/snowdin/post/cavern1) "vB" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -6842,12 +4454,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/cavern1) -"vG" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector{ - dir = 1 - }, -/turf/open/floor/plating/snowed/cavern, -/area/awaymission/snowdin/post/cavern1) "vI" = ( /obj/structure/ore_box, /obj/effect/turf_decal/bot, @@ -6873,6 +4479,13 @@ /obj/effect/baseturf_helper/asteroid/snow, /turf/open/floor/plating, /area/awaymission/snowdin/post/broken_shuttle) +"vO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/closet/crate/preopen, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/shoes/winterboots, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "vP" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -6925,6 +4538,22 @@ /obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"we" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/landmark/awaystart, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) +"wh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "wm" = ( /obj/machinery/porta_turret/centcom_shuttle/weak{ desc = "A turret built with substandard parts and run down further with age."; @@ -6933,6 +4562,21 @@ }, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/cave) +"wn" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Garage" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) +"wq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/engineering) "ws" = ( /obj/effect/light_emitter{ name = "cave light"; @@ -6942,6 +4586,28 @@ /obj/machinery/light/small/directional/east, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) +"wv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/door/airlock{ + id_tag = "snowdindormresearch2"; + name = "Elizabeth Queef's Private Quarters" + }, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) +"ww" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/trash/cheesie, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) +"wB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/messhall) "wD" = ( /turf/closed/wall, /area/awaymission/snowdin/post/mining_dock) @@ -6958,6 +4624,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) +"wI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/engineering) +"wJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/kitchen) "wK" = ( /obj/machinery/power/terminal{ dir = 1 @@ -7033,6 +4709,14 @@ /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/cave) +"xd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/research) "xe" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, @@ -7133,17 +4817,6 @@ /obj/structure/cable, /turf/open/floor/engine/cult, /area/awaymission/snowdin/post/mining_dock) -"xw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 6; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/firealarm/directional/west, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) "xx" = ( /obj/machinery/door/airlock/vault{ name = "Relic Storage" @@ -7272,6 +4945,14 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) +"xR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "xS" = ( /obj/machinery/power/port_gen/pacman, /obj/item/stack/sheet/mineral/plasma{ @@ -7298,13 +4979,6 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) -"xV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4 - }, -/turf/closed/mineral/snowmountain/cavern, -/area/awaymission/snowdin/cave/cavern) "xW" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/post/mining_dock) @@ -7359,6 +5033,14 @@ "yg" = ( /turf/open/floor/engine/plasma, /area/awaymission/snowdin/cave) +"yh" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/item/bedsheet/orange, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "yi" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -7393,6 +5075,15 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) +"yn" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/awaystart, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "yo" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -7447,6 +5138,17 @@ "yv" = ( /turf/closed/wall/mineral/snow, /area/awaymission/snowdin/outside) +"yw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "yx" = ( /obj/structure/closet/crate, /obj/item/relic, @@ -7563,6 +5265,14 @@ slowdown = 1 }, /area/awaymission/snowdin/outside) +"yN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "yO" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -7700,6 +5410,15 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/minipost) +"zs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/item/trash/can, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "zt" = ( /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/wall/mineral/wood, @@ -7707,17 +5426,19 @@ "zu" = ( /turf/closed/wall/mineral/wood, /area/awaymission/snowdin/igloo) -"zv" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 8 - }, -/turf/open/floor/plating/snowed/cavern, -/area/awaymission/snowdin/post/mining_main/mechbay) "zw" = ( /obj/structure/rack, /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) +"zx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 6 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "zy" = ( /obj/effect/decal/cleanable/oil, /turf/open/floor/plating, @@ -7759,32 +5480,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) -"zH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - piping_layer = 4 - }, -/obj/machinery/space_heater, -/obj/structure/sign/warning/xeno_mining/directional/east, -/obj/structure/cable, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_dock) -"zI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4 - }, -/turf/closed/wall/ice, -/area/awaymission/snowdin/post/mining_dock) -"zJ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plating/snowed/cavern, -/area/awaymission/snowdin/post/mining_dock) "zL" = ( /obj/machinery/door/airlock/public/glass{ name = "Garage" @@ -8095,6 +5790,17 @@ /obj/item/stack/sheet/iron, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/post/minipost) +"AS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock{ + id_tag = "snowdindormsec"; + name = "James Reed's Private Quarters" + }, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "AU" = ( /obj/effect/light_emitter{ name = "outdoor light"; @@ -8189,6 +5895,16 @@ }, /turf/open/floor/iron/white, /area/awaymission/snowdin/post/minipost) +"Bn" = ( +/obj/machinery/door/airlock{ + name = "Mechanic's Quarters" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "Bo" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -8221,6 +5937,15 @@ }, /turf/open/floor/iron/white, /area/awaymission/snowdin/post/minipost) +"Bt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "Bu" = ( /obj/structure/table, /obj/item/clothing/glasses/hud/health, @@ -8322,6 +6047,14 @@ }, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/cave) +"BL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "BM" = ( /obj/structure/table/wood, /obj/item/knife/combat/bone, @@ -8451,6 +6184,27 @@ }, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/cave) +"Cf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/door/airlock{ + id_tag = "snowdindormresearch3"; + name = "Jouslen McGee's Private Quarters" + }, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) +"Cg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/hydro) +"Ci" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ + dir = 5 + }, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/engineering) "Cj" = ( /obj/structure/fence{ dir = 4 @@ -8465,6 +6219,13 @@ "Cl" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/cave/cavern) +"Cp" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/barricade/wooden/crude, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "Ct" = ( /turf/closed/wall/mineral/plastitanium, /area/awaymission/snowdin/outside) @@ -8480,6 +6241,13 @@ /obj/machinery/light/small/broken/directional/west, /turf/open/floor/carpet, /area/awaymission/snowdin/post/dorm) +"Cy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "CA" = ( /obj/structure/bonfire/prelit{ burn_icon = "bonfire_warm" @@ -8495,6 +6263,12 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) +"CB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "CC" = ( /turf/closed/wall/mineral/plastitanium, /area/awaymission/snowdin/cave) @@ -8582,6 +6356,22 @@ }, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"CU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/engineering) "CV" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 @@ -8625,6 +6415,10 @@ /obj/effect/turf_decal/weather/snow, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/cave) +"Dc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "De" = ( /obj/structure/table/reinforced, /obj/machinery/light/built/directional/west, @@ -8712,10 +6506,29 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/cave) +"Dw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/closed/wall/ice, +/area/awaymission/snowdin/post/engineering) "Dx" = ( /obj/machinery/light/built/directional/south, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/cave) +"Dy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ + dir = 8 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/engineering) +"Dz" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "DA" = ( /obj/item/stack/rods, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -8735,6 +6548,14 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/awaymission/snowdin/cave) +"DF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/awaymission/snowdin/post) "DH" = ( /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, /turf/open/floor/plating, @@ -8767,6 +6588,13 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/cave) +"DQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "DR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8812,6 +6640,14 @@ "Ed" = ( /turf/open/floor/circuit/red, /area/awaymission/snowdin/cave) +"Ee" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "Eg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8896,6 +6732,13 @@ }, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"Ex" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/awaymission/snowdin/post) "Ez" = ( /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, @@ -8964,6 +6807,10 @@ "EH" = ( /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"EJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "EK" = ( /obj/structure/bed/medical/emergency, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -9003,6 +6850,13 @@ }, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"ER" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "ES" = ( /obj/structure/table/reinforced, /obj/machinery/light/built/directional/south, @@ -9025,6 +6879,14 @@ }, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) +"EY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "EZ" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/light_emitter{ @@ -9034,6 +6896,22 @@ }, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/outside) +"Fd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) +"Ff" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/effect/turf_decal/snowdin_station_sign/up, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "Fg" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/loading_area, @@ -9067,6 +6945,13 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/outside) +"Fr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "Ft" = ( /obj/structure/fence/door, /turf/open/misc/asteroid/snow, @@ -9086,6 +6971,14 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) +"Fw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 6 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "Fx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/plating/snowed, @@ -9111,12 +7004,43 @@ /obj/structure/lattice/catwalk, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/outside) +"FH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/button/door/directional/east{ + id = "snowdindormcap"; + name = "Dorm Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/carpet, +/area/awaymission/snowdin/post/dorm) "FI" = ( /obj/machinery/conveyor{ id = "snowdin_belt_mine" }, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) +"FJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/sign/poster/contraband/kudzu/directional/north, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) +"FK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/bedsheet/purple, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) +"FN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "FO" = ( /obj/machinery/computer/monitor{ dir = 8 @@ -9179,6 +7103,12 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/outside) +"Gg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/cavern2) "Gk" = ( /turf/closed/wall/ice, /area/awaymission/snowdin/post/mining_main/mechbay) @@ -9266,6 +7196,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/robotics) +"GD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "GH" = ( /turf/closed/wall/rust, /area/awaymission/snowdin/post/mining_main/mechbay) @@ -9300,6 +7238,11 @@ "GN" = ( /turf/closed/wall, /area/awaymission/snowdin/post/mining_main/mechbay) +"GO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/research) "GP" = ( /turf/closed/wall/rust, /area/awaymission/snowdin/post/mining_main) @@ -9397,6 +7340,11 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) +"Hn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "Ho" = ( /turf/open/floor/engine/plasma, /area/awaymission/snowdin/outside) @@ -9412,6 +7360,13 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/outside) +"Hr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "Hs" = ( /obj/machinery/light/directional/west, /turf/open/floor/iron, @@ -9427,6 +7382,14 @@ /obj/machinery/holopad, /turf/open/floor/iron/white, /area/awaymission/snowdin/post/mining_main/robotics) +"Hv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "Hy" = ( /obj/machinery/door/airlock/research/glass{ name = "Mech Lab" @@ -9498,6 +7461,12 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/awaymission/snowdin/post/mining_main/robotics) +"HN" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/mop_bucket/janitorialcart, +/obj/item/mop, +/turf/open/floor/iron/dark, +/area/awaymission/snowdin/post/custodials) "HO" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -9577,6 +7546,22 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/awaymission/snowdin/post/mining_main/robotics) +"Id" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/engineering) +"Ih" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "Ij" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron/recharge_floor, @@ -9600,6 +7585,19 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) +"Iq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/awaymission/snowdin/post) "Ir" = ( /obj/structure/closet/cabinet, /turf/open/floor/iron/grimy, @@ -9699,6 +7697,15 @@ /obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"IP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "IQ" = ( /obj/effect/spawner/random/structure/crate_abandoned, /obj/effect/mapping_helpers/broken_floor, @@ -9765,6 +7772,19 @@ }, /turf/open/floor/wood, /area/awaymission/snowdin/post/dorm) +"Jf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/hydro) +"Jg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/hydro) "Ji" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -9783,12 +7803,38 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) +"Jm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/public/glass{ + name = "Kitchen" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/machinery/door/firedoor, +/obj/structure/barricade/wooden/crude, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/kitchen) +"Jo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/engineering) "Jq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) +"Jr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "Jt" = ( /obj/structure/closet/crate/preopen, /obj/item/storage/toolbox/emergency, @@ -9838,6 +7884,11 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) +"JA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/kitchenspike, +/turf/open/floor/iron/freezer, +/area/awaymission/snowdin/post/kitchen) "JL" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -9903,6 +7954,20 @@ "JV" = ( /turf/open/misc/ice, /area/awaymission/snowdin/outside) +"JW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) +"JZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/broken/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "Kc" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -9928,6 +7993,17 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) +"Kg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/can, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "Kj" = ( /obj/machinery/power/port_gen/pacman, /obj/machinery/power/terminal{ @@ -9959,6 +8035,11 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) +"Kn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "Ko" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -9972,6 +8053,31 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) +"Kr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock{ + name = "Freezer" + }, +/obj/structure/barricade/wooden, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron/freezer, +/area/awaymission/snowdin/post/kitchen) +"Ks" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/research) +"Kt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron/freezer, +/area/awaymission/snowdin/post/kitchen) "Kv" = ( /obj/structure/fence/corner, /turf/open/misc/asteroid/snow, @@ -10009,6 +8115,21 @@ /obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) +"KE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/engineering) +"KF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 6 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "KH" = ( /obj/structure/door_assembly/door_assembly_min{ anchored = 1; @@ -10113,6 +8234,13 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) +"Ld" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/hydro) "Lf" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -10146,6 +8274,17 @@ }, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/post/minipost) +"Ll" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "Lm" = ( /mob/living/basic/bear/snow, /turf/open/misc/asteroid/snow{ @@ -10207,6 +8346,29 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) +"LD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) +"LF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/secpost) +"LH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/hydro) "LI" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/decal/cleanable/blood/drip, @@ -10240,20 +8402,10 @@ /obj/effect/mob_spawn/corpse/human/assistant, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) -"LO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/box{ - name = "box of donkpockets" - }, +"LP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, +/obj/machinery/holopad, /turf/open/floor/iron, /area/awaymission/snowdin/post/kitchen) "LQ" = ( @@ -10324,6 +8476,29 @@ temperature = 120 }, /area/awaymission/snowdin/cave/cavern) +"Md" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) +"Me" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/kitchen) +"Mf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/kitchen) "Mg" = ( /obj/structure/table, /obj/item/clothing/neck/stethoscope, @@ -10349,6 +8524,13 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/cafeteria, /area/awaymission/snowdin/post/messhall) +"Mk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "Ml" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ dir = 8 @@ -10369,10 +8551,34 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/cave) +"Mv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) +"Mx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 6 + }, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "Mz" = ( /obj/structure/fence, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"MA" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/secpost) "MB" = ( /obj/structure/fence{ dir = 4 @@ -10384,12 +8590,25 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"MD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/secpost) "ME" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) +"MF" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/hydro) "MG" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, @@ -10424,17 +8643,24 @@ /obj/item/stack/rods, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) -"MP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 +"MO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "snowdin_gate" }, -/obj/machinery/firealarm/directional/east, -/obj/machinery/light/broken/directional/east, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) +/obj/effect/turf_decal/delivery, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) +"MQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "MR" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -10445,6 +8671,12 @@ slowdown = 1 }, /area/awaymission/snowdin/outside) +"MS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "MT" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/turf_decal/weather/snow/corner{ @@ -10497,6 +8729,29 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/carpet, /area/awaymission/snowdin/post/dorm) +"Nc" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) +"Ne" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Dorms" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "Nf" = ( /obj/structure/fence/corner{ dir = 6 @@ -10529,6 +8784,10 @@ }, /turf/open/floor/wood, /area/awaymission/snowdin/post/dorm) +"Nl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/closed/wall/ice, +/area/awaymission/snowdin/post/mining_dock) "Nn" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -10536,6 +8795,34 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/hydro) +"Np" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/kitchen) +"Nr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) +"Ns" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "Nt" = ( /obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, @@ -10551,20 +8838,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/engineering) +"Ny" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/machinery/space_heater, +/obj/structure/sign/warning/xeno_mining/directional/east, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_dock) "Nz" = ( /obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) -"NA" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) "NB" = ( /obj/structure/table, /obj/item/storage/medkit/o2{ @@ -10626,6 +8912,14 @@ /obj/machinery/light/small/broken/directional/east, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/dorm) +"NO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "NQ" = ( /obj/machinery/airalarm/directional/north, /obj/effect/decal/cleanable/dirt, @@ -10647,6 +8941,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/outside) +"NW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock{ + id_tag = "snowdindormcap"; + name = "Overseer's Private Quarters" + }, +/turf/open/floor/carpet, +/area/awaymission/snowdin/post/dorm) "NX" = ( /obj/structure/noticeboard/directional/north, /obj/item/paper/crumpled/ruins/snowdin/shovel, @@ -10691,17 +8996,6 @@ }, /turf/open/floor/iron/white, /area/awaymission/snowdin/post) -"Oh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/broken/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/awaymission/snowdin/post/dorm) "Oj" = ( /obj/structure/fence, /turf/open/misc/asteroid/snow/ice, @@ -10711,6 +9005,34 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/research) +"On" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) +"Op" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) +"Os" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "Ou" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/misc/ice/smooth, @@ -10726,6 +9048,11 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) +"Ow" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "Ox" = ( /obj/structure/table, /obj/item/disk/holodisk/snowdin/welcometodie, @@ -10821,32 +9148,28 @@ /obj/item/paper/fluff/awaymissions/snowdin/secnotice, /turf/open/floor/plating, /area/awaymission/snowdin/post/secpost) -"OX" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 +"OY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 }, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/research) -"OZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 +/obj/machinery/door/airlock/public/glass{ + name = "Hydroponics" }, +/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) +"Pa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/airlock/security{ - name = "Security Checkpoint" +/obj/machinery/door/airlock{ + id_tag = "snowdindormhydro1"; + name = "Katherine Esterdeen's Private Quarters" }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/fourcorners, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/secpost) +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "Pb" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -10872,6 +9195,13 @@ slowdown = 1 }, /area/awaymission/snowdin/cave/mountain) +"Pe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/food/flour, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/kitchen) "Pf" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -10892,21 +9222,10 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) -"Pm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/dorm) +"Pi" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) "Po" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/engine/cult, @@ -10944,11 +9263,39 @@ /obj/machinery/light/small/directional/south, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/post/mining_main) +"Pw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) +"Pz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/engineering) +"PA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron/freezer, +/area/awaymission/snowdin/post/kitchen) "PC" = ( /obj/machinery/space_heater, /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) +"PF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/hydro) "PH" = ( /obj/structure/closet/crate/wooden, /obj/effect/spawner/random/exotic/antag_gear, @@ -10989,21 +9336,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) -"PU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/button/door/directional/east{ - id = "snowdindormcap"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/turf/open/floor/carpet, -/area/awaymission/snowdin/post/dorm) "PV" = ( /obj/item/shard, /turf/open/misc/asteroid/snow/ice, @@ -11016,6 +9348,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"PX" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/obj/effect/landmark/awaystart, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "PY" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -11027,6 +9367,12 @@ slowdown = 1 }, /area/awaymission/snowdin/outside) +"Qa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/hydro) "Qb" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock" @@ -11052,6 +9398,11 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave/mountain) +"Qe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet, +/area/awaymission/snowdin/post/dorm) "Qf" = ( /obj/item/shard, /turf/open/misc/asteroid/snow{ @@ -11060,6 +9411,10 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) +"Qg" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4, +/turf/open/misc/asteroid/snow/ice, +/area/awaymission/snowdin/post/cavern2) "Qh" = ( /obj/structure/table, /obj/item/clothing/glasses/hud/health, @@ -11097,14 +9452,10 @@ slowdown = 1 }, /area/awaymission/snowdin/cave) -"Qn" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4; - piping_layer = 4 - }, -/obj/structure/sign/warning/xeno_mining/directional/east, -/turf/open/floor/plating, -/area/awaymission/snowdin/post/mining_main/mechbay) +"Qo" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "Qp" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/south, @@ -11132,6 +9483,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/snowdin/post/engineering) +"Qy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "Qz" = ( /obj/machinery/door/firedoor, /obj/structure/holosign/barrier/atmos, @@ -11139,12 +9497,9 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) -"QB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 +"QA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 }, /obj/machinery/light/broken/directional/south, /obj/effect/mapping_helpers/broken_floor, @@ -11197,21 +9552,16 @@ /obj/item/disk/holodisk/snowdin/weregettingpaidright, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/research) +"QL" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/layer4{ + dir = 1 + }, +/turf/open/floor/plating/snowed/cavern, +/area/awaymission/snowdin/post/cavern1) "QM" = ( /mob/living/basic/spider/giant/nurse/ice, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) -"QN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/awaymission/snowdin/post) "QO" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -11276,6 +9626,13 @@ /obj/structure/barricade/wooden, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) +"Rc" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "Rd" = ( /obj/structure/barricade/sandbags, /turf/open/misc/asteroid/snow{ @@ -11294,6 +9651,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) +"Rk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/research) "Rm" = ( /obj/item/stack/sheet/mineral/plastitanium, /turf/open/misc/asteroid/snow{ @@ -11310,6 +9675,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) +"Rp" = ( +/obj/structure/sink/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/hydro) +"Rq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/food/egg_smudge, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/kitchen) "Rs" = ( /obj/item/stack/cable_coil{ amount = 1 @@ -11317,6 +9694,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"Rt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 6 + }, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "Ru" = ( /obj/item/shard, /turf/open/misc/asteroid/snow, @@ -11327,6 +9711,17 @@ }, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) +"Rw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 8 + }, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/engineering) "RB" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/misc/asteroid/snow, @@ -11437,11 +9832,24 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/cave) +"Se" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "Sf" = ( /obj/effect/turf_decal/weather/snow, /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/cave) +"Sh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/kitchen) "Si" = ( /mob/living/basic/spider/giant/hunter/ice, /turf/open/misc/asteroid/snow/ice, @@ -11483,6 +9891,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) +"Sn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "So" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/plating/snowed/smoothed, @@ -11492,19 +9908,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/research) -"Sr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/plating, -/area/awaymission/snowdin/post) +"Sq" = ( +/obj/structure/bed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/landmark/awaystart, +/obj/item/bedsheet/red, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "Ss" = ( /obj/structure/bed{ dir = 4 @@ -11523,6 +9934,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) +"Sv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) "Sw" = ( /obj/structure/statue/snow/snowman{ name = "Snow-Luc Price" @@ -11540,6 +9959,10 @@ }, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) +"Sz" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/cavern1) "SA" = ( /obj/structure/statue/snow/snowman{ anchored = 1; @@ -11553,11 +9976,31 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"SB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/maintenance{ + name = "Misc Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "SC" = ( /obj/structure/spider/stickyweb, /obj/structure/spider/stickyweb, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) +"SD" = ( +/obj/machinery/light/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "SE" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/decal/cleanable/dirt, @@ -11581,6 +10024,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern2) +"SK" = ( +/obj/machinery/light/small/directional/west, +/obj/machinery/door_buttons/access_button{ + idDoor = "snowdin_turbine_interior"; + idSelf = "snowdin_turbine_access"; + name = "Turbine Airlock Control"; + pixel_x = 8; + pixel_y = -24 + }, +/turf/open/floor/engine, +/area/awaymission/snowdin/post/engineering) "SL" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -11609,6 +10063,11 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) +"SP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "SS" = ( /obj/structure/fence{ dir = 4 @@ -11637,6 +10096,14 @@ }, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) +"SY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "SZ" = ( /obj/machinery/door/airlock/external/ruin{ name = "Ready Room" @@ -11648,6 +10115,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"Ta" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/kitchenspike, +/obj/structure/spider/stickyweb, +/turf/open/floor/iron/freezer, +/area/awaymission/snowdin/post/kitchen) "Tb" = ( /obj/effect/light_emitter{ name = "outdoor light"; @@ -11657,6 +10130,16 @@ /obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"Tc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/snowdin_station_sign/up/five, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "Te" = ( /obj/machinery/light/small/directional/north, /obj/structure/cable, @@ -11666,6 +10149,14 @@ /mob/living/basic/bear/snow, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"Ti" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/hydro) "Tk" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/asteroid/snow{ @@ -11674,6 +10165,16 @@ slowdown = 1 }, /area/awaymission/snowdin/outside) +"Tl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/snowdin_station_sign/up/seven, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "Tm" = ( /obj/effect/decal/cleanable/vomit/old, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -11685,6 +10186,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) +"Tq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/engineering) "Tr" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/turf_decal/weather/snow/corner{ @@ -11693,6 +10201,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/snowdin, /area/awaymission/snowdin/outside) +"Tu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "Tv" = ( /obj/structure/table, /obj/item/storage/medkit/ancient, @@ -11706,6 +10221,13 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) +"Tx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "Ty" = ( /obj/machinery/light/broken/directional/east, /turf/open/floor/iron, @@ -11725,6 +10247,13 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine/n2, /area/awaymission/snowdin/post/engineering) +"TE" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/research) "TI" = ( /obj/structure/flora/grass/both/style_random, /turf/open/misc/asteroid/snow, @@ -11740,6 +10269,15 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) +"TL" = ( +/obj/item/reagent_containers/blood, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/awaymission/snowdin/post) "TM" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -11750,6 +10288,14 @@ slowdown = 1 }, /area/awaymission/snowdin/outside) +"TQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "TR" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -11793,6 +10339,18 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating/snowed, /area/awaymission/snowdin/cave) +"Ug" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Research Desks" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/research) "Ui" = ( /obj/machinery/light/small/directional/west, /turf/open/misc/ice/smooth, @@ -11815,6 +10373,15 @@ /obj/machinery/light/small/broken/directional/east, /turf/open/floor/wood, /area/awaymission/snowdin/post/dorm) +"Ul" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "Um" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -11825,10 +10392,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine/plasma, /area/awaymission/snowdin/post/engineering) -"Up" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on, -/turf/open/misc/asteroid/snow/ice, -/area/awaymission/snowdin/post/cavern2) "Uq" = ( /obj/effect/baseturf_helper/asteroid/snow{ baseturf = /turf/open/misc/asteroid/snow/ice; @@ -11840,19 +10403,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) -"Us" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/garage) "Ut" = ( /obj/structure/closet/cabinet, /obj/machinery/button/door/directional/south{ @@ -11867,6 +10417,12 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main) +"Uw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "Ux" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, @@ -11876,6 +10432,12 @@ /obj/item/clothing/head/cone, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/cave) +"Uz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/holopad, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/research) "UA" = ( /obj/machinery/light/small/directional/east, /obj/structure/closet/cabinet, @@ -11897,6 +10459,14 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"UF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/door/airlock{ + name = "Bathroom" + }, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "UG" = ( /obj/effect/light_emitter{ name = "outdoor light"; @@ -11910,10 +10480,20 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"UH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/light/directional/north, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/kitchen) "UI" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) +"UJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/research) "UM" = ( /mob/living/basic/skeleton/settler, /turf/open/misc/asteroid/snow{ @@ -11935,6 +10515,22 @@ /obj/structure/flora/rock/pile/icy/style_random, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) +"UU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/sign/poster/contraband/lusty_xenomorph/directional/east, +/obj/structure/table/wood, +/obj/item/paper_bin, +/turf/open/floor/carpet, +/area/awaymission/snowdin/post/dorm) +"UZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "Va" = ( /obj/structure/fence{ dir = 4 @@ -11993,6 +10589,13 @@ slowdown = 1 }, /area/awaymission/snowdin/outside) +"Vn" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/sign/warning/xeno_mining/directional/east, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/mining_main/mechbay) "Vo" = ( /mob/living/basic/spider/giant/ice, /turf/open/misc/asteroid/snow/ice, @@ -12006,6 +10609,11 @@ /obj/machinery/light/broken/directional/south, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) +"Vr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/secpost) "Vt" = ( /obj/docking_port/stationary{ dir = 4; @@ -12044,12 +10652,30 @@ }, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/post/cavern2) +"VA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) "VB" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"VC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/door/airlock{ + id_tag = "snowdindormhydro2"; + name = "Rachel Migro's Private Quarters" + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "VE" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -12064,11 +10690,40 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_dock) +"VH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/landmark/awaystart, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) "VJ" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/snowdin/post/hydro) +"VK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/landmark/awaystart, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/gateway) +"VM" = ( +/obj/structure/table, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/kitchen/fork, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) +"VN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "VO" = ( /obj/machinery/light/small/directional/north, /obj/structure/sign/nanotrasen{ @@ -12096,6 +10751,14 @@ /obj/effect/spawner/random/exotic/antag_gear_weak, /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/cave/cavern) +"VV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "VY" = ( /obj/machinery/light/small/directional/south, /turf/open/misc/asteroid/snow, @@ -12105,6 +10768,15 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_dock) +"Wd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/secpost) "We" = ( /obj/structure/rack, /obj/machinery/light/small/directional/east, @@ -12115,6 +10787,21 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/snowdin/post/dorm) +"Wi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/dorm) +"Wj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/item/trash/cheesie, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "Wk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -12132,6 +10819,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/awaymission/snowdin/post) +"Wn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/awaymission/snowdin/post) "Wp" = ( /obj/structure/statue/snow/snowman{ anchored = 1; @@ -12259,6 +10950,10 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/cavern1) +"WT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/garage) "WV" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible{ @@ -12294,6 +10989,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"Xf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "Xg" = ( /obj/structure/sign/warning/no_smoking/directional/south, /obj/machinery/light/directional/south, @@ -12327,6 +11028,32 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"Xp" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating/snowed/cavern, +/area/awaymission/snowdin/post/mining_dock) +"Xq" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/layer4{ + dir = 1 + }, +/obj/effect/light_emitter{ + name = "cave light"; + set_cap = 3; + set_luminosity = 6 + }, +/turf/open/floor/plating/snowed/smoothed, +/area/awaymission/snowdin/post/engineering) +"Xr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) "Xt" = ( /obj/structure/rack, /obj/item/storage/box/rubbershot, @@ -12345,6 +11072,36 @@ }, /turf/open/floor/iron/white, /area/awaymission/snowdin/post/minipost) +"Xy" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Mess Hall" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) +"Xz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/dorm) +"XA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/secpost) "XB" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/asteroid/snow{ @@ -12415,6 +11172,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/snowdin/cave) +"XU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/engineering) "XV" = ( /obj/effect/light_emitter{ name = "cave light"; @@ -12444,15 +11206,10 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/showroomfloor, /area/awaymission/snowdin/post/cavern1) -"Yd" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - dir = 5; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, +"Yc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/garage) "Ye" = ( @@ -12469,6 +11226,17 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"Yg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/construction, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron/cafeteria, +/area/awaymission/snowdin/post/messhall) "Yh" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -12509,6 +11277,13 @@ }, /turf/open/floor/iron/white, /area/awaymission/snowdin/post) +"Yp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "Yr" = ( /obj/item/shard, /obj/effect/turf_decal/weather/snow, @@ -12538,6 +11313,17 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plating, /area/awaymission/snowdin/post/cavern1) +"Yw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "Yx" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/iron/grimy, @@ -12588,6 +11374,15 @@ /obj/structure/ore_box, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) +"YQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/door/airlock{ + id_tag = "snowdindormresearch1"; + name = "Jacob Ullman's Private Quarters" + }, +/turf/open/floor/wood, +/area/awaymission/snowdin/post/dorm) "YR" = ( /obj/effect/turf_decal/weather/snow, /obj/structure/closet/crate/preopen{ @@ -12611,12 +11406,25 @@ }, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main/mechbay) +"YY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/messhall) "YZ" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) +"Za" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/kitchen) "Zb" = ( /obj/effect/gibspawner/generic, /turf/open/misc/asteroid/snow{ @@ -12631,29 +11439,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/awaymission/snowdin/post/gateway) -"Zj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 +"Zf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/carpet, +/area/awaymission/snowdin/post/dorm) +"Zg" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, -/area/awaymission/snowdin/post/secpost) -"Zk" = ( -/obj/machinery/light/small/directional/west, -/obj/machinery/door_buttons/access_button{ - idDoor = "snowdin_turbine_interior"; - idSelf = "snowdin_turbine_access"; - name = "Turbine Airlock Control"; - pixel_x = 8; - pixel_y = -24 - }, -/turf/open/floor/engine, -/area/awaymission/snowdin/post/engineering) +/area/awaymission/snowdin/post/garage) "Zn" = ( /obj/structure/flora/tree/pine/style_random, /obj/effect/light_emitter{ @@ -12663,27 +11459,19 @@ }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) -"Zp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{ - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/item/storage/medkit/o2{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/awaymission/snowdin/post) "Zq" = ( /obj/structure/sign/warning/no_smoking/directional/north, /obj/machinery/light/broken/directional/north, /turf/open/floor/engine/cult, /area/awaymission/snowdin/post/cavern2) +"Zr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/showroomfloor, +/area/awaymission/snowdin/post/dorm) "Zu" = ( /obj/machinery/light/small/directional/east, /turf/open/misc/asteroid/snow, @@ -12718,27 +11506,36 @@ /obj/structure/mecha_wreckage/ripley, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) +"ZA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/snowdin_station_sign, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "ZB" = ( /obj/structure/table, /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/awaymission/snowdin/post/custodials) +"ZD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/awaymission/snowdin/post/hydro) "ZE" = ( /obj/structure/fence/corner{ dir = 4 }, /turf/open/misc/asteroid/snow/ice, /area/awaymission/snowdin/cave/cavern) -"ZH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible{ - dir = 4; - piping_layer = 4; - pixel_x = 5; - pixel_y = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/awaymission/snowdin/post/engineering) "ZI" = ( /obj/machinery/button/door/directional/north{ id = "snowdingarage3"; @@ -12754,12 +11551,38 @@ /obj/structure/flora/tree/dead/style_random, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"ZL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post) "ZM" = ( /obj/structure/fence/corner{ dir = 9 }, /turf/open/misc/asteroid/snow, /area/awaymission/snowdin/outside) +"ZN" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Garage" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) +"ZR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/research) "ZT" = ( /obj/structure/chair/stool/directional/west, /turf/open/misc/asteroid/snow{ @@ -12781,6 +11604,13 @@ /obj/item/shard, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/mechbay) +"ZW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/awaymission/snowdin/post/garage) "ZX" = ( /obj/structure/flora/tree/stump, /turf/open/misc/asteroid/snow, @@ -17949,12 +16779,12 @@ Wv cn aS dC -eb -eP -eP -gh -PU -hI +UU +Zf +Zf +Qe +FH +fc aK aK aK @@ -18211,12 +17041,12 @@ aS aV aV aS -hJ +NW aV Wh aS -kv -vy +sq +Fw lU aK Zy @@ -18456,24 +17286,24 @@ ae Zy Zy aK -aQ -bi -bx -bQ -cp -cV +Hn +zx +jS +Cf +Ih +Md cv ec eQ ft eQ eQ -hK +Os eQ je aS -kw -lf +Mx +NO lV aK Zy @@ -18713,23 +17543,23 @@ ae Zy Qj aK -aR +nI Uk Nh aV cq -cW +UZ dD ed -eR -fu -gi -gZ -hL -io +KF +Xf +Wi +Kg +Sn +li jf aV -kx +rC NN lW aK @@ -18975,18 +17805,18 @@ aV aS aV cr -cX +SY dE ee -eS -MP +EY +jN Ov -ha +Ll dE -ip +Op jg aV -ky +uW aV aV aK @@ -19227,23 +18057,23 @@ Zy Cu Zy aK -aT -bi -bx -bR -cs -cY +FK +zx +jS +wv +ot +CB aS aS -eT +AS aS aS -hb +SB aS -iq +yw jf aV -kz +Zr lh lX OT @@ -19484,24 +18314,24 @@ Zy Zy Zy aK -aU +Rc lJ Jb aS cq -cZ +zs aS Nk -eU +tW aV gk -hc +hx aV -ir -jh -jP -kA -Oh +lS +Qy +UF +NO +JZ aV aV aK @@ -19746,19 +18576,19 @@ aV aV aS ct -da +IP aV VE -eV +ww aV os -hd +uJ aS -iq +yw Ls aS -kB -lj +Qo +EJ lX OT aK @@ -19998,20 +18828,20 @@ Zy TI Zy aK -aW -bl -bA -bS -cu -db +SP +Rt +sW +YQ +tT +Fr aV -eh -eW +Sq +Wj aS -gm -he +uv +vO aV -iq +yw jj aS Nt @@ -20255,12 +19085,12 @@ Zy Zy Qj aK -aX +PX XW ND aS cv -Pm +Xz aS aS aS @@ -20268,7 +19098,7 @@ aS aV aS aS -iq +yw jg jQ jR @@ -20517,7 +19347,7 @@ aV aS aS cr -dd +Fd rJ ei eX @@ -20525,7 +19355,7 @@ fw fw fw dK -is +Ne jk jR qD @@ -20769,20 +19599,20 @@ Zy Zy Zy aK -aY -bl -bx -bT -cw -cY +Dc +Rt +jS +VC +VA +CB rJ dK eY -fx -gn +TL +nm gr hM -it +Yw jl jR ZB @@ -21026,25 +19856,25 @@ Zy Zy ZX aK -aZ +yh XW Ut aS cx -de +yN rJ dM eY fy -go +Ex NG hM -it +Yw jm jR jR -lm -mb +HN +lg mG mG nD @@ -21288,20 +20118,20 @@ aV aV aV cx -de +yN dG dM Mg fz -gp +nm hg hN -it +Yw jn nJ jR jR -mc +em lY jR nE @@ -21540,27 +20370,27 @@ Zy Zy Zy aK -ba -bl -bx -bU -cy -df +FJ +Rt +jS +Pa +Tx +Xr dH dK Qh fA -gq -Zp -hO -iu +DF +tO +Iq +FN jm jT kF se -md -xw -QB +Ns +LD +QA nF hZ oB @@ -21797,12 +20627,12 @@ Zy Zy Qj aK -bb +sx RX IC aS cq -de +yN Pf dK Og @@ -21810,13 +20640,13 @@ ab gr gr hM -iv +On jo jU js jU -me -mI +xR +ud nd nF Ob @@ -22059,7 +20889,7 @@ aV aV aS cq -dd +Fd eZ dK Tv @@ -22067,17 +20897,17 @@ bk Yo NB dK -iw -jp -jV -ej -lo -mf -mJ -ne -OZ -of -oD +nZ +sw +Yp +tr +Ff +ZA +nn +cE +kH +Wd +LF OW pI pH @@ -22316,7 +21146,7 @@ bo bE az cz -dg +Ug dK dK dK @@ -22325,16 +21155,16 @@ dM dM dK ix -jq +Nr jm jU -lp +tX mg mK -nf +ZL nH og -oE +Vr pm pK qq @@ -22573,25 +21403,25 @@ bo bE az bo -dh -dL -ej -fd -fd -ej -fd -hP -ej -jr +Rk +wh +tr +Tu +Tu +tr +Tu +rg +tr +fE jW jU -lq +mD mh mL -nf +ZL QZ oh -oF +MD pn pL qq @@ -22830,7 +21660,7 @@ bp bE az br -di +ZR dM ek Wl @@ -22842,13 +21672,13 @@ iy js jX kG -lr +vg mi mM -nf +ZL nF -Zj -oG +XA +MA po pM qq @@ -23084,10 +21914,10 @@ aC aC az LL -bF -bV -cA -dj +tn +nG +xd +Ks dM el ff @@ -23099,10 +21929,10 @@ fh fg fg NX -ls +Tc mj jo -Sr +GD nF oc oH @@ -23341,7 +22171,7 @@ aE aE bd br -bI +GO bW cB bo @@ -23356,10 +22186,10 @@ RO Ox fh kI -lt +uT mk mL -nh +Hr nJ hM oI @@ -23598,7 +22428,7 @@ aH aN aE bs -bH +Uz bX cB bE @@ -23613,10 +22443,10 @@ iA ju jY kJ -lu +Tl ml jU -ni +Ee nK HU oJ @@ -23855,7 +22685,7 @@ aG aO bc br -bI +GO bY cC bE @@ -23866,14 +22696,14 @@ fG gx hm hS -iB -jv -jZ -kK -lv +bK +we +MO +Pw +MS js jW -nj +rj nL dK js @@ -23881,7 +22711,7 @@ pr pP dK LK -NA +Dz qL oa dX @@ -24111,8 +22941,8 @@ aC aC aC az -OX -bJ +TE +UJ Sp bp dk @@ -24122,23 +22952,23 @@ fh fG fG hn -hT -iC +VH +VK ju jY kJ -lw +TQ jo js -nk -nM -QN -oK -ps -pQ -qs -pQ -rm +Wn +rj +hf +BL +Uw +Wn +Cp +Wn +Wn rH dX dX @@ -24384,14 +23214,14 @@ iD jw fh kL -lx +VN mm jX jX jm hM -oL -pt +ko +Cy pR dK qM @@ -24641,7 +23471,7 @@ dP dP dP kM -ly +Xy dP dP nl @@ -24898,7 +23728,7 @@ gA Mj RH kb -lz +YY mn dO Yu @@ -25155,7 +23985,7 @@ gA jy gA kN -lA +sr gA dO iz @@ -25164,10 +23994,10 @@ om oN om oN -qt -qQ -ro -rI +Rw +Id +Dw +Xq dX dX dX @@ -25412,7 +24242,7 @@ iE hp kb gD -lB +JW kb mO no @@ -25421,7 +24251,7 @@ no no no no -ZH +XU SM rp rp @@ -25669,19 +24499,19 @@ iF gD kb kO -lC -mo -mP -np -nR -on -oO -pv -pT -qu +Sv +tU +Yg +Tq +wI +KE +wq +Dy +Ci +XU Sj rp -Zk +SK rp sA rp @@ -25910,10 +24740,10 @@ Zy Zy Zy bf -bw -bN -cc -cI +JA +Kt +Ta +PA cb dP WW @@ -25926,12 +24756,12 @@ iG hs gD kP -lB +JW gA mO nq nS -oo +Jo oP pw pw @@ -26170,7 +25000,7 @@ bf bf bf cd -cJ +Kr dp dp Kd @@ -26178,17 +25008,17 @@ ex fJ gA ht -hW -iH -jz -kc -iH -lD +Pi +dI +VM +wB +dI +Mv hV dO UB nT -op +Pz oP px pU @@ -26427,7 +25257,7 @@ Zy Qj bf ce -cK +Sh dq dQ ex @@ -26440,12 +25270,12 @@ gA hp kd gA -lB +JW ZU dO ST nU -ut +CU oQ bG pV @@ -26684,7 +25514,7 @@ Zy Zy bf NL -cL +bz dr cd cd @@ -26697,7 +25527,7 @@ hv hv dO dP -lE +OY mq dO nt @@ -26941,7 +25771,7 @@ Zy Zy bf SE -jd +sL ds dR ey @@ -26954,7 +25784,7 @@ iI gJ WE kQ -lF +Ti mr mQ nu @@ -27198,20 +26028,20 @@ Zy Zy bf ch -cN -dt -LO -ez -fj -fQ -gF -fQ -hY -hY -fQ -hY -hY -lG +Mf +Pe +eM +Np +Jm +Jg +ZD +Jg +Qa +Qa +Jg +Qa +Qa +LH iK mt nv @@ -27455,7 +26285,7 @@ Zy Zy bf ci -cO +Za du dT MK @@ -27468,7 +26298,7 @@ iJ gI gH kR -lH +Jf ms mt nw @@ -27712,7 +26542,7 @@ Zy Qj bf cj -cP +LP dv ch eB @@ -27725,7 +26555,7 @@ gH gJ hz iJ -lI +pi mt iK nx @@ -27969,7 +26799,7 @@ Zy Zy bf cj -cQ +Me dw dU dr @@ -27982,7 +26812,7 @@ gJ gG kg kS -lH +Jf kR iJ Qv @@ -28226,7 +27056,7 @@ Zy Cu bf ck -cR +wJ ds dV eC @@ -28239,7 +27069,7 @@ iK gH hz hy -lI +pi mu mR mu @@ -28482,8 +27312,8 @@ Zy Zy Zy bf -cl -cS +UH +Rq dr dW eD @@ -28496,7 +27326,7 @@ iJ gI hz gI -lK +Cg ms hz nA @@ -28745,15 +27575,15 @@ bf bf bf bf -fV -gL -hA -ib -iL -jB -iL -iL -lL +MF +Rp +PF +Cg +Ld +bD +Ld +Ld +Cg mv iK nA @@ -30291,12 +29121,12 @@ fX gO ic ic -iN -jE -kh -kU -lM -Yd +Ul +yn +Nc +ZW +ER +Se mS Yn dX @@ -30548,13 +29378,13 @@ fY gP hD id -Us +VV iW -ki +Yc kV lN -my -mT +WT +gR Yn dX dX @@ -30805,9 +29635,9 @@ fY Ux Oe ie -iP +SD jF -kj +Kn kW id ld @@ -31062,9 +29892,9 @@ fY Rj Oe if -iQ +MQ jG -kk +Zg kX ie mz @@ -31319,7 +30149,7 @@ fY gS hE id -iR +wn jH ie kY @@ -31576,11 +30406,11 @@ fY fY fY fY -iS +Mk jI id -kZ -lO +uj +Bt mB Ua fY @@ -31833,11 +30663,11 @@ Zy Zy dX fY -iT -jJ +Jr +iX ie RZ -lP +Hv mC mX fY @@ -32090,11 +30920,11 @@ eE eE Zy fY -iU +ZN jH id id -lQ +Bn id ie fY @@ -32347,11 +31177,11 @@ fZ eE Zy fY -iV -jK -jK -lb -lR +qO +Ow +Ow +mZ +DQ hE Wt nB @@ -58367,9 +57197,9 @@ tY tY uF PI -vt -vA -vG +Sz +ag +QL eJ eJ eJ @@ -59531,7 +58361,7 @@ WN WN XM He -Qn +Vn SO Hf Hf @@ -59788,7 +58618,7 @@ WN tQ Gk Gk -ho +sv Gk NJ zh @@ -60045,7 +58875,7 @@ WN WN WN WN -zv +eg Gk Gk Gk @@ -62267,7 +61097,7 @@ eJ eJ eJ eL -xV +eJ fr fr fr @@ -64741,9 +63571,9 @@ eJ eJ eJ WN -Up -qF -rd +Qg +dc +Gg rz Yz ox @@ -65100,7 +63930,7 @@ yC yS zm zw -zH +Ny zR qi As @@ -65357,7 +64187,7 @@ yC yT wE xW -zI +Nl xW VO At @@ -65614,7 +64444,7 @@ yE yQ wE eJ -zJ +Xp zT yi zk diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 7db5cfd65e6b6..ccb04453e8f28 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -17,13 +17,6 @@ "ag" = ( /turf/closed/wall/mineral/titanium, /area/awaymission/undergroundoutpost45/central) -"ah" = ( -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "ai" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -449,14 +442,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) -"ci" = ( -/obj/effect/decal/cleanable/blood/gibs/limb, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "cm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -555,6 +540,19 @@ }, /turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) +"cM" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/awaymission/undergroundoutpost45/gateway) "cS" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/structure/window/spawner/directional/west, @@ -607,14 +605,6 @@ /obj/item/poster/random_contraband, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/central) -"dh" = ( -/obj/structure/table, -/obj/item/stack/package_wrap, -/obj/item/reagent_containers/condiment/enzyme, -/turf/open/floor/iron/cafeteria{ - dir = 5 - }, -/area/awaymission/undergroundoutpost45/crew_quarters) "dm" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, @@ -623,6 +613,12 @@ /obj/machinery/light/blacklight/directional/north, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) +"do" = ( +/obj/item/kirbyplants, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/central) "du" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -890,13 +886,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) -"ee" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/iron/cafeteria{ - dir = 5 - }, -/area/awaymission/undergroundoutpost45/research) "ef" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Checkpoint Maintenance" @@ -1034,6 +1023,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) +"eG" = ( +/obj/structure/alien/resin/wall, +/obj/structure/alien/weeds, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "eH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -1219,6 +1213,10 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) +"fs" = ( +/obj/effect/turf_decal/stripes/asteroid/line, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "ft" = ( /obj/structure/closet/crate/hydroponics, /obj/item/shovel/spade, @@ -1353,6 +1351,12 @@ /obj/item/bedsheet, /turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) +"fT" = ( +/obj/item/kirbyplants, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/central) "fU" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/camera/directional/south{ @@ -1706,6 +1710,14 @@ dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) +"hq" = ( +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/reagent_containers/condiment/enzyme, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/awaymission/undergroundoutpost45/crew_quarters) "hr" = ( /obj/structure/table, /turf/open/floor/iron/cafeteria{ @@ -2147,14 +2159,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) -"iY" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, -/area/awaymission/undergroundoutpost45/research) "iZ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -2442,6 +2446,20 @@ dir = 5 }, /area/awaymission/undergroundoutpost45/research) +"kg" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) +"kh" = ( +/obj/item/kirbyplants, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/white, +/area/awaymission/undergroundoutpost45/research) "kj" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -2604,6 +2622,13 @@ }, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) +"kN" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/engineering) "kO" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -2964,6 +2989,15 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) +"lV" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/underground_outpost/research/directional/south, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/awaymission/undergroundoutpost45/research) "lW" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -2973,16 +3007,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"lX" = ( -/obj/structure/closet/crate, -/obj/item/stack/sheet/mineral/plasma{ - amount = 26 - }, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/awaymission/undergroundoutpost45/engineering) "lY" = ( /obj/machinery/light/small/directional/north, /obj/machinery/camera/directional/north{ @@ -2998,19 +3022,6 @@ }, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) -"ma" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/awaymission/undergroundoutpost45/gateway) "mb" = ( /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) @@ -3252,6 +3263,13 @@ dir = 5 }, /area/awaymission/undergroundoutpost45/research) +"mQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/kirbyplants, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/awaymission/undergroundoutpost45/research) "mR" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -3993,6 +4011,14 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/research) +"pl" = ( +/obj/item/kirbyplants, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/crew_quarters) "pm" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -4195,6 +4221,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/engineering) +"qd" = ( +/obj/machinery/meter{ + name = "Mixed Air Tank Out" + }, +/obj/machinery/atmospherics/pipe/layer_manifold/supply, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/awaymission/undergroundoutpost45/engineering) +"qe" = ( +/obj/machinery/meter{ + name = "Mixed Air Tank In" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/awaymission/undergroundoutpost45/engineering) "qh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ dir = 4; @@ -4300,6 +4342,17 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"qI" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/closet/secure_closet/engineering_personal{ + req_access = list("away_maintenance") + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/engineering) "qJ" = ( /obj/machinery/light/blacklight/directional/north, /obj/machinery/camera/directional/north{ @@ -4468,6 +4521,13 @@ "rj" = ( /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"rk" = ( +/obj/item/kirbyplants, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/engineering) "rl" = ( /obj/machinery/firealarm/directional/north, /obj/structure/tank_dispenser{ @@ -4778,6 +4838,17 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"sc" = ( +/obj/machinery/computer/security{ + dir = 4; + network = list("uo45") + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/underground_outpost/research/directional/west, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/research) "sd" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -4850,6 +4921,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"sq" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/awaymission/undergroundoutpost45/engineering) "sr" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored{ chamber_id = "uo45mix"; @@ -4972,14 +5049,6 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) -"sP" = ( -/obj/machinery/meter{ - name = "Mixed Air Tank Out" - }, -/obj/machinery/atmospherics/pipe/layer_manifold/supply, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/awaymission/undergroundoutpost45/engineering) "sQ" = ( /obj/structure/chair/office{ dir = 8 @@ -5021,6 +5090,14 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"td" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/layer_manifold/orange{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/awaymission/undergroundoutpost45/engineering) "te" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ chamber_id = "uo45mix"; @@ -5043,6 +5120,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) +"ti" = ( +/obj/structure/alien/weeds, +/obj/structure/glowshroom/single, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "tj" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -5099,6 +5181,20 @@ dir = 1 }, /area/awaymission/undergroundoutpost45/engineering) +"tw" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/awaymission/undergroundoutpost45/engineering) "tx" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -5160,6 +5256,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/green, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"tK" = ( +/obj/structure/alien/weeds, +/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/mob_spawn/corpse/human, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "tL" = ( /obj/machinery/door/airlock/engineering{ name = "Engineering Maintenance" @@ -5435,6 +5537,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, /area/awaymission/undergroundoutpost45/engineering) +"uI" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/layer_manifold/orange, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/awaymission/undergroundoutpost45/engineering) +"uJ" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/awaymission/undergroundoutpost45/engineering) "uK" = ( /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, @@ -5685,6 +5799,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"vB" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 10 + }, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "vC" = ( /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, @@ -5791,13 +5911,6 @@ dir = 8 }, /area/awaymission/undergroundoutpost45/engineering) -"vW" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/engineering) "vY" = ( /obj/structure/closet/emcloset, /obj/item/clothing/mask/breath, @@ -5828,12 +5941,29 @@ /obj/item/bedsheet, /turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/mining) +"we" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/mineral/plasma{ + amount = 26 + }, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/awaymission/undergroundoutpost45/engineering) "wf" = ( /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/iron{ dir = 8 }, /area/awaymission/undergroundoutpost45/mining) +"wg" = ( +/obj/machinery/light/small/directional/north, +/obj/item/kirbyplants, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/mining) "wl" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -5896,12 +6026,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) -"wF" = ( -/obj/item/kirbyplants, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/central) "wK" = ( /obj/machinery/door/airlock{ name = "Private Restroom" @@ -5969,9 +6093,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"xe" = ( +"xd" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/engineering) @@ -6033,17 +6157,6 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) -"xt" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/closet/secure_closet/engineering_personal{ - req_access = list("away_maintenance") - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/engineering) "xu" = ( /obj/machinery/suit_storage_unit/mining, /obj/effect/decal/cleanable/dirt, @@ -6283,6 +6396,10 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) +"yr" = ( +/obj/structure/glowshroom/single, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "yN" = ( /obj/structure/chair/office/light{ dir = 1; @@ -6300,14 +6417,11 @@ }, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) -"zb" = ( +"yX" = ( /obj/structure/alien/weeds, -/obj/structure/alien/resin/wall, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/obj/structure/glowshroom/single, +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "ze" = ( /obj/structure/table, @@ -6327,6 +6441,10 @@ }, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) +"zg" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "zn" = ( /obj/machinery/light/small/directional/east, /obj/machinery/airalarm/directional/east, @@ -6336,13 +6454,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) -"zq" = ( -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "zr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -6374,22 +6485,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) -"zK" = ( +"zT" = ( /obj/structure/alien/weeds, -/obj/structure/bed/nest, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) -"zO" = ( -/obj/effect/decal/cleanable/blood/gibs/up, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/obj/structure/alien/resin/wall, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "zX" = ( /obj/structure/closet/secure_closet{ @@ -6493,14 +6592,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/mining) -"BB" = ( -/obj/item/kirbyplants, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/crew_quarters) "BI" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/all_access, @@ -6515,16 +6606,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"BL" = ( -/obj/structure/alien/weeds, -/obj/effect/decal/cleanable/blood/gibs/down, -/obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "BN" = ( /obj/machinery/computer/monitor{ dir = 1; @@ -6534,24 +6615,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) -"BQ" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) -"Cd" = ( -/obj/structure/alien/weeds, -/obj/structure/glowshroom/single, -/obj/effect/decal/cleanable/blood/gibs/down, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "Cj" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/north, @@ -6600,6 +6663,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"CM" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/awaymission/undergroundoutpost45/research) "CT" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -6609,6 +6680,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"CW" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/awaymission/undergroundoutpost45/research) "De" = ( /obj/machinery/computer/monitor{ name = "primary power monitoring console" @@ -6636,13 +6715,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/gateway) -"Du" = ( +"Dw" = ( /obj/machinery/light/small/directional/north, -/obj/item/kirbyplants, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/mining) +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "Dz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6665,16 +6741,6 @@ }, /turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) -"DJ" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 6 - }, -/turf/open/floor/plating{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "DL" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -6751,6 +6817,13 @@ dir = 5 }, /area/awaymission/undergroundoutpost45/crew_quarters) +"ET" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/awaymission/undergroundoutpost45/research) "Fd" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command/glass{ @@ -6768,6 +6841,10 @@ /obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) +"Fx" = ( +/obj/effect/decal/cleanable/blood/gibs/limb, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "FA" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/all_access, @@ -6779,28 +6856,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"FB" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/underground_outpost/research/directional/south, -/turf/open/floor/iron/cafeteria{ - dir = 5 - }, -/area/awaymission/undergroundoutpost45/research) -"FP" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/layer_manifold/orange{ - dir = 4 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/awaymission/undergroundoutpost45/engineering) "FS" = ( /obj/machinery/biogenerator, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) +"FU" = ( +/obj/structure/alien/weeds, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "Gc" = ( /obj/machinery/light/blacklight/directional/west, /obj/machinery/airalarm/directional/west, @@ -6821,14 +6886,6 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) -"Gn" = ( -/obj/structure/alien/weeds, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "Gp" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -6844,11 +6901,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) +"GB" = ( +/obj/structure/closet/crate, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "GI" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"GV" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) +"Hb" = ( +/obj/structure/ore_box, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "Hp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6858,13 +6927,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"HL" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/engineering) "HM" = ( /obj/structure/bed{ dir = 4 @@ -6883,15 +6945,6 @@ }, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) -"HW" = ( -/obj/structure/alien/weeds, -/obj/structure/glowshroom/single, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "Ic" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -6914,6 +6967,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) +"Im" = ( +/obj/structure/alien/weeds, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "Iw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/purple{ @@ -6938,14 +6995,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) -"IT" = ( +"IQ" = ( /obj/structure/alien/weeds, -/obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "IV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6962,6 +7015,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) +"Jc" = ( +/obj/machinery/light/small/directional/east, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "Ji" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/all_access, @@ -7029,21 +7086,18 @@ dir = 1 }, /area/awaymission/undergroundoutpost45/research) +"Ks" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 6 + }, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "KE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/circuit/telecomms/server, /area/awaymission/undergroundoutpost45/research) -"KN" = ( -/obj/structure/alien/weeds, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "KO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ @@ -7060,14 +7114,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"KU" = ( -/obj/structure/closet/crate, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "KW" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/all_access, @@ -7086,42 +7132,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) -"Lb" = ( -/obj/structure/alien/weeds, -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) -"Lk" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) -"Lo" = ( -/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ - dir = 4 - }, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) -"Lz" = ( -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 351.9 - }, -/area/awaymission/undergroundoutpost45/caves) "LT" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -7155,12 +7165,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) -"Mi" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/awaymission/undergroundoutpost45/engineering) "Mo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -7174,21 +7178,10 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"Mx" = ( -/obj/machinery/light/small/directional/east, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) -"MC" = ( -/obj/machinery/light/small/directional/west, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, +"ME" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/mob_spawn/corpse/human, +/turf/open/misc/asteroid/plasma, /area/awaymission/undergroundoutpost45/caves) "MJ" = ( /obj/machinery/light/blacklight/directional/west, @@ -7196,6 +7189,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) +"MS" = ( +/obj/structure/alien/resin/membrane, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "Nd" = ( /obj/machinery/light/small/directional/west, /obj/machinery/airalarm/directional/west, @@ -7276,12 +7273,10 @@ }, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) -"Oo" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/layer_manifold/orange, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/awaymission/undergroundoutpost45/engineering) +"Om" = ( +/obj/machinery/light/small/directional/west, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "Oq" = ( /obj/machinery/light/small/directional/south, /obj/structure/bed{ @@ -7309,14 +7304,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) -"OF" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/stripes/asteroid/line, -/turf/open/floor/plating{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "OL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, @@ -7340,20 +7327,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) -"Pd" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ - dir = 1 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/awaymission/undergroundoutpost45/engineering) "Pi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general, /turf/open/floor/plating, @@ -7365,17 +7338,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) +"PA" = ( +/obj/structure/alien/weeds, +/obj/effect/decal/cleanable/blood/gibs/down, +/obj/effect/mob_spawn/corpse/human, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "PB" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/central) -"Qa" = ( -/obj/item/kirbyplants, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/central) "Qb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7424,19 +7397,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/central) -"Qu" = ( -/obj/structure/disposaloutlet{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "Qw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7465,6 +7425,11 @@ }, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) +"QV" = ( +/obj/structure/alien/weeds, +/obj/effect/mob_spawn/corpse/human, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "QX" = ( /obj/structure/table, /obj/item/storage/medkit/regular, @@ -7478,6 +7443,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/central) +"Rl" = ( +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 4 + }, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "Rn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7494,14 +7465,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/gateway) -"RA" = ( -/obj/machinery/light/small/directional/south, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "RC" = ( /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/all_access, @@ -7571,6 +7534,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) +"Sq" = ( +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "Su" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -7587,17 +7553,6 @@ dir = 5 }, /area/awaymission/undergroundoutpost45/research) -"SV" = ( -/obj/machinery/computer/security{ - dir = 4; - network = list("uo45") - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/underground_outpost/research/directional/west, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/research) "SZ" = ( /obj/machinery/light/small/directional/west, /obj/structure/sign/warning/secure_area/directional/west, @@ -7616,14 +7571,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"Tr" = ( -/obj/structure/alien/resin/membrane, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "Tu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -7632,6 +7579,11 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"Ty" = ( +/obj/structure/alien/weeds, +/obj/structure/bed/nest, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "TC" = ( /obj/structure/table, /obj/machinery/reagentgrinder, @@ -7644,14 +7596,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"TO" = ( -/obj/machinery/meter{ - name = "Mixed Air Tank In" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/awaymission/undergroundoutpost45/engineering) "TP" = ( /obj/machinery/light/small/directional/north, /obj/machinery/airalarm/directional/north, @@ -7661,13 +7605,6 @@ }, /turf/open/floor/carpet, /area/awaymission/undergroundoutpost45/crew_quarters) -"TV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants, -/turf/open/floor/iron/cafeteria{ - dir = 5 - }, -/area/awaymission/undergroundoutpost45/research) "Ud" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7687,31 +7624,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) -"UE" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/awaymission/undergroundoutpost45/engineering) -"UH" = ( -/obj/structure/alien/weeds, -/obj/effect/decal/cleanable/blood/gibs/down, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) -"UM" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 10 - }, -/turf/open/floor/plating{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "UU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7736,6 +7648,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) +"VI" = ( +/obj/structure/alien/weeds, +/obj/structure/bed/nest, +/obj/effect/mob_spawn/corpse/human, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "VM" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/all_access, @@ -7771,15 +7689,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/research) -"Wd" = ( -/obj/structure/alien/resin/wall, -/obj/structure/alien/weeds, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "Wk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7801,24 +7710,11 @@ }, /turf/open/floor/iron/dark, /area/awaymission/undergroundoutpost45/crew_quarters) -"Ws" = ( -/obj/item/kirbyplants, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/white, -/area/awaymission/undergroundoutpost45/research) "WD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) -"WE" = ( -/obj/structure/glowshroom/single, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 351.9 - }, -/area/awaymission/undergroundoutpost45/caves) "WG" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -7879,14 +7775,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/awaymission/undergroundoutpost45/research) -"XF" = ( -/obj/structure/ore_box, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "XJ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -7901,28 +7789,10 @@ /obj/item/folder/red, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) -"XQ" = ( -/obj/structure/glowshroom/single, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "XU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/gateway) -"Yb" = ( -/obj/structure/alien/weeds, -/obj/structure/bed/nest, -/obj/effect/mob_spawn/corpse/human, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "Yf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7957,6 +7827,10 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/crew_quarters) +"YL" = ( +/obj/machinery/light/small/directional/south, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "YM" = ( /obj/machinery/conveyor{ id = "UO45_mining" @@ -7967,6 +7841,11 @@ }, /turf/open/floor/plating, /area/awaymission/undergroundoutpost45/mining) +"YR" = ( +/obj/structure/alien/weeds, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/misc/asteroid/plasma, +/area/awaymission/undergroundoutpost45/caves) "YV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -7977,31 +7856,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/awaymission/undergroundoutpost45/engineering) -"Zf" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/awaymission/undergroundoutpost45/research) -"Zs" = ( -/obj/machinery/light/small/directional/north, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) -"ZD" = ( -/obj/structure/alien/weeds, -/obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/misc/asteroid{ - initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"; - name = "Cave Floor"; - temperature = 363.9 - }, -/area/awaymission/undergroundoutpost45/caves) "ZH" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/all_access, @@ -26468,8 +26322,8 @@ ad ad ad ad -Yb -ZD +VI +YR ad ad ad @@ -26725,9 +26579,9 @@ ad ad ad ad -zK -KN -Gn +Ty +FU +Im ad ad ad @@ -26982,10 +26836,10 @@ ad ad ad ad -HW -Gn -zq -Tr +ti +Im +Sq +MS ad ad ad @@ -27240,9 +27094,9 @@ ad ad ad ad -Gn -zq -ci +Im +Sq +Fx ad ad ad @@ -27442,7 +27296,7 @@ jG gw ky DB -ma +cM mB gK ad @@ -27498,12 +27352,12 @@ ad ad ad ad -zq -zq -zO +Sq +Sq +GV ad -UH -Yb +IQ +VI ad ad ad @@ -27756,11 +27610,11 @@ ad ad ad ad -Lk -zq -KN -ZD -BL +ME +Sq +FU +YR +PA ad ad ad @@ -28007,17 +27861,17 @@ ad ad ad ad -Yb -ZD -zb -Wd +VI +YR +zT +eG ad ad ad -zq -Gn -zq -Tr +Sq +Im +Sq +MS ad ad ad @@ -28263,17 +28117,17 @@ ad ad ad ad -Yb -zK -Gn -IT -zb +VI +Ty +Im +QV +zT ad ad ad -XQ -zq -BQ +yr +Sq +zg ad ad ad @@ -28521,16 +28375,16 @@ ad ad ad ad -Cd -zq -BQ -ZD +yX +Sq +zg +YR ad ad -Tr -zq -zq -Tr +MS +Sq +Sq +MS ad ad ad @@ -28730,7 +28584,7 @@ lt XU mG gw -zq +Sq ad ad ad @@ -28779,21 +28633,21 @@ ad ad ad ad -zq -zq -zq -Gn +Sq +Sq +Sq +Im ad -Lb -zq -zq +tK +Sq +Sq ad ad ad ad ad -Yb -Gn +VI +Im ad ad ad @@ -28987,8 +28841,8 @@ Qb mc mH gw -zq -zq +Sq +Sq ad ad ad @@ -29037,20 +28891,20 @@ ad ad ad ad -zO -Gn -Gn -Gn -Gn -zq -zq +GV +Im +Im +Im +Im +Sq +Sq ad ad ad ad -IT -ZD -UH +QV +YR +IQ ad ad ad @@ -29244,8 +29098,8 @@ kl gK gw gv -zq -XQ +Sq +yr ad ad ad @@ -29296,18 +29150,18 @@ ad ad ad ad -Gn -zq -zq -zq -zq -Lk -Tr -zO -XQ -BQ -zq -zb +Im +Sq +Sq +Sq +Sq +ME +MS +GV +yr +zg +Sq +zT ad ad ad @@ -29500,10 +29354,10 @@ SZ lv md gU -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad ad @@ -29553,18 +29407,18 @@ ad ad ad ad -Tr -zq -zq -zq -Gn -zq -zq -zq -zq -zq -zb -Wd +MS +Sq +Sq +Sq +Im +Sq +Sq +Sq +Sq +Sq +zT +eG ad ad ad @@ -29757,10 +29611,10 @@ Dt lv me gU -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad ad @@ -29810,15 +29664,15 @@ ad ad ad ad -IT -BQ -zq -Gn -Gn -ZD -zq -Gn -Gn +QV +zg +Sq +Im +Im +YR +Sq +Im +Im ad ad ad @@ -30014,10 +29868,10 @@ kF lx gw gv -Zs -zq -zq -zq +Dw +Sq +Sq +Sq ad ad ad @@ -30067,15 +29921,15 @@ ad ad ad ad -UH -Gn -zq -Gn +IQ +Im +Sq +Im ad ad -KN -Yb -zK +FU +VI +Ty ad ad ad @@ -30263,18 +30117,18 @@ gL gv gv gv -XQ -zq -zq +yr +Sq +Sq gv kG ly gw -zq -zq -zq -zq -XQ +Sq +Sq +Sq +Sq +yr ad ad ad @@ -30325,8 +30179,8 @@ ad ad ad ad -Gn -zq +Im +Sq ad ad ad @@ -30518,20 +30372,20 @@ ad ad ad ad -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq gU kH ly gU -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -30572,8 +30426,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -30583,7 +30437,7 @@ ad ad ad ad -Tr +MS ad ad ad @@ -30774,22 +30628,22 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq gU kI ly gU -zq -zq -zq -zq -zq -XQ +Sq +Sq +Sq +Sq +Sq +yr ad ad ad @@ -30830,8 +30684,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -30840,7 +30694,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -31031,23 +30885,23 @@ ad ad ad ad -XQ -zq -XQ -zq -zq -zq +yr +Sq +yr +Sq +Sq +Sq gU kH ly gU -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -31088,16 +30942,16 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -31289,22 +31143,22 @@ ad ad ad ad -zq -zq -zq -zq -RA +Sq +Sq +Sq +Sq +YL gw yR lA gw -Zs -zq -zq -zq -zq -zq -zq +Dw +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -31346,14 +31200,14 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad ad ad -zq +Sq ad ad ad @@ -31546,22 +31400,22 @@ ad ad ad ad -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq gU du ly gU -zq -zq -XQ -zq -zq -XQ -zq +Sq +Sq +yr +Sq +Sq +yr +Sq ad ad ad @@ -31603,14 +31457,14 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad ad ad -zq +Sq ad ad ad @@ -31802,23 +31656,23 @@ ad ad ad ad -zq -XQ -zq -zq -zq -zq +Sq +yr +Sq +Sq +Sq +Sq gU du lB gU -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -31861,13 +31715,13 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -32059,22 +31913,22 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq gU Iw ly gU -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -32119,11 +31973,11 @@ ad ad ad ad -zq -zq +Sq +Sq ad -zq -zq +Sq +Sq ad ad ad @@ -32317,20 +32171,20 @@ ad ad ad ad -zq -zq -zq -zq -XQ +Sq +Sq +Sq +Sq +yr gw kH lC gv -zq -XQ -zq -zq -XQ +Sq +yr +Sq +Sq +yr ad ad ad @@ -32377,9 +32231,9 @@ ad ad ad ad -zq +Sq ad -zq +Sq ad ad ad @@ -32575,16 +32429,16 @@ ad ad ad ad -zq -XQ -zq +Sq +yr +Sq gz gw kL lD gv hc -zq +Sq ad gz hc @@ -32634,9 +32488,9 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -32836,7 +32690,7 @@ gz hc gz gz -Ws +kh ha lE mf @@ -32891,8 +32745,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -33090,7 +32944,7 @@ gX hB ig ze -iY +CM jr jO mU @@ -33148,8 +33002,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -33405,7 +33259,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -33662,7 +33516,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -33918,8 +33772,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -34119,8 +33973,8 @@ hF YF iC hc -zq -zq +Sq +Sq gz mU lJ @@ -34174,8 +34028,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -34376,8 +34230,8 @@ WT ik iD hc -zq -zq +Sq +Sq hH Jo lM @@ -34386,7 +34240,7 @@ mP nn nQ oz -FB +lV gy ql qT @@ -34431,8 +34285,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -34441,8 +34295,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -34633,15 +34487,15 @@ hH hH hc gz -zq -zq +Sq +Sq hH Jo lL mj mP mP -ee +ET oA pg gy @@ -34688,18 +34542,18 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad ad ad -zq -XQ -zq -zq -zq +Sq +yr +Sq +Sq +Sq ad ad ad @@ -34884,19 +34738,19 @@ ad ad ad ad -zq -MC -zq -zq -zq -zq -zq -zq +Sq +Om +Sq +Sq +Sq +Sq +Sq +Sq hH Jo ON mj -TV +mQ mP nS oB @@ -34945,18 +34799,18 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad ad ad -zq -zq -zq -zq -XQ +Sq +Sq +Sq +Sq +yr ad ad ad @@ -35140,15 +34994,15 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -RA +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +YL gz IX lN @@ -35202,18 +35056,18 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad ad -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -35397,21 +35251,21 @@ ad ad ad ad -zq -zq -zq -XQ -zq -zq -zq -zq -zq +Sq +Sq +Sq +yr +Sq +Sq +Sq +Sq +Sq hH Mg lM hH mR -SV +sc RC oC ph @@ -35460,17 +35314,17 @@ ad ad ad ad -zq +Sq ad ad ad ad -XQ -zq -zq -zq -zq -zq +yr +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -35654,15 +35508,15 @@ ad ad ad ad -XQ -zq -zq -zq -zq -zq -zq -zq -zq +yr +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq hH kU lM @@ -35717,17 +35571,17 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -35910,22 +35764,22 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -XQ -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +yr +Sq hH kV lM hH mT -Zf +CW nV WG lu @@ -35937,7 +35791,7 @@ sw gz tR gz -zq +Sq ad ad ad @@ -35975,15 +35829,15 @@ ad ad ad ad -zq +Sq ad ad ad ad -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad ad @@ -36167,15 +36021,15 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -XQ -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +yr +Sq +Sq gz gz kW @@ -36194,9 +36048,9 @@ sx gz tP hc -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -36232,15 +36086,15 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad -XQ -zq -zq -XQ +yr +Sq +Sq +yr ad ad ad @@ -36425,14 +36279,14 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq gz gn kV @@ -36453,8 +36307,8 @@ tS hc hc hc -Zs -zq +Dw +Sq ad ad ad @@ -36490,14 +36344,14 @@ ad ad ad ad -zq +Sq ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -36682,14 +36536,14 @@ aC aC ad ad -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq gz iL kX @@ -36710,8 +36564,8 @@ tT gy uN hH -ah -zq +Sq +Sq ad ad ad @@ -36744,18 +36598,18 @@ ad ad ad ad -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -36939,13 +36793,13 @@ fQ aC ad ad -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad gz gz @@ -36967,9 +36821,9 @@ tP gc uO vk -ah -zq -zq +Sq +Sq +Sq ad ad ad @@ -37000,19 +36854,19 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad -zq -zq -XQ +Sq +Sq +yr ad ad ad @@ -37196,13 +37050,13 @@ ZM aC ad ad -zq -zq -zq -zq -zq -zq -XQ +Sq +Sq +Sq +Sq +Sq +Sq +yr ad ad gz @@ -37224,10 +37078,10 @@ tV gy uP hH -ah -zq -zq -zq +Sq +Sq +Sq +Sq ad ad ad @@ -37256,21 +37110,21 @@ ad ad ad ad -zq -zq -zq -XQ +Sq +Sq +Sq +yr ad ad ad ad -zq +Sq ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -37452,15 +37306,15 @@ fC fS aC ad -XQ -zq -zq -zq -zq -zq -zq -zq -zq +yr +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad gy NR @@ -37481,10 +37335,10 @@ gz hc hc hc -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad ad @@ -37511,23 +37365,23 @@ ad ad ad ad -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad ad ad ad ad -zq -zq +Sq +Sq ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -37709,15 +37563,15 @@ fD aC aC ad -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad gx la @@ -37726,23 +37580,23 @@ Xq gy tP gz -zq -zq -XQ -zq -zq -zq +Sq +Sq +yr +Sq +Sq +Sq ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -37767,10 +37621,10 @@ ad ad ad ad -XQ -zq -zq -XQ +yr +Sq +Sq +yr ad ad ad @@ -37779,12 +37633,12 @@ ad ad ad ad -zq +Sq ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -37963,18 +37817,18 @@ LZ eZ MJ IV -wF +fT aC ad ad -zq -zq -Mx -zq -zq -zq -zq -XQ +Sq +Sq +Jc +Sq +Sq +Sq +Sq +yr ad gy lb @@ -37983,23 +37837,23 @@ mn gy tP hc -zq -zq -zq -zq -zq -zq -XQ -zq -zq -zq -zq -zq -zq -zq -zq -XQ -zq +Sq +Sq +Sq +Sq +Sq +Sq +yr +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +yr +Sq ad ad ad @@ -38036,12 +37890,12 @@ ad ad ad ad -zq +Sq ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -38243,19 +38097,19 @@ hc gr gr gr -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -38293,17 +38147,17 @@ ad ad ad ad -zq -zq +Sq +Sq ad -zq -zq -zq +Sq +Sq +Sq ad ad ad ad -zq +Sq ad ad ad @@ -38498,21 +38352,21 @@ mV nw JD nD -BB +pl gr gr -zq -XQ -zq -zq -zq -XQ -zq -zq -zq -zq -zq -XQ +Sq +yr +Sq +Sq +Sq +yr +Sq +Sq +Sq +Sq +Sq +yr ad ad ad @@ -38551,16 +38405,16 @@ ad ad ad ad -zq +Sq ad -zq +Sq ad -zq +Sq ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -38758,18 +38612,18 @@ gs pm pN gr -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad -zq +Sq ad ad ad @@ -38808,15 +38662,15 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad -zq +Sq ad ad -zq -zq +Sq +Sq ad ad ad @@ -39015,18 +38869,18 @@ gs gs pO gr -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad -zq +Sq ad ad ad @@ -39069,10 +38923,10 @@ ad ad ad ad -zq +Sq ad ad -zq +Sq ad ad ad @@ -39250,15 +39104,15 @@ fq Ai fV ae -zq -zq -zq -zq -MC -zq -zq -zq -XQ +Sq +Sq +Sq +Sq +Om +Sq +Sq +Sq +yr gg gg VM @@ -39272,18 +39126,18 @@ oG pn pP gr -zq -zq -XQ -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +yr +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -39326,10 +39180,10 @@ ad ad ad ad -zq +Sq ad -zq -zq +Sq +Sq ad ad ad @@ -39507,16 +39361,16 @@ fq Ai aF aP -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq fK Ro lf @@ -39531,16 +39385,16 @@ fN fK gg gg -zq -zq -zq -zq -XQ -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +yr +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -39583,9 +39437,9 @@ ad ad ad ad -zq +Sq ad -zq +Sq ad ad ad @@ -39764,16 +39618,16 @@ fr Ai fW aP -zq -zq -zq -XQ -zq -zq -XQ -zq -zq -zq +Sq +Sq +Sq +yr +Sq +Sq +yr +Sq +Sq +Sq gr KT gs @@ -39788,16 +39642,16 @@ pQ qs qY gg -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -39835,14 +39689,14 @@ ad ad ad ad -zq +Sq ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -40021,16 +39875,16 @@ PB fH fX aP -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq gr Ro gs @@ -40045,17 +39899,17 @@ pR Ie mt gg -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad ad -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad ad @@ -40091,14 +39945,14 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -40267,7 +40121,7 @@ aD cB cL aC -Qa +do dB dX dB @@ -40278,16 +40132,16 @@ HR fI fY an -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq gg Ro lg @@ -40303,16 +40157,16 @@ fO fO gg ad -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -40354,8 +40208,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -40535,10 +40389,10 @@ ae ae an an -zq -zq -zq -XQ +Sq +Sq +Sq +yr gg gr gr @@ -40560,23 +40414,23 @@ qu mu fO ad -zq -zq -zq -zq -XQ -zq -zq -zq -zq -zq -zq -zq -zq -XQ -zq -zq -zq +Sq +Sq +Sq +Sq +yr +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +yr +Sq +Sq +Sq ad ad ad @@ -40611,8 +40465,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -40791,10 +40645,10 @@ hZ ae ad ad -XQ -zq -zq -zq +yr +Sq +Sq +Sq gg gg hI @@ -40818,24 +40672,24 @@ qZ fN ad ad -XQ -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -XQ -zq -zq -zq +yr +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +yr +Sq +Sq +Sq ad ad ad @@ -40863,12 +40717,12 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -41046,12 +40900,12 @@ aS eR fe ae -zq -zq -zq -zq -zq -RA +Sq +Sq +Sq +Sq +Sq +YL gg hi hJ @@ -41076,24 +40930,24 @@ fO fO fK gg -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -41122,10 +40976,10 @@ ad ad ad ad -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad ad @@ -41303,12 +41157,12 @@ aS aS ff aP -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq gr hj hK @@ -41334,8 +41188,8 @@ sA ts gg gg -zq -zq +Sq +Sq vI vI vI @@ -41343,15 +41197,15 @@ vI vJ vI vI -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -41382,7 +41236,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -41560,12 +41414,12 @@ eb eb ff aP -zq -zq -XQ -zq -zq -zq +Sq +Sq +yr +Sq +Sq +Sq gr hk YK @@ -41591,8 +41445,8 @@ sB pX tX gg -zq -Qu +Sq +kg vJ wb rs @@ -41602,15 +41456,15 @@ wb vI ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -41638,8 +41492,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -41817,12 +41671,12 @@ aS eS ff aP -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq gr hl hM @@ -41861,16 +41715,16 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -41895,7 +41749,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -41904,7 +41758,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -42062,7 +41916,7 @@ ad ad ad ad -Lz +Sq an bq aC @@ -42074,12 +41928,12 @@ eb eb fe aP -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq gr hm hN @@ -42121,13 +41975,13 @@ vI vI vJ vI -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -42151,8 +42005,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -42161,7 +42015,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -42318,8 +42172,8 @@ ad ad ad ad -Lz -WE +Sq +yr ae bq aD @@ -42331,12 +42185,12 @@ aS aS fg an -Zs -zq -zq -zq -XQ -zq +Dw +Sq +Sq +Sq +yr +Sq gg hn hO @@ -42378,14 +42232,14 @@ xE xl xl vJ -zq -zq -zq -zq -zq -zq -zq -XF +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Hb ad ad ad @@ -42407,8 +42261,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -42417,9 +42271,9 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -42574,9 +42428,9 @@ ad ad ad ad -WE -Lz -Lz +yr +Sq +Sq an bq aC @@ -42589,9 +42443,9 @@ eb fh an an -zq -zq -zq +Sq +Sq +Sq ad ad fK @@ -42638,11 +42492,11 @@ vI vI vI vI -Zs -zq -zq -zq -KU +Dw +Sq +Sq +Sq +GB ad ad ad @@ -42663,8 +42517,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -42675,7 +42529,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -42831,9 +42685,9 @@ ad ad ad ad -Lz -Lz -Lz +Sq +Sq +Sq an al aD @@ -42879,7 +42733,7 @@ uz fO fN vK -Du +wg wv wD Wk @@ -42895,16 +42749,16 @@ ww Ni yc ww -UM -zq -zq -zq -zq -zq -zq -zq -zq -zq +vB +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -42920,7 +42774,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -42931,8 +42785,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -43088,9 +42942,9 @@ ad ad ad ad -Lz -Lz -Lz +Sq +Sq +Sq aP bY aD @@ -43152,20 +43006,20 @@ xX ya yd yf -OF -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +fs +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -43174,22 +43028,22 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad ad -zq +Sq ad ad ad @@ -43346,8 +43200,8 @@ ad ad ad ad -WE -Lz +yr +Sq aP bq cX @@ -43366,7 +43220,7 @@ fZ gu gD gO -dh +hq hR iq iK @@ -43409,45 +43263,45 @@ yj yb ye ww -DJ -zq -zq -zq -zq -zq +Ks +Sq +Sq +Sq +Sq +Sq ad ad ad -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad -zq -zq -XQ +Sq +Sq +yr ad ad ad @@ -43603,8 +43457,8 @@ ad ad ad ad -Lz -Lz +Sq +Sq an bZ bq @@ -43666,46 +43520,46 @@ vI vI vI vI -Zs -zq -zq -zq -zq -zq +Dw +Sq +Sq +Sq +Sq +Sq ad ad ad ad -zq +Sq ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad -zq +Sq ad ad ad ad -zq -zq -zq -zq -zq -XQ -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +yr +Sq +Sq +Sq +Sq ad ad ad @@ -43860,8 +43714,8 @@ ad ad ad ad -Lz -Lz +Sq +Sq an cS al @@ -43889,29 +43743,29 @@ fO fy kv ae -zq -zq -zq -zq -zq -MC -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Om +Sq +Sq +Sq gr rQ sF gr -zq -zq -zq -zq -zq -MC -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Om +Sq +Sq +Sq +Sq ad vJ xu @@ -43919,16 +43773,16 @@ xB fP xQ vI -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -43937,12 +43791,12 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -43955,14 +43809,14 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -44117,8 +43971,8 @@ ad ad ad ad -WE -Lz +yr +Sq an cT bq @@ -44146,29 +44000,29 @@ fN ka kw an -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq gr rQ sG gr -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad vI xu @@ -44176,16 +44030,16 @@ xC xK xR vJ -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -44194,9 +44048,9 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -44213,14 +44067,14 @@ ad ad ad ad -XQ -zq -zq -zq -zq -zq -zq -zq +yr +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -44374,8 +44228,8 @@ ad ad ad ad -Lz -Lz +Sq +Sq ae cU bq @@ -44403,45 +44257,45 @@ fN kb kx an -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq gr rS sF gr -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq vI xv xD xL xS vI -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -44452,9 +44306,9 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -44471,12 +44325,12 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -44660,43 +44514,43 @@ jD kc an an -zq -zq -zq -zq -zq -zq -zq -zq -RA +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +YL gg BI sH gg -Zs -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Dw +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq vI vI vJ vI vJ vI -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -44710,9 +44564,9 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -44730,9 +44584,9 @@ ad ad ad ad -zq -XQ -zq +Sq +yr +Sq ad ad ad @@ -44900,8 +44754,8 @@ et eH eV an -zq -zq +Sq +Sq ae an an @@ -44916,43 +44770,43 @@ an ae an ae -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq gr rQ Tf gr -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -44968,8 +44822,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -44987,7 +44841,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -45157,59 +45011,59 @@ aP eI aP an -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -MC -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Om +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq gr rU Tf gr -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -45226,8 +45080,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -45244,7 +45098,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -45410,61 +45264,61 @@ ad ad ad ad -ah -ah -ah -MC -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Om +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq gr rV sJ gr -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -45483,9 +45337,9 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -45501,7 +45355,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -45668,54 +45522,54 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -ad -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq fK rW sK fK -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -45741,8 +45595,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -45752,13 +45606,13 @@ ad ad ad ad -zq +Sq ad ad ad ad ad -zq +Sq ad ad ad @@ -45929,29 +45783,29 @@ ad ad ad ad -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq ad ad -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq ni ni ln @@ -45964,11 +45818,11 @@ qb qb ni ni -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -45999,8 +45853,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -46008,8 +45862,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -46189,26 +46043,26 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq ni qC rh @@ -46256,16 +46110,16 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -46448,30 +46302,30 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq qb qD ri Qw Yf -Pd +tw ln rj uV @@ -46514,14 +46368,14 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -46706,23 +46560,23 @@ ad ad ad ad -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq qb qD rj @@ -46771,8 +46625,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -46963,26 +46817,26 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -RA +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +YL ni ln -HL +rk sb sO Tu @@ -47028,9 +46882,9 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -47220,24 +47074,24 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ni ni Qm @@ -47286,8 +47140,8 @@ ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -47478,23 +47332,23 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad -zq -zq -zq -zq +Sq +Sq +Sq +Sq ni rl sd @@ -47543,9 +47397,9 @@ ad ad ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -47738,11 +47592,11 @@ ad ad ad ad -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -47750,8 +47604,8 @@ ad ad ad ad -zq -zq +Sq +Sq ni rm rj @@ -47795,15 +47649,15 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq ad -zq -zq +Sq +Sq ad ad ad @@ -48008,7 +47862,7 @@ ad ad ad wn -Lo +Rl ln rn sf @@ -48018,7 +47872,7 @@ rr qb RF vy -vW +kN ni ln ni @@ -48054,15 +47908,15 @@ ad ad ad ad -zq -zq -zq -zq +Sq +Sq +Sq +Sq ad ad -zq -zq -zq +Sq +Sq +Sq ad ad ad @@ -48314,18 +48168,18 @@ ad ad ad ad -zq -ad +Sq ad ad ad -zq -zq -zq -zq -zq -zq ad +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -48571,7 +48425,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -48772,7 +48626,7 @@ ad ad ad ln -lX +we mz ln nK @@ -48828,7 +48682,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -49079,13 +48933,13 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -49342,7 +49196,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -49551,13 +49405,13 @@ ov oY pD qb -xt +qI rj tE rj tG um -Oo +uI vd vD ln @@ -49599,7 +49453,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -49814,7 +49668,7 @@ tE rj tb un -xe +uJ ve vE ln @@ -49856,7 +49710,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -50064,7 +49918,7 @@ ad ln oZ pE -sP +qd qK rv sn @@ -50113,7 +49967,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -50321,14 +50175,14 @@ ad ln pa pF -TO +qe qL rw so rj rj up -Oo +uI vf vF ln @@ -50359,8 +50213,8 @@ ad ad ad ad -zq -XQ +Sq +yr ad ad ad @@ -50370,7 +50224,7 @@ ad ad ad ad -zq +Sq ad ad ad @@ -50585,7 +50439,7 @@ OL YD tI uq -Mi +xd vg vG ln @@ -50613,21 +50467,21 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -50870,21 +50724,21 @@ ad ad ad ad -zq -XQ -zq +Sq +yr +Sq ad ad ad -zq +Sq ad ad ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -51095,8 +50949,8 @@ ad ln ln ln -UE -FP +sq +td ln ni ni @@ -51126,22 +50980,22 @@ ad ad ad ad -zq -zq -zq -zq -zq -XQ -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +yr +Sq +Sq +Sq ad ad ad ad ad -zq -zq +Sq +Sq ad ad ad @@ -51383,22 +51237,22 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -XQ -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +yr +Sq ad -zq -zq +Sq +Sq ad ad ad @@ -51640,22 +51494,22 @@ ad ad ad ad -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -51898,20 +51752,20 @@ ad ad ad ad -XQ -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +yr +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -52155,19 +52009,19 @@ ad ad ad ad -zq -XQ -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq -zq +Sq +yr +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq +Sq ad ad ad @@ -52419,11 +52273,11 @@ ad ad ad ad -zq -XQ -zq -zq -zq +Sq +yr +Sq +Sq +Sq ad ad ad diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index af66d10c10673..33ab986f84d1d 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -4,28 +4,28 @@ #ifndef LOWMEMORYMODE #ifdef ALL_MAPS - #include "map_files\Birdshot\birdshot.dmm" + //#include "map_files\Birdshot\birdshot.dmm" BUBBER EDIT - UNUSED #include "map_files\debug\multiz.dmm" #include "map_files\debug\runtimestation.dmm" #include "map_files\Deltastation\DeltaStation2.dmm" #include "map_files\IceBoxStation\IceBoxStation.dmm" #include "map_files\MetaStation\MetaStation.dmm" #include "map_files\Mining\Lavaland.dmm" - #include "map_files\NorthStar\north_star.dmm" + //#include "map_files\NorthStar\north_star.dmm" BUBBER EDIT - UNUSED #include "map_files\tramstation\tramstation.dmm" // SKYRAT EDIT ADDITON START - Compiling our modular maps too! #include "map_files\VoidRaptor\VoidRaptor.dmm" #include "map_files\NSVBlueshift\Blueshift.dmm" #include "map_files\KiloStation\KiloStation.dmm" // SKYRAT EDIT END - #include "map_files\wawastation\wawastation.dmm" + //#include "map_files\wawastation\wawastation.dmm" BUBBER EDIT - UNUSED // BUBBER EDIT ADDITION START #include "map_files\biodome\biodome.dmm" #include "map_files\LimaStation\LimaStation.dmm" #include "map_files\moonstation\moonstation.dmm" #include "map_files\KiloStation\KiloStation.dmm" #include "map_files\BoxStation\BoxStation.dmm" - #include "map_files\ss13construct\ss13_construct.dmm" + // #include "map_files\ss13construct\ss13_construct.dmm" // BUBBER EDIT ADDITION END #ifdef CIBUILDING diff --git a/_maps/bubber/pods/listeningbasics.dmm b/_maps/bubber/pods/listeningbasics.dmm new file mode 100644 index 0000000000000..176faac98e75f --- /dev/null +++ b/_maps/bubber/pods/listeningbasics.dmm @@ -0,0 +1,107 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/photocopier/gratis, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/template_noop) +"c" = ( +/obj/machinery/computer/records/medical/syndie, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east{ + dir = 5 + }, +/turf/open/floor/mineral/plastitanium, +/area/template_noop) +"m" = ( +/obj/machinery/computer/message_monitor, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east{ + dir = 9 + }, +/turf/open/floor/mineral/plastitanium, +/area/template_noop) +"t" = ( +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"y" = ( +/obj/effect/turf_decal/skyrat_decals/ds2/right, +/obj/structure/table/reinforced, +/obj/machinery/fax{ + allow_exotic_faxes = 1; + syndicate_network = 1; + name = "Menacing Fax Machine"; + color = "#FF0000"; + fax_name = "Unknown Syndicate Fax - PLP" + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"C" = ( +/obj/effect/turf_decal/skyrat_decals/ds2/middle, +/obj/structure/chair/office/tactical{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"F" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south{ + dir = 10 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east{ + dir = 6 + }, +/turf/open/floor/mineral/plastitanium, +/area/template_noop) +"Q" = ( +/obj/effect/turf_decal/skyrat_decals/ds2/left, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/stamp/chameleon{ + pixel_x = 7; + pixel_y = 12 + }, +/obj/item/pen/fourcolor{ + pixel_x = -5; + pixel_y = 7 + }, +/obj/item/paper/monitorkey, +/obj/item/paper/crumpled/plap{ + pixel_x = 7 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) +"W" = ( +/obj/machinery/computer/camera_advanced/syndie, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/mineral/plastitanium/red, +/area/template_noop) + +(1,1,1) = {" +m +Q +a +"} +(2,1,1) = {" +W +C +t +"} +(3,1,1) = {" +c +y +F +"} diff --git a/_maps/bubber/pods/shelter_3x3.dmm b/_maps/bubber/pods/shelter_3x3.dmm new file mode 100644 index 0000000000000..4c4229e2605d2 --- /dev/null +++ b/_maps/bubber/pods/shelter_3x3.dmm @@ -0,0 +1,57 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/light/floor, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"c" = ( +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"d" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"k" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"m" = ( +/obj/machinery/door/window/survival_pod/left/directional/west, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"C" = ( +/obj/machinery/door/window/survival_pod/left/directional/east, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"E" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"H" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"K" = ( +/obj/machinery/door/window/survival_pod/left/directional/north, +/turf/open/floor/pod/light, +/area/misc/survivalpod) + +(1,1,1) = {" +H +m +d +"} +(2,1,1) = {" +K +a +c +"} +(3,1,1) = {" +k +C +E +"} diff --git a/_maps/templates/shelter_4.dmm b/_maps/bubber/pods/shelter_4.dmm similarity index 100% rename from _maps/templates/shelter_4.dmm rename to _maps/bubber/pods/shelter_4.dmm diff --git a/_maps/templates/shelter_5.dmm b/_maps/bubber/pods/shelter_5.dmm similarity index 100% rename from _maps/templates/shelter_5.dmm rename to _maps/bubber/pods/shelter_5.dmm diff --git a/_maps/bubber/pods/shelter_6x6.dmm b/_maps/bubber/pods/shelter_6x6.dmm new file mode 100644 index 0000000000000..16d7f87c6202e --- /dev/null +++ b/_maps/bubber/pods/shelter_6x6.dmm @@ -0,0 +1,112 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"c" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"d" = ( +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"l" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"m" = ( +/obj/machinery/light/floor, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"o" = ( +/obj/machinery/door/window/survival_pod/left/directional/east, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"t" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"y" = ( +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"z" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"D" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"H" = ( +/obj/machinery/door/window/survival_pod/left/directional/north, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"I" = ( +/obj/machinery/door/window/survival_pod/left/directional/west, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"M" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"N" = ( +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"V" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) + +(1,1,1) = {" +c +I +V +V +I +z +"} +(2,1,1) = {" +H +m +N +N +m +d +"} +(3,1,1) = {" +M +N +y +y +N +t +"} +(4,1,1) = {" +M +N +y +y +N +t +"} +(5,1,1) = {" +H +m +N +N +m +d +"} +(6,1,1) = {" +l +o +D +D +o +a +"} diff --git a/_maps/bubber/pods/shelter_botany.dmm b/_maps/bubber/pods/shelter_botany.dmm new file mode 100644 index 0000000000000..178fba95b50e0 --- /dev/null +++ b/_maps/bubber/pods/shelter_botany.dmm @@ -0,0 +1,83 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/door/window/survival_pod/left/directional/east, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"c" = ( +/obj/effect/turf_decal/siding/dark_green{ + dir = 6 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/seed_extractor, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"d" = ( +/obj/effect/turf_decal/siding/dark_green{ + dir = 10 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/vending/hydroseeds{ + onstation = 0 + }, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"h" = ( +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"j" = ( +/obj/machinery/door/window/survival_pod/left/directional/west, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"B" = ( +/obj/effect/turf_decal/siding/dark_green{ + dir = 5 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/biogenerator, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"K" = ( +/obj/machinery/light/floor, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/secateurs, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/bucket/wooden, +/obj/item/storage/bag/plants, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/survivalcapsule/trays, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"P" = ( +/obj/effect/turf_decal/siding/dark_green{ + dir = 9 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/smartfridge, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"X" = ( +/obj/machinery/door/window/survival_pod/left/directional/north, +/turf/open/floor/pod/light, +/area/misc/survivalpod) + +(1,1,1) = {" +c +j +B +"} +(2,1,1) = {" +X +K +h +"} +(3,1,1) = {" +d +a +P +"} diff --git a/_maps/bubber/pods/shelter_cabin.dmm b/_maps/bubber/pods/shelter_cabin.dmm new file mode 100644 index 0000000000000..7f90a78decd6b --- /dev/null +++ b/_maps/bubber/pods/shelter_cabin.dmm @@ -0,0 +1,168 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/floor/wood, +/area/misc/survivalpod) +"b" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/railing/wooden_fencing{ + dir = 8 + }, +/obj/structure/railing/wooden_fencing{ + dir = 7 + }, +/obj/machinery/light/floor, +/turf/open/floor/wood, +/area/misc/survivalpod) +"g" = ( +/obj/item/bedsheet/brown/double, +/obj/structure/bed/double, +/turf/open/floor/wood, +/area/misc/survivalpod) +"h" = ( +/turf/open/floor/carpet/orange, +/area/misc/survivalpod) +"q" = ( +/obj/structure/chair/sofa/right/brown{ + dir = 1 + }, +/turf/open/floor/carpet/orange, +/area/misc/survivalpod) +"r" = ( +/obj/machinery/door/airlock/wood{ + id_tag = "cabin_deploy" + }, +/obj/structure/fans/tiny, +/turf/open/floor/wood, +/area/misc/survivalpod) +"s" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/railing/wooden_fencing{ + dir = 8 + }, +/turf/open/floor/wood, +/area/misc/survivalpod) +"w" = ( +/obj/structure/bookcase/random/adult{ + pixel_y = 20 + }, +/turf/open/floor/carpet/orange, +/area/misc/survivalpod) +"B" = ( +/obj/machinery/light/floor, +/obj/structure/table/wood/fancy/orange, +/turf/open/floor/carpet/orange, +/area/misc/survivalpod) +"D" = ( +/obj/structure/fake_stairs/wood, +/turf/open/floor/wood, +/area/misc/survivalpod) +"E" = ( +/turf/closed/wall/mineral/wood, +/area/misc/survivalpod) +"J" = ( +/obj/item/stack/sheet/mineral/wood/fifty, +/turf/open/floor/carpet/orange, +/area/misc/survivalpod) +"L" = ( +/obj/machinery/light/floor, +/turf/open/floor/wood, +/area/misc/survivalpod) +"N" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/rack/wooden{ + pixel_y = 10 + }, +/obj/item/wallframe/button, +/obj/item/wallframe/button, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, +/obj/item/assembly/signaler, +/turf/open/floor/wood, +/area/misc/survivalpod) +"O" = ( +/obj/structure/fireplace, +/obj/effect/turf_decal/siding/wood/end, +/turf/open/floor/stone, +/area/misc/survivalpod) +"V" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 1 + }, +/turf/open/floor/carpet/orange, +/area/misc/survivalpod) +"Y" = ( +/obj/structure/chair/sofa/middle/brown{ + dir = 1 + }, +/turf/open/floor/carpet/orange, +/area/misc/survivalpod) + +(1,1,1) = {" +E +E +E +E +E +E +E +"} +(2,1,1) = {" +E +J +h +V +a +a +r +"} +(3,1,1) = {" +E +O +B +Y +L +a +E +"} +(4,1,1) = {" +E +w +h +q +a +a +E +"} +(5,1,1) = {" +E +s +s +b +N +a +E +"} +(6,1,1) = {" +E +g +a +a +D +a +E +"} +(7,1,1) = {" +E +E +E +E +E +E +E +"} diff --git a/_maps/bubber/pods/shelter_fan.dmm b/_maps/bubber/pods/shelter_fan.dmm new file mode 100644 index 0000000000000..078270c9a58ef --- /dev/null +++ b/_maps/bubber/pods/shelter_fan.dmm @@ -0,0 +1,9 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/fans/tiny, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) + +(1,1,1) = {" +a +"} diff --git a/_maps/bubber/pods/shelter_kitchen.dmm b/_maps/bubber/pods/shelter_kitchen.dmm new file mode 100644 index 0000000000000..4c28dc2e2d7d2 --- /dev/null +++ b/_maps/bubber/pods/shelter_kitchen.dmm @@ -0,0 +1,128 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 9 + }, +/obj/machinery/reagentgrinder, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"h" = ( +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"l" = ( +/obj/machinery/light/floor, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"o" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 5 + }, +/obj/machinery/chem_master/condimaster, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"p" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 10 + }, +/obj/machinery/griddle/frontier_tabletop, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"t" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/machinery/smartfridge/food, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 9 + }, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"z" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 10 + }, +/obj/machinery/microwave/frontier_printed, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"F" = ( +/obj/machinery/door/window/survival_pod/left/directional/west, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"M" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 6 + }, +/obj/machinery/oven/range_frontier, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"P" = ( +/obj/machinery/door/window/survival_pod/left/directional/north, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"Q" = ( +/obj/machinery/door/window/survival_pod/left/directional/east, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"T" = ( +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"X" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 6 + }, +/obj/machinery/chem_dispenser/frontier_appliance, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"Y" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 5 + }, +/obj/machinery/biogenerator/foodricator, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) + +(1,1,1) = {" +X +F +Y +"} +(2,1,1) = {" +P +l +T +"} +(3,1,1) = {" +p +h +a +"} +(4,1,1) = {" +M +h +o +"} +(5,1,1) = {" +P +l +T +"} +(6,1,1) = {" +z +Q +t +"} diff --git a/_maps/bubber/pods/shelter_o2.dmm b/_maps/bubber/pods/shelter_o2.dmm new file mode 100644 index 0000000000000..c131a5c802e57 --- /dev/null +++ b/_maps/bubber/pods/shelter_o2.dmm @@ -0,0 +1,72 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"g" = ( +/obj/machinery/light/floor, +/obj/machinery/atmospherics/components/unary/portables_connector{ + dir = 8 + }, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"i" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/atmospherics/components/binary/pump/on/cyan{ + dir = 8 + }, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"s" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/atmospherics/components/binary/pump/on/cyan/visible{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"y" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 8 + }, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"G" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/vg_decals/atmos/oxygen, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"T" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{ + dir = 1 + }, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"V" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) + +(1,1,1) = {" +V +T +a +"} +(2,1,1) = {" +i +g +s +"} +(3,1,1) = {" +y +G +y +"} diff --git a/_maps/templates/shelter_s.dmm b/_maps/bubber/pods/shelter_s.dmm similarity index 100% rename from _maps/templates/shelter_s.dmm rename to _maps/bubber/pods/shelter_s.dmm diff --git a/_maps/bubber/pods/shelter_trays.dmm b/_maps/bubber/pods/shelter_trays.dmm new file mode 100644 index 0000000000000..cfc35685d772a --- /dev/null +++ b/_maps/bubber/pods/shelter_trays.dmm @@ -0,0 +1,73 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/door/window/survival_pod/left/directional/south, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"d" = ( +/obj/machinery/light/floor, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"k" = ( +/obj/machinery/door/window/survival_pod/left/directional/north, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"l" = ( +/obj/effect/turf_decal/siding/dark_green{ + dir = 10 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"q" = ( +/obj/machinery/door/window/survival_pod/left/directional/east, +/turf/open/floor/pod/light, +/area/misc/survivalpod) +"r" = ( +/obj/effect/turf_decal/siding/dark_green{ + dir = 9 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"t" = ( +/obj/effect/turf_decal/siding/dark_green{ + dir = 5 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"E" = ( +/obj/effect/turf_decal/siding/dark_green{ + dir = 6 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/west, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/pod/dark, +/area/misc/survivalpod) +"T" = ( +/obj/machinery/door/window/survival_pod/left/directional/west, +/turf/open/floor/pod/light, +/area/misc/survivalpod) + +(1,1,1) = {" +E +T +t +"} +(2,1,1) = {" +k +d +a +"} +(3,1,1) = {" +l +q +r +"} diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index c1733a7eba342..5c60d2760ffb9 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -22,21 +22,6 @@ }, /turf/open/floor/iron/small, /area/station/security/prison/shower) -"aaA" = ( -/obj/structure/table/reinforced, -/obj/structure/spider/stickyweb, -/obj/item/clothing/suit/hazardvest{ - pixel_x = 3; - pixel_y = 21 - }, -/obj/item/hfr_box/corner{ - pixel_x = -5; - pixel_y = 12 - }, -/obj/item/hfr_box/body/interface, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "aaH" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -44,6 +29,14 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) +"aaR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "aaZ" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/blue, @@ -59,6 +52,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"abs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "abt" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -69,6 +71,12 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/station/hallway/primary/port) +"abE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "abJ" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -76,16 +84,6 @@ }, /turf/open/floor/iron, /area/station/security/tram) -"abR" = ( -/obj/machinery/power/emitter{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/sign/warning/no_smoking/circle/directional/south, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "acg" = ( /obj/machinery/power/smes/engineering, /turf/open/floor/plating, @@ -112,6 +110,12 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) +"acX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "adh" = ( /obj/machinery/door/airlock{ name = "Maintenance" @@ -141,18 +145,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"adV" = ( -/obj/machinery/door/airlock/atmos{ - name = "Atmospherics" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "atmos_airlock_1" - }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/hallway) "aef" = ( /obj/structure/flora/bush/flowers_yw/style_3{ pixel_x = 5; @@ -168,6 +160,12 @@ }, /turf/open/floor/grass/Airless, /area/station/hallway/primary/central/aft) +"aep" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "aeu" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -222,11 +220,6 @@ dir = 8 }, /area/station/science/lobby) -"afB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sign/warning/radiation/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "afF" = ( /obj/structure/table, /turf/open/floor/iron, @@ -242,6 +235,17 @@ dir = 1 }, /area/station/hallway/secondary/entry) +"afK" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/reagent_dispensers/fueltank/large, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - storage" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "agb" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -365,6 +369,12 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) +"aiJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "aiK" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -375,11 +385,11 @@ }, /turf/open/floor/plating, /area/station/engineering/lobby) -"aiL" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ - dir = 8 +"aki" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer4{ + dir = 1 }, -/turf/open/floor/engine/airless, +/turf/open/floor/iron, /area/station/engineering/atmos) "ako" = ( /obj/effect/turf_decal/stripes/line{ @@ -406,14 +416,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms) -"aky" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "akF" = ( /obj/effect/landmark/transport/nav_beacon/tram/nav/immovable_rod, /turf/closed/wall, @@ -428,23 +430,6 @@ }, /turf/open/floor/iron, /area/station/security) -"akS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/suit_storage_unit/atmos, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plating, -/area/station/engineering/atmos/office) -"akU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Atmospherics - South" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "alb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -456,23 +441,9 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/chapel/office) -"all" = ( -/obj/structure/table/greyscale, -/obj/item/folder/yellow{ - pixel_x = 9; - pixel_y = 1 - }, -/obj/item/pen{ - pixel_x = 5 - }, -/obj/item/reagent_containers/cup/bottle/welding_fuel{ - pixel_x = -7; - pixel_y = 5 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "als" = ( /obj/machinery/holopad, /turf/open/floor/iron/kitchen/small, @@ -505,6 +476,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"amr" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Cooling Loop Bypass" + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "amE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -517,18 +497,6 @@ }, /turf/open/floor/iron/textured_half, /area/station/security/execution/transfer) -"amH" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Air to Mix" - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "amK" = ( /obj/effect/turf_decal/weather/snow, /obj/structure/disposalpipe/segment, @@ -541,11 +509,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) -"amV" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/turf/open/space/basic, -/area/space/nearstation) "anb" = ( /obj/effect/turf_decal/siding/thinplating_new/terracotta, /obj/effect/turf_decal/siding/red/corner{ @@ -578,6 +541,9 @@ /obj/machinery/telecomms/server/presets/supply, /turf/open/floor/circuit, /area/station/tcommsat/server) +"aoc" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/pumproom) "aoj" = ( /obj/structure/railing{ dir = 8 @@ -600,19 +566,18 @@ /obj/item/storage/lockbox/medal, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/captain/private) +"aoB" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "aoL" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"apd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "apk" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/dark_red{ @@ -668,13 +633,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"aqn" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine/co2, -/area/station/engineering/atmos/space_catwalk) "aqo" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, @@ -710,6 +668,14 @@ /obj/structure/broken_flooring/singular/directional/south, /turf/open/floor/plating, /area/station/hallway/secondary/dock) +"arj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "ark" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/blue/full, @@ -724,6 +690,12 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/storage) +"arw" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 + }, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) "arH" = ( /obj/effect/turf_decal/siding/thinplating/terracotta{ dir = 8 @@ -783,6 +755,19 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/station/medical/paramedic) +"asn" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/misc/asteroid, +/area/station/maintenance/hallway/abandoned_command) +"asO" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/pumproom) "asS" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/opposingcorners{ @@ -920,6 +905,15 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"auL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor{ + id = "Secure Storage below"; + name = "Secure Storage" + }, +/turf/open/floor/plating/rust, +/area/station/engineering/main) "auO" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/iron/smooth, @@ -935,18 +929,6 @@ /obj/structure/cable, /turf/open/floor/eighties/red, /area/station/hallway/primary/central/fore) -"auQ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/railing/corner/end{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "auT" = ( /obj/structure/cable, /obj/structure/chair/office{ @@ -983,6 +965,12 @@ dir = 1 }, /area/station/hallway/secondary/exit/departure_lounge) +"avK" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "avN" = ( /obj/structure/table/glass, /obj/effect/decal/cleanable/dirt, @@ -1096,6 +1084,24 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/cargo/storage) +"axn" = ( +/obj/structure/rack, +/obj/item/clothing/neck/petcollar, +/obj/item/flashlight/flare/candle{ + pixel_x = 10 + }, +/obj/item/flashlight/flare/candle{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/item/screwdriver{ + pixel_y = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/department/engine/atmos) "axq" = ( /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) @@ -1162,18 +1168,6 @@ }, /turf/open/floor/iron/white/small, /area/station/science/cubicle) -"ayx" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) "ayK" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) @@ -1306,15 +1300,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/white/small, /area/station/maintenance/port/aft) -"aAb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/station/engineering/atmos) "aAj" = ( /obj/item/storage/backpack/duffelbag/sec{ pixel_x = -15; @@ -1539,22 +1524,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"aEq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/item/radio/intercom/directional/south, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) -"aEy" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "aEB" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/seed_rare, @@ -1625,13 +1594,6 @@ "aFR" = ( /turf/open/floor/plating, /area/station/security/tram) -"aFU" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "aFY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1654,11 +1616,10 @@ dir = 4 }, /area/station/science/ordnance/testlab) -"aGc" = ( -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/door/window/right/directional/west, -/turf/open/floor/engine, -/area/station/engineering/supermatter) +"aGn" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) "aGq" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -1719,14 +1680,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"aHb" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "aHl" = ( /obj/structure/railing/corner, /obj/structure/disposalpipe/segment, @@ -1801,14 +1754,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white/small, /area/station/medical/psychology) -"aIE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/effect/decal/cleanable/generic, -/obj/effect/landmark/blobstart, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) "aIO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1871,16 +1816,6 @@ dir = 8 }, /area/station/construction/mining/aux_base) -"aKb" = ( -/obj/structure/tank_dispenser, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"aKo" = ( -/obj/machinery/computer/atmos_control/plasma_tank, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "aKx" = ( /obj/machinery/holopad, /turf/open/floor/iron/dark/small, @@ -1903,14 +1838,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark/small, /area/station/hallway/secondary/dock) -"aKU" = ( -/obj/effect/turf_decal/siding/wideplating{ - dir = 4 - }, -/obj/machinery/light/small/directional/south, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "aLk" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark_red{ @@ -1935,14 +1862,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/construction/mining/aux_base) -"aLu" = ( -/obj/effect/turf_decal/delivery/white, -/obj/machinery/door/airlock/engineering/glass/critical{ - heat_proof = 1; - name = "Supermatter Chamber" - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "aLv" = ( /obj/structure/transport/linear/tram, /obj/effect/turf_decal/stripes/white/line{ @@ -2014,11 +1933,11 @@ /obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, /turf/open/floor/plating, /area/station/science/ordnance/testlab) -"aNc" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, +"aMJ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "aNj" = ( @@ -2082,14 +2001,6 @@ dir = 1 }, /area/station/hallway/secondary/exit/departure_lounge) -"aOb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/light/cold/directional/north, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "aOh" = ( /obj/machinery/status_display/ai/directional/south, /obj/effect/turf_decal/tile/neutral{ @@ -2121,10 +2032,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/science/genetics) -"aOS" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "aOX" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 6 @@ -2155,15 +2062,6 @@ luminosity = 2 }, /area/station/science/ordnance/bomb) -"aPB" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth_edge, -/area/station/engineering/supermatter/room) "aPD" = ( /obj/structure/chair{ dir = 1 @@ -2284,23 +2182,18 @@ /obj/effect/turf_decal/trimline/neutral/end, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"aRS" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/computer/security/telescreen/turbine/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "aRT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) -"aSc" = ( -/obj/structure/reflector/double/anchored, -/turf/open/floor/plating/rust, -/area/station/engineering/supermatter/room) +"aSf" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/item/kirbyplants/organic/plant22, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "aSt" = ( /obj/effect/spawner/random/structure/closet_private, /obj/machinery/light/small/directional/north, @@ -2309,6 +2202,10 @@ "aSy" = ( /turf/closed/wall/r_wall, /area/station/science/xenobiology) +"aSF" = ( +/obj/machinery/power/supermatter_crystal/engine, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "aSI" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/emcloset, @@ -2318,10 +2215,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/small, /area/station/hallway/secondary/dock) -"aSV" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "aSW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral, @@ -2415,20 +2308,6 @@ }, /turf/open/floor/stone, /area/station/command/heads_quarters/hos) -"aUR" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/cold/directional/north, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "aVA" = ( /obj/structure/closet/secure_closet/freezer/empty, /obj/item/food/grown/tomato{ @@ -2547,20 +2426,14 @@ }, /turf/open/floor/iron/small, /area/station/engineering/break_room) -"aWG" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) -"aXy" = ( -/obj/effect/turf_decal/siding/wideplating{ - dir = 1 +"aXc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 9 }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) +/obj/machinery/meter/monitored/distro_loop, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "aXC" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -2610,6 +2483,10 @@ }, /turf/open/floor/iron, /area/station/security/prison/rec) +"aYu" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "aYv" = ( /obj/structure/transport/linear/tram, /obj/effect/turf_decal/stripes/white/line{ @@ -2634,31 +2511,12 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/misc/sandy_dirt, /area/station/service/lawoffice) -"aZf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/cable, -/obj/structure/reflector/single/anchored{ - dir = 10 - }, -/turf/open/floor/plating/rust, -/area/station/engineering/supermatter/room) "aZh" = ( /obj/machinery/modular_computer/preset/curator{ dir = 8 }, /turf/open/floor/carpet, /area/station/service/library) -"aZu" = ( -/obj/machinery/power/emitter{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plating/rust, -/area/station/engineering/supermatter/room) "aZG" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/turf_decal/siding/wood{ @@ -2675,6 +2533,13 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"aZP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "aZS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2684,6 +2549,13 @@ }, /turf/open/floor/wood/tile, /area/station/command/meeting_room) +"baf" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "bah" = ( /obj/structure/cable, /obj/item/kirbyplants/organic/applebush, @@ -2743,15 +2615,6 @@ }, /turf/open/floor/iron/white/small, /area/station/medical/storage) -"bbp" = ( -/obj/structure/spider/stickyweb/sealed, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) -"bbF" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "bbK" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -2813,34 +2676,6 @@ dir = 4 }, /area/station/science/xenobiology) -"bcZ" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw, -/obj/structure/cable, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) -"bdb" = ( -/obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/textured_half, -/area/station/engineering/atmos) -"bdd" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 8 - }, -/obj/machinery/meter, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "bdN" = ( /obj/structure/falsewall, /turf/open/floor/plating, @@ -2857,9 +2692,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/titanium, /area/station/command/heads_quarters/ce) -"beg" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/hallway) "bej" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/wood/end{ @@ -2986,20 +2818,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/tcommsat/server) -"bhb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/engine_smes) "bho" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -3012,6 +2830,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"bhO" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Transit Tube Station" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "biB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark/smooth_large, @@ -3064,6 +2892,13 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"bjA" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Mix Outlet Pump" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "bjL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table, @@ -3113,20 +2948,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"bkI" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"bkO" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Pure to Mix" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "bkY" = ( /obj/machinery/requests_console/directional/west{ department = "Chief Medical Officer's Desk"; @@ -3198,17 +3019,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/dorms) -"blZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bmr" = ( /obj/structure/cable, /obj/machinery/telecomms/broadcaster/preset_right, @@ -3268,6 +3078,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"bnd" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Gas to Filter" + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "bnn" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -3293,15 +3111,11 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"bnq" = ( -/obj/machinery/door/airlock/engineering{ - name = "Decomissioned Airlock" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/abandoned, -/turf/open/floor/iron/textured_half, -/area/station/engineering/engine_smes) +"bnp" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "bnr" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -3429,6 +3243,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"bpk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "bpl" = ( /obj/machinery/flasher/directional/north{ id = "IsolationFlash" @@ -3450,20 +3270,6 @@ /obj/machinery/light/broken/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"bpv" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Air Mix" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/structure/cable, -/turf/open/floor/iron/textured_half{ - dir = 1 - }, -/area/station/engineering/atmos/pumproom) "bpI" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, @@ -3559,13 +3365,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/security/prison/workout) -"bre" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/crossing/horizontal{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "brj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/airalarm/directional/north, @@ -3606,13 +3405,6 @@ /obj/vehicle/ridden/scooter/skateboard/hoverboard, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"brC" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) "brD" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/tile/neutral{ @@ -3629,15 +3421,6 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/aft) -"bsn" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "bsu" = ( /obj/structure/barricade/wooden/crude, /obj/effect/mapping_helpers/broken_floor, @@ -3680,11 +3463,6 @@ dir = 4 }, /area/station/maintenance/starboard/greater) -"bsJ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/reagent_dispensers/fueltank/large, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "bsP" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -3737,6 +3515,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security) +"bun" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/computer/atmos_control/plasma_tank, +/turf/open/floor/iron, +/area/station/engineering/atmos) "buA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3784,6 +3568,11 @@ "bvt" = ( /turf/closed/mineral/random/stationside, /area/station/maintenance/department/electrical) +"bvJ" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/railing, +/turf/open/floor/iron, +/area/station/engineering/atmos) "bvK" = ( /obj/effect/turf_decal/siding/red{ dir = 9 @@ -3828,10 +3617,14 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) -"bwY" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +"bwP" = ( +/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "bxa" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -3857,28 +3650,11 @@ /obj/machinery/food_cart, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) -"bxs" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/orange/visible, -/obj/machinery/meter, -/turf/open/floor/iron/small, +"bxB" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/engine, /area/station/engineering/supermatter/room) -"bxu" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 1 - }, -/obj/machinery/button/door/directional/west{ - id = "Secure Storage"; - name = "Engineering Secure Storage"; - pixel_y = 24; - req_access = list("engine_equip") - }, -/turf/open/floor/iron/corner{ - dir = 8 - }, -/area/station/engineering/main) "bxI" = ( /obj/structure/cable, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -3900,6 +3676,23 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/central) +"byi" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Atmospherics Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/atmospherics_engine) +"byo" = ( +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "byq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3997,20 +3790,6 @@ }, /turf/open/floor/wood, /area/station/hallway/secondary/entry) -"bAU" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/portable_atmospherics/canister/plasma, -/turf/open/floor/plating, -/area/station/engineering/atmos/storage/gas) -"bBd" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge{ - name = "Turbine" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/disposal/incinerator) "bBh" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -4044,15 +3823,23 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/white/small, /area/station/science/cubicle) -"bBy" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) "bBL" = ( /obj/effect/landmark/start/cook, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/kitchen/small, /area/station/service/kitchen) +"bBM" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) "bBN" = ( /obj/structure/window/spawner/directional/east, /obj/structure/table/wood, @@ -4113,6 +3900,12 @@ /obj/machinery/light/warm/directional/south, /turf/open/floor/iron, /area/station/commons/fitness/locker_room) +"bCp" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/pumproom) "bCs" = ( /obj/machinery/light/dim/directional/north, /turf/open/floor/iron/dark/side{ @@ -4154,6 +3947,12 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"bDf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "bDh" = ( /obj/effect/turf_decal/siding/yellow{ dir = 5 @@ -4201,6 +4000,11 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/cafeteria, /area/station/science/circuits) +"bDI" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/closet/toolcloset, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/engineering/break_room) "bDN" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -4208,18 +4012,15 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"bDO" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "N2 to Pure" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "bEd" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"bEh" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/engineering/main) "bEw" = ( /obj/structure/sign/directions/supply{ dir = 1; @@ -4263,12 +4064,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"bFr" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/kirbyplants/random, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "bFt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -4358,6 +4153,20 @@ }, /turf/open/floor/iron/small, /area/station/hallway/secondary/recreation) +"bGI" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "bGL" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, @@ -4369,6 +4178,13 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/catwalk_floor/iron_dark, /area/station/cargo/office) +"bGW" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) "bGY" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -4421,11 +4237,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"bIi" = ( -/obj/machinery/light/small/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/main) "bIp" = ( /obj/structure/flora/bush/large/style_random{ pixel_x = -28; @@ -4477,6 +4288,7 @@ }, /obj/machinery/light_switch/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/herringbone, /area/station/commons/dorms) "bJK" = ( @@ -4486,13 +4298,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"bJN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/radio/intercom/directional/west, -/obj/machinery/status_display/evac/directional/south, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "bJZ" = ( /obj/structure/chair/stool/directional/south, /turf/open/floor/iron, @@ -4560,14 +4365,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"bLu" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/main) "bLS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4592,6 +4389,12 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"bLZ" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "bMc" = ( /obj/structure/table, /obj/item/rcl/pre_loaded, @@ -4639,10 +4442,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/smooth, /area/station/command/bridge) -"bNg" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "bNl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "sci-entrance" @@ -4697,7 +4496,7 @@ id = "rdoffice"; name = "Research Director's Shutters" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/cubicle) "bOa" = ( /obj/effect/turf_decal/sand/plating, @@ -4705,10 +4504,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/electrical) -"bOb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "bOG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall, @@ -4748,6 +4543,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/small, /area/station/hallway/secondary/service) +"bPA" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "HFR Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "bPU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, /turf/open/floor/iron, @@ -4796,12 +4604,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) -"bRc" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/machinery/light/small/directional/west, -/obj/structure/sign/warning/doors/directional/west, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "bRf" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/spawner/random/structure/steam_vent, @@ -4853,12 +4655,11 @@ /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/tram, /area/station/maintenance/port/aft) -"bSm" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/structure/disposalpipe/segment{ - dir = 4 +"bRP" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix Outlet Pump" }, -/turf/open/floor/iron/small, +/turf/open/floor/iron, /area/station/engineering/atmos) "bSo" = ( /turf/open/space/basic, @@ -4891,13 +4692,6 @@ }, /turf/closed/wall, /area/station/ai_monitored/turret_protected/ai) -"bTd" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/crossing/horizontal{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "bTo" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -4915,19 +4709,22 @@ }, /turf/open/floor/iron/textured_half, /area/station/cargo/miningoffice) -"bTJ" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 5 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "bTO" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation/entertainment) +"bUe" = ( +/obj/structure/table, +/obj/item/hfr_box/body/waste_output, +/obj/item/hfr_box/body/moderator_input, +/obj/item/hfr_box/body/fuel_input, +/obj/item/hfr_box/body/interface, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "bUr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue{ @@ -4963,6 +4760,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"bUL" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "bUO" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -5005,21 +4808,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) -"bWg" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/brown/visible, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "bWh" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -5054,13 +4842,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/genetics) -"bWk" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "bWl" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -5134,17 +4915,6 @@ }, /turf/open/floor/stone, /area/station/service/bar) -"bYe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/line, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "bYf" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line{ @@ -5176,19 +4946,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/fore/greater) -"bYY" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Air Mix" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/iron/textured_half{ - dir = 1 - }, -/area/station/engineering/atmos/pumproom) "bZa" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/white{ @@ -5256,6 +5013,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"caf" = ( +/obj/machinery/power/terminal, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"caj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "cam" = ( /obj/machinery/flasher/directional/east{ id = "AI"; @@ -5270,13 +5039,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"caB" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 9 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "caD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -5284,6 +5046,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/structure/cable, /turf/open/floor/wood, /area/station/service/chapel/office) "caI" = ( @@ -5313,6 +5076,14 @@ /obj/item/storage/fancy/candle_box, /turf/open/floor/iron/chapel, /area/station/maintenance/starboard/greater) +"cbh" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "cbi" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom/directional/north{ @@ -5370,19 +5141,19 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/meeting_room) +"cbF" = ( +/obj/effect/turf_decal/arrows/white, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "cbH" = ( /obj/structure/cable, /obj/item/kirbyplants/random, /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/smooth, /area/station/maintenance/solars/starboard/fore) -"cbJ" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/gas, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) "cbO" = ( /obj/structure/chair{ dir = 1 @@ -5416,23 +5187,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"ccu" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) -"ccx" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 6 - }, -/turf/open/space/basic, -/area/space/nearstation) "ccD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5458,45 +5212,6 @@ /obj/machinery/light/cold/dim/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"ccL" = ( -/obj/structure/closet/firecloset, -/obj/machinery/light_switch/directional/north, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/radio/off{ - pixel_x = 1; - pixel_y = 3 - }, -/turf/open/floor/plating/rust, -/area/station/engineering/supermatter/room) -"ccO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, -/obj/structure/table, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark, -/obj/item/radio/intercom/directional/south, -/obj/item/c_tube{ - pixel_x = 20 - }, -/obj/item/clothing/head/cone{ - pixel_y = 5; - pixel_x = -6 - }, -/obj/item/clothing/head/cone{ - pixel_y = 7; - pixel_x = -6 - }, -/obj/item/pipe_dispenser{ - pixel_y = 9; - pixel_x = 14 - }, -/obj/item/cigarette{ - pixel_y = 2 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos/pumproom) "cdg" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/grass, @@ -5522,10 +5237,6 @@ }, /turf/open/floor/grass, /area/station/service/chapel) -"cdW" = ( -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/maintenance/disposal/incinerator) "cdY" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -5538,15 +5249,6 @@ /obj/structure/window/spawner/directional/south, /turf/open/space/basic, /area/space/nearstation) -"ceA" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/stripes/white/line{ - dir = 5 - }, -/obj/machinery/airalarm/directional/south, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) "ceP" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ @@ -5610,20 +5312,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"cgh" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Waste to Starboard Filter"; - dir = 1 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "cgs" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/opposingcorners{ @@ -5648,21 +5336,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron/smooth_large, /area/station/science/auxlab/firing_range) -"cgz" = ( -/obj/machinery/door/airlock/atmos{ - name = "DECOMISSIONED" - }, -/obj/structure/barricade/wooden/crude, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/iron/textured_half{ - dir = 1 - }, -/area/station/engineering/atmospherics_engine) "cgL" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -5692,17 +5365,6 @@ }, /turf/open/floor/iron/white/small, /area/station/medical/storage) -"chb" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"chf" = ( -/obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) "chh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5714,32 +5376,10 @@ }, /turf/open/floor/iron, /area/station/security/brig/entrance) -"chj" = ( -/obj/structure/grille, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/engineering/atmos/space_catwalk) "chp" = ( /obj/structure/cable, /turf/closed/wall/r_wall, /area/station/hallway/primary/aft) -"chr" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "chC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ @@ -5855,16 +5495,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/diagonal, /area/station/engineering/lobby) -"cjP" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "cjR" = ( /obj/structure/disposalpipe/segment, /obj/structure/plasticflaps/opaque, /turf/open/floor/iron, /area/station/maintenance/port/lesser) +"cjT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "cjY" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5908,15 +5548,6 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/noslip, /area/station/maintenance/department/medical/central) -"ckI" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ - dir = 1 - }, -/turf/open/floor/engine/o2, -/area/station/engineering/atmos/space_catwalk) "ckL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5949,21 +5580,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/medical/chemistry) -"cla" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Atmospherics - Distribution" - }, -/obj/structure/cable, -/turf/open/floor/iron/small, -/area/station/engineering/atmos/pumproom) "clb" = ( /obj/structure/chair/stool/directional/north, /turf/open/floor/iron/kitchen/small, @@ -5997,6 +5613,15 @@ /obj/structure/cable, /turf/open/floor/iron/white/small, /area/station/command/heads_quarters/cmo) +"clJ" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Cold Loop to Gas" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "clV" = ( /obj/structure/table, /obj/effect/mapping_helpers/broken_floor, @@ -6009,10 +5634,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/smooth, /area/station/command/gateway) -"clX" = ( -/obj/structure/railing/corner, -/turf/open/floor/wood, -/area/station/engineering/atmos/office) "clZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -6046,20 +5667,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/storage/tcomms) -"cmu" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 9 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "cmw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -6112,21 +5719,17 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"cnv" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "cnG" = ( /obj/machinery/suit_storage_unit/rd, /turf/open/floor/iron/dark/small, /area/station/command/heads_quarters/rd) -"cnU" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "cob" = ( /obj/effect/turf_decal/tile/brown/opposingcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -6170,12 +5773,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"coO" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/engineering/atmos) "cpA" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -6190,15 +5787,6 @@ /obj/effect/mapping_helpers/airlock/access/any/command/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"cpC" = ( -/obj/effect/turf_decal/siding/red{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ - dir = 1 - }, -/turf/open/floor/engine/n2, -/area/station/engineering/atmos/space_catwalk) "cpE" = ( /obj/structure/closet/emcloset, /turf/open/floor/iron, @@ -6211,6 +5799,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"cpI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "cpJ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/transit_tube/horizontal, @@ -6244,6 +5842,15 @@ }, /turf/open/floor/iron/dark, /area/station/medical/medbay/aft) +"cqd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering - Supermatter Chamber" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "cqn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/camera/autoname/directional/north, @@ -6398,9 +6005,6 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"csB" = ( -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos) "csE" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -6590,6 +6194,15 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/station/service/chapel) +"cxF" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater{ + dir = 8 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "cxO" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -6599,14 +6212,6 @@ }, /turf/open/floor/plating, /area/station/science/cubicle) -"cxQ" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/airlock/atmos{ - name = "Locker Room" - }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/atmos/office) "cyf" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -6669,13 +6274,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/turret_protected/ai) -"czf" = ( -/obj/effect/turf_decal/stripes/white/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "czg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6707,6 +6305,12 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/cmo) +"cAi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "cAj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6758,6 +6362,24 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/science/robotics/mechbay) +"cAA" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/green{ + dir = 4 + }, +/obj/structure/lattice, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space/basic, +/area/space/nearstation) +"cAN" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Gas to Cold Loop"; + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "cAZ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -6777,28 +6399,6 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"cBR" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron, -/area/station/engineering/atmos/space_catwalk) -"cBV" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron, -/area/station/engineering/atmos/space_catwalk) -"cBX" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/structure/transit_tube/horizontal{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "cCb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -6818,6 +6418,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"cCt" = ( +/obj/machinery/camera/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "cCv" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/siding/wideplating_new/terracotta, @@ -6846,6 +6450,12 @@ }, /turf/open/misc/asteroid/airless, /area/space/nearstation) +"cCJ" = ( +/obj/structure/reflector/single/anchored{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "cCM" = ( /obj/structure/cable, /turf/open/floor/iron/kitchen/small, @@ -6894,18 +6504,6 @@ dir = 8 }, /area/station/science/lower) -"cDE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor{ - id = "Secure Storage"; - name = "Secure Storage" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating/rust, -/area/station/engineering/storage_shared) "cDH" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -6942,6 +6540,14 @@ dir = 1 }, /area/station/maintenance/starboard/greater) +"cDK" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/light/no_nightlight/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "cEn" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -6969,15 +6575,6 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/wood/large, /area/station/command/heads_quarters/captain/private) -"cEH" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, -/obj/effect/landmark/start/station_engineer, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "cEK" = ( /obj/effect/landmark/start/ai, /obj/item/radio/intercom/directional/south{ @@ -7081,6 +6678,12 @@ "cGj" = ( /turf/closed/wall/r_wall, /area/station/security/execution/education) +"cGH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "cGI" = ( /obj/machinery/firealarm/directional/south, /obj/structure/closet/secure_closet/medical3, @@ -7166,6 +6769,17 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/department/prison) +"cHT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/effect/turf_decal/arrows{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "cHX" = ( /obj/structure/filingcabinet, /obj/item/folder/documents, @@ -7180,13 +6794,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/stone, /area/station/service/bar) -"cJb" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "cJv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7254,18 +6861,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"cKv" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/sign/warning/electric_shock/directional/south, -/turf/open/floor/iron/stairs/old{ - dir = 8 - }, -/area/station/engineering/supermatter/room) "cKL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -7286,6 +6881,10 @@ /obj/structure/marker_beacon/indigo, /turf/open/space/basic, /area/space/nearstation) +"cLj" = ( +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "cLD" = ( /obj/structure/window/spawner/directional/north, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -7345,6 +6944,13 @@ /obj/effect/turf_decal/tile/dark_red/fourcorners, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/customs) +"cMa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "cMq" = ( /turf/open/floor/plating/airless, /area/space/nearstation) @@ -7386,19 +6992,22 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron/dark/small, /area/station/maintenance/aft) -"cMZ" = ( -/obj/machinery/power/smes/engineering, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Energy Silos" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/engine_smes) "cNk" = ( /obj/structure/sign/departments/restroom/directional/south, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/station/commons/fitness/locker_room) +"cNr" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/requests_console/directional/north{ + name = "Atmospherics Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "cNR" = ( /obj/structure/chair/office{ dir = 4 @@ -7429,6 +7038,11 @@ /obj/structure/window/spawner/directional/west, /turf/open/misc/sandy_dirt, /area/station/commons/fitness/recreation/entertainment) +"cOj" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "cOC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7450,6 +7064,10 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) +"cOP" = ( +/obj/machinery/portable_atmospherics/scrubber/huge, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "cOW" = ( /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plating, @@ -7479,22 +7097,29 @@ /obj/structure/urinal/directional/east, /turf/open/floor/iron/white/small, /area/station/commons/toilet/restrooms) -"cPv" = ( -/obj/effect/turf_decal/siding/red{ - dir = 10 - }, -/turf/open/floor/engine/n2, -/area/station/engineering/atmos/space_catwalk) -"cPB" = ( -/obj/machinery/air_sensor/incinerator_tank, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "cPD" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 }, /turf/open/floor/plating/airless, /area/space/nearstation) +"cPI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"cPM" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "cPN" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/showroomfloor, @@ -7543,6 +7168,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) "cQN" = ( @@ -7581,25 +7207,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/science/lobby) -"cRq" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/greyscale, -/obj/item/reagent_containers/cup/glass/mug/coco{ - pixel_x = -9 - }, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/machinery/newscaster/directional/east, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "cRw" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue, @@ -7700,16 +7307,6 @@ "cSC" = ( /turf/closed/wall, /area/station/commons/vacant_room/office) -"cSP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/trimline/yellow/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "cTn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -7721,10 +7318,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/white/small, /area/station/science/ordnance/storage) -"cTu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "cTw" = ( /obj/structure/table/wood, /obj/machinery/light/small/directional/south, @@ -7749,10 +7342,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"cTS" = ( -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "cTX" = ( /obj/machinery/computer/crew{ dir = 4 @@ -7762,14 +7351,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/paramedic) -"cUa" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/station_engineer, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) "cUf" = ( /obj/structure/sign/directions/engineering{ dir = 1; @@ -7843,6 +7424,15 @@ }, /turf/open/floor/iron/small, /area/station/hallway/primary/central/aft) +"cVp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/engineering/atmos/office) "cVx" = ( /obj/effect/turf_decal/siding/dark_red{ dir = 4 @@ -7868,13 +7458,6 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/security/execution/education) -"cVM" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "cVQ" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -7884,20 +7467,6 @@ dir = 1 }, /area/station/science/lower) -"cVS" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) -"cVY" = ( -/obj/machinery/atmospherics/components/tank/air{ - dir = 4 - }, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos/office) "cWh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7919,10 +7488,6 @@ dir = 1 }, /area/station/hallway/primary/aft) -"cWQ" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "cWZ" = ( /obj/machinery/door/airlock/external{ name = "Primary Docking Bay" @@ -8059,10 +7624,6 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/qm) -"cYU" = ( -/obj/structure/cable, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/main) "cYW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/steam_vent, @@ -8195,14 +7756,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"dbo" = ( -/obj/structure/cable, -/obj/effect/spawner/random/structure/steam_vent, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "dbs" = ( /obj/structure/chair/plastic{ dir = 8 @@ -8245,19 +7798,6 @@ /obj/effect/landmark/start/librarian, /turf/open/floor/iron/grimy, /area/station/service/library) -"dbN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "dbZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -8274,6 +7814,13 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"dcf" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "N2O to Pure" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "dcx" = ( /obj/effect/turf_decal/siding/white{ dir = 10 @@ -8314,6 +7861,12 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"dcR" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/main) "dcS" = ( /obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 4 @@ -8325,6 +7878,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig/entrance) +"dda" = ( +/obj/machinery/light/small/directional/south{ + dir = 4 + }, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) "dde" = ( /obj/structure/chair{ dir = 1; @@ -8411,6 +7970,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/small, /area/station/science/xenobiology) +"det" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 + }, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) "dex" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, @@ -8466,23 +8031,20 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai) -"dfz" = ( -/obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/locked, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "dfN" = ( /obj/structure/window/spawner/directional/west, /obj/structure/window/spawner/directional/south, /turf/open/floor/grass, /area/station/cargo/storage) +"dgk" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "dgm" = ( /obj/structure/railing/corner{ dir = 1 @@ -8532,6 +8094,12 @@ }, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai) +"dhs" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "dhu" = ( /obj/structure/flora/bush/sparsegrass{ pixel_x = -5; @@ -8577,6 +8145,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"dif" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "dim" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8588,6 +8165,9 @@ }, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) +"dio" = ( +/turf/open/floor/iron/small, +/area/station/maintenance/department/engine) "dis" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -8638,18 +8218,6 @@ /obj/effect/landmark/start/mime, /turf/open/floor/iron/smooth, /area/station/service/greenroom) -"diL" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "diP" = ( /turf/open/floor/iron, /area/station/hallway/primary/central/aft) @@ -8695,6 +8263,25 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/small, /area/station/security/brig) +"djj" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/storage/toolbox/electrical{ + pixel_y = 12 + }, +/obj/item/multitool{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/machinery/light/no_nightlight/directional/east, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "djO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8738,20 +8325,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/small, /area/station/security/execution/education) -"dkR" = ( -/obj/structure/railing/corner/end/flip{ - dir = 4 - }, -/obj/structure/railing/corner/end{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/loading_area, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) "dkT" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/turf_decal/stripes/line{ @@ -8760,13 +8333,15 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/hallway/secondary/construction) -"dlk" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ +"dlw" = ( +/obj/structure/railing, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/engineering/break_room) "dlx" = ( /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/rock/pile/style_random, @@ -8802,17 +8377,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"dmb" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer5, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "dmk" = ( /obj/machinery/holopad, /obj/effect/landmark/start/depsec/medical, @@ -8857,6 +8421,20 @@ dir = 1 }, /area/station/security/prison/safe) +"dnc" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Air to External Air Ports" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "dng" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -8930,6 +8508,9 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/medical/coldroom) +"dok" = ( +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) "don" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8972,12 +8553,6 @@ /obj/structure/railing, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/engine/atmos) -"dpk" = ( -/obj/effect/turf_decal/arrows/white, -/obj/effect/decal/cleanable/generic, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) "dps" = ( /obj/machinery/camera/directional/south{ c_tag = "AI Chamber - Aft"; @@ -9001,11 +8576,38 @@ }, /turf/open/floor/tram, /area/station/security/tram) +"dpZ" = ( +/obj/effect/turf_decal/siding/wideplating, +/obj/structure/rack, +/obj/item/circuitboard/machine/thermomachine{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/item/circuitboard/machine/thermomachine{ + pixel_x = 2; + pixel_y = -3 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "dqj" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plating, /area/station/maintenance/aft) +"dqz" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "dqB" = ( /obj/structure/table, /obj/item/clothing/head/utility/chefhat, @@ -9014,13 +8616,6 @@ "dqO" = ( /turf/open/floor/iron/dark/small, /area/station/security/checkpoint/customs/auxiliary) -"dqV" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 5 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "dqX" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -9033,16 +8628,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/electrical) -"drw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/computer/atmos_control/nocontrol/incinerator{ - dir = 4 - }, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "dry" = ( /obj/structure/bed/medical{ dir = 4 @@ -9061,15 +8646,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark/side, /area/station/hallway/primary/central/fore) -"drF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "drI" = ( /obj/structure/railing{ dir = 1 @@ -9083,6 +8659,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/station/engineering/main) +"drK" = ( +/obj/machinery/space_heater, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "drO" = ( /obj/machinery/door/airlock/maintenance{ name = "Maintenance" @@ -9138,11 +8719,6 @@ }, /turf/open/floor/iron/small, /area/station/medical/morgue) -"dsE" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/item/screwdriver, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "dsK" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -9155,6 +8731,14 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/security/lockers) +"dsS" = ( +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/cable, +/obj/machinery/camera/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "dsU" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 6 @@ -9174,6 +8758,13 @@ }, /turf/open/floor/iron/dark, /area/station/commons/dorms) +"dtr" = ( +/obj/structure/cable, +/obj/structure/reflector/single/anchored{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "dtv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9265,6 +8856,14 @@ }, /turf/closed/wall/rust, /area/station/ai_monitored/turret_protected/ai) +"duN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/cell_10k, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "duT" = ( /obj/structure/closet/wardrobe/white, /obj/machinery/light/small/directional/west, @@ -9273,14 +8872,6 @@ }, /turf/open/floor/iron/small, /area/station/commons/fitness/locker_room) -"duY" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 5 - }, -/turf/open/floor/wood, -/area/station/engineering/atmos/office) "dvd" = ( /turf/open/floor/iron/white/small, /area/station/service/hydroponics) @@ -9294,11 +8885,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark/herringbone, /area/station/ai_monitored/command/nuke_storage) -"dvv" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmos/space_catwalk) "dvJ" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/dark_red/fourcorners, @@ -9308,16 +8894,6 @@ }, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/customs) -"dvO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) "dvY" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -9352,14 +8928,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/station/engineering/storage_shared) -"dwP" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/disposal/incinerator) "dwT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9379,24 +8947,6 @@ "dxf" = ( /turf/open/floor/iron/smooth, /area/station/maintenance/department/medical/central) -"dxr" = ( -/obj/effect/turf_decal/stripes/white/box, -/obj/item/hfr_box/core, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) -"dxu" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Cold Room" - }, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "dxw" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/machinery/light/warm/directional/east, @@ -9436,6 +8986,12 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/iron/dark/diagonal, /area/station/service/bar) +"dxW" = ( +/obj/structure/closet/radiation, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/engineering/break_room) "dxZ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -9467,21 +9023,6 @@ /obj/structure/broken_flooring/singular/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"dyt" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "dyF" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/blue{ @@ -9530,16 +9071,13 @@ /obj/item/radio/intercom/chapel/directional/east, /turf/open/floor/iron/terracotta/diagonal, /area/station/service/chapel/office) -"dzA" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) -"dzD" = ( -/obj/effect/spawner/random/structure/crate, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) +"dzu" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + initialize_directions = 8 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "dzE" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -9607,6 +9145,10 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/security/evidence) +"dBe" = ( +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "dBh" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -9701,6 +9243,16 @@ dir = 8 }, /area/station/security/office) +"dDc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "dDd" = ( /obj/structure/table, /obj/item/exodrone{ @@ -9736,6 +9288,12 @@ /obj/effect/landmark/start/janitor, /turf/open/floor/iron/white/small, /area/station/service/janitor) +"dDD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "dDF" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -9779,6 +9337,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, +/obj/structure/cable, /turf/open/floor/iron/textured_half, /area/station/commons/fitness/recreation/entertainment) "dEq" = ( @@ -9791,12 +9350,6 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron/kitchen/small, /area/station/security/breakroom) -"dEA" = ( -/obj/machinery/modular_computer/preset/engineering, -/obj/structure/cable, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/iron/small, -/area/station/engineering/engine_smes) "dEF" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 5 @@ -9822,6 +9375,21 @@ }, /turf/open/floor/iron/white/small, /area/station/service/hydroponics) +"dFn" = ( +/obj/machinery/light/small/directional/south{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) +"dFs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 + }, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "dFN" = ( /obj/structure/window/spawner/directional/east, /obj/structure/window/spawner/directional/north, @@ -9835,6 +9403,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"dFY" = ( +/obj/structure/table, +/obj/item/stack/sheet/glass/fifty, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"dGL" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/atmospherics_engine) "dGV" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -9870,14 +9447,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"dHU" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "dIt" = ( /obj/structure/cable, /obj/machinery/button/door/directional/east{ @@ -9899,20 +9468,6 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/grass, /area/station/service/chapel) -"dIZ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "dJd" = ( /obj/machinery/computer/records/security, /turf/open/floor/wood/tile, @@ -9945,19 +9500,6 @@ dir = 1 }, /area/station/security/execution/transfer) -"dJU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 10 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/small, -/area/station/engineering/atmos/pumproom) "dKl" = ( /obj/effect/spawner/random/engineering/material_cheap, /obj/effect/spawner/random/engineering/material, @@ -10008,13 +9550,6 @@ /obj/structure/cable/layer3, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"dLj" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/effect/turf_decal/bot, -/obj/item/clothing/gloves/color/yellow, -/obj/item/clothing/gloves/color/yellow, -/turf/open/floor/iron/small, -/area/station/engineering/break_room) "dLn" = ( /obj/structure/chair/office, /turf/open/floor/iron/dark/herringbone, @@ -10037,6 +9572,9 @@ }, /turf/open/floor/iron/dark, /area/station/security/processing) +"dLN" = ( +/turf/open/floor/wood, +/area/station/engineering/main) "dLQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -10130,14 +9668,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"dNM" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 1; - name = "Air to Distro" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "dNU" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -10180,24 +9710,6 @@ }, /turf/open/floor/wood, /area/station/security/detectives_office) -"dOU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/button/door/directional/west{ - id = "engsm"; - name = "Radiation Shutters Control" - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) -"dOY" = ( -/obj/effect/turf_decal/arrows{ - dir = 4 - }, -/obj/effect/decal/cleanable/shreds, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) "dPa" = ( /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai) @@ -10254,6 +9766,12 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) +"dQq" = ( +/obj/machinery/air_sensor/incinerator_tank, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "dQE" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -10395,6 +9913,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"dTC" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "dTH" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/trimline/neutral/line, @@ -10415,6 +9941,10 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"dUv" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) "dUw" = ( /obj/structure/railing{ dir = 4 @@ -10457,6 +9987,10 @@ /obj/machinery/holopad, /turf/open/floor/iron/dark/small, /area/station/science/xenobiology) +"dVu" = ( +/obj/structure/reflector/single/anchored, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "dVQ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -10544,27 +10078,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/central/lesser) -"dXa" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/brown/visible, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "dXb" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -10648,15 +10161,6 @@ /obj/effect/landmark/start/cook, /turf/open/floor/iron/kitchen/small, /area/station/service/kitchen) -"dYw" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/engineering/hallway) "dYI" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -10689,11 +10193,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) -"dYY" = ( -/obj/machinery/light/cold/dim/directional/north, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "dZa" = ( /obj/structure/table/reinforced, /obj/machinery/camera/directional/west, @@ -10761,14 +10260,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) -"dZX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/binary/pump/off/general/visible{ - dir = 4; - name = "Air to Pure" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "dZZ" = ( /obj/structure/cable/layer3, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -10852,6 +10343,12 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/kitchen/small, /area/station/security/prison/mess) +"ece" = ( +/obj/structure/reflector/box/anchored{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "ecf" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -10895,6 +10392,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"ecT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 8 + }, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) "ecY" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -10980,6 +10483,12 @@ dir = 8 }, /area/station/cargo/storage) +"eef" = ( +/obj/effect/turf_decal/box/white{ + color = "#52B4E9" + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "eem" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11002,13 +10511,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"efl" = ( -/obj/effect/turf_decal/stripes/line{ +"efj" = ( +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/turf/open/floor/engine, +/area/station/engineering/supermatter) "efm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11016,6 +10525,22 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"efv" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) +"efx" = ( +/obj/effect/turf_decal/box/white{ + color = "#EFB341" + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "efy" = ( /obj/item/kirbyplants/organic/plant21, /obj/machinery/status_display/ai/directional/west, @@ -11055,6 +10580,10 @@ /obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) +"efX" = ( +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "egb" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -11076,6 +10605,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_dark, /area/station/science/xenobiology) +"egB" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "egG" = ( /obj/effect/landmark/start/medical_doctor, /obj/item/radio/intercom/directional/south, @@ -11095,13 +10631,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/chapel, /area/station/maintenance/starboard/greater) -"egR" = ( -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) "ehf" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11112,11 +10641,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"ehw" = ( -/obj/machinery/computer/atmos_control/carbon_tank, -/obj/structure/sign/poster/official/random/directional/east, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "ehT" = ( /obj/machinery/door/airlock{ id_tag = "commiss2"; @@ -11136,6 +10660,13 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/iron/dark, /area/station/medical/paramedic) +"ehY" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/orange{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) "ehZ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -11202,6 +10733,16 @@ "eiU" = ( /turf/open/floor/plating/rust, /area/station/maintenance/department/engine/atmos) +"ejk" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Pure to Fuel Pipe" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ejn" = ( /obj/item/stack/cable_coil/five, /obj/effect/decal/cleanable/cobweb, @@ -11213,6 +10754,20 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/cargo/bitrunning/den) +"ejr" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ejx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -11255,20 +10810,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/engineering/main) -"ekf" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer5{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "ekr" = ( /obj/effect/turf_decal/siding/dark_red{ dir = 1 @@ -11340,19 +10881,19 @@ }, /turf/open/floor/plating, /area/station/service/kitchen) -"eld" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Decontamination A" - }, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/main) "elh" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer2, /obj/structure/sign/warning/cold_temp/directional/west, /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"elk" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eln" = ( /obj/structure/flora/tree/jungle/small/style_5, /turf/open/floor/grass, @@ -11442,6 +10983,13 @@ "emd" = ( /turf/open/floor/iron, /area/station/medical/chemistry) +"eml" = ( +/obj/structure/reagent_dispensers/fueltank/large, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "emn" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -11458,13 +11006,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"emC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/end, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ena" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/plumbed{ @@ -11489,6 +11030,15 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"enB" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/main) "enE" = ( /obj/item/cultivator/rake, /obj/structure/cable, @@ -11542,13 +11092,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall, /area/station/maintenance/central/greater) -"eoU" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 9 - }, -/turf/open/space/basic, -/area/space/nearstation) "epa" = ( /obj/machinery/telecomms/bus/preset_four, /obj/effect/decal/cleanable/dirt, @@ -11577,11 +11120,6 @@ }, /turf/open/floor/iron/white/textured_large, /area/station/medical/medbay/lobby) -"epr" = ( -/obj/structure/closet/emcloset, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) "epu" = ( /obj/machinery/holopad, /turf/open/floor/iron, @@ -11602,7 +11140,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/security/checkpoint/science) "eqz" = ( /obj/effect/turf_decal/siding/white/corner{ @@ -11616,15 +11154,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/science/xenobiology) -"eqB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/tesla_coil/anchored, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "eqG" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark/small, @@ -11675,22 +11204,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/tile, /area/station/science/lower) -"erJ" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/greyscale, -/obj/item/folder/yellow{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/glasses/meson, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = -8; - pixel_y = 14 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "erK" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/thinplating_new, @@ -11706,6 +11219,11 @@ /obj/machinery/computer/records/security, /turf/open/floor/iron/small, /area/station/security/office) +"esj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "esr" = ( /obj/effect/turf_decal/tile/blue, /obj/structure/cable, @@ -11713,11 +11231,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/side, /area/station/hallway/primary/central/fore) -"ess" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "esv" = ( /obj/docking_port/stationary{ dwidth = 4; @@ -11794,10 +11307,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/circuit, /area/station/maintenance/port/aft) -"etX" = ( -/obj/structure/sign/warning/hot_temp/directional/east, -/turf/open/floor/iron/stairs/right, -/area/station/engineering/atmos) "etZ" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted, /obj/effect/turf_decal/siding/wideplating/dark/corner{ @@ -11846,11 +11355,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"euP" = ( -/obj/structure/chair/office, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "euR" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -11871,17 +11375,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"evm" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Engine Room" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "engine_airlock_2" - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/engine) "evq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11923,6 +11416,14 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/solars/starboard/fore) +"ewy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "ewF" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -11937,33 +11438,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) -"exr" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/machinery/air_sensor/oxygen_tank, -/turf/open/floor/engine/o2, -/area/station/engineering/atmos/space_catwalk) -"exA" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/head/cone{ - pixel_x = -7; - pixel_y = 9 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"exE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Pure to North Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "exM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12013,6 +11487,13 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"ezh" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "ezi" = ( /obj/structure/chair/stool/directional/west, /turf/open/floor/iron/cafeteria, @@ -12047,18 +11528,6 @@ /obj/vehicle/ridden/secway, /turf/open/floor/plating, /area/station/security/tram) -"ezG" = ( -/obj/structure/railing, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/engine_access, -/obj/effect/mapping_helpers/airalarm/link{ - chamber_id = "engine" - }, -/obj/effect/mapping_helpers/airalarm/tlv_no_checks, -/turf/open/floor/iron/stairs/old{ - dir = 4 - }, -/area/station/engineering/supermatter/room) "ezM" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -12067,11 +11536,6 @@ /obj/effect/turf_decal/tile/dark_red/half/contrasted, /turf/open/floor/iron, /area/station/security/brig/entrance) -"ezQ" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/break_room) "ezS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/showcase/cyborg/old{ @@ -12085,6 +11549,10 @@ }, /turf/open/floor/iron/smooth, /area/station/ai_monitored/turret_protected/aisat/teleporter) +"ezU" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) "ezV" = ( /obj/machinery/computer/security/telescreen/prison/directional/south, /turf/open/floor/iron/dark, @@ -12141,14 +11609,6 @@ /obj/machinery/light/floor, /turf/open/floor/noslip, /area/station/medical/medbay/central) -"eAC" = ( -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) -"eAI" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1, -/turf/open/space/basic, -/area/space/nearstation) "eAK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -12215,6 +11675,13 @@ }, /turf/open/floor/iron/small, /area/station/medical/morgue) +"eBW" = ( +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "eCf" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -12224,6 +11691,13 @@ }, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai) +"eCm" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/structure/railing, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eCJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -12238,14 +11712,6 @@ }, /turf/open/floor/iron/small, /area/station/engineering/main) -"eDe" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) "eDh" = ( /obj/effect/spawner/structure/window/survival_pod, /turf/open/floor/engine, @@ -12370,12 +11836,16 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"eEX" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 +"eEU" = ( +/obj/structure/table, +/obj/item/stack/rods/fifty, +/obj/item/wrench, +/obj/item/storage/box/lights/mixed, +/obj/effect/turf_decal/bot{ + dir = 1 }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "eFc" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/firealarm/directional/west, @@ -12506,6 +11976,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/prison/mess) +"eGP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/camera/directional/south{ + c_tag = "Engineering Supermatter Chamber" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "eGT" = ( /obj/structure/table, /obj/machinery/fax{ @@ -12593,19 +12071,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/turret_protected/ai) -"eIv" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/tank, -/turf/open/floor/plating, -/area/station/engineering/atmos/pumproom) -"eIx" = ( -/obj/structure/chair/plastic{ - dir = 8 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "eIF" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -12649,15 +12114,6 @@ /obj/effect/spawner/random/structure/girder, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"eIX" = ( -/obj/machinery/light/cold/directional/south, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/line, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge, -/area/station/engineering/supermatter/room) "eJe" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted, /turf/open/floor/iron/smooth, @@ -12715,6 +12171,13 @@ /obj/effect/mapping_helpers/mail_sorting/service/library, /turf/open/floor/wood/parquet, /area/station/service/library) +"eKK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eKP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12730,6 +12193,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"eLj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "eLn" = ( /obj/machinery/door/airlock/glass{ name = "Gold Standard Law Firm" @@ -12757,29 +12226,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"eLZ" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Gas Port"; - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) -"eMb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/pipe_scrubber, -/turf/open/floor/iron, -/area/station/engineering/atmos) "eMc" = ( /obj/machinery/flasher/portable, /obj/effect/turf_decal/stripes/line{ @@ -12820,19 +12266,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"eNm" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/curved, -/turf/open/space/basic, -/area/space/nearstation) -"eNn" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/transit_tube/horizontal, -/turf/open/floor/plating/airless, -/area/space/nearstation) "eNo" = ( /obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ pixel_x = -6 @@ -12872,11 +12305,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai) -"eOh" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "eOk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12893,15 +12321,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"eOP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/holopad, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "eOX" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/item/kirbyplants/random, @@ -12938,6 +12357,15 @@ /obj/structure/flora/grass/jungle/a/style_4, /turf/open/floor/grass, /area/station/service/chapel) +"ePE" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "ePP" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark_red{ @@ -13001,6 +12429,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/commons/dorms) +"eQG" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "eQQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13016,6 +12457,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"eRc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eRy" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -13026,6 +12471,19 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"eRR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"eRU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "eRX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13073,6 +12531,14 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/smooth, /area/station/ai_monitored/turret_protected/aisat/teleporter) +"eTe" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Fuel Pipe to Incinerator"; + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "eTi" = ( /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 4 @@ -13102,6 +12568,12 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/tile, /area/station/service/bar) +"eTL" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eTT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13117,6 +12589,17 @@ /obj/effect/turf_decal/tile/dark_red, /turf/open/floor/iron, /area/station/security/execution/transfer) +"eUf" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eUg" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, @@ -13129,6 +12612,15 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/smooth, /area/station/ai_monitored/turret_protected/aisat/teleporter) +"eUv" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/light/no_nightlight/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eUC" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -13158,15 +12650,6 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"eUR" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "Gas to Cold Loop" - }, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "eUZ" = ( /obj/effect/turf_decal/tile/dark_red{ dir = 1 @@ -13200,30 +12683,6 @@ /obj/machinery/light/warm/directional/east, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/port/aft) -"eVk" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 5 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) -"eVm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/brown/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth_edge{ - dir = 8 - }, -/area/station/engineering/supermatter/room) "eVz" = ( /obj/machinery/camera/directional/west{ c_tag = "AI Sat - Antechamber"; @@ -13271,31 +12730,18 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"eWf" = ( -/obj/structure/closet/cardboard, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/item/airlock_painter, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) -"eWj" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 4; - initialize_directions = 8 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark/end{ - dir = 1 - }, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/small, -/area/station/engineering/atmos/pumproom) "eWk" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, /turf/open/floor/wood, /area/station/service/chapel) +"eWx" = ( +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "eWB" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted{ dir = 1 @@ -13334,6 +12780,19 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"eXl" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/railing/corner, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) "eXo" = ( /turf/closed/wall/r_wall, /area/station/tcommsat/server) @@ -13358,6 +12817,18 @@ }, /turf/open/floor/stone, /area/station/maintenance/aft) +"eXM" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "eXR" = ( /obj/effect/turf_decal/trimline/neutral/line{ dir = 1 @@ -13431,6 +12902,9 @@ }, /turf/open/misc/sandy_dirt, /area/station/maintenance/port/lesser) +"eZa" = ( +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "eZi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13448,10 +12922,6 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/iron/dark, /area/station/commons/dorms) -"eZt" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/engineering/engine_smes) "eZM" = ( /obj/structure/cable/layer3, /obj/effect/decal/cleanable/dirt, @@ -13507,10 +12977,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/smooth, /area/station/hallway/secondary/command) -"fbs" = ( -/obj/effect/spawner/random/trash, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "fbt" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -13554,6 +13020,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"fbY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "fca" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/flowers_br/style_random, @@ -13575,18 +13048,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) -"fcI" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - Airlock" - }, -/obj/structure/cable, -/obj/structure/sign/warning/vacuum/external/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmos/space_catwalk) "fcU" = ( /obj/structure/window/spawner/directional/south, /obj/structure/flora/bush/large/style_random{ @@ -13600,6 +13061,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/fore/greater) +"fdg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 8 + }, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) "fdi" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/neutral/line{ @@ -13614,6 +13081,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"fdo" = ( +/obj/machinery/door/poddoor/incinerator_atmos_main, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "fds" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -13664,6 +13135,10 @@ }, /turf/open/floor/plating, /area/station/science/robotics/lab) +"fen" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "feo" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, /obj/effect/turf_decal/tile/yellow, @@ -13699,14 +13174,6 @@ }, /turf/open/floor/plating, /area/station/service/janitor) -"ffE" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 9 - }, -/obj/structure/cable, -/obj/structure/sign/poster/official/random/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "fgk" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/status_display/door_timer{ @@ -13803,17 +13270,6 @@ /obj/structure/mirror/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) -"fhX" = ( -/obj/structure/table/greyscale, -/obj/item/lightreplacer{ - pixel_y = 7 - }, -/obj/item/lightreplacer{ - pixel_y = 2; - pixel_x = -2 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "fhZ" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -13835,6 +13291,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/small, /area/station/engineering/break_room) +"fih" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) "fii" = ( /obj/effect/spawner/random/trash/graffiti{ pixel_x = -32; @@ -13848,10 +13312,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/eighties, /area/station/service/abandoned_gambling_den/gaming) -"fiq" = ( -/obj/machinery/computer/atmos_control/nitrous_tank, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "fiw" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/table, @@ -13863,11 +13323,6 @@ /obj/item/plate, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) -"fiI" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "fiK" = ( /obj/structure/cable, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -13939,6 +13394,9 @@ }, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai) +"fkp" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/project) "fkq" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/spawner/directional/north, @@ -13992,6 +13450,13 @@ }, /turf/open/floor/iron/dark/small, /area/station/maintenance/aft) +"fln" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "flo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -14035,6 +13500,11 @@ /obj/item/flashlight/lantern, /turf/open/floor/plating/rust, /area/station/maintenance/starboard/greater) +"fmc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "fme" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -14086,6 +13556,10 @@ /obj/effect/landmark/start/depsec/science, /turf/open/floor/iron, /area/station/security/checkpoint/science) +"fnu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "fnw" = ( /obj/structure/chair{ pixel_y = -2 @@ -14156,6 +13630,20 @@ /obj/machinery/vending/security, /turf/open/floor/iron, /area/station/security/lockers) +"fox" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + id = "engsm"; + name = "Radiation Shutters Control"; + req_access = list("engineering") + }, +/obj/structure/cable, +/obj/machinery/meter, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "foI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14177,6 +13665,12 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"fpb" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "fpg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -14213,19 +13707,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"fpF" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "Turbine Interior Airlock" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/disposal/incinerator) "fpN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -14254,11 +13735,6 @@ /obj/structure/cable, /turf/open/floor/iron/white/side, /area/station/science/research) -"fqQ" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "fqT" = ( /obj/machinery/computer/slot_machine{ pixel_y = 2 @@ -14353,6 +13829,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_dark, /area/station/science/xenobiology) +"fsN" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Storage" + }, +/turf/open/floor/iron/smooth_half{ + dir = 8 + }, +/area/station/engineering/main) "fsT" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -14367,19 +13851,22 @@ }, /turf/open/floor/wood/tile, /area/station/maintenance/aft) -"ftc" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/siding/wideplating{ - dir = 1 +"ftl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 }, -/obj/structure/closet/emcloset, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/directional/west{ - c_tag = "Atmospherics - Lockers" +/obj/machinery/camera/directional/south{ + c_tag = "atmospherics - upper" }, -/obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) +"ftn" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "fts" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14425,6 +13912,15 @@ }, /turf/open/floor/wood, /area/station/service/chapel) +"ftF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "atmospherics - lower" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ftX" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -14466,27 +13962,6 @@ /obj/effect/mapping_helpers/mail_sorting/security/detectives_office, /turf/open/floor/iron, /area/station/security/brig/entrance) -"fuB" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) -"fuC" = ( -/obj/machinery/door/poddoor/incinerator_atmos_aux, -/turf/open/floor/engine/airless, -/area/station/maintenance/disposal/incinerator) "fuD" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -14499,16 +13974,6 @@ }, /turf/open/space/basic, /area/space) -"fuT" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "fuV" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -14581,6 +14046,18 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"fwe" = ( +/obj/machinery/suit_storage_unit/engine, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) +"fwD" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/turf/open/floor/iron/small, +/area/station/engineering/break_room) "fwF" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -14639,14 +14116,6 @@ /obj/structure/table, /turf/open/floor/iron/kitchen/small, /area/station/maintenance/aft) -"fxV" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Pure to Waste" - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "fxW" = ( /obj/machinery/restaurant_portal/restaurant, /obj/effect/turf_decal/siding/wood{ @@ -14789,6 +14258,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"fzW" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) "fAr" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/barricade/wooden/crude, @@ -14876,12 +14349,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) -"fBy" = ( -/obj/structure/table, -/obj/item/folder, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "fBB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -14912,16 +14379,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/construction) -"fBZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Emitters" - }, -/obj/machinery/power/energy_accumulator/tesla_coil, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "fCd" = ( /turf/open/floor/wood, /area/station/cargo/miningfoundry) @@ -14959,15 +14416,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark/small, /area/station/security/brig) -"fCW" = ( -/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/smooth_large, -/area/station/engineering/storage_shared) "fDd" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -14978,6 +14426,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"fDe" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) "fDg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -14994,6 +14447,10 @@ }, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +"fDq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) "fDI" = ( /turf/open/floor/iron, /area/station/hallway/primary/aft) @@ -15016,6 +14473,12 @@ }, /turf/closed/wall, /area/station/engineering/atmos/storage/gas) +"fDP" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "fDQ" = ( /obj/machinery/flasher/directional/north, /turf/open/floor/iron/dark/smooth_large, @@ -15069,40 +14532,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/engineering/lobby) -"fEi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/structure/sign/poster/official/plasma_effects/directional/west, -/obj/effect/mapping_helpers/apc/cell_10k, -/turf/open/floor/iron/smooth_corner{ - dir = 4 - }, -/area/station/engineering/supermatter/room) +"fEg" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "fEq" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"fEr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 10 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "fEC" = ( /turf/closed/wall, /area/station/maintenance/port/lesser) @@ -15125,6 +14563,15 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine/atmos) +"fEW" = ( +/obj/machinery/light/small/directional/south{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) "fEX" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -15133,17 +14580,6 @@ }, /turf/open/floor/carpet, /area/station/service/library) -"fFe" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "fFt" = ( /obj/structure/chair/wood{ dir = 8 @@ -15151,9 +14587,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/service/chapel/funeral) -"fFu" = ( -/turf/open/floor/iron/stairs/medium, -/area/station/engineering/atmos) "fFD" = ( /obj/effect/turf_decal/siding/blue, /obj/effect/landmark/start/paramedic, @@ -15234,6 +14667,15 @@ }, /turf/open/floor/plating/rust, /area/station/ai_monitored/turret_protected/aisat/maint) +"fGi" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Distro Staging to Distro" + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "fGk" = ( /obj/machinery/smartfridge, /obj/machinery/door/poddoor/shutters/preopen{ @@ -15284,6 +14726,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +"fHy" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "fHD" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -15327,6 +14773,12 @@ /obj/machinery/vending/wardrobe/science_wardrobe, /turf/open/floor/iron/white, /area/station/science/research) +"fHZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "fIf" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/airalarm/directional/west, @@ -15346,6 +14798,14 @@ /obj/effect/landmark/navigate_destination/dockescpod, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"fIO" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/machinery/shower/directional/east, +/turf/open/floor/iron/dark/small, +/area/station/engineering/main) "fJl" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -15367,13 +14827,12 @@ /obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/ai_monitored/turret_protected/aisat/teleporter) -"fJt" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 8; - initialize_directions = 8 +"fJH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "fJK" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -15387,24 +14846,6 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) -"fJP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"fJX" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/transit_tube/crossing/horizontal{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "fJZ" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/tile/yellow{ @@ -15460,16 +14901,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/space/basic, /area/space/nearstation) -"fKA" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "fKN" = ( /obj/effect/landmark/event_spawn, /obj/machinery/computer/security/telescreen/test_chamber/directional/west, @@ -15485,15 +14916,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/science/lower) -"fKR" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/disposal/bin, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/north, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/iron, -/area/station/engineering/hallway) +"fKW" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "fLf" = ( /obj/structure/cable/layer3, /obj/structure/cable, @@ -15510,20 +14937,6 @@ /obj/item/assembly/mousetrap/armed, /turf/open/floor/stone, /area/station/service/abandoned_gambling_den) -"fLj" = ( -/obj/item/clothing/head/cone{ - pixel_x = -12; - pixel_y = 5 - }, -/obj/effect/decal/cleanable/insectguts, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos) "fLk" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -15561,29 +14974,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/ai_monitored/turret_protected/aisat_interior) -"fLy" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/structure/table, -/obj/item/reagent_containers/condiment/pack/sugar{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/coffee/no_lid{ - pixel_y = 13; - pixel_x = 6 - }, -/obj/item/plate/small{ - pixel_y = 1; - pixel_x = -4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/food/butterbiscuit{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, -/turf/open/floor/iron, -/area/station/engineering/hallway) "fLC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/yellow/opposingcorners, @@ -15700,21 +15090,6 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/mineral/titanium, /area/station/command/heads_quarters/ce) -"fMP" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/item/binoculars{ - pixel_x = -7; - pixel_y = 13 - }, -/obj/item/phone{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "fMQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -15780,14 +15155,6 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/catwalk_floor, /area/station/ai_monitored/turret_protected/ai) -"fNQ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 9 - }, -/obj/structure/railing/corner, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "fNR" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/left/directional/north{ @@ -15865,10 +15232,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"fPb" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "fPu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15941,6 +15304,15 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/smooth, /area/station/ai_monitored/turret_protected/aisat_interior) +"fRh" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Air to Distro staging" + }, +/obj/machinery/camera/directional/north{ + c_tag = "atmospherics - lower" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "fRl" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/purple{ @@ -15949,26 +15321,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/genetics) -"fRm" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "fRq" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 @@ -16005,6 +15357,12 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"fRS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "fRV" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -16036,6 +15394,12 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"fSi" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "fSx" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -16118,6 +15482,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"fTV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/break_room) "fUb" = ( /obj/effect/turf_decal/arrows{ dir = 8 @@ -16203,6 +15572,13 @@ }, /turf/open/floor/plating, /area/station/construction/mining/aux_base) +"fUZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "fVl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -16243,20 +15619,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) -"fWe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/west, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - West" +"fVZ" = ( +/obj/effect/turf_decal/arrows/white{ + dir = 4 }, -/turf/open/floor/iron/smooth_edge{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/area/station/engineering/supermatter/room) +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "fWi" = ( /obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 1 @@ -16265,6 +15636,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/locker_room) +"fWp" = ( +/obj/machinery/light/no_nightlight/directional/east, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"fWq" = ( +/obj/machinery/air_sensor/air_tank, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) "fWr" = ( /obj/structure/closet/crate, /obj/structure/barricade/wooden/crude, @@ -16286,18 +15667,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"fXe" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Locker Room" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "fXg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -16328,10 +15697,6 @@ }, /turf/open/floor/iron/smooth, /area/station/ai_monitored/turret_protected/aisat/foyer) -"fXo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/closed/wall/r_wall, -/area/station/maintenance/department/engine) "fXB" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16366,6 +15731,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"fXZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "fYe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/wood{ @@ -16374,17 +15746,6 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood, /area/station/service/chapel) -"fYo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/binary/valve, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "fYr" = ( /obj/structure/table, /obj/item/extinguisher/empty, @@ -16407,6 +15768,11 @@ }, /turf/open/floor/iron/dark/diagonal, /area/station/service/bar) +"fYR" = ( +/obj/machinery/air_sensor/oxygen_tank, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) "fYU" = ( /obj/effect/spawner/random/structure/crate_loot, /obj/item/pickaxe, @@ -16441,23 +15807,6 @@ }, /turf/open/floor/carpet, /area/station/service/library) -"fZL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/smooth, -/area/station/engineering/engine_smes) -"fZV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "fZZ" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 @@ -16517,7 +15866,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/mechbay) "gaF" = ( /obj/machinery/stasis{ @@ -16582,13 +15931,6 @@ /obj/structure/alien/weeds, /turf/open/misc/asteroid, /area/station/maintenance/starboard/greater) -"gbE" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output, -/turf/open/floor/engine/plasma, -/area/station/engineering/atmos/space_catwalk) "gbG" = ( /obj/machinery/door/airlock{ name = "Maintenance" @@ -16634,28 +15976,6 @@ /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) -"gcM" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/engineering/hallway) -"gcR" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer5{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "gdn" = ( /obj/item/kirbyplants/organic/applebush, /obj/effect/turf_decal/tile/red{ @@ -16727,6 +16047,10 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/plating, /area/station/maintenance/starboard/central) +"get" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "geu" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -16838,6 +16162,13 @@ }, /turf/open/floor/iron/smooth_large, /area/station/science/auxlab/firing_range) +"gfV" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "gfZ" = ( /obj/structure/window/spawner/directional/west, /obj/effect/turf_decal/sand/plating, @@ -16880,6 +16211,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"ggJ" = ( +/obj/effect/turf_decal/bot/left, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "ggN" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 9 @@ -16992,6 +16327,10 @@ /obj/structure/cable, /turf/open/floor/stone, /area/station/service/abandoned_gambling_den) +"gin" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) "giq" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -17029,6 +16368,11 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"gje" = ( +/obj/structure/table, +/obj/item/storage/bag/construction, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "gjg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17053,48 +16397,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/tcommsat/server) -"gjP" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = -2; - pixel_y = 9 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = -3; - pixel_y = -7 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = 3; - pixel_y = 6 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = 6; - pixel_y = -8 - }, -/obj/item/clothing/head/cone{ - pixel_x = -3; - pixel_y = -14 - }, -/obj/item/clothing/head/cone{ - pixel_x = 6; - pixel_y = -8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "gjS" = ( /obj/effect/turf_decal/siding/thinplating_new/terracotta{ dir = 1 @@ -17150,26 +16452,12 @@ /area/station/engineering/main) "gla" = ( /turf/open/floor/iron/grimy, -/area/station/commons) +/area/station/service/janitor) "gls" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/central/greater) -"glJ" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/siding/wideplating, -/obj/structure/closet/firecloset, -/obj/machinery/light/small/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/off{ - pixel_x = 1; - pixel_y = 3 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "glM" = ( /obj/effect/turf_decal/trimline/neutral/line, /obj/effect/turf_decal/trimline/neutral/line{ @@ -17177,16 +16465,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"glO" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/item/kirbyplants/random, -/obj/machinery/light/small/directional/west, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "glT" = ( /obj/effect/landmark/event_spawn, /obj/structure/table, @@ -17240,9 +16518,18 @@ }, /turf/open/floor/iron/white/small, /area/station/medical/cryo) -"gnd" = ( -/turf/closed/wall, -/area/station/engineering/atmos/office) +"gmC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"gnm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "gnA" = ( /obj/structure/cable, /obj/machinery/light/small/directional/north, @@ -17263,6 +16550,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"gnP" = ( +/obj/structure/table, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "gnQ" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /obj/effect/spawner/structure/window, @@ -17286,6 +16582,16 @@ }, /turf/open/floor/light/colour_cycle/dancefloor_b, /area/station/maintenance/starboard/central) +"gog" = ( +/obj/effect/turf_decal/arrows{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "gom" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 6 @@ -17359,6 +16665,17 @@ "gpI" = ( /turf/closed/wall, /area/station/command/heads_quarters/ce) +"gpJ" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Project Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/engineering/atmos) "gpL" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -17411,6 +16728,14 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/cafeteria, /area/station/science/circuits) +"gqn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "gqs" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -17435,14 +16760,6 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/on, /turf/open/floor/iron/dark/smooth_large, /area/station/security/execution/education) -"gro" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Pure to South Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "grx" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, /obj/structure/window/reinforced/spawner/directional/west, @@ -17465,6 +16782,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security) +"grY" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "gsh" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -17473,6 +16797,12 @@ }, /turf/open/floor/iron/white/side, /area/station/science/lobby) +"gss" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/small, +/area/station/engineering/supermatter/room) "gsv" = ( /obj/effect/turf_decal/siding{ dir = 1 @@ -17532,27 +16862,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) -"gtU" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/obj/machinery/power/port_gen/pacman, -/turf/open/floor/iron/dark/small, -/area/station/engineering/storage_shared) -"gub" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Distro to Waste" - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "gun" = ( /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/red{ @@ -17560,6 +16869,12 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit/departure_lounge) +"guv" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "guz" = ( /obj/structure/cable, /obj/item/kirbyplants/random, @@ -17582,18 +16897,21 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/small, /area/station/security/brig) +"guP" = ( +/obj/structure/cable, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "guY" = ( /turf/closed/wall, /area/station/service/chapel/storage) -"gvB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/computer/turbine_computer{ - dir = 4 +"gvs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ + dir = 8 }, -/obj/machinery/light_switch/directional/south, -/turf/open/floor/iron/smooth, +/turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "gvV" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, @@ -17750,6 +17068,14 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"gxv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "gxx" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/window/reinforced/spawner/directional/west, @@ -17758,11 +17084,6 @@ }, /turf/open/misc/sandy_dirt, /area/station/security/tram) -"gxK" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/turf/open/floor/catwalk_floor, -/area/station/engineering/supermatter/room) "gxL" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, @@ -17840,6 +17161,11 @@ /obj/structure/table/wood, /turf/open/floor/stone, /area/station/service/bar) +"gzd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "gzs" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 5 @@ -17873,14 +17199,6 @@ "gzF" = ( /turf/closed/wall/r_wall, /area/station/security/prison/rec) -"gzL" = ( -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/atmospherics/components/binary/valve{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "gzY" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -17898,6 +17216,14 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) +"gAz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/arrows/white{ + color = "#0000FF"; + pixel_y = 15 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "gAA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17918,6 +17244,16 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) +"gAQ" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/camera/directional/west{ + c_tag = "atmospherics - storage" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "gAR" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/dark_red/opposingcorners, @@ -17927,16 +17263,6 @@ }, /turf/open/floor/iron, /area/station/security/warden) -"gBe" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 10 - }, -/obj/structure/railing/corner/end{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "gBg" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -18009,11 +17335,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/engineering/break_room) -"gBG" = ( -/obj/effect/turf_decal/siding/wideplating, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "gBT" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/secure_safe/caps_spare, @@ -18050,10 +17371,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) -"gCp" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "gCq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_dark, @@ -18092,21 +17409,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood/tile, /area/station/service/lawoffice) -"gCP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"gCR" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "gCT" = ( /turf/closed/wall, /area/station/hallway/secondary/command) @@ -18120,16 +17422,6 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai) -"gDe" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/structure/railing, -/obj/structure/sign/warning/electric_shock/directional/north, -/turf/open/floor/iron/stairs/old{ - dir = 8 - }, -/area/station/engineering/supermatter/room) "gDk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18140,6 +17432,12 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/secondary/command) +"gDl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "gDp" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -18147,19 +17445,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"gDq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/engineering/supermatter/room) "gDs" = ( /obj/structure/lattice, /obj/structure/window/spawner/directional/south, @@ -18205,23 +17490,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"gEy" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ +"gEz" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/co2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer5{ - dir = 10 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) +/turf/open/floor/iron, +/area/station/engineering/atmos) "gEG" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -18306,6 +17580,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/medbay/aft) +"gFQ" = ( +/obj/structure/table, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/corner, +/obj/item/hfr_box/core, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) +"gFW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/break_room) "gFX" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, @@ -18447,14 +17734,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/command/gateway) -"gIr" = ( -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos) "gIs" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -18486,23 +17765,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"gIz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 1 - }, -/obj/machinery/door/airlock/external/glass{ - name = "North Tanks Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) "gIF" = ( /obj/effect/turf_decal/siding/green, /turf/open/floor/iron/dark/small, @@ -18518,20 +17780,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"gIM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 8 - }, -/obj/machinery/meter, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "gIS" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/bottle/holywater, @@ -18556,17 +17804,6 @@ }, /turf/open/floor/iron/freezer, /area/station/command/corporate_suite) -"gJs" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/siding/wideplating, -/obj/structure/closet/secure_closet/atmospherics, -/obj/item/clothing/head/utility/welding{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gJu" = ( /obj/structure/closet, /obj/effect/mapping_helpers/broken_floor, @@ -18616,20 +17853,12 @@ "gKs" = ( /turf/closed/wall, /area/station/maintenance/disposal/incinerator) -"gKz" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/hallway) "gKE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/broken_flooring/pile/directional/east, /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"gKF" = ( -/obj/effect/spawner/random/structure/grille, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "gKK" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -18654,6 +17883,12 @@ }, /turf/open/floor/iron/small, /area/station/service/barber) +"gKR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "gKT" = ( /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, @@ -18686,6 +17921,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/herringbone, /area/station/commons/dorms) "gLs" = ( @@ -18764,6 +18000,12 @@ }, /turf/open/floor/iron/dark, /area/station/tcommsat/server) +"gMp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/machinery/computer/atmos_control/carbon_tank, +/turf/open/floor/iron, +/area/station/engineering/atmos) "gMq" = ( /obj/machinery/vending/clothing, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -18862,13 +18104,6 @@ }, /turf/open/floor/plating, /area/station/cargo/miningoffice) -"gNI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/engineering/atmos) "gNP" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -18880,15 +18115,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/port) -"gNS" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos/space_catwalk) "gNV" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/stairs{ @@ -18955,10 +18181,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/small, /area/station/security/checkpoint/engineering) -"gPf" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/engine, -/area/station/engineering/atmos) "gPm" = ( /obj/machinery/computer/monitor{ dir = 1 @@ -19013,23 +18235,6 @@ }, /turf/open/floor/iron/smooth, /area/station/commons/storage/tools) -"gQI" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/transit_tube/horizontal{ - dir = 2 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) -"gQK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) "gRm" = ( /obj/structure/flora/bush/flowers_br, /obj/structure/flora/bush/flowers_pp/style_random, @@ -19076,20 +18281,6 @@ /obj/structure/broken_flooring/singular/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"gSh" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/siding/wideplating{ - dir = 1 - }, -/obj/structure/closet/secure_closet/atmospherics, -/obj/item/clothing/head/utility/welding{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gSi" = ( /obj/structure/chair{ dir = 4 @@ -19129,12 +18320,27 @@ /obj/item/stack/sheet/mineral/titanium, /turf/open/floor/tram, /area/station/maintenance/department/medical/central) +"gSB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "gSD" = ( /obj/machinery/mass_driver/chapelgun{ dir = 8 }, /turf/open/floor/plating, /area/station/service/chapel/funeral) +"gSN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "gSX" = ( /obj/machinery/computer/piratepad_control/civilian{ dir = 1 @@ -19171,6 +18377,13 @@ }, /turf/open/floor/carpet/executive, /area/station/command/meeting_room) +"gTj" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/obj/machinery/shower/directional/east, +/turf/open/floor/iron/dark/small, +/area/station/engineering/break_room) "gTH" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -19235,6 +18448,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/small, /area/station/hallway/primary/aft) +"gUg" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Engine Coolant Bypass"; + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "gUk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19342,19 +18566,6 @@ }, /turf/open/floor/iron/dark/textured_half, /area/station/command/corporate_suite) -"gWl" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engine Airlock" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/obj/structure/cable, -/obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "engine_airlock_2" - }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/break_room) "gWB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19363,13 +18574,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/processing) -"gWJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/wrench, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "gWN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19386,12 +18590,6 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating/rust, /area/station/maintenance/fore/lesser) -"gXn" = ( -/obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/engineering/break_room) "gXs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19399,6 +18597,11 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/cafeteria, /area/station/science/breakroom) +"gXB" = ( +/obj/machinery/air_sensor/carbon_tank, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "gXL" = ( /obj/structure/cable, /obj/machinery/door/airlock{ @@ -19433,15 +18636,8 @@ /area/station/maintenance/starboard/greater) "gYH" = ( /obj/machinery/vending/wardrobe/robo_wardrobe, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) -"gZf" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/misc/asteroid, -/area/station/maintenance/hallway/abandoned_command) "gZh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/holopad, @@ -19535,6 +18731,22 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) +"hav" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"haM" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/engineering/break_room) "haO" = ( /obj/effect/turf_decal/stripes/white/end, /obj/machinery/door/poddoor/shutters{ @@ -19593,6 +18805,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +"hbC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "hbG" = ( /obj/machinery/light_switch/directional/west, /obj/machinery/camera/autoname/directional/north, @@ -19855,6 +19078,13 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"hdY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "hdZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -19879,6 +19109,10 @@ "hem" = ( /turf/closed/wall, /area/station/hallway/primary/fore) +"hez" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/engineering/main) "heB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box/red/corners, @@ -20065,15 +19299,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/hallway/secondary/construction) -"hgV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) "hgY" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -20120,6 +19345,13 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"hht" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hhL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20140,19 +19372,23 @@ /obj/machinery/holopad, /turf/open/floor/wood/large, /area/station/command/corporate_suite) +"hil" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Engine Room" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "engine_airlock_2" + }, +/turf/open/floor/catwalk_floor, +/area/station/engineering/supermatter/room) "hiq" = ( /obj/structure/closet{ name = "Evidence Closet 1" }, /turf/open/floor/iron/smooth, /area/station/security/evidence) -"hir" = ( -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/engineering/atmos/office) "his" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/mod/module/plasma_stabilizer{ @@ -20187,11 +19423,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/station/science/cytology) -"hjj" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/transit_tube/curved, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "hjk" = ( /obj/structure/railing{ dir = 4 @@ -20256,6 +19487,13 @@ }, /turf/open/floor/iron/small, /area/station/medical/morgue) +"hkv" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/obj/structure/lattice, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "hky" = ( /obj/item/kirbyplants/organic/applebush, /obj/effect/turf_decal/tile/red{ @@ -20293,13 +19531,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"hkG" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/main) "hkL" = ( /obj/structure/cable, /turf/open/floor/wood/large, @@ -20315,13 +19546,6 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/dark, /area/station/science/lab) -"hkT" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/obj/structure/sink/directional/east, -/turf/open/floor/iron/dark/small, -/area/station/engineering/break_room) "hkW" = ( /obj/structure/closet/crate/goldcrate, /obj/effect/turf_decal/bot_white/right, @@ -20329,6 +19553,21 @@ /obj/machinery/status_display/ai/directional/west, /turf/open/floor/iron/dark/herringbone, /area/station/ai_monitored/command/nuke_storage) +"hlk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"hlx" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/computer/atmos_control/nocontrol/master{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/light/no_nightlight/directional/south, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "hlE" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 @@ -20346,19 +19585,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) -"hlM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron/smooth_corner{ - dir = 8 - }, -/area/station/engineering/supermatter/room) "hlX" = ( /obj/machinery/door/airlock/public/glass{ name = "Old Command Hallway" @@ -20421,12 +19647,6 @@ /obj/effect/spawner/random/contraband/prison, /turf/open/floor/iron, /area/station/security/prison/work) -"hmB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) "hmC" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -20489,17 +19709,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"hnG" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 8; - initialize_directions = 8 - }, -/obj/effect/turf_decal/tile/brown/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "hnO" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -20566,23 +19775,46 @@ "hop" = ( /turf/closed/wall, /area/station/service/chapel/funeral) -"hox" = ( -/obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/engineering/main) +"hoq" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "atmos to engine" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "hoG" = ( /obj/structure/cable, /obj/effect/landmark/start/scientist, /turf/open/floor/iron, /area/station/science/research) +"hoK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/obj/structure/cable, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/machinery/meter, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering Supermatter Port" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "hoN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/dock) +"hoO" = ( +/obj/item/radio/intercom/directional/east, +/obj/structure/closet/toolcloset, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/engineering/main) "hoQ" = ( /obj/structure/window/spawner/directional/east, /obj/structure/flora/bush/flowers_yw/style_random, @@ -20603,15 +19835,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron, /area/station/maintenance/department/engine/atmos) -"hpi" = ( -/obj/machinery/door/airlock/public/glass/incinerator/atmos_exterior, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/maintenance/disposal/incinerator) "hpj" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ @@ -20683,21 +19906,7 @@ pixel_y = 1 }, /turf/open/floor/iron/small, -/area/station/commons) -"hqm" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"hqr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) +/area/station/service/janitor) "hqH" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/cup/watering_can/wood, @@ -20712,6 +19921,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"hqP" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hqS" = ( /turf/closed/wall, /area/station/security/prison/work) @@ -20829,16 +20045,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/iron/dark/diagonal, /area/station/service/bar) -"hsy" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/wood, -/area/station/engineering/atmos/office) "hsC" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -20863,18 +20069,18 @@ /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plating, /area/station/cargo/miningoffice) -"hsL" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 6 - }, -/turf/open/space/basic, -/area/space/nearstation) "hsO" = ( /obj/structure/cable, /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/hallway/secondary/command) +"hsS" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hsZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -20885,9 +20091,34 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/station/security/tram) +"htk" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "htp" = ( /turf/closed/wall, /area/station/service/barber) +"htz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/storage/belt/utility{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/storage/belt/utility{ + pixel_x = 6 + }, +/obj/item/storage/belt/utility{ + pixel_x = -2; + pixel_y = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "htM" = ( /obj/effect/turf_decal/tile/dark_red{ dir = 4 @@ -20914,20 +20145,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/locker_room) -"htQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge{ - dir = 8 - }, -/area/station/engineering/supermatter/room) "hua" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -21007,12 +20224,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/ai_monitored/turret_protected/aisat/maint) -"hvo" = ( -/obj/structure/sign/warning/hot_temp/directional/east, -/turf/open/floor/iron/stairs/right{ - dir = 1 - }, -/area/station/engineering/atmos) "hvx" = ( /obj/structure/flora/rock/pile/jungle/style_random, /obj/machinery/light/small/directional/north, @@ -21049,18 +20260,19 @@ }, /turf/open/floor/iron/dark/small, /area/station/tcommsat/server) -"hvZ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "hwh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, /turf/open/floor/iron/white/small, /area/station/science/ordnance/storage) +"hwk" = ( +/obj/machinery/door/airlock/engineering/glass/critical{ + heat_proof = 1; + name = "Supermatter Chamber" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "hwn" = ( /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/showroomfloor, @@ -21105,12 +20317,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"hwG" = ( -/obj/machinery/door/window/left/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/effect/turf_decal/stripes/white/full, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "hwJ" = ( /turf/closed/wall/rust, /area/space/nearstation) @@ -21123,6 +20329,16 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) +"hxa" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "hxj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21155,18 +20371,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/station/hallway/secondary/command) -"hxG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/smooth_edge{ - dir = 8 - }, -/area/station/engineering/supermatter/room) "hxQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -21206,20 +20410,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"hyx" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/button/door/directional/west{ - id = "Secure Storage"; - name = "Engineering Secure Storage"; - pixel_y = -24; - req_access = list("engine_equip"); - pixel_x = 24 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) "hyA" = ( /obj/machinery/light/dim/directional/south, /turf/open/floor/iron/dark/side, @@ -21334,6 +20524,18 @@ /obj/effect/turf_decal/tile/dark_red/fourcorners, /turf/open/floor/iron, /area/station/security/execution/transfer) +"hBi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "atmospherics - turbine" + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "hBq" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -21414,6 +20616,16 @@ "hCr" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/command/storage/eva) +"hCx" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Engineering Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "hCB" = ( /obj/structure/table, /obj/item/paper_bin, @@ -21471,6 +20683,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/diagonal, /area/station/engineering/lobby) +"hDi" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hDt" = ( /obj/structure/toilet{ pixel_y = 8 @@ -21528,23 +20754,6 @@ }, /turf/open/floor/plating, /area/station/ai_monitored/command/storage/eva) -"hEt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/engine_smes) "hEu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21612,24 +20821,6 @@ /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"hFK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/computer/atmos_control/mix_tank{ - dir = 8 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) -"hFR" = ( -/obj/effect/turf_decal/siding/red{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output{ - dir = 1 - }, -/turf/open/floor/engine/n2, -/area/station/engineering/atmos/space_catwalk) "hGb" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/storage) @@ -21725,20 +20916,9 @@ /obj/item/hemostat, /turf/open/floor/iron/white, /area/station/science/robotics/augments) -"hIU" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output, -/turf/open/floor/engine/n2o, -/area/station/engineering/atmos/space_catwalk) "hJp" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/ai) -"hJs" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "hJC" = ( /obj/structure/closet/crate/hydroponics, /obj/item/paper/guides/jobs/hydroponics, @@ -21820,6 +21000,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +"hKS" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/light/no_nightlight/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "hKT" = ( /obj/structure/closet/emcloset, /turf/open/floor/iron, @@ -21858,6 +21043,10 @@ "hLc" = ( /turf/open/floor/plating, /area/station/science/xenobiology) +"hLe" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) "hLm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -21913,14 +21102,6 @@ }, /turf/open/floor/plating, /area/station/security) -"hMb" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "hMh" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/chair/stool/bamboo{ @@ -21931,6 +21112,13 @@ }, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/hop) +"hMk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, +/obj/machinery/meter/monitored/distro_loop, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "hMr" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/structure/closet/secure_closet/security/sec, @@ -21951,6 +21139,28 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/glass, /area/station/hallway/primary/central/aft) +"hMZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, +/obj/structure/table, +/obj/item/radio/intercom/directional/south, +/obj/item/clothing/head/cone{ + pixel_y = 5; + pixel_x = -6 + }, +/obj/item/clothing/head/cone{ + pixel_y = 7; + pixel_x = -6 + }, +/obj/item/pipe_dispenser{ + pixel_y = 9; + pixel_x = 14 + }, +/obj/item/cigarette{ + pixel_y = 2 + }, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "hNb" = ( /obj/effect/turf_decal/tile/brown/opposingcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -22002,14 +21212,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"hNU" = ( -/obj/structure/table/reinforced, -/obj/structure/spider/stickyweb, -/obj/item/mod/module/plasma_stabilizer{ - pixel_y = 11 - }, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) "hNY" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -22204,13 +21406,6 @@ /obj/machinery/atmospherics/components/binary/pump, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) -"hRF" = ( -/obj/structure/transit_tube/curved{ - dir = 1 - }, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating/airless, -/area/space/nearstation) "hRO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -22231,20 +21426,14 @@ }, /turf/open/misc/sandy_dirt, /area/station/security/tram) -"hSG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/table/reinforced/titaniumglass, -/obj/item/stack/cable_coil{ - pixel_x = 9; - pixel_y = -1 - }, -/obj/item/analyzer{ - pixel_y = 9 +"hSz" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter) "hSK" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/white{ @@ -22278,16 +21467,6 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"hTC" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "hTD" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 @@ -22316,11 +21495,6 @@ }, /turf/open/floor/iron/dark/side, /area/station/security/execution/transfer) -"hUh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "hUq" = ( /obj/structure/table/glass, /turf/open/floor/iron/smooth, @@ -22491,6 +21665,12 @@ }, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) +"hWQ" = ( +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 4 + }, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "hWU" = ( /obj/machinery/door/airlock{ name = "Maintenance" @@ -22518,18 +21698,13 @@ /obj/effect/turf_decal/delivery/red, /turf/open/floor/iron/white/small, /area/station/medical/medbay/central) -"hXt" = ( -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"hXB" = ( -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ - dir = 1 +"hXw" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 }, -/turf/open/floor/engine/air, -/area/station/engineering/atmos/space_catwalk) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) "hXU" = ( /turf/closed/wall, /area/station/security/execution/education) @@ -22628,16 +21803,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/meeting_room) -"hZb" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 9 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "hZe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22650,12 +21815,12 @@ /obj/machinery/brm, /turf/open/floor/iron, /area/station/cargo/miningfoundry) -"hZf" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 +"hZF" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 10 }, -/turf/open/floor/plating/airless, +/turf/open/space/basic, /area/space/nearstation) "hZP" = ( /obj/structure/cable, @@ -22742,11 +21907,9 @@ dir = 8 }, /area/station/maintenance/starboard/greater) -"iaW" = ( -/obj/structure/grille/broken, -/obj/effect/decal/cleanable/glass/plasma, -/turf/open/floor/engine, -/area/station/engineering/atmos) +"iaZ" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) "ibe" = ( /obj/effect/turf_decal/bot_white, /obj/structure/closet/crate/freezer, @@ -22762,11 +21925,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) -"ibB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "ibD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, @@ -22932,11 +22090,6 @@ }, /turf/open/floor/sepia, /area/station/maintenance/aft) -"idH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/small, -/area/station/maintenance/department/engine) "idJ" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, @@ -22968,12 +22121,13 @@ /obj/machinery/telecomms/message_server/preset, /turf/open/floor/circuit, /area/station/tcommsat/server) -"ieM" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 +"ieL" = ( +/obj/structure/cable, +/obj/machinery/modular_computer/preset/engineering{ + dir = 1 }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "ieY" = ( /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/broken_floor, @@ -22990,6 +22144,12 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +"iff" = ( +/obj/structure/sign/poster/official/moth_piping/directional/north, +/obj/machinery/light/cold/dim/directional/north, +/obj/structure/closet/firecloset, +/turf/open/floor/iron/small, +/area/station/engineering/break_room) "ifg" = ( /obj/structure/chair/sofa/bench/right, /obj/machinery/light/dim/directional/north, @@ -23048,6 +22208,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/smooth, /area/station/engineering/main) +"ifP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "ifU" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -23074,6 +22240,14 @@ /obj/structure/cable, /turf/open/floor/iron/small, /area/station/security/office) +"igt" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "igD" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -23110,16 +22284,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_command) -"ihj" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Turbine to Wastes" - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "ihl" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -23166,19 +22330,26 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/eighties/red, /area/station/service/abandoned_gambling_den/gaming) -"ihA" = ( -/obj/structure/transit_tube/curved{ +"ihz" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 8 + }, +/obj/effect/turf_decal/bot{ dir = 1 }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "ihC" = ( /obj/structure/bodycontainer/morgue{ dir = 1 }, /turf/open/floor/iron/dark/small, /area/station/medical/morgue) +"ihJ" = ( +/obj/effect/turf_decal/box/white, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "ihZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23232,13 +22403,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"ijn" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 5 +"ijs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine/plasma, -/area/station/engineering/atmos/space_catwalk) +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ijz" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/small, @@ -23274,15 +22447,6 @@ /obj/machinery/photobooth, /turf/open/floor/iron/textured_large, /area/station/hallway/primary/central/fore) -"ijP" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "ijV" = ( /turf/open/misc/asteroid, /area/station/maintenance/department/engine) @@ -23301,15 +22465,6 @@ "ikc" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"ikf" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/open/floor/iron/stairs{ - dir = 4 - }, -/area/station/engineering/atmos) "ikl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, @@ -23351,22 +22506,18 @@ }, /turf/open/floor/iron/dark/small, /area/station/command/heads_quarters/captain/private) +"ikI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ikU" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 10 }, /turf/open/floor/plating, /area/station/cargo/miningoffice) -"ilb" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "ile" = ( /obj/structure/chair{ dir = 1 @@ -23426,13 +22577,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/smooth_large, /area/station/engineering/storage_shared) -"ilB" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Engine Bay North" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "ilD" = ( /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 8 @@ -23447,17 +22591,14 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white/small, /area/station/science/ordnance/storage) -"ilN" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/turf_decal/stripes/white/line{ - dir = 5 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ilW" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"imb" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "imj" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permaouter"; @@ -23482,6 +22623,16 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/dock) +"imK" = ( +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "ina" = ( /obj/structure/table, /turf/open/floor/plating, @@ -23533,11 +22684,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron, /area/station/security/prison/rec) -"iok" = ( -/obj/effect/landmark/atmospheric_sanity/ignore_area, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "ioo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23551,16 +22697,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/dorms) -"ioN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "ioR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/airalarm/directional/west, @@ -23577,20 +22713,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/security/execution/transfer) -"ioX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/firealarm/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth_corner{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "ipb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/brown/opposingcorners, @@ -23732,13 +22854,6 @@ dir = 1 }, /area/station/maintenance/port/fore) -"iql" = ( -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 1; - name = "Air to Public Ports" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "iqp" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -23783,23 +22898,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"iqY" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix Outlet Pump" - }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ - dir = 9 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/camera/directional/east{ - c_tag = "Atmospherics - Distribution 2" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "ira" = ( /obj/structure/tank_dispenser/oxygen, /obj/machinery/light/small/directional/south, @@ -23842,6 +22940,13 @@ /obj/structure/closet/toolcloset, /turf/open/floor/plating, /area/station/construction/mining/aux_base) +"irt" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 6 + }, +/turf/open/space/basic, +/area/space/nearstation) "irQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23849,19 +22954,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/hop) -"irZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/engineering/supermatter/room) "isi" = ( /obj/structure/table, /obj/effect/turf_decal/siding/thinplating_new{ @@ -23879,18 +22971,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) -"isv" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Aux Cooling to Gas" - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 8 - }, -/obj/machinery/firealarm/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "isD" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -23925,6 +23005,15 @@ }, /turf/closed/wall, /area/station/hallway/primary/port) +"isM" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "isQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23941,12 +23030,6 @@ "itb" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/aisat/maint) -"itv" = ( -/obj/structure/transit_tube/horizontal{ - dir = 2 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "itw" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -24099,13 +23182,17 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"ivT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ - dir = 4 - }, +"ivF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"ivX" = ( +/obj/machinery/computer/atmos_control/nitrous_tank, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, +/obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) "ivY" = ( @@ -24114,17 +23201,6 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"iwi" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "iwt" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -24190,17 +23266,6 @@ }, /turf/open/floor/plating, /area/station/security/brig/entrance) -"iyl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/engine_smes) "iyn" = ( /obj/structure/railing/corner{ dir = 4 @@ -24256,6 +23321,15 @@ }, /turf/open/floor/grass, /area/station/service/chapel) +"ize" = ( +/obj/machinery/atmospherics/components/binary/pump/off{ + name = "O2 To Pure" + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "izh" = ( /obj/item/shovel, /turf/open/floor/plating, @@ -24267,12 +23341,6 @@ }, /turf/open/floor/iron/white/small, /area/station/commons/toilet/restrooms) -"izm" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 9 - }, -/turf/open/floor/engine/co2, -/area/station/engineering/atmos/space_catwalk) "izo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -24330,16 +23398,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"izT" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/greenglow, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "iAk" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 10 @@ -24413,14 +23471,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/security/brig/entrance) -"iAS" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/chair/stool/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/iron/small, -/area/station/engineering/engine_smes) "iAZ" = ( /obj/structure/bed/medical/anchored{ dir = 4 @@ -24523,13 +23573,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/station/commons/fitness/recreation/entertainment) -"iCp" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/station/engineering/atmos/office) "iCq" = ( /obj/effect/turf_decal/siding/thinplating/terracotta{ dir = 8 @@ -24539,12 +23582,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"iCr" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/break_room) "iCw" = ( /obj/structure/hedge, /obj/effect/turf_decal/tile/yellow{ @@ -24565,14 +23602,6 @@ dir = 8 }, /area/station/engineering/main) -"iCL" = ( -/obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/machinery/holopad, -/turf/open/floor/iron/textured_half, -/area/station/engineering/atmos) "iDk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24598,6 +23627,15 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/station/security/medical) +"iDz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "iDA" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -24710,14 +23748,6 @@ /obj/item/kirbyplants/random/fullysynthetic, /turf/open/floor/plating/rust, /area/station/maintenance/hallway/abandoned_command) -"iGc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/sign/warning/no_smoking/circle/directional/west, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/smooth_corner, -/area/station/engineering/supermatter/room) "iGl" = ( /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_command) @@ -24792,6 +23822,19 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"iHc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"iHe" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "iHg" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance/external{ @@ -24849,6 +23892,17 @@ /obj/effect/turf_decal/siding/end, /turf/open/floor/iron/dark/textured_large, /area/station/service/kitchen) +"iIj" = ( +/obj/structure/closet/crate{ + name = "Materials Crate" + }, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/rods/fifty, +/obj/machinery/light/cold/dim/directional/west, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/turf/open/floor/iron/dark/small, +/area/station/engineering/storage_shared) "iIs" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -24993,6 +24047,14 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/station/maintenance/department/prison) +"iJw" = ( +/obj/machinery/atmospherics/components/trinary/filter/flipped/layer2{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "iJz" = ( /obj/structure/table/glass, /obj/item/reagent_containers/cup/bottle/multiver{ @@ -25039,16 +24101,6 @@ /obj/structure/sign/warning/no_smoking/circle/directional/north, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"iJO" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 8 - }, -/obj/machinery/light/cold/dim/directional/north, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "iJS" = ( /obj/structure/railing/corner/end{ dir = 4 @@ -25070,6 +24122,12 @@ dir = 1 }, /area/station/command/heads_quarters/hop) +"iKi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "iKm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25089,12 +24147,14 @@ /obj/effect/spawner/random/trash/food_packaging, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"iKK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible, -/obj/machinery/meter, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) +"iLd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "iLe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25216,13 +24276,6 @@ /obj/machinery/flasher/portable, /turf/open/floor/plating, /area/station/security/tram) -"iME" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/mask/gas, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "iMI" = ( /obj/structure/cable, /obj/structure/sign/warning/no_smoking/circle/directional/north, @@ -25306,6 +24359,12 @@ /obj/effect/spawner/random/structure/girder, /turf/open/floor/tram, /area/station/security/tram) +"iNQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "iNS" = ( /obj/structure/chair{ dir = 1 @@ -25426,18 +24485,6 @@ /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/plating, /area/station/maintenance/fore/greater) -"iPg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Waste to Exhaust" - }, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "iPj" = ( /obj/structure/cable, /turf/open/floor/circuit/green, @@ -25528,6 +24575,16 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/small, /area/station/commons/fitness/locker_room) +"iQZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Decontamination A" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/main) "iRk" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -25549,13 +24606,6 @@ }, /turf/open/floor/stone, /area/station/service/abandoned_gambling_den) -"iRp" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos/office) "iRz" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -25620,11 +24670,6 @@ "iSD" = ( /turf/open/misc/dirt/station, /area/station/service/chapel) -"iSE" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "iSK" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -25633,6 +24678,13 @@ /obj/structure/sign/warning/pods/directional/west, /turf/open/floor/iron/checker, /area/station/security/breakroom) +"iTd" = ( +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "iTe" = ( /obj/effect/turf_decal/siding/red{ dir = 6 @@ -25702,16 +24754,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"iTZ" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Pure to Waste" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "iUb" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt, @@ -25786,6 +24828,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"iVC" = ( +/obj/machinery/light/no_nightlight/directional/east, +/obj/structure/sign/poster/official/nanotrasen_logo/directional/east, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "iVE" = ( /obj/structure/cable, /obj/machinery/telecomms/hub/preset, @@ -25953,18 +25006,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"iXg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/effect/turf_decal/trimline/yellow/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge{ - dir = 8 +"iXh" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 5 }, -/area/station/engineering/supermatter/room) +/turf/open/space/basic, +/area/space/nearstation) "iXi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25979,12 +25027,6 @@ /obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"iXn" = ( -/obj/structure/table/reinforced, -/obj/item/mod/module/signlang_radio, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "iXu" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/red/line{ @@ -25996,10 +25038,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/small, /area/station/hallway/primary/central/aft) -"iXx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/closed/wall/r_wall, -/area/station/maintenance/department/electrical) "iXy" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 @@ -26041,6 +25079,7 @@ /obj/structure/disposalpipe/junction/flip{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) "iYh" = ( @@ -26061,6 +25100,12 @@ /obj/machinery/photocopier, /turf/open/floor/iron/dark, /area/station/medical/medbay/aft) +"iYy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "iYC" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted, /obj/effect/turf_decal/siding/wideplating/dark{ @@ -26174,14 +25219,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"jad" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "jar" = ( /obj/machinery/drone_dispenser, /turf/open/misc/asteroid, @@ -26253,12 +25290,6 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/rd) -"jbo" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 9 - }, -/turf/open/floor/engine/n2o, -/area/station/engineering/atmos/space_catwalk) "jbp" = ( /obj/structure/flora/bush/jungle, /obj/structure/flora/rock/pile/style_3, @@ -26368,6 +25399,11 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"jcK" = ( +/obj/machinery/air_sensor/nitrous_tank, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) "jcU" = ( /obj/structure/chair/wood/wings{ dir = 1 @@ -26385,6 +25421,10 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood/large, /area/station/command/heads_quarters/captain/private) +"jde" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) "jdp" = ( /obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, @@ -26395,20 +25435,6 @@ /obj/structure/table/wood, /turf/open/floor/carpet, /area/station/service/library) -"jdU" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Turbine to Chamber" - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "jeh" = ( /turf/open/floor/noslip, /area/station/security/tram) @@ -26445,8 +25471,14 @@ /obj/item/radio/intercom/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/start/hangover, +/obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation/entertainment) +"jfm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "jfs" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -26469,6 +25501,11 @@ /obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) +"jfx" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/small, +/area/station/engineering/break_room) "jfA" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -26520,6 +25557,13 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/locker_room) +"jgJ" = ( +/obj/effect/turf_decal/siding/wideplating, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/main) "jgQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -26527,14 +25571,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/workout) -"jhk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/warning/pods/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) "jhm" = ( /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) @@ -26545,28 +25581,10 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"jhz" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "jhC" = ( /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/plating, /area/station/cargo/miningoffice) -"jhJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/line, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "jhY" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -26585,16 +25603,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured_half, /area/station/hallway/primary/aft) -"jia" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, -/turf/open/space/basic, -/area/space/nearstation) "jie" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -26635,6 +25643,15 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron/smooth_large, /area/station/cargo/warehouse) +"jiv" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "jiw" = ( /obj/structure/chair/sofa/bench/left{ dir = 4 @@ -26642,6 +25659,12 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/dock) +"jiy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter/room) "jiB" = ( /obj/effect/spawner/random/structure/crate_loot, /turf/open/floor/plating, @@ -26652,6 +25675,11 @@ }, /turf/open/floor/iron/small, /area/station/maintenance/department/engine/atmos) +"jiP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "jiR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/engine/vacuum, @@ -26686,6 +25714,13 @@ "jjq" = ( /turf/closed/wall, /area/station/cargo/warehouse) +"jjD" = ( +/obj/structure/sign/warning/engine_safety/directional/north, +/obj/machinery/light/cold/dim/directional/north, +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/turf/open/floor/iron/small, +/area/station/engineering/break_room) "jjI" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/siding/thinplating/dark, @@ -26705,6 +25740,17 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/medical/chemistry) +"jjT" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) +"jko" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "jkz" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -26791,6 +25837,11 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/stone, /area/station/service/chapel) +"jlF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/main) "jlL" = ( /obj/structure/closet/secure_closet/engineering_chief, /obj/item/storage/briefcase/secure, @@ -26856,6 +25907,15 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"jms" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) "jmF" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/turf_decal/stripes/line{ @@ -26980,19 +26040,6 @@ /obj/structure/alien/weeds, /turf/open/floor/wood, /area/station/maintenance/starboard/greater) -"jph" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - 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/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/engine_smes) "jpm" = ( /obj/structure/chair{ dir = 4; @@ -27057,10 +26104,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"jqh" = ( -/obj/item/stack/cable_coil/five, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "jqq" = ( /obj/structure/closet/crate/trashcart/filled, /obj/effect/landmark/start/hangover, @@ -27109,6 +26152,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/diagonal, /area/station/engineering/lobby) +"jqI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/turf/open/floor/plating, +/area/station/engineering/atmos) "jqK" = ( /obj/effect/turf_decal/tile/green/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -27128,19 +26178,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/rec) -"jrb" = ( -/obj/item/radio/intercom/directional/west, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"jrj" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 4; - name = "Refuse Exhaust" - }, -/turf/open/space/basic, -/area/space/nearstation) "jrk" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -27170,13 +26207,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating/rust, /area/station/maintenance/fore/lesser) -"jrS" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/tank, -/turf/open/floor/plating, -/area/station/engineering/atmos/pumproom) "jrT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27250,6 +26280,12 @@ /obj/effect/turf_decal/siding/thinplating/terracotta, /turf/open/floor/iron, /area/station/commons/dorms) +"jsV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "jsX" = ( /obj/structure/steam_vent, /turf/open/floor/plating, @@ -27310,28 +26346,6 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/catwalk_floor/iron_dark, /area/station/commons/storage/tools) -"jul" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 10 - }, -/turf/open/space/basic, -/area/space/nearstation) -"juF" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 6 - }, -/obj/machinery/holopad, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "juJ" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -27371,6 +26385,18 @@ /obj/structure/cable, /turf/open/floor/iron/dark/small, /area/station/command/heads_quarters/captain/private) +"jvy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/directional/north{ + c_tag = "atmospherics - HFR" + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "jvB" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -27385,6 +26411,16 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"jvF" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jvN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/dark_red/half/contrasted{ @@ -27469,29 +26505,19 @@ }, /turf/open/floor/iron, /area/station/security) -"jwC" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) -"jwM" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +"jwB" = ( +/obj/machinery/power/smes/engineering, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/bot{ + dir = 1 }, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) +"jwH" = ( +/obj/machinery/air_sensor/nitrogen_tank, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) "jwU" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/sign/poster/random/directional/south, @@ -27507,13 +26533,6 @@ /obj/structure/frame/machine, /turf/open/floor/tram, /area/station/security/tram) -"jxh" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 5 - }, -/turf/open/space/basic, -/area/space/nearstation) "jxk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -27598,22 +26617,6 @@ }, /turf/open/floor/iron/kitchen/small, /area/station/security/breakroom) -"jyl" = ( -/obj/structure/table/greyscale, -/obj/item/folder/yellow{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/item/newspaper{ - pixel_y = 4; - pixel_x = -4 - }, -/obj/item/geiger_counter{ - pixel_x = 13; - pixel_y = 6 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "jyu" = ( /obj/structure/chair/bronze{ dir = 4 @@ -27666,6 +26669,17 @@ dir = 4 }, /area/station/command/heads_quarters/captain/private) +"jyV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) "jyY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock{ @@ -27715,14 +26729,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"jzJ" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/structure/closet/firecloset, -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/engineering/hallway) "jAb" = ( /obj/structure/cable, /turf/open/floor/iron/stairs{ @@ -27802,13 +26808,6 @@ }, /turf/open/floor/iron, /area/station/security/execution/transfer) -"jBW" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "jCi" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance, @@ -28017,13 +27016,15 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"jFk" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/passive_vent{ +"jFl" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/engineering/atmos/office) "jFm" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/spawner/random/vending/snackvend, @@ -28079,15 +27080,10 @@ }, /turf/open/floor/iron, /area/station/security) -"jGk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) +"jGu" = ( +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos/office) "jGy" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/vending/wardrobe/bar_wardrobe, @@ -28215,22 +27211,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/science/lobby) -"jIa" = ( -/obj/machinery/door/airlock/atmos{ - name = "Locker Room" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "atmos_airlock_1" - }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/hallway) "jIc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock{ @@ -28261,6 +27241,14 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"jIk" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Distro to Waste" + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "jIl" = ( /obj/effect/turf_decal/siding/red{ dir = 10 @@ -28273,6 +27261,20 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"jIo" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/machinery/button/door/directional/west{ + id = "Secure Storage below"; + name = "Secure engineering storage"; + pixel_y = 24; + req_access = list("engine_equip") + }, +/turf/open/floor/iron/corner{ + dir = 8 + }, +/area/station/engineering/main) "jIy" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -28355,11 +27357,13 @@ }, /turf/open/floor/wood, /area/station/engineering/main) -"jJu" = ( -/obj/structure/chair, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) +"jJO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "jJP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28399,6 +27403,18 @@ dir = 1 }, /area/station/science/xenobiology) +"jKo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor{ + id = "Secure Storage top"; + name = "Secure Storage" + }, +/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/smooth_large, +/area/station/engineering/storage_shared) "jKq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28445,6 +27461,16 @@ }, /turf/open/floor/iron, /area/station/commons/storage/tools) +"jLh" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "jLl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28521,20 +27547,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/smooth_large, /area/station/cargo/warehouse) -"jMy" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Waste Outlet" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos/pumproom) "jMC" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 @@ -28554,6 +27566,33 @@ /obj/structure/spider/stickyweb, /turf/open/floor/iron/small, /area/station/maintenance/department/engine/atmos) +"jMR" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Central Aft" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jMT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jMW" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "jMX" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -28591,17 +27630,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/paramedic) -"jNr" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 9 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/disposal/incinerator) "jNw" = ( /obj/machinery/door/airlock/external/glass, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -28609,19 +27637,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"jNL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/trinary/filter/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "jNO" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/flora/bush/leavy/style_3{ @@ -28668,6 +27683,20 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"jOm" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Pure to Unfiltered" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"jOn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "jOs" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/flora/bush/lavendergrass/style_2, @@ -28754,7 +27783,7 @@ name = "Cytology Lab" }, /obj/effect/mapping_helpers/airlock/access/all/science/research, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "jQv" = ( /obj/structure/cable, @@ -28856,13 +27885,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"jRR" = ( -/obj/machinery/atmospherics/components/binary/crystallizer{ - dir = 4 - }, -/obj/machinery/light/cold/dim/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "jRU" = ( /obj/structure/railing, /obj/structure/disposalpipe/segment{ @@ -28898,6 +27920,12 @@ /obj/structure/railing, /turf/open/floor/catwalk_floor, /area/station/hallway/secondary/entry) +"jSF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jSJ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -28982,6 +28010,15 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/station/holodeck/rec_center) +"jTP" = ( +/obj/machinery/light/small/directional/south{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) "jTU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29056,7 +28093,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron/grimy, -/area/station/commons) +/area/station/service/janitor) "jVe" = ( /obj/structure/cable, /turf/open/floor/iron/smooth, @@ -29076,14 +28113,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark/side, /area/station/maintenance/central/greater) -"jVI" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "jVJ" = ( /obj/structure/table, /obj/item/bikehorn/rubberducky{ @@ -29132,15 +28161,6 @@ /obj/structure/flora/bush/large/style_3, /turf/open/floor/grass, /area/station/service/chapel) -"jWk" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/structure/cable, -/obj/machinery/door/airlock/atmos{ - name = "Locker Room" - }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/atmos/office) "jWl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ @@ -29173,6 +28193,13 @@ /obj/effect/landmark/start/bitrunner, /turf/open/floor/iron, /area/station/cargo/storage) +"jWH" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Pure to Waste" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "jWO" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/camera/autoname/directional/south, @@ -29254,6 +28281,7 @@ /area/station/security) "jXJ" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/airalarm/directional/west, /turf/open/floor/iron/white/side, /area/station/hallway/primary/central/aft) "jXQ" = ( @@ -29388,6 +28416,18 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"jZP" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/door/airlock/atmos/glass{ + name = "Distro Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/iron, +/area/station/engineering/atmos/pumproom) "kam" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/disposal/delivery_chute{ @@ -29452,6 +28492,14 @@ }, /turf/open/misc/sandy_dirt, /area/station/security/tram) +"kaN" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "kaP" = ( /obj/structure/lattice, /obj/structure/grille, @@ -29485,6 +28533,13 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/smooth, /area/station/maintenance/solars/starboard/fore) +"kby" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Mix to Gas"; + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "kbI" = ( /obj/structure/table/glass, /obj/machinery/cell_charger, @@ -29570,6 +28625,12 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"kej" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/main) "kel" = ( /obj/machinery/light/cold/directional/south, /obj/machinery/modular_computer/preset/id{ @@ -29612,22 +28673,6 @@ /obj/structure/flora/bush/flowers_yw, /turf/open/floor/grass, /area/station/service/chapel) -"keS" = ( -/obj/effect/turf_decal/siding/white{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input{ - dir = 1 - }, -/turf/open/floor/engine/air, -/area/station/engineering/atmos/space_catwalk) -"keY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/power/energy_accumulator/tesla_coil, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "kft" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29708,6 +28753,18 @@ dir = 1 }, /area/station/hallway/primary/aft) +"kgp" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/obj/machinery/shower/directional/east, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/small, +/area/station/engineering/main) "kgu" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/passive_vent, @@ -29722,22 +28779,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) -"kgG" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "kgN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood, @@ -29749,16 +28790,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, /area/station/medical/paramedic) -"kgW" = ( -/obj/structure/table/reinforced, -/obj/item/hfr_box/corner, -/obj/item/hfr_box/body/waste_output{ - pixel_x = 7; - pixel_y = -11 - }, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "kgZ" = ( /obj/structure/cable, /obj/machinery/newscaster/directional/east, @@ -29786,16 +28817,6 @@ /obj/structure/tram, /turf/open/floor/tram, /area/station/security/tram) -"khr" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 10 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "khD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, @@ -29969,6 +28990,23 @@ /obj/structure/plasticflaps/opaque, /turf/open/floor/plating, /area/station/maintenance/department/bridge) +"kjW" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Distro Access" + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "kkd" = ( /obj/machinery/door/window/brigdoor/left/directional/west{ name = "Creature Pen"; @@ -30066,24 +29104,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/catwalk_floor/iron_dark, /area/station/security/processing) -"klL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 6 - }, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "klN" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -30267,53 +29287,19 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/secondary/command) -"koV" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"kpe" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 6 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ +"koI" = ( +/obj/effect/turf_decal/siding/wideplating{ dir = 8 }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) -"kph" = ( -/obj/structure/railing, -/obj/machinery/light/cold/directional/north, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/iron/stairs{ +/obj/effect/turf_decal/siding/wideplating{ dir = 4 }, -/area/station/engineering/atmos/office) -"kpq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sign/warning/vacuum/external/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) +"kpg" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "kpF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/hangover, @@ -30670,21 +29656,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"ktL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 9 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "ktM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30704,7 +29675,7 @@ }, /obj/machinery/light/small/directional/west, /turf/open/floor/iron/small, -/area/station/commons) +/area/station/service/janitor) "ktT" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -30745,6 +29716,7 @@ dir = 9 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) "kuq" = ( @@ -30767,6 +29739,13 @@ /obj/structure/closet/secure_closet/miner, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"kuA" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "kuE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30794,9 +29773,14 @@ /obj/structure/chair, /turf/open/floor/iron, /area/station/commons/storage/tools) -"kvb" = ( -/turf/closed/wall/r_wall/rust, -/area/station/engineering/atmos) +"kvc" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Gas to Mix" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "kvl" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -30845,11 +29829,36 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"kwr" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/item/chair, +"kwa" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) +"kwk" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, /turf/open/floor/iron, -/area/station/engineering/hallway) +/area/station/engineering/atmos) "kws" = ( /obj/item/kirbyplants/random/fullysynthetic, /obj/machinery/firealarm/directional/west, @@ -30878,13 +29887,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/science/robotics/augments) -"kwH" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "kwW" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/iron/smooth, @@ -30964,28 +29966,6 @@ }, /turf/open/floor/plating, /area/station/service/hydroponics) -"kya" = ( -/obj/structure/table/greyscale, -/obj/item/paper{ - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/glass/mug/tea{ - pixel_y = 8; - pixel_x = -7 - }, -/obj/item/pen{ - pixel_x = 4 - }, -/obj/machinery/light/small/directional/south, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) -"kyg" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/machinery/light/small/directional/west, -/obj/structure/sign/warning/no_smoking/circle/directional/west, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "kym" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -31062,18 +30042,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/small, /area/station/hallway/primary/fore) -"kAG" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing{ - dir = 9 - }, -/obj/structure/railing/corner, -/obj/machinery/power/emitter{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "kAJ" = ( /obj/structure/closet/wardrobe/mixed, /obj/effect/turf_decal/siding/wideplating/dark, @@ -31112,10 +30080,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron/small, /area/station/engineering/main) -"kBD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/engineering/supermatter) "kBM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -31202,24 +30166,19 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"kDj" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 5 +"kDr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 }, -/obj/machinery/atmospherics/components/tank, -/turf/open/floor/plating, -/area/station/engineering/atmos/pumproom) +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "kDs" = ( /obj/structure/chair/stool/directional/north, /turf/open/floor/carpet/purple, /area/station/commons/dorms) -"kDY" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/machinery/door/airlock/public/glass{ - name = "Atmospherics Project Bay" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "kEd" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -31264,6 +30223,20 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark, /area/station/cargo/storage) +"kES" = ( +/obj/machinery/computer/atmos_control/nocontrol/incinerator{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"kFf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "kFg" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/siding/wood, @@ -31273,6 +30246,16 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/command/heads_quarters/qm) +"kFl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/no_nightlight/directional/north, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "kFq" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -31300,10 +30283,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/smooth, /area/station/cargo/sorting) -"kFH" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/engineering/atmos/office) "kFI" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -31324,9 +30303,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/cargo/sorting) -"kFS" = ( -/turf/closed/mineral/random/stationside, -/area/station/engineering/atmos) "kFU" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, @@ -31334,13 +30310,6 @@ "kFY" = ( /turf/closed/wall/r_wall, /area/station/medical/morgue) -"kGm" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/machinery/power/supermatter_crystal/engine, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "kGn" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -31381,6 +30350,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/wood/parquet, /area/station/service/library) +"kGF" = ( +/obj/machinery/door/firedoor/heavy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/atmos/office) "kGY" = ( /obj/structure/plasticflaps/opaque, /obj/effect/turf_decal/bot, @@ -31422,20 +30398,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"kHI" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "kHL" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted{ dir = 1 @@ -31453,20 +30415,6 @@ }, /turf/open/floor/iron, /area/station/security) -"kHQ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 6 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "kHX" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -31591,10 +30539,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/ai_monitored/security/armory) -"kJs" = ( -/obj/machinery/holopad, -/turf/open/floor/iron/smooth_edge, -/area/station/engineering/supermatter/room) "kJJ" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -31653,28 +30597,12 @@ }, /turf/open/floor/iron/dark/small, /area/station/science/xenobiology) -"kLk" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 10 - }, -/turf/open/floor/iron/smooth_edge, -/area/station/engineering/supermatter/room) "kLo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/service/chapel/funeral) -"kLv" = ( -/obj/effect/decal/cleanable/oil/slippery, -/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 = "Supplies" - }, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) "kLS" = ( /turf/open/floor/iron/stairs{ dir = 1 @@ -31732,22 +30660,6 @@ "kND" = ( /turf/closed/wall/r_wall, /area/station/security/prison) -"kNG" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/hidden{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "kNI" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance, @@ -31807,6 +30719,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/paramedic) +"kOU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "kOV" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -31888,23 +30804,6 @@ /obj/item/kirbyplants/random/fullysynthetic, /turf/open/floor/iron/small, /area/station/maintenance/port/lesser) -"kQo" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) -"kQr" = ( -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "kQt" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/aft) @@ -31919,18 +30818,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/science/xenobiology) -"kRu" = ( -/obj/effect/turf_decal/siding/white{ - dir = 10 - }, -/obj/machinery/air_sensor/air_tank, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - Atmospherics CO2 Chamber"; - dir = 5; - network = list("ss13","engineering") - }, -/turf/open/floor/engine/air, -/area/station/engineering/atmos/space_catwalk) "kRA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -31967,13 +30854,6 @@ /obj/machinery/light/small/dim/directional/west, /turf/open/floor/plating, /area/station/hallway/secondary/dock) -"kRW" = ( -/obj/machinery/computer/atmos_control/nitrogen_tank{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "kSb" = ( /turf/open/floor/wood, /area/station/command/heads_quarters/qm) @@ -32012,7 +30892,7 @@ id = "rdoffice"; name = "Research Director's Shutters" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/command/heads_quarters/rd) "kSv" = ( /obj/structure/disposalpipe/segment{ @@ -32070,12 +30950,6 @@ dir = 1 }, /area/station/command/heads_quarters/hop) -"kTu" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/smooth, -/area/station/engineering/engine_smes) "kTw" = ( /turf/closed/wall, /area/station/construction/mining/aux_base) @@ -32119,6 +30993,11 @@ /obj/structure/cable, /turf/open/floor/iron/small, /area/station/hallway/primary/central/fore) +"kTZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "kUa" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -32130,6 +31009,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/service/chapel/funeral) +"kUo" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "kUF" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -32149,6 +31034,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/station/maintenance/department/medical/central) +"kVc" = ( +/obj/effect/turf_decal/sand/plating, +/turf/closed/wall/r_wall, +/area/space/nearstation) "kVe" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -32160,6 +31049,10 @@ /obj/structure/chair/sofa/bench/left, /turf/open/floor/stone, /area/station/service/chapel) +"kVi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) "kVn" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/reinforced, @@ -32179,18 +31072,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"kVK" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing{ - dir = 6 - }, -/obj/structure/reflector/double/anchored, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "kWd" = ( /obj/machinery/door/airlock{ name = "Room 2" @@ -32211,6 +31092,12 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/small, /area/station/security/office) +"kWt" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input{ + dir = 1 + }, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "kWF" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32230,14 +31117,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/port) -"kWK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/small, -/area/station/engineering/engine_smes) "kWR" = ( /obj/machinery/door/airlock/public/glass{ name = "Docking Corridor" @@ -32247,15 +31126,6 @@ dir = 8 }, /area/station/hallway/secondary/dock) -"kXf" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"kXj" = ( -/obj/machinery/suit_storage_unit/engine, -/turf/open/floor/plating/rust, -/area/station/engineering/supermatter/room) "kXn" = ( /turf/closed/wall/r_wall, /area/station/engineering/gravity_generator) @@ -32266,6 +31136,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"kXr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "kXu" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/red{ @@ -32311,11 +31187,6 @@ /obj/effect/landmark/navigate_destination/cargo, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"kYo" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) "kYs" = ( /obj/machinery/mech_bay_recharge_port{ dir = 2 @@ -32452,14 +31323,6 @@ }, /turf/open/floor/iron/small, /area/station/hallway/primary/central/aft) -"lae" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Cold Loop to Gas" - }, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "laD" = ( /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) @@ -32522,6 +31385,13 @@ /obj/machinery/light/floor, /turf/open/floor/grass, /area/station/hallway/primary/central/fore) +"lbk" = ( +/obj/machinery/camera/directional/north{ + c_tag = "atmospherics - upper" + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lbl" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -32553,6 +31423,10 @@ /obj/structure/tram, /turf/open/floor/tram, /area/station/maintenance/port/aft) +"lbI" = ( +/obj/structure/cable, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "lbO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32590,6 +31464,24 @@ }, /turf/open/floor/iron/cafeteria, /area/station/hallway/secondary/exit/departure_lounge) +"lcu" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Office" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "atmos_airlock_1" + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/office) "lcw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -32601,6 +31493,13 @@ /obj/effect/landmark/navigate_destination/chemfactory, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) +"lcx" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lcC" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -32634,11 +31533,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"lda" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/hallway) "ldb" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/segment, @@ -32672,6 +31566,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/textured_half, /area/station/security/brig) +"ldO" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "lee" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -32821,44 +31721,22 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/security/prison) -"lfI" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) -"lfQ" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 - }, -/obj/machinery/shower/directional/east, -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark/small, -/area/station/engineering/main) "lfU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/brown/opposingcorners, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"lgc" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Gas to Aux Cooling"; +"lgb" = ( +/obj/machinery/computer/atmos_control/nitrogen_tank{ dir = 1 }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 }, +/obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, -/area/station/engineering/supermatter/room) +/area/station/engineering/atmos) "lgf" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, @@ -33023,6 +31901,10 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/white/small, /area/station/medical/storage) +"lhE" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "lhP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -33045,12 +31927,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"lhZ" = ( -/obj/machinery/suit_storage_unit/engine, -/obj/structure/cable, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "lir" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33066,19 +31942,11 @@ /obj/effect/landmark/navigate_destination/kitchen, /turf/open/floor/wood, /area/station/hallway/primary/central/aft) -"lix" = ( -/obj/structure/table/reinforced, -/obj/item/grenade/chem_grenade/cleaner{ - pixel_x = 8; - pixel_y = 13 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = -2; - pixel_y = 9 - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) +"liB" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/orange, +/turf/open/space/basic, +/area/space/nearstation) "liG" = ( /obj/structure/cable, /obj/structure/table/glass, @@ -33104,6 +31972,16 @@ /obj/effect/landmark/start/chaplain, /turf/open/floor/iron/dark/small, /area/station/service/chapel/storage) +"liK" = ( +/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, +/obj/effect/mapping_helpers/airlock/locked, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "liL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33136,6 +32014,16 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore/greater) +"liV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 10 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "liX" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -33144,6 +32032,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust, /area/station/maintenance/department/engine/atmos) +"liY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"lje" = ( +/obj/machinery/computer/turbine_computer{ + mapping_id = "main_turbine" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "ljg" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 @@ -33369,6 +32272,12 @@ }, /turf/open/floor/wood/tile, /area/station/maintenance/central/lesser) +"llZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/stool/bamboo, +/obj/structure/cable, +/turf/open/floor/carpet/lone, +/area/station/service/chapel/office) "lmb" = ( /obj/structure/cable, /obj/machinery/door/airlock{ @@ -33583,22 +32492,6 @@ }, /turf/open/floor/wood/large, /area/station/command/heads_quarters/captain) -"lpT" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/item/stack/sheet/iron/fifty{ - pixel_y = -9; - pixel_x = -4 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/cable_coil{ - pixel_x = -1; - pixel_y = -7 - }, -/obj/effect/turf_decal/bot, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "lpV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/green{ @@ -33668,6 +32561,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/hop) +"lqv" = ( +/obj/machinery/air_sensor/plasma_tank, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) "lqC" = ( /turf/open/floor/iron/smooth, /area/station/maintenance/solars/starboard/aft) @@ -33692,15 +32590,6 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/aft) -"lrD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "lrE" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -33713,34 +32602,12 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) -"lrL" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/item/multitool{ - pixel_x = 7; - pixel_y = 18 - }, -/obj/item/storage/bag/construction, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/south{ - c_tag = "Atmospherics - North" - }, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "lrP" = ( /obj/machinery/computer/security{ dir = 8 }, /turf/open/floor/iron/dark, /area/station/security/office) -"lsd" = ( -/obj/machinery/photocopier, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "lsh" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -33750,11 +32617,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/small, /area/station/service/barber) -"lsK" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible, -/turf/open/space/basic, -/area/space/nearstation) +"lsx" = ( +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "lsO" = ( /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron/white/side{ @@ -33802,13 +32667,6 @@ }, /turf/open/floor/iron/white/small, /area/station/service/hydroponics) -"ltz" = ( -/obj/effect/turf_decal/siding/red{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine/n2, -/area/station/engineering/atmos/space_catwalk) "ltE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33817,6 +32675,12 @@ dir = 1 }, /area/station/engineering/storage/tech) +"ltM" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/indigo, +/obj/machinery/atmospherics/pipe/smart/simple/orange, +/turf/open/space/basic, +/area/space/nearstation) "ltP" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/turf_decal/siding/wood{ @@ -33877,19 +32741,25 @@ }, /turf/open/floor/wood/parquet, /area/station/service/greenroom) -"luC" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "luG" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/fitness/recreation/entertainment) +"luK" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engine Airlock" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) +"luM" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ + dir = 1 + }, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) "luP" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -33956,10 +32826,6 @@ }, /turf/open/floor/wood/parquet, /area/station/service/greenroom) -"lvG" = ( -/obj/machinery/atmospherics/components/trinary/filter/critical, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/engineering/supermatter/room) "lvJ" = ( /obj/structure/flora/bush/flowers_br, /turf/open/floor/grass, @@ -34092,20 +32958,6 @@ /obj/structure/broken_flooring/pile/directional/east, /turf/open/floor/plating, /area/station/hallway/secondary/dock) -"lxO" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/power/emitter{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "lxP" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/spawner/random/structure/girder, @@ -34163,11 +33015,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"lyX" = ( +"lyT" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 6 }, -/turf/open/floor/plating, +/obj/structure/closet/firecloset, +/turf/open/floor/engine, /area/station/engineering/supermatter/room) "lyY" = ( /obj/structure/bed, @@ -34390,15 +33243,6 @@ }, /turf/open/floor/iron/small, /area/station/medical/medbay/lobby) -"lBw" = ( -/obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/textured_half, -/area/station/engineering/atmos) "lBy" = ( /obj/structure/railing, /obj/structure/lattice, @@ -34453,6 +33297,18 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/cafeteria, /area/station/science/circuits) +"lCi" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engine Airlock" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "engine_airlock_1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor, +/area/station/engineering/main) "lCt" = ( /obj/effect/turf_decal/siding/red{ dir = 1 @@ -34535,6 +33391,15 @@ /obj/item/clothing/head/utility/welding, /turf/open/floor/iron, /area/station/science/robotics/lab) +"lDP" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "lEa" = ( /turf/open/floor/iron/half, /area/station/hallway/primary/central/fore) @@ -34555,6 +33420,9 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron/dark, /area/station/cargo/office) +"lEn" = ( +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "lEs" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/tile/neutral/opposingcorners{ @@ -34625,6 +33493,26 @@ "lER" = ( /turf/open/floor/iron/dark, /area/station/maintenance/department/engine/atmos) +"lEW" = ( +/obj/item/stack/sheet/plasteel{ + amount = 10; + pixel_x = -2; + pixel_y = 2 + }, +/obj/structure/table, +/obj/item/stack/sheet/rglass{ + amount = 30; + pixel_x = 2; + pixel_y = -2 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/obj/item/clothing/gloves/color/yellow, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "lFg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -34646,15 +33534,6 @@ /obj/machinery/exodrone_launcher, /turf/open/floor/iron/smooth, /area/station/cargo/drone_bay) -"lFE" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge, -/area/station/engineering/supermatter/room) "lFG" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/siding/red, @@ -34662,28 +33541,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) -"lFH" = ( -/obj/machinery/light/cold/dim/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/warning/engine_safety/directional/north, -/turf/open/floor/iron/small, -/area/station/engineering/break_room) -"lFT" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/table/reinforced/titaniumglass, -/obj/item/storage/belt/utility, -/obj/item/pipe_dispenser, -/obj/item/clothing/head/utility/welding{ - pixel_y = 6 - }, -/obj/item/clothing/head/utility/welding{ - pixel_y = 6 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "lGd" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -34708,13 +33565,6 @@ }, /turf/open/misc/sandy_dirt, /area/station/hallway/primary/central/fore) -"lGq" = ( -/obj/structure/fluff/broken_canister_frame, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "lGr" = ( /obj/effect/turf_decal/siding/brown{ dir = 6 @@ -34729,13 +33579,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/smooth, /area/station/command/gateway) -"lGJ" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/item/book/manual/wiki/engineering_guide{ - pixel_y = 6 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "lGK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34777,12 +33620,6 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/carpet/donk, /area/station/command/heads_quarters/qm) -"lHh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sign/warning/radiation/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "lHk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34813,6 +33650,10 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"lHv" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) "lHz" = ( /turf/open/floor/iron/smooth, /area/station/maintenance/solars/port/aft) @@ -34909,6 +33750,15 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/qm) +"lIo" = ( +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Decontamination B" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/break_room) "lIq" = ( /obj/structure/table/wood/fancy/green, /obj/item/paperplane{ @@ -34972,13 +33822,20 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) -"lJF" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ +"lJJ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, /turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) +/area/station/engineering/atmos) "lJV" = ( /obj/structure/bed, /obj/effect/decal/cleanable/dirt, @@ -35040,6 +33897,10 @@ /obj/effect/landmark/start/bitrunner, /turf/open/floor/iron/dark/smooth_half, /area/station/cargo/bitrunning/den) +"lKT" = ( +/obj/machinery/vending/wardrobe/atmos_wardrobe, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "lKV" = ( /turf/open/floor/iron/smooth, /area/station/commons/storage/tools) @@ -35095,16 +33956,6 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"lLE" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 10 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "lLH" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -35121,19 +33972,6 @@ "lLX" = ( /turf/open/floor/iron/showroomfloor, /area/station/medical/surgery/theatre) -"lMg" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - South 2" - }, -/obj/machinery/portable_atmospherics/pump, -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "lMl" = ( /obj/structure/railing{ dir = 4 @@ -35227,20 +34065,6 @@ }, /turf/open/floor/stone, /area/station/command/heads_quarters/hos) -"lNC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = 6; - pixel_y = 17 - }, -/obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "lNF" = ( /obj/effect/spawner/random/entertainment/lighter, /obj/item/cigarette/rollie/mindbreaker{ @@ -35295,15 +34119,6 @@ "lOj" = ( /turf/closed/wall, /area/station/cargo/miningoffice) -"lOk" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) -"lOC" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "lOG" = ( /obj/structure/table, /obj/item/stack/spacecash/c1{ @@ -35329,6 +34144,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"lPb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lPf" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/storage/gas) @@ -35344,12 +34163,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"lPw" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 5 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "lPC" = ( /obj/structure/bookcase/random, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -35382,21 +34195,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/security/execution/education) -"lPW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Atmos to Loop" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/official/random/directional/west, -/turf/open/floor/iron/smooth_edge{ - dir = 8 - }, -/area/station/engineering/supermatter/room) "lQh" = ( /turf/open/floor/iron/small, /area/station/maintenance/port/aft) @@ -35421,6 +34219,17 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/station/maintenance/department/prison) +"lQD" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/camera/directional/north{ + c_tag = "Atmospherics - Central Fore" + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "lQR" = ( /obj/effect/turf_decal/caution{ dir = 4 @@ -35475,18 +34284,11 @@ dir = 8 }, /area/station/science/xenobiology) -"lRz" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Waste to Filter" - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, +"lRq" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/firealarm/directional/south, /turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) +/area/station/engineering/atmos/project) "lRM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35541,12 +34343,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/cafeteria, /area/station/science/breakroom) -"lSF" = ( -/obj/effect/decal/cleanable/generic, -/obj/machinery/light/cold/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "lSI" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35615,18 +34411,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/iron/small, /area/station/maintenance/port/lesser) -"lTC" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 9 - }, -/obj/structure/railing/corner, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Release" - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "lTN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35657,15 +34441,6 @@ "lUo" = ( /turf/open/floor/iron, /area/station/science/lobby) -"lUu" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "lUz" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -35715,6 +34490,18 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/plating, /area/station/cargo/sorting) +"lUZ" = ( +/obj/machinery/atmospherics/components/binary/crystallizer{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "lVg" = ( /obj/structure/transit_tube/horizontal, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35921,6 +34708,14 @@ /obj/item/banner/cargo, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/qm) +"lYa" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/departments/exodrone/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "lYf" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -35967,6 +34762,16 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/qm) +"lYC" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "lYF" = ( /obj/effect/turf_decal/siding/yellow{ dir = 9 @@ -36027,6 +34832,11 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/service/hydroponics) +"lZl" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/components/unary/bluespace_sender, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "lZt" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, @@ -36087,6 +34897,15 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/hallway/secondary/dock) +"lZN" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engineering Office" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron/smooth_half{ + dir = 8 + }, +/area/station/maintenance/department/engine/atmos) "lZP" = ( /obj/structure/table, /obj/item/clothing/head/fedora/det_hat/minor{ @@ -36122,6 +34941,13 @@ /obj/effect/spawner/random/trash, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"mah" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "mak" = ( /obj/machinery/computer/communications{ dir = 1 @@ -36166,6 +34992,16 @@ /obj/structure/fluff/broken_canister_frame, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"mbM" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/camera/directional/south{ + c_tag = "Atmospherics - Central Aft" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "mbV" = ( /obj/effect/spawner/random/entertainment/arcade, /turf/open/floor/eighties/red, @@ -36244,16 +35080,6 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"mcT" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/supermatter) "mcV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -36292,6 +35118,11 @@ }, /turf/open/floor/wood, /area/station/cargo/miningfoundry) +"med" = ( +/obj/structure/table, +/obj/item/stack/sheet/plasteel/fifty, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "meh" = ( /obj/structure/railing{ dir = 4 @@ -36379,22 +35210,16 @@ /obj/machinery/recharger, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/customs) -"mfU" = ( -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/department/electrical) "mgt" = ( /obj/machinery/vending/boozeomat, /obj/machinery/firealarm/directional/south, /turf/open/floor/wood/large, /area/station/command/heads_quarters/captain/private) -"mgz" = ( +"mgO" = ( /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 5 }, -/obj/structure/barricade/wooden, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, +/turf/open/floor/engine, /area/station/engineering/atmospherics_engine) "mgW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36462,16 +35287,6 @@ "miF" = ( /turf/open/floor/stone, /area/station/service/chapel) -"miN" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Gas to Chamber" - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "miP" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 10 @@ -36486,14 +35301,6 @@ }, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"miR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/yellow/line, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "mjf" = ( /obj/structure/table/reinforced/rglass, /obj/machinery/door/window/left/directional/west{ @@ -36670,6 +35477,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"mlH" = ( +/obj/structure/sign/warning/electric_shock, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) "mlK" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -36788,27 +35599,20 @@ }, /turf/open/floor/iron/dark/small, /area/station/maintenance/central/lesser) +"mno" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark/fourcorners, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "mnw" = ( /obj/effect/spawner/random/vending/colavend, /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/smooth, /area/station/hallway/secondary/command) -"mnx" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/machinery/button/door/incinerator_vent_atmos_aux{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "mny" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36816,13 +35620,6 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/iron/dark/small, /area/station/tcommsat/server) -"mnA" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mnC" = ( /obj/structure/table, /obj/item/phone{ @@ -36882,16 +35679,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_command) -"mom" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Waste Hookup" - }, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "mos" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/iron/smooth, @@ -36912,6 +35699,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/central/greater) +"mpe" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "External Gas to Loop" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "mpk" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/circuit/green, @@ -36929,14 +35724,6 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) -"mpE" = ( -/obj/machinery/light/cold/dim/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/structure/sign/poster/official/moth_piping/directional/north, -/turf/open/floor/iron/small, -/area/station/engineering/break_room) "mpQ" = ( /obj/structure/bed{ dir = 4 @@ -36970,7 +35757,7 @@ /obj/item/bedsheet/purple, /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/grimy, -/area/station/commons) +/area/station/service/janitor) "mqz" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -37041,13 +35828,6 @@ }, /turf/open/floor/iron/dark, /area/station/commons/storage/tools) -"mrW" = ( -/obj/machinery/light/cold/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "msg" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37183,19 +35963,6 @@ /obj/machinery/holopad, /turf/open/floor/glass/reinforced, /area/station/command/bridge) -"mvj" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/station/engineering/atmos) -"mvn" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/station/engineering/hallway) "mvo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/telecomms/bus/preset_three, @@ -37283,14 +36050,6 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/glass/reinforced, /area/station/command/bridge) -"mxc" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/station/engineering/atmos) "mxe" = ( /obj/effect/turf_decal/siding/thinplating_new/terracotta, /obj/effect/turf_decal/siding/blue/corner{ @@ -37327,11 +36086,6 @@ }, /turf/open/floor/iron/white, /area/station/hallway/primary/central/aft) -"mxX" = ( -/obj/structure/transit_tube/curved/flipped, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "mya" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37352,13 +36106,6 @@ }, /turf/open/floor/grass, /area/station/service/chapel) -"myi" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 6 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "myl" = ( /obj/machinery/shower/directional/east, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -37366,11 +36113,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/dorms) -"mys" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/diagonal, -/turf/open/space/basic, -/area/space/nearstation) "myt" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/item/kirbyplants/random/fullysynthetic, @@ -37488,12 +36230,6 @@ /obj/machinery/light/small/directional/east, /turf/open/misc/sandy_dirt, /area/station/hallway/primary/central/fore) -"mAK" = ( -/obj/structure/table/greyscale, -/obj/item/clothing/gloves/color/yellow, -/obj/item/wrench, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "mAL" = ( /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron, @@ -37517,6 +36253,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"mBh" = ( +/obj/structure/table, +/obj/machinery/camera/directional/east{ + c_tag = "atmospherics - HFR" + }, +/obj/item/stack/rods/fifty, +/obj/item/stack/rods/fifty, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "mBo" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -37524,13 +36270,6 @@ /obj/item/instrument/eguitar, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) -"mBq" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "mBC" = ( /obj/structure/sign/poster/official/soft_cap_pop_art/directional/north, /turf/open/floor/iron/grimy, @@ -37543,6 +36282,14 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/station/hallway/secondary/dock) +"mCl" = ( +/obj/structure/tank_dispenser, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/light/cold/dim/directional/east, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "mCt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37556,6 +36303,16 @@ dir = 4 }, /area/station/hallway/secondary/construction) +"mCy" = ( +/obj/machinery/atmospherics/components/binary/volume_pump/layer2{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "mCF" = ( /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/construction) @@ -37646,8 +36403,13 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/lab) +"mEa" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) "mEq" = ( /obj/structure/closet/crate/wooden{ name = "Alms Box" @@ -37655,6 +36417,12 @@ /obj/effect/spawner/random/entertainment/money_medium, /turf/open/floor/iron/dark/smooth_corner, /area/station/maintenance/starboard/greater) +"mEt" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "mEy" = ( /obj/machinery/conveyor{ dir = 8; @@ -37736,35 +36504,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"mFD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/tank_holder/extinguisher/advanced, -/turf/open/floor/iron, -/area/station/engineering/atmos) "mFG" = ( /obj/machinery/telecomms/processor/preset_four, /obj/effect/decal/cleanable/dirt, /turf/open/floor/circuit, /area/station/tcommsat/server) -"mFH" = ( -/obj/structure/table/greyscale, -/obj/item/screwdriver, -/obj/item/stack/cable_coil/cut{ - pixel_x = 11; - pixel_y = 7 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Office" - }, -/obj/item/stock_parts/power_store/cell/emproof{ - pixel_x = -6; - pixel_y = 9 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "mFL" = ( /obj/structure/table, /obj/effect/turf_decal/siding/thinplating_new/terracotta{ @@ -37777,12 +36521,6 @@ /obj/structure/cable, /turf/open/floor/eighties, /area/station/service/abandoned_gambling_den/gaming) -"mFZ" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - Turbine Entrance" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mGg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -37853,6 +36591,21 @@ /obj/structure/sink/directional/west, /turf/open/floor/iron/white/small, /area/station/medical/storage) +"mGO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/caution/stand_clear, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"mGV" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/main) "mGY" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/smooth, @@ -37876,6 +36629,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark/small, /area/station/maintenance/central/lesser) +"mHj" = ( +/obj/machinery/power/energy_accumulator/grounding_rod/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "mHZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37884,6 +36644,19 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/open/floor/iron/grimy, /area/station/tcommsat/server) +"mIe" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "mIg" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/catwalk_floor/iron_dark, @@ -38100,21 +36873,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"mKK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"mKV" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ - dir = 1 - }, -/turf/open/floor/engine/o2, -/area/station/engineering/atmos/space_catwalk) "mKY" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -38153,10 +36911,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) -"mLD" = ( -/obj/structure/cable, -/turf/closed/wall/r_wall, -/area/station/engineering/engine_smes) "mLH" = ( /obj/machinery/light/cold/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -38217,9 +36971,6 @@ /obj/structure/sign/warning/pods/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/electrical) -"mMH" = ( -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "mMN" = ( /obj/structure/chair/office{ dir = 8 @@ -38343,12 +37094,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"mPe" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "mPq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -38423,10 +37168,6 @@ dir = 8 }, /area/station/command/heads_quarters/hos) -"mRA" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron/stairs/left, -/area/station/engineering/atmos) "mRB" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/neutral/end, @@ -38447,32 +37188,13 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"mRY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 6 - }, -/obj/structure/cable, +"mRQ" = ( +/obj/structure/closet/crate/solarpanel_small, /turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) +/area/station/engineering/main) "mSa" = ( /turf/open/floor/iron, /area/station/commons/fitness/locker_room) -"mSc" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/brown/visible{ - dir = 10 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "mSA" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -38488,6 +37210,16 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/central) +"mSN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/computer/atmos_control/oxygen_tank{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "mSQ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -38495,23 +37227,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/grass, /area/station/service/chapel) -"mSS" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "mTc" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -38539,25 +37254,12 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, /area/station/cargo/sorting) -"mTi" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Gas Port"; - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "mTl" = ( /turf/closed/wall, /area/station/cargo/sorting) "mTs" = ( /turf/closed/wall/r_wall, /area/station/security/prison/work) -"mTt" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/engine, -/area/station/engineering/atmos) "mTy" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/blue/full, @@ -38579,17 +37281,6 @@ "mTB" = ( /turf/closed/wall, /area/station/command/gateway) -"mTC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "mTM" = ( /obj/structure/cable, /turf/open/floor/circuit, @@ -38678,17 +37369,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/grimy, /area/station/cargo/boutique) -"mUI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - North Corridor" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/iron/smooth, -/area/station/engineering/main) "mUO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -38712,6 +37392,11 @@ /obj/structure/cable, /turf/open/floor/iron/small, /area/station/hallway/primary/central/aft) +"mVi" = ( +/obj/machinery/igniter/incinerator_atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "mVm" = ( /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 1 @@ -38766,12 +37451,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/science/lower) -"mWs" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/small, -/area/station/maintenance/department/engine) "mWE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, @@ -38796,6 +37475,14 @@ }, /turf/open/floor/iron/white/small, /area/station/service/hydroponics) +"mWU" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "mWY" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/structure/chair/sofa/bench/left{ @@ -38813,26 +37500,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"mXm" = ( -/obj/machinery/atmospherics/components/binary/pump/off/general/visible{ - dir = 4; - name = "CO2 to Pure" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mXt" = ( /obj/machinery/rnd/production/techfab/department/medical, /obj/effect/turf_decal/stripes/box, /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark/small, /area/station/medical/storage) -"mXx" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "N2O to Pure" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "mXD" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -38973,6 +37646,7 @@ "mZj" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/portable_atmospherics/canister, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "mZA" = ( @@ -39037,16 +37711,11 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) -"nbj" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Cooling Loop Bypass"; - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) +"naS" = ( +/obj/structure/marker_beacon/fuchsia, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "nbF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/small/directional/west, @@ -39062,6 +37731,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"nbY" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "ncb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -39081,6 +37753,13 @@ }, /turf/open/floor/plating, /area/station/service/janitor) +"ncj" = ( +/obj/structure/closet/secure_closet/atmospherics, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "nck" = ( /obj/machinery/fax{ fax_name = "Engineering Lobby"; @@ -39138,6 +37817,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/turret_protected/ai_upload) +"ndh" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ndp" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -39163,6 +37848,11 @@ /obj/structure/tank_dispenser/oxygen, /turf/open/floor/iron, /area/station/security/tram) +"ndO" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation/entertainment) "ndY" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -39189,27 +37879,6 @@ }, /turf/open/floor/wood, /area/station/service/chapel) -"neL" = ( -/obj/structure/closet/crate{ - name = "Materials Crate" - }, -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/sheet/plasteel/fifty, -/obj/item/stack/sheet/plastic/five, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/titaniumglass/fifty, -/obj/item/stack/sheet/mineral/titanium/fifty, -/obj/item/stack/rods/fifty, -/obj/machinery/light/cold/dim/directional/west, -/turf/open/floor/iron/dark/small, -/area/station/engineering/storage_shared) -"neM" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "nfg" = ( /obj/machinery/holopad, /obj/effect/turf_decal/siding/thinplating{ @@ -39236,6 +37905,13 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/station/holodeck/rec_center) +"ngn" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "ngq" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -39248,24 +37924,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) -"nhe" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/effect/landmark/navigate_destination, -/obj/effect/spawner/random/engineering/tracking_beacon, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "nhl" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -39309,12 +37967,6 @@ }, /turf/open/floor/catwalk_floor/iron, /area/station/science/xenobiology) -"nhE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/smooth_edge, -/area/station/engineering/supermatter/room) "nhU" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -39361,10 +38013,6 @@ /obj/machinery/vending/wardrobe/chem_wardrobe, /turf/open/floor/iron, /area/station/medical/chemistry) -"niv" = ( -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "niw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -39461,21 +38109,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/wood/tile, /area/station/command/heads_quarters/hop) -"njH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "njL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -39511,6 +38144,14 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/textured_half, /area/station/security) +"njZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) "nki" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/cold/dim/directional/west, @@ -39524,17 +38165,6 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"nkp" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/light/broken/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"nks" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/atmos/space_catwalk) "nkw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -39592,18 +38222,16 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"nlp" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "nlC" = ( /obj/item/kirbyplants/random/fullysynthetic, /turf/open/floor/iron/white/corner{ dir = 4 }, /area/station/science/xenobiology) -"nlI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 5 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "nlQ" = ( /obj/machinery/holopad, /obj/effect/turf_decal/siding/thinplating{ @@ -39655,6 +38283,10 @@ /obj/effect/turf_decal/siding/wideplating, /turf/open/floor/wood, /area/station/engineering/main) +"nmR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "nmX" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -39757,15 +38389,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/security/prison/safe) -"noU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor{ - id = "Secure Storage"; - name = "Secure Storage" - }, -/turf/open/floor/plating/rust, -/area/station/engineering/main) "noV" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/shutters{ @@ -39798,19 +38421,16 @@ }, /turf/open/floor/wood/tile, /area/station/service/bar) -"npL" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Engine Coolant Bypass"; - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "npV" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/lawoffice) +"npW" = ( +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "npZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ @@ -39831,32 +38451,31 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/white/small, /area/station/commons/toilet/restrooms) -"nqi" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/corner{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "nqx" = ( /obj/machinery/power/turbine/turbine_outlet{ dir = 8 }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"nqA" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "nqJ" = ( /obj/structure/sink/directional/south, /obj/effect/turf_decal/siding/wood, /obj/structure/mirror/directional/north, /turf/open/floor/iron/freezer, /area/station/command/corporate_suite) +"nqN" = ( +/obj/effect/spawner/random/structure/crate_loot, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "nqV" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/tile/green/half/contrasted{ @@ -39916,9 +38535,6 @@ }, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/supply) -"nsa" = ( -/turf/closed/wall, -/area/station/engineering/atmospherics_engine) "nsc" = ( /obj/structure/cable, /obj/item/kirbyplants/organic/applebush, @@ -39948,9 +38564,6 @@ }, /turf/open/floor/iron/small, /area/station/security/brig) -"nsy" = ( -/turf/closed/wall/r_wall/rust, -/area/station/engineering/hallway) "nsz" = ( /obj/effect/spawner/random/vending/snackvend, /obj/structure/cable, @@ -40127,13 +38740,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"nuu" = ( -/obj/machinery/incident_display/delam/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/break_room) "nuC" = ( /obj/effect/turf_decal/siding, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40209,6 +38815,17 @@ }, /turf/open/floor/iron/recharge_floor, /area/station/maintenance/port/aft) +"nvQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ + dir = 8 + }, +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) +"nwe" = ( +/obj/structure/cable, +/obj/structure/reflector/single/anchored, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "nwj" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -40267,11 +38884,6 @@ /obj/machinery/keycard_auth/directional/south, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) -"nxO" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/turf/open/floor/plating, -/area/station/engineering/atmos) "nxX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40392,6 +39004,18 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) +"nzj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) +"nzx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "nzA" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40444,11 +39068,6 @@ /obj/effect/landmark/start/roboticist, /turf/open/floor/iron, /area/station/science/robotics/lab) -"nBd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "nBq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40486,13 +39105,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"nBM" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos/pumproom) "nCe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40507,6 +39119,18 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"nCp" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Incinerator Access" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/engineering/atmos) "nCt" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -40578,17 +39202,16 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/service/chapel) +"nDP" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "nDQ" = ( /obj/structure/chair{ dir = 4 }, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"nEa" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "nEh" = ( /obj/structure/falsewall, /turf/open/floor/plating, @@ -40636,26 +39259,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/cytology) -"nEL" = ( -/obj/structure/transit_tube/station/dispenser/reverse/flipped{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) -"nEN" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 10 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "nEY" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, @@ -40713,6 +39316,25 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"nFK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"nFT" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engine Airlock" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "engine_airlock_2" + }, +/turf/open/floor/catwalk_floor, +/area/station/engineering/break_room) "nFU" = ( /obj/machinery/door/airlock{ name = "Maintenance" @@ -40735,6 +39357,14 @@ /obj/machinery/portable_atmospherics/pump, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"nGc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible, +/obj/machinery/power/apc/auto_name/directional/west{ + areastring = "/area/station/science/ordnance/freezerchamber" + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "nGe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40760,22 +39390,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/grass, /area/station/medical/virology) -"nGm" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) -"nGt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/window/reinforced/plasma/spawner/directional/west, -/obj/structure/cable, -/obj/machinery/power/energy_accumulator/grounding_rod/anchored, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "nGu" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -40878,25 +39492,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/commons/storage/art) -"nHP" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 6 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) -"nHR" = ( -/obj/machinery/atmospherics/components/tank/plasma, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering Turbine" - }, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/disposal/incinerator) "nHU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40933,13 +39528,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) -"nID" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "nIJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -40951,27 +39539,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/medical/virology) -"nIK" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 - }, -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, -/turf/open/space/basic, -/area/space/nearstation) -"nIL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/clothing/head/cone{ - pixel_x = 24; - pixel_y = 2 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "nIT" = ( /obj/structure/railing{ dir = 6 @@ -41011,6 +39578,19 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"nJp" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"nJx" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/small, +/area/station/maintenance/department/engine) "nJG" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -41058,6 +39638,7 @@ dir = 1 }, /obj/machinery/portable_atmospherics/canister, +/obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/ordnance) "nLH" = ( @@ -41100,14 +39681,6 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"nMQ" = ( -/obj/machinery/computer/atmos_control/oxygen_tank{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/official/random/directional/east, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "nMV" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -41148,6 +39721,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_command) +"nNm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "nNz" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -41173,6 +39751,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/prison) +"nNI" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "nNZ" = ( /obj/structure/tank_dispenser, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, @@ -41278,13 +39863,6 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark, /area/station/security/prison/safe) -"nQk" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/machinery/door/airlock/maintenance{ - name = "Transit Tube Station" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "nQo" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -41330,16 +39908,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/smooth, /area/station/engineering/break_room) -"nQC" = ( -/obj/item/toy/plush/shark{ - name = "Sir Vesk"; - desc = "This radical looking plushie has some radical air-sufing fins. He loves to turn vents on and ride the pressure-wave. Duuuuuuuude. Way cool.." - }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos/office) "nQE" = ( /obj/structure/railing{ dir = 4 @@ -41422,10 +39990,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"nSo" = ( -/obj/machinery/igniter/incinerator_atmos, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "nSA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ @@ -41444,6 +40008,11 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"nSP" = ( +/obj/structure/cable, +/obj/machinery/power/emitter/welded, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "nSY" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -41459,6 +40028,18 @@ }, /turf/open/floor/iron/textured_half, /area/station/hallway/primary/central/fore) +"nTf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating/corner, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "nTi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41507,10 +40088,6 @@ }, /turf/open/floor/iron/small, /area/station/medical/morgue) -"nTK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "nUd" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -41538,33 +40115,16 @@ }, /turf/open/floor/iron/smooth, /area/station/cargo/warehouse) -"nUB" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/brown/visible, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "nUK" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/barricade/wooden/crude, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/cargo/boutique) +"nUN" = ( +/obj/structure/closet/radiation, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "nUQ" = ( /obj/structure/chair{ dir = 8 @@ -41592,12 +40152,15 @@ }, /turf/open/floor/iron/white/small, /area/station/service/janitor) -"nVe" = ( -/obj/machinery/door/window/right/directional/north, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/light/small/directional/east, +"nVb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 1 + }, /turf/open/floor/engine, -/area/station/engineering/supermatter) +/area/station/engineering/supermatter/room) "nVg" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -41667,25 +40230,13 @@ /obj/structure/hedge, /turf/open/floor/iron/smooth, /area/station/hallway/secondary/command) -"nWE" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer5{ - dir = 9 +"nWH" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Pure to Ports" }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) +/turf/open/floor/iron, +/area/station/engineering/atmos) "nWV" = ( /obj/effect/spawner/random/entertainment/arcade{ dir = 1 @@ -41753,7 +40304,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/cubicle) "nYk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -41783,33 +40334,10 @@ }, /turf/open/misc/sandy_dirt, /area/station/commons/fitness/locker_room) -"nYD" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "nYH" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/iron/smooth, /area/station/maintenance/solars/port/aft) -"nYP" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "nYQ" = ( /obj/machinery/vending/wardrobe/cargo_wardrobe, /obj/machinery/camera/autoname/directional/south, @@ -41897,21 +40425,6 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) -"oaB" = ( -/obj/machinery/holopad, -/obj/effect/landmark/start/station_engineer, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/engineering/supermatter/room) -"oaJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "oaK" = ( /obj/structure/window/spawner/directional/south, /obj/effect/decal/cleanable/dirt, @@ -41931,15 +40444,6 @@ /obj/item/stock_parts/power_store/cell/high, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"obd" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 10 - }, -/obj/structure/cable, -/obj/machinery/firealarm/directional/north, -/obj/machinery/space_heater, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "obe" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ @@ -41976,6 +40480,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/textured_half, /area/station/hallway/secondary/dock) +"obV" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "obW" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -42005,6 +40518,12 @@ /obj/machinery/computer/records/security, /turf/open/floor/iron, /area/station/security/brig/entrance) +"odg" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/obj/machinery/atmospherics/pipe/smart/simple/orange, +/turf/open/space/basic, +/area/space/nearstation) "odh" = ( /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/open/floor/plating, @@ -42024,16 +40543,6 @@ }, /turf/open/floor/wood/tile, /area/station/maintenance/central/lesser) -"odE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/power/emitter{ - dir = 1 - }, -/obj/effect/decal/cleanable/leaper_sludge, -/turf/open/floor/plating/rust, -/area/station/engineering/supermatter/room) "odH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/structure/disposalpipe/segment{ @@ -42057,11 +40566,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/storage) -"oet" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/main) "oev" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42150,6 +40654,11 @@ }, /turf/open/floor/iron/white/small, /area/station/medical/storage) +"ogx" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "ogE" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -42315,6 +40824,9 @@ /obj/item/storage/bag/xeno, /turf/open/floor/iron/dark/small, /area/station/science/xenobiology) +"oit" = ( +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) "oiw" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -42346,6 +40858,14 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/plating, /area/station/cargo/office) +"oiO" = ( +/obj/machinery/door/airlock/external/glass{ + name = "ATMOS PROJECT Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "oiP" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -42354,11 +40874,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) -"oiS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/twelve_percent_spirit_board, -/turf/open/floor/wood, -/area/station/service/chapel/office) "oiT" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 10 @@ -42409,48 +40924,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/security/lockers) -"ojK" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) -"ojW" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/frame/machine, -/obj/item/circuitboard/machine/mass_driver, -/obj/item/stock_parts/matter_bin{ - pixel_x = 9; - pixel_y = 8 - }, -/obj/item/stock_parts/micro_laser/high{ - pixel_x = -6; - pixel_y = -5 - }, -/obj/item/stock_parts/servo/femto{ - pixel_y = 8; - pixel_x = -11 - }, -/obj/effect/decal/cleanable/glass, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/atmos/office) -"okg" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "okk" = ( /obj/structure/table, /obj/item/screwdriver, @@ -42460,23 +40933,23 @@ /obj/machinery/status_display/ai, /turf/closed/wall, /area/station/hallway/secondary/entry) -"okt" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos{ - name = "Atmospherics Control" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/engineering/atmos) "okB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/engine, /area/station/science/xenobiology) +"okJ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"okP" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/circuit, +/area/station/tcommsat/server) "okW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42502,6 +40975,13 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron/herringbone, /area/station/commons/dorms) +"olh" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "olj" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/cable, @@ -42550,30 +41030,11 @@ "ona" = ( /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"onb" = ( -/obj/machinery/atmospherics/components/unary/passive_vent{ - name = "Engine Exhaust" - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "ong" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"onv" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "onw" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -42631,15 +41092,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/small, /area/station/security/brig) -"ooe" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/engineering/atmos) "oom" = ( /obj/structure/cable, /obj/machinery/door/airlock{ @@ -42664,24 +41116,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"opc" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/light/floor, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "opn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/small, /area/station/command/teleporter) -"opo" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "opv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42692,6 +41131,13 @@ dir = 1 }, /area/station/hallway/secondary/exit/departure_lounge) +"opz" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - Air" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) "opA" = ( /obj/effect/spawner/random/structure/girder, /obj/structure/barricade/wooden, @@ -42757,6 +41203,15 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/secondary/dock) +"oqO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/structure/table, +/obj/item/stack/sheet/mineral/plasma/five, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "oqT" = ( /obj/machinery/camera/autoname/directional/north, /obj/machinery/firealarm/directional/north, @@ -42808,6 +41263,13 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/maintenance/solars/starboard/fore) +"orK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "orW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, @@ -42816,16 +41278,6 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) -"orY" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "osa" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -42833,6 +41285,17 @@ }, /turf/open/space/basic, /area/space/nearstation) +"osd" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4; + name = "Air to Distro" + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "ose" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42860,20 +41323,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) -"osu" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "osy" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -42895,6 +41344,16 @@ dir = 8 }, /area/station/engineering/break_room) +"osV" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/obj/machinery/shower/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/small, +/area/station/engineering/break_room) "osY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/broken_flooring/corner/directional/south, @@ -42946,16 +41405,13 @@ dir = 1 }, /area/station/command/corporate_suite) -"oua" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/horizontal{ - dir = 4 +"ouh" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 1 }, -/turf/open/space/basic, -/area/space/nearstation) -"ouj" = ( -/turf/closed/wall, -/area/station/engineering/engine_smes) +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "oul" = ( /obj/effect/turf_decal/weather/dirt, /obj/structure/flora/bush/flowers_yw/style_2, @@ -43034,19 +41490,8 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/cytology) -"ovt" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) "ovB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/alien/weeds, @@ -43054,6 +41499,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +"ovF" = ( +/obj/machinery/suit_storage_unit/atmos, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "ovQ" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -43068,11 +41517,6 @@ dir = 1 }, /area/station/command/gateway) -"owd" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/engineering/hallway) "owl" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -43093,6 +41537,10 @@ }, /turf/open/floor/circuit, /area/station/science/server) +"oww" = ( +/obj/machinery/portable_atmospherics/pipe_scrubber, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "owD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43163,6 +41611,20 @@ }, /turf/open/floor/iron/white/small, /area/station/science/ordnance/storage) +"oxi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oxj" = ( +/obj/structure/reflector/single/anchored{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "oxm" = ( /obj/effect/turf_decal/bot, /obj/machinery/door/window/right/directional/south{ @@ -43258,22 +41720,11 @@ /obj/structure/reagent_dispensers/plumbed, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"ozz" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine/air, -/area/station/engineering/atmos/space_catwalk) -"ozM" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, +"ozy" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/floor, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "ozO" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -43296,12 +41747,28 @@ /obj/structure/steam_vent, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) +"oAp" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "oAr" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/structure/closet/bombcloset/security, /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/station/security/lockers) +"oAv" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/green/visible{ + dir = 4 + }, +/obj/machinery/camera/directional/south{ + c_tag = "atmospherics - lower"; + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "oAA" = ( /obj/structure/closet/emcloset, /obj/effect/mapping_helpers/broken_floor, @@ -43321,12 +41788,6 @@ /obj/structure/alien/weeds/node, /turf/open/misc/asteroid, /area/station/maintenance/starboard/greater) -"oBk" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4, -/turf/open/space/basic, -/area/space/nearstation) "oBv" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -43425,6 +41886,14 @@ /obj/structure/broken_flooring/pile/directional/east, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) +"oCS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "oCV" = ( /obj/effect/turf_decal/trimline/neutral/line, /obj/effect/turf_decal/trimline/neutral/line{ @@ -43439,25 +41908,36 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"oDa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ +"oDb" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"oDd" = ( +/obj/machinery/door/poddoor{ + id = "Secure Storage top"; + name = "Secure Storage" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/small, +/area/station/engineering/storage_shared) +"oDj" = ( +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage/gas) "oDB" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"oDE" = ( -/obj/structure/lattice, -/obj/machinery/camera/directional/south{ - c_tag = "Atmospherics - North Exterior" - }, -/turf/open/space/basic, -/area/space/nearstation) "oDX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/chair/wood{ @@ -43479,13 +41959,6 @@ /obj/structure/holosign/barrier/atmos/tram, /turf/open/floor/tram, /area/station/security/tram) -"oEb" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/item/reagent_containers/cup/beaker/oldstation{ - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "oEk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43585,6 +42058,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"oGf" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) "oGk" = ( /turf/open/floor/circuit, /area/station/tcommsat/server) @@ -43599,11 +42081,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/smooth_half, /area/station/cargo/storage) -"oGn" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) "oGo" = ( /obj/structure/table/glass, /obj/item/stock_parts/power_store/cell/high{ @@ -43616,6 +42093,21 @@ }, /turf/open/floor/carpet/executive, /area/station/command/meeting_room) +"oGp" = ( +/obj/machinery/light/small/directional/south{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) +"oGA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "oGL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43683,31 +42175,10 @@ dir = 1 }, /area/station/security/execution/transfer) -"oHJ" = ( -/obj/structure/table/greyscale, -/obj/item/pen{ - pixel_x = 13; - pixel_y = 4 - }, -/obj/machinery/light/small/directional/south, -/obj/item/flatpack{ - board = /obj/item/circuitboard/machine/flatpacker; - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/multitool{ - pixel_x = 7; - pixel_y = -2 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) -"oHO" = ( -/obj/structure/chair/plastic{ - dir = 1 - }, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) +"oHH" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "oIf" = ( /obj/effect/turf_decal/sand/plating, /obj/machinery/modular_computer/preset/engineering{ @@ -43945,11 +42416,24 @@ }, /turf/open/floor/iron/white/small, /area/station/commons/toilet/restrooms) -"oLN" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/tank_dispenser, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/plating, +"oLS" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"oMw" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/railing, +/turf/open/floor/iron/small, /area/station/engineering/atmos/office) "oMy" = ( /obj/structure/lattice/catwalk, @@ -43960,6 +42444,7 @@ /obj/effect/turf_decal/tile/neutral, /obj/structure/sign/departments/holy/directional/south, /obj/machinery/light/cold/directional/south, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) "oMI" = ( @@ -43967,6 +42452,18 @@ /mob/living/basic/slime, /turf/open/floor/engine, /area/station/science/xenobiology) +"oMV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/structure/cable, +/obj/effect/turf_decal/arrows{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "oNd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/blue/corner{ @@ -44127,10 +42624,6 @@ }, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai_upload) -"oPg" = ( -/obj/machinery/air_sensor/mix_tank, -/turf/open/floor/engine/airless, -/area/station/engineering/atmos) "oPh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44233,19 +42726,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/cargo/storage) -"oQs" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "oQF" = ( /turf/closed/wall/r_wall, /area/station/security/execution/transfer) @@ -44378,25 +42858,12 @@ }, /turf/open/floor/iron/smooth, /area/station/command/bridge) -"oSw" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "oSx" = ( /obj/effect/turf_decal/siding/red, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) -"oSF" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "oTg" = ( /obj/effect/turf_decal/tile/brown/opposingcorners{ dir = 1 @@ -44460,16 +42927,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) -"oTY" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 5 - }, -/turf/open/space/basic, -/area/space/nearstation) "oUb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44491,23 +42948,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"oUq" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) -"oUz" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/obj/structure/sign/warning/electric_shock/directional/west, -/turf/open/floor/plating, -/area/station/engineering/engine_smes) "oUB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44540,6 +42980,20 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/security/evidence) +"oUQ" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/break_room) +"oUY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/obj/machinery/meter, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "oVl" = ( /obj/structure/sign/picture_frame/portrait/bar{ pixel_y = 32 @@ -44645,12 +43099,6 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/iron/dark/small, /area/station/tcommsat/server) -"oWE" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/sign/warning/engine_safety/directional/east, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "oXa" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -44664,6 +43112,13 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron, /area/station/hallway/secondary/dock) +"oXz" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "oXK" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -44712,14 +43167,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) -"oYN" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Mix to Filter" - }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "oYS" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/computer/station_alert{ @@ -44777,14 +43224,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/dorms) -"oZQ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "oZY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44812,12 +43251,6 @@ /obj/structure/tram, /turf/open/floor/tram, /area/station/security/tram) -"paW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ - dir = 8 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "paX" = ( /obj/structure/chair/bronze{ dir = 8 @@ -44838,23 +43271,6 @@ }, /turf/open/floor/iron/smooth, /area/station/service/greenroom) -"pbj" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/light/cold/directional/north, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "pbk" = ( /obj/effect/turf_decal/siding/thinplating/terracotta, /turf/open/floor/iron, @@ -44922,14 +43338,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"pbT" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "pca" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/red/line{ @@ -44952,7 +43360,7 @@ /obj/machinery/vending/wardrobe/jani_wardrobe, /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/small, -/area/station/commons) +/area/station/service/janitor) "pcv" = ( /obj/machinery/door/airlock/command{ name = "Head of Security's Bedroom" @@ -44991,14 +43399,12 @@ /obj/structure/thermoplastic/light, /turf/open/floor/tram, /area/station/maintenance/port/aft) -"pdh" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) +"pdj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/meter, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "pdl" = ( /obj/machinery/light/small/directional/north, /obj/structure/disposalpipe/segment{ @@ -45031,6 +43437,10 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/misc/sandy_dirt, /area/station/science/cytology) +"pdD" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "pdR" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -45069,6 +43479,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"pen" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "pep" = ( /obj/structure/cable, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ @@ -45096,17 +43511,6 @@ }, /turf/open/floor/grass, /area/station/service/chapel) -"peW" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 5 - }, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - Atmospherics Nitrous Chamber"; - dir = 9; - network = list("ss13","engineering") - }, -/turf/open/floor/engine/co2, -/area/station/engineering/atmos/space_catwalk) "pfd" = ( /obj/effect/turf_decal/stripes/white/corner{ dir = 1 @@ -45128,15 +43532,6 @@ /obj/machinery/light/warm/directional/north, /turf/open/floor/iron/herringbone, /area/station/commons/dorms) -"pft" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ - dir = 4 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, -/area/station/engineering/hallway) "pfu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -45169,13 +43564,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"pfx" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) "pfC" = ( /obj/effect/turf_decal/siding/thinplating_new/terracotta{ dir = 5 @@ -45187,24 +43575,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/small, /area/station/ai_monitored/command/storage/eva) -"pfD" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "pfT" = ( /obj/structure/training_machine, /turf/open/floor/iron/smooth_large, @@ -45239,15 +43609,16 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/small, /area/station/security/prison/shower) -"pgr" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 +"pgs" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "pgy" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -45257,11 +43628,17 @@ /obj/item/kirbyplants/fern, /turf/open/floor/iron/white, /area/station/science/cytology) -"pgU" = ( -/obj/structure/steam_vent, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) +"pgF" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "phd" = ( /obj/effect/turf_decal/siding/red{ dir = 4 @@ -45275,6 +43652,13 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"phk" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "phm" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -45381,6 +43765,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"piN" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "pjb" = ( /obj/structure/broken_flooring/singular/directional/south, /turf/open/floor/iron, @@ -45452,12 +43840,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) -"pkd" = ( -/obj/machinery/door/window/right/directional/south, -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "pke" = ( /obj/machinery/door/airlock/centcom{ name = "Disposals Access:" @@ -45482,6 +43864,15 @@ /obj/item/weldingtool, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine/atmos) +"pkL" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "pkQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -45528,6 +43919,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"plp" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "plr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, @@ -45580,11 +43978,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/science/auxlab/firing_range) -"pmA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/break_room) "pmE" = ( /obj/effect/turf_decal/tile/yellow/diagonal_centre, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45750,14 +44143,6 @@ /obj/effect/turf_decal/siding/wideplating/dark/corner, /turf/open/floor/iron, /area/station/security) -"poV" = ( -/obj/effect/turf_decal/siding/wideplating, -/obj/machinery/camera/directional/west{ - dir = 10; - c_tag = "Atmospherics - Control" - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "ppk" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -45785,16 +44170,6 @@ /obj/structure/cable, /turf/open/floor/iron/white/small, /area/station/command/heads_quarters/cmo) -"ppr" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/reflector/single{ - dir = 9 - }, -/turf/open/space/basic, -/area/space/nearstation) "pps" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/window/spawner/directional/north, @@ -45840,25 +44215,6 @@ "pqm" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage/tcomms) -"pqo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/incident_display/delam/directional/north, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "pqv" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -45868,13 +44224,6 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"pqH" = ( -/obj/structure/closet/firecloset, -/obj/item/clothing/glasses/meson, -/obj/item/radio/intercom/directional/east, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/engineering/break_room) "pqK" = ( /obj/structure/cable, /obj/machinery/door/window/left/directional/south, @@ -45923,18 +44272,6 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark, /area/station/security/prison/safe) -"prI" = ( -/turf/closed/wall, -/area/station/engineering/hallway) -"prV" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 8 - }, -/obj/effect/landmark/start/station_engineer, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "prW" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -45961,19 +44298,6 @@ dir = 1 }, /area/station/science/auxlab/firing_range) -"pss" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "psz" = ( /obj/machinery/door/window/left/directional/west{ name = "Fitness Ring" @@ -46041,6 +44365,14 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +"ptq" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/components/binary/volume_pump, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "ptt" = ( /obj/structure/chair/wood/wings, /obj/effect/turf_decal/siding/wood{ @@ -46059,12 +44391,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/stone, /area/station/command/corporate_suite) -"ptz" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmos/space_catwalk) "ptC" = ( /obj/machinery/shower/directional/west, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -46079,6 +44405,11 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) +"ptW" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "ptX" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -46102,21 +44433,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/diagonal, /area/station/command/heads_quarters/hop) -"puI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 1 - }, -/obj/machinery/door/airlock/external/glass{ - name = "North Tanks Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) "pvi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46132,6 +44448,7 @@ /area/station/commons/fitness/recreation/entertainment) "pvB" = ( /obj/machinery/camera/autoname/directional/south, +/obj/structure/cable, /turf/open/floor/iron/herringbone, /area/station/commons/dorms) "pvC" = ( @@ -46140,29 +44457,6 @@ }, /turf/open/floor/wood, /area/station/service/chapel/office) -"pvE" = ( -/obj/effect/turf_decal/siding/wideplating{ - dir = 4 - }, -/obj/structure/chair/plastic{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) -"pvP" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/siding/thinplating_new/corner, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "pvY" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 @@ -46181,25 +44475,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/hallway/abandoned_command) -"pwv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/closed/wall, -/area/station/engineering/atmos) "pwA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /turf/open/floor/iron/white/side, /area/station/science/research) -"pwD" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/effect/landmark/atmospheric_sanity/ignore_area, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "pwJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46213,6 +44494,13 @@ "pwN" = ( /turf/open/floor/iron/dark/small, /area/station/service/chapel/storage) +"pwR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "pxj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46261,16 +44549,6 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/stone, /area/station/service/abandoned_gambling_den) -"pyl" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/item/clothing/head/cone{ - pixel_y = -13 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "pyt" = ( /obj/machinery/light/floor, /turf/open/floor/grass, @@ -46299,10 +44577,12 @@ "pzd" = ( /turf/closed/wall, /area/station/commons/fitness/recreation/entertainment) -"pzi" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/hallway) +"pzm" = ( +/obj/machinery/incident_display/delam/directional/north, +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/turf/open/floor/iron/small, +/area/station/engineering/break_room) "pzy" = ( /obj/structure/table, /obj/item/storage/box/prisoner{ @@ -46314,6 +44594,14 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/security/execution/transfer) +"pzA" = ( +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "pzK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding, @@ -46331,11 +44619,12 @@ /obj/item/stack/sheet/mineral/titanium, /turf/open/floor/tram, /area/station/maintenance/department/medical/central) -"pAa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/structure/barricade, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) +"pAb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "pAl" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46381,6 +44670,25 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"pAu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"pAx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "pAH" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -46463,26 +44771,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"pCo" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "pCv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46505,12 +44793,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/security/brig) -"pCQ" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/plating, -/area/station/engineering/engine_smes) "pCU" = ( /obj/structure/cable, /obj/machinery/door/airlock{ @@ -46552,19 +44834,6 @@ }, /turf/open/floor/wood/tile, /area/station/service/lawoffice) -"pDH" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - name = "Locker Room" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "pDK" = ( /obj/effect/decal/cleanable/generic, /obj/effect/spawner/random/structure/tank_holder, @@ -46594,16 +44863,6 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron/herringbone, /area/station/commons/dorms) -"pEa" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/fireaxecabinet/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/station/engineering/atmos) "pEo" = ( /obj/item/radio/intercom/directional/west, /obj/structure/disposalpipe/segment, @@ -46726,27 +44985,6 @@ /obj/machinery/door/window/brigdoor/right/directional/west, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/customs/auxiliary) -"pFS" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/item/stack/cable_coil/five, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) -"pGi" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "pGp" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -46757,13 +44995,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"pGt" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Pure to Waste" - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "pGD" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -46899,6 +45130,12 @@ }, /turf/open/floor/wood, /area/station/commons/fitness/recreation) +"pHW" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron/stairs/medium{ + dir = 1 + }, +/area/station/engineering/atmos) "pHY" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -46974,18 +45211,19 @@ /obj/structure/bodycontainer/morgue, /turf/open/floor/iron/dark/small, /area/station/service/chapel/storage) -"pIB" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "pIC" = ( /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 8 }, /turf/open/floor/iron/white/small, /area/station/service/hydroponics) +"pID" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "pIS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -47062,21 +45300,19 @@ /obj/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"pJT" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 6 +"pJY" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 8 }, -/turf/open/space/basic, -/area/space/nearstation) -"pKg" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 10 +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 6 }, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output, -/turf/open/floor/engine/co2, -/area/station/engineering/atmos/space_catwalk) +/turf/open/floor/wood, +/area/station/engineering/atmos/office) "pKi" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -47133,6 +45369,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"pKX" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + initialize_directions = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "pLf" = ( /obj/machinery/griddle, /obj/effect/turf_decal/siding{ @@ -47148,7 +45393,7 @@ name = "Gun Lab" }, /obj/effect/mapping_helpers/airlock/access/all/science/general, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/auxlab/firing_range) "pLj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -47184,6 +45429,15 @@ dir = 1 }, /area/station/command/corporate_showroom) +"pLs" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ + dir = 8 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "pLI" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -47226,18 +45480,8 @@ /obj/effect/mapping_helpers/airlock/access/all/science/genetics, /obj/machinery/door/firedoor, /obj/structure/cable, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) -"pML" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 6 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "pMS" = ( /obj/structure/table, /obj/machinery/light/small/directional/south, @@ -47430,12 +45674,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/engine, /area/station/science/xenobiology) -"pPH" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Atmospherics Project Bay" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "pPK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47583,6 +45821,16 @@ }, /turf/open/space/basic, /area/space/nearstation) +"pSz" = ( +/obj/machinery/door/poddoor{ + id = "Secure Storage top"; + name = "Secure Storage" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/small, +/area/station/engineering/storage_shared) "pSB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/tank/air{ @@ -47613,10 +45861,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"pSQ" = ( -/obj/structure/cable, -/turf/closed/wall, -/area/station/engineering/supermatter/room) "pST" = ( /obj/structure/table, /obj/item/plant_analyzer, @@ -47639,13 +45883,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/holodeck/rec_center) -"pTp" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/wood, -/area/station/engineering/atmos) "pTq" = ( /obj/machinery/door/airlock/maintenance{ name = "Crematorium Maintenance" @@ -47661,15 +45898,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/service/lawoffice) -"pTt" = ( -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/obj/machinery/door/airlock/engineering{ - name = "Suit Lockers" - }, -/turf/open/floor/iron/textured_half{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "pTz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47692,13 +45920,6 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"pUe" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine/o2, -/area/station/engineering/atmos/space_catwalk) "pUs" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/any/engineering/construction, @@ -47732,19 +45953,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"pUK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge{ - name = "Turbine" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/disposal/incinerator) "pUL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/table/reinforced/plastitaniumglass, @@ -47755,10 +45963,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark, /area/station/command/corporate_dock) -"pUR" = ( -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "pUS" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -47931,11 +46135,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/science/xenobiology) -"pXc" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "pXh" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -47960,15 +46159,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/hallway/secondary/exit/departure_lounge) -"pXu" = ( -/obj/effect/turf_decal/siding/wideplating{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "pXz" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted, /obj/machinery/firealarm/directional/south, @@ -48023,6 +46213,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"pYm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "pYr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48043,14 +46237,6 @@ }, /turf/open/floor/engine, /area/station/science/explab) -"pYP" = ( -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" - }, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos) "pYY" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -48120,8 +46306,18 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/herringbone, /area/station/commons/dorms) +"qbd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "qbj" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/structure/closet/secure_closet/security/sec, @@ -48148,13 +46344,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/checker, /area/station/security/breakroom) -"qbv" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "qby" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -48199,15 +46388,6 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/break_room) -"qbR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 6 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "qcf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -48231,6 +46411,7 @@ "qcC" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness/recreation/entertainment) "qcF" = ( @@ -48263,19 +46444,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/prison) -"qdJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/railing/corner/end/flip{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/obj/structure/sign/warning/radiation/directional/south, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "qdM" = ( /obj/structure/chair/sofa/bench/left{ dir = 4 @@ -48337,10 +46505,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron, /area/station/security/prison/workout) -"qeq" = ( -/obj/structure/fluff/broken_canister_frame, -/turf/open/misc/asteroid, -/area/station/maintenance/department/engine/atmos) "qeP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48367,18 +46531,13 @@ }, /turf/open/floor/iron/diagonal, /area/station/engineering/lobby) -"qfn" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 9 - }, -/obj/machinery/air_sensor/plasma_tank, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - Atmospherics CO2 Chamber"; - dir = 9; - network = list("ss13","engineering") +"qfi" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 }, -/turf/open/floor/engine/plasma, -/area/station/engineering/atmos/space_catwalk) +/turf/open/floor/plating, +/area/station/engineering/atmos) "qfo" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/departments/lawyer/directional/east, @@ -48494,6 +46653,12 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/white, /area/station/science/cytology) +"qhi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "qhD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48544,12 +46709,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/wood, /area/station/commons/fitness/recreation) -"qid" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "qie" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -48585,7 +46744,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "qiz" = ( /obj/effect/spawner/structure/window, @@ -48625,6 +46784,15 @@ }, /turf/open/floor/plating, /area/station/tcommsat/server) +"qje" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/atmospheric_sanity/ignore_area, +/turf/open/floor/iron, +/area/station/engineering/hallway) "qjh" = ( /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/white, @@ -48648,12 +46816,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/electrical) -"qjq" = ( -/obj/machinery/door/window/left/directional/north, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/effect/turf_decal/stripes/white/full, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "qjt" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/neutral/line, @@ -48674,15 +46836,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/meeting_room) -"qjx" = ( -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/break_room) "qjy" = ( /obj/structure/hedge, /turf/open/floor/iron/smooth, @@ -48734,13 +46887,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"qkI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) "qkK" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -48765,13 +46911,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"qlk" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/horizontal{ - dir = 2 - }, -/turf/open/space/basic, -/area/space/nearstation) "qlr" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, @@ -48813,14 +46952,6 @@ /obj/structure/broken_flooring/corner/directional/south, /turf/open/floor/plating, /area/station/hallway/secondary/dock) -"qmo" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "qmv" = ( /obj/machinery/door/airlock/maintenance{ name = "Atmospherics Maintenance" @@ -48880,6 +47011,12 @@ }, /turf/open/floor/iron/solarpanel/airless, /area/station/solars/starboard/fore) +"qnC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 4 + }, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) "qnJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48895,13 +47032,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/plating, /area/station/medical/morgue) -"qol" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/engineering/atmos) "qop" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -48944,6 +47074,11 @@ /obj/structure/steam_vent, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) +"qpL" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "qpO" = ( /obj/structure/chair{ dir = 1 @@ -48967,12 +47102,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"qqr" = ( -/obj/machinery/atmospherics/components/binary/pump/off/general/visible{ - dir = 4; - name = "O2 to pure" +"qqj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 }, -/turf/open/floor/iron/dark, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, +/turf/open/floor/iron, /area/station/engineering/atmos) "qqC" = ( /obj/structure/chair/comfy/carp{ @@ -48991,38 +47126,10 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/eighties/red, /area/station/hallway/primary/central/fore) -"qqJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron/smooth_corner{ - dir = 1 - }, -/area/station/engineering/supermatter/room) "qrb" = ( /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, /area/station/science/xenobiology) -"qrc" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/reflector/box{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "qrg" = ( /obj/structure/cable, /obj/structure/displaycase/captain{ @@ -49040,16 +47147,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/xenobiology) -"qsa" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/camera/directional/south{ - c_tag = "Engineering - Airlock" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) "qsg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/terminal, @@ -49066,6 +47163,24 @@ /obj/effect/landmark/blobstart, /turf/open/floor/iron, /area/station/hallway/secondary/construction) +"qsK" = ( +/obj/structure/chair/office, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) +"qsO" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "qsR" = ( /obj/structure/table/reinforced, /obj/effect/mapping_helpers/broken_floor, @@ -49103,17 +47218,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/cargo/sorting) -"qtv" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/wood, -/area/station/engineering/atmos/office) "qtE" = ( /obj/structure/bed{ dir = 4 @@ -49134,30 +47238,13 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/smooth, /area/station/cargo/drone_bay) -"qtP" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" - }, -/obj/machinery/camera/directional/east{ - c_tag = "Atmospherics - Central" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "qtQ" = ( /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"quh" = ( +/turf/closed/wall/r_wall/rust, +/area/station/engineering/atmospherics_engine) "qul" = ( /obj/machinery/light/small/directional/east, /obj/machinery/light_switch/directional/east, @@ -49208,23 +47295,6 @@ }, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/engineering) -"quP" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/item/clothing/gloves/color/black, -/obj/item/electronics/airalarm{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/machinery/light/cold/dim/directional/west, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "quU" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain) @@ -49263,17 +47333,6 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"qwc" = ( -/obj/structure/tank_holder/emergency_oxygen, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos) -"qwo" = ( -/obj/structure/lattice, -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - South Exterior" - }, -/turf/open/space/basic, -/area/space/nearstation) "qwq" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/machinery/computer/prisoner/management{ @@ -49318,6 +47377,7 @@ /turf/open/floor/iron, /area/station/security) "qwK" = ( +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/chapel/office) "qwU" = ( @@ -49350,13 +47410,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security) -"qxz" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "qxB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49371,6 +47424,11 @@ }, /turf/open/floor/plating/elevatorshaft, /area/station/engineering/break_room) +"qxG" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "qxN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49394,31 +47452,6 @@ /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/misc/sandy_dirt, /area/station/science/research) -"qyb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 5 - }, -/obj/structure/table, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 10 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ - dir = 4 - }, -/obj/machinery/light_switch/directional/south, -/obj/effect/spawner/random/entertainment/lighter{ - pixel_x = -7 - }, -/obj/item/flashlight{ - pixel_y = 8; - pixel_x = 3 - }, -/obj/item/flashlight{ - pixel_y = 3; - pixel_x = 10 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos/pumproom) "qyx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/chair{ @@ -49527,7 +47560,7 @@ name = "Break Room" }, /obj/effect/mapping_helpers/airlock/access/all/science/general, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "qzL" = ( /obj/structure/disposalpipe/segment{ @@ -49626,13 +47659,10 @@ }, /turf/open/floor/engine/n2o, /area/station/ai_monitored/turret_protected/ai) -"qAR" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/tank, -/turf/open/floor/plating, -/area/station/engineering/atmos/pumproom) +"qAX" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "qBc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49656,7 +47686,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/light/small/directional/north, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "qBi" = ( /obj/effect/decal/cleanable/dirt, @@ -49820,50 +47850,11 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/open/floor/wood/tile, /area/station/tcommsat/server) -"qDq" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/brown/visible, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) -"qDv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 8 - }, -/turf/open/floor/iron/smooth_corner, -/area/station/engineering/supermatter/room) "qDx" = ( /obj/structure/toilet, /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/iron/white/small, /area/station/maintenance/port/aft) -"qDA" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engine Airlock" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "engine_airlock_1" - }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/main) "qDC" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -50011,22 +48002,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/security/processing) +"qFn" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/project) "qFv" = ( /obj/effect/turf_decal/tile/green{ dir = 8 }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"qFw" = ( -/obj/structure/fluff/broken_canister_frame, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos) +"qFH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/machinery/meter, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "qGc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, @@ -50035,6 +48025,15 @@ }, /turf/open/floor/iron/textured_half, /area/station/hallway/primary/central/fore) +"qGd" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - CO2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/carbon_output{ + dir = 1 + }, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "qGe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, @@ -50056,10 +48055,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/grass/Airless, /area/station/hallway/primary/central/aft) -"qGk" = ( -/obj/structure/chair/stool/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "qGu" = ( /obj/effect/turf_decal/siding/dark_red, /obj/item/radio/intercom/directional/south, @@ -50169,6 +48164,13 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/white/side, /area/station/science/lower) +"qIF" = ( +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 8; + name = "mix to engine" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "qIM" = ( /obj/structure/cable, /obj/machinery/firealarm/directional/east, @@ -50212,34 +48214,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"qJN" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/table/reinforced/titaniumglass, -/obj/item/clothing/suit/hazardvest{ - pixel_y = 8 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_y = 5 - }, -/obj/item/clothing/suit/hazardvest{ - pixel_y = 2 - }, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_y = 4 - }, -/obj/item/tank/internals/emergency_oxygen/engi{ - pixel_y = 4 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = -12; - pixel_y = 10 - }, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = -15; - pixel_y = 5 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "qKe" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/effect/turf_decal/siding/green, @@ -50262,6 +48236,21 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/commons/dorms) +"qKC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/pipe_dispenser{ + pixel_y = -7; + pixel_x = 2 + }, +/obj/item/pipe_dispenser{ + pixel_y = 5; + pixel_x = -2 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "qKD" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 @@ -50325,6 +48314,13 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/security/courtroom) +"qLI" = ( +/obj/machinery/power/port_gen/pacman, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "qLU" = ( /obj/effect/turf_decal/tile/green/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -50361,26 +48357,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron, /area/station/security/courtroom) -"qMu" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/engine_smes) -"qME" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 5 - }, -/turf/open/space/basic, -/area/space/nearstation) "qMG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, @@ -50418,15 +48394,21 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/escape) -"qNN" = ( -/obj/machinery/atmospherics/components/binary/valve{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "qNO" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/central) +"qNT" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engine Airlock" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "engine_airlock_2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/engineering/break_room) "qNU" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, @@ -50461,6 +48443,10 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) +"qOM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "qON" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/table, @@ -50488,13 +48474,6 @@ /obj/effect/landmark/start/chemist, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"qPg" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 1 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "qPJ" = ( /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron, @@ -50502,13 +48481,21 @@ "qPN" = ( /turf/closed/wall/r_wall, /area/station/security/prison/safe) -"qPO" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ - dir = 6 +"qPZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/radio/intercom/directional/north, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 }, -/obj/machinery/meter/layer2, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "qQi" = ( /obj/structure/chair/stool/directional/north, /obj/effect/turf_decal/siding/yellow{ @@ -50674,6 +48661,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/port) +"qSo" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + pixel_x = -1; + pixel_y = -3 + }, +/obj/item/stack/cable_coil, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "qSC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line, @@ -50777,14 +48773,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) -"qUd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "qUe" = ( /obj/structure/cable, /obj/machinery/door/airlock/glass, @@ -50845,12 +48833,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central/lesser) -"qUN" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/turf/open/floor/iron/stairs/medium{ - dir = 1 - }, -/area/station/engineering/atmos) "qUS" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted{ dir = 4 @@ -51041,16 +49023,6 @@ /obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/plating, /area/station/command/heads_quarters/hop) -"qXd" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/structure/closet/emcloset, -/obj/machinery/light/small/directional/east, -/obj/structure/sign/poster/official/random/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "qXe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51147,12 +49119,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/iron/dark/small, /area/station/security/tram) -"qYp" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 10 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "qYr" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -51256,6 +49222,15 @@ /obj/structure/sign/departments/medbay/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"qZq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "qZw" = ( /obj/machinery/door/airlock/public/glass{ name = "Dormatories" @@ -51271,13 +49246,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/small, /area/station/medical/medbay/lobby) -"qZE" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engineering Office" - }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/iron/textured_half, -/area/station/maintenance/department/engine/atmos) "qZG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/broken_flooring/corner/directional/south, @@ -51316,13 +49284,6 @@ }, /turf/open/floor/tram, /area/station/security/tram) -"rao" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "rax" = ( /obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 8 @@ -51347,11 +49308,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"raP" = ( -/obj/item/kirbyplants/random, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "raR" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/turf_decal/siding/wood{ @@ -51375,9 +49331,6 @@ }, /turf/open/floor/tram, /area/station/security/tram) -"rbg" = ( -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "rbj" = ( /obj/item/radio/intercom/directional/east, /obj/structure/disposalpipe/trunk{ @@ -51386,23 +49339,13 @@ /obj/machinery/disposal/bin, /turf/open/floor/wood/parquet, /area/station/service/library) -"rbl" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/light/cold/dim/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) -"rbp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor{ - id = "Secure Storage"; - name = "Secure Storage" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating/rust, -/area/station/engineering/main) +"rbn" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos) "rbs" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -51471,25 +49414,13 @@ /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/engine, /area/station/science/xenobiology) -"rco" = ( -/obj/machinery/shieldgen, -/obj/item/clothing/gloves/color/black{ - pixel_y = -3; - pixel_x = -2 - }, -/obj/item/cigarette{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/clothing/mask/gas{ - pixel_y = 5 - }, -/obj/item/clothing/head/cone{ - pixel_x = 1; - pixel_y = 15 +"rcr" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - N2" }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output, +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) "rcE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51519,6 +49450,9 @@ /obj/machinery/light/small/dim/directional/east, /turf/open/floor/iron, /area/station/maintenance/department/engine/atmos) +"rdk" = ( +/turf/open/floor/engine, +/area/station/engineering/supermatter) "rds" = ( /obj/machinery/computer/slot_machine{ pixel_y = 2 @@ -51636,19 +49570,6 @@ }, /turf/open/floor/wood, /area/station/hallway/secondary/entry) -"reL" = ( -/obj/effect/turf_decal/siding/wideplating{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/requests_console/directional/west{ - department = "Atmospherics"; - name = "Atmospherics Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "reM" = ( /turf/closed/wall/r_wall, /area/station/security/checkpoint/escape) @@ -51730,6 +49651,13 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"rgH" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rgK" = ( /obj/effect/turf_decal/trimline/blue/corner{ dir = 8 @@ -51741,6 +49669,14 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/glass, /area/station/hallway/primary/central/aft) +"rgN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "rgS" = ( /obj/structure/railing/corner/end{ dir = 1 @@ -51752,13 +49688,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/small, /area/station/maintenance/department/engine/atmos) -"rhg" = ( -/obj/machinery/air_sensor/engine_chamber, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "rhj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51766,6 +49695,16 @@ /obj/structure/broken_flooring/corner/directional/south, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"rhl" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "rhm" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 10 @@ -51799,17 +49738,6 @@ /obj/item/toy/figure/detective, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"rhu" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 5 - }, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - Atmospherics CO2 Chamber"; - dir = 9; - network = list("ss13","engineering") - }, -/turf/open/floor/engine/n2o, -/area/station/engineering/atmos/space_catwalk) "rhy" = ( /obj/structure/chair{ dir = 1 @@ -51837,6 +49765,18 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) +"rhP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"rhW" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/obj/machinery/meter, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "rie" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/cargo_technician, @@ -51869,6 +49809,16 @@ "rir" = ( /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) +"riJ" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1; + initialize_directions = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "riS" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 @@ -51904,14 +49854,6 @@ dir = 1 }, /area/station/maintenance/department/electrical) -"rjr" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/turf/open/floor/plating/rust, -/area/station/engineering/supermatter) "rjv" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -51921,10 +49863,6 @@ /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron/dark/small, /area/station/hallway/primary/fore) -"rjE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "rjN" = ( /obj/structure/cable, /obj/structure/chair{ @@ -51932,15 +49870,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"rkk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "rko" = ( /obj/structure/sign/directions/evac/directional/west, /obj/structure/sign/directions/science/directional/west{ @@ -51967,13 +49896,6 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/plating, /area/station/medical/morgue) -"rkS" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 8 - }, -/obj/machinery/air_sensor/nitrous_tank, -/turf/open/floor/engine/n2o, -/area/station/engineering/atmos/space_catwalk) "rlb" = ( /obj/item/kirbyplants/random/fullysynthetic, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -52000,14 +49922,6 @@ dir = 1 }, /area/station/commons/dorms) -"rlk" = ( -/obj/machinery/light/broken/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/corner, -/obj/structure/sign/warning/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "rlq" = ( /obj/structure/bed{ dir = 4 @@ -52037,6 +49951,13 @@ /obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +"rlX" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "rma" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 6 @@ -52051,16 +49972,6 @@ }, /turf/open/floor/grass, /area/station/service/chapel) -"rmD" = ( -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/obj/machinery/door/airlock/engineering/glass{ - name = "Locker Room" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/engineering/engine_smes) "rmM" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/iron/edge{ @@ -52116,24 +50027,6 @@ /obj/structure/thermoplastic/light, /turf/open/floor/tram, /area/station/maintenance/port/aft) -"roc" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) -"roe" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/railing/corner/end{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/structure/sign/warning/radiation/directional/north, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "roi" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -52161,6 +50054,12 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +"roL" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/small, +/area/station/engineering/break_room) "roS" = ( /obj/structure/cable, /obj/structure/chair/stool/directional/west, @@ -52226,6 +50125,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) "rpV" = ( @@ -52277,26 +50177,19 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"rqV" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 9 - }, -/turf/open/space/basic, -/area/space/nearstation) "rrb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_dark, /area/station/science/xenobiology) +"rrd" = ( +/obj/machinery/atmospherics/components/binary/volume_pump{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rro" = ( /obj/structure/railing, /obj/structure/disposalpipe/segment{ @@ -52322,15 +50215,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/science/robotics/augments) -"rrG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/engineering/supermatter/room) "rrQ" = ( /obj/item/kirbyplants/random/fullysynthetic, /obj/effect/turf_decal/tile/dark_red/half/contrasted, @@ -52374,6 +50258,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/service/lawoffice) +"rsj" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engine Airlock" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "engine_airlock_2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/engineering/break_room) "rsl" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -52585,18 +50482,8 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/genetics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) -"rwl" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 9 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "rwo" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/camera/directional/west, @@ -52651,13 +50538,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"rxs" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron, -/area/station/engineering/atmos) "rxu" = ( /obj/structure/table, /obj/machinery/airalarm/directional/south, @@ -52672,6 +50552,22 @@ /obj/item/razor, /turf/open/floor/iron/dark/small, /area/station/security/execution/education) +"rxx" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"rxB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rxD" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/blue, @@ -52805,6 +50701,7 @@ icon_state = "L9"; pixel_y = -15 }, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) "rzJ" = ( @@ -52832,6 +50729,12 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) +"rAl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "rAt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52849,6 +50752,17 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"rAy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "rAA" = ( /obj/structure/flora/bush/flowers_pp/style_random, /mob/living/carbon/human/species/monkey, @@ -52875,18 +50789,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/plating, /area/station/engineering/gravity_generator) -"rAH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/status_display/evac/directional/east, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/structure/reflector/box/anchored{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "rAR" = ( /obj/structure/cable, /obj/machinery/door/airlock/security/glass{ @@ -52895,6 +50797,10 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/textured_half, /area/station/security/brig/entrance) +"rAU" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) "rBe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52932,10 +50838,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/service/janitor, /turf/open/floor/iron/textured_half{ dir = 8 }, -/area/station/commons) +/area/station/service/janitor) "rBy" = ( /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, @@ -53005,21 +50912,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/lone, /area/station/service/abandoned_gambling_den) -"rCU" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/obj/structure/sink/directional/east, -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, -/turf/open/floor/iron/dark/small, -/area/station/engineering/main) -"rCX" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input, -/turf/open/floor/engine/plasma, -/area/station/engineering/atmos/space_catwalk) "rDc" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/yellow{ @@ -53063,6 +50955,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/corner, /area/station/commons/dorms) +"rDF" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rDP" = ( /obj/item/kirbyplants/random/fullysynthetic, /obj/effect/turf_decal/tile/dark_red/opposingcorners, @@ -53107,17 +51005,6 @@ }, /turf/open/floor/wood/parquet, /area/station/service/library) -"rEH" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos{ - name = "Locker Room" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/turf/open/floor/catwalk_floor, -/area/station/engineering/atmos) "rEJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/camera/directional/east, @@ -53370,6 +51257,11 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/station/maintenance/hallway/abandoned_command) +"rHQ" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "rHY" = ( /obj/effect/turf_decal/siding/wideplating_new/terracotta{ dir = 1 @@ -53384,6 +51276,13 @@ /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /turf/open/floor/iron, /area/station/security/lockers) +"rIe" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rIn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ @@ -53397,6 +51296,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/herringbone, /area/station/service/abandoned_gambling_den/gaming) +"rIv" = ( +/obj/machinery/light/small/directional/south{ + dir = 4 + }, +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "rIJ" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, @@ -53421,6 +51326,9 @@ }, /turf/open/floor/grass, /area/station/science/xenobiology) +"rJJ" = ( +/turf/closed/wall/r_wall/rust, +/area/station/engineering/atmos/storage) "rJW" = ( /obj/machinery/suit_storage_unit/hos, /obj/effect/decal/cleanable/dirt, @@ -53434,6 +51342,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"rKd" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "rKv" = ( /obj/structure/broken_flooring/singular/directional/east, /turf/open/floor/iron, @@ -53562,17 +51476,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"rMs" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/space/basic, -/area/space/nearstation) "rMt" = ( /obj/structure/flora/bush/flowers_br/style_random, /obj/structure/flora/rock/pile/style_random, @@ -53582,6 +51485,13 @@ }, /turf/open/misc/sandy_dirt, /area/station/security/tram) +"rMx" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rMH" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -53649,6 +51559,9 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"rOa" = ( +/turf/closed/wall/r_wall/rust, +/area/station/maintenance/disposal/incinerator) "rOG" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -53688,6 +51601,20 @@ }, /turf/open/floor/iron/smooth_large, /area/station/science/robotics/mechbay) +"rPt" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engine Airlock" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "engine_airlock_1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/engineering/main) "rPx" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -53772,14 +51699,25 @@ "rQi" = ( /turf/closed/wall/r_wall, /area/station/engineering/main) -"rQm" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) +"rQq" = ( +/obj/machinery/computer/atmos_control/mix_tank{ + dir = 8 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rQw" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/engine, /area/station/science/xenobiology) +"rQy" = ( +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "rQA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53801,23 +51739,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy, /turf/open/floor/iron/dark/small, /area/station/medical/pharmacy) -"rQH" = ( -/obj/structure/rack, -/obj/item/clothing/neck/petcollar, -/obj/item/flashlight/flare/candle{ - pixel_x = 10 - }, -/obj/item/flashlight/flare/candle{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/screwdriver{ - pixel_y = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/maintenance/department/engine/atmos) "rQN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ @@ -53827,6 +51748,12 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"rQR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "rQS" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -53872,6 +51799,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/courtroom) +"rRJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor{ + id = "Secure Storage below"; + name = "Secure Storage" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/rust, +/area/station/engineering/main) +"rRK" = ( +/obj/structure/table, +/obj/structure/railing/corner, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos) "rRQ" = ( /obj/structure/hedge, /obj/item/radio/intercom/directional/south, @@ -54009,15 +51953,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"rUa" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/stairs{ - dir = 4 - }, -/area/station/engineering/atmos) "rUb" = ( /obj/structure/hedge, /obj/machinery/status_display/evac/directional/east, @@ -54041,12 +51976,6 @@ /obj/item/assembly/mousetrap/armed, /turf/open/floor/stone, /area/station/service/abandoned_gambling_den) -"rUs" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Decontamination B" - }, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/break_room) "rUt" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -54058,25 +51987,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"rUD" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 5 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "rUI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54100,6 +52010,13 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"rVa" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/item/kirbyplants/organic/plant24, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "rVj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/cold/directional/north, @@ -54140,15 +52057,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/science/auxlab/firing_range) -"rVA" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "rVH" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/table/glass, @@ -54211,6 +52119,9 @@ /obj/item/clothing/head/costume/griffin, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) +"rWv" = ( +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "rWA" = ( /obj/structure/disposalpipe/segment, /obj/structure/broken_flooring/pile/directional/east, @@ -54265,17 +52176,6 @@ dir = 1 }, /area/station/cargo/bitrunning/den) -"rWQ" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "engine_airlock_2" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "rWU" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -54401,7 +52301,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "rZq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54464,18 +52364,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/blue, /area/station/cargo/boutique) -"sav" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 10 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "saz" = ( /obj/machinery/status_display/ai/directional/west, /obj/effect/turf_decal/tile/neutral{ @@ -54493,18 +52381,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/science/robotics/augments) -"sbf" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "sbq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, @@ -54520,15 +52396,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/cafeteria, /area/station/hallway/secondary/exit/departure_lounge) -"sbG" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/obj/machinery/door/airlock/engineering/glass{ - name = "Freezer Room" - }, -/turf/open/floor/iron/textured_half, -/area/station/engineering/supermatter/room) "sbN" = ( /obj/machinery/rnd/server, /turf/open/floor/circuit, @@ -54618,27 +52485,15 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"sdF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) +"sdI" = ( +/turf/open/floor/engine/co2, +/area/station/engineering/atmos) "sea" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/white/corner, /turf/open/floor/iron/dark/small, /area/station/science/xenobiology) -"sed" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/holopad, -/obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "ser" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54655,6 +52510,12 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/cmo) +"seK" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "seM" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -54674,24 +52535,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/space/basic, /area/space/nearstation) -"sfd" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 10 +"sfe" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - N2O" }, -/turf/open/floor/engine/o2, -/area/station/engineering/atmos/space_catwalk) +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrous_output{ + dir = 1 + }, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) "sfk" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) -"sfl" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "sfq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54726,11 +52583,20 @@ dir = 8 }, /area/station/engineering/main) +"sfX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "sge" = ( /obj/structure/reagent_dispensers/beerkeg, /obj/item/clothing/head/costume/festive, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"sgs" = ( +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) "sgw" = ( /obj/machinery/mass_driver/ordnance{ dir = 1 @@ -54801,14 +52667,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) -"shK" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/spawner/random/vending/snackvend, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/engineering/hallway) +"shI" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input{ + dir = 1 + }, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) "shL" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One"; @@ -54819,6 +52683,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"shQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "shR" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -54832,19 +52708,6 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/secondary/construction) -"sio" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "sip" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/item/robot_suit, @@ -54865,11 +52728,27 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"siI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "siN" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/structure/chair/stool/bar/directional/north, /turf/open/floor/iron, /area/station/holodeck/rec_center) +"sjf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "sjl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54905,14 +52784,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"sjZ" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "skc" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -55011,14 +52882,6 @@ "slw" = ( /turf/closed/wall, /area/station/cargo/drone_bay) -"slC" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/structure/spider/stickyweb, -/obj/item/hfr_box/corner, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) "slG" = ( /obj/docking_port/stationary{ dir = 2; @@ -55053,6 +52916,17 @@ /obj/effect/landmark/navigate_destination/sec, /turf/open/floor/iron, /area/station/hallway/primary/port) +"slO" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "atmospherics - entrance" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "slY" = ( /turf/closed/wall, /area/station/maintenance/port/fore) @@ -55065,20 +52939,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/wood, /area/station/security/detectives_office) -"smd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_cw{ - dir = 6 - }, -/obj/effect/landmark/navigate_destination/incinerator, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "smf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55104,6 +52964,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/smooth_large, /area/station/science/robotics/mechbay) +"smo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible, +/turf/open/floor/iron, +/area/station/engineering/atmos) "smH" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -55130,15 +52994,6 @@ }, /turf/open/floor/plating, /area/station/engineering/lobby) -"snm" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/red/end{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "snn" = ( /obj/machinery/rnd/experimentor, /turf/open/floor/engine, @@ -55173,15 +53028,6 @@ /obj/effect/turf_decal/tile/dark_red/opposingcorners, /turf/open/floor/iron, /area/station/security/tram) -"snX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/reflector/single/anchored{ - dir = 9 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "snZ" = ( /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) @@ -55200,28 +53046,6 @@ dir = 1 }, /area/station/hallway/secondary/dock) -"son" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Gas to Filter" - }, -/turf/open/floor/engine, -/area/station/engineering/supermatter) -"soo" = ( -/obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "sor" = ( /obj/machinery/computer/exoscanner_control{ dir = 1 @@ -55254,18 +53078,6 @@ /obj/structure/tram, /turf/open/floor/tram, /area/station/security/tram) -"soB" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/engine/n2o, -/area/station/engineering/atmos/space_catwalk) -"soC" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) "soD" = ( /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 8 @@ -55285,10 +53097,6 @@ /obj/effect/spawner/random/engineering/canister, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"spa" = ( -/obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos) "spg" = ( /obj/effect/mapping_helpers/airlock/access/any/security/general, /obj/machinery/door/airlock/security{ @@ -55357,10 +53165,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"sqg" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/hallway) "sqh" = ( /obj/item/kirbyplants/random, /obj/machinery/light/cold/directional/west, @@ -55406,14 +53210,10 @@ }, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/customs/auxiliary) -"sqB" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 8; - initialize_directions = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) +"sqP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "sqV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/sofa/bench/left{ @@ -55495,6 +53295,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/science/robotics/lab) +"srL" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/components/binary/volume_pump/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) +"srQ" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) "srT" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -55506,6 +53321,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) "sso" = ( @@ -55518,6 +53334,10 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/dock) +"ssr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/station/maintenance/disposal/incinerator) "sst" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -55532,10 +53352,6 @@ "ssz" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/science/xenobiology) -"ssP" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, -/turf/closed/wall/r_wall, -/area/station/engineering/hallway) "ssY" = ( /obj/structure/kitchenspike, /obj/effect/turf_decal/weather/snow/corner{ @@ -55571,13 +53387,6 @@ dir = 1 }, /area/station/maintenance/department/science/xenobiology) -"stm" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/break_room) "stH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/brown/half, @@ -55640,6 +53449,13 @@ /obj/machinery/holopad, /turf/open/floor/iron/white/small, /area/station/science/lab) +"sus" = ( +/obj/machinery/power/emitter/welded{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "suw" = ( /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom/directional/south, @@ -55678,18 +53494,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"svr" = ( -/obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron/textured_half, -/area/station/engineering/atmos) "svs" = ( /turf/closed/wall, /area/station/hallway/secondary/dock) @@ -55712,11 +53516,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/science/xenobiology) -"svB" = ( -/obj/structure/lattice, -/obj/structure/grille/broken, -/turf/open/space/basic, -/area/space/nearstation) "svD" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/flora/bush/flowers_yw, @@ -55742,6 +53541,10 @@ /obj/structure/reagent_dispensers/servingdish, /turf/open/floor/iron/kitchen/small, /area/station/security/prison/mess) +"svR" = ( +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "svU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55792,6 +53595,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) +"swp" = ( +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/corner, +/turf/open/floor/wood, +/area/station/engineering/main) "swu" = ( /turf/open/floor/wood, /area/station/security/detectives_office) @@ -55906,13 +53716,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"sxD" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/carbon_input, -/turf/open/floor/engine/co2, -/area/station/engineering/atmos/space_catwalk) "sxF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55943,13 +53746,6 @@ }, /turf/open/space/basic, /area/space) -"syc" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrous_input, -/turf/open/floor/engine/n2o, -/area/station/engineering/atmos/space_catwalk) "sye" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/window/reinforced/spawner/directional/east, @@ -56004,6 +53800,13 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/misc/sandy_dirt, /area/station/medical/medbay/lobby) +"syI" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "syN" = ( /obj/effect/spawner/random/trash, /turf/open/floor/plating, @@ -56025,45 +53828,6 @@ }, /turf/open/floor/wood, /area/station/service/chapel) -"sAb" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, -/turf/open/space/basic, -/area/space/nearstation) -"sAM" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/siding/wideplating{ - dir = 1 - }, -/obj/structure/closet/secure_closet/atmospherics, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light_switch/directional/south, -/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"sAW" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "sBf" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -56128,6 +53892,13 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine/atmos) +"sCo" = ( +/obj/effect/turf_decal/siding/wideplating, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "sCp" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -56152,6 +53923,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig/entrance) +"sCr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/atmos) "sCu" = ( /obj/machinery/computer/prisoner/management{ dir = 8 @@ -56186,40 +53963,9 @@ /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"sDh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering - Engine Bay East" - }, -/obj/structure/sign/poster/official/random/directional/east, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/engineering/supermatter/room) "sDj" = ( /turf/closed/wall/r_wall, /area/station/science/cytology) -"sDl" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/space_catwalk) -"sDo" = ( -/obj/effect/decal/cleanable/molten_object, -/obj/item/storage/box/gloves{ - pixel_y = -7; - pixel_x = -15 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "sDp" = ( /obj/structure/cable, /obj/structure/table, @@ -56274,12 +54020,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"sEj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +"sEe" = ( /obj/structure/cable, -/obj/machinery/light/small/directional/east, -/turf/open/floor/catwalk_floor, -/area/station/engineering/break_room) +/obj/machinery/light/directional/west, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering Supermatter Emitters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "sEn" = ( /obj/item/clothing/head/cone, /obj/item/clothing/head/cone{ @@ -56400,12 +54148,20 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"sHG" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/engineering/atmos) "sHH" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/portable_atmospherics/canister/plasma, /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/smooth_large, /area/station/engineering/storage_shared) +"sHJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage) "sHM" = ( /obj/structure/railing, /obj/structure/disposalpipe/segment{ @@ -56451,17 +54207,20 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore/greater) -"sID" = ( -/obj/effect/turf_decal/arrows/white, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) +"sIL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine, +/area/station/maintenance/disposal/incinerator) "sIO" = ( /obj/structure/grille/broken, /obj/item/shard/titanium, /obj/effect/decal/cleanable/glass/titanium, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"sIR" = ( +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "sIZ" = ( /obj/structure/table/wood, /obj/effect/spawner/random/bureaucracy/folder, @@ -56506,6 +54265,26 @@ }, /turf/open/floor/iron/dark, /area/station/medical/medbay/aft) +"sJF" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Office" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "atmos_airlock_1" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/engineering/atmos/office) "sJL" = ( /obj/structure/table, /obj/effect/turf_decal/siding{ @@ -56596,25 +54375,6 @@ /obj/effect/gibspawner, /turf/open/floor/wood, /area/station/maintenance/starboard/greater) -"sLu" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/greyscale, -/obj/item/weldingtool/mini/empty{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/item/storage/box/masks{ - pixel_x = 10; - pixel_y = 13 - }, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -4; - pixel_y = 7 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "sLB" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -56658,6 +54418,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/dock) +"sLY" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) "sMh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/airlock/research{ @@ -56735,17 +54504,6 @@ dir = 8 }, /area/station/hallway/secondary/dock) -"sNc" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/siding/wideplating{ - dir = 1 - }, -/obj/machinery/vending/wardrobe/atmos_wardrobe, -/obj/machinery/light/small/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/atmos) "sNg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -56771,6 +54529,27 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"sNG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) +"sNJ" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "sNW" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -56889,17 +54668,6 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"sQa" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "sQb" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -56921,21 +54689,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"sQt" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/reflector/single{ - dir = 9 - }, -/turf/open/space/basic, -/area/space/nearstation) "sQv" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/spawner/random/structure/closet_empty/crate, @@ -57056,6 +54809,16 @@ "sRL" = ( /turf/closed/wall, /area/station/service/janitor) +"sRP" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "sRR" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -57118,16 +54881,6 @@ "sSB" = ( /turf/open/floor/catwalk_floor, /area/station/engineering/break_room) -"sSM" = ( -/obj/effect/turf_decal/siding/yellow, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/textured_half, -/area/station/engineering/atmos) "sSN" = ( /obj/structure/flora/bush/flowers_pp/style_2, /turf/open/floor/grass, @@ -57212,13 +54965,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/small, /area/station/medical/coldroom) -"sTW" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "sUe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -57229,13 +54975,6 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) -"sUk" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Fuel Pipe to Incinerator" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "sUy" = ( /turf/closed/wall/r_wall, /area/station/command/meeting_room) @@ -57269,6 +55008,12 @@ /obj/structure/flora/bush/flowers_yw, /turf/open/floor/grass, /area/station/service/chapel) +"sUU" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "sUV" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -57356,16 +55101,37 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/maintenance/starboard/greater) -"sWE" = ( -/obj/machinery/light/broken/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +"sWB" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) "sWQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) +"sXc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "sXi" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, @@ -57396,6 +55162,20 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"sXt" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/office) "sXu" = ( /obj/structure/cable/layer3, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57624,6 +55404,14 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/engineering/break_room) +"tay" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/meter, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "taB" = ( /turf/open/floor/iron/white, /area/station/medical/treatment_center) @@ -57634,22 +55422,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/security/checkpoint/customs/auxiliary) -"taK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 5 - }, -/obj/structure/cable, -/obj/machinery/meter, -/turf/open/floor/iron/smooth_corner{ - dir = 8 - }, -/area/station/engineering/supermatter/room) "taL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57680,6 +55452,12 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/textured_half, /area/station/security/execution/transfer) +"tbd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 8 + }, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) "tbk" = ( /obj/structure/cable, /obj/machinery/door/airlock/hatch{ @@ -57745,12 +55523,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) -"tbX" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2, -/turf/open/space/basic, -/area/space/nearstation) "tca" = ( /turf/open/floor/carpet/donk, /area/station/command/heads_quarters/qm) @@ -57759,13 +55531,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"tcA" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/item/stock_parts/power_store/cell/emproof{ - pixel_y = 9 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "tcC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57774,17 +55539,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/security/processing) -"tcZ" = ( -/obj/effect/turf_decal/siding/red{ - dir = 6 - }, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - Atmospherics CO2 Chamber"; - dir = 5; - network = list("ss13","engineering") - }, -/turf/open/floor/engine/n2, -/area/station/engineering/atmos/space_catwalk) "tdh" = ( /obj/structure/chair/sofa/corp/right{ dir = 4 @@ -57961,7 +55715,7 @@ name = "Research Division Server Room" }, /obj/effect/mapping_helpers/airlock/access/all/science/rd, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/server) "tfy" = ( /obj/structure/closet/firecloset, @@ -57985,6 +55739,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"tfQ" = ( +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tfX" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/brown{ @@ -57992,6 +55752,15 @@ }, /turf/open/floor/iron/dark/side, /area/station/cargo/office) +"tgi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "tgl" = ( /turf/closed/wall, /area/station/service/greenroom) @@ -58028,14 +55797,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"tgD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/decal/cleanable/ash, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) "tgJ" = ( /obj/machinery/cryo_cell, /obj/effect/turf_decal/stripes/line{ @@ -58043,6 +55804,19 @@ }, /turf/open/floor/iron/small, /area/station/medical/cryo) +"tgO" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "thb" = ( /obj/structure/chair/stool/directional/south, /obj/effect/turf_decal/siding/yellow{ @@ -58064,34 +55838,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/fitness/locker_room) -"thI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 9 - }, -/obj/machinery/meter, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "thM" = ( /obj/effect/turf_decal/tile/brown/opposingcorners, /obj/structure/closet/secure_closet/miner, /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"tic" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "tii" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58145,29 +55897,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/station/science/lab) -"tiS" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 5 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) -"tiU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 5 - }, -/obj/machinery/meter, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/engineering/supermatter) "tiW" = ( /obj/structure/chair{ pixel_y = -2 @@ -58177,6 +55906,13 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) +"tiY" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/closet/toolcloset, +/obj/machinery/light/small/directional/east, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/engineering/main) "tiZ" = ( /obj/effect/turf_decal/delivery/red, /obj/machinery/door/firedoor, @@ -58219,14 +55955,6 @@ /obj/machinery/light/small/dim/directional/west, /turf/open/floor/eighties/red, /area/station/hallway/primary/central/fore) -"tjH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) "tjT" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/siding/wood{ @@ -58234,6 +55962,18 @@ }, /turf/open/floor/stone, /area/station/service/bar) +"tjU" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "tjY" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; @@ -58293,10 +56033,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"tlC" = ( -/obj/structure/cable, -/turf/closed/wall/r_wall, -/area/station/maintenance/department/electrical) "tlI" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/rock/pile/jungle/style_random, @@ -58342,13 +56078,6 @@ /obj/machinery/light/floor, /turf/open/floor/grass, /area/station/service/hydroponics) -"tmL" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/curved/flipped{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "tmM" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/stairs/left{ @@ -58423,6 +56152,10 @@ }, /turf/open/floor/iron, /area/station/maintenance/hallway/abandoned_command) +"tnD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "tnF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58431,13 +56164,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/maintenance/department/engine/atmos) -"tnH" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/effect/landmark/start/atmospheric_technician, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "tnZ" = ( /obj/structure/bookcase/random, /obj/structure/sign/poster/official/random/directional/west, @@ -58459,6 +56185,13 @@ }, /turf/open/floor/wood/tile, /area/station/tcommsat/server) +"toi" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "top" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -58528,13 +56261,17 @@ }, /turf/open/floor/plating/airless, /area/station/hallway/secondary/dock) -"toK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/suit_storage_unit/atmos, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/plating, -/area/station/engineering/atmos/office) +"toL" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "toT" = ( /obj/structure/flora/rock/pile/jungle/style_random, /obj/structure/window/reinforced/spawner/directional/west, @@ -58667,6 +56404,18 @@ dir = 1 }, /area/station/hallway/secondary/dock) +"trc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) +"trl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "tro" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/smooth, @@ -58683,19 +56432,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"trA" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) "trB" = ( /turf/open/floor/glass, /area/station/hallway/primary/central/aft) +"trD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 1 + }, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "trI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58709,14 +56454,6 @@ /obj/structure/sign/departments/aiupload/directional/south, /turf/open/floor/iron/white, /area/station/hallway/primary/starboard) -"tsl" = ( -/obj/effect/landmark/atmospheric_sanity/ignore_area, -/obj/structure/chair/plastic{ - dir = 8 - }, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "tst" = ( /obj/machinery/atmospherics/pipe/smart/simple/general/visible{ dir = 4 @@ -58749,21 +56486,10 @@ "tsF" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/central/fore) -"tsR" = ( -/obj/machinery/electrolyzer, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/disposal/incinerator) "ttb" = ( /obj/structure/flora/grass/jungle/b/style_random, /turf/open/floor/grass, /area/station/service/chapel) -"ttg" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "tts" = ( /obj/structure/altar_of_gods, /obj/item/book/bible, @@ -58777,12 +56503,25 @@ }, /turf/open/floor/stone, /area/station/service/chapel) +"ttv" = ( +/obj/structure/closet/radiation, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ttD" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 9 }, /turf/open/floor/engine, /area/station/science/cytology) +"ttS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, +/obj/structure/cable, +/obj/machinery/light/small/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "ttV" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -58819,6 +56558,18 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron, /area/station/security/processing) +"tut" = ( +/obj/effect/turf_decal/box/white{ + color = "#9FED58" + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) +"tuw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/atmospheric_technician, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "tux" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59017,13 +56768,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron/white, /area/station/hallway/primary/starboard) -"txd" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/air_sensor/carbon_tank, -/turf/open/floor/engine/co2, -/area/station/engineering/atmos/space_catwalk) "txh" = ( /turf/closed/wall/r_wall, /area/station/command/corporate_suite) @@ -59041,18 +56785,6 @@ "txN" = ( /turf/closed/wall, /area/station/security/prison/workout) -"txS" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "txV" = ( /obj/machinery/button/door/directional/east{ id = "AuxToilet3"; @@ -59100,22 +56832,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_command) -"tyu" = ( -/obj/structure/railing/corner/end{ - dir = 4 - }, -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/loading_area{ - dir = 1 - }, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) "tyA" = ( /obj/machinery/vending/modularpc, /obj/structure/sign/departments/science/alt/directional/east, @@ -59132,19 +56848,20 @@ /obj/effect/landmark/transport/nav_beacon/tram/nav/birdshot/prison, /turf/open/floor/tram, /area/station/security/tram) -"tzh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/tile/brown{ - dir = 4 +"tzl" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ + dir = 8 }, -/obj/effect/turf_decal/tile/yellow, -/turf/open/floor/iron/smooth, +/obj/machinery/light/small/directional/south, +/turf/open/floor/engine/vacuum, /area/station/engineering/atmos) +"tzn" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 1 + }, +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "tzo" = ( /obj/structure/alien/egg/burst, /obj/structure/alien/weeds, @@ -59227,6 +56944,19 @@ }, /turf/open/floor/iron, /area/station/engineering/hallway) +"tAn" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "tAq" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance, @@ -59257,6 +56987,7 @@ /obj/machinery/disposal/bin, /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/chapel/office) "tAw" = ( @@ -59284,6 +57015,25 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"tAD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/item/clothing/glasses/meson{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/clothing/glasses/meson{ + pixel_x = 5; + pixel_y = -4 + }, +/obj/item/clothing/glasses/meson{ + pixel_x = 5; + pixel_y = 8 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "tAE" = ( /obj/structure/table, /obj/effect/spawner/random/engineering/flashlight, @@ -59300,6 +57050,7 @@ /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/iron/textured_half, /area/station/service/chapel/office) "tAH" = ( @@ -59369,23 +57120,22 @@ }, /turf/open/floor/iron, /area/station/security/prison/workout) -"tCc" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/structure/railing/corner/end{ - dir = 8 - }, -/obj/structure/railing/corner/end/flip{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "tCh" = ( /obj/structure/chair/stool/directional/north, /obj/effect/turf_decal/siding/red, /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/small, /area/station/security/office) +"tCl" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Distro Staging to Waste" + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "tCm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red{ @@ -59442,20 +57192,6 @@ /obj/machinery/shower/directional/west, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) -"tDl" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 5 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "tDn" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/prison) @@ -59488,6 +57224,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/central/greater) +"tDG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "tDM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59547,13 +57288,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"tFB" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron, -/area/station/engineering/atmos) "tFH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59576,6 +57310,15 @@ /obj/machinery/chem_master, /turf/open/floor/iron, /area/station/medical/chemistry) +"tGf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering Supermatter Chamber" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "tGp" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine, @@ -59641,6 +57384,12 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/security/tram) +"tHs" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tHK" = ( /turf/closed/wall, /area/station/security/prison/shower) @@ -59650,14 +57399,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/catwalk_floor, /area/station/hallway/secondary/entry) -"tHY" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "tIa" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/structure/chair{ @@ -59773,6 +57514,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"tKz" = ( +/obj/effect/spawner/structure/window, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/main) "tKG" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/broken_floor, @@ -59829,6 +57577,17 @@ }, /turf/open/floor/iron/white/small, /area/station/science/lab) +"tLr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/button/door/directional/east{ + id = "Secure Storage top"; + name = "Secure engineering storage"; + req_access = list("engine_equip") + }, +/turf/open/floor/iron/dark/small, +/area/station/engineering/supermatter/room) "tLt" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -59847,16 +57606,6 @@ dir = 1 }, /area/station/command/bridge) -"tMm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/machinery/meter, -/turf/open/floor/iron/smooth_edge{ - dir = 8 - }, -/area/station/engineering/supermatter/room) "tMs" = ( /obj/structure/cable, /obj/machinery/telecomms/server/presets/service, @@ -59865,13 +57614,21 @@ }, /turf/open/floor/circuit, /area/station/tcommsat/server) -"tMJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +"tMw" = ( +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) +"tMG" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tMS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59942,6 +57699,15 @@ }, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) +"tNC" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - Toxins" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ + dir = 1 + }, +/turf/open/floor/engine/plasma, +/area/station/engineering/atmos) "tNF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/chair{ @@ -59952,26 +57718,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/medbay/aft) -"tNH" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/table/reinforced/titaniumglass, -/obj/item/clothing/gloves/color/red/insulated, -/obj/item/clothing/ears/earmuffs{ - pixel_x = 7; - pixel_y = 6 - }, -/obj/item/storage/belt/utility, -/obj/item/clothing/glasses/meson{ - pixel_y = -1; - pixel_x = -14 - }, -/obj/item/clothing/glasses/meson{ - pixel_y = 3; - pixel_x = -14 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "tNR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60105,6 +57851,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/hallway/primary/starboard) +"tPV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "tPW" = ( /obj/structure/closet/secure_closet/personal, /obj/machinery/status_display/evac/directional/south, @@ -60171,15 +57929,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tcomms) -"tQZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, -/obj/machinery/light/small/directional/east, -/obj/structure/sign/warning/fire/directional/east, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "tRc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60199,14 +57948,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron, /area/station/security/courtroom) -"tRj" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/turf/open/floor/catwalk_floor, -/area/station/engineering/supermatter/room) "tRw" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -60231,24 +57972,10 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron/smooth, /area/station/maintenance/department/medical/central) -"tSg" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/obj/machinery/light_switch/directional/east, -/obj/item/clothing/head/cone{ - pixel_x = -7; - pixel_y = 11 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"tSi" = ( -/obj/machinery/light/cold/directional/west, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) +"tRU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2, +/turf/open/floor/engine/vacuum, +/area/station/maintenance/disposal/incinerator) "tSp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60292,25 +58019,6 @@ }, /turf/open/floor/iron/kitchen/small, /area/station/security/prison/mess) -"tSN" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 10 - }, -/turf/open/floor/plating, -/area/station/engineering/supermatter) -"tSV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 5 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/smooth_corner{ - dir = 4 - }, -/area/station/engineering/supermatter/room) "tTg" = ( /obj/structure/table, /obj/item/trash/cheesie{ @@ -60358,12 +58066,6 @@ /obj/machinery/light/very_dim/directional/east, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) -"tTK" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/iron/smooth_edge, -/area/station/engineering/supermatter/room) "tTT" = ( /turf/open/floor/iron/white/corner{ dir = 1 @@ -60463,12 +58165,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"tUI" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ +"tUO" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 }, -/turf/open/floor/circuit, -/area/station/tcommsat/server) +/obj/structure/railing/corner, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tUZ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -60509,19 +58212,19 @@ }, /turf/open/floor/plating, /area/station/science/robotics/lab) -"tVN" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 6 - }, -/obj/machinery/meter, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/engineering/supermatter) "tVR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, /turf/open/floor/iron, /area/station/cargo/storage) +"tVX" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tWm" = ( /obj/structure/flora/bush/jungle/c/style_3, /obj/effect/turf_decal/weather/dirt, @@ -60555,6 +58258,13 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"tWE" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 10 + }, +/obj/machinery/camera/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "tWG" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -60571,6 +58281,10 @@ dir = 1 }, /area/station/hallway/secondary/exit/departure_lounge) +"tWR" = ( +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "tWT" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 9 @@ -60614,29 +58328,11 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"tXS" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/structure/cable, -/obj/structure/sign/poster/official/random/directional/north, -/obj/machinery/light/small/directional/west, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/turf/open/floor/catwalk_floor, -/area/station/engineering/supermatter/room) "tYj" = ( /obj/item/exodrone, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/smooth, /area/station/cargo/drone_bay) -"tYn" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "tYq" = ( /turf/closed/wall, /area/station/security/execution/transfer) @@ -60743,6 +58439,33 @@ /obj/machinery/light/cold/dim/directional/east, /turf/open/floor/iron, /area/station/engineering/main) +"tZX" = ( +/obj/item/stack/cable_coil, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/light/cold/dim/directional/west, +/obj/structure/table/greyscale, +/obj/item/screwdriver, +/obj/item/stack/cable_coil/cut{ + pixel_x = 11; + pixel_y = 7 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - Office" + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "uaa" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -60764,14 +58487,6 @@ /obj/machinery/smartfridge/chemistry/virology/preloaded, /turf/open/floor/iron/white, /area/station/medical/virology) -"uah" = ( -/obj/item/mop, -/obj/item/reagent_containers/cup/bucket/wooden{ - pixel_x = 9; - pixel_y = -6 - }, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) "uax" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60792,14 +58507,10 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"uaK" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/engineering/atmos) +"uaO" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "uaT" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -60833,6 +58544,22 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"uba" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "HFR Chamber" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "ubb" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -60841,22 +58568,6 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) -"ubh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/item/lead_pipe, -/obj/item/pipe_dispenser, -/obj/item/stack/pipe_cleaner_coil, -/obj/item/pipe, -/obj/item/pipe, -/obj/item/pipe, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "ubl" = ( /obj/structure/easel, /obj/item/canvas/twentythree_twentythree, @@ -60864,11 +58575,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron, /area/station/commons/storage/art) -"ubs" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/turf/open/space/basic, -/area/space/nearstation) "uby" = ( /turf/closed/wall, /area/station/security/prison/garden) @@ -60883,6 +58589,18 @@ dir = 1 }, /area/station/hallway/primary/central/fore) +"ubQ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "ubT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61020,12 +58738,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"udP" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron, -/area/station/engineering/atmos/space_catwalk) "udW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61140,15 +58852,16 @@ /obj/effect/turf_decal/trimline/neutral/line, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"ufR" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/door/airlock/engineering/glass{ - name = "Freezer Room" +"ufV" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Plasma to Pure" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/engineering/supermatter/room) +/obj/machinery/atmospherics/pipe/bridge_pipe/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ugb" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -61252,7 +58965,7 @@ name = "Augment Corridor" }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "uhe" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -61265,12 +58978,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"uhh" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/iron/stairs/left{ - dir = 1 - }, -/area/station/engineering/atmos) "uhj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61292,6 +58999,24 @@ /obj/structure/chair/bronze, /turf/open/floor/wood/tile, /area/station/maintenance/port/lesser) +"uht" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/power/smes{ + capacity = 1.8e+008; + charge = 2e+005 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) +"uhu" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "uhy" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -61337,14 +59062,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark/small, /area/station/medical/chemistry) -"uic" = ( -/obj/machinery/computer/atmos_alert{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "uid" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61534,13 +59251,6 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/open/floor/iron/white/small, /area/station/medical/cryo) -"ulf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos) "ull" = ( /obj/machinery/light/cold/directional/west, /turf/open/floor/iron, @@ -61591,19 +59301,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"umn" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "South Ports to Wastes" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "umr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -61647,17 +59344,14 @@ }, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/customs/auxiliary) -"unG" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "unK" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/maintenance/fore/greater) +"unS" = ( +/obj/machinery/light/no_nightlight/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) "unT" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -61707,14 +59401,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"upf" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/machinery/light/cold/dim/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "upg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, @@ -61801,19 +59487,6 @@ "uqw" = ( /turf/closed/wall/r_wall, /area/station/commons/fitness/recreation) -"uqA" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix Outlet Pump" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "uqE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61830,13 +59503,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"uqG" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "uqH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61883,7 +59549,7 @@ /obj/machinery/light/small/directional/east, /obj/effect/landmark/start/janitor, /turf/open/floor/iron/grimy, -/area/station/commons) +/area/station/service/janitor) "urd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61997,11 +59663,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/small, /area/station/hallway/secondary/dock) -"urE" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/light/cold/dim/directional/west, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "urF" = ( /obj/machinery/computer/cargo{ dir = 1 @@ -62065,16 +59726,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"utf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 8; - initialize_directions = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "utm" = ( /turf/closed/wall/r_wall, /area/station/science/auxlab/firing_range) @@ -62083,13 +59734,10 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/white, /area/station/hallway/primary/starboard) -"utv" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, +"utp" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) +/area/station/engineering/supermatter) "utD" = ( /obj/machinery/light_switch/directional/west, /obj/effect/turf_decal/stripes/corner{ @@ -62128,6 +59776,11 @@ /obj/machinery/door/firedoor, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/command/heads_quarters/qm) +"utI" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage/gas) "utP" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/paper_bin/carbon{ @@ -62146,16 +59799,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"uus" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 6 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Lockers" - }, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) "uuz" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/brown/opposingcorners{ @@ -62205,19 +59848,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"uvo" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Pure to Mix Chamber" - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos/pumproom) "uvx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62235,20 +59865,6 @@ "uvA" = ( /turf/closed/wall/r_wall, /area/station/command/gateway) -"uvB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "uvG" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/spawner/random/entertainment/arcade, @@ -62305,28 +59921,11 @@ /obj/structure/broken_flooring/singular/directional/south, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"uyB" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Atmospherics Project Bay" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/engineering/atmos) "uyH" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white/small, /area/station/security/warden) -"uyS" = ( -/obj/machinery/atmospherics/components/binary/pump{ - dir = 1; - name = "Mix to Engine" - }, -/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "uzj" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -62345,13 +59944,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/station/maintenance/aft) -"uzI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ - dir = 10 - }, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "uzJ" = ( /turf/open/floor/iron, /area/station/cargo/storage) @@ -62363,6 +59955,17 @@ dir = 1 }, /area/station/science/lower) +"uzP" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "uzY" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -62396,6 +59999,19 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"uAn" = ( +/obj/structure/table, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/item/flatpack{ + board = /obj/item/circuitboard/machine/flatpacker; + pixel_x = -6; + pixel_y = 5 + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "uAo" = ( /obj/effect/turf_decal/trimline/neutral/line{ dir = 8 @@ -62414,12 +60030,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/wood/tile, /area/station/command/bridge) -"uAT" = ( -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 9 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/engineering/supermatter) "uAY" = ( /turf/open/floor/plating, /area/station/maintenance/department/bridge) @@ -62511,27 +60121,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/side, /area/station/hallway/primary/starboard) -"uCa" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ - dir = 4; - piping_layer = 2 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) +"uCc" = ( +/obj/machinery/airalarm/directional/south, +/turf/open/floor/wood, +/area/station/cargo/boutique) "uCe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -62555,13 +60148,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white/side, /area/station/hallway/primary/starboard) -"uCE" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 5 - }, -/obj/structure/railing, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) "uCH" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/stripes/line{ @@ -62571,16 +60157,15 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/plating, /area/station/engineering/atmos/storage/gas) -"uCL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 +"uCK" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, /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/smooth, -/area/station/engineering/supermatter/room) +/area/station/engineering/main) "uDg" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -62685,7 +60270,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/south, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "uEC" = ( /obj/structure/window/reinforced/spawner/directional/east, @@ -62736,6 +60321,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"uFe" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/office) +"uFh" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) "uFk" = ( /obj/structure/flora/rock/pile/jungle/style_random, /obj/structure/window/reinforced/spawner/directional/east, @@ -62777,17 +60382,6 @@ /obj/structure/cable, /turf/open/floor/iron/textured_half, /area/station/security/lockers) -"uFy" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/space/basic, -/area/space/nearstation) "uFA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -62804,15 +60398,13 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/plating, /area/station/service/chapel/funeral) -"uFT" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/stairs{ +"uGb" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ dir = 4 }, -/area/station/engineering/atmos/office) +/obj/machinery/atmospherics/pipe/bridge_pipe/green, +/turf/open/floor/iron, +/area/station/engineering/atmos) "uGj" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/structure/table/glass, @@ -62823,10 +60415,6 @@ /obj/effect/mapping_helpers/requests_console/ore_update, /turf/open/floor/iron/white, /area/station/medical/virology) -"uGy" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "uGA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62848,16 +60436,17 @@ dir = 1 }, /area/station/hallway/primary/starboard) -"uGB" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 +"uGC" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 }, -/turf/open/floor/iron, -/area/station/engineering/hallway) +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) +"uGE" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space/basic, +/area/space/nearstation) "uGH" = ( /obj/machinery/rnd/production/circuit_imprinter, /obj/effect/turf_decal/bot, @@ -62896,13 +60485,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/small, /area/station/security/brig) -"uGS" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/camera/directional/north{ - c_tag = "Atmospherics - PROJECT" - }, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "uGT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -62965,15 +60547,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) -"uHq" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/open/space/basic, -/area/space/nearstation) "uHv" = ( /obj/structure/rack, /obj/item/pipe_dispenser, @@ -63046,6 +60619,10 @@ }, /turf/open/floor/iron/white/small, /area/station/service/hydroponics) +"uIC" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/atmos) "uIP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -63072,11 +60649,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/department/engine/atmos) -"uJd" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "uJi" = ( /obj/effect/turf_decal/tile/green/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -63090,10 +60662,6 @@ /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/plating, /area/station/maintenance/fore/greater) -"uJC" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/engineering/atmos) "uJD" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -63108,19 +60676,6 @@ /obj/machinery/shieldgen, /turf/open/floor/iron/dark/small, /area/station/engineering/storage_shared) -"uJU" = ( -/obj/structure/table/reinforced, -/obj/item/stack/cable_coil{ - pixel_x = -1; - pixel_y = 8 - }, -/obj/item/clothing/ears/earmuffs{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "uKh" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, @@ -63172,19 +60727,6 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"uKO" = ( -/obj/structure/table/greyscale, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -10; - pixel_y = 6 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_y = 10; - pixel_x = 2 - }, -/obj/item/clothing/glasses/welding, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "uKP" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/table/wood, @@ -63196,6 +60738,30 @@ "uLj" = ( /turf/closed/wall, /area/station/commons/toilet/auxiliary) +"uLz" = ( +/obj/structure/table, +/obj/item/electronics/airalarm{ + pixel_x = -5; + pixel_y = -7 + }, +/obj/item/electronics/firealarm{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/electronics/firealarm{ + pixel_x = 5 + }, +/obj/item/electronics/airalarm{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/item/electronics/airalarm{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/structure/sign/poster/official/build/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "uLD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63240,13 +60806,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/hallway/secondary/service) -"uMh" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "uMl" = ( /obj/machinery/cryo_cell, /obj/effect/turf_decal/stripes/line{ @@ -63297,18 +60856,6 @@ "uMU" = ( /turf/closed/wall, /area/station/science/robotics/mechbay) -"uMV" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "uNa" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -63325,13 +60872,15 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/customs) -"uNk" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 +"uNq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, +/obj/machinery/meter/monitored/distro_loop, +/obj/structure/cable, +/obj/machinery/camera/directional/east{ + c_tag = "atmospherics - distro" }, -/obj/machinery/shower/directional/east, -/turf/open/floor/iron/dark/small, -/area/station/engineering/break_room) +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "uNz" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark_red{ @@ -63340,11 +60889,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/stone, /area/station/command/heads_quarters/hos) -"uNO" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/disposal/incinerator) "uNR" = ( /obj/structure/cable, /obj/structure/chair{ @@ -63381,27 +60925,25 @@ }, /turf/open/floor/wood/tile, /area/station/maintenance/central/lesser) +"uOB" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "N2 to Airmix" + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "uOH" = ( /obj/item/kirbyplants/random, /obj/machinery/light_switch/directional/west, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"uOL" = ( -/obj/structure/table/reinforced/titaniumglass, -/obj/item/hfr_box/body/fuel_input, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "uOP" = ( /obj/structure/cable, /obj/machinery/airalarm/directional/north, /turf/open/floor/wood/tile, /area/station/command/meeting_room) -"uPf" = ( -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) "uPr" = ( /obj/structure/weightmachine/weightlifter, /obj/effect/turf_decal/bot, @@ -63433,11 +60975,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/small, /area/station/commons/toilet/restrooms) -"uPN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/closed/wall, -/area/station/engineering/supermatter/room) "uPW" = ( /obj/structure/flora/bush/flowers_pp/style_2, /obj/structure/flora/bush/large/style_3, @@ -63540,23 +61077,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/security/execution/education) -"uRO" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "uRR" = ( /obj/structure/table, /obj/item/plant_analyzer, @@ -63727,15 +61247,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"uUp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "uUA" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -63748,12 +61259,6 @@ }, /turf/open/floor/stone, /area/station/service/bar) -"uUG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) "uVo" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -63844,6 +61349,11 @@ dir = 1 }, /area/station/security/prison/safe) +"uWz" = ( +/obj/machinery/atmospherics/components/unary/passive_vent, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "uWG" = ( /obj/structure/closet/firecloset, /obj/machinery/status_display/ai/directional/south, @@ -63857,6 +61367,12 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) +"uWY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/engineering/break_room) "uWZ" = ( /obj/machinery/door/airlock/public, /obj/effect/decal/cleanable/dirt, @@ -63874,18 +61390,6 @@ "uXC" = ( /turf/closed/wall, /area/station/science/lower) -"uXI" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) -"uXS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/holopad, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "uXU" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance, @@ -63916,6 +61420,16 @@ /obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron/white, /area/station/hallway/primary/starboard) +"uYx" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Access" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "uYD" = ( /obj/structure/table, /obj/effect/turf_decal/tile/green/fourcorners, @@ -64030,6 +61544,16 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/commons/fitness/recreation/entertainment) +"vaD" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "O2 to Airmix" + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green{ + dir = 4 + }, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "vaF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64045,6 +61569,15 @@ }, /turf/open/floor/iron, /area/station/medical/chemistry) +"vbd" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos) "vbp" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -64065,14 +61598,6 @@ "vbK" = ( /turf/closed/wall, /area/station/science/research) -"vbL" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 10 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "vbO" = ( /obj/structure/table/glass, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -64137,11 +61662,6 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/security/courtroom) -"vcR" = ( -/turf/open/floor/iron/stairs/medium{ - dir = 1 - }, -/area/station/engineering/atmos) "vcW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64171,26 +61691,6 @@ /obj/structure/railing/corner, /turf/open/space/basic, /area/space/nearstation) -"vdi" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer4{ - dir = 8 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "vdj" = ( /obj/effect/turf_decal/tile/blue, /obj/structure/filingcabinet/chestdrawer{ @@ -64241,13 +61741,6 @@ /obj/machinery/light/small/dim/directional/south, /turf/open/floor/iron/small, /area/station/maintenance/department/engine/atmos) -"vdB" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/tank, -/turf/open/floor/plating, -/area/station/engineering/atmos/pumproom) "vdH" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue{ @@ -64262,13 +61755,15 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"vdS" = ( -/obj/structure/closet/firecloset, -/obj/item/clothing/glasses/meson, -/obj/item/radio/intercom/directional/east, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/engineering/main) +"vdR" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/pumproom) "vdX" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -64299,6 +61794,13 @@ "vej" = ( /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"vem" = ( +/obj/machinery/power/energy_accumulator/tesla_coil/anchored, +/obj/structure/window/reinforced/plasma/spawner/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "veo" = ( /obj/effect/turf_decal/siding/thinplating_new/terracotta/corner, /obj/structure/chair/stool/directional/east, @@ -64324,7 +61826,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/augments) "veA" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, @@ -64386,10 +61888,12 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/smooth_large, /area/station/science/robotics/mechbay) -"vfG" = ( -/obj/structure/hedge, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) +"vfE" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "vfI" = ( /obj/machinery/microwave{ pixel_y = 5 @@ -64576,11 +62080,6 @@ dir = 8 }, /area/station/science/research) -"viw" = ( -/obj/effect/decal/cleanable/oil/streak, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) "viy" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64646,15 +62145,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"vja" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/item/kirbyplants/random, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/engineering/hallway) "vjb" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -64675,13 +62165,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/textured_half, /area/station/commons/toilet/restrooms) -"vjK" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 +"vjS" = ( +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "vjZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64690,7 +62185,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "vkh" = ( /turf/closed/wall, @@ -64706,7 +62201,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/lab) "vkr" = ( /obj/structure/cable, @@ -64842,13 +62337,11 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_command) -"vlC" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/grille/broken, -/obj/item/stack/rods/two, -/obj/effect/decal/cleanable/molten_object, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/atmos) +"vlR" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space/basic, +/area/space/nearstation) "vlV" = ( /turf/closed/wall, /area/station/maintenance/aft) @@ -64993,21 +62486,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) -"vnp" = ( -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "vnq" = ( /obj/structure/cable, /obj/structure/bed/medical/anchored{ @@ -65023,6 +62501,7 @@ /area/station/security/medical) "vnr" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/wood, /area/station/service/chapel/office) "vnu" = ( @@ -65035,16 +62514,6 @@ /obj/machinery/door/airlock/glass, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"vnz" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/bot, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "vnC" = ( /obj/structure/closet{ name = "Evidence Closet 2" @@ -65116,6 +62585,12 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/smooth, /area/station/commons/storage/tools) +"voG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/stool/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "voJ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/dark_red/half/contrasted{ @@ -65132,13 +62607,6 @@ /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, /area/station/command/teleporter) -"voO" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "vpb" = ( /obj/machinery/door/airlock/hatch{ name = "Tool Supply Corridor" @@ -65153,6 +62621,7 @@ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) "vpk" = ( @@ -65193,20 +62662,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/carpet, /area/station/commons/dorms) -"vpS" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold/supply/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/structure/sign/poster/official/random/directional/north, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "vpT" = ( /obj/structure/chair/sofa/bench{ dir = 1 @@ -65319,15 +62774,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/herringbone, /area/station/commons/dorms) -"vrK" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "vrO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/grunge{ @@ -65384,12 +62830,20 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/white, /area/station/science/research) +"vsq" = ( +/obj/structure/closet/secure_closet/atmospherics, +/turf/open/floor/iron/dark, +/area/station/engineering/atmospherics_engine) "vsx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"vsO" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) "vsQ" = ( /obj/machinery/light_switch/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -65412,16 +62866,6 @@ /obj/machinery/light/floor, /turf/open/floor/wood/parquet, /area/station/service/library) -"vtw" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 10 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold/dark/visible, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "vtA" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -65461,14 +62905,6 @@ /obj/item/fuel_pellet, /turf/open/floor/iron/smooth, /area/station/cargo/drone_bay) -"vuk" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/space/basic, -/area/space/nearstation) "vum" = ( /obj/structure/cable, /obj/machinery/firealarm/directional/north, @@ -65601,19 +63037,6 @@ /obj/structure/cable, /turf/open/floor/iron/textured_half, /area/station/hallway/primary/aft) -"vvg" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Waste to Port Filter" - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "vvs" = ( /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, @@ -65697,6 +63120,11 @@ }, /turf/open/floor/iron/dark/small, /area/station/tcommsat/server) +"vwD" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/air, +/area/station/engineering/atmos) "vwE" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -65797,9 +63225,8 @@ /turf/open/floor/iron, /area/station/commons/storage/art) "vxR" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - piping_layer = 2 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 4 }, /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/dark, @@ -65830,6 +63257,14 @@ /obj/effect/landmark/start/geneticist, /turf/open/floor/iron/dark, /area/station/science/genetics) +"vyz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "vyF" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/chair/sofa/bench/left{ @@ -65841,13 +63276,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/corporate_dock) -"vyM" = ( -/obj/effect/turf_decal/arrows{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) "vyP" = ( /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 1 @@ -65863,6 +63291,24 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"vyX" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/atmos/storage) "vze" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/status_display/ai/directional/north, @@ -65956,21 +63402,19 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/security/tram) -"vAb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 +"vAj" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/item/clothing/head/cone{ - pixel_x = 6; - pixel_y = 9 - }, -/obj/item/clothing/head/cone{ - pixel_x = 11; - pixel_y = -9 +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/turf/open/floor/iron, +/area/station/engineering/hallway) "vAl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/table/wood, @@ -65985,6 +63429,15 @@ /obj/effect/turf_decal/tile/dark_red/fourcorners, /turf/open/floor/iron, /area/station/security/execution/transfer) +"vAr" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/obj/machinery/door/airlock/maintenance{ + name = "Engineering Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "vAw" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -66109,6 +63562,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"vCP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/recreation) "vCQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/white/line{ @@ -66132,13 +63592,6 @@ }, /turf/open/floor/iron, /area/station/security/brig/entrance) -"vDg" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/station_engineer, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "vDB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66154,10 +63607,6 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"vDD" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "vDQ" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /turf/open/floor/iron, @@ -66168,6 +63617,13 @@ "vDX" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) +"vDY" = ( +/obj/machinery/light/small/directional/east, +/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/smooth_large, +/area/station/engineering/main) "vEa" = ( /obj/machinery/griddle, /turf/open/floor/iron/kitchen/small, @@ -66196,6 +63652,12 @@ dir = 8 }, /area/station/hallway/secondary/dock) +"vEs" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "Air to Pure" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "vEz" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -66220,17 +63682,6 @@ "vEP" = ( /turf/closed/wall/r_wall, /area/station/security/brig) -"vEQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/cold/directional/east, -/obj/item/radio/intercom/directional/east, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/smooth, -/area/station/engineering/engine_smes) "vET" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ @@ -66244,33 +63695,6 @@ "vEW" = ( /turf/closed/wall/r_wall, /area/station/security/prison/shower) -"vEZ" = ( -/obj/structure/railing, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/preopen{ - id = "atmos"; - name = "Atmospherics Blast Door" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) -"vFf" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/meter, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "vFh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/blobstart, @@ -66351,12 +63775,6 @@ /obj/item/storage/lockbox/loyalty, /turf/open/floor/iron, /area/station/security/tram) -"vFW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ - dir = 1 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/engineering/supermatter) "vGe" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -66403,6 +63821,11 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/small, /area/station/medical/morgue) +"vHe" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/engine/n2o, +/area/station/engineering/atmos) "vHu" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/structure/closet/secure_closet/security/sec, @@ -66425,6 +63848,12 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/security/courtroom) +"vHJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/small, +/area/station/engineering/supermatter/room) "vHT" = ( /obj/effect/turf_decal/box/red/corners{ dir = 8 @@ -66447,22 +63876,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/corner, /area/station/science/lower) -"vIp" = ( -/obj/structure/table, -/obj/item/folder/yellow{ - pixel_x = 4 - }, -/obj/item/stack/sheet/mineral/plasma/thirty, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/phone{ - pixel_x = -6; - pixel_y = 7 - }, -/turf/open/floor/iron/small, -/area/station/engineering/engine_smes) "vIt" = ( /obj/machinery/door/airlock{ name = "Maintenance" @@ -66486,9 +63899,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central/lesser) -"vIF" = ( -/turf/closed/wall, -/area/station/engineering/atmos/pumproom) "vIJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, @@ -66521,12 +63931,12 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/security/courtroom) -"vJe" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) +"vJd" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "vJn" = ( /obj/structure/closet/crate/coffin, /obj/structure/window/spawner/directional/west, @@ -66604,6 +64014,13 @@ /obj/structure/cable, /turf/open/floor/iron/textured_half, /area/station/security/brig/entrance) +"vJX" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) "vKa" = ( /obj/structure/closet/crate/coffin, /obj/effect/turf_decal/weather, @@ -66640,13 +64057,6 @@ /obj/effect/landmark/start/chief_engineer, /turf/open/floor/wood, /area/station/command/heads_quarters/ce) -"vKs" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 6 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "vKG" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /turf/open/floor/iron, @@ -66756,15 +64166,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/pharmacy) -"vMo" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 6 - }, -/obj/machinery/atmospherics/components/tank{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos/pumproom) "vMr" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/alien/weeds, @@ -66830,9 +64231,17 @@ /obj/structure/tram, /turf/open/floor/tram, /area/station/security/tram) +"vNi" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "vNn" = ( /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) "vNq" = ( @@ -66866,6 +64275,19 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/smooth, /area/station/cargo/warehouse) +"vNI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/corner, +/obj/effect/turf_decal/siding/wideplating/corner{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "vNM" = ( /obj/machinery/door/airlock{ name = "Hydroponics Maintenance" @@ -66889,6 +64311,10 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/science/lower) +"vOl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) "vOm" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -66899,6 +64325,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) +"vOt" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/light/no_nightlight/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "vOL" = ( /obj/structure/railing{ dir = 1 @@ -66949,7 +64380,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/iron/grimy, -/area/station/commons) +/area/station/service/janitor) "vPw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66980,13 +64411,13 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"vPY" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 +"vPZ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 10 }, -/turf/open/floor/iron, -/area/station/engineering/atmos) +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "vQk" = ( /obj/effect/spawner/random/structure/crate, /obj/machinery/computer/security/telescreen/entertainment/directional/east, @@ -67064,20 +64495,9 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"vRH" = ( -/obj/structure/reagent_dispensers/beerkeg, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "vSg" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/aft) -"vSh" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "vSi" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/wood/end, @@ -67258,16 +64678,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"vUh" = ( -/obj/machinery/atmospherics/components/binary/pump/off/general/visible/layer1{ - dir = 4; - name = "Plasma to Pure"; - color = "#BF40BF"; - piping_layer = 3; - icon_state = "pump_map-3" +"vUp" = ( +/obj/machinery/door/airlock/external/glass{ + name = "ATMOS PROJECT Airlock" }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "vUz" = ( /obj/structure/table_frame, /obj/effect/decal/cleanable/glass, @@ -67326,6 +64746,16 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/stone, /area/station/service/chapel) +"vVa" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "vVo" = ( /obj/machinery/light/cold/directional/south, /obj/structure/table/reinforced, @@ -67408,6 +64838,9 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white/corner, /area/station/science/lobby) +"vWj" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/atmos/storage) "vWr" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "permaouter"; @@ -67502,6 +64935,16 @@ /obj/item/wirecutters, /turf/open/floor/iron/white/diagonal, /area/station/maintenance/department/science/xenobiology) +"vXp" = ( +/obj/machinery/computer/atmos_control/air_tank{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/engineering/atmos) "vXr" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -67544,6 +64987,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"vYq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 10 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"vYv" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "vYx" = ( /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 1 @@ -67654,18 +65108,6 @@ }, /turf/open/floor/stone, /area/station/service/abandoned_gambling_den) -"vZM" = ( -/obj/item/clothing/head/cone{ - pixel_x = -17; - pixel_y = -7 - }, -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/obj/effect/decal/cleanable/glass/plasma, -/turf/open/floor/engine, -/area/station/engineering/atmos) "vZW" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -67700,13 +65142,6 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) -"way" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/smooth, -/area/station/engineering/main) "waD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -67782,19 +65217,21 @@ dir = 1 }, /area/station/science/lower) -"wby" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "wbH" = ( /obj/machinery/holopad, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/service/chapel/office) +"wbM" = ( +/obj/effect/turf_decal/arrows/red{ + dir = 4; + pixel_x = -15 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "wbO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -67905,11 +65342,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"wdJ" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer5, -/turf/open/space/basic, -/area/space/nearstation) "wdS" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 4 @@ -67945,15 +65377,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark/small, /area/station/engineering/lobby) -"weU" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4; - name = "Air" - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/blobstart, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos/office) "wfa" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -67980,40 +65403,41 @@ "wfr" = ( /turf/closed/wall/r_wall, /area/station/medical/pharmacy) +"wfv" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/machinery/firealarm/directional/north, +/obj/machinery/computer/atmos_alert, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "wfD" = ( /obj/machinery/door/airlock/research/glass{ name = "Cubicle" }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) -"wfE" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/siding/wideplating, -/obj/machinery/vending/tool, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wfG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/maintenance/hallway/abandoned_command) -"wgl" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer5{ +"wfJ" = ( +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/electrical) +"wfQ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/airlock/maintenance{ + name = "Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "wgn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -68177,15 +65601,25 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"wiH" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/turf/open/floor/plating, +/area/station/engineering/supermatter) "wiP" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/space/nearstation) -"wiR" = ( -/obj/structure/cable, -/turf/closed/wall, -/area/station/engineering/engine_smes) +"wiT" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Gas to Filter" + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "wja" = ( /turf/closed/wall/r_wall, /area/station/commons/toilet/auxiliary) @@ -68203,6 +65637,13 @@ /obj/structure/filingcabinet, /turf/open/floor/iron/dark/small, /area/station/security/detectives_office) +"wjY" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/obj/machinery/power/emitter, +/turf/open/floor/iron/dark/small, +/area/station/engineering/storage_shared) "wjZ" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -68247,14 +65688,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"wkU" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/turf/open/space/basic, -/area/space/nearstation) "wla" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68266,35 +65699,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"wlS" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"wlU" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 10 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Release" - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) -"wmd" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 10 - }, -/obj/effect/landmark/blobstart, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "wme" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -68382,6 +65786,9 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/cargo/office) +"wnj" = ( +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "wnw" = ( /obj/machinery/pdapainter/engineering, /obj/effect/turf_decal/bot, @@ -68532,17 +65939,6 @@ "wpO" = ( /turf/closed/wall/r_wall, /area/station/security/processing) -"wpY" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "wqb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68584,9 +65980,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating/rust, /area/station/maintenance/fore/lesser) -"wqP" = ( -/turf/closed/wall/r_wall/rust, -/area/station/maintenance/department/electrical) "wqW" = ( /obj/effect/turf_decal/siding/wideplating{ dir = 1 @@ -68659,6 +66052,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"wrN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "wrO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/dark_red/opposingcorners, @@ -68916,6 +66313,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/science/genetics) +"wuL" = ( +/obj/structure/cable, +/obj/machinery/power/terminal, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/supermatter/room) "wuM" = ( /turf/closed/wall, /area/station/command/heads_quarters/qm) @@ -68957,12 +66359,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron/white/small, /area/station/science/cubicle) -"wvT" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "wwk" = ( /obj/effect/turf_decal/siding/thinplating_new/light{ dir = 8 @@ -69029,7 +66425,7 @@ id = "rdoffice"; name = "Research Director's Shutters" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/research) "wwY" = ( /obj/effect/spawner/random/trash/mess, @@ -69045,14 +66441,13 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/iron/cafeteria, /area/station/maintenance/starboard/fore) -"wxp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +"wxq" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) +/obj/structure/sign/poster/official/random/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "wxu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall/r_wall, @@ -69177,23 +66572,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/service/chapel/office) -"wyU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 +"wzh" = ( +/obj/machinery/atmospherics/components/binary/pump{ + name = "N2 to Pure" }, -/obj/machinery/light/cold/directional/north, -/obj/machinery/meter, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) -"wyZ" = ( -/obj/effect/turf_decal/siding/wideplating{ +/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ dir = 4 }, -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) +/turf/open/floor/iron, +/area/station/engineering/atmos) "wzo" = ( /obj/machinery/light/small/directional/north, /obj/effect/landmark/start/cargo_technician, @@ -69202,13 +66589,6 @@ "wzv" = ( /turf/open/floor/plating, /area/station/maintenance/department/electrical) -"wzB" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/structure/barricade/wooden, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) "wzF" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -69267,13 +66647,6 @@ }, /turf/open/floor/wood, /area/station/security/detectives_office) -"wAM" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "wAS" = ( /obj/structure/table/wood, /obj/item/hand_labeler, @@ -69349,6 +66722,13 @@ /obj/effect/spawner/random/structure/grille, /turf/open/space/basic, /area/space/nearstation) +"wCf" = ( +/obj/effect/turf_decal/tile/brown/opposingcorners, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "wCt" = ( /obj/machinery/flasher/directional/east{ id = "hopflash" @@ -69437,13 +66817,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"wDF" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) +"wDD" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space/basic, +/area/space/nearstation) "wDM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69451,19 +66829,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"wEc" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 - }, -/obj/structure/closet/crate, -/obj/item/stack/sheet/iron/twenty, -/obj/item/stack/sheet/mineral/plasma/five, -/obj/item/stack/sheet/mineral/titanium, -/obj/item/stack/sheet/mineral/uranium/five, -/obj/machinery/light/small/directional/east, -/obj/structure/sign/poster/official/random/directional/east, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) "wEf" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -69514,12 +66879,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) -"wEU" = ( -/obj/structure/transit_tube/horizontal{ - dir = 2 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "wEW" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /obj/structure/barricade/wooden/crude, @@ -69579,15 +66938,6 @@ /obj/structure/broken_flooring/corner/directional/south, /turf/open/floor/plating, /area/station/hallway/secondary/dock) -"wGo" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/structure/rack, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden, -/obj/machinery/status_display/evac/directional/south, -/obj/item/tank/internals/emergency_oxygen, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/station/engineering/hallway) "wGq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69595,6 +66945,15 @@ /obj/structure/broken_flooring/singular/directional/east, /turf/open/floor/plating, /area/station/hallway/secondary/dock) +"wGt" = ( +/obj/effect/turf_decal/stripes/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation/entertainment) "wGu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69640,23 +66999,19 @@ /obj/structure/filingcabinet/filingcabinet, /turf/open/floor/iron/grimy, /area/station/science/cubicle) -"wHH" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner/end{ - dir = 8 - }, -/obj/structure/railing/corner/end/flip{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) -"wHL" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/transit_tube/station/dispenser/reverse/flipped{ - dir = 8 +"wHr" = ( +/turf/closed/wall/r_wall/rust, +/area/station/engineering/supermatter/room) +"wHv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 }, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/wood, +/area/station/engineering/atmospherics_engine) "wHN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69705,40 +67060,11 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/space/basic, /area/space/nearstation) -"wIu" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/greyscale, -/obj/item/pen{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/book/manual/wiki/engineering_construction{ - pixel_y = 3; - pixel_x = -6 - }, -/turf/open/floor/iron/grimy, -/area/station/engineering/main) "wIY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/robotics/lab) -"wJa" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing{ - dir = 10 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/power/emitter{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "wJd" = ( /turf/closed/wall, /area/station/hallway/secondary/construction) @@ -69747,10 +67073,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) -"wJn" = ( -/obj/machinery/holopad, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "wJo" = ( /obj/structure/cable, /turf/closed/wall/r_wall, @@ -69863,15 +67185,6 @@ /obj/structure/bookcase/random, /turf/open/floor/wood/parquet, /area/station/service/library) -"wKy" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/wood, -/area/station/engineering/atmos/office) "wKz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69906,7 +67219,7 @@ /obj/effect/turf_decal/siding/brown{ dir = 1 }, -/obj/machinery/incident_display/dual/directional/north, +/obj/machinery/incident_display/bridge/directional/north, /turf/open/floor/iron/smooth, /area/station/command/bridge) "wLd" = ( @@ -69926,6 +67239,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"wLI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) "wLM" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -70046,17 +67363,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/science/robotics/mechbay) -"wNi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wNs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70081,16 +67387,6 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/secondary/command) -"wNA" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/small, -/area/station/engineering/supermatter/room) "wND" = ( /obj/effect/turf_decal/siding/wideplating/dark/corner, /obj/effect/decal/cleanable/dirt, @@ -70246,6 +67542,12 @@ /obj/effect/landmark/navigate_destination/disposals, /turf/open/floor/iron, /area/station/maintenance/hallway/abandoned_command) +"wOU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "wOZ" = ( /obj/effect/decal/cleanable/molten_object, /obj/effect/landmark/event_spawn, @@ -70275,14 +67577,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/small, /area/station/security/detectives_office) -"wPt" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "wPu" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt, @@ -70349,15 +67643,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"wQa" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/glass, -/obj/machinery/light/dim/directional/north, -/obj/structure/sign/warning/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "wQc" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/turf_decal/siding/wood, @@ -70432,6 +67717,10 @@ /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /turf/open/floor/iron/dark/textured_half, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +"wQR" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/engineering/atmos) "wQT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ @@ -70475,6 +67764,10 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/freezerchamber) +"wRJ" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/station/engineering/supermatter) "wRN" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -70578,6 +67871,13 @@ /obj/effect/spawner/random/techstorage/engineering_all, /turf/open/floor/iron, /area/station/engineering/storage/tech) +"wSR" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange{ + dir = 9 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "wSZ" = ( /turf/closed/wall/r_wall, /area/station/maintenance/hallway/abandoned_command) @@ -70733,17 +68033,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/science/ordnance/testlab) -"wVh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/small, -/area/station/engineering/atmos) "wVI" = ( /obj/machinery/biogenerator, /obj/machinery/light/small/dim/directional/north, @@ -70760,14 +68049,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"wWb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/meter, -/turf/open/floor/iron/small, -/area/station/engineering/supermatter/room) "wWs" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70792,14 +68073,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"wWP" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/engineering/atmos) "wWR" = ( /obj/structure/table, /obj/item/clothing/gloves/color/orange, @@ -70880,12 +68153,6 @@ }, /turf/open/floor/iron/small, /area/station/security/brig) -"wXV" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "wYa" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -70925,6 +68192,12 @@ }, /turf/open/misc/sandy_dirt, /area/station/security/tram) +"wYO" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer4, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "wZa" = ( /obj/docking_port/stationary{ dir = 8; @@ -70945,18 +68218,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/hallway/secondary/exit/departure_lounge) -"wZk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table/rolling, -/obj/item/mod/module/thermal_regulator, -/obj/effect/decal/cleanable/ash/large, -/turf/open/floor/iron/dark, -/area/station/engineering/atmospherics_engine) -"wZl" = ( -/turf/closed/wall, -/area/station/commons) "wZp" = ( /obj/effect/turf_decal/arrows{ dir = 8 @@ -71021,10 +68282,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit/departure_lounge) -"xae" = ( -/obj/structure/grille, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/engineering/atmos) "xam" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -71072,14 +68329,12 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"xaK" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance" +"xaM" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 9 }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/plating, -/area/station/maintenance/department/electrical) +/turf/open/floor/iron, +/area/station/engineering/atmos) "xaN" = ( /turf/closed/wall, /area/station/maintenance/starboard/central) @@ -71192,6 +68447,10 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/grass, /area/station/service/hydroponics) +"xcD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "xcF" = ( /turf/open/floor/iron, /area/station/commons/dorms) @@ -71206,13 +68465,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall, /area/station/hallway/primary/central/aft) -"xcS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/plasma, -/turf/open/floor/plating, -/area/station/engineering/atmos/storage/gas) "xda" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -71227,14 +68479,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/hallway/primary/starboard) -"xdl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/spawner/random/trash, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "xdo" = ( /obj/machinery/firealarm/directional/north, /obj/item/kirbyplants/random/fullysynthetic, @@ -71270,19 +68514,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/exit/departure_lounge) -"xdJ" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engine Airlock" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "engine_airlock_2" - }, -/turf/open/floor/catwalk_floor, -/area/station/engineering/break_room) "xdR" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -71309,15 +68540,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth_large, /area/station/engineering/storage_shared) -"xef" = ( -/obj/item/stack/rods/two, -/obj/item/book/manual/wiki/atmospherics{ - pixel_x = 5; - pixel_y = 5; - desc = "Glass shards are embedded in the cover. Hopefully you'll learn sometthing from this." - }, -/turf/open/floor/engine, -/area/station/engineering/atmos) "xeo" = ( /obj/structure/window/spawner/directional/south, /obj/structure/lattice, @@ -71337,6 +68559,10 @@ }, /turf/open/floor/plating, /area/station/science/research) +"xet" = ( +/obj/effect/turf_decal/bot/right, +/turf/open/floor/engine, +/area/station/engineering/atmospherics_engine) "xeC" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -71437,7 +68663,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/server) "xfm" = ( /obj/structure/cable, @@ -71614,13 +68840,6 @@ "xia" = ( /turf/closed/wall, /area/station/science/cubicle) -"xih" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "xik" = ( /turf/closed/wall, /area/station/security/prison/rec) @@ -71702,15 +68921,6 @@ dir = 5 }, /area/station/science/lower) -"xjc" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 4 - }, -/obj/structure/transit_tube/curved{ - dir = 8 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) "xjg" = ( /turf/open/floor/iron/dark, /area/station/security/interrogation) @@ -71766,6 +68976,7 @@ /obj/machinery/vending/wardrobe/chap_wardrobe, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/autoname/directional/south, +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/chapel/office) "xjX" = ( @@ -71815,7 +69026,7 @@ /obj/item/clothing/shoes/galoshes, /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron/small, -/area/station/commons) +/area/station/service/janitor) "xkK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71910,10 +69121,6 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/misc/sandy_dirt, /area/station/medical/medbay/lobby) -"xme" = ( -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/engine, -/area/station/engineering/atmos) "xmg" = ( /obj/structure/broken_flooring/singular/directional/south, /obj/machinery/light/small/directional/east, @@ -71985,11 +69192,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/smooth, /area/station/service/greenroom) -"xnA" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "xnB" = ( /obj/effect/turf_decal/stripes/white/corner, /obj/effect/turf_decal/stripes/white/line, @@ -72013,6 +69215,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/electrical) +"xnQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "xnR" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/effect/decal/cleanable/dirt, @@ -72049,13 +69255,6 @@ "xol" = ( /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) -"xoz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xoJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/tank_holder/extinguisher, @@ -72068,25 +69267,6 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/small, /area/station/ai_monitored/command/storage/eva) -"xoV" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 9 - }, -/obj/structure/table, -/obj/effect/turf_decal/siding/thinplating_new/dark/end{ - dir = 4 - }, -/obj/item/geiger_counter{ - pixel_x = 7; - pixel_y = 14 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/item/radio/off{ - pixel_x = 1; - pixel_y = 3 - }, -/turf/open/floor/iron/small, -/area/station/engineering/atmos/pumproom) "xoW" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -72101,9 +69281,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) -"xpf" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/maintenance/disposal/incinerator) "xpl" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -72262,27 +69439,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/central/lesser) -"xri" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 10 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth_edge, +"xrf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/turf/open/floor/engine, /area/station/engineering/supermatter/room) -"xrm" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 1 +"xro" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - O2" }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output, +/turf/open/floor/engine/o2, +/area/station/engineering/atmos) "xru" = ( /obj/item/kirbyplants/random/fullysynthetic, /obj/machinery/airalarm/directional/east, @@ -72506,6 +69673,15 @@ }, /turf/open/floor/iron/checker, /area/station/security/breakroom) +"xtq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/office) "xtD" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -72540,15 +69716,6 @@ "xtW" = ( /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) -"xug" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 8 - }, -/obj/structure/sign/warning/cold_temp/directional/east, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "xuh" = ( /obj/structure/chair/pew/left, /obj/item/bouquet/sunflower, @@ -72629,10 +69796,6 @@ dir = 1 }, /area/station/science/research) -"xuX" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input, -/turf/open/floor/engine, -/area/station/maintenance/disposal/incinerator) "xva" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -72641,16 +69804,6 @@ dir = 1 }, /area/station/science/research) -"xvb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/fuel_pool, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "xvf" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72786,6 +69939,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"xwx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xwz" = ( /turf/closed/wall, /area/station/cargo/miningfoundry) @@ -72864,6 +70023,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/heads_quarters/hos) +"xxS" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/airlock/atmos/glass{ + name = "Project Room" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xxT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -72977,11 +70144,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating/elevatorshaft, /area/station/commons/dorms) -"xzm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/closed/wall, -/area/station/engineering/atmos) "xzo" = ( /obj/machinery/door/airlock/external{ name = "Departure Lounge Airlock" @@ -73024,20 +70186,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"xAh" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer5{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "xAm" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -73090,28 +70238,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/dark/side, /area/station/hallway/primary/central/fore) -"xAW" = ( -/obj/effect/turf_decal/stripes/white/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/turf/open/floor/engine, -/area/station/engineering/supermatter) -"xBa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 1 - }, -/obj/machinery/door/airlock/external/glass{ - name = "South Tanks Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) "xBd" = ( /obj/effect/turf_decal/plaque{ icon_state = "L7"; @@ -73165,11 +70291,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) -"xBH" = ( -/obj/item/radio/intercom/directional/east, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "xBV" = ( /obj/effect/spawner/random/structure/chair_flipped, /turf/open/floor/plating, @@ -73190,6 +70311,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/stairs, /area/station/hallway/primary/central/fore) +"xCu" = ( +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xCH" = ( /obj/structure/railing{ dir = 9 @@ -73200,18 +70327,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"xCR" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Engineering Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "engine_airlock_2" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "xCS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73273,6 +70388,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central/lesser) +"xDT" = ( +/turf/open/floor/engine/n2, +/area/station/engineering/atmos) "xDW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73281,7 +70399,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/robotics/mechbay) "xEd" = ( /obj/structure/cable, @@ -73294,6 +70412,11 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/starboard/central) +"xEl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/twelve_percent_spirit_board, +/turf/open/floor/wood, +/area/station/service/chapel/office) "xEm" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -73386,20 +70509,6 @@ "xFe" = ( /turf/closed/wall, /area/station/security/lockers) -"xFj" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing, -/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer5{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "xFw" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/structure/chair/sofa/bench{ @@ -73410,6 +70519,12 @@ "xFA" = ( /turf/closed/wall/r_wall, /area/station/science/research) +"xFB" = ( +/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/smooth_large, +/area/station/engineering/storage_shared) "xFD" = ( /obj/structure/closet/emcloset, /turf/open/floor/iron, @@ -73455,6 +70570,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"xGa" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos/pumproom) "xGf" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 @@ -73566,21 +70688,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/security/tram) -"xHT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) -"xHV" = ( -/obj/effect/turf_decal/siding/wideplating, -/obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "xIj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73595,13 +70702,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron, /area/station/science/lobby) -"xIr" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/holopad, -/obj/effect/landmark/atmospheric_sanity/ignore_area, -/turf/open/floor/iron, -/area/station/engineering/atmos/space_catwalk) "xIu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -73640,6 +70740,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/dorms) +"xJe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) +"xJf" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "xJi" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/spawner/random/vending/snackvend, @@ -73652,6 +70769,15 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/dock) +"xJq" = ( +/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ + dir = 1 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "xJw" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/neutral/line{ @@ -73665,6 +70791,13 @@ "xJB" = ( /turf/closed/wall, /area/station/security/courtroom) +"xJH" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Unfiltered & Air to Mix"; + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xJZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -73712,20 +70845,22 @@ /obj/structure/fireaxecabinet/mechremoval/directional/west, /turf/open/floor/iron, /area/station/science/robotics/lab) +"xKt" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 1 + }, +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "atmospherics - entrance" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "xKv" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/station/security/processing) -"xKz" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/turf_decal/siding/wideplating, -/obj/structure/closet/secure_closet/atmospherics, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/north, -/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xKG" = ( /turf/open/floor/iron, /area/station/hallway/primary/port) @@ -73738,9 +70873,12 @@ }, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/escape) -"xKS" = ( -/turf/closed/wall, -/area/station/engineering/atmos/space_catwalk) +"xKV" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/engineering/main) "xKX" = ( /turf/open/floor/iron/white/side{ dir = 4 @@ -73783,13 +70921,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"xLp" = ( -/obj/machinery/computer/atmos_control/air_tank{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/west, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos/office) "xLy" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/dirt/dust, @@ -73799,6 +70930,10 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"xLL" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "xLY" = ( /obj/item/reagent_containers/cup/glass/bottle/beer{ pixel_y = 11 @@ -73838,6 +70973,16 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark/smooth_large, /area/station/command/bridge) +"xMm" = ( +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "CO2 to Pure" + }, +/obj/machinery/atmospherics/pipe/bridge_pipe/green{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xMo" = ( /obj/item/stack/cable_coil/five, /obj/effect/decal/cleanable/glass, @@ -73898,9 +71043,31 @@ /obj/structure/closet/secure_closet/security/sec, /turf/open/floor/iron, /area/station/security/lockers) +"xNk" = ( +/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ + dir = 10 + }, +/obj/machinery/shower/directional/west, +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 6 + }, +/obj/structure/fireaxecabinet/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "xNw" = ( /turf/closed/wall, /area/station/science/breakroom) +"xNB" = ( +/obj/machinery/power/emitter/welded, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "xND" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/south, @@ -73908,18 +71075,6 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/plating, /area/station/hallway/primary/central/fore) -"xNE" = ( -/obj/structure/steam_vent, -/obj/structure/closet/crate, -/obj/structure/spider/stickyweb, -/obj/item/hfr_box/corner, -/obj/item/hfr_box/body/moderator_input, -/obj/item/grenade/chem_grenade/cleaner, -/obj/structure/sign/poster/official/random/directional/north, -/obj/item/pipe_dispenser, -/obj/item/clothing/gloves/color/red/insulated, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "xNV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73932,8 +71087,14 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/auxlab/firing_range) +"xOf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "xOm" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/shutters{ @@ -73970,28 +71131,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/textured_half, /area/station/security/breakroom) -"xOJ" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 10 - }, -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/engineering/supermatter) -"xOO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ - dir = 10 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) -"xOR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ - dir = 8 - }, -/turf/open/floor/engine/airless, -/area/station/engineering/atmos) "xOS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral, @@ -74029,6 +71168,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/security/prison/rec) +"xPo" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange, +/obj/structure/lattice, +/turf/open/misc/asteroid/airless, +/area/space/nearstation) "xPp" = ( /obj/effect/turf_decal/weather/dirt{ dir = 5 @@ -74056,6 +71200,17 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/secondary/recreation) +"xPG" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/machinery/camera/directional/east{ + c_tag = "atmospherics - project room" + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "xPJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -74118,17 +71273,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"xQr" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/station/engineering/supermatter) -"xQt" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/vending/cigarette, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) +"xQo" = ( +/obj/machinery/space_heater, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "xQv" = ( /obj/structure/cable, /obj/structure/closet/secure_closet/hop, @@ -74159,28 +71307,12 @@ /obj/structure/cable, /turf/open/floor/stone, /area/station/command/heads_quarters/captain/private) -"xQG" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "xQI" = ( /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "xQJ" = ( /turf/closed/wall, /area/station/service/abandoned_gambling_den/gaming) -"xQS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/pumproom) "xQW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74190,25 +71322,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/diagonal, /area/station/science/auxlab/firing_range) -"xQZ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) -"xRa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/elevatorshaft, -/area/station/engineering/atmos) "xRd" = ( /obj/machinery/holopad, /obj/machinery/button/door/directional/north{ @@ -74251,11 +71364,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"xRv" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/components/unary/passive_vent/layer2, -/turf/open/space/basic, -/area/space/nearstation) "xRA" = ( /obj/structure/chair/sofa/bench/left{ dir = 8 @@ -74323,14 +71431,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/white, /area/station/science/cytology) -"xSi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "xSt" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/turf_decal/stripes/white/line{ @@ -74415,12 +71515,6 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"xTM" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 6 - }, -/turf/open/floor/iron/smooth, -/area/station/engineering/atmos) "xTO" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -74444,7 +71538,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/science/cubicle) "xTV" = ( /obj/machinery/ai_slipper{ @@ -74590,6 +71684,12 @@ /obj/structure/cable, /turf/open/floor/iron/white/side, /area/station/science/research) +"xVH" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xVV" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -74819,17 +71919,13 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"xYm" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/iron/stairs/old{ - dir = 4 +"xYt" = ( +/obj/machinery/air_sensor/mix_tank, +/obj/machinery/camera/directional/east{ + c_tag = "Atmospherics Tank - Mix" }, -/area/station/engineering/supermatter/room) +/turf/open/floor/engine/vacuum, +/area/station/engineering/atmos) "xYu" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -74868,18 +71964,9 @@ "xYO" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/bridge) -"xYX" = ( -/obj/effect/turf_decal/siding/red{ - dir = 8 - }, -/obj/machinery/air_sensor/nitrogen_tank, -/turf/open/floor/engine/n2, -/area/station/engineering/atmos/space_catwalk) -"xZb" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/main) +"xYV" = ( +/turf/open/floor/engine/air, +/area/station/engineering/atmos) "xZd" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/cleanable/dirt, @@ -74961,10 +72048,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"yac" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, -/turf/open/floor/iron/stairs/medium, -/area/station/engineering/atmos) "yag" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -74982,19 +72065,6 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron, /area/station/security/tram) -"yaq" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer5{ - dir = 1 - }, -/turf/open/space/basic, -/area/station/engineering/atmos/space_catwalk) "yaB" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -75030,6 +72100,20 @@ }, /turf/open/floor/iron/dark/small, /area/station/service/chapel/storage) +"yaZ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "yba" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{ dir = 4 @@ -75058,16 +72142,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"ybC" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/directional/west{ - c_tag = "Engineering - Break Room" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/hallway) "ybD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -75102,6 +72176,13 @@ "ybO" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos) +"ybT" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage) "ycb" = ( /obj/effect/turf_decal/weather/dirt{ dir = 6 @@ -75153,6 +72234,11 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"ycs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/small, +/area/station/engineering/atmos/pumproom) "ycC" = ( /turf/closed/wall/r_wall, /area/station/command/bridge) @@ -75175,10 +72261,6 @@ }, /turf/open/floor/wood/tile, /area/station/service/bar) -"ycW" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/smooth_edge, -/area/station/engineering/supermatter/room) "ycX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ @@ -75196,23 +72278,6 @@ }, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) -"ydi" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 1 - }, -/obj/machinery/door/airlock/external/glass{ - name = "South Tanks Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos/space_catwalk) "ydj" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -75233,30 +72298,11 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark/side, /area/station/hallway/primary/central/fore) -"ydI" = ( -/obj/machinery/light/cold/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos) "ydL" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"ydV" = ( -/obj/effect/turf_decal/tile/brown/opposingcorners, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "yea" = ( /turf/closed/wall, /area/station/service/chapel/office) @@ -75430,6 +72476,20 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/turret_protected/ai_upload) +"ygT" = ( +/obj/machinery/atmospherics/pipe/smart/simple/orange/hidden, +/obj/effect/turf_decal/tile/yellow, +/obj/machinery/camera/directional/west{ + c_tag = "Engineering - North Corridor" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/smooth, +/area/station/engineering/main) "ygU" = ( /obj/structure/table/glass, /obj/machinery/computer/records/medical/laptop{ @@ -75499,10 +72559,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"yhS" = ( -/obj/effect/decal/cleanable/insectguts, -/turf/open/floor/iron, -/area/station/engineering/atmospherics_engine) "yhW" = ( /obj/structure/cable, /turf/open/floor/iron/smooth, @@ -75515,17 +72571,6 @@ }, /turf/open/floor/wood, /area/station/service/chapel) -"yhY" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 6 - }, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - Atmospherics CO2 Chamber"; - dir = 5; - network = list("ss13","engineering") - }, -/turf/open/floor/engine/o2, -/area/station/engineering/atmos/space_catwalk) "yig" = ( /obj/structure/table, /obj/structure/window/reinforced/spawner/directional/east, @@ -75539,13 +72584,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/turret_protected/ai_upload) -"yii" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/pump{ - name = "North Ports to Wastes" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "yij" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 @@ -75651,19 +72689,6 @@ "yjE" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/engine) -"yjN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/smooth, -/area/station/engineering/supermatter/room) "yjP" = ( /obj/structure/flora/tree/jungle/style_2, /turf/open/floor/grass, @@ -75721,6 +72746,10 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"ykD" = ( +/obj/machinery/door/poddoor/incinerator_atmos_aux, +/turf/open/floor/plating, +/area/station/maintenance/disposal/incinerator) "ykL" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai_upload_foyer) @@ -75772,13 +72801,6 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron/dark/textured_large, /area/station/cargo/bitrunning/den) -"ylK" = ( -/obj/structure/chair/plastic{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/smooth, -/area/station/maintenance/disposal/incinerator) "ylR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75802,13 +72824,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"ymj" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/engineering/atmospherics_engine) (1,1,1) = {" dDB @@ -79202,7 +76217,6 @@ dDB dDB dDB dDB -xZx dDB dDB dDB @@ -79220,7 +76234,8 @@ dDB dDB dDB dDB -bjQ +dDB +dDB dDB dDB dDB @@ -79456,10 +76471,8 @@ dDB dDB dDB dDB -xZx dDB dDB -blb dDB dDB dDB @@ -79477,10 +76490,12 @@ dDB dDB dDB dDB -blb dDB dDB -bjQ +dDB +dDB +dDB +dDB dDB dDB dDB @@ -79713,31 +76728,31 @@ dDB dDB dDB dDB -blb dDB dDB -blb dDB dDB dDB dDB dDB dDB -xxo dDB +vdg +wdB +sxv dDB +vdg +wdB +sxv dDB -xxo dDB dDB dDB dDB dDB dDB -blb dDB dDB -blb dDB dDB dDB @@ -79970,31 +76985,31 @@ dDB dDB dDB dDB -blb -dDB -dDB -blb -dDB dDB dDB dDB dDB dDB -blb +bjQ dDB dDB dDB -blb +qyN +xZx +rpi +rpi +rpi +xZx +wgv dDB dDB dDB +bjQ dDB dDB dDB -blb dDB dDB -blb dDB dDB dDB @@ -80227,13 +77242,8 @@ dDB dDB dDB dDB -blb -dDB -dDB -jrj -dDB -dDB dDB +bjQ dDB dDB dDB @@ -80241,17 +77251,22 @@ blb dDB dDB dDB -blb -dDB +rMm +uPX +pSs +rpi +rMm +uPX +pSs dDB dDB dDB +blb dDB dDB -jrj dDB dDB -blb +bjQ dDB dDB dDB @@ -80484,30 +77499,30 @@ dDB dDB dDB dDB +dDB blb -fNQ -xQZ -wlU dDB dDB dDB +blb +dDB +dDB dDB dDB dDB -xck blb -jFk +rpi blb -xck dDB dDB dDB dDB dDB +blb +dDB +dDB +dDB dDB -lTC -xQZ -khr blb dDB dDB @@ -80737,52 +77752,35 @@ dDB dDB dDB dDB -chj -chj -chj -chj -blb -aky -blb -wpY -dDB -dDB -dDB -dDB -dDB +tYT dDB -xck -kFH -iRp -kFH -xck dDB dDB dDB +blb dDB dDB dDB -wpY -blb -aky blb -chj -chj -chj -chj dDB dDB dDB -xxo -dDB dDB +blb +hYC +sLY +hYC +tYT dDB dDB dDB dDB +blb +tYT dDB dDB dDB +blb dDB dDB dDB @@ -80949,8 +77947,6 @@ dDB dDB dDB dDB -"} -(21,1,1) = {" dDB dDB dDB @@ -80968,6 +77964,8 @@ dDB dDB dDB dDB +"} +(21,1,1) = {" dDB dDB dDB @@ -80983,63 +77981,63 @@ dDB dDB dDB dDB -gcs dDB dDB dDB dDB -blb dDB dDB dDB dDB dDB -chj -qfn -gbE -kYo -eAI -eVk -blb -ekf dDB dDB dDB dDB dDB dDB -xck -uic -fMP -bbF -xck dDB dDB +gcs dDB dDB dDB dDB -ekf -blb -kHQ -oBk -oGn -hXB -kRu -chj +irt +qpL +qpL +qpL +qpL +xPo +xPo +qpL +qpL +qpL +qpL +liB +iXh blb blb blb -svB -dDB -dDB dDB dDB dDB dDB +blb +hYC +sHG +hYC +aJq +tYT dDB dDB dDB +blb +aJq +liQ +blb +blb +blb dDB dDB dDB @@ -81206,8 +78204,6 @@ dDB dDB dDB dDB -"} -(22,1,1) = {" dDB dDB dDB @@ -81225,6 +78221,8 @@ dDB dDB dDB dDB +"} +(22,1,1) = {" dDB dDB dDB @@ -81240,69 +78238,67 @@ dDB dDB dDB dDB -kaP dDB dDB dDB dDB -blb dDB dDB dDB dDB dDB -chj -ijn -rCX -dzA -lsK -diL -lsK -xFj -blb -blb -blb -xck -xck -xck -xck -wyZ -pvE -aKU -xck -xck -xck -xck -blb -blb -blb -ekf -blb -mSS -sfl -oGn -keS -ozz -chj dDB dDB dDB -kaP -blb dDB dDB dDB dDB dDB +kaP dDB dDB dDB dDB +oXz dDB dDB +aJq +aJq +liQ +liQ +liQ +blb +blb +blb +ybO +ehY +cwf +cwf +ybO +aJq dDB dDB +blb +cwf +ybO +oGf +ybO +cwf +aJq +tYT dDB +blb +ybO +cwf +cwf +cwf +cwf +ybO +blb +blb +blb +bjQ dDB dDB dDB @@ -81463,8 +78459,6 @@ dDB dDB dDB dDB -"} -(23,1,1) = {" dDB dDB dDB @@ -81484,6 +78478,8 @@ dDB dDB dDB dDB +"} +(23,1,1) = {" dDB dDB dDB @@ -81497,65 +78493,72 @@ dDB dDB dDB dDB -svB dDB dDB dDB dDB -blb dDB dDB dDB dDB dDB -chj -chj -chj -chj -blb -iwi -blb -xAh dDB dDB dDB dDB -kFH -aKo -poV -clX -qtv -hsy -reL -xLp -kFH dDB dDB dDB dDB -ekf -blb -uRO -blb -chj -chj -chj -chj -dDB -dDB -dDB -kaP -dDB -xxo dDB +irt +odg +qpL +qpL +qpL +qpL +uFh dDB +aJq +aJq +fkp +fkp +qFn +qFn +qFn +qFn +fkp +ybO +qIF +isM +kaN +rbn +hkv +hkv +aMJ +aMJ +jqI +vbd +tVX +tVX +jqI +wYO +wYO +wYO +aMJ +rbn +oxi +rMx +gDl +pjk +cwf +tYT dDB dDB dDB dDB dDB dDB -aan dDB dDB dDB @@ -81567,6 +78570,7 @@ dDB dDB dDB dDB +aan dDB dDB dDB @@ -81720,8 +78724,6 @@ dDB dDB dDB dDB -"} -(24,1,1) = {" dDB dDB dDB @@ -81733,6 +78735,8 @@ dDB dDB dDB dDB +"} +(24,1,1) = {" dDB dDB dDB @@ -81749,50 +78753,63 @@ dDB dDB dDB dDB -aan dDB dDB dDB dDB -kaP dDB dDB dDB dDB -blb dDB dDB dDB +aan dDB dDB dDB +htk +kaP dDB dDB dDB dDB -iwi blb -xAh -dDB dDB dDB -dDB -kFH -fiq -xHV -duY -cVY -wKy -pXu -kRW -kFH -dDB -dDB -dDB -dDB -ekf blb -uRO +fkp +vJd +fpb +fpb +fpb +fpb +tWE +cwf +aki +cPI +mEt +ybO +ybO +ybO +ybO +ybO +cwf +iHe +iHe +iHe +cwf +ybO +ybO +ybO +ybO +ybO +oAv +ndh +bLZ +pjk +cwf +tYT dDB dDB dDB @@ -81801,9 +78818,7 @@ dDB dDB dDB dDB -kaP dDB -svB dDB dDB dDB @@ -82010,57 +79025,57 @@ dDB dDB dDB dDB -dDB +htk kaP -dDB +tYT dDB dDB dDB gcs tYT dDB -dDB -dDB -chj -chj -chj -chj -chj -blb -iwi blb -xAh -dDB -dDB -dDB +qFn +fDP +lEn +lEn +lEn +lEn +fEg +cwf +bLZ +ndh +gEz +trc +jko +kWt +sdI +ybO +eUf +iHe +iHe +iHe +oLS +ybO +sgs +hLe +rAU +trc +rDF +ndh +iNQ +pAb +ybO +tYT +tYT dDB -kFH -ehw -gBG -hir -weU -iCp -aXy -nMQ -kFH dDB dDB dDB dDB -ekf -blb -uRO -blb -chj -chj -chj -chj -chj dDB dDB -xxo dDB -kaP dDB dDB dDB @@ -82267,57 +79282,57 @@ dDB dDB dDB dDB -dDB +htk gcs -dDB -dDB +tYT +tYT dDB aJq aJq tYT +tYT +liQ +qFn +fDP +lEn +lEn +lEn +lEn +fEg +cwf +tHs +ndh +ftl +ybO +dFs +qxG +gXB +gin +gMp +iHe +iHe +iHe +mSN +gin +fYR +mEa +tbd +fDq +vaD +nNI +avK +tHs +ybO +tYT +tYT +tYT dDB dDB dDB -chj -jbo -rkS -hIU -kYo -ubs -tDl -blb -xAh -blb -blb -oDE -xck -xck -xck -xck -kph -nQC -uFT -xck -xck -xck -xck -qwo -blb -blb -ekf -blb -uCa -tbX -oGn -hFR -xYX -cPv -chj dDB dDB dDB dDB -kaP dDB dDB dDB @@ -82524,57 +79539,57 @@ dDB dDB dDB dDB -dDB +htk aJq aJq tYT tYT +tYT +tYT +tYT aJq -aJq -aJq -dDB -dDB -dDB -chj -rhu -soB -syc -dzA -lsK -bWg -lsK -wgl -dDB -dDB -dDB +liQ +qFn +fDP +lEn +lEn +lEn +lEn +lRq +hYC +olh +xwx +xMm +gin +bpk +qGd +rIv +ybO +mno +iHe +iHe +iHe +mbM +ybO +sgs +xro +dFn +gin +ize +smo +guv +tHs +cwf +tYT dDB -blb -xck -oLN -uMh -pwD -pyl -ojW -xck -blb dDB dDB dDB dDB -gcR -lsK -nUB -lsK -dzA -cpC -ltz -tcZ -chj dDB dDB dDB dDB -kaP dDB dDB dDB @@ -82781,58 +79796,58 @@ dDB dDB dDB dDB -dDB +htk aJq aJq aJq tYT +aJq +tYT tYT aJq aJq +fkp +syI +lEn +lEn +lEn +lEn +fEg +cwf +tHs +ndh +tUO +ybO +ybO +wQR +ybO +ybO +hDi +iHe +iHe +iHe +hav +ybO +ybO +wQR +ybO +ybO +pAu +ndh +guv +tHs +cwf tYT dDB dDB -chj -chj -chj -chj -chj -blb -kHI -blb -xAh dDB dDB dDB dDB -blb -xck -toK -cTS -raP -aOS -akS -xck -blb dDB dDB dDB dDB -xAh -blb -sAW -blb -chj -chj -chj -chj -chj -dDB -dDB -xxo -dDB -svB -dDB dDB dDB dDB @@ -83038,47 +80053,51 @@ dDB dDB dDB dDB -dDB -aJq +htk aJq aJq aJq tYT aJq -aJq +tYT +tYT +tYT +liQ +qFn +fDP +lEn +lEn +lEn +lEn +fEg +xxS +tHs +ndh +eCm +cwf +wDD +wDD +wDD +cwf +grY +iHe +iHe +iHe +bvJ +cwf +wDD +wDD +wDD +cwf +ijs +ndh +guv +tHs +cwf aJq dDB dDB dDB -vmL -blb -dDB -dDB -dDB -kHI -blb -xAh -dDB -dDB -blb -xck -xck -xck -gnd -jWk -gnd -cxQ -gnd -xck -xck -xck -blb -dDB -dDB -xAh -blb -sAW -dDB dDB dDB dDB @@ -83086,10 +80105,6 @@ dDB dDB dDB dDB -kaP -dDB -kaP -dDB dDB dDB dDB @@ -83295,57 +80310,57 @@ dDB dDB dDB dDB +htk dDB aJq -aJq -aJq -aJq -aJq tYT +tYT +tYT +tYT +tYT +tYT +liQ +qFn +fDP +lEn +lEn +lEn +lEn +fEg +cwf +tHs +ndh +qhi +pHW +iHe +iHe +iHe +pHW +iHe +iHe +iHe +iHe +iHe +pHW +iHe +iHe +iHe +pHW +qhi +ndh +guv +tHs +ybO aJq aJq -tYT dDB -chj -chj -chj -chj -chj -blb -kgG -ttg -gEy -dmb -dmb -cnU -ilb -nks -cbJ -xKS -ptz -cBR -udP -xKS -cbJ -nks -tYn -bsn -yaq -yaq -nWE -ttg -fRm -blb -chj -chj -chj -chj -chj dDB dDB -kaP dDB -xxo +dDB +dDB +dDB +dDB dDB dDB dDB @@ -83552,56 +80567,56 @@ dDB dDB dDB dDB +htk +dDB dDB tYT +tYT +hWQ +gKs +rxx +gKs aJq +qFn +fDP +ihz +uhu +lEn +lEn +hKS +hYC +kuA +ndh +eCm +cwf +vlR +vlR +vlR +cwf +grY +iHe +iHe +iHe +bvJ +cwf +vlR +vlR +vlR +cwf +ijs +ndh +guv +elk +ybO aJq aJq aJq -aJq -aJq -aJq -tYT -tYT -chj -izm -txd -pKg -kYo -wdJ -tiS -myi -dHU -rQm -rQm -cJb -qPg -puI -qkI -gIz -gNS -xIr -sDl -xBa -utv -ydi -nEa -fiI -blb -blb -ccu -bTJ -pCo -sAb -oGn -ckI -exr -sfd -chj dDB dDB -svB -blb +dDB +dDB +dDB +dDB dDB dDB dDB @@ -83809,55 +80824,55 @@ dDB dDB dDB dDB +htk +dDB dDB dDB tYT +xnQ +gKs +imb +gKs aJq -aJq -aJq -aJq -aJq -aJq -aJq -blb -chj -peW -aqn -sxD -dzA -lsK -qDq -hZb -nEN -fFe -fFe -cgh -rwl -nks -epr -xKS -fcI -dvv -cBV -xKS -epr -nks -vbL -vvg -fFe -fFe -cmu -mSc -dXa -lsK -dzA -mKV -pUe -yhY -chj +fkp +jMW +pAx +bUL +lEn +lEn +fEg +cwf +tHs +ndh +sRP +ybO +ybO +wQR +ybO +ybO +kwk +iHe +iHe +iHe +yaZ +ybO +ybO +wQR +ybO +ybO +jvF +ndh +guv +tHs +cwf +tYT +tYT +dDB +dDB +dDB +dDB dDB dDB -kaP dDB dDB dDB @@ -84066,55 +81081,55 @@ dDB dDB dDB dDB -dDB -dDB -tYT -aJq -aJq -aJq -aJq -aJq -aJq -aJq -blb -chj -chj -chj -chj -chj -blb -nYD -blb -aky -blb -dDB -dDB -ybO -ybO -ybO -hYC -okt -hYC -rEH -hYC -ybO +htk +wBo +fdo +wBo +wBo +fXZ +wBo +uYx +wBo +giq +fkp +lUZ +lDP +sUU +dif +lEn +fEg +cwf +tHs +ndh +xVH +trc +jde +luM +dok ybO +lQD +iHe +iHe +iHe +eUv ybO +xDT +dUv +lHv +trc +oAp +ndh +guv +tHs +cwf +tYT +tYT +dDB +dDB dDB dDB -blb -aky -blb -vdi -blb -chj -chj -chj -chj -chj dDB dDB -xxo dDB dDB dDB @@ -84323,56 +81338,56 @@ dDB dDB dDB dDB -dDB -dDB -tYT -tYT -aJq -aJq -aJq -aJq -aJq -aJq -tYT +htk +wBo +nqx +wBo +iKi +ifP +tDG +ozy +caf +uht +fkp +bGI +tgi +ePE +dif +lEn +fEg +cwf +tHs +ndh +ftl +ybO +arw +tMw +lqv +gin +bun +iHe +iHe +iHe +lgb +gin +jwH +fDe +ecT +fDq +uOB +nNI +eWx +tHs +cwf tYT -blb -vmL -blb -dDB -dDB -rUD -orY -pML -dDB -dDB -dDB tYT -kFS -hYC -wfE -gNI -lBw -coO -ftc -hYC -kFS tYT dDB dDB dDB -jhz -xQZ -kpe -dDB -dDB -dDB -dDB -dDB dDB dDB dDB -blb -dDB dDB dDB dDB @@ -84579,56 +81594,56 @@ dDB dDB dDB dDB -dDB -dDB -tYT -tYT -aJq -aJq -aJq -aJq -aJq -aJq -tYT -tYT -dDB -blb +irt +wSR +giq +lVW +cPM +ttS +tnD +get +xLL +tnD +pdD +fkp +vNi +xPG +gxv +iDz +kDr +fln +hYC +rgH +tfQ +ufV +gin +qnC +tNC +dda +ybO +toL +iHe +iHe +iHe +tMG +ybO +xDT +rcr +fEW +gin +wzh +smo +guv +cDK +ybO tYT tYT -dDB -dDB -jul -oTY -qME -dDB -dDB tYT tYT -kFS -hYC -xKz -aAb -svr -coO -gSh -hYC -kFS tYT tYT dDB dDB -hsL -pJT -rqV -dDB -dDB -dDB -aJq -aJq -aJq -tYT -aJq -blb dDB dDB dDB @@ -84836,50 +81851,50 @@ dDB dDB dDB dDB -dDB -dDB -aJq -aJq -aJq -aJq -aJq -aJq -aJq -aJq -tYT -vmL +htk wBo -giq wBo -giq +sRf wBo -vmL -hZf -kwH -nID -vmL +ssr +wBo +get +tnD +wnj +nJp ybO -tYT -aJq -kFS hYC hYC -pEa -iCL -pTp +cwf +gpJ +cwf hYC hYC -kFS -aJq -tYT +olh +ndh +mWU ybO -vmL -hZf -kwH -lLE -dqV ybO -aJq +wQR +ybO +ybO +gnP +eTL +dhs +iHe +rRK +ybO +ybO +wQR +ybO +ybO +qZq +ndh +guv +ftF +ybO +tYT +tYT aJq aJq aJq @@ -85093,49 +82108,49 @@ dDB dDB dDB dDB -dDB -aJq -aJq -aJq -aJq -aJq -aJq -aJq -aJq -tYT -tYT -tYT -fPb -hSG -drw -gvB +htk wBo +tRU +mVi +wBo +sIL +wBo +iJw +egB +xLL +hBi ybO -brC -brC -brC -ybO -ybO -aJq -aJq -kFS -hYC -gJs -uaK -sSM -mvj -sAM -hYC -kFS -aJq -aJq -ybO -ybO -brC -brC -brC -pfx +ttv +pjk +pjk +sCr +pjk +pjk +unS +tHs +ndh +eCm +cwf +wDD +wDD +wDD +cwf +grY +iHe +dhs +iHe +bvJ +cwf +wDD +wDD +wDD +cwf +dgk +ndh +guv +tHs ybO +tYT aJq aJq aJq @@ -85350,53 +82365,53 @@ dDB dDB dDB dDB -dDB -tYT -aJq -aJq -aJq -aJq +htk +ykD +lhE +dQq +bwP +gvs +liK +cjT +eTe +esj +ewy +cwf +pjk +hlk +pjk +sCr +pjk +pjk +pjk +jWH +ndh +qhi +pHW +iHe +iHe +iHe +pHW +iHe +iHe +hsS +lcx +iHe +pHW +iHe +iHe +iHe +pHW +jSF +abs +guv +tHs +ybO +ybO +bNq aJq aJq aJq -tYT -blb -vmL -wBo -mnx -ylK -aRS -gKs -hXt -mXm -mXx -vUh -bJN -hYC -pwv -pwv -xzm -xzm -glJ -ooe -bdb -mxc -sNc -xzm -xzm -pwv -pwv -hYC -jrb -dZX -bDO -qqr -bkI -ybO -gBh -gBh -gBh -gBh aJq aJq aJq @@ -85607,56 +82622,56 @@ dDB dDB dDB dDB -tYT -aJq -aJq +htk +wBo +wBo +wBo +wBo +cOj +aGn +lje +voG +tuw +rhP +nCp +pID +eKK +ejk +hqP +kpg +pAb +pjk +tHs +ndh +eCm +cwf +vlR +vlR +vlR +cwf +grY +iHe +hsS +iHe +bvJ +cwf +vlR +vlR +vlR +cwf +dgk +ndh +guv +iNQ +kpg +pAb +bNq aJq aJq aJq aJq aJq tYT -tYT -vmL -xRv -roc -qUd -jwC -vDD -gKs -ydI -ijP -ivT -gCP -sWE -hYC -gjP -quP -lrL -hYC -hYC -pDH -cwf -fXe -hYC -hYC -lMg -tSi -vnz -hYC -dYY -ijP -ulf -gCP -nkp -kvb -gBh -gBh -gBh -gBh -aJq -aJq -tYT dDB dDB dDB @@ -85863,55 +82878,55 @@ dDB dDB dDB dDB -dDB -aJq -aJq -aJq -aJq -aJq -aJq -aJq -aJq +irt +wSR blb -vmL -aJq -vmL -wBo -nHR -fYo -jVI -bBd -sUk -apd -fJt -chb -hqm -uhh -gCR -lOk -cVS -kDY -kyg -xSi -tic -neM -bRc -kDY -cVS -bSm -qxz -mRA -hvZ -xHT -fJt -vPY -wPt -bNq -cmf +blb +blb +blb +blb +giq +xLL +wnj +pYm +nFK +cwf +fRS +xCu +lPb +lPb +bRP +bPU +rxB +jMT +ndh +iHc +ybO +ybO +wQR +ybO +ybO +lJJ +iHe +hsS +iHe +ejr +ybO +ybO +wQR +ybO +ybO +liV +qqj +hht +fnu +okJ +wxq +ecq fYU -gBh -knv -knv +aJq +gcs +gcs vmL dDB dDB @@ -86120,51 +83135,51 @@ dDB dDB dDB dDB -dDB +htk aJq aJq pWm pWm -bvt -bvt -bvt -aJq -aJq -tYT -xpf -nqx -fPb -uNO -klL -vtw -gKs -mFZ -exE +pWm +pWm +wBo +rHQ +tnD +tnD +ivF +ybO +dTC +qhi +pjk +pjk +pjk +nWH +pLs +nWH +ndh +seK +trc +kVi +shI +oit +ybO +rrd +iHe +hsS +iHe +jMR +ybO +xYV +fzW +vsO +uIC +vOt +nNI +rQR pjk -wWP -dlk -qUN -paW -eOh -paW -nxO -pXc -nlI -iTZ -xTM -pXc -nxO -paW -qbv -paW -yac -tHY -efl -xoz -gro -mnA +ikI +nqA bNq -qeq xLy cvJ ueX @@ -86373,55 +83388,55 @@ dDB dDB dDB dDB -aGa dDB dDB dDB dDB +htk aJq tYT -hjj -itv -wHL +kGn +wzv +srQ lOM -bvt -aJq -pnl -vmL -xpf -lVW -cdW -smd -jdU -ihj -gKs -pIB -wNi -tFB -mKK -tnH -vcR -fxV -wJn -pGt -uJC -rbg -qYp -tzh -rao -rbg -uJC -qNN -eOP -qNN -fFu -oDa -umn -bPU -wlS -akU -bNq -vlC +wBo +cxF +kES +xLL +gSB +ybO +lbk +qhi +pjk +xCu +lPb +nmR +lPb +uGb +rIe +bDf +ybO +det +vHe +jcK +gin +ivX +iHe +hsS +iHe +vXp +gin +fWq +vwD +fdg +fDq +fRh +nNI +qAX +avK +ikI +tHs +gfV nHd lyR qDJ @@ -86630,55 +83645,55 @@ dDB dDB dDB dDB -blb dDB dDB -eNm -bTd -qlk -hRF +dDB +dDB +vPZ +iXh +vmL kGn pFK cXu kYI -pWm -pWm -pnl -fuC -xpf -sRf -fPb -tQZ -jNL -fEr -pUK -vjK -rVA -bPU -yii -kXf -hvo -kQr -bNg -kQr -pPH -cTu -pvP -nhe -nqi -aEy -uyB -wAM -eEX -kQr -etX -wXV -xHT -lGq -sqB -fJP -eDe -viw +wBo +wBo +wBo +ncj +nFK +ybO +pjk +bjA +rQq +xJH +fWp +vYq +jOm +cpI +aep +dcf +gin +jTP +sfe +oit +ybO +sNJ +iHe +hsS +iHe +uzP +ybO +xYV +opz +oGp +gin +vEs +xaM +eRc +pwR +ikI +caj +bNq aIk eiU slY @@ -86887,12 +83902,12 @@ dDB dDB dDB dDB -blb dDB -mys -blb dDB dDB +dDB +dDB +oXz tYT pWm pWm @@ -86901,41 +83916,41 @@ pWm pWm pRw pnl -nSo -cPB -mPe -wBo -gKs -fpF -gKs -gKs -aOb -utf -eMb -mFD -mrW -hYC -wVh -hFK -ubh -hYC -fuB -soo -qFw -sbf -pfD -hYC -uUp -nIL -lNC -hYC -wyU -rkk -blZ -rxs -upf -bNq -gBh +rOa +bhO +ybO +ybO +cAA +vlR +cAA +jZl +jZl +dGL +bPA +dGL +jZl +jZl +jZl +jZl +jZl +jZl +jGu +jGu +kGF +jGu +jGu +vWj +vWj +vWj +vWj +vWj +aoc +ezU +ezU +jZP +hXw +xGa +aoc ybs knv knv @@ -87144,59 +84159,59 @@ dDB dDB dDB dDB -blb -mys -blb dDB dDB dDB dDB +dDB +oXz +dDB vmL pWm jUx jUx wzv jUx -pnl -xuX -bOb -uzI -hpi -dwP -jNr -tsR -gKs -obd -exA -vAb -tSg -nYP -xae -qol -mTt -qol -xae -qwc -ikf -fLj -rUa -csB -xae -uXI -iaW -vZM -xae -wvT -jBW -okg -vKs -ffE -bNq -gBh +wzv +wzv +eRR +wfJ +ybO +bGW +wQR +qfi +jZl +nNm +nNm +nNm +nNm +fHZ +gnm +eLj +nNm +nUN +jZl +wfv +sWB +sNG +fih +cbh +vWj +toi +jiv +gAQ +toi +aoc +npW +eZa +ezh +kUo +ftn +aoc ybs knv -gBh -gBh +aJq +aJq aJq tYT dDB @@ -87400,13 +84415,13 @@ dDB dDB dDB dDB -dDB -tmL -blb -blb -blb -cLg -blb +naS +irt +liB +liB +liB +ltM +uFh blb blb tGK @@ -87414,46 +84429,46 @@ pWm pWm pWm aap -pnl -pnl -wqP -pnl -pnl -iXx -pnl -wqP -pnl -bBy -nsa -cgz -nsa -bBy -xae -xOR -oPg -aiL -xae -csB -opc -xRa -ozM -spa -xae -gPf -xef -xme -xae -vIF -bYY -nBM -bpv -vIF -bNq -cmf +wzv +wzv +eRR +wzv +ybO +nvQ +xYt +tzl +jZl +nTf +koI +koI +shQ +koI +koI +vNI +rAy +rAy +uba +bBM +jyV +jms +pJY +sXt +vyX +sXc +mIe +dDc +eXM +kjW +tPV +dnc +sjf +lYC +ldO +aoc liX jqd lxP -gBh +aJq aJq aJq dDB @@ -87491,7 +84506,7 @@ fLF ahr nFX nFX -ozn +lYa pSP mhk mhk @@ -87658,7 +84673,7 @@ dDB dDB dDB dDB -oua +oXz dDB dDB dDB @@ -87671,46 +84686,46 @@ aWx oFc qcF jUx -fbs -gKF -uPf pWm -dzD -pAa pWm -pRw -pnl -xNE -soC -mom -cWQ -pgU -xae -xae -xae -xae -xae -pYP -dyt -qtP -vEZ -gIr -xae -xae -xae -xae -xae -eWj -jMy -uvo -dJU -cla -qyb -bNq +vJX +wfJ +ybO +ybO +ybO +ybO +jZl +jvy +iYy +jOn +fVZ +jOn +abE +sCo +lsx +nUN +jZl +cNr +eXl +kwa +qsK +hlx +vWj +xQo +pkL +iTd +drK +aoc +rlX +hxa +nzj +siI +xJf +aoc olj cmf gBh -gBh +aJq aJq aJq dDB @@ -87915,7 +84930,7 @@ dDB dDB dDB dDB -oua +oXz dDB dDB dDB @@ -87928,46 +84943,46 @@ qQF lgr fFO wzv -pWm -pWm +wzv +wzv yil -dbo yil +njZ kNn yil kNn -pnl -rlk -wby -juF -chf -lSF -nsa -lpT -uOL -iME -nsy -beg -adV -beg -jIa -beg -beg -dIZ -lRz -xQS -fKA -fKA -oUq -sav -gIM -amH -ccO -bNq +jZl +kFl +wOU +xet +eef +ggJ +fen +sCo +lsx +qSo +dGL +lKT +oMw +jFl +wCf +lZl +sHJ +jjT +uGC +efX +oww +ezU +trD +tCl +igt +fKW +hMZ +eKU olj gBh gBh -gBh +aJq gcs blb blb @@ -88172,7 +85187,7 @@ dDB dDB dDB dDB -oua +oXz dDB dDB dDB @@ -88193,34 +85208,34 @@ pWm pWm mMF mDb -pnl -cSP -kgW -uJU -hNU -mBq -bBy -yhS -gCp -uah -beg -glO -lda -ybC -uGB -vja -ssP -ioN -qPO -oYN -dNM -lPw -wDF -qid -bkO -nHP -xoV -bNq +quh +hbC +cbF +tut +nlp +ihJ +gAz +sCo +lsx +gFQ +dGL +tWR +oMw +cVp +ptq +baf +sHJ +jjT +uGC +efX +cOP +ezU +kUo +pKX +jiP +cLj +ngn +aoc bJK dez gBh @@ -88428,13 +85443,13 @@ dDB dDB dDB dDB -dDB -bre -blb -blb -blb -cLg -blb +naS +hZF +liB +liB +liB +ltM +iXh blb blb pWm @@ -88450,35 +85465,35 @@ bvt bvt bXb yil -dfz -ymj -wzB -xvb -pbT -nBd -kLv -nBd -ibB -ibB -beg -fKR -owd -dYw -oQs -wGo -gKz -sio -hqr -uqG -iql -wmd -iSE -lJF -sTW -mTC -bNq -bNq -cmf +byi +wHv +wOU +ggJ +efx +xet +fen +sCo +lsx +piN +dGL +ovF +oMw +cVp +ptq +baf +sHJ +jjT +uGC +efX +ybT +ezU +trD +riJ +gSN +dzu +ycs +aoc +cvJ olj knv aJq @@ -88686,12 +85701,12 @@ dDB dDB dDB dDB -oua -dDB -dDB +blb dDB dDB +wCc dDB +oXz dDB dDB tYT @@ -88707,35 +85722,35 @@ bvt bvt vcm oii -pnl -uGS -aIE -dOY -wZk -bWk -bBy -sdF -eAC -aHb -beg -xQt -xih -fLy -kNG -jzJ -sqg -gub -uyS -iKK -uqA -vMo -vdB -kDj -thI -hnG -cmf -gBh -knv +jZl +ubQ +mgO +jsV +wbM +jsV +dDD +sCo +lsx +med +dGL +tWR +pgs +uFe +mCy +plp +sHJ +jjT +uGC +efX +eml +ezU +kUo +vdR +osd +aoB +cnv +aoc +cvJ aIk knv aJq @@ -88943,12 +85958,12 @@ dDB dDB dDB dDB -oua -dDB -dDB +wCc dDB dDB +wCc dDB +oXz dDB dDB tYT @@ -88964,35 +85979,35 @@ bvt bvt bvt oii -pnl -opo -sID -dxr -dpk -xdl -nsa -niv -jRR -niv -beg -qXd -pft -kwr -ydV -shK -pzi -vpS -iqY -vnp -vIF -jrS -qAR -eIv -eKU -bNq -bNq -gBh -knv +jZl +qPZ +obV +obV +obV +obV +iVC +jLh +dBe +bnp +dGL +slO +xtq +xNk +srL +xKt +sHJ +uLz +djj +dpZ +gje +ezU +hMk +jIk +uNq +fGi +aXc +aoc +xxt liX knv aJq @@ -89053,7 +86068,7 @@ uAk yea vmX vij -oiS +xEl wyl fEC fEC @@ -89200,12 +86215,12 @@ dDB dDB dDB dDB -oua -dDB -dDB +wCc dDB dDB +blb dDB +oXz dDB dDB tYT @@ -89221,36 +86236,36 @@ bvt bvt bvt yil -pnl -wQa -tgD -vyM -hmB -slC -pnl -wqP -pnl -pnl -beg -prI -cVM -mvn -jwM -prI -beg -bNq -bNq -bNq -bNq -bNq -bNq -bNq -bNq -gBh -gBh -gBh +jZl +nzx +gmC +lsx +lsx +lsx +jZl +quh +jZl +jZl +jZl +xck +lcu +xck +sJF +xck +vWj +vWj +vWj +rJJ +vWj +aoc +bCp +aoc +asO +aoc +aoc +aoc knv -aIk +wfQ knv aJq hwJ @@ -89457,12 +86472,12 @@ dDB dDB dDB dDB -oua -dDB -dDB +wCc dDB dDB +blb dDB +oXz dDB dDB dDB @@ -89478,36 +86493,36 @@ bvt bvt pWm oii -pnl -bFr -aFU -mgz -vSh -bbp -pnl +jZl +lsx +lsx +lsx +lsx +lsx +jZl oCE oCE lYH fGU bYl -onv -gcM +vAj +qje tAm iQr kfv vgp -jhk +hrx hrx hrx lLe -mid +nqN knv -rQH +axn wdo tkN gBh -knv -ovt +cvJ +ybs knv knv knv @@ -89714,12 +86729,12 @@ dDB dDB dDB dDB -cBX -dDB -dDB +blb dDB dDB +wCc dDB +oXz dDB dDB tYT @@ -89735,13 +86750,13 @@ bvt bvt pWm yil -pnl jZl -iXn -lix -aaA +vsq +bUe +mBh +dFY +vfE jZl -pnl oCE pWm pWm @@ -89756,7 +86771,7 @@ bNq bNq knv knv -hgV +aaR wDM uaZ fTf @@ -89824,7 +86839,7 @@ rpE tAF vnr caD -buc +llZ alg qwK xjU @@ -89971,14 +86986,14 @@ dDB dDB dDB dDB -eNn -blb -blb -blb -blb -blb -blb blb +dDB +dDB +wCc +dDB +oXz +dDB +bSo aJq aJq aJq @@ -89993,11 +87008,11 @@ bvt pWm qjp kNn -pnl -pnl -pnl -wqP -pnl +jZl +jZl +jZl +quh +jZl tOc oCE pWm @@ -90077,7 +87092,7 @@ iSD wBm wXk pEO -xOS +gKR rQC von pvC @@ -90227,28 +87242,28 @@ dDB dDB dDB dDB -dDB -eNn -kAG -kQo -kQo -kQo -wJa +aGa blb -vmL +blb +blb +wCc +blb +oXz +blb +kVc aJq aJq aJq bvt -pWm -pWm -pWm -bvt -bvt -bvt -pnl -pnl -wqP +ayK +ayK +ayK +ayK +ayK +ayK +ayK +ayK +wHr kNn oCE vxX @@ -90485,29 +87500,29 @@ dDB dDB dDB dDB -eNn -uHq -blb -blb -blb -vrK -blb +blb +dDB +dDB +wCc +dDB +oXz +dDB vmL aJq ayK urz -pSQ -pSQ -mfU -wiR -wiR -wiR -mLD -tlC -mfU -pnl -pUR -jUx +urz +urz +xNB +guP +dtr +sEe +nwe +cYt +sus +ayK +hCx +ayK pnl pnl pnl @@ -90742,31 +87757,31 @@ dDB dDB dDB dDB -eNn -ojK -sQa -lxO -sQa -osu -vuk +blb +dDB +dDB +blb +dDB +oXz +dDB ayK ayK ayK -lhZ -kXj -xYG -wiR -ouj -pCQ -oUz -cMZ -pnl -tlC -pnl -xaK -pnl -pnl -neL +oxj +dVu +cCJ +cYt +rWv +rWv +rWv +rWv +kOU +cGH +duN +cGH +sIR +rDV +iIj fHD agR dgV @@ -90778,13 +87793,13 @@ uOk nmH sHO ojz -sLu -urE -ess -mFH -vfG -oSw -jyl +tKz +qLI +mRQ +tZX +uAn +eEU +rVa bNq pkB sCm @@ -90999,49 +88014,49 @@ dDB dDB dDB dDB -eNn -uHq -blb -blb -blb -luC -lOC +wCc +dDB +dDB +rpi +rpi +phk +rpi jkV cYt gyt -gQK -tjH -xYG -dEA -kWK -bhb -hEt -qMu -ouj -tXS -uus -wNA -ceA -rDV +cYt +cYt +cYt +cYt +rWv +rWv +rWv +rWv +rWv +kTZ +sIR +vHJ +vHJ +oDd ugF eTj -gtU +wjY uJH tHa -noU -bxu +auL +jIo xta cbj bKl cqM dgm -wIu -oHO -sDo -fhX -lsd -jJu -kya +hez +xKV +xKV +xKV +xKV +jgJ +mah bNq muy hAN @@ -91256,306 +88271,306 @@ dDB dDB dDB dDB -eNn -sQt -sQa -sQa -sQa -uMV -qmo -ayK -ayK -ayK -kpq -qsa -uPN -vIp -iAS -vEQ -jph -kTu -bnq -tRj -pgr -cUa -hyx -cDE -fCW -oPa -sXE -qKx -xed -rbp -vrh -eat -oYv -jJg -bsG -wqW -jad -hUh -hUh -uXS -nTK -uGy -mMH -qZE -lER -hRO -knv -rKZ -mGn -lvK -jiC -vdw -knv -knv -blb -blb -blb -blb -blb -blb -blb -slY -mEB -ueX -slY -ohl -xwz -pjG -hZe -bOY -rzL -xwz -rGq -rUt -sgR -wcz -eIF -juJ -mTe -kqL -kFI -pBD -wSf -lIw -lYw -mhk -qjn -uiw -ina -mhk -ozt -mrn -vRn -ani -bKv -jCm -dPx -miF -yhX -iSD -iyR -lkJ -qzP -wAW -yiY -nSb -xOS -yeF -xle -xle -xle -xle -xle -jlz -kte -cVh -fEC -wmV -qVP -wQn -rpq -gEH -jlt -jGd -xFe -qbj -xGT -wrO -xNh -xFe -aAj -myy -dDQ -utP -bVO -ezV -wuc -iiX -sos -trp -edK -wEW -wuc -vAx -ira -lzM -aPM -uMu -cwL -lzM -kaW -fbt -vKG -rtQ -rtQ -lzM -vmL -tYT -vmL -tYT -gcs -aJq -aJq -aJq -wdB -wdB -wdB -wdB -wdB -wdB -wdB -rtQ -rtQ -lzM -lzM -gRp -lzM -raf -uMu -vKG -snW -xAG -pSd -uHF -rJs -sLD -tDn -hVb -ket -mTs -iAy -ora -oTJ -hTZ -wjZ -jUp -lku -ume -tyh -pDu -egb -iGE -mlN -fiD -xGL -eGL -dDB -dDB -wCc -dDB -wCc -dDB -vdg -wdB -sxv -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -"} -(62,1,1) = {" -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB -dDB +wCc +dDB +dDB +blb +dDB +oXz +dDB +ayK +ayK +ayK +vYv +sIR +sIR +cYt +rWv +rWv +rWv +rWv +aYu +kTZ +sIR +cAi +rWv +jKo +xFB +oPa +sXE +qKx +xed +rRJ +vrh +eat +oYv +jJg +bsG +wqW +fsN +dLN +dLN +dLN +dLN +swp +enB +lZN +lER +hRO +knv +rKZ +mGn +lvK +jiC +vdw +knv +knv +blb +blb +blb +blb +blb +blb +blb +slY +mEB +ueX +slY +ohl +xwz +pjG +hZe +bOY +rzL +xwz +rGq +rUt +sgR +wcz +eIF +juJ +mTe +kqL +kFI +pBD +wSf +lIw +lYw +mhk +qjn +uiw +ina +mhk +ozt +mrn +vRn +ani +bKv +jCm +dPx +miF +yhX +iSD +iyR +lkJ +qzP +wAW +yiY +nSb +xOS +yeF +xle +xle +xle +xle +xle +jlz +kte +cVh +fEC +wmV +qVP +wQn +rpq +gEH +jlt +jGd +xFe +qbj +xGT +wrO +xNh +xFe +aAj +myy +dDQ +utP +bVO +ezV +wuc +iiX +sos +trp +edK +wEW +wuc +vAx +ira +lzM +aPM +uMu +cwL +lzM +kaW +fbt +vKG +rtQ +rtQ +lzM +vmL +tYT +vmL +tYT +gcs +aJq +aJq +aJq +wdB +wdB +wdB +wdB +wdB +wdB +wdB +rtQ +rtQ +lzM +lzM +gRp +lzM +raf +uMu +vKG +snW +xAG +pSd +uHF +rJs +sLD +tDn +hVb +ket +mTs +iAy +ora +oTJ +hTZ +wjZ +jUp +lku +ume +tyh +pDu +egb +iGE +mlN +fiD +xGL +eGL +dDB +dDB +wCc +dDB +wCc +dDB +vdg +wdB +sxv +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +"} +(62,1,1) = {" +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB +dDB dDB dDB dDB dDB dDB +wCc dDB dDB +wCc dDB +oXz dDB -eNn -uHq -blb -blb -blb -lUu -blb aJq ayK -aKb -uUG -aEq -xYG -ouj -ouj -ouj -iyl -fZL -ouj -gxK -aWG -trA -wEc -rDV +dVu +oxj +oxj +sIR +nSP +rWv +rWv +ece +rWv +rWv +cYt +sIR +gss +tLr +pSz tmk wzF gom gzs ilz -noU +auL hFA gkW rmM btV lMl ayR -erJ -vDg -euP -all -eWf -eIx -oHJ +hez +kej +kej +kej +kej +mGV +afK bNq wxG uIX @@ -91770,29 +88785,29 @@ dDB dDB dDB dDB -eNn -rMs -qrc -uFy -uFy -kVK -blb +wCc +dDB +dDB +wCc +dDB +oXz +dDB aJq ayK -xYG -pTt -xYG -xYG -ccL -unG -ouj -rmD -eZt -ouj -xYG -ufR -xYG -xYG +ayK +ayK +ptW +luK +ptW +ayK +ptW +ptW +ptW +ayK +ptW +luK +ptW +ayK rDV mOx dwC @@ -91806,13 +88821,13 @@ nra hGp sHO drI -cRq -rbl -tcA -uKO -vfG -lGJ -mAK +hez +lEW +fwe +mCl +fwe +qsO +aSf bNq hOX fEU @@ -92027,29 +89042,29 @@ dDB dDB dDB dDB -eNn -blb -wkU -blb -blb -blb -blb -vmL -aSV -hMb -fuT -lgc -sbG -qDv -eVm -lPW -htQ -tMm -fWe -hxG -iXg -tSV -xYG +wCc +dDB +dDB +wCc +dDB +oXz +dDB +uWz +pen +cMa +aZP +rgN +rgN +rgN +qbd +trl +oMV +gqn +qbd +rgN +rgN +rgN +oDb rDV rDV rDV @@ -92284,38 +89299,38 @@ dDB dDB dDB dDB -fJX -blb -tCc -blb -bSo -bSo -blb blb +dDB +dDB +wCc +dDB +hZF +fbY +iXh ayK -iJO -bdd -prV -hdT -ktL -eLZ -uCL -pss -sed -drF -fZV -bcZ -kLk +tGf +nbY +nbY +nbY +nbY +nbY +bxB +gog +fUZ +nbY +nbY +nbY +xrf +ogx ejN -xZb -rCU -lfQ -eld +fIO +kgp +iQZ ejN ejL feo oVt -mUI +ygT rFb rSW wPM @@ -92541,38 +89556,38 @@ dDB dDB dDB dDB -eNn blb -wkU +blb +blb blb uqe uLW blb -blb -aSV -xug -dxu -isv -sbG -njH -uJd -xQr -xQr -xQr -xQr -xQr -bYe -aPB -qDA -bIi -oet -cYU -bIi -qDA -bLu -hkG -hkG -way +hZF +ouh +nVb +hoq +rhW +xcD +xJq +xrf +imK +cHT +vjS +xrf +xJq +xrf +qFH +rKd +lCi +dcR +jlF +vDY +rPt +efv +uCK +uCK +nGP vuq faQ uaT @@ -92798,33 +89813,33 @@ dDB dDB dDB dDB -eNn -blb -wkU +wCc +dDB +dDB bSv sQm sQm wNU aci ayK -ayK -ayK -ayK -ayK -aUR -qdJ -xQr -snm -izT -emC -xQr -roe -xri -xYG -xYG -vdS -hox -orb +jiy +hdY +fmc +fJH +jJO +jJO +mGO +iLd +liY +jJO +jJO +jJO +tay +cqd +rQi +hoO +tiY +bEh wfn eDo ecY @@ -93055,32 +90070,32 @@ dDB dDB dDB dDB -eNn -blb -wkU +wCc +dDB +dDB osa vrT vrT blb osa blb -vmL -hdT -bsJ -iGc -lfI -xYm -xQr -gzL -aGc -gzL -xQr -ezG -pGi -fEi -xYG -xYG -xYG +ayK +acX +oGA +iaZ +iaZ +iaZ +mlH +utp +wRJ +iaZ +iaZ +iaZ +acX +gzd +ayK +ayK +urz xYG tNV hss @@ -93088,7 +90103,7 @@ lYF uBj nRA wnR -dLj +jfx gKL jOi rNI @@ -93146,7 +90161,7 @@ qBz qTR kym rHD -qVR +uCc wCR jRz qzP @@ -93312,35 +90327,35 @@ dDB dDB aan dDB -eNn blb -jia -gBe +blb +blb +bWl sQm sQm aci bWl wNU -wNU gfA -lFT -eUR -hTC -wWb -qjq -xAW -npL -czf -hwG -uCE -jhJ -tTK -aZu -fBZ -abR -xYG -wfn -lFH +clJ +pdj +wiH +rdk +byo +rAl +rdk +wrN +dsS +cCt +wiH +acX +gzd +rWv +rWv +ieL +ayK +jjD +aWA ugA tIN hEl @@ -93569,35 +90584,35 @@ dDB dDB dDB dDB -eNn -blb -luC -amV -vrT +wCc +dDB +dDB +bSo +osa lBp sYg +rpi blb -blb -blb -hdT -qJN -oaB -oZQ -nbj -nVe -son -ieM -miN -pkd -egR -jhJ -kJs -lyX -rjE -pFS -keY -wfn -nuu +ayK +acX +amr +hSz +svR +eBW +efj +aSF +wrN +mHj +svR +hSz +eRU +gzd +rWv +wuL +jwB +ayK +pzm +aWA thb oxc rwJ @@ -93826,34 +90841,34 @@ dDB dDB dDB dDB -eNn -blb -luC -amV -vrT +wCc +dDB +dDB +bSo +osa uqe uLW -bSv -wNU -wNU -gfA -tNH -lae -xrm -bxs -tVN -uAT -aLu -xOJ -tiU -egR -wxp -ycW -snX -aSc -fqQ -odE -wfn +rpi +blb +ayK +orK +kXr +wiH +fHy +byo +rAl +oHH +wrN +vem +fHy +wiH +eRU +kFf +lbI +wuL +jwB +ayK +fwD aWA lVv nHq @@ -94083,35 +91098,35 @@ dDB dDB dDB dDB -fJX +wCc +blb blb -wHH -nIK +bSv sQm sQm qZm -osa -blb -onb -xnA -oSF -iPg -dbN -ayx -vFW -qbR -rhg -ilN -kBD -dvO -miR -nhE -gWJ -jqh -vJe -xYG -wfn -mpE +bSv +uGE +tzn +cAN +oUY +iaZ +iaZ +vOl +vOl +hwk +wLI +wLI +iaZ +iaZ +eRU +gzd +rWv +wuL +jwB +ayK +iff +roL nCC rDc qQi @@ -94340,33 +91355,33 @@ dDB dDB dDB dDB -eNn -blb -ppr +wCc +dDB +dDB osa vrT vrT blb osa blb -blb -hdT -ilB -koV -sjZ -dkR -tSN -lrD -kGm -oaJ -caB -tyu -cjP -oWE -tMJ -rAH -aZf -xYG +ayK +acX +kXr +dqz +dqz +iaZ +wiT +rdk +bnd +iaZ +rhl +rhl +eRU +gzd +rWv +uaO +rQy +ayK nXC nmi cED @@ -94597,33 +91612,33 @@ dDB dDB dDB dDB -eNn -eoU -aNc -gBe +wCc +dDB +dDB +bWl hHV sQm wNU qZm -yjE -yjE -yjE -yjE +dDB +ayK +acX +kXr +jfm +jfm +iaZ +vOl +hwk +wLI +iaZ +mpe +mpe +eRU +sfX +ayK +ayK +ayK ayK -pbj -cKv -xQr -eqB -nGt -eqB -xQr -gDe -eIX -xYG -xYG -xYG -xYG -xYG wfn wfn osT @@ -94854,33 +91869,33 @@ dDB dDB dDB dDB -eNn -luC +wCc +blb blb -amV +wCc lBp sYg -eNm -bTd -gQI -wEU -nEL -fBy -yjE -pqo -auQ -xQr -pdh -mcT -rjr -xQr -txS -lFE -gWl -ezQ -hkT -uNk -rUs +blb +blb +dDB +hdT +acX +vyz +pzA +xJe +xJe +fox +gUg +hoK +arj +arj +arj +oCS +aiJ +nFT +gTj +osV +lIo gBA sSB sHM @@ -95111,36 +92126,36 @@ dDB dDB dDB dDB -eNn -jxh -voO -ccx blb -mys dDB -blb -xQG -xBH -yfa -tsl -yjE -taK -chr -uvB -mRY -yjN -jGk -dOU -vFf -ioX -xdJ -iCr -pmA -pmA -stm -xdJ -sEj -qjx +dDB +wCc +dDB +dDB +dDB +ayK +ayK +ayK +acX +sqP +nbY +nbY +nbY +nbY +nbY +nbY +kby +nbY +nbY +nbY +kvc +qNT +gFW +fTV +oUQ +rsj +uWY +dlw iqB phY jmZ @@ -95368,33 +92383,33 @@ dDB dDB dDB dDB -xjc blb dDB -blb -mys +dDB +wCc dDB dDB dDB -vxt -vxt -nQk -vxt -yjE ayK -xOO -cEH -lvG -lvG -lvG -nGm -mTi +nDP ayK +tGf +fSi +nbY +nbY +nbY +nbY +nbY +nbY +qOM +qOM +qOM +qOM +eGP yjE -yjE -pqH -gXn -wfn +bDI +dxW +haM jKU jKU jRU @@ -95624,30 +92639,30 @@ dDB dDB dDB dDB -dDB -dDB -mxX -bTd -ihA -dDB -dDB -dDB -dDB -dDB -vxt -yfa -qGk -oEb -yjE -hlM -irZ -sDh -rrG -rrG -gDq -qqJ -yjE -rco +aGa +blb +blb +blb +blb +rpi +rpi +rpi +oiO +sIR +vUp +xOf +eQG +vVa +qKC +oqO +htz +tAD +fJH +pgF +tAn +tgO +tjU +lyT yjE dGV fDO @@ -95884,27 +92899,27 @@ dDB dDB dDB dDB -blb -dDB dDB dDB dDB dDB dDB -vxt -uUA -iok -dsE -yjE -fXo -yjE -yjE -evm -yjE -yjE -yjE -yjE -yjE +ayK +ayK +ayK +ayK +ayK +ayK +ayK +ayK +ayK +ayK +hil +ayK +ayK +ayK +ayK +ayK yjE eIT whl @@ -96141,7 +93156,13 @@ dDB dDB dDB dDB -aGa +dDB +dDB +dDB +dDB +dDB +dDB +dDB dDB dDB dDB @@ -96149,19 +93170,13 @@ dDB dDB dDB vxt -yfa -uUA -uUA -yfa -afB -rWQ -idH +dio evM -mWs -xCR -lHh +nJx +vAr hVq hVq +bUF yjE oIF tit @@ -96405,23 +93420,23 @@ dDB dDB dDB dDB +dDB +dDB +dDB +dDB +dDB +dDB +vxt +dio +dio +dio vxt -vRH -vRH -hJs yfa -bwY -yjE -cYL -aEP -auc -yjE -vnI -vnI +yfa hVq yjE -xcS -bAU +oDj +utI gwl pPm jKU @@ -96662,19 +93677,19 @@ dDB dDB dDB dDB +dDB +dDB +dDB +dDB +dDB +dDB vxt -xQG -vxt -xQG +cYL +aEP +auc vxt -xQG -yjE -yjE -yjE -yjE -yjE -vnI -vnI +yfa +yfa hVq yjE uCH @@ -96919,19 +93934,19 @@ dDB dDB dDB dDB -vxt +dDB dDB dDB dDB dDB dDB vxt -aJq -aJq -aJq -vnI -vnI -vnI +gcs +gcs +gcs +vxt +vxt +vxt hVq yjE yjE @@ -97183,12 +94198,12 @@ dDB dDB dDB dDB -tYT -aJq -aJq -aJq +bSo +bSo +bSo +bSo aJq -vnI +vxt hVq hVq ayO @@ -108282,7 +105297,7 @@ aJq aJq aJq rvp -gZf +asn iFP iGl hqW @@ -109837,7 +106852,7 @@ nju iGt vtL sBP -wZl +sRL pcm gla vPt @@ -110094,7 +107109,7 @@ wNd nFW tDB unK -wZl +sRL xkv ura jUU @@ -110351,12 +107366,12 @@ rqw rqw qow rqw -wZl -wZl -wZl +sRL +sRL +sRL rBr -wZl -wZl +sRL +sRL eeJ lxp syA @@ -111658,7 +108673,7 @@ pCv unc sWQ raZ -qUa +vCP qUa qUa qUa @@ -111897,7 +108912,7 @@ ntZ jpp jpp dxw -jpp +ndO jpp jpp jpp @@ -112154,7 +109169,7 @@ pzd tpG pvk pzd -iCj +wGt qMa uhy iCj @@ -121963,7 +118978,7 @@ vnf wML pwn eXo -tUI +okP wdS eXo wos @@ -121982,7 +118997,7 @@ eXo eXo eXo jat -tUI +okP nVF msJ xQj @@ -124783,7 +121798,7 @@ xFI gfu ckt ckt -ckt +nGc lwu lkV whF diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 4c48ecf21c37f..9766108598b36 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -30,10 +30,10 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/table, /obj/machinery/chem_dispenser/drinks/beer{ dir = 8 }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aai" = ( @@ -242,9 +242,6 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "abX" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Quartermaster's Office" - }, /obj/machinery/status_display/supply{ pixel_x = -32 }, @@ -353,7 +350,10 @@ "acN" = ( /obj/effect/landmark/start/hangover, /obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "acQ" = ( /obj/structure/table/wood, @@ -425,10 +425,11 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "ado" = ( -/obj/effect/landmark/start/hangover, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) +/obj/structure/table/wood/fancy, +/obj/effect/spawner/random/entertainment/cigarette, +/obj/effect/spawner/random/entertainment/lighter, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "adp" = ( /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/chapel{ @@ -436,8 +437,15 @@ }, /area/station/service/chapel) "adq" = ( -/obj/machinery/computer/slot_machine, -/turf/open/floor/wood, +/obj/structure/table/wood, +/obj/item/instrument/violin, +/obj/item/instrument/eguitar{ + pixel_x = 5 + }, +/obj/item/instrument/guitar{ + pixel_x = -7 + }, +/turf/open/floor/wood/large, /area/station/service/bar) "adr" = ( /obj/structure/sign/warning/vacuum/external/directional/west, @@ -613,6 +621,17 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron/smooth_large, /area/station/engineering/main) +"aeG" = ( +/obj/item/cigarette/cigar, +/obj/item/toy/cards/deck, +/obj/effect/landmark/start/hangover, +/obj/structure/chair/sofa/left/brown, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/wood, +/area/station/service/bar) "aeQ" = ( /obj/machinery/light/directional/east, /obj/structure/closet/radiation, @@ -1325,6 +1344,8 @@ /area/station/security/processing) "akJ" = ( /obj/machinery/light/directional/south, +/obj/effect/spawner/random/contraband/permabrig_weapon, +/obj/structure/closet/crate/bin, /turf/open/floor/iron/cafeteria, /area/station/security/prison) "akM" = ( @@ -1334,6 +1355,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/wood, /area/station/service/lawoffice) "akN" = ( @@ -1547,13 +1569,13 @@ dir = 1 }, /obj/machinery/light/small/directional/west, +/obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/station/security/brig) "amn" = ( /obj/structure/chair/office{ dir = 4 }, -/obj/effect/landmark/start/security_officer, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -1649,9 +1671,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/effect/turf_decal/vg_decals/department/med{ - dir = 1 - }, +/obj/effect/turf_decal/vg_decals/department/med, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "amK" = ( @@ -1692,9 +1712,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/vg_decals/department/mining{ - dir = 1 - }, +/obj/effect/turf_decal/vg_decals/department/mining, /turf/open/floor/iron, /area/station/cargo/office) "amT" = ( @@ -2522,19 +2540,11 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) "aqY" = ( -/obj/structure/closet/lawcloset, -/obj/item/storage/briefcase{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/briefcase/secure, -/obj/item/clothing/glasses/sunglasses/big{ - pixel_x = 3; - pixel_y = 3 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/obj/item/clothing/glasses/sunglasses, -/obj/machinery/newscaster/directional/west, -/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/wood, /area/station/service/lawoffice) "arf" = ( @@ -2703,6 +2713,10 @@ /obj/structure/chair/office{ dir = 8 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/station/service/lawoffice) "arT" = ( @@ -2726,6 +2740,9 @@ dir = 1 }, /obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/carpet/blue, /area/station/service/lawoffice) "asb" = ( @@ -3740,7 +3757,7 @@ /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/commons/toilet) "avD" = ( /turf/closed/wall/r_wall, @@ -3829,6 +3846,10 @@ /area/station/construction/mining/aux_base) "avQ" = ( /obj/structure/table/reinforced, +/obj/item/food/burger/orange{ + desc = "Made by those abandoned by society."; + name = "prison burger" + }, /turf/open/floor/iron/cafeteria, /area/station/security/prison) "avR" = ( @@ -4363,7 +4384,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "axD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4874,9 +4898,10 @@ /turf/open/floor/iron/pool, /area/station/commons/fitness) "aze" = ( -/obj/structure/window/spawner/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/effect/turf_decal/siding/wideplating_new, +/obj/structure/railing, +/turf/open/floor/grass, +/area/station/security/prison) "azg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 6 @@ -4915,8 +4940,8 @@ /obj/machinery/computer/security{ dir = 4 }, -/obj/machinery/computer/security/telescreen/prison, /obj/machinery/light/directional/west, +/obj/machinery/computer/security/telescreen/prison/directional/west, /turf/open/floor/iron/dark, /area/station/security/corrections_officer) "azw" = ( @@ -5323,13 +5348,16 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "aAR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 6 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 6 }, -/turf/open/floor/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/stone, /area/station/service/bar) "aAS" = ( /obj/structure/sink/directional/south, @@ -5540,7 +5568,8 @@ dir = 9 }, /obj/machinery/restaurant_portal/bar, -/turf/open/floor/wood, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aBK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5776,16 +5805,10 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "aCG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Diner" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/stool/bar/directional/north, +/obj/effect/turf_decal/siding/thinplating_new/light, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/wood, +/turf/open/floor/eighties, /area/station/service/bar) "aCM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -6316,14 +6339,13 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/wood, /area/station/service/lawoffice) "aFj" = ( @@ -6388,15 +6410,10 @@ /turf/open/floor/wood, /area/station/command/meeting_room) "aFp" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/vg_decals/department/sci{ - dir = 1 - }, +/obj/effect/turf_decal/vg_decals/department/sci, +/obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "aFs" = ( @@ -7312,8 +7329,8 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "aIC" = ( -/obj/effect/landmark/start/chaplain, /obj/structure/chair, +/obj/effect/landmark/start/chaplain, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) "aID" = ( @@ -7475,7 +7492,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/service/theatre, /obj/effect/landmark/navigate_destination, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/service/theater) "aJm" = ( /obj/structure/cable, @@ -7825,19 +7842,25 @@ /area/station/commons/storage/primary) "aKq" = ( /obj/machinery/camera/directional/north{ - c_tag = "Theater Stage" + c_tag = "Theater Stage"; + network = list("ss13","bar") }, -/obj/structure/chair/comfy/brown{ - dir = 4 +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 10 }, -/obj/effect/landmark/start/assistant, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/wood, +/obj/structure/railing, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood/large, /area/station/service/bar) "aKr" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/light/directional/north, -/turf/open/floor/wood, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/iron/stairs/old{ + dir = 4 + }, /area/station/service/bar) "aKs" = ( /obj/structure/disposalpipe/segment, @@ -7885,15 +7908,21 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "aKI" = ( -/obj/structure/chair/stool/directional/west, -/turf/open/floor/wood, +/obj/structure/table/wood, +/obj/item/food/pie/cream, +/obj/item/clothing/head/costume/sombrero/green, +/obj/item/clothing/head/collectable/petehat, +/turf/open/floor/wood/large, /area/station/service/bar) "aKJ" = ( /obj/machinery/light_switch{ pixel_y = 28 }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, /obj/machinery/vending/coffee, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/service/bar) "aKM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -7902,15 +7931,21 @@ /turf/open/floor/iron, /area/station/cargo/storage) "aKN" = ( -/obj/structure/table/wood/fancy, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 6 + }, +/obj/structure/railing, +/turf/open/floor/wood/large, /area/station/service/bar) "aKO" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/turf/open/floor/stone, /area/station/service/bar) "aKP" = ( /obj/structure/disposalpipe/segment{ @@ -7919,7 +7954,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/wood, +/obj/effect/turf_decal/loading_area/white, +/turf/open/floor/wood/large, /area/station/service/bar) "aKQ" = ( /obj/machinery/reagentgrinder, @@ -8353,7 +8389,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/stone, /area/station/service/bar) "aMA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -8371,8 +8410,14 @@ /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "aMC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /obj/machinery/vending/cigarette, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/service/bar) "aMD" = ( /obj/machinery/icecream_vat, @@ -8608,7 +8653,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aNu" = ( /obj/structure/closet/secure_closet/bar, @@ -8635,30 +8680,37 @@ /turf/open/floor/wood, /area/station/service/bar) "aNF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 +/obj/machinery/camera/directional/north{ + c_tag = "Disposal Mass Driver" }, -/obj/structure/chair/comfy/brown, -/obj/effect/landmark/start/hangover, -/turf/open/floor/wood, -/area/station/service/bar) +/turf/open/space/basic, +/area/space/nearstation) "aNH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, -/turf/open/floor/wood, +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, /area/station/service/bar) "aNI" = ( /obj/machinery/light/small/directional/east, /obj/machinery/status_display/evac/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/stone, /area/station/service/bar) "aNJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "aNL" = ( /obj/machinery/door/firedoor, @@ -8932,11 +8984,13 @@ /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen) "aOJ" = ( -/obj/structure/chair/comfy/brown{ +/obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/stone, /area/station/service/bar) "aOM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -8965,7 +9019,7 @@ dir = 8 }, /obj/structure/window/spawner/directional/west, -/obj/item/toy/plush/beeplushie, +/obj/structure/beebox, /turf/open/floor/grass, /area/station/service/hydroponics) "aOS" = ( @@ -9245,6 +9299,7 @@ /obj/effect/landmark/start/hangover, /obj/structure/chair/sofa/right/brown, /obj/structure/window/spawner/directional/north, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/wood, /area/station/service/bar) "aQc" = ( @@ -9260,6 +9315,9 @@ }, /obj/effect/landmark/start/hangover, /obj/structure/window/spawner/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/station/service/bar) "aQg" = ( @@ -9382,14 +9440,14 @@ /turf/open/floor/iron, /area/station/commons/locker) "aQP" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/machinery/light_switch{ pixel_y = 28 }, +/obj/machinery/vending/autodrobe/all_access, /turf/open/floor/iron, /area/station/commons/locker) "aQQ" = ( -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/vending/dorms, /turf/open/floor/iron, /area/station/commons/locker) "aQR" = ( @@ -9397,7 +9455,7 @@ /turf/open/floor/iron, /area/station/commons/locker) "aQS" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron, /area/station/commons/locker) "aQT" = ( @@ -9495,8 +9553,8 @@ /obj/machinery/chem_dispenser/drinks{ dir = 8 }, -/obj/structure/table, /obj/machinery/digital_clock/directional/east, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aRh" = ( @@ -9632,11 +9690,11 @@ dir = 1 }, /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aRx" = ( /obj/effect/spawner/random/entertainment/arcade, -/turf/open/floor/wood, +/turf/open/floor/eighties, /area/station/service/bar) "aRy" = ( /obj/structure/extinguisher_cabinet{ @@ -9840,17 +9898,16 @@ /turf/open/floor/plating, /area/station/commons/storage/emergency/port) "aSo" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/wood, +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, /area/station/service/bar) "aSq" = ( /obj/structure/chair/comfy/brown{ dir = 8 }, /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aSr" = ( /obj/effect/turf_decal/tile/yellow, @@ -9878,19 +9935,15 @@ /turf/open/floor/iron, /area/station/command/bridge) "aSv" = ( -/obj/structure/table/reinforced, -/obj/item/storage/briefcase/secure, -/obj/item/storage/box/ids, -/obj/item/storage/box/silver_ids{ - pixel_x = 4; - pixel_y = 6 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/item/storage/box/pdas{ - pixel_x = 4; - pixel_y = 4 +/obj/machinery/light/directional/west, +/obj/structure/sign/poster/timeclock_psa/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/turf/open/floor/iron, -/area/station/command/bridge) +/area/station/commons/dorms) "aSw" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -9986,7 +10039,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aSI" = ( /obj/machinery/door/airlock/public/glass{ @@ -10053,15 +10106,12 @@ /turf/open/floor/iron, /area/station/commons/storage/tools) "aSY" = ( -/obj/structure/table/reinforced, /obj/item/clothing/head/hats/tophat, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aSZ" = ( @@ -10358,7 +10408,7 @@ "aUg" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aUl" = ( /obj/effect/spawner/structure/window/reinforced, @@ -10507,6 +10557,7 @@ dir = 10 }, /obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/computer/security/telescreen/vault/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "aUQ" = ( @@ -10708,17 +10759,17 @@ /area/station/service/bar) "aVx" = ( /obj/machinery/holopad, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aVy" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_y = 4 }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aVz" = ( @@ -11353,14 +11404,10 @@ /turf/open/floor/wood, /area/station/service/bar) "aXj" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = 6; pixel_y = 7 @@ -11370,6 +11417,7 @@ pixel_x = -7 }, /obj/machinery/firealarm/directional/north, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aXk" = ( @@ -11377,9 +11425,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, /obj/structure/window/spawner/directional/south, -/obj/structure/table/reinforced, /obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/cup/rag{ pixel_x = -4 @@ -11387,6 +11433,7 @@ /obj/item/reagent_containers/cup/glass/shaker{ pixel_x = 8 }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aXm" = ( @@ -11551,7 +11598,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "aXP" = ( /obj/structure/closet/crate, @@ -11995,11 +12045,15 @@ /area/station/maintenance/fore) "aZb" = ( /obj/machinery/camera/directional/south{ - c_tag = "Bar South" + c_tag = "Bar South"; + network = list("ss13","bar") }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/stone, /area/station/service/bar) "aZd" = ( /obj/machinery/firealarm/directional/south, @@ -12252,6 +12306,7 @@ dir = 1 }, /obj/effect/landmark/start/hangover, +/obj/machinery/firealarm/directional/south, /turf/open/floor/wood, /area/station/service/bar) "baa" = ( @@ -12259,12 +12314,17 @@ dir = 1 }, /obj/effect/landmark/start/hangover, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/wood, /area/station/service/bar) "bab" = ( -/obj/machinery/light/directional/south, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "bac" = ( /obj/structure/chair/sofa/right/brown{ @@ -12272,6 +12332,7 @@ }, /obj/effect/landmark/start/hangover, /obj/machinery/newscaster/directional/south, +/obj/machinery/light/directional/south, /turf/open/floor/wood, /area/station/service/bar) "bad" = ( @@ -12281,8 +12342,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/stone, /area/station/service/bar) "bae" = ( /obj/effect/spawner/structure/window, @@ -12306,8 +12370,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/wood, +/obj/structure/chair/stool/directional/west{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/wood/parquet, /area/station/service/bar) "bah" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -12316,7 +12384,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "bai" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -12329,7 +12400,8 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/turf/open/floor/wood, +/obj/machinery/computer/slot_machine, +/turf/open/floor/wood/parquet, /area/station/service/bar) "baj" = ( /obj/structure/table/reinforced, @@ -12658,10 +12730,10 @@ /area/station/command/heads_quarters/captain) "bbx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Diner" +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Atrium" }, -/turf/open/floor/wood, +/turf/open/floor/iron, /area/station/service/bar) "bby" = ( /obj/machinery/barsign, @@ -13037,16 +13109,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/item/paper{ - pixel_y = 7; - pixel_x = -4 - }, -/obj/item/pen/fourcolor{ - pixel_x = -5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/item/paper{ + pixel_x = -1; + pixel_y = 5 + }, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) "bcH" = ( @@ -13907,7 +13976,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/machinery/computer/security/telescreen/cmo/directional/west, /obj/effect/landmark/start/chief_medical_officer, /obj/machinery/button/door{ id = "cmoprivacy"; @@ -13919,6 +13987,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, +/obj/machinery/computer/security/telescreen/cmo/directional/east, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "bfL" = ( @@ -13930,6 +13999,8 @@ /area/station/cargo/sorting) "bfO" = ( /obj/machinery/fishing_portal_generator, +/obj/item/fishing_line/reinforced, +/obj/item/fishing_rod/telescopic, /turf/open/floor/plating, /area/station/security/prison) "bfR" = ( @@ -13986,10 +14057,11 @@ "bfZ" = ( /obj/structure/sign/warning/secure_area/directional/south, /obj/effect/turf_decal/tile/purple, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/purple/opposingcorners, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "bgc" = ( @@ -14095,7 +14167,8 @@ id = "packageSort2" }, /obj/machinery/camera/directional/west{ - c_tag = "Cargo Delivery Office" + c_tag = "Cargo Delivery Office"; + network = list("ss13","trash","Cargo") }, /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -14113,7 +14186,6 @@ /area/station/cargo/sorting) "bgE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/cargo/sorting) "bgF" = ( @@ -14854,7 +14926,8 @@ /area/station/command/heads_quarters/blueshield) "bjo" = ( /obj/machinery/camera/directional/north{ - c_tag = "Cargo Bay North" + c_tag = "Cargo Bay North"; + network = list("ss13","cargo") }, /obj/machinery/vending/wardrobe/cargo_wardrobe, /turf/open/floor/iron, @@ -15986,15 +16059,12 @@ /turf/closed/wall/r_wall, /area/station/science/robotics/mechbay) "bnd" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, /obj/structure/displaycase/forsale/kitchen, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "bne" = ( @@ -16272,9 +16342,9 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "bnR" = ( -/obj/machinery/computer/security/telescreen/vault, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, +/obj/machinery/computer/security/telescreen/vault/directional/north, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "bnT" = ( @@ -16697,10 +16767,11 @@ /obj/structure/sign/painting/parting{ pixel_y = -32 }, -/obj/structure/closet/secure_closet/captains, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/item/bedsheet/captain, +/obj/structure/closet/secure_closet/captains, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) "bpk" = ( @@ -17308,7 +17379,8 @@ }, /obj/effect/mapping_helpers/requests_console/supplies, /obj/machinery/camera/directional/west{ - c_tag = "Cargo Office" + c_tag = "Cargo Office"; + network = list("ss13","cargo") }, /obj/machinery/rnd/production/techfab/department/cargo, /turf/open/floor/iron, @@ -17723,6 +17795,7 @@ /area/station/medical/storage) "bsO" = ( /obj/structure/bodycontainer/morgue, +/obj/item/food/burger/roburger, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "bsP" = ( @@ -19117,10 +19190,7 @@ dir = 1 }, /obj/effect/landmark/start/depsec/medical, -/obj/machinery/computer/security/telescreen/cmo/directional/east{ - desc = "Used for monitoring medbay to ensure patient safety."; - name = "Medbay Monitor" - }, +/obj/machinery/computer/security/telescreen/cmo/directional/west, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "bwH" = ( @@ -19152,6 +19222,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"bwS" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, +/area/station/service/bar) "bwV" = ( /obj/effect/landmark/start/shaft_miner, /obj/structure/cable, @@ -20023,7 +20099,8 @@ "bAP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/west{ - c_tag = "Atmospherics Incinerator" + c_tag = "Atmospherics Incinerator"; + network = list("ss13","engine") }, /obj/machinery/atmospherics/components/tank/plasma, /turf/open/floor/iron, @@ -20344,7 +20421,8 @@ pixel_x = -30 }, /obj/machinery/camera/directional/west{ - c_tag = "Mining Dock" + c_tag = "Mining Dock"; + network = list("ss13","cargo") }, /obj/machinery/conveyor_switch/oneway{ id = "boulderbelt" @@ -21031,7 +21109,8 @@ "bEn" = ( /obj/machinery/light/directional/north, /obj/machinery/camera/directional/north{ - c_tag = "Xenobiology Experimentation Cell" + c_tag = "Xenobiology Experimentation Cell"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -21415,7 +21494,7 @@ /area/station/medical/chemistry) "bFC" = ( /obj/structure/table/wood/poker, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "bFE" = ( /obj/effect/decal/cleanable/dirt, @@ -22020,7 +22099,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, -/turf/open/floor/wood, +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, /area/station/service/bar) "bHG" = ( /obj/structure/rack, @@ -22267,9 +22348,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - piping_layer = 2 - }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2, /turf/open/floor/iron, /area/station/science/ordnance) "bIB" = ( @@ -22755,7 +22834,8 @@ /area/space/nearstation) "bKj" = ( /obj/machinery/camera/directional/east{ - c_tag = "Mining Dock External" + c_tag = "Mining Dock External"; + network = list("ss13","cargo") }, /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line, @@ -22865,10 +22945,10 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/landmark/start/depsec/engineering, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/effect/landmark/start/depsec/engineering, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "bKI" = ( @@ -24000,7 +24080,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "bPe" = ( -/obj/machinery/photocopier, +/obj/structure/aquarium/lawyer, /turf/open/floor/wood, /area/station/service/lawoffice) "bPf" = ( @@ -24831,6 +24911,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"bTe" = ( +/obj/effect/turf_decal/vg_decals/numbers/eight, +/turf/open/floor/iron/airless, +/area/space/nearstation) "bTh" = ( /obj/machinery/holopad, /turf/open/floor/iron/smooth_large, @@ -26592,7 +26676,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "caI" = ( -/obj/item/toy/plush/bigdeer, +/obj/item/toy/plush/bigdeer{ + name = "turbine deer" + }, /turf/open/floor/plating, /area/space/nearstation) "caK" = ( @@ -27336,7 +27422,6 @@ "cee" = ( /obj/structure/table, /obj/item/book/manual/wiki/tcomms, -/obj/item/radio/off, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -27344,6 +27429,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/item/radio/off, /turf/open/floor/iron, /area/station/tcommsat/computer) "ceg" = ( @@ -27376,10 +27462,10 @@ /obj/machinery/computer/station_alert{ dir = 4 }, -/obj/machinery/computer/security/telescreen/ce/directional/east, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, +/obj/machinery/computer/security/telescreen/ce/directional/west, /turf/open/floor/iron/white/corner{ dir = 4 }, @@ -27576,7 +27662,9 @@ /turf/open/floor/engine, /area/station/engineering/atmos) "cfo" = ( -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","xeno") + }, /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) "cfp" = ( @@ -28022,9 +28110,10 @@ "chR" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/machinery/camera/directional/west{ - c_tag = "Bar West" + c_tag = "Bar West"; + network = list("ss13","bar") }, -/turf/open/floor/wood, +/turf/open/floor/eighties, /area/station/service/bar) "chS" = ( /obj/machinery/door/airlock/engineering{ @@ -28684,9 +28773,13 @@ /turf/open/floor/engine/o2, /area/station/engineering/atmos) "clX" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /obj/effect/landmark/event_spawn, /obj/effect/spawner/xmastree, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/service/bar) "clZ" = ( /turf/open/floor/engine/air, @@ -30744,6 +30837,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, /turf/open/floor/carpet/blue, /area/station/service/lawoffice) "cxx" = ( @@ -31033,7 +31129,10 @@ /area/station/cargo/storage) "czP" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, /area/station/service/bar) "czS" = ( /obj/structure/cable, @@ -32151,7 +32250,8 @@ /area/station/engineering/main) "cFl" = ( /obj/machinery/camera/directional/west{ - c_tag = "Cargo - Bitrunning Den" + c_tag = "Cargo - Bitrunning Den"; + network = list("ss13","cargo") }, /obj/effect/decal/cleanable/cobweb, /obj/structure/table, @@ -32912,6 +33012,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/machinery/computer/security/telescreen/disposals/directional/north, /turf/open/floor/iron, /area/station/cargo/sorting) "cNN" = ( @@ -33343,7 +33444,7 @@ "cTP" = ( /obj/effect/landmark/start/hangover, /obj/structure/table/wood/poker, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "cTQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -33639,7 +33740,7 @@ dir = 4 }, /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "dfw" = ( /obj/machinery/light_switch{ @@ -33845,6 +33946,10 @@ /obj/item/clothing/neck/pauldron, /turf/open/floor/iron/dark, /area/station/security/office) +"dlW" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/service/bar) "dlY" = ( /obj/structure/sink/directional/south, /obj/structure/mirror/directional/north, @@ -33855,12 +33960,12 @@ /obj/machinery/computer/records/security{ dir = 8 }, -/obj/machinery/computer/security/telescreen/engine/directional/west, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/computer/security/telescreen/engine/directional/east, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "dnc" = ( @@ -33988,6 +34093,16 @@ }, /turf/open/floor/iron, /area/station/science/cytology) +"drV" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar) "dsd" = ( /obj/machinery/computer/records/security{ dir = 1 @@ -34053,7 +34168,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/computer/security/telescreen/engine/directional/west, +/obj/machinery/computer/security/telescreen/engine/directional/east, /turf/open/floor/iron/smooth_large, /area/station/engineering/engine_smes) "dul" = ( @@ -34277,9 +34392,9 @@ /turf/open/floor/plating, /area/station/maintenance/fore/lesser) "dDX" = ( -/obj/machinery/computer/security/telescreen/prison/directional/north, /obj/structure/filingcabinet/employment, /obj/machinery/firealarm/directional/east, +/obj/machinery/computer/security/telescreen/prison/directional/south, /turf/open/floor/carpet/blue, /area/station/service/lawoffice) "dEq" = ( @@ -35100,18 +35215,19 @@ /obj/item/reagent_containers/spray/cleaner{ pixel_x = 2 }, -/obj/item/storage/pill_bottle/mutadone{ - pixel_x = 11; - pixel_y = 7 - }, -/obj/item/clothing/gloves/latex{ - pixel_y = 3 - }, /obj/item/radio/headset/headset_medsci{ pixel_x = -7; pixel_y = 4 }, /obj/machinery/light/directional/south, +/obj/item/clothing/gloves/latex{ + pixel_y = 3 + }, +/obj/item/storage/pill_bottle/monkeydone, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = 11; + pixel_y = 7 + }, /turf/open/floor/iron/dark/textured, /area/station/science/genetics) "eiK" = ( @@ -35281,11 +35397,12 @@ "epT" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, -/obj/structure/chair/comfy/brown{ +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/turf/open/floor/iron/stairs/old{ dir = 8 }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/wood, /area/station/service/bar) "eqj" = ( /obj/machinery/porta_turret/ai{ @@ -35562,7 +35679,8 @@ "eCg" = ( /obj/effect/turf_decal/delivery, /obj/machinery/camera/directional/south{ - c_tag = "Cargo Bay South" + c_tag = "Cargo Bay South"; + network = list("ss13","cargo") }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -35685,7 +35803,11 @@ /area/station/engineering/main) "eIf" = ( /obj/structure/noticeboard/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/jukebox, +/turf/open/floor/stone, /area/station/service/bar) "eIo" = ( /obj/structure/cable, @@ -35739,6 +35861,13 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) +"eJQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/stone, +/area/station/service/bar) "eJR" = ( /obj/structure/chair/pew/right{ dir = 1 @@ -35851,6 +35980,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/science/ordnance) +"eOm" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/loading_area/white, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "eOx" = ( /obj/structure/railing{ dir = 8 @@ -36063,6 +36199,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/item/radio/off, +/obj/item/screwdriver{ + pixel_y = 10 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "eYQ" = ( @@ -36405,9 +36545,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 }, -/obj/machinery/computer/security/telescreen/isolation{ - name = "isolation room monitor" - }, +/obj/machinery/computer/security/telescreen/isolation/directional/north, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "fiD" = ( @@ -36474,6 +36612,8 @@ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/effect/spawner/random/contraband/prison, +/obj/structure/closet/crate/trashcart, /turf/open/floor/iron/kitchen{ dir = 1 }, @@ -37079,7 +37219,6 @@ pixel_x = -26; pixel_y = 6 }, -/obj/item/clothing/head/hats/warden/drill/nanotrasen, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/nt_rep) "fJv" = ( @@ -37227,6 +37366,18 @@ }, /turf/open/floor/iron/white, /area/station/service/barber) +"fNG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "fNJ" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37378,6 +37529,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/office) +"fTS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "fUa" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -37523,7 +37683,6 @@ dir = 1 }, /obj/machinery/light/directional/south, -/obj/item/storage/briefcase/central_command, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) "fYZ" = ( @@ -38195,11 +38354,11 @@ /area/station/maintenance/port/aft) "gzQ" = ( /obj/structure/table, -/obj/effect/spawner/random/engineering/tool, /obj/effect/spawner/random/engineering/tool{ pixel_x = 16; pixel_y = -3 }, +/obj/item/bot_assembly/ed209, /turf/open/floor/iron/dark, /area/station/security/mechbay) "gzV" = ( @@ -38934,7 +39093,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access = list("virology"); + req_access = list("medical"); pixel_y = 6 }, /obj/effect/mapping_helpers/airlock/access/any/medical/general, @@ -39386,10 +39545,6 @@ }, /area/station/science/server) "huk" = ( -/obj/item/screwdriver{ - pixel_y = 10 - }, -/obj/item/radio/off, /obj/machinery/light_switch/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -39408,6 +39563,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/effect/landmark/start/engineering_guard, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "huA" = ( @@ -39746,7 +39902,7 @@ "hGf" = ( /obj/machinery/camera/directional/south{ c_tag = "Prison - Isolation B"; - network = list("ss13","prison") + network = list("ss13","prison","isolation") }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -39966,7 +40122,8 @@ }, /obj/structure/disposaloutlet, /obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Cell 6" + c_tag = "Xenobiology Cell 6"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -39993,7 +40150,6 @@ /area/station/service/chapel) "hQn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/clothing/under/rank/prisoner/classic, /turf/open/floor/plating, /area/station/security/prison) "hQu" = ( @@ -40345,6 +40501,10 @@ /area/station/hallway/primary/starboard) "ibl" = ( /obj/structure/flora/bush/flowers_pp, +/obj/effect/turf_decal/siding/wideplating_new{ + dir = 4 + }, +/obj/structure/flora/bush/grassy, /turf/open/floor/grass, /area/station/security/prison) "ibI" = ( @@ -40547,7 +40707,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/landmark/start/engineering_guard, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "iiz" = ( @@ -40578,7 +40737,7 @@ /area/station/hallway/primary/fore) "iiD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/computer/security/telescreen/research, +/obj/machinery/computer/security/telescreen/xeno/directional/north, /turf/open/floor/iron/white, /area/station/science/xenobiology) "iiZ" = ( @@ -40806,6 +40965,16 @@ /obj/machinery/drone_dispenser, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"iqu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/item/kirbyplants/organic/plant11, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "iqK" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -41243,8 +41412,8 @@ /turf/open/floor/iron/smooth_large, /area/station/engineering/break_room) "iHH" = ( -/obj/machinery/light/floor, -/turf/open/floor/wood, +/obj/structure/table/wood/fancy, +/turf/open/floor/wood/parquet, /area/station/service/bar) "iHT" = ( /obj/machinery/biogenerator, @@ -41302,10 +41471,16 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "iKp" = ( -/obj/structure/musician/piano{ - icon_state = "piano" +/obj/structure/chair/comfy/black{ + dir = 8 }, -/turf/open/floor/wood, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/wood/large, /area/station/service/bar) "iKz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -41359,11 +41534,11 @@ pixel_x = -6; pixel_y = 9 }, -/obj/machinery/computer/security/telescreen/rd/directional/west, /obj/item/stamp/coderbus/closed, /obj/item/stamp/coderbus/merged{ pixel_x = 9 }, +/obj/machinery/computer/security/telescreen/rd/directional/east, /turf/open/floor/iron/cafeteria, /area/station/command/heads_quarters/rd) "iMH" = ( @@ -41574,7 +41749,7 @@ name = "Virology Access Console"; pixel_x = 7; pixel_y = 26; - req_access = list("virology") + req_access = list("medical") }, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -41663,15 +41838,16 @@ /turf/open/floor/catwalk_floor/iron, /area/station/science/explab) "iYy" = ( -/obj/structure/table/wood, -/obj/item/instrument/guitar{ - pixel_x = -7 +/obj/structure/musician/piano{ + icon_state = "piano" }, -/obj/item/instrument/eguitar{ - pixel_x = 5 +/obj/structure/railing{ + dir = 1 }, -/obj/item/instrument/violin, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/wood/large, /area/station/service/bar) "iYO" = ( /obj/effect/decal/cleanable/dirt, @@ -41874,13 +42050,20 @@ /area/station/maintenance/aft) "jeQ" = ( /obj/structure/chair/office, -/obj/effect/landmark/start/research_director, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/research_director, /turf/open/floor/iron/cafeteria, /area/station/command/heads_quarters/rd) +"jgc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/bar) "jgi" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -42140,6 +42323,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) +"jnq" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "jnH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42346,7 +42536,7 @@ idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; - req_access = list("virology"); + req_access = list("medical"); pixel_x = -24 }, /obj/effect/mapping_helpers/airlock/access/any/medical/general, @@ -42443,15 +42633,12 @@ /turf/open/floor/iron/dark, /area/station/security/corrections_officer) "juQ" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/spawner/random/food_or_drink/refreshing_beverage, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "jvb" = ( @@ -42879,7 +43066,6 @@ /area/station/security/prison/safe) "jMI" = ( /obj/structure/table, -/obj/machinery/computer/security/telescreen/research, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -42889,6 +43075,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/item/radio/off, +/obj/item/screwdriver{ + pixel_y = 10 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) "jMY" = ( @@ -43263,10 +43453,10 @@ /area/station/security/prison/safe) "jYM" = ( /obj/structure/chair/office, -/obj/effect/landmark/start/depsec/engineering, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 9 }, +/obj/effect/landmark/start/depsec/engineering, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "jZE" = ( @@ -43324,6 +43514,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"kcx" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "kcz" = ( /obj/machinery/plate_press{ pixel_y = 4 @@ -43472,6 +43668,10 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"kfR" = ( +/obj/machinery/barsign, +/turf/closed/wall, +/area/station/service/theater) "kgE" = ( /obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = -5; @@ -43662,7 +43862,10 @@ "kmD" = ( /obj/effect/landmark/start/assistant, /obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "kmR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43807,7 +44010,7 @@ /obj/machinery/door/airlock/command{ name = "Gateway" }, -/obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door, +/obj/effect/mapping_helpers/airlock/access/any/command/gateway, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) "ktt" = ( @@ -44763,7 +44966,10 @@ /area/station/service/hydroponics/garden/abandoned) "lcd" = ( /obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "lcp" = ( /obj/machinery/light/directional/north, @@ -44910,6 +45116,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "liF" = ( @@ -44968,6 +45175,11 @@ /obj/item/clothing/neck/pauldron, /turf/open/floor/iron/dark, /area/station/security/office) +"lno" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/chair/comfy/brown, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "log" = ( /obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/wood, @@ -45149,6 +45361,7 @@ /turf/open/floor/iron/dark/corner, /area/station/commons/dorms) "lwn" = ( +/obj/effect/turf_decal/vg_decals/numbers/two, /turf/open/floor/iron/airless, /area/space/nearstation) "lwp" = ( @@ -45211,8 +45424,11 @@ /turf/open/floor/iron/white, /area/station/medical/break_room) "lyz" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/grass, +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/obj/structure/railing, +/turf/open/water, /area/station/security/prison) "lzf" = ( /obj/machinery/door/window/right/directional/east{ @@ -46160,6 +46376,8 @@ /area/station/medical/storage) "mez" = ( /obj/machinery/light/directional/north, +/obj/item/clothing/gloves/boxing/yellow, +/obj/structure/closet/crate/bin, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -46342,13 +46560,23 @@ }, /turf/open/floor/iron, /area/station/command/meeting_room) +"moN" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar) "moU" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/structure/disposaloutlet, /obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Cell 7" + c_tag = "Xenobiology Cell 7"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -46364,10 +46592,6 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "mql" = ( -/obj/item/screwdriver{ - pixel_y = 10 - }, -/obj/item/radio/off, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 @@ -46377,6 +46601,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/light/directional/south, +/obj/machinery/computer/security/telescreen/research/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) "mqS" = ( @@ -46400,6 +46625,7 @@ }, /obj/item/restraints/handcuffs, /obj/item/radio/off, +/obj/machinery/computer/security/telescreen/normal/directional/south, /turf/open/floor/iron/dark, /area/station/security/brig) "mrg" = ( @@ -46450,7 +46676,9 @@ dir = 5; network = list("ss13","prison") }, -/obj/structure/flora/bush/grassy, +/obj/effect/turf_decal/siding/wideplating_new{ + dir = 4 + }, /obj/machinery/biogenerator, /turf/open/floor/grass, /area/station/security/prison) @@ -46531,9 +46759,15 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 }, -/obj/structure/closet/crate/hydroponics, /obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/west, +/obj/item/bee_smoker, +/obj/item/clothing/head/utility/beekeeper_head, +/obj/item/clothing/suit/hooded/bee_costume, +/obj/item/clothing/mask/animal/small/bee, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/melee/flyswatter, +/obj/structure/closet/crate/hydroponics, /turf/open/floor/grass, /area/station/service/hydroponics) "muH" = ( @@ -46807,6 +47041,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/station/commons/locker) "mFY" = ( @@ -46885,6 +47120,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/glass/bottle/rootbeer, +/obj/structure/closet/crate/bin, /turf/open/floor/iron/kitchen{ dir = 1 }, @@ -47027,6 +47264,14 @@ /obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot, /turf/open/floor/iron, /area/station/maintenance/starboard) +"mPx" = ( +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 + }, +/obj/structure/railing, +/turf/open/water, +/area/station/security/prison) "mQo" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -47298,9 +47543,11 @@ /turf/open/floor/iron/dark, /area/station/security/office) "nah" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/pollution_scrubber, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/stone, /area/station/service/bar) "naT" = ( /obj/effect/turf_decal/tile/red{ @@ -47442,7 +47689,8 @@ }, /obj/structure/disposaloutlet, /obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Cell 8" + c_tag = "Xenobiology Cell 8"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -47490,14 +47738,16 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) "nhI" = ( -/obj/structure/chair/comfy/black{ +/obj/structure/railing/corner/end{ + dir = 8 + }, +/turf/open/floor/iron/stairs/old{ dir = 8 }, -/turf/open/floor/wood, /area/station/service/bar) "nhM" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, /turf/open/floor/wood, /area/station/service/lawoffice) @@ -47602,6 +47852,9 @@ /area/station/medical/pharmacy) "nlQ" = ( /obj/structure/trash_pile, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5 + }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "nlW" = ( @@ -47658,6 +47911,10 @@ /obj/item/toy/plush/slimeplushie, /turf/open/floor/engine, /area/station/science/xenobiology) +"npz" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood/large, +/area/station/service/bar) "npG" = ( /turf/open/floor/iron/textured, /area/station/security/prison) @@ -47719,6 +47976,18 @@ /obj/item/clothing/head/wizard/fake, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"ntB" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/stone, +/area/station/service/bar) "ntP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/smooth_large, @@ -47975,7 +48244,8 @@ /area/station/security/office) "nDM" = ( /obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 2" + c_tag = "Xenobiology Cell 2"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -48163,6 +48433,10 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) +"nJF" = ( +/obj/machinery/computer/security/telescreen/bar/directional/east, +/turf/open/floor/wood, +/area/station/service/bar) "nJL" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/broken_floor, @@ -48212,6 +48486,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/science/research) +"nLX" = ( +/obj/structure/bed, +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/random/contraband/prison, +/turf/open/floor/plating, +/area/station/security/prison) "nMc" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/light/directional/south, @@ -48298,8 +48578,8 @@ /area/station/science/xenobiology) "nOt" = ( /obj/machinery/camera/directional/south{ - c_tag = "Prison - Cell 2"; - network = list("ss13","prison") + c_tag = "Prison - Cell A"; + network = list("ss13","prison","isolation") }, /obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -48393,6 +48673,10 @@ /obj/structure/weightmachine/weightlifter, /turf/open/floor/iron/dark/side, /area/station/security/prison) +"nQv" = ( +/obj/effect/turf_decal/vg_decals/numbers/one, +/turf/open/floor/plating/airless, +/area/space/nearstation) "nQD" = ( /obj/structure/sign/warning/pods/directional/north, /turf/open/floor/iron/white/corner{ @@ -48461,7 +48745,6 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/service/bar) "nRA" = ( @@ -48533,6 +48816,12 @@ }, /turf/open/floor/wood, /area/station/service/library) +"nTG" = ( +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/turf/open/water, +/area/station/security/prison) "nTO" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -49535,6 +49824,17 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) +"oFR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/stone, +/area/station/service/bar) "oGX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/burgerstation/odd, @@ -49646,10 +49946,13 @@ /obj/structure/table, /obj/effect/spawner/random/engineering/tool{ pixel_y = 6; - pixel_x = 1 + pixel_x = 7 }, /obj/item/poster/random_official, /obj/machinery/airalarm/directional/south, +/obj/effect/spawner/random/engineering/tool{ + pixel_x = -7 + }, /turf/open/floor/iron/dark, /area/station/security/mechbay) "oNd" = ( @@ -49914,10 +50217,11 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "oXU" = ( -/obj/structure/closet/secure_closet/chief_medical, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/item/circuitboard/machine/fat_sucker, +/obj/structure/closet/secure_closet/chief_medical, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "oYb" = ( @@ -50603,6 +50907,10 @@ dir = 10 }, /area/station/science/research) +"pxR" = ( +/obj/effect/turf_decal/loading_area/white, +/turf/open/floor/wood/large, +/area/station/service/bar) "pxV" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -50993,6 +51301,10 @@ dir = 5; id = "garbage" }, +/obj/machinery/camera/directional/west{ + network = list("ss13","trash"); + c_tag = "Disposal" + }, /turf/open/floor/plating, /area/station/maintenance/disposal) "pLA" = ( @@ -51049,7 +51361,10 @@ /turf/open/floor/iron/dark, /area/station/security/prison) "pOz" = ( -/obj/machinery/camera/directional/east, +/obj/machinery/camera/directional/east{ + network = list("ss13","engine"); + c_tag = "Atmospherics HFR Room" + }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -51200,6 +51515,20 @@ }, /turf/open/floor/iron/smooth_half, /area/station/engineering/main) +"pRx" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/pdas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/silver_ids{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/storage/box/ids, +/obj/item/storage/briefcase/secure, +/turf/open/floor/iron, +/area/station/command/bridge) "pSb" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -51210,7 +51539,10 @@ /area/station/medical/virology) "pSg" = ( /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "pSk" = ( /turf/closed/wall, @@ -51439,8 +51771,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "qbv" = ( -/obj/machinery/jukebox, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/stone, /area/station/service/bar) "qby" = ( /obj/machinery/light/directional/south, @@ -51793,6 +52129,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning, +/obj/item/stamp/law, /turf/open/floor/iron/dark, /area/station/security/processing) "qqr" = ( @@ -52595,6 +52932,11 @@ }, /turf/open/floor/engine, /area/station/science/cytology) +"qRE" = ( +/obj/structure/table, +/obj/item/pai_card, +/turf/open/floor/wood, +/area/station/service/bar) "qSS" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron/white, @@ -52626,12 +52968,12 @@ /turf/open/floor/iron/dark/textured_large, /area/station/service/hydroponics) "qTr" = ( -/obj/item/food/burger/orange{ - desc = "Made by those abandoned by society."; - name = "prison burger" - }, -/turf/open/floor/plating, -/area/station/security/prison) +/obj/structure/bed, +/obj/structure/cable, +/obj/item/radio/intercom/prison/directional/north, +/obj/item/clothing/under/rank/prisoner/classic, +/turf/open/floor/iron, +/area/station/security/prison/safe) "qTC" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -52926,6 +53268,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"rbD" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/stone, +/area/station/service/bar) "rbH" = ( /obj/machinery/camera/directional/west{ c_tag = "Atmospherics Central" @@ -53059,6 +53411,8 @@ /area/station/science/ordnance/storage) "rfY" = ( /obj/structure/flora/bush/sparsegrass, +/obj/effect/turf_decal/siding/wideplating_new/corner, +/obj/structure/railing/corner, /turf/open/floor/grass, /area/station/security/prison) "rgu" = ( @@ -53074,7 +53428,10 @@ "rgF" = ( /obj/effect/landmark/start/bouncer, /obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "rgU" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, @@ -53279,6 +53636,12 @@ /obj/structure/plant_tank, /turf/open/floor/grass, /area/station/service/hydroponics) +"rqb" = ( +/obj/machinery/pollution_scrubber, +/obj/structure/chair/comfy/brown, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "rqi" = ( /turf/open/floor/wood, /area/station/command/heads_quarters/hop) @@ -53307,7 +53670,8 @@ /area/station/security/corrections_officer) "rqY" = ( /obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 4" + c_tag = "Xenobiology Cell 4"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -54178,6 +54542,16 @@ }, /turf/open/floor/wood, /area/station/security/prison) +"rUy" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/stone, +/area/station/service/bar) "rVc" = ( /obj/structure/toilet{ dir = 4 @@ -54328,6 +54702,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/safe) +"sbi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "sbQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -54433,11 +54813,8 @@ /obj/item/plant_analyzer, /obj/item/secateurs, /obj/item/secateurs, -/obj/item/wrench, -/obj/item/crowbar, /obj/item/storage/bag/plants, /obj/item/hatchet, -/obj/item/wirecutters, /obj/item/reagent_containers/cup/bucket, /obj/item/cultivator, /obj/item/cultivator, @@ -54450,6 +54827,11 @@ /obj/item/reagent_containers/cup/bucket{ pixel_x = -4 }, +/obj/item/wirecutters/makeshift, +/obj/item/fish_analyzer, +/obj/item/fishing_hook/magnet, +/obj/item/fishing_line/bouncy, +/obj/item/fishing_rod, /turf/open/floor/grass, /area/station/security/prison) "sfV" = ( @@ -54765,6 +55147,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Isolation Cell"; + network = list("ss13","prison","Isolation"); + view_range = 5 + }, /turf/open/floor/mineral/titanium/tiled/white{ name = "Padded tile" }, @@ -54798,10 +55185,6 @@ id = "briggate"; name = "Security Shutters" }, -/obj/machinery/computer/security/telescreen/normal/directional/north{ - desc = "Used to access the various cameras on the station."; - name = "Security Camera Monitor" - }, /obj/machinery/door/window/right/directional/south{ req_access = list("brig"); name = "Brig Desk" @@ -54852,7 +55235,8 @@ }, /obj/structure/disposaloutlet, /obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Cell 5" + c_tag = "Xenobiology Cell 5"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -55380,6 +55764,36 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/storage/part_replacer, +/obj/item/circuitboard/machine/telecomms/receiver, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/obj/item/circuitboard/machine/telecomms/hub, +/obj/item/circuitboard/machine/telecomms/processor, +/obj/item/circuitboard/machine/telecomms/bus, /turf/open/floor/iron, /area/station/tcommsat/computer) "sOI" = ( @@ -55409,6 +55823,13 @@ /obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer, /area/station/maintenance/starboard/fore) +"sPj" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/siding/wood/end{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar) "sPq" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56250,12 +56671,13 @@ }, /area/station/security/prison/safe) "twl" = ( -/obj/machinery/door/poddoor/preopen{ - id = "barShutters"; - name = "Privacy Shutters" +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/bar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, /area/station/service/bar) "twO" = ( /obj/effect/turf_decal/tile/dark_blue{ @@ -56734,7 +57156,10 @@ /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "tPg" = ( -/turf/open/floor/grass, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/turf/open/water, /area/station/security/prison) "tPr" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -56860,6 +57285,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"tTE" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort2" + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/cargo/sorting) "tTF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, @@ -57778,6 +58211,16 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"uGq" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/vg_decals/department/hop{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "uGw" = ( /obj/structure/bed/double, /obj/item/bedsheet/ce/double, @@ -58348,6 +58791,11 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) +"vbq" = ( +/obj/machinery/newscaster/directional/west, +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/station/service/lawoffice) "vbw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -58821,6 +59269,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay) +"vrk" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/bar) "vsA" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -59076,6 +59528,7 @@ dir = 4 }, /obj/structure/flora/bush/flowers_pp, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/grass, /area/station/security/prison) "vCF" = ( @@ -59345,7 +59798,7 @@ dir = 1 }, /obj/effect/landmark/start/assistant, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "vHR" = ( /obj/machinery/door/airlock{ @@ -59457,13 +59910,18 @@ /turf/open/floor/plating, /area/station/security/prison) "vLI" = ( -/obj/structure/beebox, +/obj/machinery/hydroponics/soil/soilbin, +/obj/item/toy/plush/beeplushie, /turf/open/floor/grass, /area/station/service/hydroponics) "vLX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"vNt" = ( +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "vNL" = ( /obj/machinery/door/window/brigdoor/right/directional/west, /obj/effect/decal/cleanable/dirt, @@ -59484,11 +59942,11 @@ /turf/open/floor/wood, /area/station/maintenance/abandon_cafeteria) "vOt" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/purple/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "vOC" = ( @@ -59501,11 +59959,21 @@ /turf/open/floor/iron, /area/station/security/prison/visit) "vOH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, /obj/machinery/airalarm/directional/west, /obj/machinery/light/directional/west, +/obj/item/fish_feed, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/clothing/glasses/sunglasses, +/obj/item/clothing/glasses/sunglasses/big{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/briefcase/secure, +/obj/item/storage/briefcase{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/closet/lawcloset, /turf/open/floor/wood, /area/station/service/lawoffice) "vOK" = ( @@ -59834,7 +60302,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/computer/security/telescreen/ordnance/directional/west, +/obj/machinery/computer/security/telescreen/ordnance/directional/east, /turf/open/floor/iron, /area/station/science/ordnance/bomb) "wed" = ( @@ -59910,7 +60378,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/newscaster/directional/south, +/obj/machinery/computer/security/telescreen/cargo_sec/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) "wfh" = ( @@ -59981,9 +60449,6 @@ /area/station/commons/dorms) "wik" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/item/storage/toolbox/fishing/small, -/obj/item/storage/toolbox/fishing/small, -/obj/item/storage/toolbox/fishing/small, /turf/open/floor/plating, /area/station/security/prison) "wiW" = ( @@ -60214,6 +60679,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/science/explab) +"wrY" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/iron, +/area/station/commons/locker) "wso" = ( /obj/machinery/light/small/directional/south, /obj/structure/mirror{ @@ -60284,7 +60758,8 @@ /area/station/command/heads_quarters/ce) "wuD" = ( /obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 3" + c_tag = "Xenobiology Cell 3"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -60700,6 +61175,11 @@ "wIx" = ( /obj/machinery/keycard_auth/directional/west, /obj/machinery/pdapainter/supply, +/obj/machinery/computer/security/telescreen/cargo/directional/north, +/obj/machinery/camera/directional/west{ + c_tag = "Quartermaster's Office"; + network = list("ss13","cargo") + }, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/qm) "wIK" = ( @@ -61400,7 +61880,7 @@ name = "Service Hall" }, /obj/effect/mapping_helpers/airlock/access/all/service/general, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/hallway/secondary/service) "xgf" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ @@ -61504,6 +61984,8 @@ /area/station/construction) "xhX" = ( /obj/structure/flora/bush/leafy, +/obj/effect/turf_decal/siding/wideplating_new, +/obj/structure/railing, /turf/open/floor/grass, /area/station/security/prison) "xiy" = ( @@ -61743,6 +62225,9 @@ /obj/item/toy/cards/deck{ pixel_y = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/station/service/bar) "xqs" = ( @@ -61837,7 +62322,6 @@ /turf/open/floor/iron/dark/textured_large, /area/station/cargo/miningdock) "xtO" = ( -/obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/rank/centcom/officer, /obj/item/clothing/under/rank/centcom/officer_skirt, /obj/item/clothing/under/rank/centcom/intern, @@ -61851,6 +62335,8 @@ /obj/item/clothing/suit/armor/centcom_formal/nt_consultant, /obj/item/clothing/suit/armor/centcom_formal, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/item/clothing/head/hats/warden/drill/nanotrasen, +/obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/nt_rep) "xuc" = ( @@ -61971,7 +62457,8 @@ /area/station/maintenance/disposal) "xyR" = ( /obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 1" + c_tag = "Xenobiology Cell 1"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -62019,12 +62506,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/storage) -"xAH" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/obj/effect/landmark/start/assistant, +"xAG" = ( +/obj/structure/sink/directional/south, /turf/open/floor/wood, +/area/station/security/prison) +"xAH" = ( +/turf/open/floor/wood/parquet, /area/station/service/bar) "xBJ" = ( /obj/structure/cable, @@ -62204,7 +62691,10 @@ "xJJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "xKb" = ( /obj/machinery/atmospherics/components/unary/portables_connector/layer4{ @@ -62376,10 +62866,11 @@ /turf/open/floor/wood, /area/station/security/prison) "xPm" = ( -/obj/structure/closet/secure_closet/nanotrasen_consultant, /obj/item/clothing/accessory/medal/gold/ordom, /obj/item/clothing/accessory/medal/gold/nanotrasen_consultant, /obj/item/clothing/accessory/medal/silver/bureaucracy, +/obj/item/storage/briefcase/central_command, +/obj/structure/closet/secure_closet/nanotrasen_consultant, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/nt_rep) "xPq" = ( @@ -62702,6 +63193,18 @@ /obj/machinery/computer/mecha, /turf/open/floor/carpet, /area/station/command/heads_quarters/rd) +"xYM" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar) "xZn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -76128,7 +76631,7 @@ beO beO beO beO -xzh +aNF xzh xzh xzh @@ -80993,7 +81496,7 @@ aLE avJ aOp aPA -aQR +aQV axi aTz aTz @@ -82021,7 +82524,7 @@ aLE avJ aOl aPE -aQV +aQR axy aSi aQN @@ -82219,13 +82722,13 @@ aaJ ikZ rTk abz -ikZ +qTr oLv abz jYu iBu abz -ikZ +qTr oLv abz ikZ @@ -82512,7 +83015,7 @@ xzh ali anK ali -uRx +nQv xzh alU alU @@ -82543,7 +83046,7 @@ nJN nmV szO vpS -vpS +wrY bbs aPA kYP @@ -82769,7 +83272,7 @@ xzh alU amC alU -uRx +nQv xzh xzh uRx @@ -83283,7 +83786,7 @@ xzh ali amC ali -lwn +bTe uRx xzh xzh @@ -85293,7 +85796,7 @@ bJc sUX aai xFA -qTr +hnO wOx acd acd @@ -86401,7 +86904,7 @@ mjF bcH jwX avD -aZH +tTE bnL cNJ cNJ @@ -88171,8 +88674,8 @@ dFo dFo dFo dFo +dFo aNS -aze axt jtw aph @@ -88212,7 +88715,7 @@ bqw aJq aJq aYl -aKF +uGq oXL lfF ova @@ -88384,7 +88887,7 @@ jgi vDw hXx riN -tPg +cZy eFj acd kZJ @@ -88427,8 +88930,8 @@ dFo air aqY vOH +vbq dFo -arP aqR btX bwI @@ -88897,8 +89400,8 @@ aai ulw cer qMW -tPg -cZy +aze +nTG lyz acd hXd @@ -89148,15 +89651,15 @@ sUX bJc xzh aai -hhR +nLX mam aai -ulw +xAG pmM nNA xhX tPg -lyz +mPx acd vJW sCd @@ -90759,8 +91262,8 @@ aJq gSY aOE aPT +pRx aRj -aSv aTV aVl aWP @@ -94345,7 +94848,7 @@ atj azc azc atj -aAX +aSv azc qgF aFe @@ -96923,13 +97426,13 @@ aGp aAh dlY avC -aKR +pxR adq aQb dPy aRu chR -aKR +aCG iYy aXi aPZ @@ -97180,19 +97683,19 @@ xfZ aAh aAh aAh -aKR +sPj aKI rFQ aPY xXl aRx -aKR +aCG iKp rFQ aPY aZZ aJC -aYV +vNt iKz aYV bfF @@ -97437,19 +97940,19 @@ aGD aHZ aCr aKJ -aKR -pSg -aVw +rUy +npz +aeG xqe aQd aRx -aKR +aCG nhI aVw -aPZ +qRE bac aJC -aYV +hXL iKz aYV bfF @@ -97693,20 +98196,20 @@ aFj aGr aHI aJk -aKR -aKR -aNt -aKR -aKR -aKR -aKR -aKR -aKR -aKR -aKR +pxR +aOJ +xYM +rbD +moN +moN +moN +drV +bwS +moN +moN bab -aJC -ado +aQg +aYV iKz ber bfF @@ -97951,19 +98454,19 @@ xNR aHK aCr aKr -aKR +vrk bHF -dfp +qbv xAH -aKR -aSo -clX +jnq +sbi +qbv aVx dfp -aKR -aKR +xAH +eJQ bbx -aYV +alu iKz aYV bfF @@ -98206,21 +98709,21 @@ aCr vmC aCr aCr -aCr +kfR aKq aSo -aNF +aNH nah -aKN +rqb iHH -aSG -aKR +fTS +clX aUg cTP aRw -aKR +ntB twl -alu +aDe dCL bes bfF @@ -98465,19 +98968,19 @@ aGz aIb aJC aKN -aSG +aSo aNH -aOJ -aSq -aKR -aSG -aKR +nah +lno +ado +fTS +nah aUg bFC vHL aAR -aCG -aDe +bby +aYV oOF bet bfH @@ -98722,18 +99225,18 @@ aGy aIa aJC epT -aSG +jgc aNH -aKR -aKR -aKR +qbv +xAH +aSq aSG qbv -aKR +xAH aSq aNt bad -bby +aJC uly ilO bet @@ -98981,16 +99484,16 @@ xge aKP aMx aNJ -xJJ +oFR xJJ xJJ axz -xJJ +oFR xJJ xJJ aXO aZb -aJC +bbx hXL iKz bet @@ -99239,16 +99742,16 @@ aKO aMC aNI eIf -aKR +bwS rgF acN lcd kmD -aKR +bwS pSg bah -twl -bcr +dlW +aYV iKz bet bvk @@ -99502,9 +100005,9 @@ aVy aSY juQ bnd -aKR -bah -twl +kcx +iqu +aQg aYV cTQ amJ @@ -100016,10 +100519,10 @@ aSF aQc leX nRz -aKR +eOm bai aJC -aYV +bcr iKz bet bfH @@ -100273,7 +100776,7 @@ aQc aac aQc aXk -aAR +fNG aBJ aJC hLC @@ -100778,7 +101281,7 @@ tve aIg lNN aKR -aKR +nJF aJC aOP aJI diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index f87929e066909..f3b146fadbb03 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -13428,6 +13428,10 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/dark, /area/station/security/brig) +"dmU" = ( +/obj/effect/spawner/random/structure/twelve_percent_spirit_board, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) "dnd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16228,7 +16232,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/incident_display/delam/directional/south, +/obj/machinery/incident_display/bridge/directional/south, /turf/open/floor/iron/dark, /area/station/command/bridge) "dXO" = ( @@ -24704,6 +24708,21 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/kitchen/abandoned) +"gei" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/cytology{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/obj/item/seeds/soya{ + pixel_x = 11; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) "gej" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -33170,10 +33189,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"ikB" = ( -/obj/effect/spawner/random/structure/twelve_percent_spirit_board, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) "ikD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -49214,20 +49229,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"mna" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/table/reinforced, -/obj/item/storage/box/monkeycubes{ - pixel_y = 3 - }, -/obj/item/storage/box/monkeycubes, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/science/xenobiology) "mnl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53137,17 +53138,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/science) -"nnh" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/cytology{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/science/xenobiology) "nnv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -90433,9 +90423,8 @@ /turf/open/misc/grass, /area/station/hallway/primary/fore) "wCh" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1; - piping_layer = 2 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 1 }, /obj/structure/window/reinforced/spawner/directional/south, /obj/effect/turf_decal/siding/thinplating/dark, @@ -94412,6 +94401,24 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"xCj" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/item/storage/box/monkeycubes{ + pixel_y = 10; + pixel_x = 1 + }, +/obj/item/storage/box/monkeycubes{ + pixel_y = 3; + pixel_x = -13 + }, +/turf/open/floor/iron, +/area/station/science/xenobiology) "xCC" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -121568,7 +121575,7 @@ rZw iQF eRr pTC -nnh +gei fpt uOF sPk @@ -122857,7 +122864,7 @@ qNn lZG gmI ahY -mna +xCj jDd eJG loj @@ -145241,7 +145248,7 @@ dKz dpO asS iVj -ikB +dmU tdC kZc mVY diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 778f84a0019d8..a154878b82c92 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1688,10 +1688,6 @@ }, /turf/open/floor/plating, /area/station/science/robotics/lab) -"aAf" = ( -/obj/machinery/incident_display/delam, -/turf/closed/wall/r_wall, -/area/station/command/bridge) "aAi" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/table/wood/fancy/red, @@ -4309,6 +4305,17 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) +"boA" = ( +/obj/machinery/chem_master{ + name = "CytoMaster 5000" + }, +/obj/item/swab{ + pixel_y = 10; + pixel_x = -2 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "boO" = ( /obj/structure/chair/sofa/left/brown{ dir = 8 @@ -4620,6 +4627,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/textured, /area/station/commons/toilet) +"bsq" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/icemoon/underground/explored) "bst" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 @@ -6844,11 +6858,6 @@ dir = 1 }, /area/station/security/prison) -"bXL" = ( -/obj/machinery/door/firedoor/heavy, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) "bXT" = ( /obj/machinery/camera{ c_tag = "Medbay Storage"; @@ -7036,6 +7045,18 @@ "bZQ" = ( /turf/closed/wall/r_wall, /area/station/hallway/primary/starboard) +"bZR" = ( +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4 + }, +/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/station/science/ordnance) "bZU" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2 @@ -8514,6 +8535,13 @@ "cvS" = ( /turf/closed/wall, /area/station/maintenance/department/medical/central) +"cvV" = ( +/obj/structure/sign/warning/fire/directional/east, +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "cwe" = ( /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, @@ -9488,6 +9516,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"cJM" = ( +/turf/open/floor/iron/stairs/left{ + dir = 4 + }, +/area/station/science/cytology) "cKe" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -9877,6 +9910,13 @@ }, /turf/open/floor/iron, /area/station/security/prison/workout) +"cPS" = ( +/obj/machinery/vatgrower{ + dir = 4 + }, +/obj/effect/mapping_helpers/no_atoms_ontop, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "cQa" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -10972,6 +11012,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"dgv" = ( +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "dgZ" = ( /obj/machinery/airalarm/directional/south, /obj/structure/cable, @@ -11486,6 +11530,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"doX" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Research Break Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/turf/open/floor/iron/dark, +/area/station/science/research) "dpa" = ( /obj/structure/table, /obj/effect/turf_decal/siding/white{ @@ -12069,6 +12120,12 @@ }, /turf/open/floor/iron/textured, /area/station/security/brig) +"dwW" = ( +/obj/structure/fence/corner{ + dir = 5 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "dwY" = ( /obj/machinery/light_switch/directional/west, /obj/structure/closet/secure_closet/quartermaster, @@ -12895,6 +12952,12 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/station/tcommsat/computer) +"dKq" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "dKr" = ( /obj/structure/table, /obj/machinery/computer/security/telescreen/isolation/directional/south, @@ -16301,6 +16364,15 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"ePS" = ( +/obj/structure/rack, +/obj/item/soap{ + pixel_y = -2 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "ePZ" = ( /obj/structure/chair/stool/directional/west, /obj/structure/disposalpipe/segment{ @@ -17123,6 +17195,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"fdE" = ( +/obj/item/toy/snowball{ + pixel_x = -6; + pixel_y = 3 + }, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "fdF" = ( /obj/structure/closet/secure_closet/chemical, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -19268,15 +19347,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron, /area/mine/laborcamp/security) -"fLU" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "rnd2"; - name = "Research Lab Shutters" - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/science/research) "fLY" = ( /obj/structure/table, /obj/item/stock_parts/micro_laser{ @@ -19943,6 +20013,13 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) +"fXl" = ( +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "fXo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21070,10 +21147,6 @@ /obj/machinery/smartfridge/organ, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"goq" = ( -/obj/structure/statue/snow/snowman, -/turf/open/misc/asteroid/snow/standard_air, -/area/station/science/research) "gov" = ( /obj/machinery/door/window/left/directional/west{ name = "Janitorial Delivery"; @@ -21380,6 +21453,12 @@ /obj/effect/turf_decal/tile/neutral/diagonal_edge, /turf/open/floor/iron/kitchen/diagonal, /area/station/service/kitchen) +"gtA" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "gtF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -21471,12 +21550,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"gwm" = ( -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/iron/white/side{ - dir = 9 - }, -/area/station/science/research) "gwp" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/full, @@ -21661,6 +21734,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"gzG" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) "gzV" = ( /obj/structure/mineral_door/paperframe{ name = "Meditation Room" @@ -23616,6 +23695,11 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) +"hcf" = ( +/turf/open/floor/iron/stairs/right{ + dir = 4 + }, +/area/station/science/cytology) "hcg" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -23982,6 +24066,18 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"his" = ( +/turf/open/floor/iron/stairs/right{ + dir = 4 + }, +/area/station/science/research) +"hiJ" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/icemoon/underground/explored) "hjh" = ( /obj/machinery/computer/records/security{ dir = 4 @@ -24286,6 +24382,15 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"hoa" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/flashlight{ + pixel_y = 2 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/station/science/cytology) "hog" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -25377,6 +25482,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/xenobiology) +"hEY" = ( +/turf/open/floor/iron/stairs/medium{ + dir = 4 + }, +/area/station/science/research) "hEZ" = ( /obj/structure/ladder, /turf/open/floor/plating, @@ -25746,6 +25856,14 @@ /obj/structure/chair, /turf/open/floor/iron, /area/station/cargo/storage) +"hKW" = ( +/mob/living/basic/pet/penguin/baby/permanent, +/obj/item/toy/snowball{ + pixel_x = -6; + pixel_y = -3 + }, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "hLf" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -25909,6 +26027,9 @@ /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/iron/white, /area/station/security/prison/safe) +"hNe" = ( +/turf/closed/wall/r_wall, +/area/station/science/cytology) "hNg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -27132,6 +27253,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/security/execution/transfer) +"ihK" = ( +/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/smooth_large, +/area/station/science/cytology) "ihN" = ( /obj/machinery/button/door/directional/west{ id = "xenobio4"; @@ -27844,6 +27971,10 @@ dir = 8 }, /area/station/service/chapel) +"irV" = ( +/obj/structure/fence/door, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "irX" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/blue{ @@ -28720,6 +28851,13 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"iFv" = ( +/obj/structure/ladder, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/icemoon/underground/explored) "iFz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28964,6 +29102,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"iKO" = ( +/obj/structure/statue/snow/snowman, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "iKQ" = ( /obj/machinery/status_display/evac/directional/east, /turf/open/openspace, @@ -29270,6 +29412,11 @@ dir = 4 }, /area/station/security/brig/entrance) +"iQa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/holopad, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "iQj" = ( /obj/item/radio/intercom/directional/north, /obj/structure/table/glass, @@ -29961,6 +30108,9 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) +"jac" = ( +/turf/open/openspace, +/area/icemoon/underground/explored) "jae" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -30151,6 +30301,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"jcv" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/icemoon/underground/explored) "jcy" = ( /obj/machinery/camera/directional/north{ c_tag = "Central Hallway North-East" @@ -30430,6 +30584,19 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"jiy" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/cytology{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/storage/box/swab{ + pixel_y = 7; + pixel_x = 7 + }, +/obj/machinery/newscaster/directional/east, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "jiD" = ( /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 @@ -31887,6 +32054,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"jGq" = ( +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "jGB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -32098,6 +32268,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"jJt" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/icemoon/underground/explored) "jJF" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -32360,6 +32537,10 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"jMx" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "jMD" = ( /obj/effect/turf_decal/siding/white/corner{ dir = 1 @@ -32951,6 +33132,13 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) +"jWn" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/icemoon/underground/explored) "jWt" = ( /obj/structure/cable, /obj/structure/closet/radiation, @@ -33089,6 +33277,23 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"jYN" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -5; + pixel_y = -8 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_y = -6; + pixel_x = 9 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "jYS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, @@ -33418,10 +33623,14 @@ /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"kdJ" = ( -/obj/structure/flora/grass/brown/style_3, -/turf/open/misc/asteroid/snow/standard_air, -/area/station/science/research) +"kdN" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/smartfridge/petri/preloaded, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "kdT" = ( /obj/machinery/iv_drip, /obj/item/reagent_containers/blood, @@ -33745,6 +33954,14 @@ /obj/effect/mapping_helpers/no_atoms_ontop, /turf/open/genturf, /area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) +"khE" = ( +/obj/item/toy/snowball{ + pixel_x = 11; + pixel_y = -7 + }, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "khF" = ( /obj/machinery/light/small/directional/north, /obj/structure/sign/warning/gas_mask/directional/north{ @@ -35052,6 +35269,12 @@ }, /turf/open/floor/wood/parquet, /area/station/service/theater) +"kzV" = ( +/obj/structure/stairs/west, +/turf/open/floor/iron/stairs/left{ + dir = 4 + }, +/area/station/science/cytology) "kzZ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -36843,13 +37066,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/vault, /area/station/security/prison/rec) -"laa" = ( -/obj/machinery/atmospherics/components/tank, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "lab" = ( /obj/machinery/door/window/brigdoor/left/directional/north{ name = "Secure Weapons Storage"; @@ -36951,6 +37167,18 @@ /obj/structure/sign/warning/fire/directional/north, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"lbU" = ( +/obj/structure/fence/door{ + dir = 4 + }, +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/structure/railing/corner/end{ + dir = 8 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "lca" = ( /obj/structure/railing/corner{ dir = 1 @@ -37139,6 +37367,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) +"lfc" = ( +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "lfp" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -37633,11 +37870,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/mine/laborcamp) -"lmL" = ( -/obj/machinery/newscaster/directional/west, -/obj/effect/spawner/random/structure/twelve_percent_spirit_board, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) "lmM" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -40362,6 +40594,14 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/dark, /area/mine/eva/lower) +"mfs" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/openspace, +/area/icemoon/underground/explored) "mfD" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/atmos) @@ -40402,6 +40642,32 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/station/hallway/primary/central) +"mgw" = ( +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/science{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/clothing/shoes/winterboots{ + pixel_x = -7; + pixel_y = -1 + }, +/obj/item/biopsy_tool{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/item/gps/mining{ + pixel_x = -7; + pixel_y = -3 + }, +/obj/item/knife/combat/survival{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/structure/sign/warning/gas_mask/directional/north, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "mgy" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40931,6 +41197,16 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) +"mqp" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/icemoon/underground/explored) "mqq" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -41274,15 +41550,6 @@ /obj/structure/tank_holder/extinguisher, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"mxc" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/science/ordnance) "mxh" = ( /obj/structure/cable, /turf/open/floor/stone, @@ -41297,6 +41564,10 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, /area/station/commons/locker) +"mxz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "mxD" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -41650,6 +41921,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/machinery/incident_display/bridge/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) "mDw" = ( @@ -45050,6 +45322,17 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"nBJ" = ( +/mob/living/basic/pet/penguin/emperor{ + name = "Club" + }, +/obj/machinery/light/small/directional/east, +/obj/item/toy/snowball{ + pixel_x = -9; + pixel_y = 17 + }, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "nBN" = ( /obj/machinery/atmospherics/components/tank/air, /obj/effect/turf_decal/delivery, @@ -45537,6 +45820,9 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors/nospawn) +"nIf" = ( +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "nIl" = ( /obj/structure/chair/stool/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -46222,6 +46508,12 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +"nRW" = ( +/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/white, +/area/station/science/ordnance) "nRX" = ( /turf/open/floor/iron/white/side{ dir = 10 @@ -48149,6 +48441,7 @@ "oxe" = ( /obj/machinery/computer/cargo/request, /obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/incident_display/bridge/directional/north, /turf/open/floor/iron, /area/station/command/bridge) "oxh" = ( @@ -49036,6 +49329,13 @@ dir = 1 }, /area/station/command/gateway) +"oJV" = ( +/obj/machinery/door/firedoor/border_only, +/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/white, +/area/station/science/ordnance) "oKu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -49239,6 +49539,13 @@ "oMT" = ( /turf/open/floor/iron, /area/station/command/heads_quarters/rd) +"oNn" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/research) "oNy" = ( /obj/effect/spawner/random/structure/crate_abandoned, /obj/machinery/light/small/directional/south, @@ -49548,6 +49855,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/textured, /area/station/security/office) +"oSv" = ( +/obj/structure/table, +/obj/item/food/deadmouse{ + pixel_y = 18; + pixel_x = 13 + }, +/obj/structure/microscope, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "oSw" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/closed/wall/r_wall, @@ -49690,6 +50006,22 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"oUv" = ( +/obj/structure/table, +/obj/item/petri_dish{ + pixel_y = 15; + pixel_x = -5 + }, +/obj/item/petri_dish{ + pixel_y = 10; + pixel_x = 6 + }, +/obj/item/petri_dish{ + pixel_y = -6; + pixel_x = -1 + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "oUL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50923,11 +51255,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/tcommsat/computer) -"pnq" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/flora/grass/brown/style_random, -/turf/open/misc/asteroid/snow/standard_air, -/area/station/science/research) "pns" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51455,14 +51782,6 @@ }, /turf/open/floor/eighties/red, /area/station/security/prison/safe) -"pvU" = ( -/obj/item/toy/snowball{ - pixel_x = 6; - pixel_y = -5 - }, -/obj/machinery/light/small/directional/south, -/turf/open/misc/asteroid/snow/standard_air, -/area/station/science/research) "pvY" = ( /obj/machinery/computer/order_console/mining, /obj/machinery/light_switch/directional/north, @@ -52470,6 +52789,13 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen) +"pLp" = ( +/obj/machinery/light/small/directional/south, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) "pLr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -53136,6 +53462,16 @@ }, /turf/open/floor/iron, /area/station/tcommsat/computer) +"pVw" = ( +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/airlock/external/glass{ + name = "Cytology External Airlock" + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "pVH" = ( /turf/closed/wall/mineral/wood, /area/station/maintenance/aft/lesser) @@ -53767,6 +54103,11 @@ /obj/structure/cable, /turf/open/floor/eighties, /area/station/commons/lounge) +"qfg" = ( +/obj/machinery/airalarm/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "qfh" = ( /turf/open/floor/iron/recharge_floor, /area/station/science/robotics/mechbay) @@ -54302,6 +54643,10 @@ }, /turf/open/floor/carpet, /area/station/security/prison/rec) +"qng" = ( +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) "qnj" = ( /turf/closed/wall, /area/station/commons/locker) @@ -54784,6 +55129,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"qtg" = ( +/obj/machinery/atmospherics/components/tank, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "qtj" = ( /turf/closed/wall, /area/station/engineering/storage) @@ -55289,6 +55642,14 @@ }, /turf/open/floor/plating, /area/station/hallway/primary/central/fore) +"qAc" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) "qAf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56661,6 +57022,12 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/carpet/red, /area/station/security/prison/work) +"qTJ" = ( +/obj/structure/stairs/west, +/turf/open/floor/iron/stairs/right{ + dir = 4 + }, +/area/station/science/cytology) "qTS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -57555,6 +57922,12 @@ dir = 8 }, /area/station/science/ordnance/office) +"rhm" = ( +/obj/machinery/vatgrower{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "rhF" = ( /obj/machinery/camera/directional/north{ c_tag = "Security - Permabrig Observation North"; @@ -58278,6 +58651,14 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/checker, /area/station/hallway/secondary/service) +"rrf" = ( +/obj/structure/table/wood, +/obj/item/storage/crayons, +/obj/item/storage/fancy/candle_box{ + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/station/service/chapel/office) "rrl" = ( /obj/item/stack/sheet/mineral/wood, /obj/effect/decal/cleanable/generic, @@ -58605,6 +58986,14 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"rxu" = ( +/obj/structure/ladder, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/station/science/cytology) "rxz" = ( /obj/structure/girder, /turf/open/floor/plating/snowed/icemoon, @@ -59083,13 +59472,6 @@ /obj/structure/sign/poster/official/safety_internals/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"rDH" = ( -/obj/structure/flora/grass/green/style_random, -/mob/living/basic/pet/penguin/emperor{ - name = "Club" - }, -/turf/open/misc/asteroid/snow/standard_air, -/area/station/science/research) "rDI" = ( /obj/item/toy/plush/lizard_plushie{ name = "Wines-And-Dines"; @@ -59575,6 +59957,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/lobby) +"rMt" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Cytology Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "rMu" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -60142,6 +60531,10 @@ /obj/effect/spawner/random/trash/janitor_supplies, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) +"rVx" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/science/cytology) "rVA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61735,10 +62128,6 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) -"stb" = ( -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "sth" = ( /obj/item/radio/intercom/directional/east, /obj/structure/disposalpipe/trunk{ @@ -62596,6 +62985,10 @@ /obj/machinery/light/floor, /turf/open/floor/iron/smooth, /area/mine/living_quarters) +"sEQ" = ( +/obj/structure/fence/corner, +/turf/open/misc/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "sEU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/closed/wall/r_wall, @@ -63257,6 +63650,12 @@ "sOn" = ( /turf/closed/wall, /area/station/cargo/lobby) +"sOp" = ( +/obj/structure/railing/corner/end{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "sOz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -63390,6 +63789,11 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron, /area/mine/living_quarters) +"sQw" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "sQB" = ( /turf/closed/wall, /area/station/security/brig/upper) @@ -64500,12 +64904,6 @@ }, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) -"tkS" = ( -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/white/side{ - dir = 9 - }, -/area/station/science/research) "tkU" = ( /turf/open/lava/plasma/ice_moon, /area/icemoon/surface/outdoors/nospawn) @@ -64890,6 +65288,10 @@ /obj/structure/disposalpipe/junction/flip, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"trQ" = ( +/obj/structure/stairs/east, +/turf/open/misc/asteroid/snow, +/area/station/science/ordnance) "trT" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -67132,6 +67534,9 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) +"ubh" = ( +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "ubi" = ( /turf/open/misc/asteroid/snow/coldroom, /area/icemoon/underground/explored) @@ -67383,6 +67788,10 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/station/security/prison/mess) +"ueQ" = ( +/obj/item/food/grown/carrot, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "ueS" = ( /obj/effect/turf_decal/trimline/neutral/warning{ dir = 8 @@ -67418,6 +67827,14 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/central) +"ufA" = ( +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external/glass{ + name = "Cytology External Airlock" + }, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "ufF" = ( /obj/structure/table, /obj/item/storage/box/prisoner{ @@ -67820,9 +68237,8 @@ /turf/open/floor/plating, /area/station/security/prison/safe) "ulE" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1; - piping_layer = 2 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 1 }, /turf/open/floor/iron, /area/station/science/ordnance) @@ -67936,6 +68352,7 @@ /obj/structure/chair{ dir = 4 }, +/obj/structure/sign/departments/exodrone/directional/west, /turf/open/floor/iron, /area/station/cargo/storage) "unO" = ( @@ -68229,9 +68646,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"usP" = ( -/turf/open/misc/asteroid/snow/standard_air, -/area/station/science/research) "usS" = ( /obj/structure/bed{ dir = 1 @@ -68407,6 +68821,11 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"uvw" = ( +/obj/structure/railing, +/obj/structure/closet/secure_closet/cytology, +/turf/open/floor/iron/smooth_large, +/area/station/science/cytology) "uvM" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle, /turf/open/floor/plating, @@ -68558,6 +68977,16 @@ /obj/effect/spawner/random/engineering/flashlight, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"uyz" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/icemoon/underground/explored) "uyH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/broken_floor, @@ -69071,6 +69500,13 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"uHd" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/lattice/catwalk, +/turf/open/openspace, +/area/icemoon/underground/explored) "uHv" = ( /obj/structure/chair/stool/directional/north, /obj/structure/cable, @@ -70677,6 +71113,10 @@ dir = 1 }, /area/station/command/gateway) +"viY" = ( +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/white, +/area/station/science/research) "vja" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -70685,15 +71125,6 @@ "vjh" = ( /turf/closed/wall/r_wall, /area/mine/laborcamp) -"vjj" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "rnd2"; - name = "Research Lab Shutters" - }, -/turf/open/floor/plating, -/area/station/science/research) "vjk" = ( /obj/machinery/atmospherics/components/binary/crystallizer{ dir = 4 @@ -71732,6 +72163,16 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/misc/asteroid/snow/coldroom, /area/station/service/kitchen/coldroom) +"vyE" = ( +/obj/machinery/door/airlock/research{ + name = "Cytology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/general, +/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/smooth_large, +/area/station/science/ordnance) "vyI" = ( /obj/structure/railing{ dir = 1 @@ -72407,6 +72848,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"vIT" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/white, +/area/station/science/research) "vIZ" = ( /obj/machinery/duct, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72621,6 +73070,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"vOy" = ( +/mob/living/basic/pet/penguin/baby/permanent, +/obj/structure/flora/grass/brown/style_random, +/turf/open/misc/asteroid/snow/standard_air, +/area/station/science/cytology) "vOD" = ( /obj/machinery/status_display/ai/directional/north, /obj/effect/turf_decal/tile/dark_green{ @@ -73718,6 +74172,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/xenobiology) +"wgu" = ( +/obj/machinery/newscaster/directional/west, +/obj/effect/spawner/random/structure/twelve_percent_spirit_board, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) "wgG" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ @@ -74196,14 +74655,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/dark/textured, /area/station/security/range) -"wnp" = ( -/obj/item/toy/snowball{ - pixel_x = -6; - pixel_y = -3 - }, -/mob/living/basic/pet/penguin/baby/permanent, -/turf/open/misc/asteroid/snow/standard_air, -/area/station/science/research) "wnv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -74994,6 +75445,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"wyA" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/sign/departments/science/alt/directional/north, +/turf/open/openspace, +/area/station/science/research) "wyB" = ( /obj/machinery/conveyor{ dir = 1; @@ -75218,6 +75674,14 @@ /obj/structure/closet/crate, /turf/open/floor/iron, /area/station/cargo/miningdock) +"wBW" = ( +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/science/research) "wCo" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 1 @@ -75769,6 +76233,9 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/command/bridge) +"wLA" = ( +/turf/open/openspace, +/area/station/science/research) "wLK" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, @@ -77429,14 +77896,6 @@ /obj/vehicle/ridden/janicart, /turf/open/floor/iron, /area/station/service/janitor) -"xjs" = ( -/obj/machinery/door/firedoor/heavy, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/station/science/research) "xjC" = ( /turf/open/floor/plating, /area/station/maintenance/department/cargo) @@ -77691,10 +78150,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) -"xnC" = ( -/obj/structure/sign/warning/fire/directional/east, -/turf/open/misc/asteroid/snow/icemoon, -/area/icemoon/underground/explored) "xnE" = ( /obj/machinery/duct, /obj/effect/turf_decal/tile/yellow{ @@ -77974,10 +78429,6 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"xsD" = ( -/obj/item/food/grown/carrot, -/turf/open/misc/asteroid/snow/standard_air, -/area/station/science/research) "xsP" = ( /obj/structure/table, /obj/item/folder/white, @@ -79210,14 +79661,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"xJN" = ( -/obj/structure/table/wood, -/obj/item/storage/crayons, -/obj/item/storage/fancy/candle_box{ - pixel_y = 5 - }, -/turf/open/floor/iron/dark, -/area/station/service/chapel/office) "xJT" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -127277,12 +127720,12 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU +xMq +xMq +xMq +xMq +xMq +xMq oSU oSU oSU @@ -127534,13 +127977,13 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +xMq +iDt +iDt +iDt +iDt +xMq +xMq oSU oSU oSU @@ -127790,14 +128233,14 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +xMq +xMq +iDt +iDt +iDt +iDt +iDt +fIt oSU oSU oSU @@ -128047,14 +128490,14 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +xMq +cPS +iDt +iDt +iDt +iDt +iFv +fIt oSU oSU oSU @@ -128302,16 +128745,16 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +iDt +iDt +xMq +cPS +iDt +iDt +iDt +iDt +mrI +fIt oSU oSU oSU @@ -128558,17 +129001,17 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +iDt +iDt +jZN +rcY +iDt +iDt +iDt +iDt +iDt +scw +fIt oSU oSU oSU @@ -128814,18 +129257,18 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +iDt +iDt +iDt +iDt +chg +iDt +iDt +iDt +iDt +iDt +fIt +fIt oSU oSU oSU @@ -129071,19 +129514,19 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +iDt +iDt +iDt +jZN +rcY +iDt +iDt +iDt +iDt +iDt +iDt +fIt +fIt oSU oSU oSU @@ -129328,20 +129771,20 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +iDt +iDt +iDt +iDt +xMq +xMq +iDt +iDt +iDt +iDt +iDt +iDt +fIt +fIt oSU oSU oSU @@ -129586,19 +130029,19 @@ oSU oSU oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +iDt +iDt +iDt +iDt +xMq +xMq +iDt +iDt +iDt +iDt +iDt +iDt +fIt oSU oSU oSU @@ -129844,18 +130287,18 @@ oSU oSU oSU oSU +iDt +iDt oSU oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU -oSU +xMq +xMq +xMq +xMq +xMq +xMq +xMq +xMq oSU oSU oSU @@ -192012,7 +192455,7 @@ thA tBs tix tBs -lmL +wgu dlB jCL qEJ @@ -192303,16 +192746,16 @@ thA thA xMq xMq -xMq -iDt -iDt +kNC +kNC +ebX iDt iDt nfG alM alM alM -oxO +alM aDe tNJ tNJ @@ -192558,23 +193001,23 @@ thA thA thA thA -thA -xMq -xMq -xMq xMq iDt +iDt +iDt +dwW +ebX scw iDt lRI eNh -bEh oxO +bEh vAx -oLa -pvh -oxO +jXl oxO +pvh +oLa yfz oxO woH @@ -192786,7 +193229,7 @@ tBs dit bDH rYt -xJN +rrf wAv jvs qEJ @@ -192812,25 +193255,25 @@ thA thA thA thA -thA -thA -thA -thA -thA +xMq xMq xMq iDt iDt +lfc +iDt +iDt +chg iDt nfG alM -alM -alM -alM -alM -alM -alM -alM +bXf +ffe +ffe +ffe +ffe +rMt +ffe iry oxO oxO @@ -193069,24 +193512,24 @@ thA thA thA thA -thA -thA -thA -thA -thA -thA xMq -psb -iDt -iDt -iDt -iDt -iDt -iDt -iDt -iDt -iDt -iDt +xMq +jac +jac +jac +mfs +iDt +iDt +hNe +hNe +hNe +hNe +hNe +hNe +iKO +fdE +hKW +dgv ffe ffe ffe @@ -193326,24 +193769,24 @@ thA thA thA thA -thA -thA -thA -thA -thA -thA xMq xMq -iDt -iDt -iDt -iDt -iDt -iDt -iDt -iDt -iDt -iDt +jac +jac +jac +mfs +jac +hNe +hNe +qTJ +kzV +hNe +qfg +irV +vOy +jGq +dgv +jGq kAH mHu kwM @@ -193583,24 +194026,24 @@ thA thA thA thA -thA -thA -thA -thA -thA -thA -thA -xMq xMq -iDt -xMq -iDt -iDt -xnC -iDt -iDt -iDt -iDt +jac +jac +jac +jac +mqp +rxu +hNe +uvw +hcf +cJM +kdN +nIf +cvV +rhm +nBJ +ueQ +khE kAH mHu jlj @@ -193840,26 +194283,26 @@ thA thA thA thA -tjo -tjo -tjo -thA -thA -thA -thA -thA -xMq -xMq -xMq -ebX -kNC +rcY +jac +jac +jac +hiJ +uHd +hoa +hNe +fXl +jMx +mxz +sOp +nIf uIf uIf uIf uIf uIf uIf -laa +qtg qKt tUo aQn @@ -194097,19 +194540,19 @@ thA thA tjo tjo -tjo -tjo -tjo -tjo -thA -thA -thA -thA -thA -thA -thA rcY -iDt +jac +jac +jac +jWn +jcv +rVx +rVx +rVx +nIf +iQa +nIf +ePS uIf nIt nIt @@ -194354,28 +194797,28 @@ thA thA tjo tjo -tjo -tjo -tjo -tjo -tjo -thA -thA -thA -thA -thA -thA rcY -iDt -uIf -stb -pOL -pOL -pOL -opD -mxc -hFb -hFb +jac +jac +jac +bsq +jJt +ufA +nIf +pVw +nIf +mxz +sQw +ihK +vyE +nRW +nRW +nRW +nRW +oJV +bZR +qRO +rEj qRO mEL vqv @@ -194611,19 +195054,19 @@ thA thA tjo tjo -tjo -tjo -tjo -tjo -tjo -thA -thA -thA -thA -thA -thA rcY -iDt +jac +jac +jac +jac +uyz +rVx +rVx +hNe +mgw +oSv +gtA +boA uIf rmp pOL @@ -194868,19 +195311,19 @@ thA thA tjo tjo -tjo -tjo -tjo -tjo -tjo -thA -thA -thA -thA -thA -thA -rcY -iDt +dwW +ebX +jac +jac +jac +mfs +jac +jac +hNe +hNe +jYN +oUv +jiy uIf jcC pOL @@ -195126,22 +195569,22 @@ thA tjo tjo tjo -tjo -tjo -tjo -tjo -thA -thA -thA -thA -thA -thA -rcY -iDt +dwW +kNC +ebX +jac +mfs +jac +jac +jac +hNe +rVx +rVx +hNe uIf odm odm -odm +trQ odm nqy jGR @@ -195385,16 +195828,16 @@ tjo tjo tjo tjo -tjo -tjo -tjo -thA -thA -thA -thA -thA -rcY +dwW +kNC +lbU +kNC +kNC +kNC +sEQ iDt +dKq +kNC fcj fcj fcj @@ -195643,9 +196086,9 @@ tjo tjo tjo tjo -tjo -tjo -thA +iDt +iDt +iDt thA thA thA @@ -196421,8 +196864,8 @@ thA thA thA thA -rcY -iDt +syw +kNC bgx bgx bgx @@ -242655,7 +243098,7 @@ xwC utR pAZ bln -aAf +qWZ oxe vmj aqB @@ -254508,12 +254951,12 @@ wHc aEA dng dAB -ily -ily -ily -ily -ily -ily +ubh +ubh +ubh +ubh +ubh +ubh qLY pnA qFp @@ -254765,12 +255208,12 @@ wHc fPO pTU itt -ily -ily -ily -ily -ily -ily +ubh +ubh +ubh +ubh +ubh +ubh qLY baF fvk @@ -255022,12 +255465,12 @@ wHc oMT emK uvU -ily -ily -ily -ily -ily -ily +ubh +ubh +ubh +ubh +ubh +ubh qLY oCA fvk @@ -257842,10 +258285,10 @@ mbK jQS eNK aYJ +viY aYJ aYJ -aYJ -bXL +qng eLr eaa via @@ -258099,10 +258542,10 @@ aYJ aYJ wUt urK -urK +vIT nJT urK -xjs +urK urK iRx pJV @@ -258356,10 +258799,10 @@ uZB oni nxa qwN -tkS +oNn dFj dFj -gwm +wBW dFj niC xnM @@ -258614,10 +259057,10 @@ cbF dEC oHK oHK -vjj -fLU -vjj -vjj +his +hEY +qAc +gzG wLl wol hnP @@ -258871,10 +259314,10 @@ bxP vvE tJG oHK -goq -wnp -kdJ -usP +wLA +wLA +qAc +gzG wLl nsZ uoC @@ -259128,10 +259571,10 @@ vaA gXJ wgU oHK -pnq -xsD -rDH -pvU +wyA +wLA +qAc +pLp wLl jUX wbR @@ -259387,7 +259830,7 @@ hhP oHK iZl iZl -iZl +doX iZl wLl tur diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 7c89bf6af0872..48df48372b0a7 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -9843,13 +9843,13 @@ dir = 4 }, /obj/structure/cable, -/obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/incident_display/delam/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "dqa" = ( @@ -10627,7 +10627,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "dEl" = ( -/obj/machinery/firealarm/directional/east, /obj/machinery/camera/directional/east{ c_tag = "Aft Hallway Engineering Venders"; name = "aft camera" @@ -18933,10 +18932,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) -"gng" = ( -/obj/structure/sign/departments/engineering, -/turf/closed/wall, -/area/station/commons/storage/primary) "gnh" = ( /turf/closed/wall/r_wall, /area/station/service/chapel) @@ -22341,6 +22336,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/aft) "hsg" = ( @@ -33582,7 +33578,6 @@ /obj/item/kirbyplants{ icon_state = "plant-21" }, -/obj/structure/extinguisher_cabinet/directional/north, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -34945,7 +34940,7 @@ dir = 4 }, /obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/incident_display/delam/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/lobby) "lsb" = ( @@ -37851,7 +37846,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "mnO" = ( -/obj/item/radio/intercom/directional/north, /obj/structure/cable, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -37859,6 +37853,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/machinery/incident_display/delam/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/aft) "mnR" = ( @@ -40807,17 +40802,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"npy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "npR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/closed/wall, @@ -42336,17 +42320,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) -"nPw" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "ceprivate"; - name = "Chief Engineer's Privacy Shutters" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/incident_display/delam/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/lobby) "nPS" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/blood/old, @@ -43087,6 +43060,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/aft) "ofr" = ( @@ -43298,11 +43272,11 @@ }, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/structure/sign/warning/secure_area/directional/east, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, /obj/effect/turf_decal/tile/red, +/obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron, /area/station/engineering/lobby) "ojs" = ( @@ -45000,10 +44974,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "oPX" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - piping_layer = 2 - }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2, /turf/open/floor/iron/dark, /area/station/science/ordnance) "oQe" = ( @@ -107993,7 +107964,7 @@ deG gkr pmu wRE -gng +bax xsJ jhg xAw @@ -110054,7 +110025,7 @@ sXJ sXJ alL jjs -nPw +xDj piN xDj eHc @@ -113639,7 +113610,7 @@ udt nQO lKq lkF -npy +tar tar nwf fur diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index 8e29cebfb20ec..4dfcd2466de2c 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -12307,10 +12307,9 @@ /area/station/maintenance/department/engine/atmos) "eSZ" = ( /obj/machinery/duct, -/obj/machinery/atmospherics/components/binary/pump/off{ +/obj/machinery/atmospherics/components/binary/pump/layer4{ dir = 8; - name = "Supplementary Air Supply"; - piping_layer = 4 + name = "Supplementary Air Supply" }, /turf/open/floor/iron, /area/station/security/prison) @@ -14838,10 +14837,9 @@ /area/station/maintenance/starboard/lower) "fNn" = ( /obj/structure/cable, -/obj/machinery/atmospherics/components/binary/pump/on{ +/obj/machinery/atmospherics/components/binary/pump/on/layer4{ dir = 4; - name = "Air to Sat"; - piping_layer = 4 + name = "Air to Sat" }, /turf/open/floor/iron/showroomfloor, /area/station/engineering/transit_tube) @@ -26441,10 +26439,9 @@ "keD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/binary/pump/on{ +/obj/machinery/atmospherics/components/binary/pump/on/layer4{ dir = 1; - name = "Prison Air Supply"; - piping_layer = 4 + name = "Prison Air Supply" }, /turf/open/floor/iron, /area/station/security/prison) @@ -31172,9 +31169,8 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "lOM" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1; - piping_layer = 2 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 1 }, /turf/open/floor/iron/dark, /area/station/science/ordnance) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1192f56b78d62..799632ef64dc5 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -587,14 +587,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"alA" = ( -/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay, -/obj/structure/disposalpipe/sorting/mail{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "alE" = ( /turf/open/floor/iron, /area/station/security/courtroom) @@ -1007,14 +999,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/engine, /area/station/engineering/supermatter) -"auh" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "aum" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2210,17 +2194,6 @@ /obj/effect/turf_decal/trimline/brown/warning, /turf/open/floor/iron/white, /area/station/science/lobby) -"aOA" = ( -/obj/effect/landmark/blobstart, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/greater) "aOC" = ( /obj/effect/turf_decal/trimline/red/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3990,6 +3963,14 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +"buc" = ( +/obj/effect/landmark/blobstart, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "bug" = ( /obj/structure/lattice, /obj/item/tank/internals/oxygen/empty, @@ -4270,6 +4251,10 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) +"byr" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/station/maintenance/port/fore) "byw" = ( /obj/effect/landmark/start/lawyer, /turf/open/floor/wood, @@ -4373,6 +4358,17 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/port) +"bAC" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/machinery/autolathe, +/turf/open/floor/iron, +/area/station/cargo/storage) "bAD" = ( /obj/structure/dresser, /obj/machinery/newscaster/directional/north, @@ -4402,18 +4398,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"bBy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8 - }, -/obj/effect/mapping_helpers/mail_sorting/supply/qm_office, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "bBA" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5128,6 +5112,18 @@ /obj/item/stack/rods, /turf/open/space/basic, /area/station/solars/port/fore) +"bOB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "bOH" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron, @@ -5471,15 +5467,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"bVz" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "bVB" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=9.3-Escape-3"; @@ -5788,11 +5775,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"caV" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "cbg" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -7118,13 +7100,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"cAf" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "cAm" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, @@ -7638,11 +7613,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/library) -"cLN" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/firealarm/directional/west, -/turf/open/floor/plating, -/area/station/cargo/drone_bay) "cMb" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -7660,6 +7630,26 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) +"cMl" = ( +/obj/structure/railing{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/table, +/obj/item/storage/box/bandages{ + pixel_y = 6; + pixel_x = 4 + }, +/obj/effect/spawner/random/entertainment/deck, +/obj/effect/spawner/random/entertainment/cigarette_pack{ + pixel_x = -6; + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "cMG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -8006,6 +7996,17 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"cTN" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) "cUd" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -9487,12 +9488,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/customs) -"dve" = ( -/obj/structure/cable, -/obj/effect/spawner/random/maintenance, -/obj/machinery/recharge_station, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "dvn" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -9622,16 +9617,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"dxo" = ( -/obj/structure/railing{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "dxq" = ( /obj/structure/chair{ dir = 8 @@ -10621,6 +10606,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"dRc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "dRj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -10841,10 +10835,6 @@ /obj/effect/landmark/start/chemist, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"dUd" = ( -/obj/structure/noticeboard/qm, -/turf/closed/wall, -/area/station/command/heads_quarters/qm) "dUj" = ( /obj/structure/chair/office{ dir = 1 @@ -11255,12 +11245,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/construction/storage_wing) -"ebd" = ( -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "ebg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -12922,6 +12906,14 @@ /obj/effect/spawner/random/entertainment/deck, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"eDK" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "eDL" = ( /obj/structure/sign/directions/command{ dir = 1; @@ -13124,15 +13116,6 @@ }, /turf/open/floor/iron, /area/station/commons/lounge) -"eIc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/dim/directional/south, -/obj/machinery/mech_bay_recharge_port{ - dir = 8 - }, -/obj/structure/sign/warning/directional/south, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "eIy" = ( /obj/structure/cable, /obj/machinery/photocopier, @@ -15565,15 +15548,6 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, /area/station/security/checkpoint/engineering) -"fAk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/crate, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/arrows/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "fAt" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -15633,6 +15607,14 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"fBy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "fBz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16249,17 +16231,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) -"fNz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random/maintenance, -/obj/effect/spawner/random/maintenance, -/obj/effect/turf_decal/stripes/corner, -/obj/item/reagent_containers/cup/soda_cans/pwr_game, -/obj/structure/sign/poster/contraband/random/directional/south, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "fNI" = ( /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/wood, @@ -16307,21 +16278,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/range) -"fOB" = ( -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, -/obj/machinery/door/airlock/maintenance{ - name = "Brig Maintenance" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "fOS" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/flowers_yw/style_random, @@ -19074,17 +19030,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) -"gPN" = ( -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/cargo/sorting) "gPY" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -20314,17 +20259,6 @@ /obj/effect/turf_decal/trimline/brown/filled/line, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"hor" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Warehouse Maintenance" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, -/turf/open/floor/plating, -/area/station/cargo/warehouse) "hoE" = ( /obj/structure/sign/map/left{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; @@ -20724,12 +20658,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"hvz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/closed/wall, -/area/station/maintenance/port/fore) "hvB" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -20773,6 +20701,15 @@ /obj/item/mod/module/thermal_regulator, /turf/open/floor/iron/dark, /area/station/medical/storage) +"hwf" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = 14 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "hwg" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /obj/structure/lattice, @@ -21766,6 +21703,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"hOx" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/storage) "hOR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/spawner/random/trash/soap{ @@ -22095,6 +22037,12 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) +"hUj" = ( +/obj/structure/cable, +/obj/effect/landmark/start/cargo_technician, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/storage) "hUn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -22311,14 +22259,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/security/office) -"hYl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - dir = 8; - pixel_x = 14 - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "hYr" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -24090,6 +24030,21 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"iBO" = ( +/obj/item/emptysandbag, +/obj/item/emptysandbag, +/obj/item/emptysandbag, +/obj/item/emptysandbag{ + pixel_x = 8 + }, +/obj/item/emptysandbag{ + pixel_x = -9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/random/directional/south, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "iCj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/effect/mapping_helpers/airlock/locked, @@ -24151,6 +24106,15 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/station/security/range) +"iDy" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "iDG" = ( /obj/structure/table, /obj/item/stock_parts/scanning_module{ @@ -25956,12 +25920,6 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) -"jjn" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/maintenance/port/greater) "jjs" = ( /obj/effect/spawner/random/engineering/tank, /obj/effect/mapping_helpers/broken_floor, @@ -27082,28 +27040,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron, /area/station/cargo/storage) -"jBy" = ( -/obj/machinery/light_switch/directional/south, -/obj/machinery/conveyor_switch/oneway{ - id = "packageSort2"; - name = "Sort and Deliver"; - pixel_x = -2; - pixel_y = 12 - }, -/obj/machinery/conveyor_switch/oneway{ - dir = 8; - id = "packageExternal"; - name = "Crate Returns"; - pixel_x = -5; - pixel_y = -3 - }, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/brown/filled/corner, -/obj/effect/turf_decal/trimline/white/corner, -/turf/open/floor/iron, -/area/station/cargo/sorting) "jBC" = ( /obj/structure/table, /obj/item/clothing/head/soft/grey{ @@ -27271,6 +27207,16 @@ /obj/structure/sign/poster/party_game, /turf/closed/wall, /area/space/nearstation) +"jFw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/structure/crate, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "jFy" = ( /obj/effect/landmark/generic_maintenance_landmark, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -27923,22 +27869,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/white, /area/station/medical/virology) -"jPE" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "jPH" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics" @@ -27974,16 +27904,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"jQr" = ( -/obj/machinery/door/airlock/maintenance, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/port/greater) "jQz" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 8 @@ -28053,6 +27973,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"jRL" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "jRO" = ( /obj/structure/table, /obj/item/paper_bin, @@ -28965,20 +28894,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/hallway/primary/central) -"kif" = ( -/obj/item/emptysandbag, -/obj/item/emptysandbag, -/obj/item/emptysandbag, -/obj/item/emptysandbag{ - pixel_x = 8 - }, -/obj/item/emptysandbag{ - pixel_x = -9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/contraband/random/directional/south, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "kir" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 4 @@ -29352,16 +29267,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/work) -"koj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "kop" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30218,6 +30123,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +"kED" = ( +/obj/structure/sign/departments/exodrone/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "kFa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30387,13 +30296,6 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/port) -"kIJ" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "kIR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -30427,18 +30329,6 @@ /obj/machinery/light/no_nightlight/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos) -"kKd" = ( -/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 = 5 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "kKh" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -31025,6 +30915,12 @@ /obj/structure/cable/layer3, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) +"kUv" = ( +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/storage) "kUG" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/loading_area{ @@ -31080,6 +30976,26 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"kVC" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable, +/obj/structure/table, +/obj/item/clothing/gloves/cargo_gauntlet{ + pixel_y = 8 + }, +/obj/item/clothing/gloves/cargo_gauntlet{ + pixel_y = 5 + }, +/obj/item/clothing/gloves/cargo_gauntlet{ + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/random{ + pixel_x = -9 + }, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) "kVN" = ( /turf/open/floor/carpet, /area/station/service/chapel) @@ -31798,36 +31714,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"liU" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/pen/red{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/pen/fountain{ - pixel_x = 10 - }, -/obj/item/pen/blue{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/storage/medkit/regular{ - pixel_x = -3; - pixel_y = 10 - }, -/obj/structure/table, -/obj/item/stamp{ - pixel_x = -9; - pixel_y = -1 - }, -/obj/item/stamp/denied{ - pixel_y = -1 - }, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron, -/area/station/cargo/storage) "liX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31884,11 +31770,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/engine, /area/station/science/xenobiology) -"ljH" = ( -/obj/effect/decal/cleanable/generic, -/obj/vehicle/sealed/mecha/ripley/cargo, -/turf/open/floor/iron/recharge_floor, -/area/station/cargo/warehouse) "ljL" = ( /obj/structure/chair/comfy/black, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31899,6 +31780,16 @@ /obj/machinery/barsign, /turf/closed/wall, /area/station/commons/lounge) +"lke" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/maintenance, +/obj/item/reagent_containers/cup/soda_cans/pwr_game, +/obj/structure/sign/poster/contraband/random/directional/south, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "lku" = ( /obj/structure/cable, /obj/structure/sign/poster/contraband/random/directional/west, @@ -33002,6 +32893,23 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"lLa" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/railing{ + dir = 9 + }, +/obj/machinery/disposal/bin/tagger, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "lLk" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron, @@ -33431,6 +33339,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"lRI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/arrows/red{ + dir = 1 + }, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "lRS" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, @@ -35009,22 +34926,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/office) -"mvZ" = ( -/obj/machinery/light/directional/south, -/obj/structure/rack, -/obj/item/storage/toolbox/emergency, -/obj/item/storage/toolbox/emergency{ - pixel_x = -2; - pixel_y = -3 - }, -/obj/item/wrench, -/obj/item/multitool, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/machinery/incident_display/delam/directional/south, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "mwj" = ( /obj/machinery/computer/records/security{ dir = 4 @@ -35850,14 +35751,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"mKr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "mKu" = ( /obj/machinery/light_switch/directional/west, /obj/structure/cable, @@ -36835,6 +36728,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"naX" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "nbd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37704,18 +37602,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"nrB" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/item/kirbyplants/random, -/obj/structure/railing{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "nrM" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/cable, @@ -38641,6 +38527,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons/locker) +"nFH" = ( +/obj/effect/turf_decal/arrows/red{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "nFL" = ( /obj/machinery/camera/directional/north{ c_tag = "MiniSat Exterior - Fore"; @@ -39046,13 +38939,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"nNB" = ( -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/arrows/red{ - dir = 1 +"nNE" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4; + name = "Quartermaster Junction" }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) +/obj/effect/mapping_helpers/mail_sorting/supply/qm_office, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "nNH" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -39359,6 +39254,19 @@ /obj/item/food/grown/mushroom/glowshroom, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"nTi" = ( +/obj/structure/sign/map/left{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "nTk" = ( /obj/structure/flora/bush/jungle/c/style_random, /obj/machinery/light/small/directional/east, @@ -39518,6 +39426,11 @@ /obj/effect/spawner/random/entertainment/deck, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"nXW" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "nYa" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -39741,6 +39654,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/research) +"obj" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "obk" = ( /obj/item/target/alien, /turf/open/floor/plating, @@ -40175,14 +40095,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"ojW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/arrows/red{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "okj" = ( /obj/structure/cable, /obj/machinery/camera/motion/directional/south{ @@ -40382,6 +40294,18 @@ /obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"ood" = ( +/obj/effect/turf_decal/trimline/brown/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/small/directional/north, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) "oog" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -41325,6 +41249,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/storage_shared) +"oFI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "oFK" = ( /obj/structure/cable, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -42582,6 +42515,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/service/hydroponics) +"pdp" = ( +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/machinery/door/airlock/maintenance{ + name = "Brig Maintenance" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "pdx" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -42667,6 +42615,14 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"pfd" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/obj/machinery/rnd/production/techfab/department/cargo, +/turf/open/floor/iron, +/area/station/cargo/storage) "pfe" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43246,14 +43202,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"pqc" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "pqi" = ( /obj/structure/chair, /obj/machinery/light/directional/north, @@ -44868,13 +44816,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/warehouse) -"pTf" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/goonplaque, -/area/station/hallway/primary/port) "pTm" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -45003,20 +44944,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/brig) -"pVV" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/effect/spawner/random/entertainment/deck, -/obj/structure/table, -/obj/effect/spawner/random/entertainment/cigarette_pack{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/storage/box/bandages{ - pixel_y = 6; - pixel_x = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "pVZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -45309,6 +45236,17 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +"qbD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/caution{ + dir = 8 + }, +/obj/machinery/light/small/dim/directional/south, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "qbE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -46028,13 +45966,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"qoY" = ( -/obj/effect/spawner/random/maintenance, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "qph" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/spawner/random/medical/patient_stretcher, @@ -46307,11 +46238,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/holding_cell) -"quT" = ( -/obj/effect/turf_decal/trimline/brown/filled/line, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/cargo/storage) "qvJ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -46511,14 +46437,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"qzC" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "qzE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -46957,15 +46875,6 @@ /obj/structure/sign/warning/docking, /turf/closed/wall, /area/station/hallway/secondary/entry) -"qHt" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "qHK" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, @@ -48149,14 +48058,6 @@ "qZI" = ( /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) -"qZO" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "qZV" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance" @@ -48821,18 +48722,6 @@ dir = 4 }, /area/station/service/chapel) -"rmS" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "QMLoad" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/light/directional/west, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron, -/area/station/cargo/storage) "rnb" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/spawner/random/trash/garbage{ @@ -49592,11 +49481,6 @@ /mob/living/basic/goat/pete, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) -"rzo" = ( -/obj/structure/cable, -/obj/effect/landmark/start/cargo_technician, -/turf/open/floor/iron, -/area/station/cargo/storage) "rzq" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/corner, @@ -50124,6 +50008,28 @@ "rJB" = ( /turf/closed/wall/r_wall, /area/station/security/evidence) +"rJF" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 9 + }, +/obj/item/folder/yellow{ + pixel_y = -5; + pixel_x = 5 + }, +/obj/item/pen/blue{ + pixel_x = 4; + pixel_y = -3 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "rJI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/junction/yjunction{ @@ -50245,6 +50151,17 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/science/lab) +"rLq" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/machinery/disposal/bin{ + name = "Jim Norton's Quebecois Coffee disposal unit" + }, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "rLv" = ( /turf/open/floor/plating/foam{ initial_gas_mix = "TEMP=2.7" @@ -50278,18 +50195,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron, /area/station/science/xenobiology) -"rMl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "rMr" = ( /obj/structure/table/glass, /obj/item/experi_scanner{ @@ -50444,12 +50349,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) -"rPp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/caution, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "rPA" = ( /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/flowers_yw/style_random, @@ -50491,6 +50390,29 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) +"rQi" = ( +/obj/machinery/light_switch/directional/south, +/obj/machinery/conveyor_switch/oneway{ + id = "packageSort2"; + name = "Sort and Deliver"; + pixel_x = -2; + pixel_y = 12 + }, +/obj/machinery/conveyor_switch/oneway{ + dir = 8; + id = "packageExternal"; + name = "Crate Returns"; + pixel_x = -5; + pixel_y = -3 + }, +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/brown/filled/corner, +/obj/effect/turf_decal/trimline/white/corner, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) "rQk" = ( /obj/machinery/recharger{ pixel_y = 4 @@ -51336,6 +51258,13 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"sei" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "sey" = ( /obj/structure/sign/departments/court/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51635,17 +51564,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) -"sly" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "slC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -51698,17 +51616,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/iron, /area/station/engineering/atmos) -"smB" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/autolathe, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "smG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -51759,28 +51666,6 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) -"snS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/greater) -"snZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "soa" = ( /obj/machinery/light/small/directional/south, /obj/structure/sign/poster/official/random/directional/south, @@ -51797,6 +51682,18 @@ /obj/item/storage/box, /turf/open/floor/plating, /area/station/maintenance/port) +"som" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/structure/railing{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "sou" = ( /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -52468,26 +52365,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"sCc" = ( -/obj/structure/table, -/obj/item/clothing/gloves/cargo_gauntlet{ - pixel_y = 2 - }, -/obj/item/clothing/gloves/cargo_gauntlet{ - pixel_y = 5 - }, -/obj/item/clothing/gloves/cargo_gauntlet{ - pixel_y = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable, -/obj/item/reagent_containers/cup/soda_cans/random{ - pixel_x = -9 - }, -/turf/open/floor/catwalk_floor/iron, -/area/station/cargo/storage) "sCh" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53290,12 +53167,6 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/white, /area/station/science/explab) -"sPO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "sPV" = ( /obj/structure/closet/secure_closet/captains, /obj/structure/window/reinforced/spawner/directional/north, @@ -54353,14 +54224,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"tik" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/rnd/production/techfab/department/cargo, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "tit" = ( /obj/structure/sink/directional/east, /obj/structure/sign/poster/contraband/random/directional/west, @@ -55399,6 +55262,16 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) +"tCl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/caution{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "tCC" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -55439,6 +55312,13 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/dark, /area/station/science/lab) +"tDj" = ( +/obj/structure/cable, +/obj/effect/spawner/random/maintenance, +/obj/machinery/recharge_station, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "tDk" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/engineering_all, @@ -57487,6 +57367,14 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"unp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/warning/directional/south, +/obj/machinery/computer/mech_bay_power_console{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "unt" = ( /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, @@ -58365,16 +58253,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"uBG" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - piping_layer = 2 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "uBI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -59449,6 +59327,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark/corner, /area/station/engineering/storage_shared) +"uUR" = ( +/obj/machinery/light/directional/south, +/obj/structure/rack, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ + pixel_x = -2; + pixel_y = -3 + }, +/obj/item/wrench, +/obj/item/multitool, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/incident_display/bridge/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "uUX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable/layer3, @@ -60971,6 +60865,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/station/service/lawoffice) +"vua" = ( +/obj/vehicle/sealed/mecha/ripley/cargo, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/iron/recharge_floor, +/area/station/cargo/warehouse) "vud" = ( /obj/effect/spawner/random/structure/closet_empty/crate, /obj/effect/spawner/random/maintenance, @@ -61749,6 +61648,11 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"vGW" = ( +/obj/structure/noticeboard/qm, +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/station/command/heads_quarters/qm) "vHa" = ( /obj/effect/decal/cleanable/oil/slippery, /turf/open/floor/iron, @@ -62685,13 +62589,6 @@ dir = 1 }, /area/station/engineering/atmos) -"vWD" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron, -/area/station/cargo/storage) "vWF" = ( /obj/structure/cable, /obj/machinery/holopad, @@ -63187,6 +63084,14 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/central) +"weP" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Warehouse Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/turf/open/floor/plating, +/area/station/cargo/warehouse) "weS" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -64576,6 +64481,13 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"wEU" = ( +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "wFa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/line{ @@ -65143,6 +65055,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"wRz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "wRB" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/firealarm/directional/west, @@ -65701,6 +65622,36 @@ }, /turf/open/floor/iron, /area/station/command/gateway) +"xbA" = ( +/obj/structure/table, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = 10 + }, +/obj/item/pen/blue{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/pen/fountain{ + pixel_x = 10 + }, +/obj/item/pen/red{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/stamp/denied{ + pixel_y = -1 + }, +/obj/item/stamp{ + pixel_x = -9; + pixel_y = -1 + }, +/turf/open/floor/catwalk_floor/iron, +/area/station/cargo/storage) "xbT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65980,14 +65931,6 @@ dir = 4 }, /area/station/medical/treatment_center) -"xgx" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/brown/filled/corner{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "xgB" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -66222,6 +66165,10 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) +"xkS" = ( +/obj/structure/cable, +/turf/open/floor/iron/goonplaque, +/area/station/hallway/primary/port) "xkV" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, /turf/open/floor/iron, @@ -66422,6 +66369,11 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"xoW" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "xpb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67171,6 +67123,18 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"xBO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "xBX" = ( /obj/machinery/firealarm/directional/east, /turf/closed/wall, @@ -68502,6 +68466,13 @@ /obj/item/pipe_dispenser, /turf/open/floor/iron, /area/station/engineering/main) +"yaH" = ( +/obj/effect/turf_decal/trimline/brown/warning{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) "yaO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68838,6 +68809,11 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/carpet, /area/station/command/corporate_showroom) +"ygy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "ygR" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 4 @@ -85172,10 +85148,10 @@ fcq pck lku uEw -snS -jjn -jQr -kKd +nJG +xoW +iDy +wRz mjg dHc dHc @@ -85429,13 +85405,13 @@ fur fur wEz aaq -aOA +buc wUt fcq -jPE -auh -koj -rMl +nTi +obj +crr +crr crr qer crr @@ -85686,13 +85662,13 @@ dBE vQs vQs vQs -hor +weP vQs vQs iSk nzD uxa -bVz +uxa bNQ aal sEk @@ -85944,12 +85920,12 @@ vQs ePj tnF dKY -kif +iBO vQs dHc dHc bZY -xOw +rEO spH dHc fjD @@ -86194,7 +86170,7 @@ sUc vsO vsO uAu -rmS +cTN dme exQ vQs @@ -86206,7 +86182,7 @@ slZ vQs puW hyW -pTf +xkS iOc qwG fjD @@ -86463,7 +86439,7 @@ cJT vQs qlz hyW -xOw +rEO iOc mAs fjD @@ -86713,14 +86689,14 @@ aok vlk fqe iWZ -ojW +lRI hpj uSO pSY vQs tiD hyW -xOw +rEO iOc rcW fjD @@ -86973,11 +86949,11 @@ xbZ kZI nbd vKn -fNz +lke vQs vQs hyW -xOw +rEO xbd pOa pOa @@ -87227,14 +87203,14 @@ mmR vlk fqe vHa -nNB -qoY -fAk -rPp -ljH +nFH +eDK +tCl +tCl +qbD vQs mQa -xOw +rEO mux pOa qXm @@ -87485,13 +87461,13 @@ gxu vQs vde tGU -hYl -caV -rPp -eIc +hwf +vua +sei +unp vQs hyW -qzC +ygy kOQ lxM kDS @@ -87719,8 +87695,8 @@ fhn jXu jBp wsk -qHt -dxo +rJF +cMl hlE oor aKN @@ -87748,7 +87724,7 @@ vQs vQs vQs upM -pqc +nXW rkM pOa hKp @@ -87971,10 +87947,10 @@ fUr fUr bkJ iIE -cAf -dve -jXu -pVV +jFw +tDj +byr +rLq qqr iId tkf @@ -87991,12 +87967,12 @@ dfk dfk rQD nsh -vWD -sCc -liU -nrB -smB -tik +kVC +xbA +lLa +som +bAC +pfd sxk xwa fjw @@ -88005,7 +87981,7 @@ sbF flG bzH hyW -xOw +rEO wAk pOa pOa @@ -88221,14 +88197,14 @@ hTG gJM srk qGP -sHu +kED pkT sHu eMY cVL jXu -kIJ -sPO +wEU +dRc twr jXu hKg @@ -88250,8 +88226,8 @@ qvV tMn sFi cHG -snZ -xgx +bOB +hOx dfk uyf edN @@ -88262,7 +88238,7 @@ hYx eMf iev sus -sly +fBy nxF sVY cyk @@ -88484,7 +88460,7 @@ jXu jXu jXu jXu -alA +nNE lpS lpS lpS @@ -88507,19 +88483,19 @@ bDn xzx hIp qCS -iqt -mmR -rzo -quT -bzH -gPN -ebd -ebd -jBy -bzH -bzH -bBy -qZO +oFI +hOx +hUj +kUv +iev +ood +yaH +yaH +rQi +iev +iev +xBO +naX pYn sVY psr @@ -88735,7 +88711,7 @@ aaa tdg hkj sQp -cLN +kuW qHa ujT dYi @@ -88999,7 +88975,7 @@ mUF obF jXu fpn -hvz +jXu jXu jXu jXu @@ -89256,7 +89232,7 @@ xMx qrF jXu vxO -hvz +jXu aaa aaa aaf @@ -89513,7 +89489,7 @@ phP rgL jXu paU -hvz +jXu aaf rlU rlU @@ -89525,7 +89501,7 @@ aaf jXu sxn ciE -dUd +vGW rtz fpV tQp @@ -89770,7 +89746,7 @@ jXu jXu jXu otQ -hvz +jXu aaa rlU dfl @@ -90027,7 +90003,7 @@ twr fnJ jXu wgm -mKr +fsQ aaa rlU qrg @@ -90284,7 +90260,7 @@ pOi bMu jXu agi -mKr +fsQ aaa rlU trx @@ -90541,7 +90517,7 @@ knQ cDV sLf uEA -mKr +fsQ aaa rlU vbF @@ -90797,7 +90773,7 @@ wQj jXu jXu jXu -fOB +pdp jXu aaa rlU @@ -97514,7 +97490,7 @@ lNH qXF qXF aMB -mvZ +uUR duI jnt pOK @@ -98857,7 +98833,7 @@ aHi hrh txG eKP -uBG +jRL kXG svS ove diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm index f3755210337f1..52216a328e9a0 100644 --- a/_maps/map_files/NSVBlueshift/Blueshift.dmm +++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm @@ -511,6 +511,25 @@ }, /turf/open/floor/wood/parquet, /area/station/service/theater) +"afr" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/closet/secure_closet/corrections_officer, +/obj/machinery/button/flasher{ + id = "IsolationFlash2"; + pixel_x = 10; + pixel_y = -24 + }, +/obj/machinery/button/flasher{ + id = "IsolationFlash"; + pixel_x = -10; + pixel_y = -24 + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/isolation/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/corrections_officer) "afx" = ( /obj/structure/table, /obj/item/stack/sheet/glass{ @@ -1563,12 +1582,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/hallway/secondary/command) -"apY" = ( -/obj/structure/chair/office/light, -/obj/machinery/light/floor, -/obj/machinery/computer/security/telescreen/tcomms/directional/south, -/turf/open/floor/iron, -/area/station/tcommsat/computer) "aqb" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, @@ -1765,6 +1778,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/courtroom) +"arT" = ( +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/obj/machinery/computer/security/telescreen/research/directional/south, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) "arX" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/poddoor/preopen{ @@ -1927,17 +1947,6 @@ }, /turf/open/floor/carpet, /area/station/security/prison/rec) -"atR" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Server Room" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "tcomms-internal" - }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/tcommsat/computer) "atW" = ( /obj/effect/turf_decal/trimline/blue/corner, /obj/effect/landmark/start/assistant, @@ -1980,19 +1989,6 @@ dir = 4 }, /area/station/security/range) -"aue" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Shared Engineering Storage" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/iron, -/area/station/engineering/storage_shared) "auv" = ( /obj/effect/turf_decal/bot_white/left, /obj/effect/spawner/random/structure/crate, @@ -2267,17 +2263,6 @@ /obj/machinery/chem_dispenser/drinks/beer, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) -"axh" = ( -/obj/machinery/disposal/delivery_chute{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "axi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3303,18 +3288,6 @@ /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, /area/station/service/janitor) -"aHG" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Control Room" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "tcomms-internal" - }, -/obj/machinery/door/firedoor/heavy, -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, -/obj/effect/mapping_helpers/airlock/access/any/command/general, -/turf/open/floor/iron, -/area/station/tcommsat/computer) "aHJ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Medbay Maintenance" @@ -3431,13 +3404,6 @@ dir = 4 }, /area/station/hallway/primary/central/aft) -"aIR" = ( -/obj/machinery/light/directional/south, -/obj/structure/table/wood, -/obj/item/folder, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "aIS" = ( /obj/structure/table/glass, /obj/item/melee/flyswatter, @@ -3514,6 +3480,14 @@ dir = 1 }, /area/station/command/heads_quarters/ce) +"aJC" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/newscaster/directional/west, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron, +/area/station/command/teleporter) "aJG" = ( /obj/item/kirbyplants/random, /obj/machinery/airalarm/directional/north, @@ -3705,24 +3679,15 @@ /turf/open/floor/carpet/blue, /area/station/medical/exam_room) "aLC" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/rack, /obj/effect/turf_decal/bot, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/item/storage/box/petridish{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/petridish, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/science/xenobiology) -"aLO" = ( -/turf/open/space/openspace, -/area/space/nearstation) +/obj/structure/rack, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/inducer, +/obj/item/inducer, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva/upper) "aLP" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -4274,18 +4239,6 @@ /obj/structure/railing, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"aRF" = ( -/obj/machinery/door/airlock/research{ - name = "Cytology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "aSc" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -5548,6 +5501,11 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/station/maintenance/pool_maintenance) +"bet" = ( +/obj/structure/closet/secure_closet/cytology, +/obj/effect/turf_decal/stripes/white/box, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "beu" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -7010,6 +6968,19 @@ }, /turf/open/floor/wood, /area/station/security/courtroom) +"bsa" = ( +/obj/structure/table/reinforced, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/structure/cable, +/obj/machinery/cell_charger, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/station/ai_monitored/command/storage/eva/upper) "bse" = ( /obj/machinery/light/directional/south, /turf/open/floor/carpet/lone, @@ -7513,6 +7484,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/electronic_marketing_den) +"bxP" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 6; + pixel_y = 16 + }, +/obj/item/cigarette{ + pixel_y = 4 + }, +/turf/open/floor/iron/dark/small, +/area/station/cargo/miningdock) "bxS" = ( /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/light/small/directional/west, @@ -7639,6 +7621,29 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"byz" = ( +/obj/machinery/light/directional/east, +/obj/structure/table, +/obj/item/multitool{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/multitool{ + pixel_y = 10 + }, +/obj/item/multitool{ + pixel_x = 4; + pixel_y = 12 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_y = -4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/test_chambers) "byC" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -7827,18 +7832,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"bAx" = ( -/obj/structure/table/wood, -/obj/item/cigarette/cigar/havana{ - pixel_x = -3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar, -/obj/item/lighter, -/turf/open/floor/carpet, -/area/station/command/meeting_room/council) "bAL" = ( /obj/machinery/door/poddoor/shutters{ id = "gatewayshutters"; @@ -7892,13 +7885,6 @@ "bBd" = ( /turf/open/floor/wood, /area/station/service/cafeteria) -"bBh" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high/empty, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron, -/area/station/science/research/abandoned) "bBm" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -8255,6 +8241,18 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +"bER" = ( +/obj/structure/rack, +/obj/item/stack/rods{ + amount = 23 + }, +/obj/effect/spawner/random/maintenance, +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/item/stock_parts/power_store/cell/crap/empty, +/turf/open/floor/circuit, +/area/station/science/research/abandoned) "bET" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/iron, @@ -8614,12 +8612,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood, /area/station/command/captain_dining) -"bJM" = ( -/obj/structure/chair/stool/directional/south, -/obj/machinery/firealarm/directional/east, -/obj/effect/landmark/start/telecomms_specialist, -/turf/open/floor/iron, -/area/station/engineering/break_room) "bJS" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/bot, @@ -9256,6 +9248,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/dorms) +"bOZ" = ( +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/obj/machinery/vatgrower, +/obj/item/plunger{ + pixel_x = -7; + pixel_y = 20 + }, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "bPe" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -9573,6 +9580,18 @@ /obj/item/reagent_containers/cup/glass/mug/britcup, /turf/open/floor/wood, /area/station/hallway/primary/central) +"bRW" = ( +/obj/machinery/door/airlock/research{ + name = "Cytology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "bSa" = ( /obj/structure/table, /obj/structure/window/reinforced/spawner/directional/east, @@ -9810,6 +9829,10 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"bTZ" = ( +/obj/machinery/power/shuttle_engine/large, +/turf/open/space/openspace, +/area/space/nearstation) "bUc" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt{ @@ -9972,6 +9995,22 @@ }, /turf/open/floor/iron/white, /area/station/security/medical) +"bVF" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat_interior) "bVK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10154,6 +10193,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/prison/safe) +"bXG" = ( +/obj/structure/chair/stool/directional/south, +/obj/machinery/firealarm/directional/east, +/obj/effect/landmark/start/telecomms_specialist, +/turf/open/floor/iron, +/area/station/engineering/break_room) "bXI" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 @@ -10424,26 +10469,6 @@ /obj/machinery/duct, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) -"caa" = ( -/obj/structure/table/wood, -/obj/item/cigarette/syndicate, -/obj/item/food/sandwich{ - pixel_x = 5; - pixel_y = 14 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - desc = "Takes you to a whole new level of thinking."; - name = "Meta-Cider"; - pixel_x = -7; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = -14; - pixel_y = 1 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/security/prison_upper) "cab" = ( /turf/open/floor/iron/smooth_edge, /area/station/command/secure_bunker) @@ -10994,10 +11019,6 @@ /obj/item/camera_film, /turf/open/floor/wood, /area/station/maintenance/abandon_art_studio) -"cfU" = ( -/obj/machinery/smartfridge/petri/preloaded, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "cfV" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt{ @@ -11105,6 +11126,16 @@ }, /turf/open/floor/iron/white, /area/station/science/genetics) +"chi" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/battery/high, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/gateway) "chl" = ( /obj/machinery/camera/directional/north{ c_tag = "Holodeck - Fore 1"; @@ -12349,24 +12380,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"csW" = ( -/obj/structure/table/wood, -/obj/item/cigarette/cigar/havana{ - pixel_x = -3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar, -/obj/item/lighter, -/obj/structure/cable, -/obj/machinery/button/door{ - id = "DetShutters"; - name = "Privacy Shutters"; - pixel_y = 14 - }, -/turf/open/floor/carpet, -/area/station/security/detectives_office) "csY" = ( /obj/effect/turf_decal/stripes, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13243,6 +13256,11 @@ /obj/structure/flora/bush/flowers_pp, /turf/open/floor/grass, /area/station/service/cafeteria) +"czu" = ( +/obj/structure/table/glass, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) "czv" = ( /obj/machinery/door/airlock{ id_tag = "Toilet2"; @@ -13366,6 +13384,15 @@ /obj/structure/ladder, /turf/open/floor/plating, /area/station/maintenance/wrestle) +"cAD" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/effect/turf_decal/stripes{ + dir = 5 + }, +/obj/machinery/light/directional/west, +/obj/structure/sign/warning/gas_mask/directional/south, +/turf/open/floor/plating, +/area/station/science/xenobiology) "cAJ" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/machinery/light/directional/west, @@ -14291,6 +14318,26 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"cIg" = ( +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/structure/table, +/obj/item/folder/blue{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = -2; + pixel_y = -7 + }, +/obj/item/stock_parts/power_store/cell{ + pixel_x = 7; + pixel_y = -9 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/fore) "cIm" = ( /turf/open/floor/iron/smooth_edge{ dir = 1 @@ -14498,15 +14545,6 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai) -"cKh" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "cKl" = ( /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, @@ -14773,6 +14811,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) +"cMO" = ( +/obj/structure/railing, +/obj/structure/chair/plastic{ + dir = 8 + }, +/turf/open/floor/iron/dark/side, +/area/station/hallway/primary/upper) "cMP" = ( /obj/effect/turf_decal/bot, /obj/structure/table/glass, @@ -14954,6 +14999,16 @@ }, /turf/open/floor/iron/dark, /area/station/service/kitchen) +"cOM" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/computer/security/telescreen/interrogation/directional/east, +/turf/open/floor/iron, +/area/station/security/interrogation) "cOS" = ( /obj/structure/hedge/opaque, /obj/structure/curtain/bounty, @@ -15159,6 +15214,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"cRm" = ( +/obj/machinery/power/shuttle_engine/huge, +/turf/open/space/basic, +/area/space/nearstation) "cRo" = ( /obj/structure/bed/maint, /obj/effect/decal/cleanable/dirt{ @@ -15309,14 +15368,6 @@ /obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"cSD" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "cSF" = ( /obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior, /obj/effect/mapping_helpers/airlock/locked, @@ -15453,6 +15504,27 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"cTU" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/storage/fancy/cigarettes/cigars/cohiba, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_y = 4 + }, +/obj/item/cigarette/rollie/cannabis{ + pixel_x = 8; + pixel_y = 15 + }, +/obj/item/lighter, +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet/royalblack, +/area/station/command/heads_quarters/qm) "cTZ" = ( /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) @@ -15785,24 +15857,17 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/shuttle/arrivals/airless, /area/space/nearstation) +"cXv" = ( +/obj/effect/turf_decal/delivery, +/obj/item/beacon, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "cXy" = ( /obj/structure/closet/secure_closet/personal, /obj/structure/window/reinforced/spawner/directional/south, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/commons/dorms) -"cXC" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 6 - }, -/obj/machinery/light/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "cXG" = ( /obj/effect/turf_decal/stripes{ dir = 5 @@ -15977,18 +16042,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/captain/private) -"cZk" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Server Room" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "tcomms-internal" - }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/general, -/turf/open/floor/iron, -/area/station/tcommsat/computer) "cZl" = ( /obj/effect/landmark/event_spawn, /turf/open/misc/beach/sand, @@ -16497,6 +16550,12 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"deR" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "deS" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ dir = 1 @@ -16658,6 +16717,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/lobby) +"dgv" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/table, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 4; + pixel_y = 0 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/station/service/bar) "dgw" = ( /obj/item/kirbyplants/random, /obj/item/radio/intercom/directional/south, @@ -16703,6 +16773,17 @@ /obj/effect/turf_decal/siding/thinplating_new, /turf/open/floor/iron/dark, /area/station/hallway/primary/upper) +"dgZ" = ( +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/turf/open/floor/iron/grimy, +/area/station/ai_monitored/turret_protected/aisat_interior) "dhd" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -16714,6 +16795,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +"dhk" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space/openspace, +/area/space/nearstation) "dhs" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/computer/crew{ @@ -17017,21 +17103,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/barber) -"djV" = ( -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/obj/machinery/vatgrower, -/obj/item/plunger{ - pixel_x = -7; - pixel_y = 20 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "djW" = ( /obj/structure/curtain/cloth, /obj/effect/turf_decal/siding/thinplating/light, @@ -17342,6 +17413,22 @@ }, /turf/open/floor/grass, /area/station/security/prison/garden) +"dmZ" = ( +/obj/structure/table/wood, +/obj/item/paper/fluff/gateway, +/obj/item/coin/gold{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/phone{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/cigarette/pipe{ + pixel_x = -5 + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "dnc" = ( /obj/structure/table, /obj/item/toy/gun{ @@ -17557,14 +17644,6 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/command/gateway) -"dpE" = ( -/obj/machinery/power/shuttle_engine/huge, -/turf/open/space/openspace, -/area/space/nearstation) -"dpN" = ( -/obj/machinery/power/shuttle_engine/large, -/turf/open/space/basic, -/area/space/nearstation) "dpO" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -21043,6 +21122,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/openspace, /area/station/maintenance/aft/upper) +"dYL" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "tcomms-internal" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/turf/open/floor/iron, +/area/station/tcommsat/computer) "dYM" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/iron/stairs/right{ @@ -21517,6 +21606,19 @@ "eeW" = ( /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) +"eeX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Shared Engineering Storage" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) "eeY" = ( /obj/structure/rack/shelf, /obj/effect/spawner/random/techstorage/tcomms_all, @@ -22149,12 +22251,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/engineering/engine_aft_starboard) -"elo" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/basic, -/area/space/nearstation) "elp" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -22648,22 +22744,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"eqL" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Break Room" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/iron, -/area/station/engineering/lobby) "eqP" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -22884,6 +22964,10 @@ /obj/item/melee/baton/security/cattleprod, /turf/open/floor/iron, /area/station/maintenance/abandon_holding_cell) +"etb" = ( +/obj/machinery/smartfridge/petri/preloaded, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "etc" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -23007,10 +23091,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/textured, /area/station/common/cryopods) -"eud" = ( -/obj/structure/shipping_container/donk_co, -/turf/open/floor/iron/dark/small, -/area/station/cargo/miningdock) "euj" = ( /obj/machinery/door/firedoor, /obj/machinery/firealarm/directional/west, @@ -23107,6 +23187,14 @@ "euK" = ( /turf/open/floor/engine, /area/station/science/explab) +"euL" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/bot, +/obj/machinery/modular_computer/preset/engineering, +/obj/structure/cable, +/obj/machinery/computer/security/telescreen/turbine/directional/east, +/turf/open/floor/iron/dark, +/area/station/maintenance/disposal/incinerator) "euM" = ( /obj/structure/disposalpipe/sorting/mail{ name = "CE's Junction"; @@ -23715,6 +23803,18 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/wood, /area/station/security/detectives_office/private_investigators_office) +"eAl" = ( +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/xenobiology) "eAm" = ( /obj/structure/table/wood, /obj/item/toner/large, @@ -24105,6 +24205,18 @@ }, /turf/open/floor/wood, /area/station/security/courtroom) +"eDR" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/abandoned_gambling_den) "eDV" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -24266,6 +24378,18 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/department/security/prison_upper) +"eFs" = ( +/obj/structure/window/spawner/directional/south, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/computer/records/security{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/vault/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "eFx" = ( /obj/structure/water_source/puddle, /obj/structure/flora/bush/large{ @@ -24473,11 +24597,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain/private) -"eHs" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/space/openspace, -/area/space/nearstation) "eHw" = ( /obj/machinery/telecomms/hub/preset, /turf/open/floor/circuit/telecomms/mainframe, @@ -25748,32 +25867,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central) -"eSM" = ( -/obj/structure/showcase/cyborg/old{ - dir = 4; - pixel_x = -9; - pixel_y = 2 - }, -/obj/machinery/turretid{ - control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; - icon_state = "control_stun"; - name = "AI Upload turret control"; - pixel_y = 32 - }, -/obj/item/radio/intercom/directional/north{ - broadcasting = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = -26 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/aiupload/directional/west, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload_foyer) "eSN" = ( /turf/closed/wall, /area/station/service/bar/backroom) @@ -25797,6 +25890,15 @@ /obj/item/crowbar, /turf/open/floor/engine, /area/station/engineering/supermatter) +"eSV" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "eSY" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -26207,6 +26309,25 @@ /obj/item/plate, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/diner) +"eWM" = ( +/obj/structure/table/reinforced, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = 2 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4.5 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/effect/turf_decal/tile/yellow/full, +/turf/open/floor/iron/large, +/area/station/command/heads_quarters/ce) "eWN" = ( /obj/effect/spawner/random/trash/mess, /obj/structure/cable, @@ -26807,14 +26928,6 @@ }, /turf/open/floor/wood, /area/station/security/prison/rec) -"fbZ" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/effect/turf_decal/bot, -/obj/machinery/modular_computer/preset/engineering, -/obj/structure/cable, -/obj/machinery/computer/security/telescreen/turbine/directional/east, -/turf/open/floor/iron/dark, -/area/station/maintenance/disposal/incinerator) "fcb" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/surgery, @@ -26853,13 +26966,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/engine, /area/station/science/xenobiology) -"fcJ" = ( -/obj/machinery/light/floor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/computer/security/telescreen/minisat/directional/north, -/turf/open/floor/iron, -/area/station/engineering/transit_tube) "fcK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -27679,15 +27785,6 @@ dir = 4 }, /area/station/hallway/secondary/entry) -"fkw" = ( -/obj/machinery/power/shieldwallgen/xenobiologyaccess, -/obj/effect/turf_decal/stripes{ - dir = 5 - }, -/obj/machinery/light/directional/west, -/obj/structure/sign/warning/gas_mask/directional/south, -/turf/open/floor/plating, -/area/station/science/xenobiology) "fkA" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -28035,6 +28132,16 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/security/courtroom) +"foz" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/ce/directional/west, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/ce) "foC" = ( /turf/closed/indestructible/riveted{ desc = "A wall impregnated with Fixium, able to withstand massive explosions with ease"; @@ -28476,6 +28583,19 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/medical/central) +"fsN" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt{ + icon_state = "dirt-flat-1" + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/abandoned_gambling_den) "fsS" = ( /obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/east, @@ -29013,6 +29133,20 @@ }, /turf/open/floor/plating, /area/station/security/checkpoint/customs) +"fxX" = ( +/obj/structure/table/wood, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/item/cigarette/cigar, +/obj/item/cigarette/pipe{ + pixel_y = 13 + }, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/captain) "fye" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating, @@ -29867,6 +30001,15 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/night_club) +"fIe" = ( +/obj/structure/chair/office/light, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "fIi" = ( /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) @@ -29980,10 +30123,6 @@ /obj/machinery/light/small/broken/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) -"fJz" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/space/openspace, -/area/space/nearstation) "fJD" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -31304,6 +31443,39 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/ordnance/storage) +"fXg" = ( +/obj/machinery/button/ignition{ + id = "executionburn"; + name = "Justice Ignition Switch"; + pixel_x = -25; + pixel_y = 36 + }, +/obj/machinery/button/flasher{ + id = "justiceflash"; + name = "Justice Flash Control"; + pixel_x = -36; + pixel_y = 36; + req_access = list("security") + }, +/obj/machinery/button/door{ + id = "executionfireblast"; + name = "Justice Area Lockdown"; + pixel_x = -25; + pixel_y = 26; + req_access = list("brig") + }, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ + dir = 9 + }, +/obj/machinery/button/door{ + id = "SecJusticeChamber"; + name = "Justice Vent Control"; + pixel_x = -36; + pixel_y = 26; + req_access = list("armory") + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) "fXh" = ( /obj/structure/cable, /obj/effect/landmark/start/medical_doctor, @@ -32435,17 +32607,25 @@ /turf/open/floor/plating, /area/station/science/circuits) "giN" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/table/wood, +/obj/item/cigarette/syndicate, +/obj/item/food/sandwich{ + pixel_x = 5; + pixel_y = 14 }, -/obj/structure/chair/sofa/corp{ - dir = 4 +/obj/item/reagent_containers/cup/glass/bottle/beer{ + desc = "Takes you to a whole new level of thinking."; + name = "Meta-Cider"; + pixel_x = -7; + pixel_y = 9 }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -14; + pixel_y = 1 }, -/turf/open/floor/wood/parquet, -/area/station/common/night_club) +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/department/security/prison_upper) "giS" = ( /obj/effect/spawner/random/trash/graffiti, /turf/closed/wall, @@ -33113,10 +33293,6 @@ /obj/structure/cable, /turf/open/floor/iron/stairs, /area/station/science/xenobiology) -"gox" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/space/openspace, -/area/space/nearstation) "goy" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/bush/flowers_br, @@ -33682,6 +33858,11 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"guo" = ( +/obj/structure/chair/stool/directional/west, +/obj/machinery/computer/security/telescreen/disposals/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "guu" = ( /obj/structure/trash_pile, /obj/effect/decal/cleanable/dirt{ @@ -34149,6 +34330,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/clown_chamber) +"gyX" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen, +/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, +/turf/open/floor/iron/dark, +/area/station/service/library/private) "gze" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/light/directional/east, @@ -34186,6 +34384,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"gzx" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space/openspace, +/area/space/nearstation) "gzC" = ( /obj/structure/chair/plastic{ dir = 4 @@ -34342,6 +34545,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"gAW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Break Room" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron, +/area/station/engineering/lobby) "gBa" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -35015,6 +35234,18 @@ /obj/structure/flora/bush/stalky, /turf/open/floor/grass, /area/station/hallway/primary/port) +"gIM" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 18; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = 18; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology/control) "gIN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35144,12 +35375,6 @@ /obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) -"gJR" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger_multi, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/iron/dark, -/area/station/engineering/storage_shared) "gJT" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -35321,6 +35546,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"gLI" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Security Maintenance"; + welded = 1 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/turf/open/floor/plating, +/area/station/maintenance/department/security/lower) "gLQ" = ( /obj/machinery/seed_extractor, /obj/machinery/light/directional/west, @@ -35804,6 +36038,26 @@ dir = 8 }, /area/station/science) +"gQO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/obj/structure/railing{ + dir = 9 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/station/commons/dorms) "gQU" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4; @@ -35903,12 +36157,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) -"gRv" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/chair/office/light, -/obj/effect/landmark/start/telecomms_specialist, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "gRw" = ( /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -36999,6 +37247,19 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"hdE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Shared Engineering Storage" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) "hdL" = ( /obj/effect/turf_decal/stripes/end{ dir = 1 @@ -37336,6 +37597,22 @@ dir = 8 }, /area/station/engineering/atmos/hfr_room) +"hhg" = ( +/obj/structure/table/reinforced, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar, +/turf/open/floor/carpet/red, +/area/station/command/heads_quarters/hos) "hhq" = ( /obj/structure/trash_pile, /turf/open/floor/plating, @@ -37442,17 +37719,6 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction, /turf/open/floor/plating, /area/station/tcommsat/computer) -"hiu" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/landmark/start/psychologist, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/cmo/directional/south, -/turf/open/floor/iron, -/area/station/medical/psychology) "hiy" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -37687,6 +37953,18 @@ /obj/effect/spawner/random/trash/moisture, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"hkw" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/abandoned_gambling_den) "hkB" = ( /obj/structure/chair/sofa/bench/right{ dir = 8; @@ -38234,23 +38512,6 @@ /obj/structure/flora/bush/jungle/a/style_3, /turf/open/floor/grass, /area/station/hallway/primary/port) -"hqq" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen, -/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, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "hqu" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -38584,18 +38845,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"htN" = ( -/obj/structure/rack, -/obj/item/stack/rods{ - amount = 23 - }, -/obj/effect/spawner/random/maintenance, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/item/stock_parts/power_store/cell/crap/empty, -/turf/open/floor/circuit, -/area/station/science/research/abandoned) "htQ" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -38770,6 +39019,12 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"hvV" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger_multi, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/dark, +/area/station/engineering/storage_shared) "hwb" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /turf/open/floor/iron/dark, @@ -38968,6 +39223,19 @@ /obj/item/folder/red, /turf/open/floor/plating, /area/station/maintenance/abandon_holding_cell) +"hyk" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer4, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "hym" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -39533,26 +39801,6 @@ }, /turf/open/floor/grass, /area/station/service/hydroponics) -"hDZ" = ( -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/table, -/obj/item/folder/blue{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = -2; - pixel_y = -7 - }, -/obj/item/stock_parts/power_store/cell{ - pixel_x = 7; - pixel_y = -9 - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/smooth, -/area/station/maintenance/starboard/fore) "hEe" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -39782,11 +40030,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"hGr" = ( -/obj/machinery/light/directional/south, -/obj/machinery/computer/security/telescreen/cmo/directional/south, -/turf/open/floor/carpet/blue, -/area/station/command/heads_quarters/cmo) "hGt" = ( /obj/structure/table, /obj/machinery/microwave{ @@ -40490,6 +40733,11 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/hallway/secondary/service) +"hMR" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/incident_display/bridge/directional/south, +/turf/open/floor/iron/dark/side, +/area/station/hallway/secondary/command) "hMW" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -40950,15 +41198,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/solars/port/fore) -"hQy" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/plumbing/input, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "hQA" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt{ @@ -41290,6 +41529,12 @@ }, /turf/open/floor/grass, /area/station/security/prison/garden) +"hUp" = ( +/obj/structure/hoop{ + pixel_y = 17 + }, +/turf/open/floor/iron, +/area/station/security/prison/workout) "hUs" = ( /obj/structure/closet/secure_closet/brig, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -41669,17 +41914,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"hYw" = ( -/obj/machinery/door/airlock/research{ - name = "Cytology Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "hYF" = ( /obj/item/kirbyplants/random, /obj/machinery/light_switch/directional/north, @@ -42222,6 +42456,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"iea" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) "iej" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -43042,6 +43282,14 @@ /obj/effect/turf_decal/tile/red/real_red/fourcorners, /turf/open/floor/iron/dark, /area/station/common/laser_tag) +"iml" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/dark, +/area/station/science/robotics) "imm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43130,6 +43378,11 @@ }, /turf/open/floor/wood, /area/station/commons/dorms/room1) +"inb" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space/openspace, +/area/space/nearstation) "inc" = ( /obj/effect/decal/cleanable/oil/streak, /turf/open/floor/iron/dark, @@ -43823,11 +44076,6 @@ }, /turf/open/floor/plating, /area/station/science/ordnance/testlab) -"iuR" = ( -/obj/structure/table/glass, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/transit_tube) "iuS" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron/white, @@ -44437,6 +44685,17 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/security/greater) +"iAu" = ( +/obj/machinery/disposal/delivery_chute{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "iAG" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -44793,16 +45052,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"iEa" = ( -/obj/structure/table/reinforced, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/machinery/newscaster/directional/north, -/obj/machinery/cell_charger, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tech) "iEg" = ( /obj/structure/trash_pile, /turf/open/floor/plating, @@ -45334,6 +45583,11 @@ /obj/machinery/duct, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) +"iJi" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/space/openspace, +/area/space/nearstation) "iJw" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/bot, @@ -46064,18 +46318,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"iRV" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 4 - }, -/obj/structure/railing{ - dir = 10 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/turf/open/floor/wood/parquet, -/area/station/common/night_club) "iRZ" = ( /obj/machinery/iv_drip, /obj/structure/bed/medical/anchored{ @@ -46986,6 +47228,18 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +"jas" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Control Room" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "tcomms-internal" + }, +/obj/machinery/door/firedoor/heavy, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/iron, +/area/station/tcommsat/computer) "jay" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -47033,14 +47287,6 @@ "jaR" = ( /turf/open/floor/iron, /area/station/commons/dorms) -"jaV" = ( -/obj/machinery/door/airlock/engineering{ - name = "Telecoms Cooling" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "jaZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -47412,6 +47658,19 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"jeS" = ( +/obj/machinery/door/firedoor, +/obj/machinery/firealarm/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/door/airlock/public/glass{ + name = "Central Upper Hallway" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/upper) "jeT" = ( /obj/structure/table, /obj/item/storage/fancy/coffee_condi_display{ @@ -48154,6 +48413,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"jmt" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "jmD" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -48545,6 +48814,17 @@ /obj/effect/turf_decal/tile/red/real_red/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +"jpY" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/start/psychologist, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/cmo/directional/south, +/turf/open/floor/iron, +/area/station/medical/psychology) "jqa" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Mix to Ports" @@ -48692,14 +48972,6 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) -"jro" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/iron/dark, -/area/station/science/robotics) "jrw" = ( /obj/effect/turf_decal/bot, /obj/machinery/airalarm/directional/west, @@ -49199,10 +49471,6 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"jwx" = ( -/obj/machinery/power/shuttle_engine/huge, -/turf/open/space/basic, -/area/space/nearstation) "jwF" = ( /obj/structure/filingcabinet/chestdrawer, /obj/item/storage/box/syringes{ @@ -49388,6 +49656,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/upper) +"jyn" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 2; + pixel_y = 7 + }, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/dark, +/area/station/engineering/break_room) "jyo" = ( /obj/structure/flora/bush/grassy, /obj/structure/flora/bush/flowers_yw, @@ -49407,16 +49685,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"jyu" = ( -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "jyx" = ( /obj/structure/chair/stool/directional/north, /obj/effect/landmark/start/assistant, @@ -50166,6 +50434,14 @@ /obj/effect/turf_decal/stripes, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"jFL" = ( +/obj/structure/chair/office, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/ordnance/directional/south, +/turf/open/floor/iron, +/area/station/science/ordnance/testlab) "jFN" = ( /obj/structure/cable, /obj/item/radio/intercom/directional/north, @@ -50176,16 +50452,6 @@ dir = 1 }, /area/station/hallway/primary/port) -"jFV" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/inducer, -/obj/item/inducer, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/eva/upper) "jFZ" = ( /obj/structure/table/reinforced, /obj/item/gun_maintenance_supplies{ @@ -50233,6 +50499,21 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/common/wrestling/beverage) +"jGw" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Foyer" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron, +/area/station/engineering/lobby) "jGA" = ( /obj/structure/table/glass, /obj/structure/cable, @@ -50449,19 +50730,6 @@ dir = 1 }, /area/station/science/research) -"jIS" = ( -/obj/structure/table/glass, -/obj/machinery/cell_charger, -/obj/item/stack/cable_coil, -/obj/item/stock_parts/power_store/cell, -/obj/structure/window/spawner/directional/south, -/obj/effect/turf_decal/tile/purple/half{ - dir = 8 - }, -/turf/open/floor/iron/white/side{ - dir = 8 - }, -/area/station/science) "jIV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50544,29 +50812,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/upper) -"jJD" = ( -/obj/machinery/light/directional/east, -/obj/structure/table, -/obj/item/multitool{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/multitool{ - pixel_y = 10 - }, -/obj/item/multitool{ - pixel_x = 4; - pixel_y = 12 - }, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/item/stock_parts/power_store/cell/high{ - pixel_y = -4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos/test_chambers) "jJF" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -52426,6 +52671,12 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"jZv" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "jZy" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -52814,6 +53065,10 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/grass, /area/station/hallway/primary/central) +"kev" = ( +/obj/structure/shipping_container/donk_co, +/turf/open/floor/iron/dark/small, +/area/station/cargo/miningdock) "key" = ( /obj/structure/cable, /obj/effect/landmark/event_spawn, @@ -53214,6 +53469,17 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron, /area/station/maintenance/console_room) +"kha" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/cytology, +/obj/item/biopsy_tool, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/xenobiology) "khb" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/effect/turf_decal/bot, @@ -53706,6 +53972,16 @@ /obj/machinery/skill_station, /turf/open/floor/iron/dark, /area/station/service/library/printer) +"kmb" = ( +/obj/structure/table/reinforced, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/newscaster/directional/north, +/obj/machinery/cell_charger, +/turf/open/floor/iron/dark, +/area/station/engineering/storage/tech) "kmc" = ( /obj/effect/spawner/random/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54765,19 +55041,6 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"kwd" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/experimentor{ - pixel_x = -16 - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/white/smooth_corner{ - dir = 8 - }, -/area/station/science/explab) "kwh" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -54974,6 +55237,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"kxI" = ( +/obj/machinery/smartfridge/organ, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "kxK" = ( /obj/effect/turf_decal/stripes, /obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ @@ -55201,6 +55468,13 @@ dir = 4 }, /area/station/tcommsat/computer) +"kzH" = ( +/obj/structure/window/spawner/directional/north, +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/transit_tube) "kzI" = ( /turf/open/floor/iron, /area/station/science/xenobiology) @@ -55351,39 +55625,6 @@ }, /turf/open/floor/engine, /area/station/cargo/miningdock) -"kAX" = ( -/obj/machinery/button/ignition{ - id = "executionburn"; - name = "Justice Ignition Switch"; - pixel_x = -25; - pixel_y = 36 - }, -/obj/machinery/button/flasher{ - id = "justiceflash"; - name = "Justice Flash Control"; - pixel_x = -36; - pixel_y = 36; - req_access = list("security") - }, -/obj/machinery/button/door{ - id = "executionfireblast"; - name = "Justice Area Lockdown"; - pixel_x = -25; - pixel_y = 26; - req_access = list("brig") - }, -/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ - dir = 9 - }, -/obj/machinery/button/door{ - id = "SecJusticeChamber"; - name = "Justice Vent Control"; - pixel_x = -36; - pixel_y = 26; - req_access = list("armory") - }, -/turf/open/floor/iron/dark, -/area/station/security/execution/education) "kAY" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/light/directional/south, @@ -55518,28 +55759,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"kCv" = ( -/obj/structure/window/spawner/directional/south, -/obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/computer/records/security{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/vault/directional/west, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) -"kCA" = ( -/obj/structure/cable, -/obj/structure/statue/sandstone/venus, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "kCB" = ( /turf/open/floor/iron/white/small, /area/station/medical/break_room) @@ -56392,6 +56611,20 @@ }, /turf/open/floor/mineral/plastitanium, /area/station/maintenance/cult_chapel_maint) +"kLU" = ( +/obj/structure/table/reinforced, +/obj/machinery/ecto_sniffer{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/newscaster/directional/north, +/obj/machinery/light_switch/directional/west, +/obj/machinery/light/directional/north, +/turf/open/floor/mineral/plastitanium/red, +/area/station/science/robotics/lab) "kLV" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/engine, @@ -57298,18 +57531,6 @@ /obj/effect/spawner/random/techstorage/service_all, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"kXp" = ( -/obj/structure/railing{ - dir = 9 - }, -/obj/structure/chair/sofa/corp/left{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/turf/open/floor/wood/parquet, -/area/station/common/night_club) "kXs" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -57723,6 +57944,15 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/hydroponics) +"lbi" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/item/flatpack, +/turf/open/floor/iron/white, +/area/station/science/lab) "lbm" = ( /turf/open/openspace, /area/station/service/barber) @@ -58130,16 +58360,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/engine_smes) -"lem" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/computer/security/telescreen/interrogation/directional/east, -/turf/open/floor/iron, -/area/station/security/interrogation) "leo" = ( /obj/structure/sink/directional/east, /obj/structure/disposalpipe/segment{ @@ -59439,21 +59659,6 @@ /obj/item/pen, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) -"lrX" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - piping_layer = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "lsb" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -59557,6 +59762,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/drone_bay) +"lsQ" = ( +/obj/effect/turf_decal/bot, +/obj/structure/table/reinforced, +/obj/item/stack/sheet/iron{ + amount = 30 + }, +/obj/item/stack/sheet/glass{ + amount = 30 + }, +/obj/item/stack/cable_coil, +/obj/item/screwdriver, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "lsV" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -59950,11 +60173,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/science/robotics) -"lxM" = ( -/obj/effect/turf_decal/delivery, -/obj/item/beacon, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "lyc" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -60696,10 +60914,6 @@ }, /turf/open/floor/wood/parquet, /area/station/service/theater) -"lFh" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/engine, -/area/station/science/xenobiology) "lFi" = ( /obj/machinery/photocopier, /turf/open/floor/iron, @@ -62197,6 +62411,14 @@ /obj/structure/flora/bush/jungle, /turf/open/floor/grass, /area/station/hallway/primary/central/aft) +"lTz" = ( +/obj/machinery/door/airlock/engineering{ + name = "Telecoms Cooling" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "lTC" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ @@ -62915,6 +63137,13 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/dark, /area/station/science/genetics) +"maG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/turf/open/floor/iron, +/area/station/command/bridge) "maI" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -63265,20 +63494,6 @@ }, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) -"meg" = ( -/obj/structure/table/reinforced, -/obj/machinery/ecto_sniffer{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/machinery/newscaster/directional/north, -/obj/machinery/light_switch/directional/west, -/obj/machinery/light/directional/north, -/turf/open/floor/mineral/plastitanium/red, -/area/station/science/robotics/lab) "meh" = ( /obj/item/clothing/shoes/magboots{ pixel_x = 3; @@ -63963,19 +64178,14 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"mlM" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/item/flatpack, -/turf/open/floor/iron/white, -/area/station/science/lab) "mlN" = ( /obj/machinery/vending/sovietsoda, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"mlV" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/engine, +/area/station/science/xenobiology) "mlX" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt{ @@ -64985,17 +65195,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"mxw" = ( -/obj/structure/sink/directional/south, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "mxE" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ @@ -65722,6 +65921,15 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/freezer, /area/station/medical/patients_rooms) +"mEE" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/plumbing/input, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "mER" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, @@ -65785,16 +65993,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central) -"mFr" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/battery/high, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/command/gateway) "mFs" = ( /obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/west, @@ -66235,13 +66433,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science) -"mJA" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/computer/cryopod/directional/west, -/turf/open/floor/iron/dark/textured, -/area/station/common/cryopods) "mJC" = ( /obj/item/radio/intercom/chapel{ pixel_y = 22 @@ -66830,6 +67021,12 @@ /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"mPs" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/structure/table, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "mPt" = ( /obj/machinery/door/window/brigdoor/right/directional/west{ req_access = list("security"); @@ -67155,12 +67352,6 @@ /obj/structure/cable, /turf/open/floor/mineral/plastitanium/red, /area/station/maintenance/cult_chapel_maint) -"mSh" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/structure/table, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "mSk" = ( /obj/machinery/light/small/directional/west, /obj/structure/cable, @@ -67377,27 +67568,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/barber) -"mUv" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/eva) "mUx" = ( /obj/structure/bed, /obj/item/bedsheet/orange, @@ -67563,6 +67733,16 @@ /obj/structure/filingcabinet, /turf/open/floor/wood/parquet, /area/station/common/arcade) +"mWj" = ( +/obj/effect/turf_decal/siding/yellow, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/digital_clock/directional/west, +/obj/structure/sign/calendar/directional/north, +/obj/item/rcl/pre_loaded, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "mWl" = ( /obj/effect/spawner/random/trash/mess, /obj/effect/decal/cleanable/dirt{ @@ -67909,11 +68089,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"mZX" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/space/openspace, -/area/space/nearstation) "mZZ" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -68253,6 +68428,17 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) +"ndi" = ( +/obj/structure/sink/directional/south, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "ndp" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/emcloset, @@ -68487,15 +68673,6 @@ /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"nfK" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance"; - welded = 1 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/plating, -/area/station/maintenance/department/security/lower) "nfL" = ( /turf/closed/wall, /area/station/common/wrestling/beverage) @@ -68903,21 +69080,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/hop, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"njn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/iron, -/area/station/engineering/lobby) "njq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -69525,15 +69687,6 @@ }, /turf/closed/wall, /area/station/maintenance/port/fore) -"nqR" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "nqT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69561,6 +69714,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/upper) +"nri" = ( +/obj/machinery/power/shuttle_engine/large, +/turf/open/space/basic, +/area/space/nearstation) "nrv" = ( /obj/structure/bookcase/random/reference, /obj/machinery/digital_clock/directional/north, @@ -69755,6 +69912,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/construction) +"ntx" = ( +/obj/structure/dresser{ + pixel_y = -11 + }, +/obj/structure/mirror{ + pixel_x = 1; + pixel_y = 4 + }, +/turf/closed/wall, +/area/station/common/tailoring) "nty" = ( /obj/effect/turf_decal/stripes/box, /obj/structure/closet/emcloset, @@ -70174,18 +70341,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/station/cargo/sorting) -"nxX" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/chair/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/wood, -/area/station/service/abandoned_gambling_den) "nyf" = ( /obj/effect/turf_decal/tile/red/half{ dir = 4 @@ -70646,27 +70801,6 @@ }, /turf/open/water/overlay, /area/station/hallway/primary/central) -"nCe" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/item/reagent_containers/cup/glass/bottle/rum{ - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/storage/fancy/cigarettes/cigars/cohiba, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_y = 4 - }, -/obj/item/cigarette/rollie/cannabis{ - pixel_x = 8; - pixel_y = 15 - }, -/obj/item/lighter, -/obj/structure/disposalpipe/segment, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/qm) "nCh" = ( /obj/structure/window/spawner/directional/east, /obj/structure/window/spawner/directional/west, @@ -70685,6 +70819,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/teleporter) +"nCn" = ( +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/turf/open/floor/wood, +/area/station/service/bar/atrium) "nCq" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -70817,25 +70957,6 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/station/common/tailoring) -"nDy" = ( -/obj/structure/table/reinforced, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = 2 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4.5 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/effect/turf_decal/tile/yellow/full, -/turf/open/floor/iron/large, -/area/station/command/heads_quarters/ce) "nDz" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -71544,6 +71665,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) +"nKr" = ( +/obj/structure/musician/piano{ + icon_state = "piano" + }, +/turf/open/floor/wood, +/area/station/service/theater) "nKs" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/bush/grassy, @@ -72885,18 +73012,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"nXm" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/abandoned_gambling_den) "nXn" = ( /obj/structure/window/spawner/directional/east, /obj/effect/turf_decal/bot, @@ -72963,19 +73078,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) -"nXR" = ( -/obj/structure/table/glass, -/obj/structure/microscope, -/obj/effect/turf_decal/tile/purple/half{ - dir = 1 - }, -/obj/item/knife{ - pixel_x = 16 - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/science/xenobiology) "nXV" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -73388,6 +73490,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"ocq" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/space/openspace, +/area/space/nearstation) "ocu" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -73432,14 +73538,6 @@ }, /turf/open/floor/iron, /area/station/science/ordnance) -"ocK" = ( -/obj/structure/chair/office, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/ordnance/directional/south, -/turf/open/floor/iron, -/area/station/science/ordnance/testlab) "ocN" = ( /obj/structure/trash_pile, /turf/open/floor/iron, @@ -74250,10 +74348,6 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"ojl" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/space/openspace, -/area/space/nearstation) "ojm" = ( /obj/structure/closet/crate/engineering{ name = "Prototype Botanical Plant Nutrient Dispenser" @@ -74286,6 +74380,18 @@ /obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"ojP" = ( +/obj/structure/table/wood, +/obj/item/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar, +/obj/item/lighter, +/turf/open/floor/carpet, +/area/station/command/meeting_room/council) "ojR" = ( /obj/structure/marker_beacon/burgundy, /obj/structure/lattice/catwalk, @@ -75346,23 +75452,6 @@ }, /turf/open/floor/engine, /area/station/science/auxlab/firing_range) -"ote" = ( -/obj/structure/table/reinforced, -/obj/item/aicard, -/obj/item/circuitboard/aicore, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Science - Research Director's Office"; - name = "science camera"; - network = list("ss13","rd") - }, -/obj/machinery/light/directional/south, -/obj/item/taperecorder, -/obj/machinery/computer/security/telescreen/rd/directional/south, -/turf/open/floor/iron, -/area/station/command/heads_quarters/rd) "otk" = ( /obj/machinery/photocopier, /obj/machinery/light/directional/north, @@ -75846,6 +75935,10 @@ /obj/machinery/atmospherics/pipe/smart/simple/violet/visible, /turf/closed/wall, /area/station/engineering/atmos/pumproom) +"oyb" = ( +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "oyh" = ( /obj/structure/window/spawner/directional/south, /obj/effect/turf_decal/siding/wood, @@ -76014,25 +76107,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"ozW" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/closet/secure_closet/corrections_officer, -/obj/machinery/button/flasher{ - id = "IsolationFlash2"; - pixel_x = 10; - pixel_y = -24 - }, -/obj/machinery/button/flasher{ - id = "IsolationFlash"; - pixel_x = -10; - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/isolation/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/corrections_officer) "oAa" = ( /obj/effect/turf_decal/bot_white/right, /obj/machinery/ore_silo, @@ -76382,16 +76456,6 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"oDa" = ( -/obj/effect/turf_decal/siding/yellow, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/machinery/digital_clock/directional/west, -/obj/structure/sign/calendar/directional/north, -/obj/item/rcl/pre_loaded, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "oDe" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 @@ -76622,6 +76686,14 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/fore) +"oGh" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "oGm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -77346,6 +77418,10 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/miningoffice) +"oMM" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/space/openspace, +/area/space/nearstation) "oMQ" = ( /mob/living/basic/garden_gnome, /turf/open/floor/grass, @@ -77555,14 +77631,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"oOU" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/station/science/lab) "oOX" = ( /obj/structure/grille, /obj/structure/window/spawner/directional/east, @@ -78340,6 +78408,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/maintenance/abandon_office) +"oWH" = ( +/obj/structure/chair/sofa/bench{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/commons/dorms) "oWJ" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 @@ -78571,6 +78654,19 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"oZs" = ( +/obj/structure/table/glass, +/obj/structure/microscope, +/obj/effect/turf_decal/tile/purple/half{ + dir = 1 + }, +/obj/item/knife{ + pixel_x = 16 + }, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/xenobiology) "oZu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -78926,13 +79022,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"pdv" = ( -/obj/structure/window/spawner/directional/north, -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/engineering/transit_tube) "pdD" = ( /obj/machinery/light/small/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -79091,6 +79180,23 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/plating, /area/station/engineering/atmos) +"pfs" = ( +/obj/structure/table/reinforced, +/obj/item/aicard, +/obj/item/circuitboard/aicore, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Research Director's Office"; + name = "science camera"; + network = list("ss13","rd") + }, +/obj/machinery/light/directional/south, +/obj/item/taperecorder, +/obj/machinery/computer/security/telescreen/rd/directional/south, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) "pfx" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/structure/extinguisher_cabinet/directional/south, @@ -79167,6 +79273,22 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/security/courtroom) +"pgs" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/item/storage/box/petridish{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/petridish, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/xenobiology) "pgz" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/service/bar, @@ -79463,12 +79585,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"pjb" = ( -/obj/structure/musician/piano{ - icon_state = "piano" - }, -/turf/open/floor/wood, -/area/station/service/bar/atrium) "pjf" = ( /obj/machinery/door/airlock{ name = "Abandoned Arcade" @@ -79602,6 +79718,9 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/upper) +"pjT" = ( +/turf/open/space/openspace, +/area/space/nearstation) "pjV" = ( /turf/closed/wall, /area/station/common/night_club/back_stage) @@ -80708,13 +80827,6 @@ }, /turf/open/floor/iron/dark/side, /area/station/security/checkpoint/escape) -"pwg" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/computer/security/telescreen/minisat/directional/south, -/turf/open/floor/iron, -/area/station/command/bridge) "pwi" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 6 @@ -81463,6 +81575,12 @@ }, /turf/open/floor/iron, /area/station/cargo/lobby) +"pEp" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/telecomms_specialist, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "pEq" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/door/airlock{ @@ -81477,6 +81595,25 @@ /obj/effect/mapping_helpers/airlock/access/all/security/court, /turf/open/floor/wood, /area/station/security/courtroom) +"pEu" = ( +/obj/machinery/button/door{ + id = "cargounload"; + name = "Loading Doors"; + pixel_x = 24; + pixel_y = -8 + }, +/obj/machinery/button/door{ + id = "cargoload"; + name = "Loading Doors"; + pixel_x = 24; + pixel_y = 8 + }, +/obj/machinery/computer/cargo{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/small, +/area/station/cargo/storage) "pEA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -81752,6 +81889,13 @@ /obj/machinery/light/small/broken/directional/west, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) +"pHH" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/office) "pHL" = ( /obj/machinery/door/firedoor/heavy, /obj/machinery/door/airlock/maintenance_hatch{ @@ -81964,6 +82108,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/department/eva) +"pKb" = ( +/obj/machinery/light/directional/south, +/obj/structure/table/wood, +/obj/item/folder, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/library/private) "pKc" = ( /obj/effect/turf_decal/bot, /obj/structure/table, @@ -82471,22 +82622,6 @@ /obj/effect/spawner/armory_spawn/smg, /turf/open/floor/iron, /area/station/ai_monitored/security/armory) -"pOq" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat_interior) "pOr" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -83351,6 +83486,15 @@ }, /turf/open/floor/iron/dark, /area/station/science/power_station) +"pWA" = ( +/obj/structure/table, +/obj/item/wirecutters/makeshift, +/obj/item/clothing/sextoy/nipple_clamps, +/obj/item/stock_parts/power_store/cell{ + pixel_x = -5 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/department/security/prison_upper) "pWB" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -83430,10 +83574,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"pXd" = ( -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "pXe" = ( /obj/structure/flora/bush/flowers_br, /obj/machinery/hydroponics/constructable, @@ -84345,24 +84485,6 @@ }, /turf/open/floor/iron, /area/station/engineering/engine_smes) -"qgD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/chair/sofa/bench/right{ - dir = 4 - }, -/obj/structure/railing{ - dir = 10 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/station/commons/dorms) "qgE" = ( /obj/structure/hoop{ dir = 1 @@ -84965,13 +85087,6 @@ "qma" = ( /turf/open/floor/carpet, /area/station/medical/patients_rooms) -"qme" = ( -/obj/structure/railing, -/obj/structure/chair/plastic{ - dir = 8 - }, -/turf/open/floor/iron/dark/side, -/area/station/hallway/primary/upper) "qmi" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -85384,17 +85499,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) -"qpT" = ( -/obj/structure/closet/crate/bin, -/obj/machinery/light/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/item/cigarette/pipe/crackpipe, -/turf/open/floor/iron/kitchen{ - dir = 1 - }, -/area/station/security/prison/upper) "qpU" = ( /obj/structure/closet/secure_closet/brig/genpop, /obj/effect/turf_decal/bot, @@ -86064,19 +86168,18 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"quR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/firealarm/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/door/airlock/public/glass{ - name = "Central Upper Hallway" +"quQ" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 4 }, -/turf/open/floor/iron, -/area/station/hallway/primary/upper) +/obj/structure/railing{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood/parquet, +/area/station/common/night_club) "quW" = ( /obj/structure/showcase/cyborg/old{ pixel_y = 20 @@ -86619,11 +86722,6 @@ "qAu" = ( /turf/open/floor/plating, /area/station/maintenance/central) -"qAA" = ( -/obj/structure/closet/secure_closet/cytology, -/obj/effect/turf_decal/stripes/white/box, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "qAB" = ( /obj/structure/table/glass, /obj/item/reagent_containers/spray/plantbgone{ @@ -87363,11 +87461,6 @@ /obj/item/book/bible, /turf/open/floor/iron/dark, /area/station/security/prison) -"qHe" = ( -/obj/structure/table/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/security/interrogation) "qHg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -87382,13 +87475,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/abandon_exam/cat) -"qHl" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/office) "qHq" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/cable, @@ -87396,6 +87482,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central) +"qHx" = ( +/obj/structure/rack, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/wallframe/camera, +/obj/item/wallframe/camera, +/obj/item/wallframe/camera, +/obj/item/wallframe/camera, +/obj/item/assault_pod/mining, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/auxbase/directional/east, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) "qHy" = ( /obj/effect/spawner/random/structure/crate, /obj/structure/grille/broken, @@ -87897,17 +88002,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"qMQ" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 4; - pixel_y = 0 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/station/service/bar) "qMV" = ( /obj/structure/railing{ dir = 8 @@ -88081,6 +88175,18 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"qOI" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/chair/sofa/corp{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/parquet, +/area/station/common/night_club) "qOJ" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -88619,6 +88725,11 @@ dir = 4 }, /area/station/security/prison) +"qUm" = ( +/obj/structure/table/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) "qUp" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -88649,24 +88760,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/maintenance/abandon_office) -"qUD" = ( -/obj/effect/turf_decal/bot, -/obj/structure/table/reinforced, -/obj/item/stack/sheet/iron{ - amount = 30 - }, -/obj/item/stack/sheet/glass{ - amount = 30 - }, -/obj/item/stack/cable_coil, -/obj/item/screwdriver, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "qUF" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -89315,16 +89408,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/station/science/ordnance/bomb) -"raZ" = ( -/obj/structure/dresser{ - pixel_y = -11 - }, -/obj/structure/mirror{ - pixel_x = 1; - pixel_y = 4 - }, -/turf/closed/wall, -/area/station/common/tailoring) "rba" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, @@ -89768,6 +89851,10 @@ /obj/item/clothing/head/utility/hardhat, /turf/open/floor/plating, /area/station/security/execution/transfer) +"reR" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/space/openspace, +/area/space/nearstation) "reW" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -90246,6 +90333,24 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/dorms) +"rjL" = ( +/obj/structure/railing, +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/iron/dark/side, +/area/station/hallway/primary/upper) +"rjM" = ( +/obj/machinery/door/airlock/research{ + name = "Cytology Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "rjO" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -90490,12 +90595,6 @@ /obj/machinery/holopad, /turf/open/floor/glass/reinforced, /area/station/security/checkpoint/customs/auxiliary) -"rlT" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/space/basic, -/area/space/nearstation) "rlW" = ( /obj/structure/railing{ dir = 8 @@ -90586,22 +90685,6 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"rmG" = ( -/obj/structure/table/wood, -/obj/item/paper/fluff/gateway, -/obj/item/coin/gold{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/phone{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/item/cigarette/pipe{ - pixel_x = -5 - }, -/turf/open/floor/carpet/green, -/area/station/command/heads_quarters/nt_rep) "rmI" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/bot, @@ -90618,6 +90701,15 @@ /obj/machinery/digital_clock/directional/east, /turf/open/floor/wood, /area/station/command/captain_dining) +"rmY" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "rnl" = ( /obj/machinery/gulag_teleporter, /turf/open/floor/iron/dark, @@ -90677,6 +90769,20 @@ }, /turf/open/floor/carpet/green, /area/station/service/abandoned_gambling_den) +"roc" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/computer/cryopod/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/common/cryopods) +"rof" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high/empty, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron, +/area/station/science/research/abandoned) "rog" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -93335,6 +93441,15 @@ }, /turf/closed/wall, /area/station/service/chapel) +"rPv" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "rPy" = ( /obj/machinery/door/airlock/grunge{ name = "Morgue" @@ -93950,6 +94065,10 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central) +"rWh" = ( +/obj/machinery/power/shuttle_engine/huge, +/turf/open/space/openspace, +/area/space/nearstation) "rWk" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -94605,6 +94724,13 @@ dir = 8 }, /area/station/hallway/secondary/command) +"sco" = ( +/obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/computer/security/telescreen/minisat/directional/north, +/turf/open/floor/iron, +/area/station/engineering/transit_tube) "scr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -95282,17 +95408,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"sjn" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 6; - pixel_y = 16 - }, -/obj/item/cigarette{ - pixel_y = 4 - }, -/turf/open/floor/iron/dark/small, -/area/station/cargo/miningdock) "sjq" = ( /turf/open/floor/glass/reinforced, /area/station/security/checkpoint/customs/auxiliary) @@ -96007,25 +96122,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"srh" = ( -/obj/machinery/button/door{ - id = "cargounload"; - name = "Loading Doors"; - pixel_x = 24; - pixel_y = -8 - }, -/obj/machinery/button/door{ - id = "cargoload"; - name = "Loading Doors"; - pixel_x = 24; - pixel_y = 8 - }, -/obj/machinery/computer/cargo{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark/small, -/area/station/cargo/storage) "srj" = ( /obj/effect/turf_decal/delivery, /obj/machinery/space_heater, @@ -96393,6 +96489,24 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/office) +"suA" = ( +/obj/structure/table/wood, +/obj/item/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar, +/obj/item/lighter, +/obj/structure/cable, +/obj/machinery/button/door{ + id = "DetShutters"; + name = "Privacy Shutters"; + pixel_y = 14 + }, +/turf/open/floor/carpet, +/area/station/security/detectives_office) "suE" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -96602,6 +96716,14 @@ /obj/effect/mapping_helpers/airlock/access/all/security/armory, /turf/open/floor/iron/dark, /area/station/security/warden) +"swp" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/science/lab) "swr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -97412,6 +97534,11 @@ /obj/item/target/alien, /turf/open/floor/iron, /area/station/science/ordnance/testlab) +"sEy" = ( +/obj/machinery/light/directional/south, +/obj/machinery/computer/security/telescreen/cmo/directional/south, +/turf/open/floor/carpet/blue, +/area/station/command/heads_quarters/cmo) "sEz" = ( /obj/effect/turf_decal/bot, /obj/machinery/vending/coffee, @@ -98777,6 +98904,18 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/dorms) +"sRw" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/machinery/light/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "sRx" = ( /obj/structure/table, /obj/machinery/power/shuttle_engine/heater{ @@ -98802,6 +98941,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"sRS" = ( +/obj/structure/closet/crate/bin, +/obj/machinery/light/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/item/cigarette/pipe/crackpipe, +/turf/open/floor/iron/kitchen{ + dir = 1 + }, +/area/station/security/prison/upper) "sRV" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -99340,6 +99490,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"sXb" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/obj/machinery/computer/security/telescreen/xeno/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology/control) "sXk" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "lawyerprivacy"; @@ -99519,11 +99675,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/light/colour_cycle/dancefloor_b, /area/station/common/night_club) -"sYH" = ( -/obj/structure/chair/stool/directional/west, -/obj/machinery/computer/security/telescreen/disposals/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "sYK" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -99965,17 +100116,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"tce" = ( -/obj/machinery/computer/monitor{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/minisat/directional/south, -/turf/open/floor/iron/grimy, -/area/station/ai_monitored/turret_protected/aisat_interior) "tcf" = ( /obj/effect/turf_decal/siding/blue, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -100050,14 +100190,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"tcK" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/machinery/newscaster/directional/west, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron, -/area/station/command/teleporter) "tcL" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -100664,16 +100796,6 @@ dir = 4 }, /area/station/security/prison/visit) -"tir" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Server Room" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "tcomms-internal" - }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, -/turf/open/floor/iron, -/area/station/tcommsat/computer) "tis" = ( /obj/effect/spawner/random/trash/mess, /obj/effect/decal/cleanable/dirt{ @@ -101541,10 +101663,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"tsn" = ( -/obj/machinery/smartfridge/organ, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "tso" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -101733,6 +101851,18 @@ }, /turf/open/floor/wood, /area/station/security/prison/mess) +"tuu" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/structure/chair/sofa/corp/left{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood/parquet, +/area/station/common/night_club) "tuv" = ( /obj/machinery/light/small/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -102321,6 +102451,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/upper) +"tzO" = ( +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "tzR" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/structure/extinguisher_cabinet/directional/south, @@ -102672,10 +102806,6 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/aft/upper) -"tCw" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/engine, -/area/station/science/xenobiology) "tCC" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -102714,15 +102844,6 @@ /obj/machinery/duct, /turf/open/floor/wood, /area/station/medical/patients_rooms) -"tCU" = ( -/obj/structure/chair/office/light, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "tCX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -103528,6 +103649,19 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet/black, /area/station/commons/dorms/room5) +"tMn" = ( +/obj/structure/table/glass, +/obj/machinery/cell_charger, +/obj/item/stack/cable_coil, +/obj/item/stock_parts/power_store/cell, +/obj/structure/window/spawner/directional/south, +/obj/effect/turf_decal/tile/purple/half{ + dir = 8 + }, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/science) "tMq" = ( /obj/machinery/computer/slot_machine, /turf/open/floor/eighties, @@ -103694,15 +103828,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/station/security/detectives_office) -"tNv" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "tNx" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 @@ -104039,19 +104164,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood/parquet, /area/station/common/gaskiosk) -"tQt" = ( -/obj/structure/table/glass, -/obj/item/petri_dish{ - pixel_x = 4; - pixel_y = 7 - }, -/obj/item/petri_dish, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "tQu" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -105022,11 +105134,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/upper) -"uaT" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/space/openspace, -/area/space/nearstation) "uaV" = ( /obj/effect/spawner/random/engineering/tool, /turf/open/floor/plating, @@ -106020,19 +106127,6 @@ /obj/effect/landmark/start/librarian, /turf/open/floor/carpet, /area/station/service/library/lounge) -"ukG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Shared Engineering Storage" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/iron, -/area/station/engineering/storage_shared) "ukI" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -107556,12 +107650,6 @@ /obj/effect/spawner/random/armory/bulletproof_armor, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"uzd" = ( -/obj/structure/hoop{ - pixel_y = 17 - }, -/turf/open/floor/iron, -/area/station/security/prison/workout) "uzf" = ( /obj/effect/turf_decal/tile/yellow, /obj/structure/disposalpipe/sorting/mail{ @@ -107992,6 +108080,17 @@ "uDg" = ( /turf/closed/wall, /area/station/security/courtroom) +"uDi" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "tcomms-internal" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/tcommsat/computer) "uDj" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/turf_decal/bot, @@ -108364,20 +108463,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) -"uGO" = ( -/obj/structure/table/wood, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = -3 - }, -/obj/item/cigarette/cigar, -/obj/item/cigarette/pipe{ - pixel_y = 13 - }, -/turf/open/floor/carpet/blue, -/area/station/command/heads_quarters/captain) "uGZ" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet, @@ -108401,18 +108486,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore/upper) -"uHn" = ( -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/purple/half{ - dir = 1 - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/science/xenobiology) "uHo" = ( /obj/effect/turf_decal/weather/sand{ dir = 6 @@ -108503,10 +108576,6 @@ }, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"uIo" = ( -/obj/machinery/power/shuttle_engine/large, -/turf/open/space/openspace, -/area/space/nearstation) "uIp" = ( /obj/machinery/door/airlock/security/glass{ name = "Gear Room" @@ -108687,6 +108756,32 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"uKd" = ( +/obj/structure/showcase/cyborg/old{ + dir = 4; + pixel_x = -9; + pixel_y = 2 + }, +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; + icon_state = "control_stun"; + name = "AI Upload turret control"; + pixel_y = 32 + }, +/obj/item/radio/intercom/directional/north{ + broadcasting = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = -26 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/aiupload/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload_foyer) "uKe" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -108713,15 +108808,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"uKw" = ( -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "uKG" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron, @@ -108734,6 +108820,15 @@ "uKU" = ( /turf/closed/wall/r_wall, /area/station/maintenance/rus_gambling) +"uKW" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/armory/dragnet, +/obj/machinery/camera/directional/south{ + c_tag = "Armory - Interior" + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/security/armory) "uLb" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -108995,6 +109090,10 @@ /obj/structure/window/reinforced/shuttle, /turf/open/floor/grass, /area/station/common/cryopods) +"uNX" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/engine, +/area/station/science/xenobiology) "uNZ" = ( /obj/machinery/ntnet_relay, /turf/open/floor/circuit/telecomms/mainframe, @@ -110524,16 +110623,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) -"vey" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/obj/machinery/computer/station_alert{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/ce/directional/west, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/ce) "veC" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ @@ -110712,22 +110801,6 @@ }, /turf/open/floor/plating/airless, /area/station/security/prison/mess) -"vgo" = ( -/obj/structure/table/reinforced, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 8 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = -3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar, -/turf/open/floor/carpet/red, -/area/station/command/heads_quarters/hos) "vgp" = ( /obj/machinery/porta_turret/lasertag/blue, /obj/structure/window/reinforced/tinted/spawner/directional/east, @@ -110757,17 +110830,6 @@ dir = 4 }, /area/station/ai_monitored/command/storage/eva/upper) -"vgF" = ( -/obj/structure/table/glass, -/obj/item/book/manual/wiki/cytology, -/obj/item/biopsy_tool, -/obj/effect/turf_decal/tile/purple/half{ - dir = 1 - }, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/science/xenobiology) "vgG" = ( /obj/structure/trash_pile, /obj/effect/decal/cleanable/dirt{ @@ -111359,6 +111421,19 @@ /obj/structure/cable, /turf/open/floor/iron/freezer, /area/station/maintenance/abandon_kitchen_upper) +"vlD" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/experimentor{ + pixel_x = -16 + }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white/smooth_corner{ + dir = 8 + }, +/area/station/science/explab) "vlO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -111542,15 +111617,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"vnN" = ( -/obj/structure/table, -/obj/item/wirecutters/makeshift, -/obj/item/clothing/sextoy/nipple_clamps, -/obj/item/stock_parts/power_store/cell{ - pixel_x = -5 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/department/security/prison_upper) "vnO" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, @@ -112398,20 +112464,6 @@ }, /turf/open/floor/iron/dark, /area/station/common/laser_tag) -"vvK" = ( -/obj/machinery/door/airlock/engineering{ - name = "Telecommunications" - }, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, -/obj/effect/mapping_helpers/airlock/access/any/command/general, -/turf/open/floor/iron, -/area/station/tcommsat/computer) "vvP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -112949,13 +113001,6 @@ "vzh" = ( /turf/closed/wall, /area/station/maintenance/department/medical/central) -"vzk" = ( -/obj/machinery/computer/station_alert{ - dir = 1 - }, -/obj/machinery/computer/security/telescreen/research/directional/south, -/turf/open/floor/iron/grimy, -/area/station/ai_monitored/turret_protected/aisat_interior) "vzq" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -113454,6 +113499,12 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/cargo/sorting) +"vEE" = ( +/obj/structure/chair/office/light, +/obj/machinery/light/floor, +/obj/machinery/computer/security/telescreen/tcomms/directional/south, +/turf/open/floor/iron, +/area/station/tcommsat/computer) "vEF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -113702,21 +113753,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"vHs" = ( -/obj/structure/chair/sofa/bench{ - dir = 4 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/commons/dorms) "vHy" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 10 @@ -113874,23 +113910,6 @@ /obj/effect/spawner/random/trash/crushed_can, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/cargo/miningdock) -"vIv" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/bot, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = -7 - }, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = -7; - pixel_y = 4 - }, -/turf/open/floor/iron/dark, -/area/station/commons/storage/primary) "vIy" = ( /mob/living/basic/bot/cleanbot/autopatrol, /obj/structure/cable, @@ -114686,15 +114705,6 @@ }, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/qm) -"vQh" = ( -/obj/structure/table/reinforced, -/obj/effect/spawner/random/armory/dragnet, -/obj/machinery/camera/directional/south{ - c_tag = "Armory - Interior" - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/security/armory) "vQk" = ( /obj/machinery/computer/teleporter{ dir = 1 @@ -114842,12 +114852,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"vRJ" = ( -/obj/structure/chair/plastic{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "vRO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, @@ -114884,6 +114888,23 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) +"vSB" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/bot, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = -7 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = -7; + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) "vSD" = ( /turf/open/floor/iron/dark/side{ dir = 8 @@ -115094,6 +115115,12 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"vUK" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "vUM" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -115227,6 +115254,15 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +"vVU" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "vVV" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -115287,19 +115323,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/upper) -"vWs" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt{ - icon_state = "dirt-flat-1" - }, -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/abandoned_gambling_den) "vWN" = ( /obj/structure/sign/warning/vacuum/external/directional/south, /turf/open/floor/iron, @@ -115357,12 +115380,6 @@ }, /turf/open/floor/carpet, /area/station/service/library/lounge) -"vXF" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "vXK" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -115560,12 +115577,6 @@ }, /turf/open/floor/iron/freezer, /area/station/maintenance/abandon_kitchen_upper) -"vZX" = ( -/obj/structure/musician/piano{ - icon_state = "piano" - }, -/turf/open/floor/wood, -/area/station/service/theater) "vZY" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -116843,6 +116854,24 @@ /obj/effect/mapping_helpers/airlock/access/all/security/court, /turf/open/floor/carpet, /area/station/security/courtroom) +"wkU" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/obj/structure/railing{ + dir = 10 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/station/commons/dorms) "wkY" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/bot, @@ -117816,6 +117845,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/security/prison_upper) +"wtZ" = ( +/obj/structure/cable, +/obj/structure/statue/sandstone/venus, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "wub" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 6 @@ -117903,6 +117942,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/security/prison/upper) +"wuI" = ( +/obj/structure/table/glass, +/obj/item/petri_dish{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/petri_dish, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "wuM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -118046,10 +118098,6 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) -"wvY" = ( -/obj/structure/shipping_container/nanotrasen, -/turf/open/floor/iron/dark/small, -/area/station/cargo/miningdock) "wvZ" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -118119,6 +118167,11 @@ /obj/structure/chair/office/light, /turf/open/floor/iron, /area/station/science/xenobiology) +"wxt" = ( +/obj/structure/cable, +/obj/structure/sign/poster/timeclock_psa/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/common/cryopods) "wxu" = ( /obj/structure/transit_tube/curved/flipped, /turf/open/floor/iron/shuttle/arrivals/airless, @@ -119064,18 +119117,6 @@ /obj/structure/window/spawner/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/upper) -"wFe" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 18; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = 18; - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology/control) "wFh" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/corner{ @@ -119217,10 +119258,6 @@ dir = 1 }, /area/station/commons/fitness) -"wGW" = ( -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "wGZ" = ( /obj/machinery/computer/exoscanner_control{ dir = 1 @@ -119264,26 +119301,6 @@ /obj/machinery/duct, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) -"wHv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/chair/sofa/bench/left{ - dir = 4 - }, -/obj/structure/railing{ - dir = 9 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/station/commons/dorms) "wHw" = ( /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, @@ -120730,25 +120747,6 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark/side, /area/station/maintenance/department/engineering/engine_aft_starboard) -"wWR" = ( -/obj/structure/rack, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/wallframe/camera, -/obj/item/wallframe/camera, -/obj/item/wallframe/camera, -/obj/item/wallframe/camera, -/obj/item/assault_pod/mining, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/auxbase/directional/east, -/turf/open/floor/iron, -/area/station/construction/mining/aux_base) "wWZ" = ( /obj/structure/hedge, /obj/structure/railing/corner, @@ -120846,11 +120844,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit, /area/station/command/gateway) -"wYa" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/south, -/turf/open/space/openspace, -/area/space/nearstation) "wYd" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -121713,12 +121706,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/plating, /area/station/cargo/storage) -"xgy" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "xgE" = ( /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" @@ -121999,6 +121986,10 @@ /obj/machinery/pdapainter/research, /turf/open/floor/wood, /area/station/command/heads_quarters/rd) +"xjE" = ( +/obj/structure/shipping_container/nanotrasen, +/turf/open/floor/iron/dark/small, +/area/station/cargo/miningdock) "xjF" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Cargo Maintenance" @@ -122198,16 +122189,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) -"xlr" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = 2; - pixel_y = 7 - }, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) "xlt" = ( /obj/structure/cable, /turf/open/floor/plating/airless, @@ -122635,6 +122616,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"xqc" = ( +/obj/machinery/door/airlock/engineering{ + name = "Telecommunications" + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/iron, +/area/station/tcommsat/computer) "xqe" = ( /obj/machinery/door/airlock/research{ name = "Telescience Test Chamber" @@ -123121,6 +123116,18 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/science/lab) +"xuI" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "tcomms-internal" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/iron, +/area/station/tcommsat/computer) "xuJ" = ( /turf/open/floor/iron, /area/station/maintenance/department/engineering/engine_aft_port) @@ -124056,11 +124063,6 @@ }, /turf/open/floor/iron/white, /area/station/science/tele_sci) -"xEw" = ( -/obj/structure/cable, -/obj/structure/sign/poster/timeclock_psa/directional/north, -/turf/open/floor/iron/white/textured, -/area/station/common/cryopods) "xEA" = ( /obj/machinery/camera/directional/south{ c_tag = "Prison - Visitation (Prisoner)"; @@ -124134,13 +124136,6 @@ "xFq" = ( /turf/closed/wall/r_wall, /area/station/science/lab) -"xFu" = ( -/obj/structure/railing, -/obj/structure/chair/plastic{ - dir = 4 - }, -/turf/open/floor/iron/dark/side, -/area/station/hallway/primary/upper) "xFw" = ( /obj/machinery/power/terminal{ dir = 8 @@ -126067,19 +126062,6 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"xZp" = ( -/obj/structure/table/reinforced, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high, -/obj/structure/cable, -/obj/machinery/cell_charger, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/ai_monitored/command/storage/eva/upper) "xZs" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Engineering Maintenance" @@ -126362,6 +126344,27 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +"ybw" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) "ybB" = ( /obj/machinery/power/terminal{ dir = 1 @@ -126381,12 +126384,6 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"ybJ" = ( -/obj/machinery/holopad, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/security/telescreen/xeno/directional/south, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology/control) "ybS" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -127273,6 +127270,12 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/main) +"yiY" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) "yja" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, @@ -145174,7 +145177,7 @@ fZI rUF ojX nuU -jwx +cRm fZI fZI fZI @@ -146203,7 +146206,7 @@ jtq tfY ojX nuU -jwx +cRm fZI fZI fZI @@ -148389,7 +148392,7 @@ mjE mjE mjE mjE -nfK +gLI mjE ltN cDn @@ -148471,9 +148474,9 @@ cUE bEW ptO oeQ -kXp -giN -iRV +tuu +qOI +quQ vIV upX hmn @@ -148528,7 +148531,7 @@ kZg kZg wMq ojX -dpN +nri fZI fZI fZI @@ -149560,7 +149563,7 @@ jtq hKw ojX ojX -jwx +cRm fZI fZI fZI @@ -150591,7 +150594,7 @@ sAe pDz ojX nuU -jwx +cRm fZI fZI fZI @@ -151620,7 +151623,7 @@ sAe pDz ojX nuU -jwx +cRm fZI fZI fZI @@ -151795,7 +151798,7 @@ nJc aKq iXC aVJ -raZ +ntx rqt wYH cbs @@ -152111,10 +152114,10 @@ exp ofE ofE nds -jaV +lTz nds vCy -tir +dYL vCy aqZ jPT @@ -152622,20 +152625,20 @@ vVX pLD vaX jjt -vvK +xqc oqU xPO nud nud -cZk +xuI xxh -aHG +jas pFN pFN -aHG +jas pFN -apY -pXd +vEE +tzO nds tku dbY @@ -152648,7 +152651,7 @@ sAe pDz ojX nuU -jwx +cRm fZI fZI fZI @@ -153142,7 +153145,7 @@ fJD rHO mnG vCy -atR +uDi vCy uNZ eHw @@ -153653,7 +153656,7 @@ exp ofE aFb tHn -gRv +pEp pPc nds llL @@ -153679,7 +153682,7 @@ sAe pDz ojX nuU -jwx +cRm fZI fZI fZI @@ -153863,7 +153866,7 @@ oHU qlY sJE jzJ -hqq +gyX qlY tbS oMk @@ -154120,7 +154123,7 @@ kWy qlY qfV jbI -aIR +pKb qlY snu gbw @@ -154329,7 +154332,7 @@ dMN tUg tzJ ylq -lem +cOM fzJ jOn fAw @@ -154586,7 +154589,7 @@ sXy fAw juQ wPb -qHe +qUm udU eya fAw @@ -154709,7 +154712,7 @@ sAe pDz ojX ojX -jwx +cRm fZI fZI fZI @@ -154943,7 +154946,7 @@ tcz eTl hUn vjX -xlr +jyn jWd meh lvJ @@ -155212,7 +155215,7 @@ lzd lzd lzd gON -vey +foz sHR lzd lzd @@ -155439,7 +155442,7 @@ vVX nyD sXZ dAT -wWR +qHx eCU fIw onL @@ -155466,7 +155469,7 @@ lKz jcQ moY qhV -oDa +mWj vkm jIc jIc @@ -155982,7 +155985,7 @@ bRe qhV wTj jmk -nDy +eWM bqH dFZ fhB @@ -156782,7 +156785,7 @@ eFZ eFZ hIY aML -dpN +nri fZI fZI fZI @@ -156907,7 +156910,7 @@ jhS mxi obU lHW -csW +suA awo tez juG @@ -157263,7 +157266,7 @@ lvJ pzm nXx sjf -gJR +hvV pzm ewO iGA @@ -157506,10 +157509,10 @@ uqE kTo hHI osZ -njn +jGw olg dgq -eqL +gAW iGe oQI vKL @@ -157517,11 +157520,11 @@ yaj iGe iGe oQI -ukG +eeX bcy bcy fGR -aue +hdE mWf mWf euM @@ -157785,7 +157788,7 @@ mFy fVb mFy vMA -xgy +vUK etW hNB uTu @@ -158004,7 +158007,7 @@ uXF iYE qAu rMr -iEa +kmb rYf qqM wCf @@ -158025,7 +158028,7 @@ uzo qCU uzo hKV -bJM +bXG dUS xrx eXl @@ -158539,7 +158542,7 @@ wKQ mMT npj rxX -qHl +pHH hMm cZa rxG @@ -159012,7 +159015,7 @@ fuR dyt iQX bJS -vIv +vSB dkN hNX fAB @@ -159183,7 +159186,7 @@ fZI ugq jHk efd -vgo +hhg dSH kac lZg @@ -159574,7 +159577,7 @@ mjw gbf lXc oLA -qUD +lsQ tUT jOV lTd @@ -161059,7 +161062,7 @@ jZJ nge rZM wna -qMQ +dgv kGp mQS nYP @@ -161074,7 +161077,7 @@ qJJ cUu jMU pgb -pjb +nCn oAu vET hPM @@ -161151,7 +161154,7 @@ eFZ eFZ hIY aML -dpN +nri fZI fZI fZI @@ -161258,7 +161261,7 @@ bqj pzw mrb fRD -vQh +uKW gkm bkG lnC @@ -163804,9 +163807,9 @@ fZI xJH xOu lcD -rlT -rlT -rlT +iea +iea +iea gJW xJH fZI @@ -163818,7 +163821,7 @@ gHt mcE nQK xez -kAX +fXg usE qeT ktT @@ -163895,7 +163898,7 @@ wPA wtf bZp qBm -nCe +cTU sJC lUP vms @@ -164576,7 +164579,7 @@ bsG gfW bsG bsG -vXF +jZv fZI tci eAw @@ -165347,7 +165350,7 @@ bsG oek bsG bsG -elo +yiY fZI tci eAw @@ -165657,7 +165660,7 @@ dVy mrV dVy ifi -vRJ +deR xYg dVy pdU @@ -166775,7 +166778,7 @@ nuU nuU fth fYp -fbZ +euL ecj tHX aSG @@ -166788,7 +166791,7 @@ laI aCo vwS sQQ -jJD +byz eGO vLv vLv @@ -168521,7 +168524,7 @@ pMw bJC bQX qfc -srh +pEu uXP eJa axj @@ -168691,7 +168694,7 @@ tfU rKG hcM piQ -vnN +pWA eAw fhV vKf @@ -168762,11 +168765,11 @@ sWA sWA fAl eFp -sYH +guo mqR txp sMx -axh +iAu eFn qIm qyM @@ -168790,15 +168793,15 @@ bld lVQ ktY bDS -wvY +xjE ktY djJ djJ ktY -eud +kev pXg txY -sjn +bxP djJ leG kyD @@ -169019,7 +169022,7 @@ jUp mou jUp ctp -mSh +mPs ocA pbG ejr @@ -169228,7 +169231,7 @@ rtH nes qCL oDC -ozW +afr vwF nes oqT @@ -169259,9 +169262,9 @@ baE dzs rtr ddd -nxX -vWs -nXm +hkw +fsN +eDR tfe rtr rtr @@ -169728,7 +169731,7 @@ eXo lWC ffG hVk -qpT +sRS jGp lkn hiH @@ -171031,7 +171034,7 @@ fYU qkw xxz lSv -uzd +hUp mNQ fhf cxL @@ -171053,7 +171056,7 @@ gqn bhW sDW wPS -hDZ +cIg iss gxF hrK @@ -171259,7 +171262,7 @@ fZI fZI fZI tfU -caa +giN jNq jZy lSv @@ -210711,7 +210714,7 @@ spk hFB ojX ojX -dpE +rWh ulx ulx ulx @@ -210968,7 +210971,7 @@ tcq tcq ojX ojX -aLO +pjT ulx ulx ulx @@ -211740,7 +211743,7 @@ spk hFB ojX ojX -dpE +rWh ulx ulx ulx @@ -211997,7 +212000,7 @@ tcq tcq ojX ojX -aLO +pjT ulx ulx ulx @@ -212254,7 +212257,7 @@ mkZ rkF ojX ojX -aLO +pjT ulx ulx ulx @@ -212769,7 +212772,7 @@ spk hFB ojX ojX -dpE +rWh ulx ulx ulx @@ -213026,7 +213029,7 @@ tcq tcq ojX ojX -aLO +pjT ulx ulx ulx @@ -213283,7 +213286,7 @@ mkZ rkF ojX ojX -aLO +pjT ulx ulx ulx @@ -213711,7 +213714,7 @@ kBa ktQ jtu ktQ -mJA +roc hZy kmq eCV @@ -213964,7 +213967,7 @@ aIi tsS kTV kTV -xEw +wxt tQZ tQZ tQZ @@ -214065,7 +214068,7 @@ iVF lVY wVE ojX -uIo +bTZ ulx ulx ulx @@ -214322,7 +214325,7 @@ iVF sXD wVE ojX -aLO +pjT ulx ulx ulx @@ -216066,7 +216069,7 @@ hDv eVg vBi acy -kwd +vlD xsV iUL xpB @@ -216554,9 +216557,9 @@ xEX tFc jqe vXi -wHv -vHs -qgD +gQO +oWH +wkU vXi iAN vVu @@ -218894,7 +218897,7 @@ ruu quF dqm hOA -meg +kLU xBQ xah pMj @@ -219069,7 +219072,7 @@ pwA qNG qru vmK -htN +bER oDA kNf qYH @@ -219381,7 +219384,7 @@ nVD nVD nVD rYH -mUv +ybw cRb oGK mqh @@ -219400,7 +219403,7 @@ jCN ooa uUk pey -vZX +nKr sTk qjg aZe @@ -219429,7 +219432,7 @@ aOY qZR sCa adx -ote +pfs pzS ipo nBN @@ -219618,7 +219621,7 @@ hSQ fKQ vqW goe -rmG +dmZ oTn qJL ide @@ -219835,7 +219838,7 @@ kNf pcs mYx nBp -bBh +rof bta bCe roC @@ -220217,8 +220220,8 @@ nYY qTC nYY nYY -cfU -tsn +etb +kxI fDT sTz krV @@ -220473,10 +220476,10 @@ prZ aXs fEY nYY -qAA -cKh -uKw -hYw +bet +rPv +rmY +rjM ggt krV paj @@ -220670,7 +220673,7 @@ cRb fKf ipE nCj -tcK +aJC fKf mQo mqh @@ -220730,9 +220733,9 @@ eNZ umx iDx nYY -djV -tNv -cXC +bOZ +vVU +sRw fDT czk fDT @@ -220987,9 +220990,9 @@ mkR gjh pfx nYY -hQy -cSD -uHn +mEE +oGh +eAl krV vcr uWb @@ -221244,9 +221247,9 @@ thj ydp ltW nYY -mxw -tCU -nXR +ndi +fIe +oZs krV miB sWX @@ -221256,8 +221259,8 @@ bDn oKA bDn bDn -lxM -fkw +cXv +cAD fDT euU euU @@ -221501,13 +221504,13 @@ rtX nYY xqe nYY -jyu -tQt -vgF +jmt +wuI +kha krV uxR wvi -aLC +pgs eRv tMs iHQ @@ -221758,7 +221761,7 @@ snw gOs snw nYY -aRF +bRW fDT krV krV @@ -221774,8 +221777,8 @@ oEB cJl pux mzy -lFh -tCw +uNX +mlV euU fcE fDT @@ -221916,7 +221919,7 @@ uNo iiL qzm uzC -mFr +chi dDr xRc gLc @@ -221945,7 +221948,7 @@ xai xai hCo sIz -xFu +rjL cJU aWU mDA @@ -222193,7 +222196,7 @@ wJQ nAH mMZ qES -kCv +eFs hSo hRG pQs @@ -222243,7 +222246,7 @@ mOL sXt wyS cdK -jro +iml vKN uor rtG @@ -222319,19 +222322,19 @@ vXQ vXQ vXQ qYX -fJz -fJz -fJz -fJz -fJz -fJz -fJz -fJz -fJz -fJz -fJz -fJz -fJz +reR +reR +reR +reR +reR +reR +reR +reR +reR +reR +reR +reR +reR ulx ulx ulx @@ -222459,7 +222462,7 @@ fMF njk cyR lRs -qme +cMO cJU aWU fSN @@ -222589,8 +222592,8 @@ van van van hVx -eHs -fJz +dhk +reR ulx ulx ulx @@ -222834,21 +222837,21 @@ duP duP fjw fjw -gox -gox -gox +ocq +ocq +ocq pvi -gox -gox +ocq +ocq pvi -gox -gox +ocq +ocq pvi -wYa +iJi guU van hVx -eHs +dhk ulx ulx ulx @@ -223102,11 +223105,11 @@ dFU ulx czg ulx -gox -wYa +ocq +iJi guU hVx -ojl +oMM ulx ulx ulx @@ -223212,7 +223215,7 @@ duP gRC wZW gwW -xUY +hMR xai wEl vre @@ -223361,9 +223364,9 @@ dFU dFU ulx ulx -wYa +iJi oIO -eHs +dhk ulx ulx ulx @@ -223599,7 +223602,7 @@ gLc fge rRe aHx -pOq +bVF fge szZ ejT @@ -223621,7 +223624,7 @@ czg rHM guU hVx -ojl +oMM ulx ulx ulx @@ -223786,7 +223789,7 @@ mhL aBX aBX czf -jIS +tMn soa rGZ iwv @@ -223876,9 +223879,9 @@ dFU dFU ulx ulx -wYa +iJi oIO -eHs +dhk ulx ulx ulx @@ -224133,10 +224136,10 @@ dFU dFU dFU ulx -uaT +inb ilP hVx -eHs +dhk ulx ulx ulx @@ -224236,7 +224239,7 @@ ckV gJh gBh jiu -eSM +uKd vNL tNU fnq @@ -224394,7 +224397,7 @@ bRf aaG aaG hVx -ojl +oMM ulx ulx ulx @@ -224564,7 +224567,7 @@ tGH gqu kKB taU -oOU +swp jTN pRM suN @@ -224584,8 +224587,8 @@ geG vRO oWi kLg -ybJ -wFe +sXb +gIM byl lap mAg @@ -224604,8 +224607,8 @@ aYz fDT kyV nsy -pdv -fcJ +kzH +sco iyl ldA tgW @@ -224623,7 +224626,7 @@ dZA qyl yiC iQN -vzk +arT fge rEy qnM @@ -224651,7 +224654,7 @@ aaG kSe kSe acJ -ojl +oMM ulx ulx ulx @@ -224880,7 +224883,7 @@ aiq qyl wxK mRw -tce +dgZ fge quW pLF @@ -224908,7 +224911,7 @@ dQF aaG aaG xfa -ojl +oMM ulx ulx ulx @@ -225161,10 +225164,10 @@ dFU dFU dFU ulx -wYa +iJi ilP xfa -mZX +gzx fZI ulx ulx @@ -225418,9 +225421,9 @@ dFU dFU ulx ulx -uaT +inb oIO -mZX +gzx ulx ulx ulx @@ -225514,7 +225517,7 @@ xmO dEJ idB wFN -pwg +maG mrZ jiu jiu @@ -225677,7 +225680,7 @@ czg rHM iub xfa -ojl +oMM ulx ulx ulx @@ -225793,7 +225796,7 @@ iUz sXV auH xFQ -bAx +ojP hsQ nKZ ikt @@ -225931,9 +225934,9 @@ dFU dFU ulx ulx -uaT +inb oIO -mZX +gzx ulx ulx ulx @@ -226066,7 +226069,7 @@ tXu imD cbB bcA -quR +jeS afh eTA xTW @@ -226107,7 +226110,7 @@ cIt aTJ lAM reZ -mlM +lbi lsu drm gxG @@ -226144,7 +226147,7 @@ lLv euU aYz fDT -iuR +czu pVW lrQ lVR @@ -226186,11 +226189,11 @@ dFU ulx czg ulx -fJz -uaT +reR +inb iub xfa -ojl +oMM ulx ulx ulx @@ -226432,21 +226435,21 @@ vXQ vXQ qYX qYX -fJz -fJz -fJz +reR +reR +reR bGK -fJz -fJz +reR +reR bGK -fJz -fJz +reR +reR bGK -uaT +inb iub van xfa -mZX +gzx ulx ulx ulx @@ -226701,8 +226704,8 @@ van van van xfa -mZX -gox +gzx +ocq ulx ulx ulx @@ -226844,7 +226847,7 @@ glI kHl tpR kHl -nqR +eSV eaQ bst frF @@ -226945,19 +226948,19 @@ duP duP duP fjw -gox -gox -gox -gox -gox -gox -gox -gox -gox -gox -gox -gox -gox +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq +ocq ulx ulx ulx @@ -227568,7 +227571,7 @@ qlM npF xjt bIZ -jFV +aLC mbZ duV mbQ @@ -228099,7 +228102,7 @@ aqQ hTp vEz bnU -uGO +fxX uWC kdU gfL @@ -229379,7 +229382,7 @@ heq bVU pTH oLd -kCA +wtZ bTN vtt nwo @@ -229722,7 +229725,7 @@ hDu eoz yjD hJE -lrX +hyk leC dxT xbd @@ -229878,7 +229881,7 @@ loJ soz soz kaj -xZp +bsa qsb atk qsb @@ -231241,7 +231244,7 @@ pSd qoV aQY npE -hiu +jpY hBc jsj hFR @@ -232296,8 +232299,8 @@ scR elb vir qfl -ocK -wGW +jFL +oyb eQK ulx ulx @@ -234371,7 +234374,7 @@ rDS aqy tvm bqk -uIo +bTZ ulx ulx ulx @@ -234574,7 +234577,7 @@ nrv izM xCf eeW -hGr +sEy bcQ kPf sbR @@ -234628,7 +234631,7 @@ kta lQX tvm bqk -aLO +pjT ulx ulx ulx @@ -235143,7 +235146,7 @@ oON oON bqk hMF -dpE +rWh ulx ulx ulx @@ -235400,7 +235403,7 @@ tzf tzf hMF hMF -aLO +pjT ulx ulx ulx @@ -235657,7 +235660,7 @@ rnF rnF bqk hMF -aLO +pjT ulx ulx ulx @@ -236170,7 +236173,7 @@ aqy dpl tvm bqk -uIo +bTZ ulx ulx ulx @@ -236427,7 +236430,7 @@ aqy cIB tvm bqk -aLO +pjT ulx ulx ulx @@ -238988,8 +238991,8 @@ soz soz soz nvJ -aLO -aLO +pjT +pjT ulx ulx ulx @@ -239245,7 +239248,7 @@ nvJ nvJ nvJ nvJ -aLO +pjT ulx ulx ulx diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index c3aa46eb3ba37..52b0c10a65bfc 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -11990,6 +11990,14 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos/pumproom) +"cYM" = ( +/obj/machinery/keycard_auth/directional/north{ + pixel_x = -22 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/incident_display/bridge/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "cYP" = ( /obj/structure/closet/wardrobe/black, /obj/effect/spawner/random/contraband/permabrig_weapon, @@ -24809,6 +24817,12 @@ dir = 1 }, /area/station/hallway/floor4/fore) +"gxo" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "gxr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26859,17 +26873,6 @@ dir = 4 }, /area/station/cargo/miningdock) -"hai" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/stack/sheet/iron/ten, -/obj/item/circuitboard/machine/exoscanner, -/obj/item/circuitboard/machine/exoscanner, -/obj/item/circuitboard/machine/exoscanner, -/turf/open/floor/iron/corner, -/area/station/cargo/drone_bay) "haj" = ( /obj/effect/landmark/start/psychologist, /turf/open/floor/iron/white/small{ @@ -30642,6 +30645,13 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/open/floor/pod/light, /area/station/maintenance/floor1/port/aft) +"hXH" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer2{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "hXI" = ( /obj/structure/chair/wood{ dir = 1 @@ -38735,19 +38745,6 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/iron/dark, /area/station/hallway/floor2/fore) -"kcT" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/cargo/storage) "kcZ" = ( /obj/effect/turf_decal/delivery, /obj/structure/table/reinforced, @@ -38995,14 +38992,6 @@ dir = 1 }, /area/station/hallway/floor1/aft) -"kfg" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater{ - dir = 1; - piping_layer = 2 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/engineering/atmos) "kfm" = ( /obj/effect/turf_decal/trimline/purple, /obj/machinery/airalarm/directional/south, @@ -42260,14 +42249,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain) -"kWD" = ( -/obj/machinery/keycard_auth/directional/north{ - pixel_x = -22 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/incident_display/delam/directional/north, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "kWJ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -50942,6 +50923,16 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"nfi" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Treatment Center"; + name = "medbay camera"; + network = list("ss13","medbay") + }, +/obj/machinery/shower/directional/south, +/obj/structure/fluff/shower_drain, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) "nfm" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -53366,13 +53357,6 @@ dir = 4 }, /area/station/hallway/floor3/aft) -"nJb" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/heater{ - dir = 1; - piping_layer = 2 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "nJk" = ( /obj/effect/turf_decal/trimline/purple/line{ dir = 1 @@ -57478,6 +57462,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/pod/light, /area/station/maintenance/floor2/port/aft) +"oNi" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer4{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "oNn" = ( /obj/structure/bed/double, /obj/item/bedsheet/cosmos/double, @@ -66655,6 +66646,26 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/hallway/floor4/aft) +"rez" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/south, +/obj/item/fuel_pellet{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/fuel_pellet, +/obj/item/fuel_pellet{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/structure/rack, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/corner{ + dir = 1 + }, +/area/station/cargo/drone_bay) "reD" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 8 @@ -67444,6 +67455,20 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"rqd" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/sign/departments/exodrone/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) "rqf" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -69909,27 +69934,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/station/service/hydroponics) -"sbB" = ( -/obj/effect/turf_decal/stripes{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/south, -/obj/item/fuel_pellet{ - pixel_x = -4; - pixel_y = -2 - }, -/obj/item/fuel_pellet, -/obj/item/fuel_pellet{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/structure/rack, -/obj/machinery/firealarm/directional/east, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/corner{ - dir = 1 - }, -/area/station/cargo/drone_bay) "sbI" = ( /obj/structure/flora/bush/snow/style_random, /turf/open/misc/snow/actually_safe{ @@ -71007,6 +71011,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/textured_large, /area/station/cargo/storage) +"ssc" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "ssi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -78118,14 +78128,6 @@ }, /turf/open/floor/iron/checker, /area/station/commons/vacant_room/commissary) -"uhC" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1; - piping_layer = 2 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) "uhF" = ( /obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -78262,14 +78264,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/medical/surgery/fore) -"ujl" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1; - piping_layer = 4 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/pumproom) "ujr" = ( /obj/effect/turf_decal/trimline/green/warning{ dir = 8 @@ -78589,13 +78583,6 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/science/breakroom) -"unQ" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - piping_layer = 2 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "unV" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/siding/wideplating, @@ -79690,6 +79677,18 @@ }, /turf/open/floor/engine/airless, /area/station/engineering/supermatter/waste) +"uEv" = ( +/obj/effect/turf_decal/stripes{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/stack/sheet/iron/ten, +/obj/item/circuitboard/machine/exoscanner, +/obj/item/circuitboard/machine/exoscanner, +/obj/item/circuitboard/machine/exoscanner, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/corner, +/area/station/cargo/drone_bay) "uED" = ( /obj/effect/turf_decal/tile/yellow/half, /obj/machinery/light/small/directional/east, @@ -85479,6 +85478,13 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/floor4/port/fore) +"vZY" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 1 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/pumproom) "wat" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 8 @@ -90784,16 +90790,6 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/security/lockers) -"xqZ" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Treatment Center"; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/obj/machinery/shower/directional/south, -/obj/structure/fluff/shower_drain, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) "xrh" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -118551,7 +118547,7 @@ lyB yef wZu vTt -hai +uEv aQK uhw rhs @@ -118808,7 +118804,7 @@ gHw hDa fyg xxQ -sbB +rez aQK jUP prt @@ -119322,7 +119318,7 @@ oKT xsL vDw dty -kcT +rqd eOz eOz onX @@ -138091,7 +138087,7 @@ kIe fxo uvD ocv -kfg +hXH rBP iTu iko @@ -138348,7 +138344,7 @@ blI gkx xeO vsL -nJb +ssc rBP fxd haK @@ -142723,7 +142719,7 @@ vxz csf buQ nPZ -uhC +vZY oIy tyQ iPN @@ -142980,7 +142976,7 @@ eNk qNf jaK aLh -ujl +oNi oIy yli jCD @@ -197480,7 +197476,7 @@ voB pZZ gBz sRR -xqZ +nfi jTK dzM dzM @@ -309265,7 +309261,7 @@ xJp uxw xjX aNs -kWD +cYM sZO rlJ nKL @@ -315672,7 +315668,7 @@ crp crp dWz lYx -unQ +gxo wMU aaN pGz diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 8f8ecbabb67f2..be9b81ba9f0c0 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -158,19 +158,6 @@ dir = 4 }, /area/station/medical/treatment_center) -"ada" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/railing{ - dir = 9 - }, -/obj/structure/table/reinforced/rglass, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/dropper, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/pharmacy) "ade" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -868,6 +855,15 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"amL" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high/empty, +/turf/open/floor/iron/smooth_edge, +/area/station/engineering/lobby) "amO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -1229,6 +1225,16 @@ /obj/structure/spider/stickyweb, /turf/open/floor/iron/smooth, /area/station/maintenance/aft/greater) +"asj" = ( +/obj/effect/turf_decal/trimline/dark_red/warning{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/poster/timeclock_psa/directional/south, +/turf/open/floor/iron/small, +/area/station/hallway/primary/central) "asr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -1561,35 +1567,6 @@ /obj/structure/chair/office, /turf/open/floor/glass/reinforced, /area/station/security/office) -"axn" = ( -/obj/structure/table, -/obj/item/storage/medkit/o2{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/o2, -/obj/item/storage/medkit/regular{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/digital_clock/directional/north{ - pixel_y = 37 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled, -/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner, -/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/storage) "axx" = ( /obj/structure/window/spawner/directional/south, /obj/structure/flora/bush/sparsegrass, @@ -2133,6 +2110,12 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) +"aFq" = ( +/obj/effect/turf_decal/bot, +/obj/structure/rack, +/obj/item/stock_parts/power_store/cell/potato, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/aft) "aFv" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/white/smooth_large, @@ -2925,15 +2908,6 @@ "aRC" = ( /turf/open/floor/carpet/green, /area/station/commons/dorms) -"aRG" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/effect/turf_decal/stripes/red/corner, -/obj/machinery/computer/security/telescreen/ordnance/directional/west, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/science/ordnance/testlab) "aRQ" = ( /obj/structure/chair/office, /turf/open/floor/iron/grimy, @@ -3017,26 +2991,6 @@ "aSS" = ( /turf/closed/wall/r_wall, /area/station/engineering/power_room) -"aTe" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 8; - initialize_directions = 4; - name = "euthanization chamber freezer" - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/machinery/button/door/directional/east{ - id = "xenobio5"; - name = "Xenobio Pen 5 Blast DOors"; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "aTo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, @@ -3201,6 +3155,19 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"aVq" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/structure/disposaloutlet{ + name = "Prisoner Doomp" + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/brig) "aVN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3512,12 +3479,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/stairs/medium, /area/station/cargo/storage) -"aYU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/light/cold/directional/west, -/obj/machinery/computer/security/telescreen/tcomms/directional/west, -/turf/open/floor/engine, -/area/station/tcommsat/computer) "aZb" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/flowers_pp/style_random, @@ -3751,6 +3712,27 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/lobby) +"bbW" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/engineering/glass{ + name = "Shared Engineering Storage" + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/storage_shared) "bcf" = ( /obj/structure/table_frame, /turf/open/floor/iron/smooth, @@ -3949,6 +3931,23 @@ }, /turf/open/floor/iron/large, /area/station/security/courtroom) +"bee" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/table/reinforced/rglass, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/structure/noticeboard/staff{ + dir = 8; + pixel_x = -32 + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 10 + }, +/obj/effect/turf_decal/tile/blue/half{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "bem" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4153,6 +4152,14 @@ }, /turf/closed/wall/r_wall, /area/station/science/xenobiology) +"biD" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/engine, +/area/station/science/xenobiology) "biU" = ( /obj/structure/table, /obj/item/clipboard, @@ -4240,11 +4247,6 @@ /obj/machinery/vending/drugs, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) -"bkE" = ( -/obj/structure/table/wood/poker, -/obj/item/cigarette/pipe, -/turf/open/floor/iron/grimy, -/area/station/commons/lounge) "bkF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -4818,6 +4820,14 @@ /obj/item/flashlight, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) +"bul" = ( +/obj/structure/flora/bush/sparsegrass, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/grass, +/area/station/medical/virology) "bup" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -5454,17 +5464,6 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/small, /area/station/hallway/secondary/exit/departure_lounge) -"bEf" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 1; - height = 13; - name = "arrivals"; - shuttle_id = "arrivals_stationary"; - width = 5 - }, -/turf/open/space/basic, -/area/space) "bEm" = ( /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 8 @@ -5495,24 +5494,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/station/hallway/primary/aft) -"bED" = ( -/obj/machinery/firealarm/directional/south, -/obj/machinery/light/warm/directional/south, -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/item/storage/toolbox/electrical{ - pixel_y = 7 - }, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = -4; - pixel_y = -5 - }, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = 8; - pixel_y = -5 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/atmos) "bES" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad/secure, @@ -5908,28 +5889,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/science/xenobiology) -"bMu" = ( -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -8; - pixel_y = -3 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4.5 - }, -/obj/item/cigarette/cigar/havana{ - pixel_x = 3 - }, -/obj/item/cigarette/cigar/cohiba{ - pixel_x = 6 - }, -/obj/item/flashlight/lamp{ - pixel_x = -5; - pixel_y = 13 - }, -/obj/structure/table/reinforced/plastitaniumglass, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/hos) "bMB" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -6209,19 +6168,6 @@ "bPZ" = ( /turf/closed/wall, /area/station/service/cafeteria) -"bQa" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Telecomms Foyer" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination/tcomms, -/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, -/obj/effect/mapping_helpers/airlock/access/any/command/general, -/turf/open/floor/engine, -/area/station/tcommsat/computer) "bQd" = ( /obj/machinery/door/airlock/public/glass{ name = "Departures" @@ -6396,12 +6342,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/abandoned) -"bST" = ( -/obj/structure/sign/nanotrasen{ - pixel_x = 32 - }, -/turf/open/space/basic, -/area/space/nearstation) "bSV" = ( /obj/machinery/suit_storage_unit/engine, /obj/effect/turf_decal/box, @@ -6827,17 +6767,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/maintenance/port/fore) -"cba" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/iron/smooth, -/area/station/maintenance/starboard/fore) "cbf" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/any/service/kitchen, @@ -6850,21 +6779,6 @@ /obj/effect/landmark/navigate_destination/kitchen, /turf/open/floor/iron/large, /area/station/service/kitchen) -"cbj" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/window/reinforced/spawner/directional/west{ - pixel_x = -4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/medical/medbay/lobby) "cbr" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/green/filled/line, @@ -7280,6 +7194,22 @@ "cgZ" = ( /turf/closed/wall, /area/station/maintenance/port/greater) +"chg" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/storage/photo_album, +/obj/item/camera{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/minisat/directional/west, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "chq" = ( /obj/structure/chair/office{ dir = 8 @@ -7971,6 +7901,10 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/pumproom) +"crN" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/engine, +/area/station/science/xenobiology) "csd" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -8195,17 +8129,6 @@ dir = 1 }, /area/station/hallway/primary/aft) -"cvX" = ( -/obj/structure/table, -/obj/item/stack/cable_coil{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stack/cable_coil, -/obj/item/stock_parts/power_store/battery/high, -/obj/machinery/light/small/directional/east, -/turf/open/floor/pod/dark, -/area/station/engineering/storage/tech) "cwa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8448,6 +8371,26 @@ }, /turf/open/floor/iron/smooth, /area/station/security/checkpoint/engineering) +"czH" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/east{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast DOors"; + req_access = list("xenobiology") + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/science/xenobiology) "cAd" = ( /obj/effect/turf_decal/stripes/box, /obj/machinery/power/shieldwallgen/anchored{ @@ -8566,6 +8509,14 @@ "cBk" = ( /turf/closed/wall, /area/station/cargo/bitrunning/den) +"cBN" = ( +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/atmos) "cBU" = ( /obj/structure/chair/comfy/beige{ dir = 1 @@ -8919,6 +8870,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/wood, /area/station/commons/vacant_room/office) +"cHg" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/hop) "cHh" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 @@ -9333,6 +9290,17 @@ /obj/item/knife/plastic, /turf/open/floor/iron/dark, /area/station/security/prison/mess) +"cNU" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/fore) "cOd" = ( /obj/structure/sign/poster/official/space_cops/directional/east, /obj/structure/cable, @@ -9538,28 +9506,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/grass, /area/station/service/chapel) -"cQD" = ( -/obj/item/clothing/shoes/magboots{ - pixel_x = -4 - }, -/obj/item/clothing/shoes/magboots{ - pixel_x = 3 - }, -/obj/item/clothing/shoes/magboots{ - pixel_y = 4 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/rack/shelf, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 5 - }, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/eva) "cQG" = ( /obj/structure/railing{ dir = 8 @@ -9770,10 +9716,6 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/aft) -"cUE" = ( -/obj/structure/sign/warning/secure_area/directional/north, -/turf/open/space/basic, -/area/space/nearstation) "cUH" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -9820,17 +9762,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white/smooth_large, /area/station/security/medical) -"cVv" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 6 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "cVF" = ( /turf/open/floor/iron/small, /area/station/hallway/primary/central) @@ -10178,6 +10109,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/large, /area/station/service/theater) +"daO" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/bot, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/lightreplacer, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/atmos) "daQ" = ( /obj/machinery/modular_computer/preset/civilian{ dir = 4 @@ -11074,6 +11012,12 @@ }, /turf/open/floor/iron/white/diagonal, /area/station/science/xenobiology) +"dnO" = ( +/mob/living/carbon/human/species/monkey, +/obj/structure/flora/bush/sparsegrass, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/grass, +/area/station/medical/virology) "dnW" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp{ @@ -11348,6 +11292,28 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth, /area/station/science/research/abandoned) +"dsV" = ( +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -8; + pixel_y = -3 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4.5 + }, +/obj/item/cigarette/cigar/havana{ + pixel_x = 3 + }, +/obj/item/cigarette/cigar/cohiba{ + pixel_x = 6 + }, +/obj/item/flashlight/lamp{ + pixel_x = -5; + pixel_y = 13 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/carpet/royalblack, +/area/station/command/heads_quarters/hos) "dsW" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/large, @@ -12257,14 +12223,6 @@ }, /turf/closed/wall, /area/station/maintenance/starboard/lesser) -"dGc" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/chair{ - dir = 1; - name = "Accused" - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/courtroom) "dGf" = ( /obj/effect/turf_decal/siding/wood/end{ dir = 8 @@ -12796,13 +12754,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/dark/smooth_corner, /area/station/hallway/secondary/command) -"dLN" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/machinery/computer/security/telescreen/cmo/directional/south, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/cmo) "dLP" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/window/reinforced/spawner/directional/south, @@ -14476,18 +14427,6 @@ }, /turf/open/floor/iron/dark/smooth_edge, /area/station/security/prison) -"ehR" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 10 - }, -/obj/structure/table/glass, -/obj/item/knife/kitchen, -/obj/item/wrench, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "ehU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -14843,11 +14782,6 @@ }, /turf/open/floor/grass, /area/station/hallway/primary/central/fore) -"emJ" = ( -/obj/machinery/light/cold/directional/south, -/obj/machinery/computer/security/telescreen/minisat/directional/south, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/foyer) "emO" = ( /obj/structure/rack, /obj/item/circuitboard/machine/exoscanner{ @@ -15211,10 +15145,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/large, /area/station/hallway/primary/fore) -"esz" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/engine, -/area/station/science/xenobiology) "esD" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 10 @@ -15337,6 +15267,11 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/white/smooth_large, /area/station/hallway/primary/fore) +"euI" = ( +/obj/structure/table/wood/poker, +/obj/item/cigarette/pipe, +/turf/open/floor/iron/grimy, +/area/station/commons/lounge) "evd" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ @@ -15658,6 +15593,10 @@ /obj/structure/flora/bush/flowers_br/style_3, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) +"ezm" = ( +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/space/basic, +/area/space/nearstation) "ezu" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -16129,6 +16068,10 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/smooth_large, /area/station/hallway/secondary/entry) +"eFu" = ( +/obj/machinery/power/shuttle_engine/huge, +/turf/open/space/basic, +/area/space/nearstation) "eFE" = ( /obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -16279,6 +16222,22 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron/smooth_edge, /area/station/science/ordnance/testlab) +"eHk" = ( +/obj/structure/table/reinforced, +/obj/item/stack/package_wrap, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/cable_coil, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/smooth, +/area/station/construction/mining/aux_base) "eHu" = ( /obj/machinery/air_sensor/air_tank, /turf/open/floor/engine/air, @@ -16483,12 +16442,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/station/maintenance/rus_gambling) -"eKz" = ( -/obj/structure/flora/bush/sparsegrass, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/grass, -/area/station/medical/virology) "eKU" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/flora/bush/lavendergrass, @@ -16525,22 +16478,6 @@ dir = 4 }, /area/station/engineering/main) -"eLG" = ( -/obj/item/stack/sheet/iron/fifty, -/obj/item/stack/rods/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/stack/sheet/mineral/plasma{ - amount = 30 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/closet/crate/engineering, -/turf/open/floor/engine, -/area/station/engineering/main) "eLH" = ( /obj/machinery/door/airlock/research{ name = "Research Division Access" @@ -16727,32 +16664,6 @@ dir = 1 }, /area/station/commons/storage/primary) -"eOB" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/clothing/glasses/sunglasses{ - pixel_y = 12 - }, -/obj/machinery/button/door/directional/east{ - id = "brigprison"; - name = "Prison Lockdown"; - req_access = list("brig") - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/computer/security/telescreen/isolation/directional/north, -/turf/open/floor/iron/dark, -/area/station/security/corrections_officer) "eOF" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -17003,20 +16914,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/pod/dark, /area/station/service/chapel) -"eSK" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio7"; - name = "Xenobio Pen 7 Blast Door" - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "eTa" = ( /turf/open/floor/wood, /area/station/security/prison/garden) @@ -17105,6 +17002,13 @@ }, /turf/open/floor/iron/smooth_large, /area/station/hallway/primary/aft) +"eUs" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/cable, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/engine, +/area/station/science/xenobiology) "eUu" = ( /obj/docking_port/stationary/public_mining_dock{ dir = 2 @@ -17248,6 +17152,15 @@ /obj/effect/spawner/liquids_spawner, /turf/open/floor/iron/pool, /area/station/common/pool) +"eWi" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/stripes/red/corner, +/obj/machinery/computer/security/telescreen/ordnance/directional/west, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/science/ordnance/testlab) "eWs" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17314,28 +17227,6 @@ dir = 8 }, /area/station/security/office) -"eXE" = ( -/obj/machinery/computer/cargo{ - dir = 8 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Cargo Bay - Starboard"; - name = "cargo camera" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/button/door/directional/east{ - id = 68; - name = "Unloading Doors"; - pixel_y = 6 - }, -/obj/machinery/button/door/directional/east{ - id = 69; - name = "Loading Doors"; - pixel_y = -6 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/storage) "eXK" = ( /obj/structure/closet/toolcloset, /obj/item/clothing/gloves/color/yellow, @@ -17611,11 +17502,6 @@ }, /turf/open/floor/plating, /area/station/security/holding_cell) -"fbM" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "fbO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17983,6 +17869,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/service/library) +"fiC" = ( +/obj/structure/table, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stock_parts/power_store/cell/emproof{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/effect/turf_decal/bot, +/obj/item/clothing/glasses/meson/engine, +/obj/item/storage/box/bandages{ + pixel_x = 4; + pixel_y = 5 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/main) "fiN" = ( /turf/closed/wall/r_wall, /area/station/medical/chemistry) @@ -19434,14 +19338,6 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/wood/large, /area/station/commons/fitness/recreation/entertainment) -"fEV" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/flora/bush/sunny, -/mob/living/carbon/human/species/monkey, -/obj/structure/sign/poster/official/fruit_bowl/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/grass, -/area/station/science/genetics) "fEX" = ( /obj/structure/window/reinforced/plasma/spawner/directional/south, /obj/structure/window/reinforced/plasma/spawner/directional/west, @@ -19453,16 +19349,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) -"fEZ" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/north, -/turf/open/floor/wood/large, -/area/station/security/courtroom) "fFe" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/smooth_large, @@ -19638,25 +19524,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) -"fIS" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/west{ - id = "xenobio2"; - name = "Xenobio Pen 2 Blast Door"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "fIW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/barricade/wooden/crude, @@ -19878,18 +19745,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) -"fNp" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/door/window/right/directional/north{ - name = "Warehouse Deliveries"; - req_access = list("cargo") - }, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/warehouse) "fNt" = ( /obj/effect/decal/cleanable/dirt, /obj/item/paper/crumpled/fluff{ @@ -19959,6 +19814,21 @@ /obj/item/crowbar/red, /turf/open/floor/iron/white, /area/station/medical/virology) +"fOh" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 7 + }, +/obj/item/gun/energy/laser/practice, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/turf/open/floor/engine, +/area/station/security/range) "fOm" = ( /obj/effect/turf_decal/trimline/brown/filled/corner, /obj/structure/disposalpipe/segment{ @@ -20387,6 +20257,23 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/commons/lounge) +"fVm" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/structure/rack, +/obj/item/storage/box/syringes{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/storage/box/beakers{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "fVn" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -20500,22 +20387,19 @@ dir = 6 }, /area/station/service/chapel) -"fWX" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/structure/rack, -/obj/item/storage/box/syringes{ - pixel_x = -4; - pixel_y = 4 +"fWQ" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, -/obj/item/storage/box/beakers{ - pixel_x = 6; - pixel_y = 10 +/obj/effect/turf_decal/box, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/white, +/turf/open/floor/engine, /area/station/science/xenobiology) "fXl" = ( /obj/docking_port/stationary/random{ @@ -20971,6 +20855,26 @@ "gei" = ( /turf/open/floor/iron/large, /area/station/hallway/primary/central/aft) +"geo" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/machinery/recharger{ + pixel_x = -7; + pixel_y = 3 + }, +/obj/machinery/computer/security/telescreen/prison/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/warden) "gep" = ( /obj/effect/turf_decal/bot, /obj/machinery/telecomms/server/presets/common, @@ -20990,32 +20894,6 @@ }, /turf/open/floor/wood, /area/station/commons/dorms) -"geI" = ( -/obj/structure/table, -/obj/item/storage/medkit/brute{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/brute, -/obj/item/storage/medkit/regular{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/status_display/ai/directional/west, -/obj/effect/turf_decal/trimline/purple/filled, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/storage) "geK" = ( /obj/machinery/mecha_part_fabricator, /obj/machinery/light_switch/directional/north{ @@ -21240,18 +21118,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/vault, /area/station/ai_monitored/turret_protected/ai) -"gis" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/east, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/electrical) "git" = ( /obj/machinery/airalarm/directional/west, /obj/structure/table, @@ -21699,6 +21565,12 @@ "gmz" = ( /turf/closed/wall, /area/station/service/hydroponics/garden/abandoned) +"gmB" = ( +/obj/structure/flora/bush/sparsegrass, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/grass, +/area/station/medical/virology) "gmD" = ( /obj/effect/turf_decal/tile/dark/fourcorners, /obj/effect/turf_decal/stripes/line{ @@ -22234,38 +22106,6 @@ }, /turf/open/floor/iron/white/smooth_edge, /area/station/medical/medbay/central) -"guG" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Bridge - Starboard"; - name = "command camera" - }, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 6 - }, -/obj/structure{ - density = 1; - icon = 'icons/obj/machines/shuttle_manipulator.dmi'; - icon_state = "hologram_on"; - light_color = "#2cb2e8"; - light_range = 2; - mouse_opacity = 0; - name = "holographic projection"; - pixel_x = -32; - pixel_y = 17 - }, -/obj/structure{ - desc = "This is the ship we're on. It's amazing what Nanotrasen can do once they actually put more than ten seconds of effort into their projects."; - icon = 'icons/obj/machines/shuttle_manipulator.dmi'; - icon_state = "hologram_whiteship"; - light_color = "#2cb2e8"; - light_range = 7; - name = "Ship Hologram"; - pixel_x = -32; - pixel_y = 27 - }, -/obj/machinery/incident_display/delam/directional/south, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "guX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22327,14 +22167,6 @@ dir = 4 }, /area/station/medical/virology) -"gvC" = ( -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/bot, -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/aisat/atmos) "gvG" = ( /turf/open/floor/engine, /area/station/science/auxlab/firing_range) @@ -22723,6 +22555,20 @@ /obj/structure/cable/layer3, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) +"gBQ" = ( +/obj/machinery/chem_dispenser, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/chemistry) "gCm" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4 @@ -23906,6 +23752,17 @@ "gRN" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/foyer) +"gRR" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/radio/intercom/directional/north, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/command/teleporter) "gSd" = ( /obj/structure/railing/corner, /obj/structure/disposalpipe/segment, @@ -24395,6 +24252,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) +"gYT" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/window/reinforced/spawner/directional/west{ + pixel_x = -4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/medical/medbay/lobby) "gZb" = ( /obj/structure/lattice/catwalk, /obj/structure/closet/crate, @@ -24427,27 +24299,6 @@ /obj/structure/trash_pile, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) -"had" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/west{ - id = "xenobio4"; - name = "Xenobio Pen 4 Blast Door"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "hae" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25183,6 +25034,17 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/iron, /area/station/commons/lounge) +"hjR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 6 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "hjT" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -25444,6 +25306,25 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) +"hnT" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/button/door/directional/east{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast DOors"; + req_access = list("xenobiology") + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/science/xenobiology) "hnU" = ( /obj/effect/turf_decal/tile/dark/fourcorners, /obj/structure/fluff/metalpole/anchor{ @@ -25498,6 +25379,23 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/commons/storage/art) +"hpd" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/box, +/obj/machinery/button/door/directional/west{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "hpe" = ( /turf/open/floor/iron/smooth_large, /area/station/security/checkpoint/engineering) @@ -25559,12 +25457,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) -"hqA" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/plating, -/area/space/nearstation) "hqJ" = ( /obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes/line{ @@ -25984,6 +25876,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) +"hxg" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/obj/item/stock_parts/matter_bin{ + pixel_x = -10; + pixel_y = 4 + }, +/obj/item/stock_parts/matter_bin{ + pixel_x = 2; + pixel_y = 7 + }, +/obj/item/stock_parts/micro_laser{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/flatpack, +/turf/open/floor/iron/white/smooth_edge, +/area/station/science/lab) "hxh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26129,6 +26041,28 @@ "hzk" = ( /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/hfr_room) +"hzl" = ( +/obj/machinery/computer/cargo{ + dir = 8 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Cargo Bay - Starboard"; + name = "cargo camera" + }, +/obj/effect/turf_decal/bot, +/obj/machinery/button/door/directional/east{ + id = 68; + name = "Unloading Doors"; + pixel_y = 6 + }, +/obj/machinery/button/door/directional/east{ + id = 69; + name = "Loading Doors"; + pixel_y = -6 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/storage) "hzm" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -26417,6 +26351,13 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) +"hBZ" = ( +/obj/machinery/pdapainter/research, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/bot, +/obj/machinery/computer/security/telescreen/rd/directional/north, +/turf/open/floor/iron/white/smooth_large, +/area/station/command/heads_quarters/rd) "hCh" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -26737,6 +26678,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/aft) +"hGn" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/pod/dark, +/area/station/service/chapel/funeral) "hGq" = ( /obj/structure/chair/office{ dir = 1 @@ -26869,6 +26814,18 @@ }, /turf/open/floor/iron/smooth, /area/station/science/ordnance/storage) +"hIy" = ( +/obj/structure/flora/bush/lavendergrass, +/obj/structure/window/reinforced/spawner/directional/west, +/mob/living/carbon/human/species/monkey, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/right/directional/south{ + name = "Monkey Pen"; + req_access = list("genetics") + }, +/turf/open/floor/grass, +/area/station/science/genetics) "hIA" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain) @@ -27609,6 +27566,21 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) +"hTQ" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/conveyor{ + id = "cargodisposals" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/camera/directional/west{ + c_tag = "Cargo Bay - Delivery Office Port"; + name = "cargo camera" + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/sorting) "hTW" = ( /obj/structure/closet/secure_closet/atmospherics, /obj/effect/turf_decal/delivery, @@ -27697,10 +27669,6 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/iron/white/diagonal, /area/station/medical/medbay/central) -"hUQ" = ( -/obj/structure/sign/warning/biohazard/directional/east, -/turf/open/space/basic, -/area/space/nearstation) "hUR" = ( /obj/structure/tank_holder/extinguisher, /turf/open/floor/iron/smooth, @@ -27774,6 +27742,32 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth_large, /area/station/maintenance/department/engine/atmos/lesser) +"hWm" = ( +/obj/structure/table, +/obj/item/storage/medkit/brute{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/status_display/ai/directional/west, +/obj/effect/turf_decal/trimline/purple/filled, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) "hWF" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 @@ -27782,26 +27776,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_edge, /area/station/security/prison) -"hXe" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/obj/item/stock_parts/matter_bin{ - pixel_x = -10; - pixel_y = 4 - }, -/obj/item/stock_parts/matter_bin{ - pixel_x = 2; - pixel_y = 7 - }, -/obj/item/stock_parts/micro_laser{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/flatpack, -/turf/open/floor/iron/white/smooth_edge, -/area/station/science/lab) "hXj" = ( /obj/machinery/rnd/production/circuit_imprinter, /obj/item/radio/intercom/directional/west, @@ -27829,14 +27803,6 @@ /obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/pod/dark, /area/station/service/chapel) -"hXI" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - piping_layer = 2 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/smooth_edge, -/area/station/science/ordnance) "hXP" = ( /obj/structure/table, /obj/item/restraints/handcuffs/cable/red, @@ -28295,6 +28261,17 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/upper) +"ifj" = ( +/obj/effect/turf_decal/siding/dark_blue/corner, +/obj/machinery/shuttle_manipulator{ + desc = "A holographic display of the ship we're on right now."; + name = "ship holographic display" + }, +/obj/effect/turf_decal/tile/blue/half{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "ifq" = ( /turf/closed/wall/r_wall, /area/station/medical/pharmacy) @@ -28314,46 +28291,6 @@ }, /turf/open/floor/iron/white/small, /area/station/common/pool) -"ige" = ( -/obj/structure/table/reinforced, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/flashlight/seclite, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas/sechailer{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/storage/lockbox/loyalty{ - pixel_y = -11 - }, -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/item/storage/box/flashbangs{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/box/teargas{ - pixel_x = 6; - pixel_y = -6 - }, -/turf/open/floor/engine, -/area/station/ai_monitored/security/armory) "igk" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/effect/landmark/start/chaplain, @@ -28380,10 +28317,6 @@ "igv" = ( /turf/closed/wall/r_wall, /area/station/security/prison/work) -"igO" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/pod/dark, -/area/station/service/chapel/funeral) "ihg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -28731,6 +28664,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port) +"imd" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/computer/security/telescreen/cmo/directional/south, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/cmo) "imh" = ( /obj/structure/sign/departments/xenobio/directional/west, /obj/item/kirbyplants/monkey, @@ -29182,12 +29122,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) -"irl" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/station/command/heads_quarters/qm) "irm" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, @@ -29287,6 +29221,24 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/prison) +"iso" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/suit/hooded/ablative{ + pixel_y = 7 + }, +/obj/item/gun/energy/temperature/security{ + pixel_y = 5 + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/station/ai_monitored/security/armory) "isr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, @@ -29595,6 +29547,33 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/large, /area/station/medical/psychology) +"iwk" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/item/reagent_containers/cup/glass/flask/gold{ + pixel_x = -5 + }, +/obj/structure/table/wood, +/obj/structure/secure_safe/directional/east, +/obj/item/lighter{ + color = "#d4af37"; + desc = "Cap's Lucky Lighter. Given to him by NT staff for being the most capable person to secure the disk."; + name = "The Captain's Lucky Lighter"; + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/cigarette/cigar{ + pixel_x = 4 + }, +/obj/item/cigarette/cigar{ + pixel_x = 7 + }, +/obj/item/cigarette/cigar{ + pixel_x = 10 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/captain) "iwq" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -29607,6 +29586,13 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) +"iwH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/ce/directional/south, +/turf/open/floor/carpet/orange, +/area/station/command/heads_quarters/ce) "iwV" = ( /obj/structure/disposalpipe/junction/flip{ dir = 8 @@ -29723,21 +29709,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth_large, /area/station/hallway/primary/aft) -"iyp" = ( -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/conveyor{ - id = "cargodisposals" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/directional/west{ - c_tag = "Cargo Bay - Delivery Office Port"; - name = "cargo camera" - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/sorting) "iyv" = ( /obj/structure/railing/corner{ dir = 8 @@ -30040,6 +30011,20 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"iCV" = ( +/obj/structure/disposaloutlet{ + dir = 1; + name = "Cargo Deliveries" + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/structure/plasticflaps, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/storage) "iCW" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -30152,20 +30137,6 @@ /obj/machinery/status_display/ai, /turf/closed/wall/mineral/iron, /area/station/service/chapel) -"iFa" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/medical/medbay/lobby) "iFc" = ( /mob/living/basic/cow{ name = "Betsy"; @@ -30239,25 +30210,6 @@ dir = 4 }, /area/station/science/robotics/lab) -"iGe" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/east{ - id = "xenobio8"; - name = "Xenobio Pen 8 Blast DOors"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/science/xenobiology) "iGg" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 8 @@ -30697,15 +30649,6 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"iMF" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/box, -/turf/open/floor/engine, -/area/station/science/xenobiology) "iMO" = ( /obj/effect/turf_decal/trimline/dark_red/arrow_cw{ dir = 9 @@ -30792,6 +30735,12 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/smooth, /area/station/hallway/secondary/construction) +"iOh" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/smooth_edge, +/area/station/science/ordnance) "iOx" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark_blue{ @@ -31219,6 +31168,14 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos) +"iUM" = ( +/obj/structure/chair/comfy/brown{ + color = "#A46106" + }, +/obj/effect/landmark/start/quartermaster, +/obj/machinery/computer/security/telescreen/vault/directional/north, +/turf/open/floor/carpet/black, +/area/station/command/heads_quarters/qm) "iVa" = ( /turf/open/floor/engine, /area/station/security/range) @@ -31800,17 +31757,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood/large, /area/station/command/heads_quarters/hop) -"jcl" = ( -/obj/effect/turf_decal/siding/dark_blue/corner, -/obj/machinery/shuttle_manipulator{ - desc = "A holographic display of the ship we're on right now."; - name = "ship holographic display" - }, -/obj/effect/turf_decal/tile/blue/half{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "jcm" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/warning, @@ -31881,6 +31827,26 @@ }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"jdJ" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 8; + initialize_directions = 4; + name = "euthanization chamber freezer" + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/machinery/button/door/directional/east{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast DOors"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "jdN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/generic_maintenance_landmark, @@ -32600,13 +32566,6 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/smooth_large, /area/station/cargo/sorting) -"joJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/ce/directional/south, -/turf/open/floor/carpet/orange, -/area/station/command/heads_quarters/ce) "joM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32638,6 +32597,14 @@ /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +"jpk" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "jpv" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32885,6 +32852,18 @@ }, /turf/open/floor/iron/smooth_large, /area/station/command/cc_dock) +"jsf" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 10 + }, +/obj/structure/table/glass, +/obj/item/knife/kitchen, +/obj/item/wrench, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "jsm" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -33254,6 +33233,10 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/lesser) +"jwN" = ( +/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, +/turf/open/floor/engine, +/area/station/science/xenobiology) "jwV" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron/smooth, @@ -33345,15 +33328,6 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/smooth_large, /area/station/maintenance/disposal) -"jyN" = ( -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, -/obj/effect/spawner/random/engineering/tracking_beacon, -/turf/open/floor/iron/white/smooth_corner{ - dir = 1 - }, -/area/station/science/xenobiology) "jyT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -33489,26 +33463,6 @@ /obj/effect/turf_decal/siding/green, /turf/open/floor/iron/smooth, /area/station/service/hydroponics/garden/abandoned) -"jAG" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/east{ - id = "xenobio7"; - name = "Xenobio Pen 7 Blast DOors"; - req_access = list("xenobiology") - }, -/obj/machinery/light/cold/directional/east, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/science/xenobiology) "jAK" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 1 @@ -33674,6 +33628,13 @@ /obj/effect/landmark/start/mime, /turf/open/floor/iron/herringbone, /area/station/service/theater) +"jCB" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/landmark/start/telecomms_specialist, +/turf/open/floor/engine, +/area/station/tcommsat/computer) "jCE" = ( /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/siding/wood{ @@ -33716,6 +33677,15 @@ /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/open/floor/iron/dark/smooth_large, /area/station/security/lockers) +"jDb" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "jDe" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/bush/grassy, @@ -33961,26 +33931,6 @@ /obj/machinery/light/warm/directional/east, /turf/open/floor/wood/large, /area/station/medical/psychology) -"jFL" = ( -/obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/jetpack/carbondioxide{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/tank/jetpack/carbondioxide{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/rack/shelf, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/storage/eva) "jFM" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -34037,11 +33987,6 @@ }, /turf/open/floor/iron/half, /area/station/service/hydroponics) -"jGp" = ( -/obj/structure/chair/stool/directional/south, -/obj/effect/landmark/start/telecomms_specialist, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/lobby) "jGF" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -34117,12 +34062,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/maintenance/disposal) -"jHh" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/siding/wood, -/obj/item/kirbyplants/random, -/turf/open/floor/wood/large, -/area/station/security/courtroom) "jHi" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -34156,20 +34095,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/station/hallway/primary/aft) -"jHG" = ( -/obj/structure/plasticflaps{ - name = "Deliveries" - }, -/obj/structure/window/reinforced/spawner/directional/west{ - pixel_x = -4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/window/right/directional/north{ - name = "Deliveries"; - req_access = list("shipping") - }, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/sorting) "jHI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34279,13 +34204,6 @@ /obj/structure/cable, /turf/open/floor/pod/dark, /area/station/service/chapel) -"jJT" = ( -/obj/machinery/power/shieldwallgen/xenobiologyaccess, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/cable, -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/engine, -/area/station/science/xenobiology) "jJZ" = ( /obj/machinery/door/airlock/maintenance{ name = "Treatment Center Maintenance" @@ -34528,16 +34446,6 @@ /obj/item/stack/sheet/cardboard, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine) -"jNv" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/machinery/computer/security/telescreen/ce/directional/west, -/turf/open/floor/iron/smooth_edge{ - dir = 4 - }, -/area/station/security/checkpoint/engineering) "jNy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34765,6 +34673,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/vaporwave, /area/station/service/barber) +"jQQ" = ( +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/obj/effect/spawner/random/engineering/tracking_beacon, +/turf/open/floor/iron/white/smooth_corner{ + dir = 1 + }, +/area/station/science/xenobiology) "jQR" = ( /obj/machinery/door/window/left/directional/south{ name = "Research Test Chamber"; @@ -34898,6 +34815,21 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) +"jTk" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/structure/sign/poster/contraband/random/directional/south, +/obj/item/storage/box/lights/mixed{ + pixel_y = 4 + }, +/obj/item/stock_parts/power_store/cell/high/empty{ + pixel_y = 4 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/cargo/warehouse) "jTn" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -35051,16 +34983,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/qm) -"jVP" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/turf/open/floor/carpet/black, -/area/station/service/chapel/office) "jWg" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 6 @@ -35297,6 +35219,12 @@ /obj/effect/turf_decal/bot/left, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos/hfr_room) +"jZE" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = -32 + }, +/turf/open/space/basic, +/area/space/nearstation) "jZS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35826,13 +35754,6 @@ dir = 4 }, /area/station/medical/medbay/central) -"kir" = ( -/obj/machinery/pdapainter/research, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/security/telescreen/rd/directional/north, -/turf/open/floor/iron/white/smooth_large, -/area/station/command/heads_quarters/rd) "kit" = ( /obj/effect/turf_decal/siding/green{ dir = 1 @@ -36003,6 +35924,20 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"kjX" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "kkk" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/sorting/mail{ @@ -36249,6 +36184,38 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/storage) +"koc" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Bridge - Starboard"; + name = "command camera" + }, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 6 + }, +/obj/structure{ + density = 1; + icon = 'icons/obj/machines/shuttle_manipulator.dmi'; + icon_state = "hologram_on"; + light_color = "#2cb2e8"; + light_range = 2; + mouse_opacity = 0; + name = "holographic projection"; + pixel_x = -32; + pixel_y = 17 + }, +/obj/structure{ + desc = "This is the ship we're on. It's amazing what Nanotrasen can do once they actually put more than ten seconds of effort into their projects."; + icon = 'icons/obj/machines/shuttle_manipulator.dmi'; + icon_state = "hologram_whiteship"; + light_color = "#2cb2e8"; + light_range = 7; + name = "Ship Hologram"; + pixel_x = -32; + pixel_y = 27 + }, +/obj/machinery/incident_display/bridge/directional/south, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/bridge) "koi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/power/apc/auto_name/directional/north, @@ -36408,18 +36375,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/smooth_large, /area/station/cargo/sorting) -"kpz" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 9 - }, -/obj/machinery/light/warm/directional/north, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/box, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "kpB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36531,21 +36486,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/pod/dark, /area/station/service/chapel/funeral) -"ksk" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/brown/filled/line, -/obj/structure/sign/poster/contraband/random/directional/south, -/obj/item/storage/box/lights/mixed{ - pixel_y = 4 - }, -/obj/item/stock_parts/power_store/cell/high/empty{ - pixel_y = 4 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/cargo/warehouse) "ksx" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/iron/smooth, @@ -38284,10 +38224,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/dark, /area/station/security/execution/education) -"kOB" = ( -/obj/structure/sign/warning/biohazard/directional/south, -/turf/open/space/basic, -/area/space/nearstation) "kOS" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/warning{ @@ -38372,24 +38308,6 @@ dir = 1 }, /area/station/security/prison) -"kPL" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, -/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, -/obj/effect/landmark/navigate_destination/engineering, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/lobby) "kPP" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Chamber Inject" @@ -39744,6 +39662,20 @@ /obj/machinery/rnd/experimentor, /turf/open/floor/engine, /area/station/science/explab) +"ljG" = ( +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/medical/medbay/lobby) "ljI" = ( /turf/closed/wall, /area/station/medical/morgue) @@ -39908,14 +39840,6 @@ /obj/effect/landmark/start/head_of_security, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/hos) -"lmR" = ( -/obj/structure/window/reinforced/spawner/directional/north{ - pixel_y = 1 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space/nearstation) "lmS" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 @@ -40249,6 +40173,16 @@ }, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/hos) +"lqX" = ( +/obj/structure/rack, +/obj/effect/turf_decal/tile/dark_red/half, +/obj/machinery/camera/directional/south{ + c_tag = "Armory - Interior" + }, +/obj/effect/turf_decal/bot, +/obj/effect/spawner/random/armory/dragnet, +/turf/open/floor/engine, +/area/station/ai_monitored/security/armory) "lrc" = ( /obj/structure/bed/double, /obj/item/bedsheet/nanotrasen/double, @@ -40595,6 +40529,35 @@ /obj/effect/turf_decal/tile/red/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/station/security/office) +"lvU" = ( +/obj/structure/table, +/obj/item/storage/medkit/o2{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/o2, +/obj/item/storage/medkit/regular{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/digital_clock/directional/north{ + pixel_y = 37 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/storage) "lvX" = ( /obj/structure/closet, /obj/item/crowbar, @@ -40822,22 +40785,6 @@ /obj/item/clothing/glasses/meson, /turf/open/floor/iron/smooth, /area/station/engineering/atmos/storage) -"lzo" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - dir = 4; - location = "QM #1" - }, -/obj/effect/turf_decal/box, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #3"; - suffix = "#3" - }, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/storage) "lzN" = ( /turf/open/floor/engine/plasma, /area/station/engineering/atmos) @@ -41222,12 +41169,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) -"lEP" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/pod/dark, -/area/station/engineering/storage/tech) "lFg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/structure/cable, @@ -42068,10 +42009,6 @@ /obj/structure/flora/bush/jungle, /turf/open/floor/grass, /area/station/hallway/primary/central/fore) -"lQA" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/carpet, -/area/station/security/courtroom) "lQC" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/right/directional/north{ @@ -42733,10 +42670,18 @@ }, /turf/open/floor/wood/large, /area/station/security/courtroom) -"lYE" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/engine, -/area/station/science/xenobiology) +"lYC" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm/directional/east, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/electrical) "lYN" = ( /obj/structure/disposalpipe/junction/flip{ dir = 2 @@ -43371,21 +43316,6 @@ dir = 4 }, /area/station/hallway/primary/aft) -"mju" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/ears/earmuffs{ - pixel_y = 7 - }, -/obj/item/gun/energy/laser/practice, -/obj/item/clothing/glasses/sunglasses{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/turf/open/floor/engine, -/area/station/security/range) "mjy" = ( /obj/structure/sign/logo{ icon_state = "nanotrasen_sign5"; @@ -44116,6 +44046,17 @@ }, /turf/open/floor/iron/smooth_large, /area/station/construction/mining/aux_base) +"mvu" = ( +/obj/machinery/power/shieldwallgen/xenobiologyaccess, +/obj/structure/cable, +/obj/machinery/button/door/directional/west{ + id = "Xtestlab"; + name = "Secure Creature Pen Blast Door"; + req_access = list("xenobiology") + }, +/obj/structure/sign/warning/gas_mask/directional/west, +/turf/open/floor/engine, +/area/station/science/xenobiology) "mvz" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/structure/disposalpipe/segment{ @@ -44267,6 +44208,17 @@ dir = 4 }, /area/station/science/research) +"mxN" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 4 + }, +/area/station/command/gateway) "mxQ" = ( /obj/effect/turf_decal/weather/snow, /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ @@ -44936,14 +44888,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white/smooth_large, /area/station/science/research) -"mIo" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/wood/large, -/area/station/security/courtroom) "mIp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -45040,18 +44984,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/office) -"mJn" = ( -/obj/structure/flora/bush/lavendergrass, -/obj/structure/window/reinforced/spawner/directional/west, -/mob/living/carbon/human/species/monkey, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/right/directional/south{ - name = "Monkey Pen"; - req_access = list("genetics") - }, -/turf/open/floor/grass, -/area/station/science/genetics) "mJs" = ( /obj/structure/cable, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -46614,6 +46546,22 @@ }, /turf/open/floor/plating, /area/station/command/cc_dock) +"nge" = ( +/obj/item/paper/fluff/gateway, +/obj/item/coin/gold{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/phone{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/cigarette/pipe{ + pixel_x = -5 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "ngt" = ( /obj/machinery/power/shuttle_engine/heater, /obj/effect/turf_decal/stripes/line{ @@ -47757,22 +47705,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical) -"nvT" = ( -/obj/structure/table/reinforced, -/obj/item/stack/package_wrap, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stack/cable_coil, -/obj/item/stock_parts/power_store/battery/high, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/smooth, -/area/station/construction/mining/aux_base) "nvZ" = ( /obj/machinery/door/airlock/maintenance{ name = "Dormitories Maintenance" @@ -48367,6 +48299,11 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/vaporwave, /area/station/service/barber) +"nFL" = ( +/obj/machinery/mass_driver/chapelgun, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/pod/dark, +/area/station/service/chapel/funeral) "nFQ" = ( /obj/machinery/barsign/all_access/directional/north, /obj/machinery/light/warm/directional/north, @@ -49323,6 +49260,15 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white/diagonal, /area/station/science/research) +"nSB" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/turf/open/floor/iron/corner, +/area/station/hallway/primary/central) "nSE" = ( /obj/machinery/light/warm/directional/north, /obj/effect/turf_decal/siding/green, @@ -49397,17 +49343,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/wood/large, /area/station/commons/fitness/recreation) -"nSZ" = ( -/obj/machinery/power/shieldwallgen/xenobiologyaccess, -/obj/structure/cable, -/obj/machinery/button/door/directional/west{ - id = "Xtestlab"; - name = "Secure Creature Pen Blast Door"; - req_access = list("xenobiology") - }, -/obj/structure/sign/warning/gas_mask/directional/west, -/turf/open/floor/engine, -/area/station/science/xenobiology) "nTh" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -49609,6 +49544,20 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/auxlab/firing_range) +"nVG" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "nVO" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/iron/dark, @@ -49716,20 +49665,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white/smooth_large, /area/station/hallway/primary/fore) -"nXo" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio5"; - name = "Xenobio Pen 5 Blast Door" - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "nXs" = ( /obj/structure/fireaxecabinet/directional/north, /obj/structure/table, @@ -49760,6 +49695,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"nXH" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/chair/office, +/obj/effect/landmark/start/science_guard, +/obj/machinery/computer/security/telescreen/research/directional/east, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/security/checkpoint/science/research) "nXM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -49876,16 +49822,6 @@ }, /turf/open/misc/asteroid, /area/station/commons/dorms) -"nZu" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/dark_red/half, -/obj/machinery/camera/directional/south{ - c_tag = "Armory - Interior" - }, -/obj/effect/turf_decal/bot, -/obj/effect/spawner/random/armory/dragnet, -/turf/open/floor/engine, -/area/station/ai_monitored/security/armory) "nZF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49993,14 +49929,6 @@ }, /turf/open/floor/iron/edge, /area/station/service/hydroponics) -"obJ" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/modular_computer/preset/id{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/carpet/purple, -/area/station/command/heads_quarters/rd) "ocb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -50420,6 +50348,22 @@ /obj/item/storage/belt/utility, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) +"ohN" = ( +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/rods/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stock_parts/power_store/battery/high, +/obj/item/stack/sheet/mineral/plasma{ + amount = 30 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/closet/crate/engineering, +/turf/open/floor/engine, +/area/station/engineering/main) "ohO" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -51348,11 +51292,6 @@ dir = 4 }, /area/station/cargo/drone_bay) -"ouQ" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) "ouX" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -51488,27 +51427,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine) -"owH" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/poddoor/preopen{ - id = "engielock"; - name = "Engineering Lockdown Blast Door" - }, -/obj/machinery/door/airlock/engineering/glass{ - name = "EngineRoom" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/main) "owP" = ( /obj/machinery/atmospherics/pipe/smart/manifold/green/visible, /obj/effect/turf_decal/trimline/yellow/filled/line, @@ -51517,6 +51435,16 @@ dir = 1 }, /area/station/engineering/atmos) +"owU" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/north, +/turf/open/floor/wood/large, +/area/station/security/courtroom) "oxa" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /turf/closed/wall, @@ -51609,6 +51537,13 @@ "oyg" = ( /turf/open/floor/engine, /area/station/science/explab) +"oym" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "oyq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ @@ -52111,20 +52046,6 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/circuit/telecomms/server, /area/station/science/server) -"oFz" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio8"; - name = "Xenobio Pen 8 Blast Door" - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "oFF" = ( /obj/effect/turf_decal/trimline/purple/filled/warning, /obj/structure/cable, @@ -52205,6 +52126,11 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"oGH" = ( +/obj/machinery/light/cold/directional/south, +/obj/machinery/computer/security/telescreen/minisat/directional/south, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/aisat/foyer) "oGI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -52582,22 +52508,6 @@ dir = 1 }, /area/station/hallway/primary/central) -"oNg" = ( -/obj/item/paper/fluff/gateway, -/obj/item/coin/gold{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/phone{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/cigarette/pipe{ - pixel_x = -5 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/green, -/area/station/command/heads_quarters/nt_rep) "oNj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52656,14 +52566,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) -"oNX" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/bot, -/obj/machinery/light/directional/south, -/turf/open/floor/wood/large, -/area/station/security/courtroom) "oOb" = ( /turf/closed/wall/mineral/plastitanium, /area/station/maintenance/starboard/fore) @@ -52713,6 +52615,15 @@ dir = 1 }, /area/station/hallway/primary/fore) +"oOw" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/engine, +/area/station/science/xenobiology) "oOG" = ( /obj/structure/sign/warning/electric_shock/directional/north, /obj/effect/turf_decal/bot, @@ -52765,6 +52676,27 @@ /obj/machinery/light/warm/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) +"oPu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "oPM" = ( /obj/machinery/vending/wardrobe/det_wardrobe, /turf/open/floor/carpet, @@ -52829,14 +52761,6 @@ /obj/structure/chair/office/light, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/cmo) -"oQA" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/turf/open/floor/engine, -/area/station/science/xenobiology) "oQF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52974,12 +52898,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) -"oSF" = ( -/obj/structure/chair/wood{ - dir = 4 - }, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/hop) "oSK" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/wood{ @@ -53309,6 +53227,22 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/ce) +"oWu" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/obj/machinery/airalarm/directional/north, +/obj/machinery/light/directional/north, +/obj/machinery/computer/security/telescreen/tcomms/directional/west, +/turf/open/floor/iron/smooth, +/area/station/security/checkpoint/engineering) "oWD" = ( /obj/structure/flora/bush/pointy/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -53372,6 +53306,20 @@ }, /turf/open/floor/grass, /area/station/command/heads_quarters/nt_rep) +"oXF" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/box, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast Door" + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "oXG" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/popcorn, @@ -54077,17 +54025,6 @@ /obj/effect/turf_decal/tile/neutral/diagonal_centre, /turf/open/floor/iron/diagonal, /area/station/commons/dorms) -"pgb" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/chair/office, -/obj/effect/landmark/start/science_guard, -/obj/machinery/computer/security/telescreen/research/directional/east, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/security/checkpoint/science/research) "pgc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54473,6 +54410,10 @@ }, /turf/open/floor/carpet/blue, /area/station/command/bridge) +"plc" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/engine, +/area/station/science/xenobiology) "plm" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -54683,27 +54624,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/storage/gas) -"pnQ" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/engineering/glass{ - name = "Shared Engineering Storage" - }, -/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/iron/smooth_large, -/area/station/engineering/storage_shared) "pnU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -54715,15 +54635,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/command) -"poc" = ( -/obj/structure/railing{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/corner, -/area/station/hallway/primary/central) "poe" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -54907,20 +54818,6 @@ "pqO" = ( /turf/open/floor/grass, /area/station/service/hydroponics/garden/abandoned) -"prg" = ( -/obj/structure/disposaloutlet{ - dir = 1; - name = "Cargo Deliveries" - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/status_display/ai/directional/south, -/obj/structure/plasticflaps, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/storage) "prp" = ( /obj/machinery/status_display/ai, /turf/closed/wall/r_wall, @@ -55142,6 +55039,21 @@ dir = 8 }, /area/station/engineering/atmos) +"put" = ( +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/delivery_chute{ + dir = 1; + name = "Prisoner Doomp" + }, +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Prisoner Doomp" + }, +/obj/effect/turf_decal/bot_red, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/brig) "puw" = ( /obj/structure/sign/painting/parting{ pixel_x = -32 @@ -55295,12 +55207,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/command/heads_quarters/captain) -"pwW" = ( -/obj/effect/turf_decal/bot, -/obj/structure/rack, -/obj/item/stock_parts/power_store/cell/potato, -/turf/open/floor/iron/smooth, -/area/station/maintenance/starboard/aft) "pwX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55440,6 +55346,28 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) +"pzF" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/item/storage/box/trackimp{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/gun/energy/ionrifle{ + pixel_y = -6 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/station/ai_monitored/security/armory) "pzG" = ( /obj/structure/table/wood, /obj/item/restraints/handcuffs, @@ -55608,6 +55536,24 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"pBR" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Foyer" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/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, +/obj/effect/landmark/navigate_destination/engineering, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/lobby) "pBZ" = ( /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating, @@ -55965,6 +55911,26 @@ dir = 1 }, /area/station/commons/fitness/recreation/entertainment) +"pHx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "pHz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56122,19 +56088,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/server) -"pJs" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 10 - }, -/obj/structure/window/reinforced/spawner/directional/west{ - pixel_x = -4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "pJO" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 @@ -56325,10 +56278,6 @@ /obj/item/stack/sheet/iron, /turf/open/floor/iron/smooth, /area/station/maintenance/department/science/ordnance_maint) -"pMw" = ( -/obj/machinery/power/shuttle_engine/huge, -/turf/open/space/basic, -/area/space/nearstation) "pMA" = ( /obj/structure/chair/sofa/right/brown{ dir = 4 @@ -57373,6 +57322,28 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/pod/dark, /area/station/service/chapel) +"qaf" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/light_switch/directional/east{ + pixel_y = 11 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 1 + }, +/obj/machinery/button/door/directional/east{ + id = "chemistry_shutters"; + name = "Shutters Control"; + req_access = list("pharmacy") + }, +/obj/effect/turf_decal/bot_red, +/obj/machinery/chem_dispenser, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/pharmacy) "qai" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 @@ -57444,11 +57415,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/aft/lesser) -"qaW" = ( -/obj/machinery/mass_driver/chapelgun, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/pod/dark, -/area/station/service/chapel/funeral) "qaX" = ( /obj/effect/decal/cleanable/insectguts, /turf/open/floor/circuit, @@ -57691,6 +57657,14 @@ }, /turf/open/floor/iron/white/small, /area/station/common/pool) +"qcQ" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8 + }, +/obj/effect/turf_decal/box, +/turf/open/floor/engine, +/area/station/science/xenobiology) "qcR" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark_blue{ @@ -58288,6 +58262,28 @@ "qlN" = ( /turf/closed/wall/r_wall, /area/station/science/robotics/lab) +"qlQ" = ( +/obj/item/clothing/shoes/magboots{ + pixel_x = -4 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 3 + }, +/obj/item/clothing/shoes/magboots{ + pixel_y = 4 + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/rack/shelf, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 5 + }, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) "qlS" = ( /obj/machinery/door/airlock/research{ name = "Circuit Testing Lab" @@ -58532,6 +58528,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/circuit, /area/station/science/research/abandoned) +"qoU" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/computer/security/telescreen/ce/directional/west, +/turf/open/floor/iron/smooth_edge{ + dir = 4 + }, +/area/station/security/checkpoint/engineering) "qoV" = ( /obj/structure/table/wood/fancy/cyan, /obj/effect/turf_decal/siding/wood{ @@ -58679,6 +58685,33 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/engineering/main) +"qrc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/window/right/directional/south{ + name = "Shuttle Deliveries"; + req_access = list("cargo") + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/brown/half, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/line, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/obj/effect/turf_decal/trimline/neutral/mid_joiner, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/sorting) "qrF" = ( /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark/smooth_large, @@ -58772,6 +58805,19 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical) +"qsW" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + name = "Telecomms Foyer" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/tcomms, +/obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/turf/open/floor/engine, +/area/station/tcommsat/computer) "qta" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -58932,24 +58978,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) -"qul" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/suit/hooded/ablative{ - pixel_y = 7 - }, -/obj/item/gun/energy/temperature/security{ - pixel_y = 5 - }, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/station/ai_monitored/security/armory) "quy" = ( /obj/structure/railing{ dir = 8 @@ -59324,6 +59352,14 @@ }, /turf/open/floor/iron/smooth_large, /area/station/cargo/storage) +"qAA" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/bush/sunny, +/mob/living/carbon/human/species/monkey, +/obj/structure/sign/poster/official/fruit_bowl/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/grass, +/area/station/science/genetics) "qAD" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -59420,6 +59456,12 @@ }, /turf/open/floor/iron/smooth_edge, /area/station/hallway/secondary/entry) +"qCq" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/siding/wood, +/obj/item/kirbyplants/random, +/turf/open/floor/wood/large, +/area/station/security/courtroom) "qCB" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -59679,6 +59721,20 @@ dir = 8 }, /area/station/hallway/primary/fore) +"qGR" = ( +/obj/structure/plasticflaps{ + name = "Deliveries" + }, +/obj/structure/window/reinforced/spawner/directional/west{ + pixel_x = -4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/window/right/directional/north{ + name = "Deliveries"; + req_access = list("shipping") + }, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/sorting) "qGT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60427,17 +60483,6 @@ /obj/effect/turf_decal/tile/green/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/station/hallway/primary/fore) -"qRW" = ( -/obj/machinery/door/window/left/directional/east{ - name = "Medbay Deliveries"; - req_access = list("medical") - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/firedoor, -/obj/structure/sign/calendar/directional/south, -/obj/effect/turf_decal/delivery/blue, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/storage) "qRZ" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -60647,6 +60692,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth_edge, /area/station/cargo/drone_bay) +"qUc" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/modular_computer/preset/id{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/carpet/purple, +/area/station/command/heads_quarters/rd) "qUl" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -60729,6 +60782,17 @@ }, /turf/open/floor/iron/dark/small, /area/station/security/prison/work) +"qVb" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv{ + pixel_y = 8 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/plaque/static_plaque/golden/captain{ + pixel_y = 32 + }, +/turf/open/floor/carpet/royalblue, +/area/station/command/heads_quarters/captain) "qVj" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60839,14 +60903,6 @@ /obj/effect/spawner/random/decoration/paint, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) -"qWx" = ( -/obj/structure/flora/bush/sparsegrass, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/grass, -/area/station/medical/virology) "qWA" = ( /obj/structure/chair/pew/right{ dir = 4 @@ -60856,6 +60912,18 @@ }, /turf/open/floor/wood/large, /area/station/security/courtroom) +"qWG" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/structure/plasticflaps, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/smooth_large, +/area/station/cargo/sorting) "qWR" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall, @@ -60902,6 +60970,14 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark/smooth_large, /area/station/command/gateway) +"qXs" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/wood/large, +/area/station/security/courtroom) "qXG" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, /obj/structure/disposalpipe/segment, @@ -61157,23 +61233,6 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/iron/smooth, /area/station/engineering/main) -"rbp" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/machinery/firealarm/directional/north, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - dir = 4; - location = "QM #4" - }, -/obj/effect/turf_decal/box, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #1"; - suffix = "#1" - }, -/turf/open/floor/iron/smooth_edge, -/area/station/cargo/storage) "rbz" = ( /obj/structure/chair/pew/left{ dir = 4 @@ -61363,11 +61422,41 @@ }, /turf/open/floor/engine, /area/station/ai_monitored/security/armory) +"rfc" = ( +/obj/structure/table/reinforced/rglass, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/turf/open/floor/carpet/purple, +/area/station/command/heads_quarters/rd) "rfk" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/head/cone, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine) +"rfn" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Door"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/science/xenobiology) "rfo" = ( /obj/effect/turf_decal/vg_decals/atmos/air, /turf/open/floor/engine/air, @@ -61514,6 +61603,19 @@ /obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white/diagonal, /area/station/science/research) +"rhi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 10 + }, +/obj/structure/window/reinforced/spawner/directional/west{ + pixel_x = -4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "rhr" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -61872,14 +61974,6 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/catwalk_floor, /area/station/hallway/secondary/construction) -"rlK" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "rlT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62052,6 +62146,23 @@ /obj/effect/spawner/random/trash/hobo_squat, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"rob" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 4 + }, +/obj/machinery/requests_console/directional/south{ + department = "Pharmacy"; + name = "Pharmacy Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/effect/turf_decal/bot_red, +/obj/machinery/chem_dispenser, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/pharmacy) "rog" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 @@ -62173,6 +62284,32 @@ /obj/effect/turf_decal/bot, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat/service) +"rpN" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_y = 12 + }, +/obj/machinery/button/door/directional/east{ + id = "brigprison"; + name = "Prison Lockdown"; + req_access = list("brig") + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/computer/security/telescreen/isolation/directional/north, +/turf/open/floor/iron/dark, +/area/station/security/corrections_officer) "rpS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62290,22 +62427,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"rsr" = ( -/obj/structure/table/reinforced/rglass, -/obj/item/storage/photo_album, -/obj/item/camera{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half{ - dir = 4 - }, -/obj/machinery/computer/security/telescreen/minisat/directional/west, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) "rsC" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 9 @@ -62468,14 +62589,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/storage) -"ruZ" = ( -/obj/structure/chair/comfy/brown{ - color = "#A46106" - }, -/obj/effect/landmark/start/quartermaster, -/obj/machinery/computer/security/telescreen/vault/directional/north, -/turf/open/floor/carpet/black, -/area/station/command/heads_quarters/qm) "rva" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -62960,22 +63073,6 @@ /obj/structure/window/spawner/directional/west, /turf/open/floor/carpet, /area/station/service/library) -"rCG" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/obj/machinery/airalarm/directional/north, -/obj/machinery/light/directional/north, -/obj/machinery/computer/security/telescreen/tcomms/directional/west, -/turf/open/floor/iron/smooth, -/area/station/security/checkpoint/engineering) "rCQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -63129,19 +63226,6 @@ /obj/machinery/atmospherics/components/unary/thermomachine/heater/on, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/atmos) -"rEs" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/structure/disposaloutlet{ - name = "Prisoner Doomp" - }, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/brig) "rET" = ( /turf/open/floor/iron/smooth_edge{ dir = 8 @@ -63298,6 +63382,24 @@ dir = 4 }, /area/station/security/prison) +"rHt" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/light/warm/directional/south, +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/item/storage/toolbox/electrical{ + pixel_y = 7 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 8; + pixel_y = -5 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/atmos) "rHw" = ( /obj/effect/turf_decal/trimline/dark_red/arrow_cw{ dir = 1 @@ -64134,6 +64236,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/large, /area/station/commons/fitness/recreation/entertainment) +"rTT" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "rTW" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 10 @@ -64942,10 +65049,6 @@ "sgt" = ( /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) -"sgw" = ( -/obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner, -/turf/open/floor/engine, -/area/station/science/xenobiology) "sgA" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, @@ -65039,26 +65142,6 @@ /obj/structure/closet/crate/bin, /turf/open/floor/vault, /area/station/ai_monitored/turret_protected/aisat/foyer) -"shU" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/machinery/recharger{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/machinery/computer/security/telescreen/prison/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/warden) "shV" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -65141,6 +65224,18 @@ }, /turf/open/floor/carpet/green, /area/station/commons/dorms) +"sjE" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/machinery/light/warm/directional/north, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/box, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "sjR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -65192,13 +65287,6 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) -"skA" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/bot, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/lightreplacer, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/atmos) "skC" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -65493,12 +65581,6 @@ }, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/hos) -"soX" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/plating, -/area/space/nearstation) "soY" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65901,12 +65983,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/medical/medbay/lobby) -"suO" = ( -/obj/structure/sign/nanotrasen{ - pixel_x = -32 - }, -/turf/open/space/basic, -/area/space/nearstation) "svh" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/lawyer, @@ -66194,12 +66270,6 @@ dir = 4 }, /area/station/medical/medbay/central) -"szC" = ( -/mob/living/carbon/human/species/monkey, -/obj/structure/flora/bush/sparsegrass, -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/grass, -/area/station/medical/virology) "sAc" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -66256,24 +66326,6 @@ }, /turf/open/floor/wood/large, /area/station/hallway/primary/central/fore) -"sAX" = ( -/obj/machinery/turretid{ - control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; - icon_state = "control_stun"; - name = "AI Upload turret control"; - pixel_y = 32 - }, -/obj/structure/table, -/obj/item/folder/blue{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/computer/security/telescreen/aiupload/directional/west, -/turf/open/floor/vault, -/area/station/ai_monitored/turret_protected/ai_upload) "sBl" = ( /obj/structure/flora/grass/jungle, /obj/structure/window/fulltile, @@ -66678,24 +66730,6 @@ /obj/effect/turf_decal/trimline/green/filled/line, /turf/open/floor/noslip, /area/station/service/janitor) -"sEV" = ( -/obj/structure/table, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/stock_parts/power_store/cell/emproof{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/effect/turf_decal/bot, -/obj/item/clothing/glasses/meson/engine, -/obj/item/storage/box/bandages{ - pixel_x = 4; - pixel_y = 5 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/main) "sFa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66726,6 +66760,12 @@ }, /turf/open/floor/iron/dark/diagonal, /area/station/hallway/secondary/exit/departure_lounge) +"sFq" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/pod/dark, +/area/station/engineering/storage/tech) "sFt" = ( /obj/effect/turf_decal/tile/dark/fourcorners, /obj/structure/disposalpipe/trunk{ @@ -67224,6 +67264,24 @@ }, /turf/open/floor/iron/freezer, /area/station/medical/pharmacy) +"sLq" = ( +/obj/machinery/turretid{ + control_area = "/area/station/ai_monitored/turret_protected/ai_upload"; + icon_state = "control_stun"; + name = "AI Upload turret control"; + pixel_y = 32 + }, +/obj/structure/table, +/obj/item/folder/blue{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/computer/security/telescreen/aiupload/directional/west, +/turf/open/floor/vault, +/area/station/ai_monitored/turret_protected/ai_upload) "sLs" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 10 @@ -68772,6 +68830,12 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/department/engine/atmos) +"tfX" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating, +/area/space/nearstation) "tga" = ( /obj/structure/drain, /obj/item/soap/deluxe, @@ -69220,6 +69284,46 @@ }, /turf/open/floor/iron/white, /area/station/medical/office) +"tms" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/flashlight/seclite, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas/sechailer{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/storage/lockbox/loyalty{ + pixel_y = -11 + }, +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/item/storage/box/flashbangs{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/box/teargas{ + pixel_x = 6; + pixel_y = -6 + }, +/turf/open/floor/engine, +/area/station/ai_monitored/security/armory) "tmu" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/landmark/secequipment, @@ -69295,18 +69399,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/solars/port/aft) -"tnK" = ( -/obj/effect/turf_decal/trimline/brown/filled/line, -/obj/item/radio/intercom/directional/south, -/obj/structure/table, -/obj/machinery/cell_charger{ - pixel_y = 3 - }, -/obj/item/stock_parts/power_store/cell/high, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/cargo/miningdock) "tod" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/cardboard/metal, @@ -69456,26 +69548,6 @@ }, /turf/open/floor/iron/smooth_corner, /area/station/cargo/warehouse) -"tpG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/button/door/directional/west{ - id = "xenobio3"; - name = "Xenobio Pen 3 Blast Door"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "tpL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/girder, @@ -69869,6 +69941,18 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron/kitchen/small, /area/station/service/kitchen/abandoned) +"tuw" = ( +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/item/radio/intercom/directional/south, +/obj/structure/table, +/obj/machinery/cell_charger{ + pixel_y = 3 + }, +/obj/item/stock_parts/power_store/cell/high, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/cargo/miningdock) "tuC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/stripes/line{ @@ -70587,13 +70671,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/smooth, /area/station/engineering/atmos) -"tDl" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "tDI" = ( /obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/box, @@ -70678,13 +70755,23 @@ }, /turf/open/floor/plating, /area/station/science/ordnance/storage) -"tEF" = ( -/obj/structure/chair/office{ - dir = 8 +"tEH" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 }, -/obj/effect/landmark/start/telecomms_specialist, -/turf/open/floor/engine, -/area/station/tcommsat/computer) +/obj/machinery/firealarm/directional/north, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + dir = 4; + location = "QM #4" + }, +/obj/effect/turf_decal/box, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #1"; + suffix = "#1" + }, +/turf/open/floor/iron/smooth_edge, +/area/station/cargo/storage) "tEI" = ( /obj/structure/table, /obj/item/food/ready_donk/mac_n_cheese{ @@ -70760,28 +70847,6 @@ "tFt" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/engine/atmos) -"tFv" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/item/storage/box/trackimp{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/gun/energy/ionrifle{ - pixel_y = -6 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/station/ai_monitored/security/armory) "tFA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -71500,23 +71565,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/abandoned) -"tRn" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/box, -/obj/machinery/button/door/directional/west{ - id = "xenobio1"; - name = "Xenobio Pen 1 Blast Door"; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "tRr" = ( /obj/structure/bed/double, /obj/item/bedsheet/captain/double, @@ -71626,15 +71674,6 @@ dir = 8 }, /area/station/commons/fitness/recreation/entertainment) -"tSV" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 - }, -/area/station/science/xenobiology) "tTp" = ( /obj/machinery/turretid{ control_area = "/area/station/ai_monitored/turret_protected/aisat_interior"; @@ -71945,6 +71984,16 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron/freezer, /area/station/medical/chemistry) +"tZm" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen{ + pixel_y = 4 + }, +/turf/open/floor/carpet/black, +/area/station/service/chapel/office) "tZx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -72341,20 +72390,6 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat_interior) -"uem" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/box, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio6"; - name = "Xenobio Pen 6 Blast Door" - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "uen" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -72570,6 +72605,19 @@ /obj/structure/closet/firecloset, /turf/open/floor/pod, /area/station/service/chapel/office) +"uhH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/railing{ + dir = 9 + }, +/obj/structure/table/reinforced/rglass, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/dropper, +/turf/open/floor/iron/dark/smooth_large, +/area/station/medical/pharmacy) "uhK" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -73604,6 +73652,14 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/storage) +"uuh" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/chair{ + dir = 1; + name = "Accused" + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/security/courtroom) "uup" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -73755,14 +73811,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/medical/storage) -"uwE" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 8 - }, -/obj/effect/turf_decal/box, -/turf/open/floor/engine, -/area/station/science/xenobiology) "uwV" = ( /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/disposalpipe/segment{ @@ -74172,6 +74220,25 @@ }, /turf/open/floor/iron/smooth_large, /area/station/cargo/sorting) +"uBX" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + pixel_y = 1 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"uCe" = ( +/obj/structure/table, +/obj/item/stack/cable_coil{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stack/cable_coil, +/obj/item/stock_parts/power_store/battery/high, +/obj/machinery/light/small/directional/east, +/turf/open/floor/pod/dark, +/area/station/engineering/storage/tech) "uCn" = ( /obj/machinery/portable_atmospherics/canister/plasma, /turf/open/floor/engine/plasma, @@ -74535,6 +74602,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/gateway) +"uHn" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/turf_decal/bot, +/obj/machinery/computer/crew, +/obj/machinery/computer/security/telescreen/cmo/directional/north, +/turf/open/floor/iron/freezer, +/area/station/security/checkpoint/medical) "uHq" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 @@ -74561,6 +74635,11 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/eva_shed/starboard) +"uHA" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "uHB" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -75068,6 +75147,21 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library) +"uOA" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 7 + }, +/obj/item/clothing/glasses/sunglasses{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/reinforced/spawner/directional/east{ + pixel_x = 4 + }, +/obj/item/gun/energy/laser/carbine/practice, +/turf/open/floor/engine, +/area/station/security/range) "uOO" = ( /turf/open/floor/wood/large, /area/station/service/theater) @@ -75333,6 +75427,14 @@ }, /turf/open/floor/wood/large, /area/station/hallway/secondary/exit/departure_lounge) +"uSC" = ( +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/machinery/cell_charger, +/obj/item/stock_parts/power_store/cell/high, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron/dark/smooth_large, +/area/station/engineering/power_room) "uSX" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, @@ -75594,17 +75696,6 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos/storage/gas) -"uWr" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/radio/intercom/directional/north, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/command/teleporter) "uWz" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -75838,18 +75929,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/carpet/cyan, /area/station/commons/dorms) -"van" = ( -/obj/structure/disposaloutlet, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/structure/plasticflaps, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/sorting) "vaq" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/disposalpipe/segment{ @@ -76037,17 +76116,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/morgue) -"vdE" = ( -/obj/structure/table/wood, -/obj/machinery/computer/security/wooden_tv{ - pixel_y = 8 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/plaque/static_plaque/golden/captain{ - pixel_y = 32 - }, -/turf/open/floor/carpet/royalblue, -/area/station/command/heads_quarters/captain) "vdM" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -76115,12 +76183,26 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/iron/kitchen, /area/station/service/kitchen/abandoned) +"veR" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/south, +/turf/open/floor/wood/large, +/area/station/security/courtroom) "vfc" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/wood/large, /area/station/security/courtroom) +"vfg" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/station/command/heads_quarters/qm) "vfn" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -76410,13 +76492,6 @@ /obj/structure/cable, /turf/open/floor/vault, /area/station/ai_monitored/turret_protected/aisat/foyer) -"vkm" = ( -/obj/machinery/computer/records/medical{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/hop) "vkB" = ( /obj/structure/rack/shelf, /obj/effect/spawner/random/techstorage/service_all, @@ -76897,25 +76972,6 @@ dir = 4 }, /area/station/science/genetics) -"vrA" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/button/door/directional/east{ - id = "xenobio6"; - name = "Xenobio Pen 6 Blast DOors"; - req_access = list("xenobiology") - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 - }, -/area/station/science/xenobiology) "vrJ" = ( /obj/machinery/camera/directional/south{ c_tag = "Holodeck - Aft"; @@ -77040,6 +77096,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/pod/dark, /area/station/service/chapel) +"vtw" = ( +/obj/structure/chair/stool/directional/south, +/obj/effect/landmark/start/telecomms_specialist, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/lobby) "vty" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -77908,6 +77969,24 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) +"vFC" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/item/clothing/mask/gas, +/obj/item/stock_parts/power_store/cell/high, +/obj/item/radio/intercom/directional/south, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/station/hallway/primary/aft) "vFE" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/iron/grimy, @@ -78080,13 +78159,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"vIr" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/turf_decal/bot, -/obj/machinery/computer/crew, -/obj/machinery/computer/security/telescreen/cmo/directional/north, -/turf/open/floor/iron/freezer, -/area/station/security/checkpoint/medical) "vIt" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -78248,6 +78320,12 @@ }, /turf/open/floor/iron/herringbone, /area/station/service/theater) +"vKi" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating, +/area/space/nearstation) "vKz" = ( /obj/structure/disposalpipe/junction{ dir = 2 @@ -78770,16 +78848,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/science/xenobiology) -"vRY" = ( -/obj/effect/turf_decal/trimline/dark_red/warning{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/poster/timeclock_psa/directional/south, -/turf/open/floor/iron/small, -/area/station/hallway/primary/central) "vSb" = ( /obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, @@ -79257,15 +79325,6 @@ }, /turf/open/floor/iron/freezer, /area/station/medical/chemistry) -"vXu" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high/empty, -/turf/open/floor/iron/smooth_edge, -/area/station/engineering/lobby) "vXv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/cold/directional/east, @@ -79793,21 +79852,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white/small, /area/station/common/pool) -"wfB" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/delivery_chute{ - dir = 1; - name = "Prisoner Doomp" - }, -/obj/machinery/door/window/brigdoor/left/directional/north{ - name = "Prisoner Doomp" - }, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark/smooth_large, -/area/station/security/brig) "wfJ" = ( /obj/structure/table, /obj/machinery/button/curtain{ @@ -80294,33 +80338,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/freezer, /area/station/medical/surgery) -"wmQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/window/right/directional/south{ - name = "Shuttle Deliveries"; - req_access = list("cargo") - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/brown/half, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/line, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/obj/effect/turf_decal/trimline/neutral/mid_joiner, -/turf/open/floor/iron/smooth_large, -/area/station/cargo/sorting) "wne" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/green/corner{ @@ -80522,6 +80539,10 @@ }, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai) +"wpJ" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/carpet, +/area/station/security/courtroom) "wpK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -80647,6 +80668,25 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/glass/reinforced, /area/station/security/execution/transfer) +"wrN" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/button/door/directional/east{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast DOors"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, +/area/station/science/xenobiology) "wrO" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron/smooth_edge{ @@ -81001,6 +81041,26 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/freezer, /area/station/medical/pharmacy) +"wwv" = ( +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/tank/jetpack/carbondioxide{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/rack/shelf, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/storage/eva) "wwA" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral{ @@ -81799,6 +81859,10 @@ dir = 1 }, /area/station/engineering/atmos/storage) +"wGd" = ( +/obj/structure/sign/warning/biohazard/directional/east, +/turf/open/space/basic, +/area/space/nearstation) "wGg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -82044,6 +82108,17 @@ }, /turf/open/floor/iron/smooth_large, /area/station/engineering/atmos) +"wKH" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Medbay Deliveries"; + req_access = list("medical") + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/firedoor, +/obj/structure/sign/calendar/directional/south, +/obj/effect/turf_decal/delivery/blue, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/storage) "wKP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -82399,6 +82474,20 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/iron/smooth, /area/station/maintenance/aft/lesser) +"wOJ" = ( +/obj/structure/window/spawner/directional/south, +/obj/structure/table, +/obj/machinery/cell_charger{ + pixel_y = 3 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_y = 3 + }, +/obj/effect/turf_decal/trimline/purple/filled/line, +/turf/open/floor/iron/white/side{ + dir = 1 + }, +/area/station/science/lab) "wOP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/kitchen, @@ -82810,6 +82899,22 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"wVQ" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + dir = 4; + location = "QM #1" + }, +/obj/effect/turf_decal/box, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #3"; + suffix = "#3" + }, +/turf/open/floor/iron/smooth_edge, +/area/station/cargo/storage) "wWw" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/chair/office{ @@ -82972,20 +83077,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/smooth, /area/station/hallway/secondary/construction) -"xaU" = ( -/obj/machinery/chem_dispenser, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/bot_red, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/chemistry) "xaX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -83178,33 +83269,6 @@ /obj/effect/turf_decal/tile/dark_blue/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) -"xfb" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/item/reagent_containers/cup/glass/flask/gold{ - pixel_x = -5 - }, -/obj/structure/table/wood, -/obj/structure/secure_safe/directional/east, -/obj/item/lighter{ - color = "#d4af37"; - desc = "Cap's Lucky Lighter. Given to him by NT staff for being the most capable person to secure the disk."; - name = "The Captain's Lucky Lighter"; - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/cigarette/cigar{ - pixel_x = 4 - }, -/obj/item/cigarette/cigar{ - pixel_x = 7 - }, -/obj/item/cigarette/cigar{ - pixel_x = 10 - }, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/captain) "xfl" = ( /obj/structure/dresser, /obj/item/radio/intercom/directional/south, @@ -83217,6 +83281,13 @@ }, /turf/open/floor/iron/smooth, /area/station/command/cc_dock) +"xfA" = ( +/obj/machinery/computer/records/medical{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/hop) "xfB" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/landmark/start/hangover, @@ -83536,23 +83607,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/station/hallway/primary/central/aft) -"xkx" = ( -/obj/item/radio/intercom/directional/south, -/obj/structure/table/reinforced/rglass, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/structure/noticeboard/staff{ - dir = 8; - pixel_x = -32 - }, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 10 +"xkt" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/door/window/right/directional/north{ + name = "Warehouse Deliveries"; + req_access = list("cargo") }, -/obj/effect/turf_decal/tile/blue/half{ +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/command/bridge) +/turf/open/floor/iron/smooth_large, +/area/station/cargo/warehouse) "xkA" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -83754,6 +83820,12 @@ /obj/item/holosign_creator/robot_seat/bar, /turf/open/floor/iron/large, /area/station/service/bar) +"xmU" = ( +/obj/structure/sign/nanotrasen{ + pixel_x = 32 + }, +/turf/open/space/basic, +/area/space/nearstation) "xna" = ( /obj/structure/chair/sofa/bench, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -84051,28 +84123,6 @@ dir = 8 }, /area/station/science/ordnance/testlab) -"xqy" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/machinery/light_switch/directional/east{ - pixel_y = 11 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 1 - }, -/obj/machinery/button/door/directional/east{ - id = "chemistry_shutters"; - name = "Shutters Control"; - req_access = list("pharmacy") - }, -/obj/effect/turf_decal/bot_red, -/obj/machinery/chem_dispenser, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/pharmacy) "xqA" = ( /obj/machinery/chem_heater/withbuffer, /obj/effect/turf_decal/trimline/yellow/filled/corner, @@ -84249,23 +84299,6 @@ }, /turf/open/floor/carpet/cyan, /area/station/commons/dorms) -"xsU" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 4 - }, -/obj/machinery/requests_console/directional/south{ - department = "Pharmacy"; - name = "Pharmacy Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/ore_update, -/obj/effect/turf_decal/bot_red, -/obj/machinery/chem_dispenser, -/turf/open/floor/iron/dark/smooth_large, -/area/station/medical/pharmacy) "xsW" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/dark_red/filled/line{ @@ -84504,20 +84537,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron/white, /area/station/medical/office) -"xwF" = ( -/obj/structure/window/spawner/directional/south, -/obj/structure/table, -/obj/machinery/cell_charger{ - pixel_y = 3 - }, -/obj/item/stock_parts/power_store/cell/high{ - pixel_y = 3 - }, -/obj/effect/turf_decal/trimline/purple/filled/line, -/turf/open/floor/iron/white/side{ - dir = 1 - }, -/area/station/science/lab) "xwO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -84790,17 +84809,6 @@ }, /turf/open/floor/wood/parquet, /area/station/common/night_club) -"xAO" = ( -/obj/structure/table/reinforced/rglass, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen{ - pixel_y = 4 - }, -/turf/open/floor/carpet/purple, -/area/station/command/heads_quarters/rd) "xAV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -84954,24 +84962,6 @@ dir = 8 }, /area/station/hallway/secondary/construction) -"xDO" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/item/clothing/mask/gas, -/obj/item/stock_parts/power_store/cell/high, -/obj/item/radio/intercom/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/smooth_edge{ - dir = 1 - }, -/area/station/hallway/primary/aft) "xEc" = ( /obj/structure/table, /obj/item/kitchen/rollingpin{ @@ -85013,6 +85003,12 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) +"xEU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/cold/directional/west, +/obj/machinery/computer/security/telescreen/tcomms/directional/west, +/turf/open/floor/engine, +/area/station/tcommsat/computer) "xFd" = ( /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -85192,6 +85188,10 @@ dir = 8 }, /area/station/hallway/secondary/command) +"xHj" = ( +/obj/structure/sign/warning/biohazard/directional/south, +/turf/open/space/basic, +/area/space/nearstation) "xHn" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -85261,21 +85261,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/smooth_large, /area/station/cargo/office) -"xIa" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/ears/earmuffs{ - pixel_y = 7 - }, -/obj/item/clothing/glasses/sunglasses{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, -/obj/item/gun/energy/laser/carbine/practice, -/turf/open/floor/engine, -/area/station/security/range) "xIu" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /obj/structure/cable, @@ -85556,6 +85541,27 @@ /obj/structure/cable, /turf/open/floor/plating/airless, /area/station/command/heads_quarters/rd) +"xNl" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/poddoor/preopen{ + id = "engielock"; + name = "Engineering Lockdown Blast Door" + }, +/obj/machinery/door/airlock/engineering/glass{ + name = "EngineRoom" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/turf/open/floor/iron/smooth_large, +/area/station/engineering/main) "xNE" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/cleanable/dirt, @@ -86094,17 +86100,6 @@ /obj/structure/table, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) -"xUN" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark/smooth_edge{ - dir = 4 - }, -/area/station/command/gateway) "xUP" = ( /obj/item/reagent_containers/cup/bucket/wooden{ name = "waste bucket" @@ -86890,14 +86885,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/qm) -"yhG" = ( -/obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/machinery/cell_charger, -/obj/item/stock_parts/power_store/cell/high, -/obj/machinery/camera/directional/north, -/turf/open/floor/iron/dark/smooth_large, -/area/station/engineering/power_room) "yhL" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 @@ -86971,6 +86958,17 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"yjr" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 1; + height = 13; + name = "arrivals"; + shuttle_id = "arrivals_stationary"; + width = 5 + }, +/turf/open/space/basic, +/area/space) "yjw" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/stairs/left{ @@ -99518,7 +99516,7 @@ ttw gPJ kbK ttw -bST +xmU xMq xMq xMq @@ -99788,7 +99786,7 @@ xMq xMq ttw odJ -bST +xmU gPJ gPJ gPJ @@ -101058,7 +101056,7 @@ jkZ jkZ shM vFF -emJ +oGH uQV uQV uQV @@ -103377,7 +103375,7 @@ nAH nAH wkT eeN -gvC +cBN sZR rDp rDp @@ -103412,7 +103410,7 @@ ttw ttw ttw ttw -hUQ +wGd ttw ttw ttw @@ -103477,7 +103475,7 @@ vnu jgz xMq ttw -hUQ +wGd ttw ttw ttw @@ -103900,7 +103898,7 @@ xMq xMq ttw odJ -suO +jZE gPJ gPJ gPJ @@ -103982,11 +103980,11 @@ vnu mDd pCd vnu -szC -eKz +dnO +gmB cmO -qWx -szC +bul +dnO vnu iHU oUn @@ -104144,7 +104142,7 @@ ttw gPJ kbK ttw -suO +jZE xMq xMq xMq @@ -104706,7 +104704,7 @@ iGR qNd ttw qNd -hUQ +wGd ttw ttw ttw @@ -104950,10 +104948,10 @@ kVR kVR kVR kVR -fWX +fVm nRo -tSV -ehR +jDb +jsf oMs hKy hKy @@ -105205,9 +105203,9 @@ hNw uiw uiw aIs -nSZ +mvu wYK -jyN +jQQ bxT wFV gtM @@ -105458,11 +105456,11 @@ dfs lSP kVR uiw -lYE +plc uiw hdS vRS -iMF +oOw sYn vBO ktF @@ -105474,7 +105472,7 @@ xMq xMq tdv hCr -aRG +eWi nMV tdv lZV @@ -105715,7 +105713,7 @@ ajP ajP kVR jRP -sgw +jwN nlj mIH rCy @@ -105976,7 +105974,7 @@ uiw uiw wxE aIs -jJT +eUs iMC tDI rjU @@ -105995,7 +105993,7 @@ eWG nZn jKg tdv -cUE +ezm ttw ttw iLQ @@ -106216,7 +106214,7 @@ ttw ttw ttw ttw -kOB +xHj dWX dWX mIm @@ -106482,13 +106480,13 @@ kVR uiw sYU uiw -esz +crN sYU oGz -esz +crN sYU uiw -esz +crN sYU uiw oMs @@ -106739,13 +106737,13 @@ kVR uiw agX uiw -esz +crN tAl uiw -esz +crN tAl uiw -esz +crN agX uiw oMs @@ -106883,7 +106881,7 @@ uUU oVO pkp xXo -pMw +eFu ttw ttw ttw @@ -106996,13 +106994,13 @@ kVR raP uiw iVS -oQA +biD uiw iVS -oQA +biD uiw iVS -oQA +biD uiw iVS oMs @@ -107507,16 +107505,16 @@ bMr oRY vEz pdg -tRn +hpd sig xNR -fIS +rfn ckQ sLA -tpG +pHx gbf iIn -had +oPu gbf bLi ykd @@ -107912,7 +107910,7 @@ uUU oVO pkp xXo -pMw +eFu ttw ttw ttw @@ -108021,16 +108019,16 @@ bMr oRY bie efz -aTe +jdJ xyc bwJ -vrA +hnT jcW bwJ -jAG +czH jcW bwJ -iGe +wrN jcW kJT ldB @@ -108280,16 +108278,16 @@ oRY kVR mom mQW -nXo +nVG biy lEa -uem +fWQ biy mXv -eSK +oXF biy meR -oFz +kjX xtW oMs gdS @@ -108538,13 +108536,13 @@ kVR lXQ uiw jSr -uwE +qcQ uiw jSr -uwE +qcQ uiw jSr -uwE +qcQ uiw jSr oMs @@ -108795,13 +108793,13 @@ kVR uiw tAl uiw -esz +crN agX uiw -esz +crN xXU uiw -esz +crN tAl uiw oMs @@ -108813,7 +108811,7 @@ ncR vHj dou ciZ -hXI +iOh iue otw fDb @@ -108830,7 +108828,7 @@ xqO ttw ttw ttw -bEf +yjr ttw qjA bgi @@ -109052,13 +109050,13 @@ kVR uiw hsn uiw -esz +crN hsn uba -esz +crN hsn uiw -esz +crN hsn uiw oMs @@ -109300,7 +109298,7 @@ gPJ gPJ ttw ttw -kOB +xHj dWX dWX mIm @@ -110918,10 +110916,10 @@ sAM ahd rba sAM -axn +lvU ady gJm -geI +hWm sAM sAM sAM @@ -111182,7 +111180,7 @@ kam aQC aZe kyH -qRW +wKH uyk mCM fsR @@ -111515,7 +111513,7 @@ deE wTj pkp xXo -pMw +eFu ttw ttw ttw @@ -111706,7 +111704,7 @@ wqx mdP cVG ino -dLN +imd lAB rPx lAB @@ -113024,7 +113022,7 @@ wyk kVc dYh nyT -bED +rHt luV nca nEW @@ -113546,7 +113544,7 @@ fDu fKt fTR vGe -skA +daO nAn dYh nny @@ -114850,7 +114848,7 @@ brI gAd pkp xXo -pMw +eFu ttw ttw ttw @@ -115205,7 +115203,7 @@ ipH cuA prO sOq -vdE +qVb ria iqc sfj @@ -115543,7 +115541,7 @@ vQf cnC abF lZg -vIr +uHn fch tKO ivR @@ -115566,9 +115564,9 @@ vFl pPp xPa xnl -aYU +xEU kKL -tEF +jCB pzK sHv pIN @@ -115752,7 +115750,7 @@ sms cuZ dje hMD -pgb +nXH lDz dje lPo @@ -115977,7 +115975,7 @@ iAb ejU sOq vOF -xfb +iwk vNT itN npP @@ -115985,11 +115983,11 @@ hIA xMq cas cRe -sAX +sLq toU nya bFO -kir +hBZ lKw ted uHB @@ -116251,8 +116249,8 @@ bcn vWw kFf rMc -xAO -obJ +rfc +qUc glp vkJ cLi @@ -116339,7 +116337,7 @@ gcy lMj lMj lMj -bQa +qsW lMj sHv sEL @@ -116478,7 +116476,7 @@ jrF uHj qSd cgu -xUN +mxN bYj iqM rjh @@ -116864,7 +116862,7 @@ rzr gXL cxR gXL -xDO +vFC fpH fpH fpH @@ -116905,7 +116903,7 @@ gmz gAd pkp xXo -pMw +eFu ttw ttw ttw @@ -117597,8 +117595,8 @@ xFM sHA bVR nCl -iFa -cVv +ljG +hjR tWj kqY tQF @@ -117676,7 +117674,7 @@ gmz ngt pkp xXo -pMw +eFu ttw ttw ttw @@ -117889,8 +117887,8 @@ iGy pEX dYi xnw -rCG -jNv +oWu +qoU jWq joZ hxy @@ -118045,15 +118043,15 @@ imR wMT eoq vBP -fEV -mJn +qAA +hIy hlx ujy uhX lTE -hXe +hxg abG -xwF +wOJ stA gWZ uEX @@ -118111,8 +118109,8 @@ cdR cdR cdR cdR -cbj -pJs +gYT +rhi hxh wMl lVF @@ -118152,7 +118150,7 @@ iYZ uAE tlS hxy -eLG +ohN mAy mAy mcP @@ -118291,7 +118289,7 @@ kAm oHW wSc cmH -uWr +gRR pBc qLf xLF @@ -118700,7 +118698,7 @@ qbp oWM pkp xXo -pMw +eFu ttw ttw ttw @@ -119364,7 +119362,7 @@ oUR fUT sAA kfu -bkE +euI nPI wlp nPB @@ -119404,7 +119402,7 @@ twU wwr mJB eil -ada +uhH mAC nIJ ifq @@ -119471,7 +119469,7 @@ qbp nIl pkp xXo -pMw +eFu ttw ttw ttw @@ -119571,9 +119569,9 @@ kYF nag wav dTL -rsr +chg yeg -xkx +bee fHb tvm tvm @@ -119663,7 +119661,7 @@ sUt daB mYW kyV -xsU +rob ifq fvW yiT @@ -119913,7 +119911,7 @@ gLN itW jWg rUf -xqy +qaf wEK pKg nXW @@ -119925,7 +119923,7 @@ eEq xkq xkq fiN -xaU +gBQ lLk xgA fiN @@ -119945,7 +119943,7 @@ tRQ gXL erh lPT -vXu +amL lqJ fdG lCP @@ -120210,7 +120208,7 @@ qfk wBI wBI uIw -pnQ +bbW uIw wBI jtJ @@ -120500,7 +120498,7 @@ qbp oWM pkp xXo -pMw +eFu ttw ttw ttw @@ -120715,13 +120713,13 @@ wEg uit qCR dJj -kPL +pBR puq fol oxL enl lOY -owH +xNl sJO qQu pkH @@ -120987,7 +120985,7 @@ hiQ akW hPu wik -sEV +fiC hLh sPF tUK @@ -121191,7 +121189,7 @@ iLL jiu vMa atS -poc +nSB tVg fmp aeN @@ -121527,7 +121525,7 @@ qbp oWM pkp xXo -pMw +eFu ttw ttw ttw @@ -121625,7 +121623,7 @@ sXl lSU ekt tuU -jcl +ifj gSK umJ rju @@ -121882,7 +121880,7 @@ xbj ydE qcR oTz -guG +koc xlE xlE xlE @@ -122002,7 +122000,7 @@ gwM rKH nwm efQ -jGp +vtw nDn hAj enY @@ -122154,13 +122152,13 @@ vJT xjX jOs pWq -fEZ -jHh -lQA +owU +qCq +wpJ kmg -lQA -mIo -oNX +wpJ +qXs +veR eFF abN oCY @@ -122179,9 +122177,9 @@ uND vZb gIK fWD -wfB +put vHZ -rEs +aVq dcg pzr lcT @@ -122218,9 +122216,9 @@ dHa uuO vjx vIV -vRY +asj aeN -kpz +sjE eBD jcv rtS @@ -122298,7 +122296,7 @@ qbp nIl pkp xXo -pMw +eFu ttw ttw ttw @@ -122917,9 +122915,9 @@ jlB xlE lPh kyd -cQD +qlQ jDE -jFL +wwv ygP uOg pwX @@ -123328,7 +123326,7 @@ qbp oWM pkp xXo -pMw +eFu ttw ttw ttw @@ -123682,7 +123680,7 @@ oaA dzx eRV cXb -oNg +nge sfv ujJ xlE @@ -123702,7 +123700,7 @@ sah boH dBW ugu -dGc +uuh nkn uXb tpZ @@ -123807,7 +123805,7 @@ mII fAJ fAJ fAJ -pwW +aFq iyw duy jnT @@ -124074,7 +124072,7 @@ eLf dZy rGo eEu -yhG +uSC iZl hEF hEF @@ -124099,7 +124097,7 @@ qbp nIl pkp xXo -pMw +eFu ttw ttw ttw @@ -124743,7 +124741,7 @@ xBE bCE ntX owg -shU +geo bki oEC qXR @@ -125115,7 +125113,7 @@ wfL mWh oWn dJr -joJ +iwH dhx rTf sxN @@ -125243,7 +125241,7 @@ xMq ttw oEn xbH -bMu +dsV ftA ngD ngD @@ -125332,8 +125330,8 @@ xud xud qok xud -van -iyp +qWG +hTQ vwl brl wwf @@ -125590,7 +125588,7 @@ cxF qok xud kpq -wmQ +qrc txh fTO gjv @@ -126100,7 +126098,7 @@ vwJ wKg fdP cJR -fNp +xkt vHg hCV ioP @@ -126252,8 +126250,8 @@ lGY kEv cIS iEv -oSF -oSF +cHg +cHg xSq tAU aNG @@ -126604,7 +126602,7 @@ cYz onP bnV nTW -irl +vfg gnh koK fyT @@ -126621,7 +126619,7 @@ atg jTg uBW jhD -jHG +qGR fwW mnR iQy @@ -126767,7 +126765,7 @@ lGY lgF iyK ntp -vkm +xfA qNc tAU hBH @@ -126859,9 +126857,9 @@ ryo xud cYz onP -ruZ +iUM lZh -irl +vfg hRM yhD cpg @@ -126891,8 +126889,8 @@ ewh kbD uqw fZM -cvX -lEP +uCe +sFq rSz spv nju @@ -127046,9 +127044,9 @@ frc vnb vwn ewC -ige -tFv -qul +tms +pzF +iso pKY nRV iqx @@ -127385,7 +127383,7 @@ vFv tqu gmb vFv -ksk +jTk pqh rop rop @@ -127428,7 +127426,7 @@ ash mRA dtb xsG -gis +lYC ile sId dJo @@ -127447,7 +127445,7 @@ sJd gUC pkp xXo -pMw +eFu ttw ttw ttw @@ -127527,7 +127525,7 @@ ttw ttw ttw hBA -cba +cNU ayO vgz taf @@ -127564,7 +127562,7 @@ iSJ pVK iSJ iSJ -nZu +lqX vnb nYI pgB @@ -129439,7 +129437,7 @@ gjq nyf gZb wuW -lzo +wVQ udn aRn fun @@ -129976,7 +129974,7 @@ pPy vxH hdZ aic -nvT +eHk xUk tKV tKV @@ -130200,7 +130198,7 @@ cbP qtr cXD qpX -tnK +tuw oXI jBq gsb @@ -130210,7 +130208,7 @@ aUA pjT xMq sFi -rbp +tEH udn cLG sny @@ -130531,7 +130529,7 @@ unI otq pkp xXo -pMw +eFu ttw ttw ttw @@ -130683,9 +130681,9 @@ eON aZX kSB tuq -rlK +jpk pvA -tDl +oym skC hqK udg @@ -130729,13 +130727,13 @@ tKA uHr oQK xJt -eXE +hzl xJt qAu xbQ qVt xbQ -prg +iCV sFi bwv wbf @@ -131554,7 +131552,7 @@ lAi jBK pkp xXo -pMw +eFu ttw ttw ttw @@ -131684,7 +131682,7 @@ qtc wnu vei hsu -mju +fOh iVa iVa jFA @@ -131941,7 +131939,7 @@ mpF nnj tdY mpu -xIa +uOA iVa iVa mVl @@ -132185,7 +132183,7 @@ aBX qsw tod xTY -eOB +rpN pcq mbW vWY @@ -139942,7 +139940,7 @@ npZ uzo erR wab -jVP +tZm okt npZ npZ @@ -139954,8 +139952,8 @@ qyC qyC qyC qyC -ouQ -fbM +uHA +rTT xMq ttw ttw @@ -140213,7 +140211,7 @@ xvm qyC tGk tGk -lmR +uBX xMq ttw ttw @@ -140982,8 +140980,8 @@ cyA gCp jxh afD -qaW -igO +nFL +hGn cwn xMq ttw @@ -142784,7 +142782,7 @@ dKO sEf qtL qtL -hqA +vKi puG ttw ttw @@ -143298,7 +143296,7 @@ ntY sEf qtL qtL -soX +tfX sxf ttw ttw @@ -143811,7 +143809,7 @@ omg omg sEf qtL -hqA +vKi puG ttw ttw @@ -144325,7 +144323,7 @@ cFz cGp sEf qtL -soX +tfX sxf ttw ttw diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index 446786ebc3296..c00d8c6b68462 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -17755,9 +17755,8 @@ /turf/open/floor/grass, /area/station/security/courtroom) "gfX" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - piping_layer = 2 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 8 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron/white, @@ -34610,7 +34609,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, -/obj/machinery/incident_display/dual/directional/north, +/obj/machinery/incident_display/delam/directional/north, /turf/open/floor/iron/white, /area/station/medical/treatment_center) "lZZ" = ( @@ -45726,7 +45725,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/starboard) "pQb" = ( -/obj/machinery/incident_display/dual/directional/north, +/obj/machinery/incident_display/delam/directional/north, /turf/closed/wall, /area/station/medical/medbay/lobby) "pQc" = ( diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 1b1fdf387396f..23937b91f979e 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -61,63 +61,32 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) -"at" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "av" = ( /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) "aw" = ( /turf/open/floor/plating, /area/station/engineering/atmos) -"aA" = ( -/turf/open/floor/iron, -/area/station/engineering/main) -"aB" = ( +"ax" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"aC" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external/glass/ruin, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/main) -"aD" = ( -/turf/open/floor/iron, -/area/station/security/brig) -"aE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 +"ay" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L7" }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/engineering/main) -"aF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, +/area/station/commons/storage/primary) +"aA" = ( /turf/open/floor/iron, /area/station/engineering/main) -"aG" = ( -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/closet/radiation, -/obj/structure/cable, +"aD" = ( /turf/open/floor/iron, -/area/station/engineering/gravity_generator) +/area/station/security/brig) "aH" = ( /obj/machinery/light/directional/east, /obj/machinery/recharge_station, @@ -150,12 +119,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"aP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) "aS" = ( /obj/structure/table, /obj/item/flashlight{ @@ -165,36 +128,6 @@ /obj/item/stock_parts/power_store/cell/infinite, /turf/open/floor/iron, /area/station/engineering/main) -"aT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) -"aU" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Gravity Generator" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) -"aV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "aX" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Gravity Generator" @@ -208,10 +141,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"ba" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/plating, -/area/station/engineering/atmos) "bb" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -235,11 +164,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) -"be" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) "bf" = ( /obj/machinery/suit_storage_unit/captain, /turf/open/floor/iron, @@ -258,19 +182,6 @@ }, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"bk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/door/airlock, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/atmos) -"bl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/plating, -/area/station/engineering/atmos) "bm" = ( /obj/machinery/atmospherics/components/binary/valve/on{ dir = 4 @@ -305,11 +216,6 @@ /obj/machinery/announcement_system, /turf/open/floor/iron, /area/station/engineering/gravity_generator) -"bt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/science) "bu" = ( /turf/closed/wall/r_wall, /area/station/command/bridge) @@ -321,12 +227,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/brig) -"bx" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/main) "by" = ( /turf/closed/wall/r_wall, /area/station/medical/medbay) @@ -353,10 +253,6 @@ /obj/machinery/computer/rdconsole, /turf/open/floor/iron, /area/station/science) -"bH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron, -/area/station/security/brig) "bI" = ( /obj/structure/table, /obj/item/card/emag, @@ -395,10 +291,6 @@ }, /turf/open/floor/iron, /area/station/command/bridge) -"bN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "bO" = ( /obj/machinery/door/poddoor, /turf/open/floor/engine, @@ -425,35 +317,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"bV" = ( -/obj/machinery/light/directional/north, -/mob/living/carbon/human, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/station/medical/medbay) -"bW" = ( -/obj/machinery/camera/directional/north, -/mob/living/carbon/human, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/station/medical/medbay) -"bX" = ( -/obj/machinery/sleeper/syndie/fullupgrade, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/station/medical/medbay) "bY" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -489,18 +352,6 @@ }, /turf/open/floor/iron, /area/station/command/bridge) -"ch" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/medical/chemistry) -"ci" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/brig) "cj" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -536,11 +387,6 @@ }, /turf/open/floor/iron, /area/station/command/bridge) -"cq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron, -/area/station/command/bridge) "cr" = ( /obj/machinery/light/directional/south, /obj/structure/closet/secure_closet/hos{ @@ -553,107 +399,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/medical/chemistry) -"cu" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/station/medical/medbay) -"cw" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron, -/area/station/command/bridge) -"cx" = ( -/obj/machinery/door/airlock/public/glass, -/turf/open/floor/iron, -/area/station/medical/medbay) -"cy" = ( -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/medical/medbay) -"cz" = ( -/obj/structure/fans/tiny, -/turf/open/floor/plating, -/area/station/medical/medbay) -"cA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"cB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"cC" = ( -/obj/machinery/camera/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"cD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"cE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/station/medical/chemistry) -"cF" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/medical/chemistry) -"cG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/station/medical/medbay) -"cH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/table, -/obj/item/gun/magic/wand/resurrection/debug, -/obj/item/gun/magic/wand/death/debug{ - pixel_y = 10 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/item/debug/human_spawner{ - pixel_x = 6; - pixel_y = -4 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/station/medical/medbay) "cI" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -668,62 +413,16 @@ }, /turf/open/floor/iron/cafeteria, /area/station/medical/medbay) -"cK" = ( -/obj/machinery/light/directional/south, -/obj/structure/table/glass, -/obj/item/disk/surgery/debug, -/obj/item/storage/box/monkeycubes{ - pixel_x = 6; - pixel_y = 1 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/item/disk/data/debug{ - pixel_y = 9; - pixel_x = 7 - }, -/turf/open/floor/iron/white/corner, -/area/station/medical/medbay) -"cL" = ( -/obj/item/surgery_tray/full/advanced, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white/corner, -/area/station/medical/medbay) "cN" = ( /turf/closed/wall/r_wall, /area/station/construction) -"cP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/closed/wall/r_wall, -/area/station/construction) "cS" = ( /turf/closed/wall/r_wall, /area/station/commons/storage/primary) -"cT" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron, -/area/station/medical/chemistry) "cV" = ( /obj/machinery/door/airlock/public/glass, /turf/open/floor/iron, /area/station/commons/storage/primary) -"cX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/construction) "cY" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -734,10 +433,6 @@ }, /turf/open/floor/iron, /area/station/construction) -"da" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/closed/wall/r_wall, -/area/station/commons/storage/primary) "db" = ( /turf/closed/wall/mineral/plastitanium, /area/station/hallway/secondary/entry) @@ -766,14 +461,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"dk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "dl" = ( /turf/open/floor/plating, /area/station/commons/storage/primary) @@ -856,13 +543,6 @@ }, /turf/open/floor/iron, /area/station/construction) -"dA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "dB" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, @@ -884,20 +564,10 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) -"dF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "dG" = ( /obj/machinery/door/airlock, /turf/open/floor/iron, /area/station/commons/storage/primary) -"dH" = ( -/obj/machinery/door/airlock, -/turf/open/floor/plating, -/area/station/maintenance/department/bridge) "dI" = ( /obj/effect/landmark/start, /turf/open/floor/iron, @@ -923,18 +593,6 @@ }, /turf/open/floor/iron, /area/station/construction) -"dN" = ( -/obj/machinery/vending/subtype_vendor, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"dO" = ( -/obj/structure/table, -/obj/machinery/light/directional/south, -/obj/item/storage/medkit/regular, -/obj/item/healthanalyzer/advanced, -/obj/item/debug/omnitool/item_spawner, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "dP" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -960,16 +618,6 @@ /obj/machinery/camera/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"dU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "dV" = ( /turf/open/floor/plating, /area/station/hallway/secondary/entry) @@ -1022,30 +670,13 @@ /obj/machinery/door/airlock, /turf/open/floor/iron, /area/station/construction) -"eg" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/brig) "eh" = ( /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"ei" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "ej" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"ek" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "el" = ( /obj/structure/fans/tiny/invisible, /turf/open/floor/engine, @@ -1057,13 +688,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"ep" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 +"er" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) +/obj/structure/closet/secure_closet/medical3{ + locked = 0 + }, +/obj/item/healthanalyzer/advanced, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/medical/medbay) "es" = ( /obj/machinery/dna_scannernew, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -1081,11 +717,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/cargo/storage) -"ew" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/vacuum, -/turf/open/floor/plating, -/area/station/cargo/storage) "ex" = ( /obj/machinery/door/airlock/external/ruin{ name = "Escape Pod One" @@ -1093,17 +724,6 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"ez" = ( -/obj/machinery/camera/autoname/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "eA" = ( /obj/machinery/conveyor{ dir = 1; @@ -1111,6 +731,14 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"eB" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/full, +/turf/open/floor/iron, +/area/station/engineering/main) "eC" = ( /obj/machinery/conveyor{ dir = 8; @@ -1135,14 +763,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"eH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "eJ" = ( /obj/docking_port/stationary{ dir = 4; @@ -1154,10 +774,6 @@ }, /turf/open/space/basic, /area/space) -"eL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "eN" = ( /obj/machinery/conveyor{ dir = 9; @@ -1177,36 +793,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"eR" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/external/ruin{ - name = "Supply Dock Airlock" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) -"eS" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external/ruin{ - name = "Supply Dock Airlock" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "eT" = ( /obj/machinery/conveyor{ dir = 5; @@ -1235,19 +821,6 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) -"eZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/cargo/storage) -"fa" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "fb" = ( /obj/machinery/door/airlock/external/ruin{ name = "Departure Lounge Airlock" @@ -1267,23 +840,6 @@ }, /turf/open/floor/plating, /area/station/cargo/storage) -"fe" = ( -/obj/machinery/computer/cargo{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/button/door/directional/east{ - id = "cargounload"; - name = "Loading Doors"; - pixel_y = 8 - }, -/obj/machinery/button/door/directional/east{ - id = "cargoload"; - name = "Loading Doors"; - pixel_y = -8 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "ff" = ( /obj/docking_port/stationary{ dir = 2; @@ -1365,125 +921,21 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"ft" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/hallway/primary/central) -"fw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"fx" = ( -/obj/effect/turf_decal/plaque{ - icon_state = "L1" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"fy" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/plaque{ - icon_state = "L3" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"fz" = ( -/obj/effect/turf_decal/plaque{ - icon_state = "L5" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"fA" = ( -/obj/effect/turf_decal/plaque{ - icon_state = "L7" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "fB" = ( /obj/machinery/status_display/supply, /turf/closed/wall/r_wall, /area/station/cargo/storage) -"fC" = ( -/obj/effect/turf_decal/plaque{ - icon_state = "L9" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"fD" = ( -/obj/machinery/light/directional/north, -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/plaque{ - icon_state = "L11" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"fE" = ( -/obj/effect/turf_decal/plaque{ - icon_state = "L13" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) -"fF" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/caution/stand_clear, -/obj/structure/fans/tiny, -/turf/open/floor/iron, -/area/station/cargo/storage) -"fH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "fI" = ( /obj/machinery/door/airlock, /turf/open/floor/plating, /area/station/maintenance/aft) -"fK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 5 +"fL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 }, -/obj/structure/cable, +/obj/item/storage/part_replacer/bluespace/tier4, /turf/open/floor/iron, -/area/station/commons/storage/primary) +/area/station/cargo/bitrunning/den) "fM" = ( /obj/structure/sign/directions/supply{ dir = 4; @@ -1500,14 +952,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"fN" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/commons/storage/primary) "fO" = ( /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) @@ -1523,24 +967,11 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"fR" = ( -/obj/machinery/door/airlock, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/commons/storage/primary) "fS" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"fW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "fX" = ( /obj/structure/sign/directions/supply{ dir = 4; @@ -1562,21 +993,9 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/storage) -"fZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "ga" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/exit/departure_lounge) -"gb" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "gc" = ( /obj/machinery/door/airlock/external/ruin{ name = "Auxiliary Airlock" @@ -1608,75 +1027,24 @@ }, /turf/open/floor/plating, /area/station/commons/storage/primary) -"gk" = ( +"gi" = ( +/obj/structure/table, +/obj/item/storage/toolbox/syndicate, +/obj/item/debug/omnitool, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"gk" = ( /obj/structure/sign/departments/evac, /turf/closed/wall/r_wall, /area/station/hallway/secondary/exit/departure_lounge) -"gl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) -"gm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 10 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "gn" = ( /obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/station/security/brig) -"go" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) -"gp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/closed/wall/r_wall, -/area/station/cargo/miningoffice) -"gq" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"gr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 5 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"gu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "gv" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"gw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"gx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "gy" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1690,27 +1058,6 @@ /obj/machinery/keycard_auth/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"gB" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"gC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"gD" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/miningoffice) "gE" = ( /obj/machinery/camera/directional/north, /turf/open/floor/iron, @@ -1726,6 +1073,10 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/construction) +"gH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor, +/area/station/cargo/storage) "gI" = ( /obj/machinery/light/directional/north, /obj/machinery/camera/directional/north, @@ -1742,25 +1093,23 @@ /obj/structure/sign/warning/radiation/rad_area/directional/north, /turf/open/floor/plating, /area/station/engineering/gravity_generator) -"gY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/science) "hm" = ( /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/unlocked, /turf/open/floor/plating, /area/station/engineering/atmos) -"hv" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 +"hp" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 }, -/obj/item/storage/part_replacer/bluespace/tier4, /turf/open/floor/iron, -/area/station/cargo/bitrunning/den) +/area/station/hallway/primary/central) +"hr" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) "hD" = ( /obj/structure/closet/secure_closet/chemical/heisenberg{ locked = 0 @@ -1774,32 +1123,69 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron, /area/station/construction) -"is" = ( -/obj/structure/sign/warning/vacuum/external/directional/east, -/obj/machinery/vending/subtype_vendor, -/turf/open/floor/iron, -/area/station/medical/medbay) -"jb" = ( +"io" = ( /obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/command/bridge) +"jg" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L1" + }, /obj/structure/cable, /turf/open/floor/iron, -/area/station/science) -"jE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +/area/station/commons/storage/primary) +"jk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"jz" = ( +/obj/structure/table/glass, +/obj/item/disk/surgery/debug, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/open/floor/plating, -/area/station/engineering/atmos) +/obj/item/disk/data/debug{ + pixel_y = 9; + pixel_x = 7 + }, +/turf/open/floor/iron/white/corner, +/area/station/medical/medbay) +"jL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "jU" = ( /obj/structure/table, /obj/item/melee/energy/axe, /turf/open/floor/iron, /area/station/commons/storage/primary) -"kj" = ( -/obj/machinery/door/airlock, -/obj/structure/cable, +"jZ" = ( +/obj/machinery/sleeper/syndie/fullupgrade, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/camera/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/medical/medbay) +"kf" = ( +/obj/machinery/vending/subtype_vendor, /turf/open/floor/iron, -/area/station/cargo/miningoffice) +/area/station/commons/storage/primary) "kn" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, @@ -1808,129 +1194,191 @@ /obj/structure/server, /turf/open/floor/iron/dark, /area/station/science/explab) -"kQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/central) +"kS" = ( +/turf/closed/wall/r_wall, +/area/station/medical/chemistry) "lc" = ( /turf/open/floor/engine, /area/station/hallway/secondary/entry) -"lg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) -"lH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) -"lX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +"lu" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/central) -"mi" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/light/directional/north, +"mb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"mE" = ( +/area/station/medical/chemistry) +"mk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/machinery/chem_mass_spec, /turf/open/floor/iron, -/area/station/medical/chemistry) -"nn" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/area/station/engineering/main) +"mC" = ( +/turf/open/floor/iron/dark, +/area/station/medical/medbay) +"nb" = ( +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/turf/open/floor/iron/dark, -/area/station/science/explab) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"ng" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/cargo/storage) "nq" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 }, /turf/open/floor/iron, /area/station/commons/storage/primary) -"ny" = ( +"nT" = ( /obj/structure/table, -/obj/item/storage/toolbox/syndicate, -/obj/item/debug/omnitool, +/obj/machinery/light/directional/south, +/obj/item/storage/medkit/regular, +/obj/item/healthanalyzer/advanced, +/obj/item/debug/omnitool/item_spawner, /turf/open/floor/iron, /area/station/commons/storage/primary) -"nI" = ( -/obj/machinery/door/airlock, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron, -/area/station/cargo/bitrunning/den) "od" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"oV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +"os" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/research, +/turf/open/floor/iron/dark, +/area/station/science/explab) +"ou" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/effect/spawner/structure/window/reinforced, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/medical/chemistry) +/area/station/construction) +"oK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/main) +"pe" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/commons/storage/primary) +"pr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "pv" = ( /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"pA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/closed/wall/r_wall, -/area/station/science) -"pI" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +"pw" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L9" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"pL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/caution/stand_clear{ dir = 8 }, -/obj/machinery/door/airlock/external/glass/ruin, -/turf/open/floor/plating, -/area/station/medical/medbay) +/turf/open/floor/iron, +/area/station/cargo/storage) +"pZ" = ( +/obj/machinery/light/directional/north, +/obj/machinery/camera/directional/north, +/obj/effect/turf_decal/plaque{ + icon_state = "L11" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "qb" = ( /obj/machinery/door/airlock, /turf/open/floor/plating, /area/station/engineering/atmos) +"qg" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/turf_decal/stripes/full, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) +"qv" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"qw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "qx" = ( /obj/machinery/airalarm/directional/west, /obj/effect/mapping_helpers/airalarm/unlocked, /turf/open/floor/iron, /area/station/cargo/storage) +"qH" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/iron, +/area/station/medical/chemistry) "qQ" = ( /turf/open/floor/engine, /area/station/cargo/miningoffice) -"rn" = ( +"rh" = ( +/obj/machinery/door/airlock, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/science) +"ru" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"rC" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/plaque{ + icon_state = "L3" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "rK" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"rL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "rT" = ( /turf/open/floor/circuit/green, /area/station/cargo/bitrunning/den) @@ -1938,6 +1386,29 @@ /obj/machinery/door/airlock/shell, /turf/open/floor/iron/dark, /area/station/construction) +"sN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"sT" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/main) +"tn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/medical/chemistry) +"tz" = ( +/obj/machinery/status_display/supply, +/turf/closed/wall/r_wall, +/area/station/commons/storage/primary) "tE" = ( /obj/machinery/door/airlock/research, /turf/open/floor/iron/dark, @@ -1949,6 +1420,13 @@ }, /turf/open/space/basic, /area/space) +"tQ" = ( +/obj/machinery/door/airlock/public/glass, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/medical/chemistry) "tV" = ( /obj/structure/bot, /turf/open/floor/iron/dark, @@ -1974,6 +1452,11 @@ /obj/machinery/light/directional/north, /turf/open/floor/plating, /area/station/engineering/atmos) +"uL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/bitrunning/den) "uO" = ( /obj/machinery/door/airlock/public/glass, /obj/structure/cable, @@ -1995,11 +1478,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/explab) -"vb" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/iron, -/area/station/cargo/bitrunning/den) "vm" = ( /mob/living/circuit_drone, /turf/open/floor/iron/dark, @@ -2014,43 +1492,127 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"vP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +"vB" = ( +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/door/airlock/public/glass, -/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/white/corner, +/area/station/medical/medbay) +"vQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, -/area/station/medical/chemistry) -"wb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +/area/station/cargo/storage) +"vS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/airlock_pump{ dir = 4 }, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/turf/open/floor/iron, +/area/station/engineering/main) +"wa" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/corner{ dir = 1 }, +/area/station/medical/medbay) +"wc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/iron, -/area/station/hallway/primary/central) +/area/station/science) +"wk" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/medical/medbay) +"wl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"wp" = ( +/obj/machinery/door/airlock, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/bitrunning/den) "wB" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"wM" = ( +"wD" = ( +/obj/machinery/door/airlock, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, -/area/station/hallway/secondary/entry) +/area/station/cargo/miningoffice) "wU" = ( /turf/closed/wall/r_wall, /area/station/science/explab) +"xD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron, +/area/station/command/bridge) +"xK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"xY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos) +"ya" = ( +/obj/machinery/atmospherics/components/unary/airlock_pump{ + dir = 8 + }, +/obj/machinery/light/small/red/dim/directional/east, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) +"yi" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) +"yl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "yA" = ( /obj/docking_port/stationary/laborcamp_home{ dir = 8 }, /turf/open/space/basic, /area/space) +"yH" = ( +/obj/effect/turf_decal/stripes/full, +/obj/machinery/door/airlock/external/glass/ruin{ + name = "Medbay Airlock" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/medical/medbay) "yK" = ( /obj/structure/fans/tiny/invisible, /obj/effect/turf_decal/stripes/line{ @@ -2063,6 +1625,12 @@ /obj/machinery/power/rtg/debug, /turf/open/floor/plating/airless, /area/space/nearstation) +"zg" = ( +/obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "zo" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -2073,16 +1641,57 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/science) +"zY" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "Aj" = ( /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/bitrunning/den) -"AP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +"An" = ( +/turf/open/floor/iron/dark, +/area/station/cargo/storage) +"Ao" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/caution/stand_clear{ dir = 8 }, /turf/open/floor/iron, -/area/station/science) +/area/station/cargo/storage) +"AD" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"Bp" = ( +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"Bz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"BB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor, +/area/station/medical/medbay) "BD" = ( /obj/structure/closet/secure_closet/chief_medical{ locked = 0 @@ -2096,13 +1705,44 @@ /obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/iron, /area/station/command/bridge) +"BM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "Ce" = ( /turf/open/floor/iron, /area/station/medical/chemistry) +"Cg" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "Ct" = ( /obj/structure/closet/syndicate/resources/everything, /turf/open/floor/iron, /area/station/science) +"CF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/corner, +/area/station/medical/medbay) +"CG" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) +"CJ" = ( +/obj/machinery/door/airlock/external/glass/ruin{ + name = "Medbay Airlock" + }, +/obj/effect/turf_decal/stripes/full, +/turf/open/floor/iron/dark, +/area/station/medical/medbay) "CQ" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/line{ @@ -2114,11 +1754,6 @@ /obj/machinery/component_printer, /turf/open/floor/iron/dark, /area/station/science/explab) -"CV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/medical/chemistry) "Df" = ( /obj/machinery/light/directional/east, /obj/item/integrated_circuit/loaded/hello_world, @@ -2126,6 +1761,35 @@ /obj/structure/rack, /turf/open/floor/iron/dark, /area/station/science/explab) +"DC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) +"DD" = ( +/mob/living/carbon/human, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/medical/medbay) +"DO" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"DT" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/turf_decal/stripes/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/cargo/storage) "DW" = ( /obj/machinery/computer/scan_consolenew{ dir = 1 @@ -2135,15 +1799,19 @@ }, /turf/open/floor/iron/white/corner, /area/station/medical/medbay) -"EA" = ( +"Ef" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"Es" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/construction) -"EB" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron, -/area/station/medical/medbay) "EG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -2166,13 +1834,21 @@ /obj/effect/mapping_helpers/airalarm/unlocked, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"ES" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +"EN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/meter/layer4, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"ER" = ( +/mob/living/carbon/human, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/central) +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/medical/medbay) "EX" = ( /obj/structure/table, /obj/item/screwdriver{ @@ -2196,6 +1872,70 @@ /obj/effect/mapping_helpers/airalarm/unlocked, /turf/open/floor/iron, /area/station/command/bridge) +"Fy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) +"FA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"FC" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"FE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"GC" = ( +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"GN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"GQ" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/security/brig) +"GV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/cargo/storage) +"GZ" = ( +/obj/machinery/chem_mass_spec, +/turf/open/floor/iron, +/area/station/medical/chemistry) +"Hb" = ( +/obj/machinery/door/airlock, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/construction) +"Hc" = ( +/obj/machinery/camera/directional/north, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"Hg" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L5" + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "HW" = ( /obj/machinery/airalarm/directional/east, /obj/effect/mapping_helpers/airalarm/unlocked, @@ -2213,6 +1953,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/explab) +"Is" = ( +/obj/machinery/door/airlock, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/commons/storage/primary) "Iy" = ( /obj/structure/closet/secure_closet/research_director{ locked = 0 @@ -2220,24 +1965,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/station/command/bridge) -"IB" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/table, -/obj/item/debug/omnitool{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/debug/omnitool/item_spawner{ - pixel_x = 4; - pixel_y = -6 - }, -/turf/open/floor/iron/white/corner{ - dir = 1 - }, -/area/station/medical/medbay) "IF" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -2259,25 +1986,52 @@ }, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"IV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/medical/chemistry) +"IX" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "cargounload" + }, +/obj/structure/sign/warning/vacuum/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) +"Jd" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/commons/storage/primary) "Jp" = ( /obj/machinery/gravity_generator/main, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"JF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 +"JV" = ( +/obj/machinery/camera/autoname/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, -/area/station/medical/chemistry) -"JS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/unlocked, +/area/station/commons/storage/primary) +"Kg" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/full, /turf/open/floor/iron, -/area/station/hallway/primary/central) +/area/station/engineering/main) +"Ks" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/atmos) "Kx" = ( /obj/structure/table, /obj/item/analyzer, @@ -2285,45 +2039,87 @@ /obj/machinery/light/directional/south, /turf/open/floor/plating, /area/station/engineering/atmos) +"Lb" = ( +/obj/machinery/door/airlock, +/turf/open/floor/plating, +/area/station/medical/medbay) +"Lq" = ( +/obj/effect/turf_decal/stripes/full, +/obj/machinery/door/airlock/external/glass/ruin{ + name = "Medbay Airlock" + }, +/turf/open/floor/iron, +/area/station/medical/medbay) "Ly" = ( /obj/machinery/chem_dispenser/chem_synthesizer, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"LH" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 +"LD" = ( +/obj/item/surgery_tray/full/advanced, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/door/airlock/research, -/turf/open/floor/iron/dark, -/area/station/science/explab) +/obj/machinery/light/directional/south, +/turf/open/floor/iron/white/corner, +/area/station/medical/medbay) "LS" = ( /obj/machinery/quantum_server, /turf/open/floor/iron, /area/station/cargo/bitrunning/den) +"LU" = ( +/obj/machinery/vending/subtype_vendor, +/turf/open/floor/iron, +/area/station/medical/chemistry) "LW" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"Ma" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/main) +"Mg" = ( +/obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/medical/medbay) "Mh" = ( /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"Ml" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"My" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/science) "ME" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"MM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "MN" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"MY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/atmos) "Nb" = ( /obj/machinery/bci_implanter, /turf/open/floor/iron/dark, @@ -2332,11 +2128,26 @@ /obj/machinery/chem_recipe_debug, /turf/open/floor/iron, /area/station/medical/chemistry) +"Ni" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/science/explab) "Ns" = ( /obj/machinery/door/airlock/public/glass, /obj/structure/cable, /turf/open/floor/iron, /area/station/medical/medbay) +"Nu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"NG" = ( +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/storage) "NZ" = ( /obj/machinery/rnd/production/protolathe/department, /turf/open/floor/iron, @@ -2362,15 +2173,58 @@ /obj/item/stock_parts/power_store/cell/bluespace, /turf/open/floor/iron/dark, /area/station/science/explab) +"OF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"OI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) +"OO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) +"OS" = ( +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/unlocked, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "OU" = ( /obj/item/disk/tech_disk/debug, /turf/open/floor/iron, /area/station/science) +"Pc" = ( +/obj/effect/turf_decal/plaque{ + icon_state = "L13" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "Pk" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/unlocked, /turf/open/floor/iron/dark, /area/station/science/explab) +"Pr" = ( +/obj/machinery/atmospherics/components/unary/airlock_pump{ + dir = 8 + }, +/obj/machinery/light/small/red/dim/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/medbay) +"Pv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/meter/layer2, +/turf/open/floor/plating, +/area/station/engineering/atmos) "Px" = ( /obj/structure/table, /obj/machinery/reagentgrinder, @@ -2383,19 +2237,11 @@ /obj/effect/mapping_helpers/airalarm/unlocked, /turf/open/floor/iron, /area/station/security/brig) -"Qi" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) -"Qt" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +"PK" = ( +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/door/airlock/external/glass/ruin, -/turf/open/floor/plating, +/turf/open/floor/iron/white/corner, /area/station/medical/medbay) "Qu" = ( /obj/docking_port/stationary/mining_home{ @@ -2403,6 +2249,35 @@ }, /turf/open/floor/engine, /area/station/cargo/miningoffice) +"QM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/science) +"QP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/east{ + id = "cargoload"; + name = "Loading Doors"; + pixel_y = -9 + }, +/obj/machinery/button/door/directional/east{ + id = "cargounload"; + name = "Unloading Doors"; + pixel_y = 8 + }, +/obj/machinery/computer/cargo{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) +"QV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "QY" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -2421,6 +2296,41 @@ /obj/machinery/byteforge, /turf/open/floor/circuit/green, /area/station/cargo/bitrunning/den) +"Ru" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/atmos) +"Rx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/closet/radiation, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) +"RD" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table, +/obj/item/debug/omnitool{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/debug/omnitool/item_spawner{ + pixel_x = 4; + pixel_y = -6 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/medical/medbay) +"RE" = ( +/obj/machinery/door/airlock/external/glass/ruin, +/obj/effect/turf_decal/stripes/full, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/storage) "RM" = ( /obj/structure/closet/secure_closet/hop{ locked = 0 @@ -2449,6 +2359,14 @@ /obj/item/bitrunning_debug, /turf/open/floor/iron, /area/station/cargo/bitrunning/den) +"SU" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/security/brig) +"SX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "Td" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -2460,28 +2378,50 @@ /obj/machinery/door/poddoor, /turf/open/floor/engine, /area/station/hallway/secondary/entry) +"Ts" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Gravity Generator" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/gravity_generator) "Tt" = ( /turf/open/floor/plating, /area/station/maintenance/aft) +"TJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/atmos) "TR" = ( -/obj/machinery/netpod, -/turf/open/floor/iron, -/area/station/cargo/bitrunning/den) -"TV" = ( -/obj/machinery/door/airlock, -/obj/structure/cable, +/obj/machinery/netpod, /turf/open/floor/iron, -/area/station/construction) +/area/station/cargo/bitrunning/den) +"TT" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 8 + }, +/turf/open/space, +/area/space/nearstation) "Ue" = ( /turf/closed/wall/r_wall, /area/station/cargo/bitrunning/den) -"Ut" = ( -/obj/structure/closet/secure_closet/medical3{ - locked = 0 - }, -/obj/item/healthanalyzer/advanced, +"Un" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/medical/medbay) +"Uy" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "Va" = ( /obj/machinery/power/smes/full, /obj/effect/turf_decal/stripes/line{ @@ -2497,23 +2437,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) -"Vr" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/explab) "Vy" = ( /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) -"VA" = ( -/obj/structure/fans/tiny, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) "We" = ( /obj/machinery/newscaster/directional/west, /turf/open/floor/iron, @@ -2522,32 +2449,20 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) -"Wq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) -"Wx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/gravity_generator) "WK" = ( /obj/structure/money_bot, /turf/open/floor/iron/dark, /area/station/science/explab) -"WT" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external/glass/ruin, +"WL" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/medical/medbay) +"WR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/plating, -/area/station/engineering/main) +/turf/open/floor/iron, +/area/station/security/brig) "Xg" = ( /obj/machinery/light/directional/east, /obj/machinery/vending/syndichem{ @@ -2563,10 +2478,44 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"Xy" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/hallway/primary/central) +"XA" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/warning/vacuum/external/directional/east, +/turf/open/floor/iron/white/corner, +/area/station/medical/medbay) "XC" = ( /obj/structure/cable, /turf/open/floor/iron, /area/station/science) +"XF" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "cargoload" + }, +/obj/structure/sign/warning/vacuum/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) +"XG" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) +"XK" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "XN" = ( /obj/structure/table, /obj/item/organ/internal/cyberimp/bci{ @@ -2580,12 +2529,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/explab) -"XR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 9 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) "XU" = ( /obj/machinery/atmospherics/components/tank/air, /obj/machinery/light/directional/north, @@ -2609,6 +2552,11 @@ }, /turf/open/floor/iron/dark, /area/station/science/explab) +"Yt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/machinery/meter, +/turf/open/floor/plating, +/area/station/engineering/atmos) "Yy" = ( /obj/machinery/light/directional/north, /obj/machinery/rnd/production/circuit_imprinter/department, @@ -2616,6 +2564,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science) +"Yz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor, +/area/station/medical/medbay) "YL" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -2628,6 +2581,28 @@ /obj/effect/mapping_helpers/airalarm/unlocked, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"Zl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron, +/area/station/engineering/main) +"Zo" = ( +/obj/structure/table, +/obj/item/gun/magic/wand/resurrection/debug, +/obj/item/gun/magic/wand/death/debug{ + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/debug/human_spawner{ + pixel_x = 6; + pixel_y = -4 + }, +/turf/open/floor/iron/white/corner{ + dir = 1 + }, +/area/station/medical/medbay) "Zz" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/effect/turf_decal/stripes/line, @@ -2636,6 +2611,12 @@ /obj/effect/mapping_helpers/airalarm/unlocked, /turf/open/floor/iron, /area/station/commons/storage/primary) +"ZB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "ZD" = ( /obj/machinery/suit_storage_unit/ce, /turf/open/floor/iron, @@ -3410,7 +3391,7 @@ aa Ue LS Yd -hv +fL TR Ue aa @@ -3502,7 +3483,7 @@ aa Ue IF Aj -vb +uL SC Ue aa @@ -3594,7 +3575,7 @@ em Ue Ue Ue -nI +wp QY Ue Tj @@ -3686,7 +3667,7 @@ rK rK vy em -aB +jL eh LW lc @@ -3778,7 +3759,7 @@ qQ qQ ME em -aB +jL eh LW lc @@ -3870,7 +3851,7 @@ qQ qQ ME em -aB +jL eh LW lc @@ -3962,7 +3943,7 @@ qQ qQ CQ em -mi +OF eh LW lc @@ -4054,7 +4035,7 @@ qQ qQ ME em -aB +jL eh LW lc @@ -4146,7 +4127,7 @@ qQ qQ YL em -aB +jL eh LW lc @@ -4235,11 +4216,11 @@ II Td II II -gl -gD -kj -aB -wM +Uy +Cg +wD +jL +jL LW lc lc @@ -4327,11 +4308,11 @@ em em em EM -gm -go -gp -eL -gr +yi +yi +em +eh +ax LW lc lc @@ -4423,7 +4404,7 @@ dY dY dY eh -gu +ax LW lc lc @@ -4515,7 +4496,7 @@ od dj ed eh -gu +ax LW lc lc @@ -4607,7 +4588,7 @@ fi dP ex eh -gu +ax LW lc lc @@ -4699,7 +4680,7 @@ Re dV dY ej -gu +ax LW lc lc @@ -4791,7 +4772,7 @@ dY dY dY eh -gu +ax LW lc lc @@ -4883,7 +4864,7 @@ aa aa dY gE -gu +ax LW lc lc @@ -4974,8 +4955,8 @@ aa aa aa dY -gq -ei +SX +ax LW lc lc @@ -4986,7 +4967,7 @@ lc lc wB eh -gw +GN dY aa aa @@ -4994,7 +4975,7 @@ aa aa aa dY -gB +ru eh en aa @@ -5067,7 +5048,7 @@ aa aa dY eh -gu +ax LW lc lc @@ -5078,7 +5059,7 @@ lc lc wB eh -ek +BM en aa aa @@ -5086,7 +5067,7 @@ aa aa aa en -ek +BM eh dY aa @@ -5159,7 +5140,7 @@ aa aa dY eh -gu +ax LW lc lc @@ -5170,7 +5151,7 @@ lc lc wB eh -ek +BM en aa aa @@ -5178,7 +5159,7 @@ aa aa aa en -ek +BM eh en aa @@ -5251,7 +5232,7 @@ aa aa dY ej -gu +ax LW lc lc @@ -5262,7 +5243,7 @@ lc lc wB eh -ek +BM en aa aa @@ -5270,7 +5251,7 @@ aa aa aa en -ek +BM eh dY aa @@ -5343,7 +5324,7 @@ aa aa dY eh -gu +ax LW lc lc @@ -5354,7 +5335,7 @@ lc lc wB eh -gx +Ml dY aa aa @@ -5362,7 +5343,7 @@ aa aa aa dY -gC +OI eh dY aa @@ -5435,7 +5416,7 @@ aa aa dY eh -gu +ax LW lc lc @@ -5446,7 +5427,7 @@ lc lc wB eh -ek +BM en aa aa @@ -5454,7 +5435,7 @@ eE aa aa en -ek +BM eh dY aa @@ -5527,7 +5508,7 @@ bw ag ag eh -gu +ax LW dh en @@ -5538,7 +5519,7 @@ en dY wB eh -ek +BM dY dY fn @@ -5546,7 +5527,7 @@ fs en dY dY -ek +BM eh dY aa @@ -5619,7 +5600,7 @@ aD dR ag eh -gu +ax eh eV eh @@ -5630,7 +5611,7 @@ eh eV eh eh -ek +BM eh eV eh @@ -5638,7 +5619,7 @@ eh eh eV eh -ek +BM eh dY aa @@ -5703,34 +5684,34 @@ ag gn aD aD -bH -ci -ci -ci -ci -ci -eg -ei -gu -ei -ep -ei -ei -ei -ei -ei -ei -ei -ei -gu -ei -ei -ei -ei -ei -ei -Qi -fZ +SU +WR +WR +WR +WR +WR +GQ +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +jL +BM eh dY aa @@ -5805,7 +5786,7 @@ ag eh eh eh -gu +ax eh eh eh @@ -5821,7 +5802,7 @@ eh eh eh eh -rn +jL eh eh dY @@ -5897,7 +5878,7 @@ bA gd bA bZ -ft +Xy bZ cN cN @@ -5913,7 +5894,7 @@ cN cN cN cN -LH +os en dY dY @@ -5980,7 +5961,7 @@ ut aw hm aw -aw +hr Kx ah zS @@ -5989,7 +5970,7 @@ ca If bA kn -ES +xK bE cN Sg @@ -6005,7 +5986,7 @@ dy dm dM cN -Vr +Ni vm uQ Ov @@ -6069,22 +6050,22 @@ aa aa ah am -aw -aw -ba -jE -MY -bk -bt -bt -bt -AP -pA -kQ -ES -rL -cP -cX +EN +FC +FC +Nu +xY +Ks +My +My +My +bD +bA +XK +xK +Mh +cN +ou dn dn dn @@ -6097,7 +6078,7 @@ dn dn dL sr -nn +OO ZP ZP WK @@ -6161,22 +6142,22 @@ aa aa ah dS -aw +GC aN bb -bl +Ru zo ah Yy bD -XC -gY -jb -ES -bE -Mh -TV -EA +QM +QM +rh +ZB +QV +FA +Hb +Es dn dn dn @@ -6253,19 +6234,19 @@ aa aa ah am -aw +bm aO bc -bm +Ru ZD ah bF OU -XC +wc Ct gd -cA bE +QV bE ef cY @@ -6345,10 +6326,10 @@ aa aa ah XU -bl -aP -aP -XR +Yt +FE +FE +Pv Xp ah NZ @@ -6356,8 +6337,8 @@ bD XC co bA -JS -bE +OS +QV bE cN dW @@ -6436,11 +6417,11 @@ aa aa aa ah -Wh -ah ah Wh -ah +Wh +Wh +TJ ah ah bu @@ -6448,8 +6429,8 @@ bu cd bu bu -cB -bE +Ef +QV bE cN cY @@ -6532,7 +6513,7 @@ ab ab ab ab -ab +TT ab ab bu @@ -6540,9 +6521,9 @@ Fd ce cp bu -cC -lX -bE +Hc +QV +hp cN cY dn @@ -6632,8 +6613,8 @@ bI cf EI bv -dU -bE +Hc +QV bE cN cY @@ -6724,8 +6705,8 @@ BG cf BD bu -dU -bE +Hc +QV bE cN cY @@ -6814,10 +6795,10 @@ ab bv bJ cf -cq -cw -Wq -bE +xD +io +lu +QV bE ef cY @@ -6908,8 +6889,8 @@ bK cf Iy bu -cD -bE +XG +QV bE ef cY @@ -6991,7 +6972,7 @@ ae ac ac aj -aC +Kg aj ac ac @@ -7000,8 +6981,8 @@ aK cf RM bv -cD -bE +XG +QV bE cN dK @@ -7083,7 +7064,7 @@ aj aj aj aj -VA +vS aj ac ac @@ -7092,8 +7073,8 @@ bM cg cr bu -wb -bE +DO +QV bE cS cS @@ -7175,7 +7156,7 @@ aj al aA aj -WT +eB aj aj aj @@ -7184,8 +7165,8 @@ bu cd bu bu -cE -bE +kS +QV bE cS Zz @@ -7267,7 +7248,7 @@ aj ap aA We -Vy +Ma aS bd bo @@ -7276,8 +7257,8 @@ hD cj ct Nc -cF -bE +qH +QV bE cS dc @@ -7358,21 +7339,21 @@ aa aj aq Vy -Vy -aE -aT -be -be -bx -CV -CV -ch -CV -cT -bN -bN -da -fK +Zl +Ma +oK +oK +oK +sT +IV +IV +Ce +Ce +qH +QV +bE +cS +qv dJ dJ dJ @@ -7451,20 +7432,20 @@ aj IH aA aH -aF -lg +aA +mk bf bp aj Px +tn Ce -JF -mE -oV -bE +GZ +qH +QV bE cS -fx +jg dq dJ dJ @@ -7475,7 +7456,7 @@ dJ dJ dJ dJ -ny +gi cS fI ga @@ -7544,19 +7525,19 @@ ad ak ak ak -aU +Ts ak ak ak bQ -Ce -Ce -cj -vP -Mh +tn +tn +tn +tQ +sN Vg cS -fy +rC dr dJ dJ @@ -7567,7 +7548,7 @@ dJ dJ dJ dJ -dO +nT cS fO fO @@ -7635,20 +7616,20 @@ ad af ak Va -aG -aV +Bp +nb bg bq ak bR cj +mb cj -cj -oV -bE +qH +QV Mh uO -fz +Hg ds dJ dJ @@ -7726,21 +7707,21 @@ aa bY af ak -at -Wx +Rx +bh bh bh br ak bS Ce -Ce +LU cj -oV -bE -bE -cV -fA +qH +QV +QV +zg +ay dt dJ dD @@ -7828,11 +7809,11 @@ Ly EX Xg cj -oV -bE +qH +QV bE cV -fC +pw du dJ dJ @@ -7920,11 +7901,11 @@ by ck by Ns -cG -cx +by +Mg by by -fD +pZ dv dJ dJ @@ -8010,13 +7991,13 @@ av by Ot cl -IB +RD cl -cH -cu +Zo +wa cJ by -fE +Pc dw dJ dJ @@ -8027,7 +8008,7 @@ dJ dJ dJ dJ -dN +kf cS fQ fO @@ -8100,20 +8081,20 @@ av Jp av by -bV -cm +DD cm cm cm cm +WL Sj by -dA +jk dJ dJ dJ dJ -dF +yl dJ dJ dJ @@ -8122,8 +8103,8 @@ dJ dJ cS fS -lH -gb +fO +AD fO gk aa @@ -8192,30 +8173,30 @@ MN MN av by -bW -cm -cm +ER cm cm cm -cL +Un +WL +LD by -dk -eH -eH -eH -eH -fH -fw -eH -eH -eH -eH -fH -fR -fW -lH -fO +DC +Bz +Bz +Bz +Bz +wl +DC +MM +MM +MM +MM +qw +pe +pr +Fy +Fy fO ga aa @@ -8284,21 +8265,21 @@ aY av av by -bX +jZ +cm cm -is -cy -Ut cm -cK +cm +WL +jz by dB dx dl dl gg -ez -dB +JV +zY dl dl dl @@ -8376,12 +8357,12 @@ ak ak ak by -by -dH -by -Qt -by -EB +er +cm +cm +cm +cm +WL DW by cS @@ -8389,9 +8370,9 @@ cS cS cS cS -fN -vv -cS +Is +Jd +tz cS cS cS @@ -8467,13 +8448,13 @@ af af af af -af -af -af -by -cz -by -cm +Lb +wk +PK +PK +CF +XA +vB es by eu @@ -8481,8 +8462,8 @@ eu qx eP fY -eZ -eu +NG +vQ fq fr eu @@ -8559,13 +8540,13 @@ ad ad ad ad -ad -ad -ad by -pI by by +Lq +yH +by +ck by by eu @@ -8573,8 +8554,8 @@ eu eu eQ eu -fa -eu +CG +vQ eu eu fo @@ -8651,25 +8632,25 @@ fg fg fg fg -fg -fg -fg -fg -fg -fg -fg -fg -et +aa +aa +ck +mC +BB +Yz +mC +mC +by ev eA eA -eA +IX eN -ev -fe -ev +Ao +QP +pL eT -fm +XF fm ev et @@ -8745,23 +8726,23 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +ck +mC +mC +Pr +mC +mC +by et -fB -fh fh fh +et eY -eR -fh -eR +DT +et +RE fc -fh +et fh fh et @@ -8837,23 +8818,23 @@ aa aa aa aa +by +ck +ck +by +CJ +CJ +by aa aa aa -aa -aa -aa -aa -aa -aa -aa -ew +fh eC -fF -fB -fF +gH +ng +GV fl -ew +fh aa aa aa @@ -8940,11 +8921,11 @@ aa aa aa fh -eY -eS -fh -eS -fc +eC +An +ya +An +fl fh aa aa @@ -9031,13 +9012,13 @@ aa aa aa aa -aa -aa -eJ -aa -aa -aa -aa +et +eY +qg +fB +qg +fc +et aa aa aa @@ -9125,7 +9106,7 @@ aa aa aa aa -aa +eJ aa aa aa diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index de18983531fd8..274728a23d207 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -9314,11 +9314,6 @@ pixel_x = 7; pixel_y = 5 }, -/obj/item/paper/fluff/junkmail_redpill/true, -/obj/item/paper/fluff/junkmail_redpill{ - pixel_x = 1; - pixel_y = 8 - }, /obj/item/paper/fluff/jobs/prisoner/letter, /obj/item/paper/fluff/jobs/security/court_judgement{ pixel_x = -5; diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 34f223d52fdbc..f9988a1d780a5 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -1043,13 +1043,17 @@ /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) "aoS" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, +/obj/effect/mapping_helpers/airlock/autoname, /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, -/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/machinery/duct, /turf/open/floor/plating, -/area/station/maintenance/central) +/area/station/service/janitor) "aoY" = ( /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, @@ -1172,13 +1176,14 @@ }, /area/station/tcommsat/server) "aqD" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, /obj/structure/closet/l3closet/janitor, /obj/machinery/firealarm/directional/north, /obj/machinery/light_switch/directional/east, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/item/plunger/reinforced, +/turf/open/floor/iron/checker, /area/station/service/janitor) "aqE" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, @@ -1540,7 +1545,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/service/janitor) "avb" = ( /obj/effect/spawner/random/vending/colavend, @@ -2778,7 +2783,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/service/janitor) "aLr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3758,7 +3763,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/service/janitor) "aYT" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -4027,7 +4032,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /obj/machinery/meter, /obj/structure/closet/crate/freezer/blood, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/virology) "bcq" = ( /obj/structure/closet/secure_closet/nanotrasen_consultant/station, @@ -4431,9 +4436,17 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) "biT" = ( -/obj/effect/spawner/random/structure/steam_vent, -/turf/open/floor/plating, -/area/station/maintenance/central) +/obj/structure/table, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/newscaster/directional/south, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/key/janitor, +/turf/open/floor/iron/checker, +/area/station/service/janitor) "bjf" = ( /turf/open/floor/iron, /area/station/cargo/storage) @@ -5785,7 +5798,8 @@ "bFr" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron, +/obj/structure/cable, +/turf/open/floor/iron/checker, /area/station/service/janitor) "bFs" = ( /obj/structure/table, @@ -6797,15 +6811,8 @@ /turf/open/floor/plating, /area/station/maintenance/disposal) "bUL" = ( -/obj/structure/closet/secure_closet/animal, -/obj/machinery/firealarm/directional/south, -/obj/item/knife/bowie{ - force = 12; - name = "David's Bowie knife"; - desc = "A frontiersman's classic, closer to a shortsword than a knife. It boasts a full-tanged build, a brass handguard and pommel, a wicked sharp point, and a large, heavy blade, It's almost everything you could want in a knife, besides portability. Seems a little dull due to excessive use against space bears." - }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron, +/mob/living/basic/lizard/eats_the_roaches, +/turf/open/floor/iron/checker, /area/station/service/janitor) "bVk" = ( /obj/structure/window/reinforced/spawner/directional/east, @@ -7801,7 +7808,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/commons/storage) "cjp" = ( /obj/structure/extinguisher_cabinet/directional/east, @@ -9680,7 +9687,7 @@ /area/station/medical/storage) "cNM" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/virology) "cNO" = ( /obj/structure/cable, @@ -14209,8 +14216,26 @@ /area/station/engineering/asteroid_lobby) "eaB" = ( /obj/structure/table, -/obj/item/phone, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/grenade/chem_grenade/cleaner{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/grenade/chem_grenade/cleaner, +/obj/machinery/light/warm/directional/east, +/obj/item/radio/intercom/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 9; + pixel_y = 2 + }, +/turf/open/floor/iron/checker, /area/station/service/janitor) "eaG" = ( /turf/closed/wall/mineral/wood, @@ -15875,7 +15900,13 @@ "ewf" = ( /obj/machinery/teleport/station, /obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, /area/station/command/gateway) "ewg" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ @@ -17138,7 +17169,8 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/obj/structure/cable, +/turf/open/floor/iron/checker, /area/station/service/janitor) "eNR" = ( /obj/effect/turf_decal/stripes/line{ @@ -17828,7 +17860,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/engine, /area/station/ai_monitored/command/storage/eva) "eYc" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -18742,15 +18777,16 @@ /turf/open/floor/plating, /area/station/maintenance/starboard) "flb" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/service/janitor, -/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/trimline/yellow/filled/warning, /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, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/duct, +/turf/open/floor/iron/checker, /area/station/service/janitor) "flr" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2, @@ -20882,7 +20918,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/service/janitor) "fNB" = ( /obj/structure/rack, @@ -21955,9 +21991,9 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) "gcJ" = ( -/obj/effect/turf_decal/stripes/line, /obj/machinery/teleport/hub, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/end, +/turf/open/floor/engine, /area/station/command/gateway) "gcM" = ( /obj/machinery/door/airlock/maintenance, @@ -22096,11 +22132,19 @@ /turf/open/floor/engine, /area/station/engineering/rbmk2) "gft" = ( -/obj/item/assembly/mousetrap/armed{ - dir = 4 +/obj/structure/table, +/obj/machinery/requests_console/auto_name/directional/south, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/item/toy/figure/janitor, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 }, -/turf/open/floor/plating, -/area/station/maintenance/central) +/obj/item/melee/flyswatter, +/obj/item/key/janitor, +/turf/open/floor/iron/checker, +/area/station/service/janitor) "gfu" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, @@ -24595,6 +24639,17 @@ "gTe" = ( /turf/open/floor/glass/reinforced/scrape_below, /area/station/science/research) +"gTh" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/camera/autoname/directional/south, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/iron/checker, +/area/station/service/janitor) "gTr" = ( /obj/structure/closet/wardrobe/genetics_white, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, @@ -26068,14 +26123,11 @@ /turf/open/floor/engine/o2, /area/station/engineering/atmos) "hoQ" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 }, -/obj/machinery/airalarm/directional/south, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron, +/obj/machinery/portable_atmospherics/canister/water_vapor, +/turf/open/floor/iron/checker, /area/station/service/janitor) "hoV" = ( /obj/effect/spawner/structure/window/reinforced, @@ -28127,7 +28179,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/meter, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/virology) "hSp" = ( /obj/machinery/conveyor{ @@ -30444,7 +30496,7 @@ dir = 1 }, /obj/effect/spawner/random/trash/mopbucket, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/service/janitor) "iCx" = ( /obj/effect/turf_decal/siding/dark{ @@ -32407,15 +32459,11 @@ /turf/open/floor/plating, /area/station/engineering/atmos) "jcM" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/trimline/yellow/filled/warning, -/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 = 6 - }, -/turf/open/floor/iron, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron/checker, /area/station/service/janitor) "jcV" = ( /obj/effect/landmark/atmospheric_sanity/ignore_area, @@ -33154,7 +33202,10 @@ dir = 8 }, /obj/structure/mop_bucket/janitorialcart, -/turf/open/floor/iron, +/obj/item/storage/bag/trash, +/obj/item/mop, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron/checker, /area/station/service/janitor) "jmn" = ( /obj/effect/turf_decal/stripes/line{ @@ -34060,7 +34111,7 @@ pixel_x = -8; req_access = list("janitor") }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/service/janitor) "jAO" = ( /turf/open/floor/glass/reinforced/scrape_below, @@ -34453,8 +34504,12 @@ /obj/item/air_refresher, /obj/item/air_refresher, /obj/item/air_refresher, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/checker, /area/station/service/janitor) "jId" = ( /obj/machinery/door/airlock/engineering{ @@ -34630,9 +34685,8 @@ /turf/open/floor/wood, /area/station/security/courtroom) "jLf" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos{ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos/layer2{ dir = 1; - piping_layer = 2; icon_state = "dpvent_map-2" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -34728,7 +34782,7 @@ /area/station/medical/medbay/lobby) "jMl" = ( /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark, +/turf/open/floor/engine, /area/station/service/janitor) "jMm" = ( /obj/structure/plasticflaps, @@ -35148,12 +35202,15 @@ /turf/open/floor/plating, /area/station/maintenance/evac_maintenance) "jRy" = ( -/obj/structure/railing{ - dir = 10 +/obj/effect/spawner/random/structure/table_fancy, +/obj/structure/window/spawner/directional/west{ + name = "IN CASE OF EMERGENCY, BREAK GLASS" }, -/obj/effect/spawner/random/trash/mopbucket, +/obj/item/grenade/clusterbuster/cleaner, +/obj/machinery/light/floor, +/obj/structure/sign/poster/official/cleanliness/directional/east, /turf/open/floor/plating, -/area/station/maintenance/central) +/area/station/service/janitor) "jRA" = ( /obj/structure/sign/flag/nanotrasen/directional/south, /obj/item/radio/intercom/command/directional/west, @@ -35359,9 +35416,8 @@ }, /obj/machinery/light_switch/directional/north, /obj/machinery/camera/autoname/toxins/directional/north, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - piping_layer = 2 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 4 }, /turf/open/floor/iron/dark, /area/station/science/ordnance) @@ -37308,7 +37364,7 @@ dir = 1 }, /obj/effect/landmark/start/janitor, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/service/janitor) "kxb" = ( /obj/structure/cable, @@ -38964,7 +39020,7 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/service/janitor) "kUw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40082,6 +40138,13 @@ /obj/machinery/light/warm/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"ljI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/central) "ljU" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -41033,7 +41096,7 @@ "lxe" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark, +/turf/open/floor/engine, /area/station/service/janitor) "lxk" = ( /obj/structure/table, @@ -43159,7 +43222,7 @@ /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, /obj/effect/spawner/random/engineering/material, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/commons/storage) "maI" = ( /obj/effect/turf_decal/stripes/line{ @@ -43186,7 +43249,7 @@ /area/station/command/heads_quarters/nt_rep) "maQ" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/medical/virology) "maY" = ( /turf/open/floor/iron/dark, @@ -43813,7 +43876,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/iron/dark, +/turf/open/floor/engine, /area/station/service/janitor) "mjY" = ( /obj/effect/turf_decal/stripes/line{ @@ -46591,10 +46654,12 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "mZP" = ( -/obj/structure/table, -/obj/item/paint/paint_remover, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron, +/obj/machinery/door/window/right/directional/west{ + name = "Janitorial Deliveries"; + req_access = list("janitor") + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, /area/station/service/janitor) "mZQ" = ( /obj/machinery/telecomms/processor/preset_one, @@ -47406,7 +47471,7 @@ /obj/machinery/newscaster/directional/north, /obj/item/radio/intercom/directional/east, /obj/effect/spawner/random/engineering/vending_restock, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/commons/storage) "nnd" = ( /obj/structure/cable, @@ -48547,7 +48612,10 @@ /obj/item/door_seal, /obj/item/door_seal, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/engine, /area/station/ai_monitored/command/storage/eva) "nDk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -50196,6 +50264,15 @@ }, /turf/open/floor/engine/cult, /area/station/service/library/private) +"obE" = ( +/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, +/obj/effect/turf_decal/delivery, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/central) "obI" = ( /obj/effect/turf_decal/siding/wood, /turf/open/misc/grass/jungle, @@ -50917,6 +50994,16 @@ /obj/item/clothing/head/helmet/toggleable/justice, /turf/open/floor/iron/dark, /area/station/security/lockers) +"okH" = ( +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/effect/spawner/random/trash/moisture, +/turf/open/floor/plating, +/area/station/maintenance/central) "okJ" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/showcase/machinery/tv/broken, @@ -53832,6 +53919,15 @@ "pbU" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/command/storage/eva) +"pbX" = ( +/obj/structure/railing{ + dir = 10 + }, +/obj/structure/reagent_dispensers/plumbed{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/central) "pce" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -54010,7 +54106,7 @@ /obj/effect/mapping_helpers/requests_console/supplies, /obj/effect/mapping_helpers/requests_console/information, /obj/machinery/firealarm/directional/west, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/commons/storage) "pdN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56263,7 +56359,10 @@ /obj/machinery/computer/teleporter{ dir = 8 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/turf/open/floor/engine, /area/station/command/gateway) "pLk" = ( /obj/structure/window/reinforced/spawner/directional/south, @@ -56358,7 +56457,8 @@ /obj/structure/rack, /obj/item/clothing/suit/costume/poncho/ponchoshame, /obj/item/clothing/head/costume/sombrero/shamebrero, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, /area/station/ai_monitored/command/storage/eva) "pMz" = ( /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ @@ -57664,7 +57764,7 @@ /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/plating, -/area/station/maintenance/disposal) +/area/station/service/janitor) "qeq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58116,12 +58216,8 @@ /turf/open/floor/plating, /area/station/maintenance/port) "qjX" = ( -/obj/structure/table, -/obj/item/key/janitor, -/obj/item/reagent_containers/spray/cleaner, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron, +/mob/living/basic/lizard/wags_his_tail, +/turf/open/floor/iron/checker, /area/station/service/janitor) "qkc" = ( /obj/structure/closet/crate/engineering, @@ -61766,6 +61862,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/work) +"rlk" = ( +/obj/vehicle/ridden/janicart{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/engine, +/area/station/service/janitor) "rlm" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/cable, @@ -63966,6 +64072,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) "rQY" = ( @@ -70140,6 +70247,7 @@ /obj/structure/rack, /obj/effect/spawner/random/techstorage/security_all, /obj/effect/turf_decal/stripes/line, +/obj/machinery/newscaster/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) "tDk" = ( @@ -70967,13 +71075,13 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine) "tOa" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/structure/table, -/obj/item/melee/flyswatter, -/obj/item/plunger/reinforced, -/obj/item/lightreplacer, -/turf/open/floor/iron, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron/checker, /area/station/service/janitor) "tOi" = ( /obj/structure/fluff/drake_statue, @@ -71190,17 +71298,9 @@ /turf/open/floor/iron, /area/station/cargo/lobby) "tRy" = ( -/obj/structure/railing/corner/end{ - dir = 4 - }, -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, -/obj/effect/spawner/random/trash/moisture, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/maintenance/central) +/area/station/engineering/storage/tech) "tRE" = ( /obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, @@ -73004,7 +73104,7 @@ dir = 1 }, /obj/effect/landmark/start/janitor, -/turf/open/floor/iron, +/turf/open/floor/iron/checker, /area/station/service/janitor) "uro" = ( /obj/effect/spawner/random/trash/moisture_trap, @@ -73662,11 +73762,11 @@ /turf/open/floor/wood, /area/station/service/library/artgallery) "uAS" = ( -/mob/living/basic/lizard/wags_his_tail, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/obj/machinery/duct, +/obj/structure/cable, +/turf/open/floor/iron/checker, /area/station/service/janitor) "uAT" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -74320,7 +74420,10 @@ /area/station/service/library/abandoned) "uLf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/mob/living/basic/bot/cleanbot{ + name = "Steals-Your-Job" + }, +/turf/open/floor/iron/checker, /area/station/service/janitor) "uLo" = ( /obj/effect/mapping_helpers/broken_floor, @@ -74687,6 +74790,15 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/maintenance/central) +"uRb" = ( +/obj/structure/plasticflaps/opaque, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Custodial Closet"; + name = "Custodial Closet" + }, +/turf/open/floor/plating, +/area/station/maintenance/central) "uRl" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -74865,17 +74977,16 @@ /turf/open/misc/hay, /area/station/biodome) "uUg" = ( -/obj/structure/table, -/obj/item/key/janitor, -/obj/machinery/requests_console/auto_name/directional/south, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/item/toy/figure/janitor, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ +/obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/turf/open/floor/iron, +/obj/structure/table, +/obj/item/storage/box/lights/mixed{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/lightreplacer, +/turf/open/floor/iron/checker, /area/station/service/janitor) "uUh" = ( /obj/effect/turf_decal/siding/wood, @@ -75263,7 +75374,7 @@ /obj/structure/cable, /obj/effect/landmark/navigate_destination/autoname, /obj/machinery/door/firedoor, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/commons/storage) "uZL" = ( /obj/effect/landmark/start/cook, @@ -75887,7 +75998,6 @@ /turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) "vjq" = ( -/obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/camera/autoname/directional/east, @@ -76267,7 +76377,10 @@ /obj/item/stack/sheet/plasteel/twenty, /obj/machinery/light/small/directional/west, /obj/item/construction/rcd/loaded, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/engine, /area/station/ai_monitored/command/storage/eva) "vos" = ( /turf/closed/wall, @@ -76937,7 +77050,6 @@ /area/station/command/meeting_room) "vyS" = ( /obj/structure/rack, -/obj/machinery/newscaster/directional/north, /obj/effect/spawner/random/techstorage/service_all, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, @@ -79315,7 +79427,10 @@ }, /obj/item/radio/intercom/directional/north, /obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/engine, /area/station/ai_monitored/command/storage/eva) "wiL" = ( /obj/structure/chair, @@ -80010,7 +80125,8 @@ /obj/effect/landmark/start/janitor, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/obj/structure/cable, +/turf/open/floor/iron/checker, /area/station/service/janitor) "wtC" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -81167,9 +81283,17 @@ /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "wKR" = ( -/obj/effect/spawner/random/trash/moisture_trap, -/turf/open/floor/plating, -/area/station/maintenance/central) +/obj/structure/closet/secure_closet/animal, +/obj/machinery/firealarm/directional/south, +/obj/item/knife/bowie{ + force = 12; + name = "David's Bowie knife"; + desc = "A frontiersman's classic, closer to a shortsword than a knife. It boasts a full-tanged build, a brass handguard and pommel, a wicked sharp point, and a large, heavy blade, It's almost everything you could want in a knife, besides portability. Seems a little dull due to excessive use against space bears." + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/light/warm/directional/south, +/turf/open/floor/iron/checker, +/area/station/service/janitor) "wKY" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, @@ -82153,6 +82277,14 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) +"wYR" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/central/aft) "wYU" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -82835,7 +82967,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) "xkE" = ( @@ -83627,7 +83758,7 @@ "xxg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/commons/storage) "xxj" = ( /obj/effect/landmark/start/engineering_guard, @@ -83686,6 +83817,14 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"xxD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/ai_monitored/command/storage/eva) "xxP" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/structure/cable, @@ -84588,7 +84727,9 @@ /turf/open/floor/iron, /area/station/cargo/storage) "xJs" = ( -/obj/structure/girder, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/railing/corner/end/flip, /turf/open/floor/plating, /area/station/maintenance/central) "xJu" = ( @@ -85364,7 +85505,7 @@ /obj/machinery/light_switch/directional/east, /obj/machinery/camera/autoname/directional/east, /obj/machinery/power/floodlight, -/turf/open/floor/iron, +/turf/open/floor/iron/dark, /area/station/commons/storage) "xUd" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -86391,10 +86532,9 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance) "yhg" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) "yhB" = ( @@ -242841,7 +242981,7 @@ ekY kon eSO kqc -kon +xxD pMu pbU pTm @@ -250084,7 +250224,7 @@ crh qdL crh crh -xAV +crh xAV xAV xAV @@ -250333,17 +250473,17 @@ aKN lkv jdF rkT -wPD +wYR eMH -mjW +rlk lxe iCv aYP kUu uUg +gft xAV qlq -jTr kyE uHj xAV @@ -250590,7 +250730,7 @@ lkv lkv kAg rkT -wPD +wYR eMH mjW jMl @@ -250598,9 +250738,9 @@ urn fNx aLo qjX +biT xAV xYZ -fIo oIL jVx ubz @@ -250855,16 +250995,16 @@ kwN fNx uLf bUL +wKR xAV iTX -jVx bFz jTr eOD wjy wjy wjy -oNm +tRy pmR jis iWb @@ -251114,7 +251254,7 @@ uAS jcM flb aoS -jmO +obE jbe jTr ubz @@ -251369,10 +251509,10 @@ eaB mZP tOa hoQ +gTh xAV -jRy -riO -gft +pbX +sSh shG eOD wjy @@ -251623,13 +251763,13 @@ naw xAV xAV xAV +uRb xAV +jRy xAV xAV -xAV -tRy +okH sSh -fIo jTr ubz wjy @@ -251879,14 +252019,14 @@ cVl aUc xAV aGX -xJs -wKR -jTr -jTr +jVx +fIo +xAV +xAV xAV +xJs coT sSh -biT jTr eOD wjy @@ -252138,7 +252278,7 @@ cLi sSh sSh sSh -sSh +ljI sSh vBA sSh @@ -252406,7 +252546,7 @@ eOD wjy wjy wjy -oNm +tRy vyS jis qny @@ -252649,7 +252789,7 @@ oeJ xAV xAV xAV -sSh +ljI jTr xAV qyL diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 5599fdb90228f..8e5717b9df42d 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -664,8 +664,9 @@ /turf/open/floor/iron/stairs/medium, /area/station/escapepodbay) "act" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 +/obj/structure/railing, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 }, /turf/open/floor/iron, /area/station/commons/storage/primary) @@ -740,21 +741,13 @@ /turf/open/floor/iron, /area/station/hallway/secondary/service) "acF" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" }, -/obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/commons/storage/primary) "acG" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/corner{ +/obj/effect/turf_decal/trimline/yellow/line{ dir = 8 }, /turf/open/floor/iron, @@ -1163,9 +1156,18 @@ /turf/open/floor/iron, /area/station/maintenance/tram/right) "adE" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner, -/obj/structure/cable, -/turf/open/floor/iron, +/obj/structure/table, +/obj/item/assembly/igniter{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/assembly/igniter{ + pixel_y = 4 + }, +/obj/item/clothing/gloves/color/fyellow{ + pixel_x = 5 + }, +/turf/open/floor/iron/smooth, /area/station/commons/storage/primary) "adF" = ( /obj/effect/turf_decal/siding/thinplating/dark{ @@ -1248,11 +1250,13 @@ /turf/open/floor/iron/dark, /area/station/escapepodbay) "adU" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, -/obj/structure/cable, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/iron, /area/station/commons/storage/primary) "adV" = ( @@ -3751,8 +3755,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/station/cargo/drone_bay) "axC" = ( @@ -5050,6 +5053,12 @@ }, /turf/open/openspace, /area/station/hallway/primary/tram/center) +"aKG" = ( +/obj/structure/railing, +/turf/open/floor/iron/stairs{ + dir = 8 + }, +/area/station/commons/storage/primary) "aKL" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/machinery/door/firedoor/border_only, @@ -5300,16 +5309,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"aML" = ( -/obj/machinery/camera/directional/north{ - network = list("ss13","rd"); - c_tag = "Science - Monkey Pit" - }, -/obj/machinery/light/warm/directional/north, -/turf/open/misc/dirt/jungle{ - baseturfs = /turf/open/misc/dirt - }, -/area/station/science/explab) "aMM" = ( /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/scrubber, @@ -5733,6 +5732,11 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) +"aQL" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/spawner/random/structure/twelve_percent_spirit_board, +/turf/open/floor/iron/grimy, +/area/station/service/chapel/office) "aQM" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -6056,18 +6060,16 @@ /turf/open/floor/iron/white, /area/station/science/lower) "aWJ" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" }, -/obj/machinery/door/firedoor, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/navigate_destination/tools, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/station/commons/storage/primary) "aWL" = ( @@ -6775,10 +6777,6 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/station/command/bridge) -"bpn" = ( -/mob/living/carbon/human/species/monkey, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "bpu" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -7162,11 +7160,6 @@ }, /turf/open/space/openspace, /area/station/solars/starboard/fore) -"bwU" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/flora/bush/fullgrass/style_random, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "bxd" = ( /obj/structure/table, /obj/item/radio/intercom/directional/east{ @@ -7496,17 +7489,6 @@ /obj/effect/turf_decal/tile/dark_green/fourcorners, /turf/open/floor/iron/white, /area/station/science/genetics) -"bDH" = ( -/obj/structure/table, -/obj/item/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = -1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/commons/storage/primary) "bEo" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 9 @@ -8146,6 +8128,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/escape) +"bNm" = ( +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "bNp" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -8206,11 +8196,11 @@ /turf/open/floor/wood, /area/station/command/meeting_room) "bNG" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, +/obj/machinery/vending/modularpc, +/obj/structure/table, /turf/open/floor/iron, /area/station/commons/storage/primary) "bNI" = ( @@ -9731,10 +9721,14 @@ /turf/open/floor/wood, /area/station/service/library) "coV" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line, /obj/structure/table, /obj/machinery/cell_charger, +/obj/item/screwdriver{ + pixel_x = 2; + pixel_y = 11 + }, /obj/item/stock_parts/power_store/cell/high, -/obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/commons/storage/primary) "cpl" = ( @@ -10059,6 +10053,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/miningdock) +"cuj" = ( +/obj/structure/flora/bush/sunny/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "cuM" = ( /obj/structure/table, /obj/item/radio/intercom/prison/directional/north, @@ -10174,13 +10172,6 @@ "cwG" = ( /turf/open/floor/iron, /area/station/cargo/office) -"cwU" = ( -/obj/machinery/door/window/right/directional/north{ - name = "The Monkey Pit"; - req_access = list("science") - }, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "cxc" = ( /obj/structure/chair, /turf/open/floor/iron/checker, @@ -11553,10 +11544,10 @@ /turf/closed/wall, /area/station/hallway/primary/tram/center) "cTl" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, +/obj/machinery/vending/assist, /turf/open/floor/iron, /area/station/commons/storage/primary) "cTw" = ( @@ -13183,6 +13174,20 @@ /obj/structure/flora/bush/leavy/style_random, /turf/open/floor/grass, /area/station/medical/virology) +"dyp" = ( +/obj/structure/railing{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "dys" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 @@ -14490,6 +14495,9 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/station/hallway/secondary/service) "dUK" = ( @@ -14789,17 +14797,19 @@ /turf/open/floor/iron/dark, /area/station/command/teleporter) "eaZ" = ( -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/wrench{ + pixel_x = 3; + pixel_y = 4 }, -/obj/item/t_scanner, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 5 +/obj/item/assembly/prox_sensor{ + pixel_x = 10; + pixel_y = 11 }, -/obj/structure/sign/clock/directional/east, -/turf/open/floor/iron, +/turf/open/floor/iron/smooth, /area/station/commons/storage/primary) "ebq" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -16388,15 +16398,12 @@ /turf/open/openspace, /area/station/asteroid) "eHj" = ( -/obj/machinery/vending/tool, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/effect/turf_decal/trimline/yellow/warning{ dir = 4 }, -/obj/machinery/camera/directional/east{ - c_tag = "Civilian - Primary Tool Storage" - }, -/turf/open/floor/iron, +/obj/structure/sign/clock/directional/east, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/smooth, /area/station/commons/storage/primary) "eHr" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, @@ -18822,10 +18829,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"fEM" = ( -/obj/machinery/light/warm/directional/south, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "fEQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, @@ -18953,11 +18956,6 @@ /obj/machinery/light/cold/directional/south, /turf/open/floor/iron, /area/station/commons/dorms) -"fGK" = ( -/mob/living/carbon/human/species/monkey, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "fHg" = ( /obj/structure/chair{ name = "Prosecution"; @@ -19647,28 +19645,11 @@ /turf/closed/wall/r_wall, /area/station/science/xenobiology) "fUP" = ( -/obj/structure/table, -/obj/item/stack/cable_coil{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 - }, -/obj/item/screwdriver{ - pixel_y = 16 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 }, /obj/machinery/firealarm/directional/west{ - pixel_y = -3 - }, -/obj/item/storage/belt/utility, -/obj/machinery/light_switch/directional/west{ - pixel_x = -23; - pixel_y = 8 + pixel_y = -5 }, /turf/open/floor/iron, /area/station/commons/storage/primary) @@ -19908,6 +19889,13 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) +"fYF" = ( +/obj/machinery/door/window/left/directional/north{ + name = "The Monkey Pit"; + req_access = list("science") + }, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "fYW" = ( /obj/structure/grille, /obj/structure/lattice, @@ -20203,6 +20191,15 @@ "geG" = ( /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"geJ" = ( +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/turf/open/floor/iron/smooth, +/area/station/commons/storage/primary) "geX" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -20334,6 +20331,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/secondary/service) "ghs" = ( @@ -20517,13 +20515,6 @@ "gkD" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) -"gkF" = ( -/obj/machinery/door/window/left/directional/north{ - name = "The Monkey Pit"; - req_access = list("science") - }, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "gkQ" = ( /obj/machinery/computer/atmos_control/mix_tank{ dir = 8 @@ -20656,16 +20647,19 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom/holding) "gms" = ( -/obj/structure/rack, -/obj/item/weldingtool, -/obj/item/crowbar, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 6 +/obj/structure/table, +/obj/item/wirecutters{ + pixel_y = 7; + pixel_x = -4 }, -/turf/open/floor/iron, +/obj/item/stack/cable_coil{ + pixel_x = -2; + pixel_y = 1 + }, +/obj/item/stack/cable_coil{ + pixel_y = 4 + }, +/turf/open/floor/iron/smooth, /area/station/commons/storage/primary) "gmu" = ( /obj/effect/decal/cleanable/dirt, @@ -21387,9 +21381,8 @@ /turf/open/floor/carpet, /area/station/commons/dorms) "gBr" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - piping_layer = 2 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 8 }, /turf/open/floor/iron/dark, /area/station/science/ordnance) @@ -22122,6 +22115,13 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/command/nuke_storage) +"gOr" = ( +/obj/machinery/door/window/right/directional/north{ + name = "The Monkey Pit"; + req_access = list("science") + }, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "gOA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -22265,6 +22265,9 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/hallway/secondary/service) "gRQ" = ( @@ -22543,10 +22546,6 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"gXo" = ( -/obj/structure/flora/bush/fullgrass/style_random, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "gXA" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -22718,6 +22717,19 @@ }, /turf/open/floor/iron, /area/station/commons/storage/art) +"hbk" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "hbQ" = ( /obj/machinery/camera/directional/north{ c_tag = "Civilian - Holodeck Controls" @@ -23020,6 +23032,12 @@ /obj/machinery/coffeemaker, /turf/open/floor/iron, /area/station/security/brig) +"hhP" = ( +/obj/structure/flora/bush/jungle/c/style_random, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) "hic" = ( /obj/structure/railing{ dir = 4 @@ -23287,6 +23305,10 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"hlu" = ( +/obj/structure/flora/bush/jungle/c/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "hlB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -23412,6 +23434,10 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"hoj" = ( +/obj/structure/flora/tree/palm/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "hou" = ( /obj/machinery/duct, /obj/structure/cable, @@ -23806,7 +23832,6 @@ /turf/open/floor/iron/dark/smooth_corner, /area/station/commons/fitness) "hze" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 9 }, @@ -23814,6 +23839,8 @@ pixel_x = -22; pixel_y = -8 }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/drone_bay) "hzk" = ( @@ -25380,6 +25407,12 @@ /obj/machinery/light/directional/east, /turf/open/floor/noslip/tram, /area/station/hallway/primary/tram/right) +"idP" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) "idW" = ( /obj/structure/railing/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -25943,6 +25976,11 @@ /obj/effect/turf_decal/sand/plating, /turf/open/misc/asteroid/airless, /area/station/asteroid) +"ipa" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/bush/jungle/c/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "ipe" = ( /obj/machinery/atmospherics/pipe/smart/manifold/green/visible{ dir = 8 @@ -25958,6 +25996,11 @@ /obj/effect/turf_decal/tile/brown/fourcorners, /turf/open/floor/iron, /area/station/cargo/sorting) +"ipu" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "ipC" = ( /obj/effect/turf_decal/stripes/white/line, /obj/machinery/transport/crossing_signal/northwest, @@ -27238,7 +27281,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/incident_display/dual/directional/south, +/obj/machinery/incident_display/tram/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "iOC" = ( @@ -27548,6 +27591,12 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +"iTW" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) "iUf" = ( /obj/machinery/door/airlock/grunge{ name = "Morgue" @@ -28495,6 +28544,15 @@ }, /turf/open/space/basic, /area/space/nearstation) +"jjM" = ( +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 9 + }, +/turf/open/floor/iron/smooth, +/area/station/commons/storage/primary) "jjP" = ( /obj/effect/spawner/random/structure/billboard/nanotrasen, /obj/effect/turf_decal/sand/plating, @@ -28839,13 +28897,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"jpt" = ( -/obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "jpB" = ( /obj/structure/sign/clock/directional/north, /obj/structure/cable, @@ -29024,7 +29075,7 @@ /obj/machinery/camera/directional/north{ c_tag = "Command - Bridge North" }, -/obj/machinery/incident_display/dual/directional/north, +/obj/machinery/incident_display/bridge/directional/north, /turf/open/floor/iron, /area/station/command/bridge) "jsW" = ( @@ -30834,12 +30885,18 @@ /turf/open/floor/wood, /area/station/commons/dorms) "jYJ" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, -/obj/machinery/light/directional/north, +/obj/structure/table, +/obj/item/analyzer{ + pixel_y = 4; + pixel_x = 2 + }, +/obj/item/t_scanner{ + pixel_x = -6; + pixel_y = 6 + }, /turf/open/floor/iron, /area/station/commons/storage/primary) "jYO" = ( @@ -31622,6 +31679,7 @@ /obj/effect/spawner/random/vending/snackvend{ pixel_x = -5 }, +/obj/machinery/incident_display/delam/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) "kkg" = ( @@ -31837,6 +31895,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"knU" = ( +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) "koo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, @@ -32477,6 +32540,13 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "kzx" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/storage/primary) "kzC" = ( @@ -32969,6 +33039,11 @@ "kHB" = ( /turf/open/floor/grass, /area/station/medical/virology) +"kHQ" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "kHR" = ( /mob/living/basic/parrot/poly, /obj/structure/filingcabinet/chestdrawer, @@ -33371,6 +33446,9 @@ "kNT" = ( /turf/open/floor/glass/reinforced/tram, /area/station/hallway/primary/tram/center) +"kOc" = ( +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "kOf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -33508,14 +33586,6 @@ /obj/item/stock_parts/power_store/cell/high, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"kQR" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/item/food/grown/banana/bunch{ - pixel_x = 5; - pixel_y = 16 - }, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "kQX" = ( /obj/machinery/computer/security{ dir = 1 @@ -33562,9 +33632,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/bar/backroom) -"kRR" = ( -/turf/open/misc/grass/jungle, -/area/station/science/explab) "kRW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -37823,10 +37890,6 @@ }, /turf/open/floor/glass, /area/station/command/meeting_room) -"mmy" = ( -/obj/structure/flora/bush/jungle/c/style_random, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "mmH" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -39246,10 +39309,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/service) "mOB" = ( -/obj/structure/table, -/obj/item/analyzer, -/obj/item/wrench, -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/shrink_ccw{ dir = 8 }, /turf/open/floor/iron, @@ -40500,6 +40560,11 @@ /obj/machinery/barsign/directional/south, /turf/open/floor/iron/checker, /area/station/commons/lounge) +"nmj" = ( +/mob/living/carbon/human/species/monkey, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "nmk" = ( /obj/structure/toilet{ pixel_y = 8 @@ -41272,12 +41337,6 @@ /obj/structure/cable/layer1, /turf/open/floor/plating/airless, /area/station/solars/port) -"nzO" = ( -/mob/living/carbon/human/species/monkey, -/turf/open/misc/dirt/jungle{ - baseturfs = /turf/open/misc/dirt - }, -/area/station/science/explab) "nzR" = ( /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) @@ -41938,10 +41997,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"nNh" = ( -/obj/structure/flora/bush/sunny/style_random, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "nNi" = ( /obj/structure/table/wood, /obj/structure/window/reinforced/spawner/directional/north{ @@ -42167,11 +42222,6 @@ }, /turf/open/floor/tram, /area/station/hallway/primary/tram/right) -"nRd" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/flora/bush/fullgrass/style_random, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "nRw" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 @@ -43016,6 +43066,10 @@ }, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"ogn" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "ogt" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs{ @@ -43350,6 +43404,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"omj" = ( +/obj/machinery/light/warm/directional/south, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "omm" = ( /turf/closed/wall, /area/station/maintenance/department/security) @@ -43793,8 +43851,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/structure/disposalpipe/junction{ + dir = 2 }, /turf/open/floor/iron, /area/station/hallway/secondary/service) @@ -44514,11 +44572,10 @@ /turf/open/floor/plating/elevatorshaft, /area/station/maintenance/tram/mid) "oOb" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, +/obj/structure/railing, +/obj/effect/turf_decal/delivery, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/iron/smooth, /area/station/commons/storage/primary) "oOd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -44647,10 +44704,6 @@ /obj/machinery/light/dim/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) -"oQU" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "oQW" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -44737,9 +44790,18 @@ /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) "oSl" = ( +/obj/structure/railing/corner/end/flip{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/station/commons/storage/primary) "oSu" = ( @@ -46094,8 +46156,9 @@ /turf/open/floor/iron/white, /area/station/science/explab) "prW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/iron/stairs{ + dir = 8 + }, /area/station/commons/storage/primary) "psa" = ( /obj/structure/tank_holder/anesthetic, @@ -46343,6 +46406,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"pvL" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "pvU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46811,13 +46879,15 @@ /turf/open/floor/plating, /area/station/cargo/miningdock) "pCM" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/item/clothing/gloves/color/fyellow, -/obj/item/assembly/prox_sensor{ - pixel_x = -8; - pixel_y = 4 +/obj/structure/railing{ + dir = 4 }, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/storage/primary) "pCU" = ( @@ -46941,12 +47011,19 @@ /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) "pFw" = ( -/obj/machinery/vending/modularpc, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 +/obj/machinery/airalarm/directional/east, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 3; + pixel_y = 17 }, -/turf/open/floor/iron, +/obj/item/storage/toolbox/electrical{ + pixel_y = 10; + pixel_x = 4 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 5 + }, +/turf/open/floor/iron/smooth, /area/station/commons/storage/primary) "pFE" = ( /obj/structure/table, @@ -47524,10 +47601,15 @@ /turf/open/floor/plating, /area/station/maintenance/tram/mid) "pOQ" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/obj/structure/cable, /turf/open/floor/iron, /area/station/commons/storage/primary) "pOZ" = ( @@ -47713,12 +47795,6 @@ "pSV" = ( /turf/closed/wall, /area/station/security/checkpoint/escape) -"pTj" = ( -/obj/structure/flora/bush/fullgrass/style_random, -/turf/open/misc/dirt/jungle{ - baseturfs = /turf/open/misc/dirt - }, -/area/station/science/explab) "pTl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -48289,6 +48365,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"qdq" = ( +/obj/structure/flora/bush/lavendergrass/style_random, +/obj/item/food/grown/banana/bunch{ + pixel_x = 5; + pixel_y = 16 + }, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "qdy" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -48373,7 +48457,7 @@ /turf/open/floor/iron/dark, /area/station/commons/lounge) "qeD" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/shrink_cw{ dir = 8 }, /turf/open/floor/iron, @@ -49406,15 +49490,10 @@ /turf/open/floor/iron, /area/station/security/office) "qxU" = ( -/obj/structure/table, -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 - }, -/obj/item/wirecutters, -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 10 }, +/obj/machinery/vending/tool, /turf/open/floor/iron, /area/station/commons/storage/primary) "qxZ" = ( @@ -49579,6 +49658,12 @@ /obj/machinery/door/window/right/directional/east, /turf/open/floor/iron, /area/station/security/brig) +"qAC" = ( +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 10 + }, +/turf/open/floor/iron/smooth, +/area/station/commons/storage/primary) "qBg" = ( /turf/open/floor/engine/plasma, /area/station/engineering/atmos) @@ -50464,6 +50549,10 @@ /obj/item/paper_bin, /turf/open/floor/iron/white, /area/station/science/lobby) +"qQi" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "qQq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -51645,10 +51734,13 @@ /turf/open/floor/iron/dark, /area/station/command/gateway) "rkq" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner{ - dir = 4 +/obj/structure/table, +/obj/item/flashlight{ + pixel_x = 9; + pixel_y = 13 }, -/turf/open/floor/iron, +/obj/item/storage/belt/utility, +/turf/open/floor/iron/smooth, /area/station/commons/storage/primary) "rks" = ( /obj/effect/spawner/structure/window, @@ -52130,6 +52222,14 @@ "run" = ( /turf/closed/wall/r_wall, /area/station/security/medical) +"ruo" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "rup" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -53538,6 +53638,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/science/explab) +"rUE" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/effect/landmark/event_spawn, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) "rUQ" = ( /obj/structure/window/reinforced/fulltile, /turf/open/floor/grass, @@ -55569,11 +55676,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/cargo/miningdock) -"sGF" = ( -/turf/open/misc/dirt/jungle{ - baseturfs = /turf/open/misc/dirt - }, -/area/station/science/explab) "sGG" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 4 @@ -55840,6 +55942,16 @@ /obj/structure/railing/corner, /turf/open/space/openspace, /area/station/solars/starboard/fore) +"sLp" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/obj/item/kirbyplants/random, +/obj/structure/railing{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/commons/storage/primary) "sLz" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -56131,6 +56243,16 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +"sQD" = ( +/obj/machinery/camera/directional/north{ + network = list("ss13","rd"); + c_tag = "Science - Monkey Pit" + }, +/obj/machinery/light/warm/directional/north, +/turf/open/misc/dirt/jungle{ + baseturfs = /turf/open/misc/dirt/station + }, +/area/station/science/explab) "sQJ" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -56524,17 +56646,15 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "sXV" = ( -/obj/structure/table, -/obj/item/assembly/igniter, -/obj/item/assembly/igniter{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/item/screwdriver{ - pixel_y = 16 +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/structure/rack, +/obj/machinery/light_switch/directional/south{ + pixel_x = 13 }, -/obj/effect/turf_decal/trimline/neutral/filled/line, -/obj/machinery/light/directional/south, +/obj/item/crowbar, +/obj/item/weldingtool, /turf/open/floor/iron, /area/station/commons/storage/primary) "sXW" = ( @@ -56846,12 +56966,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) -"tdY" = ( -/obj/structure/flora/bush/jungle/c/style_random, -/turf/open/misc/dirt/jungle{ - baseturfs = /turf/open/misc/dirt - }, -/area/station/science/explab) "tdZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -57758,6 +57872,7 @@ /obj/structure/closet/crate/preopen, /obj/item/stock_parts/power_store/cell/empty, /obj/effect/spawner/random/engineering/flashlight, +/obj/structure/sign/departments/exodrone/directional/east, /turf/open/floor/iron, /area/station/cargo/warehouse) "tuf" = ( @@ -58457,11 +58572,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) -"tFX" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/spawner/random/structure/twelve_percent_spirit_board, -/turf/open/floor/iron/grimy, -/area/station/service/chapel/office) "tGc" = ( /obj/structure/closet/secure_closet/brig/genpop, /obj/effect/turf_decal/bot, @@ -59029,7 +59139,7 @@ c_tag = "Civilian - Recreational Area North-West" }, /obj/item/toy/plush/lizard_plushie/space/green, -/obj/machinery/incident_display/dual/directional/north, +/obj/machinery/incident_display/tram/directional/north, /turf/open/floor/iron, /area/station/commons/fitness/recreation) "tRo" = ( @@ -61149,15 +61259,15 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "uAC" = ( -/obj/effect/turf_decal/trimline/neutral/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/neutral/filled/corner{ +/obj/effect/turf_decal/trimline/yellow/line{ dir = 8 }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/station/commons/storage/primary) "uAF" = ( @@ -61433,6 +61543,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/secondary/service) "uEw" = ( @@ -62430,11 +62541,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/station/engineering/supermatter/room) -"uVa" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/flora/bush/jungle/c/style_random, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "uVb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -62905,6 +63011,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +"vcV" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/flora/tree/palm/style_random, +/obj/structure/flora/coconuts, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "vde" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64385,10 +64497,6 @@ "vCS" = ( /turf/closed/mineral/random/stationside/asteroid/porus, /area/station/engineering/atmos) -"vCY" = ( -/obj/structure/flora/tree/palm/style_random, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "vCZ" = ( /turf/closed/wall, /area/station/service/chapel/monastery) @@ -64423,13 +64531,6 @@ /obj/machinery/light/small/dim/directional/south, /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/mid) -"vDg" = ( -/obj/structure/flora/bush/fullgrass/style_random, -/obj/effect/landmark/event_spawn, -/turf/open/misc/dirt/jungle{ - baseturfs = /turf/open/misc/dirt - }, -/area/station/science/explab) "vDu" = ( /obj/machinery/computer/robotics{ dir = 1 @@ -64475,10 +64576,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/greater) -"vEl" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "vEq" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8 @@ -64538,7 +64635,9 @@ /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) "vFp" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, /turf/open/floor/iron, @@ -66582,12 +66681,6 @@ }, /turf/open/floor/iron, /area/station/security/processing) -"wtR" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/flora/tree/palm/style_random, -/obj/structure/flora/coconuts, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "wtS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -67162,6 +67255,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/secondary/service) "wEu" = ( @@ -67797,6 +67891,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +"wQf" = ( +/obj/structure/flora/bush/jungle/b/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "wQm" = ( /turf/open/floor/iron, /area/station/engineering/atmos) @@ -67888,10 +67986,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/carpet, /area/station/commons/dorms) -"wSp" = ( -/obj/structure/flora/bush/jungle/b/style_random, -/turf/open/misc/grass/jungle, -/area/station/science/explab) "wSx" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -68056,15 +68150,11 @@ /turf/open/floor/engine, /area/station/engineering/supermatter/room) "wXB" = ( -/obj/machinery/vending/assist, -/obj/machinery/requests_console/directional/east{ - name = "Tool Department Requests Console"; - department = "Tool Storage" - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 6 }, -/turf/open/floor/iron, +/turf/open/floor/iron/smooth, /area/station/commons/storage/primary) "wXC" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -68551,6 +68641,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"xgT" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "xgZ" = ( /obj/structure/table/reinforced, /obj/machinery/light/cold/directional/west, @@ -68578,6 +68672,10 @@ "xhX" = ( /turf/open/misc/asteroid, /area/station/maintenance/starboard/lesser) +"xic" = ( +/mob/living/carbon/human/species/monkey, +/turf/open/misc/grass/jungle/station, +/area/station/science/explab) "xir" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -105007,13 +105105,13 @@ pGy dUH uDT wEl -jpt -jpt -jpt -jpt -jpt +aHR +aHR +aHR +aHR +aHR ghp -jpt +aHR ovY aHR sJQ @@ -105770,9 +105868,9 @@ aaa aaa sNs cTl -qeD +mOB acG -bDH +qeD fUP mOB uAC @@ -106027,13 +106125,13 @@ aaa aaa sNs bNG -kzx -kzx -kzx +eJZ +bNm +ruo pCM kzx oSl -kzx +ive coV alg aes @@ -106284,13 +106382,13 @@ aaa aaa sNs jYJ -eJZ -prW -prW +pvL +sLp +aKG oOb prW -oSl -ive +dyp +hbk sXV alg bug @@ -106543,9 +106641,9 @@ sNs vFp act rkq -kzx -kzx -kzx +jjM +geJ +qAC adE pOQ adU @@ -119698,12 +119796,12 @@ aaa aaa sQZ mtI -fGK -bwU -vEl -wtR -uVa -oQU +nmj +kHQ +qQi +vcV +ipa +ogn ojU gzw gzw @@ -119954,15 +120052,15 @@ aaa aaa aaa sQZ -wSp -nNh -gXo -sGF -gXo -sGF -gkF -kRR -nNh +wQf +cuj +xgT +knU +xgT +knU +fYF +kOc +cuj gzw gGi xBC @@ -120211,15 +120309,15 @@ aaa aaa aaa sQZ -kRR -vCY -kQR -bpn -kRR -wSp -cwU -kRR -gXo +kOc +hoj +qdq +xic +kOc +wQf +gOr +kOc +xgT gzw dNH lrt @@ -120469,12 +120567,12 @@ aaa oyR sQZ sQZ -aML -kRR -mmy -nNh -vCY -nRd +sQD +kOc +hlu +cuj +hoj +ipu ojU gzw gzw @@ -120725,12 +120823,12 @@ aaa aaa oyR vUz -tdY -pTj -kRR -vDg +hhP +iTW +kOc +rUE pQx -fEM +omj sQZ sQZ gzw @@ -120983,9 +121081,9 @@ aaa oyR pQx vUz -nzO -pTj -pTj +idP +iTW +iTW hgN mRD asu @@ -152872,7 +152970,7 @@ rAS xmZ qXS epP -tFX +aQL jFJ jFJ jFJ diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 892c175a400d5..1ea449e2f2fad 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -448,18 +448,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/science/xenobiology) -"agM" = ( -/obj/machinery/door/poddoor/shutters/window/preopen{ - name = "Security Shutters"; - id = "xbprotect"; - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/firealarm/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "agO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/broken_flooring/pile/directional/east, @@ -1040,12 +1028,6 @@ /obj/item/lighter, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/qm) -"aqG" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "aqM" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -1214,16 +1196,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/textured_large, /area/station/service/hydroponics/garden) -"auA" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "auB" = ( /turf/open/floor/engine, /area/station/medical/chemistry) @@ -1682,6 +1654,17 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/central) +"aBl" = ( +/obj/structure/table, +/obj/item/storage/box/syringes{ + pixel_x = -8; + pixel_y = 11 + }, +/obj/item/storage/box/beakers{ + pixel_x = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/science/xenobiology) "aBy" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -2204,6 +2187,17 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"aKk" = ( +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + name = "shutter control"; + id = "xbprotect" + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "aKl" = ( /obj/structure/chair, /obj/machinery/airalarm/directional/north, @@ -2366,11 +2360,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/commons/lounge) -"aMS" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "aMU" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/flora/bush/fullgrass/style_random, @@ -2398,15 +2387,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/research) -"aNF" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/lab) "aNH" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Entry"; @@ -2853,15 +2833,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"aXc" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/effect/mapping_helpers/apc/cell_5k, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "aXg" = ( /obj/structure/railing{ dir = 10 @@ -3104,6 +3075,17 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) +"bbY" = ( +/obj/structure/cable, +/obj/machinery/button/door/directional/east{ + name = "shutter control"; + id = "xbprotect1" + }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/item/kirbyplants/random, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "bca" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/effect/landmark/start/bartender, @@ -3387,6 +3369,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"bhm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/lab) "bhv" = ( /obj/structure/window/reinforced/plasma/spawner/directional/south, /obj/machinery/power/energy_accumulator/tesla_coil/anchored, @@ -3708,6 +3697,11 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engine) +"bou" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "boy" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -3874,6 +3868,13 @@ "brV" = ( /turf/open/floor/engine, /area/station/command/corporate_dock) +"bso" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "bsw" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -3942,6 +3943,16 @@ dir = 8 }, /area/station/service/chapel) +"btS" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/lab) "btU" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, @@ -4436,16 +4447,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"bBJ" = ( -/obj/machinery/processor/slime, -/obj/effect/turf_decal/bot_red, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/white/textured_corner{ - dir = 4 - }, -/area/station/science/xenobiology) "bBX" = ( /obj/structure/window/spawner/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5689,11 +5690,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"caH" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/sign/warning/directional/west, -/turf/closed/wall/rust, -/area/station/medical/chemistry/minisat) "caP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -5944,6 +5940,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"cfk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "cfv" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -6421,17 +6427,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) -"cqt" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/button/door/directional/east{ - name = "shutter control"; - id = "ordauxgarage" - }, -/turf/open/floor/plating, -/area/station/science/ordnance) "cqH" = ( /obj/structure/transit_tube, /obj/structure/lattice, @@ -6600,13 +6595,6 @@ "csW" = ( /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/captain/private) -"ctf" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/rack, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/iron/white, -/area/station/maintenance/department/medical) "cti" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -6663,6 +6651,11 @@ /obj/item/trash/shrimp_chips, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"cuo" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/broken_flooring/pile, +/turf/open/floor/plating, +/area/station/science/ordnance) "cuq" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/structure/closet/secure_closet/bar, @@ -6686,10 +6679,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"cuA" = ( -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/iron/white/smooth_large, -/area/station/science/ordnance/storage) "cuE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/plastic{ @@ -6714,6 +6703,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"cvQ" = ( +/obj/structure/sign/warning/directional/west, +/turf/closed/wall/rust, +/area/station/medical/chemistry/minisat) "cvT" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -7702,6 +7695,18 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +"cPz" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) "cPE" = ( /obj/machinery/light/small/directional/west, /turf/open/misc/asteroid, @@ -7800,13 +7805,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"cQX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) "cRa" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/chair/office{ @@ -7903,13 +7901,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"cSI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/ordnance) "cSJ" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/snack, @@ -8008,6 +7999,14 @@ }, /turf/open/floor/iron, /area/station/security) +"cUQ" = ( +/obj/machinery/door/airlock/command{ + name = "Research Director's Observatory" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/science/ordnance/testlab) "cVb" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ color = "#000000" @@ -8417,18 +8416,6 @@ }, /turf/open/floor/plating, /area/station/cargo/miningoffice) -"dci" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) -"dck" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/white/smooth_half{ - dir = 8 - }, -/area/station/science/xenobiology) "dcl" = ( /obj/effect/turf_decal/sand/plating, /obj/item/pickaxe, @@ -8531,6 +8518,14 @@ }, /turf/open/floor/plating, /area/station/commons/vacant_room/commissary) +"ddx" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/item/pickaxe, +/turf/open/floor/plating, +/area/station/asteroid) "ddF" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -8649,16 +8644,6 @@ }, /turf/open/floor/plating, /area/station/medical/storage) -"dgR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) "dgS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8802,23 +8787,6 @@ /obj/machinery/light/small/dim/directional/west, /turf/open/misc/asteroid, /area/station/hallway/secondary/entry) -"dir" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Chemistry Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry/minisat) "diz" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -9320,6 +9288,21 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w, /turf/open/space/basic, /area/space/nearstation) +"dqS" = ( +/obj/machinery/door_buttons/airlock_controller{ + idExterior = "xeno_airlock_exterior"; + idInterior = "xeno_airlock_interior"; + idSelf = "xeno_airlock_control"; + name = "Access Console"; + pixel_x = -25; + pixel_y = -25; + req_access = list("xenobiology") + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "dqW" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -9354,21 +9337,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/station/cargo/storage) -"drx" = ( -/obj/machinery/door_buttons/airlock_controller{ - idExterior = "xeno_airlock_exterior"; - idInterior = "xeno_airlock_interior"; - idSelf = "xeno_airlock_control"; - name = "Access Console"; - pixel_x = -25; - pixel_y = -25; - req_access = list("xenobiology") - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "drz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/disposal/bin, @@ -9658,6 +9626,14 @@ /obj/item/kirbyplants/potty, /turf/open/floor/wood, /area/station/commons/lounge) +"dxy" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/box/red, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "dxA" = ( /obj/machinery/telecomms/receiver/preset_left, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -10169,6 +10145,16 @@ /obj/structure/fluff/minepost, /turf/open/misc/asteroid, /area/station/maintenance/department/cargo) +"dEi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) "dEn" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/structure/window/reinforced/spawner/directional/east, @@ -10319,13 +10305,6 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/misc/asteroid, /area/station/maintenance/department/cargo) -"dGX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/science) "dHa" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -10511,6 +10490,17 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine/xenobio, /area/station/science/xenobiology) +"dKh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/box/red, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "dKp" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10741,18 +10731,6 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) -"dPh" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1; - piping_layer = 2 - }, -/obj/effect/turf_decal/box/red, -/obj/machinery/light/directional/south, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","rd") - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "dPk" = ( /obj/machinery/button/elevator/directional/east{ id = "cargo" @@ -10835,6 +10813,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"dQw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) +"dQA" = ( +/obj/structure/cable, +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "dQQ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -10850,6 +10843,12 @@ }, /turf/open/floor/plating, /area/station/service/lawoffice) +"dRc" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 5 + }, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/storage) "dRh" = ( /obj/structure/closet/secure_closet/cytology, /turf/open/floor/iron/dark/small, @@ -10917,6 +10916,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/medical/chemistry/minisat) +"dSc" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/turf/open/floor/plating, +/area/station/science/ordnance) "dSl" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/structure/cable, @@ -11394,10 +11397,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) -"eaL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) "eaS" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -11576,20 +11575,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"ecM" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "edv" = ( /obj/machinery/computer/order_console/cook, /turf/open/floor/iron, @@ -11939,6 +11924,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) +"ekq" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "eky" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -12008,11 +11997,6 @@ /obj/structure/door_assembly, /turf/open/misc/asteroid, /area/station/asteroid) -"elG" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "elT" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 @@ -12082,18 +12066,6 @@ /obj/structure/stairs/north, /turf/open/floor/iron, /area/station/command/corporate_showroom) -"enX" = ( -/obj/effect/turf_decal/caution/stand_clear/red, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "ordstorage" - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) "eon" = ( /obj/effect/spawner/random/structure/chair_comfy{ dir = 4 @@ -12655,12 +12627,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/station/service/library) -"exS" = ( -/obj/structure/cable, -/obj/effect/turf_decal/sand/plating, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/asteroid) "exT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12697,6 +12663,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/security/prison/work) +"eyJ" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_y = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "eyN" = ( /obj/structure/table, /obj/item/grenade/chem_grenade/smart_metal_foam{ @@ -13246,6 +13222,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"eHw" = ( +/obj/machinery/processor/slime, +/obj/effect/turf_decal/bot_red, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "eHA" = ( /obj/structure/railing/corner{ dir = 1 @@ -13286,6 +13270,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"eIF" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{ + chamber_id = "o2ordance" + }, +/turf/open/floor/engine/o2, +/area/station/science/ordnance) "eIO" = ( /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/closed/wall, @@ -13378,20 +13368,6 @@ "eKR" = ( /turf/closed/wall/r_wall, /area/station/command/bridge) -"eKT" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/pipe_dispenser{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/pipe_dispenser, -/obj/machinery/power/apc/auto_name/directional/south{ - areastring = "/area/station/science/ordnance/burnchamber" - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "eLe" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -13720,6 +13696,13 @@ "eSS" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/cargo) +"eSW" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "eTd" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -13760,9 +13743,14 @@ /obj/machinery/portable_atmospherics/canister, /turf/open/floor/plating, /area/station/maintenance/department/science) -"eUB" = ( -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) +"eUs" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "eUD" = ( /obj/effect/turf_decal/plaque{ icon_state = "L12" @@ -14213,6 +14201,18 @@ }, /turf/open/floor/iron/textured, /area/station/security/processing) +"fei" = ( +/obj/machinery/door/poddoor/shutters/window/preopen{ + name = "Security Shutters"; + id = "xbprotect"; + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/firealarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "feu" = ( /obj/effect/landmark/start/janitor, /obj/effect/decal/cleanable/dirt, @@ -14292,19 +14292,6 @@ }, /turf/closed/wall/r_wall, /area/station/engineering/atmos/pumproom) -"ffK" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "ffT" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/no_decals/two, @@ -14404,6 +14391,11 @@ }, /turf/open/floor/plating, /area/station/commons/storage/art) +"fhM" = ( +/obj/structure/barricade/wooden, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "fhN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/airlock/maintenance, @@ -15137,15 +15129,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"fuF" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "ordstorage" - }, -/obj/effect/turf_decal/caution/stand_clear/red, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) "fuZ" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -15493,6 +15476,12 @@ /obj/machinery/space_heater, /turf/open/misc/asteroid, /area/station/maintenance/central/greater) +"fAL" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/machinery/incident_display/bridge/directional/south, +/turf/open/floor/iron, +/area/station/command/bridge) "fAR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -16270,6 +16259,9 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/station/security/brig/entrance) +"fNF" = ( +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "fNW" = ( /obj/effect/landmark/carpspawn, /turf/open/space/openspace, @@ -16408,6 +16400,12 @@ }, /turf/open/floor/iron, /area/station/security/warden) +"fPK" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "fPV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16542,19 +16540,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"fSi" = ( -/obj/machinery/light/directional/north, -/obj/structure/table, -/obj/item/pen{ - pixel_x = 9; - pixel_y = 4 - }, -/obj/item/hand_labeler{ - pixel_y = 10; - pixel_x = -13 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/xenobiology) "fSk" = ( /obj/structure/chair/office{ dir = 1 @@ -16597,14 +16582,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/checkpoint/supply) -"fSD" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "fSK" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -17068,6 +17045,13 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/white/smooth_large, /area/station/science/ordnance/storage) +"gbY" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ + dir = 4; + chamber_id = "o2ordance" + }, +/turf/open/floor/engine/o2, +/area/station/science/ordnance) "gcb" = ( /obj/structure/table, /obj/item/storage/box/firingpins{ @@ -17164,14 +17148,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/glass/reinforced, /area/station/science/research) -"gdM" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "gdP" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ @@ -17271,6 +17247,14 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"gfj" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/lab) "gft" = ( /obj/structure/transport/linear/public, /obj/effect/landmark/transport/transport_id{ @@ -17454,17 +17438,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/drone_bay) -"gjo" = ( -/obj/structure/cable, -/obj/machinery/button/door/directional/east{ - name = "shutter control"; - id = "xbprotect" - }, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "gjt" = ( /obj/machinery/pdapainter/medbay, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -17632,15 +17605,6 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"gmb" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "gmd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -17966,16 +17930,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"gsw" = ( -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "ordstorage" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/caution/stand_clear/red, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) "gsM" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -18071,6 +18025,17 @@ /obj/item/book/manual/wiki/engineering_guide, /turf/open/floor/iron, /area/station/engineering/lobby) +"guz" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","rd") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "guF" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -18698,6 +18663,11 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"gEX" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/structure/closet/firecloset, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "gFg" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/siding/purple{ @@ -19052,6 +19022,10 @@ dir = 1 }, /area/station/engineering/atmos/storage/gas) +"gLS" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "gLZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -19977,6 +19951,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"hcj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/tank/oxygen, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "hcm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/carpet, @@ -20421,21 +20400,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/station/service/library) -"hkG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/tank/oxygen{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/science) -"hld" = ( -/obj/structure/cable, -/obj/machinery/firealarm/directional/east, -/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/catwalk_floor/flat_white, -/area/station/science/lab) "hle" = ( /obj/machinery/light/directional/south, /obj/structure/table/glass, @@ -20991,6 +20955,23 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/virology) +"hsJ" = ( +/obj/structure/closet/crate/freezer, +/obj/item/food/icecreamsandwich, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/structure/sign/departments/chemistry/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) +"hsV" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "hsW" = ( /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) @@ -21044,6 +21025,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/purple, /area/station/service/library) +"htS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/lab) "htV" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -21380,6 +21370,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/science/xenobiology) +"hAP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) "hAV" = ( /obj/structure/table/wood, /obj/item/flashlight/flare/candle{ @@ -21390,6 +21391,15 @@ dir = 4 }, /area/station/service/chapel) +"hBb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/directional/south, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "hBi" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -21561,15 +21571,6 @@ /obj/effect/landmark/start/mime, /turf/open/floor/carpet, /area/station/service/theater) -"hEw" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/lab) "hED" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/security/armory) @@ -21628,6 +21629,21 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/commons/dorms) +"hFV" = ( +/obj/machinery/door/airlock/research{ + autoclose = 0; + frequency = 1449; + id_tag = "xeno_airlock_interior"; + name = "Xenobiology Lab Internal Airlock" + }, +/obj/effect/mapping_helpers/airlock/locked, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "hFY" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -22363,6 +22379,10 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/medical/paramedic) +"hTm" = ( +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/ordnance/testlab) "hTQ" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1; @@ -22469,14 +22489,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/engineering/storage) -"hVm" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "hVs" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -22582,6 +22594,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"hXz" = ( +/obj/machinery/atmospherics/components/tank/air/layer4, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/virology) "hXK" = ( /obj/structure/closet/cardboard, /obj/effect/turf_decal/stripes/line, @@ -22922,6 +22941,18 @@ /obj/structure/flora/rock/style_random, /turf/open/misc/asteroid, /area/station/maintenance/department/science) +"iep" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/box/red, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "ieI" = ( /obj/structure/cable/layer3, /turf/open/floor/circuit/telecomms/mainframe, @@ -22943,14 +22974,6 @@ }, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) -"ieU" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "ifc" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/firealarm/directional/south, @@ -23193,6 +23216,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/reinforced, /area/station/maintenance/port/greater) +"ikQ" = ( +/obj/structure/cable, +/obj/effect/turf_decal/sand/plating, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/turf/open/floor/plating, +/area/station/asteroid) "ilb" = ( /obj/effect/turf_decal/tile/red/diagonal_edge, /turf/open/floor/iron/dark, @@ -23350,6 +23381,14 @@ dir = 8 }, /area/station/medical/pharmacy) +"inM" = ( +/obj/machinery/light/dim/directional/east, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/obj/structure/fireaxecabinet/directional/east, +/turf/open/floor/iron, +/area/station/command/bridge) "ioa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, @@ -23358,18 +23397,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"ioh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) "iol" = ( /turf/closed/wall/r_wall, /area/station/service/lawoffice) @@ -23393,16 +23420,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"iox" = ( -/obj/machinery/computer/camera_advanced/xenobio{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/item/storage/box/monkeycubes, -/turf/open/floor/iron/white/textured_half, -/area/station/science/xenobiology) "ioL" = ( /obj/item/radio/intercom/directional/east, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -23484,6 +23501,16 @@ "ipx" = ( /turf/closed/wall/r_wall, /area/station/science/cytology) +"ipB" = ( +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/door/airlock/research{ + name = "Ordnance Auxiliary Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "ipJ" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -23686,6 +23713,16 @@ "isT" = ( /turf/open/openspace, /area/station/engineering/break_room) +"isX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "ita" = ( /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, /obj/machinery/light_switch/directional/east, @@ -23922,6 +23959,12 @@ /obj/effect/turf_decal/stripes/asteroid/line, /turf/open/floor/plating/airless, /area/space/nearstation) +"iya" = ( +/obj/structure/sign/warning/chem_diamond/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/department/medical) "iyb" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -24035,14 +24078,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/science/lobby) -"iAx" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, -/obj/effect/turf_decal/box/red, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "iAE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24340,6 +24375,13 @@ "iFN" = ( /turf/closed/wall/r_wall, /area/station/science/server) +"iFO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) "iFU" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/spawner/random/maintenance, @@ -24469,6 +24511,15 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/iron, /area/station/cargo/warehouse) +"iIy" = ( +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "ordstorage" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/caution/stand_clear/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) "iIB" = ( /obj/effect/turf_decal/tile/yellow/diagonal_centre, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -24668,6 +24719,28 @@ /obj/machinery/recharger, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/hop) +"iLP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/turf/open/floor/iron/white, +/area/station/maintenance/department/medical) +"iLV" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = 9; + pixel_y = 4 + }, +/turf/open/floor/glass/reinforced, +/area/station/science/xenobiology) "iLZ" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -24771,21 +24844,6 @@ /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"iOk" = ( -/obj/machinery/door/airlock/research{ - autoclose = 0; - frequency = 1449; - id_tag = "xeno_airlock_interior"; - name = "Xenobiology Lab Internal Airlock" - }, -/obj/effect/mapping_helpers/airlock/locked, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "iOE" = ( /obj/item/pickaxe/mini, /turf/open/misc/asteroid, @@ -24814,6 +24872,12 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron, /area/station/engineering/lobby) +"iPb" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "iPd" = ( /obj/machinery/firealarm/directional/north, /turf/open/floor/carpet/executive, @@ -24874,17 +24938,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/teleporter) +"iPR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/portable_atmospherics/scrubber/huge/movable, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "iPS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/corporate_showroom) -"iPW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/tank/oxygen{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/science) "iQt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/trash/food_packaging, @@ -25178,12 +25242,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/chemistry/minisat) -"iXB" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "iXR" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -25194,6 +25252,11 @@ /obj/structure/sign/warning/biohazard/directional/east, /turf/open/floor/iron/white, /area/station/maintenance/aft/upper) +"iYp" = ( +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) "iYB" = ( /obj/machinery/door/airlock/command{ name = "Chief Medical Officer's Office" @@ -25241,6 +25304,15 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/plating, /area/station/maintenance/central/greater) +"iZs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 8 + }, +/obj/machinery/meter, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "iZz" = ( /obj/structure/lattice, /turf/open/openspace, @@ -25498,13 +25570,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/storage) -"jej" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "jer" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/landmark/event_spawn, @@ -25529,15 +25594,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"jeV" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "jeY" = ( /obj/structure/railing/corner{ dir = 1 @@ -25614,12 +25670,6 @@ /obj/item/clothing/glasses/meson, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"jgl" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/holosign_creator/atmos, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "jgs" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -25772,13 +25822,6 @@ /obj/docking_port/stationary/syndicate, /turf/open/space/openspace, /area/space) -"jiP" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plating, -/area/station/asteroid) "jjp" = ( /obj/item/reagent_containers/cup/bottle/fake_gbs, /turf/closed/mineral/random/stationside/asteroid/porus{ @@ -26113,15 +26156,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"joD" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","rd") - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "joH" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -26354,6 +26388,13 @@ "jsC" = ( /turf/closed/wall/r_wall, /area/station/maintenance/department/medical/central) +"jsG" = ( +/obj/structure/cable, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/hallway/secondary/entry) "jsL" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -26892,6 +26933,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"jCl" = ( +/obj/structure/table, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "jCm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ dir = 8 @@ -27230,6 +27281,9 @@ dir = 1 }, /area/station/service/chapel) +"jHl" = ( +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "jHn" = ( /obj/structure/railing{ dir = 8 @@ -27717,6 +27771,17 @@ /obj/structure/disposalpipe/junction, /turf/open/floor/iron, /area/station/security/office) +"jPn" = ( +/obj/effect/turf_decal/caution/stand_clear/red, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "ordstorage" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) "jPq" = ( /obj/machinery/light/small/dim/directional/south, /turf/open/misc/asteroid, @@ -27908,14 +27973,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical) -"jSR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "jSV" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -27923,6 +27980,12 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/textured_large, /area/station/science/xenobiology) +"jSX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "jSY" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -28357,6 +28420,15 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +"kbA" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "kbD" = ( /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/siding/purple, @@ -28589,19 +28661,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron, /area/station/service/hydroponics) -"keb" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Secure Pen" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "Xenolab"; - name = "Test Chamber Blast Door" - }, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "ked" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -28713,6 +28772,13 @@ }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"kgB" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/table, +/obj/item/holosign_creator/atmos, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "kgT" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/machinery/door/firedoor, @@ -28823,6 +28889,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"kiS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical) "kiT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/stripes, @@ -28914,13 +28989,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"kke" = ( -/obj/structure/tank_dispenser, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/radio/intercom/directional/north, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "kkf" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/plating, @@ -29279,6 +29347,12 @@ }, /turf/open/floor/iron/dark/smooth_edge, /area/station/science/xenobiology) +"kpt" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "kpw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -29478,10 +29552,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) -"krO" = ( -/obj/structure/cable, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "krP" = ( /turf/closed/wall/r_wall, /area/station/command/teleporter) @@ -29564,6 +29634,16 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/security/mechbay) +"ksN" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/pipe_dispenser{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/pipe_dispenser, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "ksR" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 @@ -30008,18 +30088,6 @@ /obj/structure/cable, /turf/open/floor/iron/large, /area/station/service/hydroponics/garden) -"kBr" = ( -/obj/structure/barricade/wooden, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 4 - }, -/obj/item/flashlight/glowstick/blue{ - start_on = 1; - light_range = 2 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/science) "kBt" = ( /obj/machinery/modular_computer/preset/civilian, /obj/machinery/button/door/directional/north{ @@ -30080,6 +30148,23 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/cargo) +"kBZ" = ( +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "ordstorage" + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/button/door/directional/east{ + req_access = list("ordnance"); + name = "Ordnance Storage Shutter Control"; + id = "ordstorage" + }, +/obj/effect/turf_decal/caution/stand_clear/red, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) "kCc" = ( /obj/effect/landmark/secequipment, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -30545,15 +30630,6 @@ /obj/machinery/light/small/dim/directional/west, /turf/open/floor/iron/textured_large, /area/station/hallway/primary/central) -"kKC" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "kKJ" = ( /obj/machinery/rnd/destructive_analyzer, /obj/machinery/light/directional/north, @@ -30577,6 +30653,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft/upper) +"kKV" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Chemistry Minisat" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/obj/effect/landmark/navigate_destination/chemfactory, +/turf/open/floor/iron/white, +/area/station/medical/chemistry/minisat) "kLi" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/station/maintenance/department/medical/central) @@ -30811,12 +30898,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/station/engineering/lobby) -"kQB" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/sign/poster/official/wtf_is_co2/directional/north, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/iron/white/smooth_large, -/area/station/science/ordnance/storage) "kQF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/engine, @@ -30934,14 +31015,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"kSc" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/machinery/light/small/dim/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "kSm" = ( /obj/machinery/computer/libraryconsole/bookmanagement, /obj/structure/table, @@ -30965,6 +31038,13 @@ }, /turf/open/floor/iron/white/herringbone, /area/station/science/breakroom) +"kSB" = ( +/obj/machinery/light/directional/north, +/obj/machinery/atmospherics/components/trinary/mixer{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "kSH" = ( /obj/machinery/medical_kiosk{ pixel_x = -2 @@ -31155,10 +31235,6 @@ "kUX" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmospherics_engine) -"kVh" = ( -/obj/effect/turf_decal/sand/plating, -/turf/closed/wall/rust, -/area/station/medical/chemistry/minisat) "kVF" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -31602,12 +31678,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"leZ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/hallway/secondary/entry) "lfd" = ( /obj/machinery/door/airlock/external/glass, /obj/effect/mapping_helpers/airlock/access/all/engineering/external, @@ -31803,6 +31873,42 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/misc/asteroid, /area/station/maintenance/central/greater) +"lhY" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/construction/plumbing{ + pixel_x = 34; + pixel_y = 6 + }, +/obj/item/stack/ducts/fifty{ + pixel_x = 26; + pixel_y = 2 + }, +/obj/item/stack/ducts/fifty{ + pixel_x = 25; + pixel_y = 1 + }, +/obj/item/stack/ducts/fifty{ + pixel_x = 24; + pixel_y = -1 + }, +/obj/item/stack/ducts/fifty{ + pixel_x = 23; + pixel_y = -3 + }, +/obj/item/stack/ducts/fifty{ + pixel_x = 23; + pixel_y = -5 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "lib" = ( /obj/machinery/light/directional/west, /turf/open/floor/circuit/green, @@ -31841,6 +31947,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/station/commons/locker) +"liI" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/storage/box/monkeycubes, +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "liQ" = ( /obj/structure/table, /obj/item/reagent_containers/cup/glass/coffee, @@ -31887,6 +32003,12 @@ }, /turf/open/floor/iron, /area/station/cargo/lobby) +"ljy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "ljF" = ( /obj/structure/weightmachine/weightlifter, /obj/machinery/camera/autoname/directional/east, @@ -32383,6 +32505,16 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/cafeteria, /area/station/commons/locker) +"luR" = ( +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/lab) "luW" = ( /obj/machinery/door/airlock/grunge{ name = "Chapel" @@ -32620,6 +32752,13 @@ }, /turf/open/floor/iron/textured_large, /area/station/medical/treatment_center) +"lzg" = ( +/obj/structure/cable, +/obj/effect/landmark/navigate_destination/dockarrival, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/hallway/secondary/entry) "lzj" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/decal/cleanable/dirt, @@ -32701,15 +32840,6 @@ "lAj" = ( /turf/closed/wall, /area/station/construction/mining/aux_base) -"lAl" = ( -/obj/structure/window/spawner/directional/east, -/obj/machinery/portable_atmospherics/pipe_scrubber, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/ordnance) "lAm" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -32755,15 +32885,6 @@ dir = 4 }, /area/station/command/meeting_room) -"lBm" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ - dir = 9 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance/testlab) "lBu" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -32795,11 +32916,6 @@ /obj/structure/chair/sofa/bench/left, /turf/open/floor/iron/white/textured_large, /area/station/science/research) -"lBZ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "lCk" = ( /obj/effect/turf_decal/siding/dark_blue{ dir = 1 @@ -33381,6 +33497,11 @@ }, /turf/open/floor/iron/checker, /area/station/science/research) +"lNc" = ( +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) "lNe" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, /turf/open/floor/plating, @@ -33769,13 +33890,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/bridge) -"lUy" = ( -/obj/structure/cable, -/obj/effect/landmark/navigate_destination/dockarrival, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/hallway/secondary/entry) "lUF" = ( /obj/structure/transport/linear/public, /obj/machinery/elevator_control_panel{ @@ -33829,14 +33943,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"lVy" = ( -/obj/machinery/door/airlock/command{ - name = "Research Director's Observatory" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/rd, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/station/command/heads_quarters/rd) "lVB" = ( /turf/closed/mineral/random/stationside/asteroid/porus, /area/station/maintenance/department/science) @@ -33890,6 +33996,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +"lXg" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/research/glass{ + name = "Secure Pen" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/structure/cable, +/obj/machinery/door/poddoor/preopen{ + id = "Xenolab"; + name = "Test Chamber Blast Door" + }, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "lXu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -34039,6 +34158,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/lockers) +"lYU" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8; + name = "Oxygen Chamber Injection Port" + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/ordnance/storage) "lYZ" = ( /obj/machinery/computer/communications, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -34329,17 +34458,6 @@ /obj/effect/baseturf_helper/reinforced_plating/ceiling, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"mgi" = ( -/obj/machinery/door/poddoor/shutters{ - id = "ordauxgarage"; - dir = 1 - }, -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/stripes/asteroid/end{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/science/ordnance) "mgn" = ( /obj/docking_port/stationary{ dir = 8; @@ -34522,16 +34640,6 @@ }, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) -"miR" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/sand/plating, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "miV" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -34850,14 +34958,6 @@ "mnP" = ( /turf/open/floor/iron, /area/station/service/hydroponics) -"mnS" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/ordnance) "mnU" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -35445,6 +35545,9 @@ /obj/effect/turf_decal/trimline/dark_red/filled/warning, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"myJ" = ( +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) "myV" = ( /obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/west, @@ -35556,6 +35659,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/patients_rooms/room_a) +"mBp" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, +/turf/open/floor/plating, +/area/station/science/ordnance) "mBt" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -35784,17 +35892,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"mFa" = ( -/obj/machinery/door/firedoor/heavy, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/door/airlock/research{ - name = "Ordnance Auxiliary Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "mFb" = ( /obj/structure/fans/tiny, /obj/machinery/door/poddoor/massdriver_chapel, @@ -35895,11 +35992,6 @@ }, /turf/open/floor/engine, /area/station/command/heads_quarters/captain/private) -"mHc" = ( -/obj/machinery/airalarm/directional/west, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/iron/white/smooth_large, -/area/station/science/ordnance/storage) "mHf" = ( /obj/structure/table, /obj/item/controller, @@ -36392,6 +36484,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_half, /area/station/science/xenobiology) +"mQO" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light_switch/directional/east, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/ordnance/storage) "mQP" = ( /obj/structure/lattice, /obj/structure/cable, @@ -36443,17 +36542,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/station/commons/lounge) -"mRC" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Xenobiology Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/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/catwalk_floor/flat_white, -/area/station/science/xenobiology) "mRI" = ( /obj/effect/mob_spawn/corpse/human/clown, /turf/open/misc/asteroid, @@ -36763,19 +36851,6 @@ }, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/qm) -"mYh" = ( -/obj/machinery/door/poddoor/shutters/window/preopen{ - name = "Security Shutters"; - id = "xbprotect1"; - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "mYs" = ( /obj/machinery/door/airlock/public/glass{ name = "Gateway Chamber" @@ -37286,18 +37361,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"nfk" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = -2; - pixel_y = 5 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/xenobiology) "nfn" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -37585,6 +37648,10 @@ "nkM" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) +"nkW" = ( +/obj/item/radio/intercom/chapel/directional/west, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/ordnance/testlab) "nli" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/airalarm/directional/east, @@ -37604,12 +37671,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"nlx" = ( -/obj/structure/cable, -/obj/effect/turf_decal/sand/plating, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "nlI" = ( /obj/effect/landmark/start/depsec/engineering, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -37853,6 +37914,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"npI" = ( +/obj/machinery/light/small/dim/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 8 + }, +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/maintenance/department/medical) "npL" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -38419,6 +38492,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"nBY" = ( +/obj/machinery/air_sensor/oxygen_tank{ + chamber_id = "o2ordance" + }, +/turf/open/floor/engine/o2, +/area/station/science/ordnance) "nCb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -38696,17 +38775,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"nIa" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) "nIb" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -38742,10 +38810,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/misc/asteroid, /area/station/maintenance/department/cargo) -"nIQ" = ( -/obj/item/radio/intercom/directional/south, -/turf/open/floor/catwalk_floor/iron_white, -/area/station/science/ordnance/testlab) "nIS" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -39019,12 +39083,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/central) -"nNl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) "nNo" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -39119,17 +39177,6 @@ "nPW" = ( /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"nQl" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","rd") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "nQm" = ( /obj/machinery/camera/motion/directional/west{ network = list("aicore"); @@ -39448,6 +39495,16 @@ /obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron/white, /area/station/medical/virology) +"nZg" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "nZo" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -39564,6 +39621,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig/entrance) +"obh" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/lab) "obx" = ( /obj/structure/railing, /obj/effect/decal/cleanable/dirt/dust, @@ -39901,12 +39967,6 @@ }, /turf/open/floor/iron/textured, /area/station/cargo/drone_bay) -"ojR" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden, -/turf/open/floor/iron/white, -/area/station/science/ordnance/testlab) "oka" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -40321,6 +40381,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"osc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/science/ordnance/testlab) "osd" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -40385,11 +40451,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"osT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) "osX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -40764,6 +40825,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) +"oAM" = ( +/obj/machinery/door/airlock/research{ + name = "Ordnance Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/structure/cable, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/ordnance) "oAO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, @@ -41026,17 +41098,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"oFp" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "oFu" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -41199,18 +41260,6 @@ }, /turf/open/floor/iron, /area/station/security/warden) -"oIu" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_y = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/white/textured_corner{ - dir = 1 - }, -/area/station/science/xenobiology) "oID" = ( /obj/structure/lattice, /obj/effect/spawner/random/structure/grille, @@ -41528,12 +41577,6 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/station/command/bridge) -"oOP" = ( -/obj/structure/cable, -/obj/structure/fireaxecabinet/directional/south, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted, -/turf/open/floor/iron, -/area/station/command/bridge) "oOR" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/green{ @@ -42307,6 +42350,10 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) +"pbq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/white, +/area/station/maintenance/department/medical) "pbA" = ( /obj/machinery/air_sensor/incinerator_tank, /turf/open/floor/engine/airless, @@ -42421,6 +42468,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security) +"pdL" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Chemistry Minisat" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry/minisat) "pdR" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -42681,17 +42745,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) -"piH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) "piS" = ( /obj/structure/girder/displaced, /obj/effect/turf_decal/sand/plating, @@ -42750,14 +42803,10 @@ dir = 8 }, /area/station/service/theater) -"pjL" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 6 - }, -/turf/open/floor/glass/reinforced, -/area/station/science/xenobiology) +"pjM" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/engine/o2, +/area/station/science/ordnance) "pjN" = ( /obj/structure/transit_tube/horizontal{ dir = 2 @@ -43317,6 +43366,25 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) +"puf" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 16; + pixel_y = 1 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/structure/sign/poster/contraband/random/directional/north, +/turf/open/floor/iron/white, +/area/station/maintenance/department/medical) "pui" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/bot_white, @@ -43535,10 +43603,6 @@ /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/plating/airless, /area/station/maintenance/department/medical/central) -"pxU" = ( -/obj/effect/turf_decal/sand/plating, -/turf/closed/wall, -/area/station/medical/chemistry/minisat) "pxY" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, @@ -43878,10 +43942,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/chemistry) -"pDr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "pDs" = ( /obj/structure/chair, /obj/machinery/light/small/directional/north, @@ -44156,6 +44216,11 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"pIE" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "pIF" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/right/directional/north{ @@ -44455,6 +44520,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark/textured, /area/station/security/interrogation) +"pOs" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light_switch/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "pOv" = ( /obj/structure/chair/pew{ dir = 4 @@ -44485,6 +44558,20 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"pPe" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/obj/effect/turf_decal/trimline/yellow/filled/line, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/door/airlock/research/glass{ + name = "Chemistry Minisat" + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "pPv" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -44572,13 +44659,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/carpet, /area/station/commons/dorms) -"pQG" = ( -/obj/machinery/atmospherics/components/trinary/mixer{ - dir = 4 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "pQM" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 1; @@ -44741,6 +44821,13 @@ /obj/effect/mapping_helpers/airlock/welded, /turf/open/floor/plating, /area/station/asteroid) +"pTg" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/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/white, +/area/station/science/ordnance/testlab) "pTn" = ( /obj/structure/kitchenspike, /obj/machinery/light/directional/west, @@ -45175,6 +45262,18 @@ /obj/structure/railing, /turf/open/openspace, /area/station/science/xenobiology) +"qas" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/computer/atmos_control/oxygen_tank{ + atmos_chambers = list(o2ordance="Oxygen Supply") + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "qaz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -45436,15 +45535,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"qeY" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "qfu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/textured_large, @@ -45665,6 +45755,19 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/station/security/mechbay) +"qiZ" = ( +/obj/machinery/door/poddoor/shutters/window/preopen{ + name = "Security Shutters"; + id = "xbprotect1"; + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "qjc" = ( /obj/structure/cable, /obj/machinery/door/airlock/external{ @@ -45742,6 +45845,10 @@ /obj/item/screwdriver, /turf/open/floor/iron, /area/station/hallway/primary/central) +"qkP" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "qlc" = ( /obj/effect/spawner/random/structure/chair_comfy{ dir = 1 @@ -45849,11 +45956,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/storage/primary) -"qmI" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron, -/area/station/science/ordnance) "qmU" = ( /obj/item/radio/intercom/command/directional/west, /turf/open/floor/glass, @@ -45900,14 +46002,6 @@ }, /turf/open/floor/iron/white/smooth_half, /area/station/science/robotics/lab) -"qnV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/broken/directional/north, -/obj/machinery/atmospherics/components/tank/oxygen{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/science) "qob" = ( /obj/structure/table, /obj/item/stock_parts/micro_laser{ @@ -46937,16 +47031,6 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"qIQ" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/lab) "qIS" = ( /obj/machinery/cryo_cell, /obj/structure/window/reinforced/spawner/directional/west, @@ -47182,14 +47266,6 @@ /obj/effect/spawner/random/structure/table_or_rack, /turf/open/floor/plating, /area/station/maintenance/port/lesser) -"qOt" = ( -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/effect/turf_decal/box/red, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "qOz" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -47946,13 +48022,6 @@ dir = 8 }, /area/station/hallway/secondary/exit/departure_lounge) -"rbS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/science) "rce" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -48551,15 +48620,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/science/xenobiology) -"rkd" = ( -/obj/structure/closet/crate/science, -/obj/item/wrench, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/firealarm/directional/west, -/obj/effect/spawner/random/maintenance, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/ordnance) "rkm" = ( /obj/machinery/washing_machine, /turf/open/floor/iron/freezer, @@ -48811,6 +48871,16 @@ }, /turf/open/floor/plating, /area/station/service/library) +"roD" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/poddoor/shutters/window/preopen{ + id = "ordstorage" + }, +/obj/effect/turf_decal/caution/stand_clear/red, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) "roG" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/cable, @@ -48818,20 +48888,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security) -"roK" = ( -/obj/machinery/door/airlock/research{ - name = "Ordnance Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, -/obj/structure/cable, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/ordnance) "roO" = ( /obj/machinery/door/airlock/security/glass{ name = "Prison Wing" @@ -48854,10 +48910,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"rpC" = ( -/obj/effect/decal/remains/human, -/turf/open/floor/plating, -/area/station/science/ordnance/storage) "rpD" = ( /obj/structure/closet/secure_closet/brig/genpop, /obj/machinery/light/dim/directional/east, @@ -49581,11 +49633,6 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) -"rBq" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/purple, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "rBt" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -49842,14 +49889,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/cargo/storage) -"rEV" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "rFb" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 @@ -49873,15 +49912,6 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/freezer, /area/station/security/prison/shower) -"rFA" = ( -/obj/structure/window/spawner/directional/east, -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/ordnance) "rFK" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/decal/cleanable/rubble, @@ -50093,11 +50123,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"rJv" = ( -/obj/structure/sign/warning/chem_diamond/directional/south, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "rJy" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/bot, @@ -51117,12 +51142,6 @@ }, /turf/open/floor/carpet/black, /area/station/command/heads_quarters/hos) -"sar" = ( -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","rd") - }, -/turf/open/floor/catwalk_floor/iron_white, -/area/station/science/ordnance/testlab) "sas" = ( /obj/machinery/door/airlock/command/glass{ name = "Emergency Spatial Evacuation" @@ -51221,6 +51240,15 @@ /obj/structure/lattice/catwalk, /turf/open/openspace, /area/station/science/xenobiology) +"sbT" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/box, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8; + name = "Oxygen Chamber Injection Port" + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) "sbU" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/structure/crate, @@ -51576,11 +51604,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/iron/dark, /area/station/security/lockers) -"siU" = ( -/obj/item/pickaxe, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "siX" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /obj/machinery/meter/monitored/waste_loop, @@ -51817,6 +51840,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"smH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "smM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52002,13 +52033,6 @@ /obj/effect/spawner/random/trash/bucket, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"spU" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/sand/plating, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "sqb" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -52206,16 +52230,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/ai_monitored/turret_protected/ai_upload_foyer) -"stk" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/sand/plating, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "stp" = ( /obj/structure/railing{ dir = 1 @@ -53329,6 +53343,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +"sNL" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Xenobiology Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "sNP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -53701,6 +53724,12 @@ /obj/structure/fluff/minepost, /turf/open/misc/asteroid, /area/station/maintenance/port/greater) +"sVW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/hallway/secondary/entry) "sWd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/broken_flooring/side, @@ -54499,6 +54528,9 @@ /obj/machinery/light/floor/broken, /turf/open/floor/iron, /area/station/hallway/primary/central) +"tkO" = ( +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/ordnance) "tkR" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/left/directional/south{ @@ -55059,6 +55091,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) +"tuC" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/box/red, +/obj/machinery/light/directional/south, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","rd") + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "tuE" = ( /obj/effect/spawner/structure/window/hollow/middle{ dir = 4 @@ -55073,6 +55116,15 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron/dark, /area/station/medical/chemistry/minisat) +"tuG" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "tuH" = ( /obj/machinery/light/dim/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55091,6 +55143,14 @@ /obj/machinery/computer/security/telescreen/ordnance/directional/south, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) +"tuV" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/trimline/yellow/filled/corner, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron/white, +/area/station/maintenance/department/medical) "tuY" = ( /obj/effect/turf_decal/trimline/blue/arrow_ccw{ dir = 1 @@ -55124,12 +55184,6 @@ }, /turf/open/floor/wood/parquet, /area/station/service/theater) -"tvt" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "tvB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -55350,6 +55404,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine/cult, /area/station/service/library) +"tAG" = ( +/obj/machinery/door/airlock/research{ + glass = 1; + name = "Slime Euthanization Chamber"; + opacity = 0 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "tAL" = ( /obj/item/exodrone, /obj/machinery/exodrone_launcher, @@ -55477,14 +55541,6 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron/textured, /area/station/cargo/miningoffice) -"tCz" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/lab) "tCE" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55555,6 +55611,16 @@ /obj/structure/tank_holder/oxygen, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"tDv" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/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 = 9 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "tDw" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/stripes/line{ @@ -55667,6 +55733,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/central/greater) +"tFk" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/station/maintenance/department/medical) "tFD" = ( /obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, @@ -55736,6 +55808,11 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) +"tGL" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/structure/cable, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/ordnance/storage) "tGM" = ( /obj/machinery/firealarm/directional/south, /obj/structure/closet/emcloset, @@ -55826,13 +55903,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/warden) -"tIs" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "tIE" = ( /obj/effect/landmark/secequipment, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -56297,11 +56367,6 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/openspace, /area/station/science/research) -"tPE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "tPJ" = ( /obj/machinery/light_switch/directional/west, /obj/structure/disposalpipe/segment, @@ -56547,15 +56612,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) -"tUr" = ( -/obj/machinery/light/small/dim/directional/west, -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/trimline/yellow/filled/corner{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/maintenance/department/medical) "tUD" = ( /obj/structure/cable, /turf/open/floor/iron/dark/side{ @@ -56590,12 +56646,6 @@ /obj/structure/cable, /turf/closed/wall/r_wall, /area/station/engineering/main) -"tVg" = ( -/obj/effect/turf_decal/tile/brown/fourcorners, -/obj/structure/railing, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/iron, -/area/station/cargo/storage) "tVF" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle, /obj/structure/cable, @@ -56854,12 +56904,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) -"tZR" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "tZW" = ( /obj/machinery/camera/autoname/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56998,6 +57042,14 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"ubI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/box/red, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "ubV" = ( /obj/structure/chair{ dir = 1 @@ -57161,6 +57213,15 @@ dir = 1 }, /area/station/engineering/atmos/storage/gas) +"ueM" = ( +/obj/structure/window/spawner/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "ueX" = ( /obj/machinery/exodrone_launcher, /turf/open/floor/iron/dark, @@ -57207,6 +57268,14 @@ /obj/machinery/computer/security/telescreen/normal/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"ugb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "ugh" = ( /obj/machinery/door/airlock/research{ name = "Research and Development Lab" @@ -57713,11 +57782,6 @@ /obj/machinery/atmospherics/components/binary/valve, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"uoP" = ( -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/medical/treatment_center) "uoY" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/purple/filled/arrow_ccw, @@ -58149,6 +58213,11 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"uwk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "uww" = ( /obj/structure/table/reinforced, /obj/structure/desk_bell{ @@ -58167,22 +58236,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/storage) -"uwV" = ( -/obj/machinery/door/poddoor/shutters/window/preopen{ - id = "ordstorage" - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/button/door/directional/east{ - req_access = list("ordnance"); - name = "Ordnance Storage Shutter Control"; - id = "ordstorage" - }, -/obj/effect/turf_decal/caution/stand_clear/red, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) "uwW" = ( /obj/structure/cable/layer1, /turf/open/floor/iron, @@ -58446,6 +58499,11 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/airless, /area/station/asteroid) +"uCd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "uCj" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -58515,6 +58573,16 @@ /obj/machinery/telecomms/receiver/preset_right, /turf/open/floor/circuit/green/telecomms/mainframe, /area/station/tcommsat/server) +"uDc" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "uDd" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -58699,14 +58767,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) -"uGx" = ( -/obj/item/toy/plush/lizard_plushie/green{ - name = "Hauls-The-Crates" - }, -/obj/effect/spawner/random/structure/table_or_rack, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plating, -/area/station/maintenance/department/cargo) "uGS" = ( /obj/structure/chair/office/tactical{ dir = 8 @@ -59504,6 +59564,18 @@ }, /turf/open/floor/iron, /area/station/security) +"uVy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/medical) "uVI" = ( /obj/structure/grille, /turf/open/misc/asteroid/airless, @@ -59575,17 +59647,11 @@ dir = 1 }, /area/station/command/heads_quarters/qm) -"uWI" = ( -/obj/machinery/door/airlock/research/glass{ - name = "Chemistry Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/obj/effect/landmark/navigate_destination/chemfactory, -/turf/open/floor/iron/white, -/area/station/medical/chemistry/minisat) +"uWN" = ( +/obj/effect/spawner/structure/window/reinforced/plasma, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/command/heads_quarters/rd) "uWX" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -59598,19 +59664,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/upper) -"uXb" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "uXe" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -59993,6 +60046,12 @@ }, /turf/open/floor/iron/large, /area/station/service/hydroponics/garden) +"veF" = ( +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/structure/railing, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/iron, +/area/station/cargo/storage) "veW" = ( /obj/structure/extinguisher_cabinet/directional/north, /turf/closed/wall, @@ -60166,6 +60225,15 @@ }, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +"viw" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/cell_5k, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "viK" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -60309,6 +60377,12 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/plating, /area/station/maintenance/disposal) +"vkH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/storage) "vkM" = ( /obj/machinery/light_switch/directional/north, /obj/structure/easel, @@ -60668,18 +60742,6 @@ dir = 8 }, /area/station/service/theater) -"vrG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/box/red, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark/smooth_large, -/area/station/science/ordnance) "vrR" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/wood, @@ -60739,6 +60801,10 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/morgue) +"vtF" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) "vtN" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 @@ -61133,6 +61199,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"vCu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ + dir = 6 + }, +/obj/item/flashlight/glowstick/blue{ + start_on = 1; + light_range = 2 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "vCw" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -61473,6 +61550,15 @@ }, /turf/open/floor/wood/tile, /area/station/security/courtroom) +"vHs" = ( +/obj/item/toy/plush/lizard_plushie/green{ + name = "Hauls-The-Crates" + }, +/obj/effect/spawner/random/structure/table_or_rack, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/sign/departments/exodrone/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) "vHA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -61745,6 +61831,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/upper) +"vNf" = ( +/obj/machinery/light/directional/north, +/obj/structure/table, +/obj/item/hand_labeler{ + pixel_y = 10; + pixel_x = -13 + }, +/obj/item/folder, +/turf/open/floor/glass/reinforced, +/area/station/science/xenobiology) "vNg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/old, @@ -61757,15 +61853,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/engineering/main) -"vNl" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 10 - }, -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "vNB" = ( /obj/machinery/vending/tool, /obj/effect/decal/cleanable/dirt, @@ -61975,13 +62062,6 @@ "vQB" = ( /turf/closed/wall, /area/station/cargo/boutique) -"vQP" = ( -/obj/machinery/light/dim/directional/east, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "vQT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62372,6 +62452,14 @@ dir = 1 }, /area/station/engineering/atmos/upper) +"vXQ" = ( +/obj/structure/cable, +/obj/machinery/firealarm/directional/east, +/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/catwalk_floor/iron_white, +/area/station/science/lab) "vXS" = ( /obj/structure/broken_flooring/side, /obj/effect/decal/cleanable/dirt/dust, @@ -62425,15 +62513,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron/dark, /area/station/commons/locker) -"vZu" = ( -/obj/machinery/atmospherics/components/tank/air{ - piping_layer = 4 - }, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/virology) "vZF" = ( /obj/structure/dresser, /obj/effect/decal/cleanable/dirt, @@ -62699,12 +62778,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) -"wea" = ( -/obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "weg" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 @@ -62777,6 +62850,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"wft" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) "wfy" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62795,13 +62873,6 @@ }, /turf/open/floor/iron/textured, /area/station/engineering/atmos) -"wfU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ - dir = 6 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/science) "wfW" = ( /obj/structure/lattice/catwalk, /obj/item/food/pie/cream, @@ -63126,17 +63197,6 @@ /obj/effect/turf_decal/stripes, /turf/open/floor/iron/dark, /area/station/engineering/atmospherics_engine) -"wmM" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/simple/green/hidden{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "wmO" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/glass/reinforced, @@ -63172,12 +63232,6 @@ dir = 8 }, /area/station/science/xenobiology) -"wnH" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/iron/white, -/area/station/science/ordnance/storage) "wnL" = ( /turf/open/floor/plating, /area/station/medical/medbay/central) @@ -63686,16 +63740,6 @@ }, /turf/open/floor/carpet/executive, /area/station/command/meeting_room) -"wxP" = ( -/obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/lab) "wxQ" = ( /obj/machinery/computer/operating{ dir = 8 @@ -64696,23 +64740,6 @@ /obj/machinery/gravity_generator/main, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) -"wOJ" = ( -/obj/structure/table, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 9 - }, -/obj/item/stack/sheet/iron/fifty, -/obj/item/construction/plumbing, -/obj/item/stack/ducts/fifty, -/obj/item/stack/ducts/fifty, -/obj/item/stack/ducts/fifty, -/obj/item/stack/ducts/fifty, -/obj/item/stack/ducts/fifty, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","medbay") - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "wOK" = ( /obj/structure/chair/comfy/brown{ dir = 8; @@ -64738,15 +64765,6 @@ /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai_upload_foyer) -"wPP" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Xenobiology Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "wPU" = ( /obj/machinery/light/small/directional/west, /turf/open/misc/asteroid, @@ -64861,6 +64879,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/service/theater) +"wSC" = ( +/obj/structure/window/spawner/directional/east, +/obj/machinery/power/apc/auto_name/directional/south{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/cable, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "wTc" = ( /obj/machinery/meter/monitored/distro_loop, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible, @@ -65159,6 +65186,15 @@ }, /turf/open/floor/iron, /area/station/security/office) +"wYS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/yellow/filled/corner{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "wYW" = ( /obj/machinery/door/airlock/research{ autoclose = 0; @@ -65296,15 +65332,6 @@ /obj/machinery/vending/wallmed/directional/south, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"xaw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "xay" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -65588,17 +65615,6 @@ "xeS" = ( /turf/open/floor/iron, /area/station/commons/storage/primary) -"xeT" = ( -/obj/structure/cable, -/obj/machinery/button/door/directional/east{ - name = "shutter control"; - id = "xbprotect1" - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/item/kirbyplants/random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/xenobiology) "xeW" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -65666,13 +65682,6 @@ /obj/machinery/photobooth, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"xgc" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/science/lab) "xgn" = ( /obj/structure/mannequin/skeleton{ starting_items = list() @@ -65785,6 +65794,12 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/iron, /area/station/cargo/warehouse/upper) +"xiI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance/storage) "xiM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65995,6 +66010,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/lobby) +"xms" = ( +/obj/structure/table, +/obj/effect/spawner/random/trash/crushed_can{ + pixel_x = 7; + pixel_y = 15 + }, +/turf/open/floor/iron/white, +/area/station/maintenance/department/medical) "xmy" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -66203,19 +66226,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/chemistry/minisat) -"xqG" = ( -/obj/structure/cable, -/obj/effect/landmark/event_spawn, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, -/area/station/hallway/secondary/entry) "xqO" = ( /obj/docking_port/stationary/escape_pod{ dir = 8 }, /turf/open/space/basic, /area/space) +"xqT" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "xqY" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -66558,6 +66582,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"xwU" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/button/door/directional/east{ + name = "shutter control"; + id = "ordauxgarage" + }, +/obj/structure/tank_dispenser, +/turf/open/floor/plating, +/area/station/science/ordnance) "xxe" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -66634,6 +66667,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/library) +"xyl" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/openspace/xenobio, +/area/station/science/xenobiology) "xyG" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/power/apc/auto_name/directional/south, @@ -67040,6 +67077,14 @@ }, /turf/open/floor/glass, /area/station/command/meeting_room) +"xFA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "xFH" = ( /obj/structure/stairs/east, /turf/open/floor/iron/white/smooth_large, @@ -67094,6 +67139,17 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/wood, /area/station/service/cafeteria) +"xGE" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Xenobiology Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/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/catwalk_floor/iron_white, +/area/station/science/xenobiology) "xGG" = ( /obj/machinery/computer/camera_advanced/xenobio, /obj/effect/turf_decal/stripes/line, @@ -67136,6 +67192,11 @@ /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, /turf/open/floor/plating, /area/station/command/corporate_showroom) +"xHN" = ( +/obj/machinery/portable_atmospherics/canister, +/obj/structure/sign/poster/official/wtf_is_co2/directional/north, +/turf/open/floor/iron/white/smooth_large, +/area/station/science/ordnance/storage) "xHT" = ( /obj/structure/cable, /obj/machinery/light/warm/dim/directional/south, @@ -67213,16 +67274,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/central) -"xJt" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/light/small/directional/south, -/obj/structure/broken_flooring/pile, -/obj/machinery/atmospherics/components/binary/pump/off/green/hidden{ - dir = 4; - name = "Aux Oxygen To Port" - }, -/turf/open/floor/plating, -/area/station/science/ordnance) "xJA" = ( /obj/structure/table/wood/fancy/blue, /obj/effect/spawner/random/aimodule/neutral, @@ -67972,6 +68023,12 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"xYT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/purple/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/science/xenobiology) "xYZ" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 @@ -68053,6 +68110,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"yaB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/iron/dark/smooth_large, +/area/station/science/ordnance) "yaM" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/decal/cleanable/dirt, @@ -68076,6 +68141,19 @@ }, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"ybj" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 3; + pixel_y = -2 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "ybo" = ( /turf/open/floor/iron/white/textured_corner{ dir = 8 @@ -68286,10 +68364,15 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) -"yew" = ( -/obj/effect/spawner/random/structure/girder, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) +"yeC" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "yeO" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -68312,6 +68395,10 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/misc/asteroid, /area/station/asteroid) +"yfh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_white, +/area/station/medical/treatment_center) "yfl" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -68587,6 +68674,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"ykV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/broken/directional/north, +/obj/machinery/atmospherics/components/tank/oxygen, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "ylf" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 @@ -81687,7 +81780,7 @@ jtd bPP gUa mxq -uGx +vHs bVs ycz bVs @@ -82243,9 +82336,9 @@ phV kFT kFT qIS -osT -uoP -ioh +wft +lNc +cPz gzw dKw amK @@ -82500,9 +82593,9 @@ hQK dPg fvo jPO -osT -dci -piH +wft +vtF +dQw xaC dKw dKw @@ -82757,9 +82850,9 @@ sGt ltj fvo pwn -eaL -eUB -dgR +yfh +myJ +dEi uPg bui yit @@ -83014,9 +83107,9 @@ bhZ pgJ fvo lcM -eaL -eaL -nIa +yfh +yfh +hAP crz bui yit @@ -96574,7 +96667,7 @@ hSi sRM kZA gkQ -oOP +fAL eKR eKR juw @@ -97087,7 +97180,7 @@ jTd rkz lrc eHa -vQP +inM ita hOb cwq @@ -104038,7 +104131,7 @@ wWY eZN cPt alA -qIQ +btS irJ rBI cPt @@ -104295,7 +104388,7 @@ xbu gMK cPt lcj -tCz +gfj dfr mKF cPt @@ -104552,7 +104645,7 @@ eIV gMK cPt voQ -tCz +gfj urh ooy cPt @@ -104809,7 +104902,7 @@ gLw jmY cPt kKJ -hEw +obh xWb cUe cPt @@ -105066,7 +105159,7 @@ rXG raz cPt toV -hEw +obh irJ cPt cPt @@ -105323,7 +105416,7 @@ oBP raz wtr rrq -aNF +htS irJ jRN jyQ @@ -105580,9 +105673,9 @@ oBP vfJ cPt cPt -wxP -xgc -hld +luR +bhm +vXQ ugh aZs jDP @@ -108409,9 +108502,9 @@ foX aku ouA jJe -ilp -ixU -ixU +gOY +gOY +gOY gOY gOY gOY @@ -108666,15 +108759,15 @@ foX aku aku ilp -ilp -jTB -rpC gOY -iAx +pjM +eIF +mBp +qas boy gql abh -xaw +cfk uPL sSN nal @@ -108923,11 +109016,11 @@ rji foX ilp ilp -jTB -jTB -jTB gOY -pQG +gbY +nBY +dSc +kSB atb qVB iOH @@ -109179,13 +109272,13 @@ uOo aku aku ilp +ilp jTB -jTB -mHc -wnH +vkH +dRc gOY -nQl -jSR +guz +iep nTZ urY czh @@ -109437,15 +109530,15 @@ aku ilp ilp jTB -jGd -eBH -cQX -enX +jTB +lYU +sbT +gOY rSB bwj mSG rSh -qOt +dxy gOY wOn gOY @@ -109694,18 +109787,18 @@ aku ilp ilp jTB -dkr -hbH -naU -gsw -fSD +jGd +eBH +xiI +jPn +smH lCw vlz fDz fDz bPc efJ -dPh +tuC gOY cxg cxg @@ -109951,11 +110044,11 @@ uro rji ilp jTB -sqJ -wiT -rBt -aPG -qeY +dkr +hbH +naU +iIy +iZs aMG vlz xTs @@ -110208,11 +110301,11 @@ aku ilp ilp jTB -dEn -lIn -tra -qGr -kKC +sqJ +wiT +rBt +aPG +tuG mqb vlz fDz @@ -110465,10 +110558,10 @@ aku ilp ilp jTB -gbV -jqY -rus -fuF +dEn +lIn +tra +qGr gzF kEM fDz @@ -110477,7 +110570,7 @@ fDz oWy fDz dyd -vrG +dKh gOY cxg vxX @@ -110722,11 +110815,11 @@ aku ilp ilp jTB -cuA -cuA -nNl -uwV -vNl +gbV +jqY +rus +roD +ugb nCo tGW tGW @@ -110979,14 +111072,14 @@ aku ieo ilp jTB -jTB -kQB -ioL -gOY -aks +xHN +tGL +iFO +kBZ +qkP tTK tvB -cSI +iPR nkM vxZ dyS @@ -111235,15 +111328,15 @@ uOo aku vfR ilp -ilp -jTB jTB jTB +mQO +ioL gOY -gOY +aks tTK -rFA -lAl +yaB +xqT xfQ cAG xXF @@ -111492,15 +111585,15 @@ uOo aku aku fbN -gsW -gsW -mnS -mnS +rji +jTB +jTB +jTB gOY -iJZ -lcd -ecM -eKT +gOY +tTK +ueM +wSC nkM vxZ pZK @@ -111749,15 +111842,15 @@ uOo aku aku pkw -mgi -rkd -aMS -hVm -mFa -elG -uXb -cmn -jgl +gsW +gEX +xFA +hBb +gOY +iJZ +lcd +ybj +ksN efL cQu wgI @@ -112009,10 +112102,10 @@ aku ajs gop cqf -xJt -gOY -joD -ffK +cuo +ipB +cmn +uDc cut rcR efL @@ -112266,11 +112359,11 @@ aku vjB jEw cmn -cqt +xwU gOY -kke -wmM -auA +pOs +tDv +kgB icz efL nbS @@ -112526,8 +112619,8 @@ grm gsW gOY gOY -gOY -roK +oAM +tkO gOY nkM nkM @@ -112780,11 +112873,11 @@ aku aku aku xAd -wfU -rbS +upd +upd kAI -ojR -lBm +osc +pTg uvx mna gXw @@ -113037,8 +113130,8 @@ aku aku vfR vfJ -dGX -upd +fhM +vfJ moe jxe aaR @@ -113294,8 +113387,8 @@ tsz lJq obA vfJ -kBr -vfJ +vCu +ubI moe tLh dlE @@ -113807,9 +113900,9 @@ lJq jBM lJq obA -qnV -iPW -hkG +ykV +hcj +hcj moe mJU bpW @@ -144425,10 +144518,10 @@ vxX mUQ kLL cts -caH +cvQ lCA pux -kVh +eYP iJm mUQ mUQ @@ -145453,10 +145546,10 @@ vxX iJm iJm eYP -kVh +eYP qMK tAk -pxU +gHN iJm iJm fnh @@ -145968,8 +146061,8 @@ vxX iJm uKm eYP -uWI -dir +kKV +pdL eYP fnh qoN @@ -146224,7 +146317,7 @@ vxX vxX vxX uKm -tUr +npI iLo lYg oHC @@ -146481,10 +146574,10 @@ unk vxX vxX oTe -ctf -pDr +puf +pbq cMK -rJv +iya fnh kGS fnh @@ -146736,13 +146829,13 @@ ibx ibx unk hvw -jiP +ddx uKm -yew -stk +xms +jSE hgS jHQ -jHQ +uVy jHQ bhV jHQ @@ -146994,9 +147087,9 @@ ibx fvF duU hmA -exS -nlx -miR +ikQ +tFk +kiS kYT kYT kYT @@ -147231,7 +147324,7 @@ sdc ilr gDQ qWY -tVg +veF oZQ oZQ oZQ @@ -147251,9 +147344,9 @@ vxX unk ibx vxX -vxX -siU -spU +unk +tuV +iLP kYT bUZ vzG @@ -147508,10 +147601,10 @@ wOU vxX ibx vxX -vxX -fnh -spU -kYT +bGk +bGk +pPe +bGk rRy cOb ycI @@ -147766,9 +147859,9 @@ vxX taj vxX bGk -kYT -rEV -kYT +hsJ +isX +bGk bGk ncR ncR @@ -148023,8 +148116,8 @@ ibx ibx vxX bGk -wOJ -jeV +lhY +wYS tGR hNN pLA @@ -148280,7 +148373,7 @@ ibx vxX vxX bGk -kSc +jCl dhj dhj xmy @@ -152408,7 +152501,7 @@ wYY tSn xas xhJ -vZu +hXz xOF dgS kzI @@ -154692,25 +154785,25 @@ wjI wjI uXD cYC -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW dFc uXD uXD @@ -154949,7 +155042,7 @@ uXD uXD uXD uGW -leZ +sVW rCL sTB kAc @@ -154967,7 +155060,7 @@ kAc kAc sTB vAo -leZ +sVW sZF pLP pLP @@ -155206,7 +155299,7 @@ aLN aLN uXD jYf -leZ +sVW vVC sxV sxV @@ -155224,7 +155317,7 @@ sxV sxV sxV mJV -leZ +sVW sZF pLP pLP @@ -155463,7 +155556,7 @@ aLN aLN ntQ hPS -leZ +sVW sby sxV sxV @@ -155481,7 +155574,7 @@ sxV sxV sxV hrI -xqG +jsG wDr uXD uXD @@ -155720,7 +155813,7 @@ aLN aLN hVN hPS -leZ +sVW sby sxV sxV @@ -155738,7 +155831,7 @@ sxV sxV sxV hrI -leZ +sVW lGP rzJ gMk @@ -155977,7 +156070,7 @@ aLN jhc jYG hPS -leZ +sVW sby sxV sxV @@ -155995,7 +156088,7 @@ sxV sxV idV hrI -leZ +sVW khL uXD uet @@ -156234,7 +156327,7 @@ aLN aLN vzi hPS -leZ +sVW sby sxV sxV @@ -156252,7 +156345,7 @@ sxV sxV sxV hrI -leZ +sVW lGP rzJ gMk @@ -156491,7 +156584,7 @@ aLN aLN uXD hPS -leZ +sVW sby sxV sxV @@ -156509,7 +156602,7 @@ sxV sxV sxV hrI -leZ +sVW qgy uXD uXD @@ -156748,7 +156841,7 @@ aLN aLN uXD cDl -leZ +sVW vVC sxV sxV @@ -156766,7 +156859,7 @@ sxV sxV sxV mJV -leZ +sVW sZF pLP pLP @@ -157005,7 +157098,7 @@ jJb jJb jJb ata -leZ +sVW hbb xkO nhm @@ -157023,7 +157116,7 @@ nhm nhm xkO lCp -leZ +sVW sZF pLP pLP @@ -157262,25 +157355,25 @@ dRq bfN uhi bOr -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -lUy -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ -leZ +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +lzg +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW +sVW wLu uXD uXD @@ -176520,7 +176613,7 @@ raz raz nzk fpY -clQ +uWN ssg vtN ylR @@ -176776,8 +176869,8 @@ iSz uba vfJ nzk -qmI -wYI +fpY +clQ elT elT elT @@ -177033,14 +177126,14 @@ vmk uba pBN nzk -hEi -hEi -wFI -mmU -ibE -wts -oFp -oFp +iYp +wYI +jHl +jHl +jHl +jHl +uCd +uCd tcx qJN uHQ @@ -177291,13 +177384,13 @@ wtI vfJ vfJ hEi -myW -myW -fsZ -jfB -sab -sab -jzM +hEi +wFI +mmU +ibE +wts +nZg +yeC iFN kHf xkL @@ -177548,13 +177641,13 @@ bfp vfJ mNZ hEi -mlm -rsI -gmH -iVp +myW +myW +fsZ +jfB sab sab -sdn +jzM iFN aXl fyJ @@ -177805,13 +177898,13 @@ lVB vfJ mNZ hEi -hUH -dfk +mlm +rsI gmH -rXS -tOL -fPv -iAM +iVp +sab +sab +sdn iFN mZn oND @@ -178062,13 +178155,13 @@ mNZ mNZ mNZ hEi -hEi -hEi -hEi -hEi -hEi -hEi -lVy +hUH +dfk +gmH +rXS +tOL +fPv +iAM iFN rEv vjQ @@ -178318,14 +178411,14 @@ mNZ mNZ mNZ mNZ -mNZ -mNZ -ivx -ivx -ivx -ivx -wkG -nIQ +kxB +kxB +kxB +kxB +kxB +kxB +moe +cUQ iFN iFN iFN @@ -178578,11 +178671,11 @@ mNZ mNZ mNZ ivx -moe wkG -wkG -wkG -sar +jYT +nkW +hTm +rIJ moe vxX vxX @@ -178837,9 +178930,9 @@ mNZ gEA wkG jYT -jYT -jYT -rIJ +wkG +wkG +wkG moe vxX vxX @@ -179095,9 +179188,9 @@ ivx wkG jYT wkG -wkG -wkG -moe +ivx +ivx +ivx vxX vxX vxX @@ -183735,7 +183828,7 @@ gQq klu xEs xEs -iOk +hFV xEs xEs qRY @@ -183992,7 +184085,7 @@ gQq sbR gQq arS -drx +dqS qad gQq abm @@ -184249,7 +184342,7 @@ gQq sbR gQq ibl -tZR +jSX qad gQq abm @@ -184506,7 +184599,7 @@ gQq sbR gQq ibl -tZR +jSX qad gQq abm @@ -184763,7 +184856,7 @@ ubn gYI ybO xgq -tZR +jSX ueJ ybO gYI @@ -185015,17 +185108,17 @@ wBd rWL jQS jQS -wea -tPE -tPE -tvt -tvt -tZR -tvt -tvt -tZR -tZR -aXc +kpt +uwk +uwk +ljy +ljy +jSX +ljy +ljy +jSX +jSX +viw jQS jQS geB @@ -185272,17 +185365,17 @@ wBd hAL jQS ojC -tPE +uwk lKY lKY -lBZ +bou nRj nem ciV -tPE +uwk lKY lKY -tZR +jSX kkD jQS cku @@ -185529,17 +185622,17 @@ jQS hAL jQS qWt -tPE +uwk lKY hQH -gjo +aKk csf oIh pPY -xeT +bbY gCP lKY -tZR +jSX hLA jQS cku @@ -185786,7 +185879,7 @@ wBd hAL jQS jQS -agM +fei gMy gwx jQS @@ -185796,7 +185889,7 @@ wmO jQS xDf gtE -mYh +qiZ jQS jQS cku @@ -186041,21 +186134,21 @@ oJt wAT ezg agA -wPP -tIs -tPE +sNL +bso +uwk lKY -bBJ -wmO -uHz -uHz +eHw +xyl +gLS +gLS uHz wmO rmi lKY -tZR -gmb -mRC +jSX +kbA +xGE awC vbV wAT @@ -186300,17 +186393,17 @@ wBd rWL jQS uVe -tPE +uwk avA -iox -wmO -uHz -uHz +liI +xyl +gLS +gLS uHz wmO xGG uBm -lBZ +bou rWp jQS hAL @@ -186557,17 +186650,17 @@ jQS hye jQS qZX -tPE +uwk lKY -oIu -wmO -uHz -uHz +eyJ +xyl +gLS +gLS uHz wmO bLI lKY -lBZ +bou gDl jQS hye @@ -186814,17 +186907,17 @@ jQS jQS jQS iXn -ieU +hsV cWL -tMz -jQS -wmO -inz +xyl +fNF +xyl +tAG jgA jQS tMz ybo -aqG +xYT lVq jQS jQS @@ -187069,21 +187162,21 @@ hhX hhX fZF jQS -pjL +iLV jEt -gdM +eUs rdn -dck -wnA -wnA -wnA +iPb +fNF +fNF +fNF wnA viT bUl cNh -iXB +fPK jEt -nfk +aBl jQS fZF hhX @@ -187326,19 +187419,19 @@ hhX hhX fZF jQS -fSi +vNf fXW -jej -krO -krO -krO -krO -krO -krO -krO -krO -krO -rBq +eSW +ekq +dQA +dQA +dQA +dQA +ekq +ekq +ekq +ekq +pIE mCT sQU jQS @@ -187590,7 +187683,7 @@ cWc wnA wnA jfD -krO +ekq olE wnA wnA @@ -187847,7 +187940,7 @@ jQS bGL vBD rxC -krO +ekq jpe wnA trg @@ -188104,7 +188197,7 @@ jQS tbU byC tbU -keb +lXg tbU byC tbU @@ -188358,13 +188451,13 @@ hhX hhX fZF jQS -gQq -gQq -gQq -ybO -gQq -gQq -gQq +fNF +fNF +fNF +gLS +fNF +fNF +fNF jQS fZF hhX @@ -188615,13 +188708,13 @@ hhX hhX fZF jQS -gQq -gQq -gQq -ybO -gQq -gQq -gQq +fNF +fNF +fNF +gLS +fNF +fNF +fNF jQS fZF hhX @@ -188872,13 +188965,13 @@ hhX hhX fZF jQS -gQq -gQq -gQq -gQq -gQq -gQq -gQq +fNF +fNF +fNF +fNF +fNF +fNF +fNF jQS fZF hhX @@ -189129,13 +189222,13 @@ hhX hhX fZF jQS -gQq -gQq -gQq -gQq -gQq -gQq -gQq +fNF +fNF +fNF +fNF +fNF +fNF +fNF jQS fZF hhX @@ -189387,11 +189480,11 @@ hhX fZF jQS jQS -gQq -gQq -gQq -gQq -gQq +fNF +fNF +fNF +fNF +fNF jQS jQS fZF diff --git a/_maps/shuttles/cargo_delta.dmm b/_maps/shuttles/cargo_delta.dmm index 75b2b6cb23270..c12c7c1787841 100644 --- a/_maps/shuttles/cargo_delta.dmm +++ b/_maps/shuttles/cargo_delta.dmm @@ -79,7 +79,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/docking_port/mobile/supply{ - dir = 4 + dir = 4; + port_direction = 8 }, /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/open/floor/plating, diff --git a/_maps/shuttles/cargo_kilo.dmm b/_maps/shuttles/cargo_kilo.dmm index 948369f49085a..e0dc7be8bef72 100644 --- a/_maps/shuttles/cargo_kilo.dmm +++ b/_maps/shuttles/cargo_kilo.dmm @@ -91,7 +91,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/docking_port/mobile/supply{ - dir = 4 + dir = 4; + port_direction = 8 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/supply) diff --git a/_maps/shuttles/cargo_pubby.dmm b/_maps/shuttles/cargo_pubby.dmm index c3d064bc59d17..4ff003c70b3a1 100644 --- a/_maps/shuttles/cargo_pubby.dmm +++ b/_maps/shuttles/cargo_pubby.dmm @@ -140,7 +140,8 @@ /area/shuttle/supply) "R" = ( /obj/docking_port/mobile/supply{ - dir = 4 + dir = 4; + port_direction = 8 }, /obj/machinery/door/airlock/shuttle{ name = "Supply Shuttle Airlock" diff --git a/_maps/shuttles/emergency_northstar.dmm b/_maps/shuttles/emergency_northstar.dmm index e934a65b722fa..798a4d9671a4e 100644 --- a/_maps/shuttles/emergency_northstar.dmm +++ b/_maps/shuttles/emergency_northstar.dmm @@ -183,10 +183,10 @@ pixel_x = -3; pixel_y = 2 }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/shuttle/escape) "qf" = ( -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/shuttle/escape) "qK" = ( /obj/machinery/stasis, @@ -347,7 +347,7 @@ /obj/machinery/door/airlock/survival_pod/glass{ name = "Emergency Shuttle Treatment" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/shuttle/escape) "Eh" = ( /obj/machinery/power/shuttle_engine/propulsion/left, diff --git a/_maps/shuttles/ert_bounty.dmm b/_maps/shuttles/ert_bounty.dmm index 03be12a36a771..b1fbf895fa586 100644 --- a/_maps/shuttles/ert_bounty.dmm +++ b/_maps/shuttles/ert_bounty.dmm @@ -18,7 +18,9 @@ movement_force = list("KNOCKDOWN"=0,"THROW"=0); name = "hunter shuttle"; rechargeTime = 1800; - shuttle_id = "huntership" + shuttle_id = "huntership"; + port_direction = 4; + preferred_direction = 4 }, /obj/structure/fans/tiny, /turf/open/floor/pod/dark, @@ -205,7 +207,9 @@ /area/shuttle/hunter) "H" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{ - dir = 8 + dir = 8; + y_offset = 6; + x_offset = 3 }, /turf/open/floor/pod/dark, /area/shuttle/hunter) diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm index 69a4d6fa18cec..42366d373d8d3 100644 --- a/_maps/shuttles/ferry_base.dmm +++ b/_maps/shuttles/ferry_base.dmm @@ -48,7 +48,7 @@ dir = 8; shuttle_id = "ferry"; name = "ferry shuttle"; - port_direction = 2 + preferred_direction = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm index b5bb7186693e8..5bb79a3e56ed7 100644 --- a/_maps/shuttles/ferry_lighthouse.dmm +++ b/_maps/shuttles/ferry_lighthouse.dmm @@ -142,7 +142,7 @@ dir = 8; shuttle_id = "ferry"; name = "The Lighthouse"; - port_direction = 2 + preferred_direction = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index fc986bcda5030..a4fd0c9e19b74 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -105,7 +105,7 @@ dir = 8; shuttle_id = "ferry"; name = "ferry shuttle"; - port_direction = 2 + preferred_direction = 4 }, /turf/open/floor/iron/freezer, /area/shuttle/transport) diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm index 318995cdbeb08..f5a63f28e49b1 100644 --- a/_maps/shuttles/pirate_silverscale.dmm +++ b/_maps/shuttles/pirate_silverscale.dmm @@ -11,8 +11,11 @@ /turf/open/floor/pod/light, /area/shuttle/pirate) "aZ" = ( -/obj/machinery/suit_storage_unit/pirate, /obj/effect/turf_decal/bot_red, +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tophat; + suit_type = /obj/item/clothing/suit/space/pirate/silverscale + }, /turf/open/floor/pod/dark, /area/shuttle/pirate) "bp" = ( @@ -30,9 +33,6 @@ /turf/open/floor/pod/light, /area/shuttle/pirate) "de" = ( -/obj/machinery/door/airlock/external/glass/ruin{ - id_tag = "pirateportexternal" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -40,6 +40,9 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "pirateportexternal" + }, /turf/open/floor/pod/light, /area/shuttle/pirate) "dI" = ( @@ -51,20 +54,18 @@ anchored = 1 }, /obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/bot, /turf/open/floor/pod/dark, /area/shuttle/pirate) "dT" = ( -/obj/item/ammo_box/strilka310{ - pixel_y = 2 +/obj/structure/table, +/obj/item/grenade/c4, +/obj/item/grenade/c4{ + pixel_x = 9 }, -/obj/item/ammo_box/strilka310, /obj/item/grenade/c4{ - pixel_x = -13 + pixel_x = -9 }, -/obj/structure/table, /turf/open/floor/iron/dark, /area/shuttle/pirate) "ei" = ( @@ -108,15 +109,25 @@ /obj/structure/rack{ dir = 8 }, -/obj/item/ammo_box/strilka310, -/obj/item/ammo_box/strilka310{ - pixel_y = 3 - }, /obj/effect/turf_decal/bot, -/obj/item/gun/ballistic/rifle/boltaction/prime, +/obj/item/ammo_box/strilka310/phasic{ + pixel_y = -5; + pixel_x = 5 + }, +/obj/item/ammo_box/strilka310/phasic{ + pixel_x = 5 + }, +/obj/item/ammo_box/strilka310/phasic{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/ammo_box/strilka310/phasic{ + pixel_x = -5 + }, /obj/item/gun/ballistic/rifle/boltaction/prime{ pixel_y = 4 }, +/obj/item/gun/ballistic/rifle/boltaction/prime, /turf/open/floor/pod/dark, /area/shuttle/pirate) "fN" = ( @@ -300,13 +311,13 @@ /turf/open/floor/plating/airless, /area/shuttle/pirate) "nY" = ( -/obj/machinery/door/airlock/external/glass/ruin{ - id_tag = "pirateportexternal" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "pirateportexternal" + }, /turf/open/floor/pod/light, /area/shuttle/pirate) "pk" = ( @@ -330,6 +341,14 @@ "rB" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/pirate) +"st" = ( +/mob/living/basic/bot/medbot/nukie{ + name = "Mortimer"; + faction = list("pirate"); + desc = "A lowly medibot serving as the Silverscales' live-in manservant/butler/coat rack. They recently discovered it can heal people as well." + }, +/turf/open/floor/carpet/royalblack, +/area/shuttle/pirate) "sB" = ( /turf/open/floor/iron/dark/textured, /area/shuttle/pirate) @@ -384,6 +403,9 @@ "xj" = ( /obj/structure/table/glass, /obj/item/storage/medkit/brute, +/obj/item/storage/medkit/fire{ + pixel_y = 5 + }, /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) "xs" = ( @@ -427,9 +449,6 @@ /turf/open/floor/pod/dark, /area/shuttle/pirate) "zQ" = ( -/obj/machinery/door/airlock/external/glass/ruin{ - id_tag = "piratestarboardexternal" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -437,6 +456,9 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "piratestarboardexternal" + }, /turf/open/floor/pod/light, /area/shuttle/pirate) "Ae" = ( @@ -525,8 +547,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/button/door/directional/north{ + specialfunctions = 4; + normaldoorcontrol = 1; + name = "External Bolt Control"; + id = "piratestarboardexternal" + }, /turf/open/floor/pod/dark, /area/shuttle/pirate) "Fl" = ( @@ -632,6 +658,18 @@ /obj/item/gun/ballistic/shotgun/doublebarrel/slugs, /turf/open/floor/pod/dark, /area/shuttle/pirate) +"Lf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "pirateportexternal"; + name = "External Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) "Lk" = ( /obj/machinery/power/terminal{ dir = 1 @@ -723,6 +761,14 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/pod/light, /area/shuttle/pirate) +"NL" = ( +/obj/structure/guncase, +/obj/item/gun/energy/laser/luxurypaywall{ + projectile_damage_multiplier = 1.30; + desc = "A laser gun modified to cost 20 credits to fire. Someone on the station should have an ID that works with this thing." + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) "Ox" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -875,6 +921,8 @@ /area/shuttle/pirate) "UV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/pod/dark, /area/shuttle/pirate) "Vw" = ( @@ -1049,7 +1097,7 @@ TV rB rB dQ -Si +Lf rB aZ aZ @@ -1095,7 +1143,7 @@ fR Ox Qm wa -Qm +NL rB UV wa @@ -1187,7 +1235,7 @@ xs Ai am am -am +st am am Ai diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index b751f453d6408..985a7133a9414 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -80,15 +80,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/shuttle/abandoned) -"cE" = ( -/obj/effect/turf_decal/bot_white, -/obj/machinery/atmospherics/components/tank/air{ - dir = 1; - piping_layer = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/shuttle/abandoned) "cS" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -461,6 +452,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/purple, /area/shuttle/abandoned) +"rY" = ( +/obj/effect/turf_decal/bot_white, +/obj/machinery/atmospherics/components/tank/air/layer4{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/shuttle/abandoned) "sl" = ( /obj/machinery/door/poddoor{ id = "whiteship_bridge" @@ -593,6 +592,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/shuttle/abandoned) +"zw" = ( +/obj/machinery/power/shuttle_engine/heater, +/obj/structure/window/reinforced/spawner/directional/north, +/turf/open/floor/plating/airless, +/area/shuttle/abandoned) "zY" = ( /turf/template_noop, /area/template_noop) @@ -928,11 +932,6 @@ /obj/effect/decal/cleanable/plasma, /turf/open/floor/iron/white/diagonal, /area/shuttle/abandoned) -"Nx" = ( -/obj/machinery/power/shuttle_engine/heater, -/obj/structure/window/reinforced/spawner/directional/north, -/turf/open/floor/plating/airless, -/area/shuttle/abandoned) "Ny" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -1344,7 +1343,7 @@ Sc Sc ED xl -Nx +zw UX "} (7,1,1) = {" @@ -1360,11 +1359,11 @@ CG Il pV Bu -cE +rY Sc ot cx -Nx +zw UX "} (8,1,1) = {" @@ -1444,7 +1443,7 @@ Ky Sc Rr vJ -Nx +zw UX "} (12,1,1) = {" @@ -1464,7 +1463,7 @@ Sc Sc UC AA -Nx +zw UX "} (13,1,1) = {" diff --git a/_maps/skyrat/automapper/templates/wawastation/wawastation_arrivals.dmm b/_maps/skyrat/automapper/templates/wawastation/wawastation_arrivals.dmm index 4982edc783f33..5684534a1c08c 100644 --- a/_maps/skyrat/automapper/templates/wawastation/wawastation_arrivals.dmm +++ b/_maps/skyrat/automapper/templates/wawastation/wawastation_arrivals.dmm @@ -172,7 +172,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/south, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "lj" = ( /obj/effect/turf_decal/siding{ @@ -221,7 +221,7 @@ /obj/effect/landmark/navigate_destination{ location = "Arrival Shuttle" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "nL" = ( /obj/effect/spawner/structure/window/reinforced, @@ -233,7 +233,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/directional/north, /obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "pk" = ( /obj/machinery/computer/shuttle/arrivals/recall, @@ -247,7 +247,7 @@ dir = 1 }, /obj/structure/closet/emcloset, -/obj/machinery/incident_display/dual/directional/north, +/obj/machinery/incident_display/delam/directional/north, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) "qi" = ( @@ -294,7 +294,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/directional/south, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "qP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -382,7 +382,7 @@ shuttle_id = "arrivals_shuttle"; name = "Interlink shuttle display" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "yD" = ( /obj/effect/turf_decal/stripes/line{ @@ -402,14 +402,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/item/radio/intercom/directional/north, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "Au" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "AJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -532,7 +532,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/extinguisher_cabinet/directional/west, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "Hf" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -561,7 +561,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/directional/west, /obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "HJ" = ( /obj/effect/turf_decal/siding/corner{ @@ -614,7 +614,7 @@ name = "Interlink shuttle display"; shuttle_id = "arrivals_shuttle" }, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "IQ" = ( /obj/structure/cable, @@ -642,7 +642,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/item/radio/intercom/directional/south, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "JJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -803,7 +803,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "Vc" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -838,7 +838,7 @@ /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/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "Xj" = ( /turf/open/floor/iron/dark/textured_large, @@ -856,7 +856,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/directional/north, /obj/machinery/firealarm/directional/north, -/turf/open/floor/catwalk_floor/flat_white, +/turf/open/floor/catwalk_floor/iron_white, /area/station/hallway/secondary/entry) "YC" = ( /obj/effect/turf_decal/sand/plating, diff --git a/_maps/skyrat/automapper/templates/wawastation/wawastation_commons.dmm b/_maps/skyrat/automapper/templates/wawastation/wawastation_commons.dmm index 195352ff360f1..68e53ffc22084 100644 --- a/_maps/skyrat/automapper/templates/wawastation/wawastation_commons.dmm +++ b/_maps/skyrat/automapper/templates/wawastation/wawastation_commons.dmm @@ -162,7 +162,7 @@ /area/station/service/library) "fK" = ( /obj/effect/turf_decal/trimline/green/filled/line, -/obj/machinery/incident_display/dual{ +/obj/machinery/incident_display/delam{ pixel_x = 16 }, /turf/closed/wall, diff --git a/_maps/ss13_construct.json b/_maps/ss13_construct.txt similarity index 97% rename from _maps/ss13_construct.json rename to _maps/ss13_construct.txt index e1ead45cdc13b..625916affc2fb 100644 --- a/_maps/ss13_construct.json +++ b/_maps/ss13_construct.txt @@ -1,3 +1,4 @@ +CONVERTED TO .txt { "version": 1, "map_name": "SS13 Construct", diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 6c0b918345f64..ebd1617aabd34 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -98,6 +98,7 @@ #define ORGAN_SLOT_MONSTER_CORE "monstercore" #define ORGAN_SLOT_RIGHT_ARM_AUG "r_arm_device" #define ORGAN_SLOT_LEFT_ARM_AUG "l_arm_device" //This one ignores alphabetical order cause the arms should be together +#define ORGAN_SLOT_SPINE "spine" #define ORGAN_SLOT_STOMACH "stomach" #define ORGAN_SLOT_STOMACH_AID "stomach_aid" #define ORGAN_SLOT_THRUSTERS "thrusters" diff --git a/code/__DEFINES/_flags.dm b/code/__DEFINES/_flags.dm index 1dbe5ae85112e..9d0e6a86aec26 100644 --- a/code/__DEFINES/_flags.dm +++ b/code/__DEFINES/_flags.dm @@ -54,6 +54,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// Flag as an optimization, don't make this a trait without profiling /// Yes I know this is a stupid flag, no you can't take him from me #define DECAL_INIT_UPDATE_EXPERIENCED_1 (1<<17) +/// This atom always returns its turf in get_turf_pixel instead of the turf from its offsets +#define IGNORE_TURF_PIXEL_OFFSET_1 (1<<18) //BUBBER EDIT START - Flags //Does item send log notices to admin log when consumed by supermatter? diff --git a/code/__DEFINES/atmospherics/atmos_piping.dm b/code/__DEFINES/atmospherics/atmos_piping.dm index 3870a7aed34ac..521dbd02579ec 100644 --- a/code/__DEFINES/atmospherics/atmos_piping.dm +++ b/code/__DEFINES/atmospherics/atmos_piping.dm @@ -91,6 +91,8 @@ #define PIPING_ALL_COLORS (1<<4) /// can bridge over pipenets #define PIPING_BRIDGE (1<<5) +/// intended to connect with layers 2 and 4 only +#define PIPING_DISTRO_AND_WASTE_LAYERS (1<<6) // Ventcrawling bitflags, handled in var/vent_movement ///Allows for ventcrawling to occur. All atmospheric machines have this flag on by default. Cryo is the exception diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index ed0ddc5954be8..2841c8aaabd4b 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -354,7 +354,7 @@ GLOBAL_LIST_INIT(leg_zones, list(BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)) ///If the obstacle is an object at the border of the turf (so no signal from being sent to the other turf) #define SHOVE_DIRECTIONAL_BLOCKED (1<<6) -///Bitfield returned by listeners for COMSIG_CARBON_ENTER_STAMCRIT when they perform some action that prevents a mob going into stamcrit. +///Bitfield returned by listeners for COMSIG_LIVING_ENTER_STAMCRIT when they perform some action that prevents a mob going into stamcrit. #define STAMCRIT_CANCELLED (1<<0) ///Deathmatch lobby current status diff --git a/code/__DEFINES/dcs/signals/signals_global_object.dm b/code/__DEFINES/dcs/signals/signals_global_object.dm index 51b7a38a94a6c..bed06ff176c1f 100644 --- a/code/__DEFINES/dcs/signals/signals_global_object.dm +++ b/code/__DEFINES/dcs/signals/signals_global_object.dm @@ -1,8 +1,11 @@ /// signals from globally accessible objects -///Whenever SetupOccupations() is called, called all occupations are set +///from SSJob whenever SetupOccupations() is called, all occupations are set #define COMSIG_OCCUPATIONS_SETUP "occupations_setup" +///from SSJob when DivideOccupations is called +#define COMSIG_OCCUPATIONS_DIVIDED "occupations_divided" + ///from SSsun when the sun changes position : (azimuth) #define COMSIG_SUN_MOVED "sun_moved" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm index 598ddc5187852..051953bd7e508 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm @@ -57,8 +57,6 @@ /// Called from bodypart being removed /obj/item/bodypart/proc/drop_limb(mob/living/carbon/old_owner, special, dismembered) #define COMSIG_BODYPART_REMOVED "bodypart_removed" -/// from /mob/living/carbon/enter_stamcrit() -#define COMSIG_CARBON_ENTER_STAMCRIT "carbon_enter_stamcrit" ///from base of mob/living/carbon/soundbang_act(): (list(intensity)) #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang" ///from /item/organ/proc/Insert() (/obj/item/organ/) @@ -163,3 +161,8 @@ /// from /datum/status_effect/limp/proc/check_step(mob/whocares, OldLoc, Dir, forced) iodk where it shuld go #define COMSIG_CARBON_LIMPING "mob_limp_check" #define COMPONENT_CANCEL_LIMP (1<<0) + +///Called from on_acquiring(mob/living/carbon/human/acquirer) +#define COMSIG_MUTATION_GAINED "mutation_gained" +///Called from on_losing(mob/living/carbon/human/owner) +#define COMSIG_MUTATION_LOST "mutation_lost" diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm index 517048bbd4d1d..4c79c9ad8147d 100644 --- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm +++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm @@ -21,6 +21,8 @@ ///from base of mob/update_transform() #define COMSIG_LIVING_POST_UPDATE_TRANSFORM "living_post_update_transform" +/// from /datum/status_effect/incapacitating/stamcrit/on_apply() +#define COMSIG_LIVING_ENTER_STAMCRIT "living_enter_stamcrit" ///from /obj/structure/door/crush(): (mob/living/crushed, /obj/machinery/door/crushing_door) #define COMSIG_LIVING_DOORCRUSHED "living_doorcrush" ///from base of mob/living/resist() (/mob/living) diff --git a/code/__DEFINES/dcs/signals/signals_turf.dm b/code/__DEFINES/dcs/signals/signals_turf.dm index f89f30d1eb458..321fb503cbf96 100644 --- a/code/__DEFINES/dcs/signals/signals_turf.dm +++ b/code/__DEFINES/dcs/signals/signals_turf.dm @@ -40,3 +40,6 @@ #define COMSIG_TURF_RESET_ELEVATION "turf_reset_elevation" #define ELEVATION_CURRENT_PIXEL_SHIFT 1 #define ELEVATION_MAX_PIXEL_SHIFT 2 + +///Called when turf no longer blocks light from passing through +#define COMSIG_TURF_NO_LONGER_BLOCK_LIGHT "turf_no_longer_block_light" diff --git a/code/__DEFINES/door.dm b/code/__DEFINES/door.dm new file mode 100644 index 0000000000000..198d38a3af6dc --- /dev/null +++ b/code/__DEFINES/door.dm @@ -0,0 +1,18 @@ +// Door animation defines +#define DOOR_OPENING_ANIMATION "opening" +#define DOOR_CLOSING_ANIMATION "closing" +#define DOOR_DENY_ANIMATION "deny" + +// Door animation STEP defines +// These are used to mark points in the animtion when things in game should change +#define DOOR_OPENING_PASSABLE "opening_passable" +#define DOOR_OPENING_FINISHED "opening_finished" +#define DOOR_CLOSING_UNPASSABLE "closing_unpassable" +#define DOOR_CLOSING_FINISHED "closing_finished" + +#define AIRLOCK_OPENING_TRANSPARENT "airlock_opening_transparent" +#define AIRLOCK_OPENING_PASSABLE "airlock_opening_passable" +#define AIRLOCK_OPENING_FINISHED "airlock_opening_finished" +#define AIRLOCK_CLOSING_OPAQUE "airlock_closing_opaque" +#define AIRLOCK_CLOSING_UNPASSABLE "airlock_closing_unpassable" +#define AIRLOCK_CLOSING_FINISHED "airlock_closing_finished" diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 2e5bda1bbfa12..0b3321ea450e4 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -122,23 +122,37 @@ // PLANE_SPACE layer(s) #define SPACE_LAYER 1.8 -//#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define. Most floors (FLOOR_PLANE) and walls (WALL_PLANE) use this. +// placed here for documentation. Byond's default turf layer +// We do not use it, as different turfs render on different planes +// #define TURF_LAYER 2 +#define TURF_LAYER 2 #error TURF_LAYER is no longer supported, please be more specific + +// FLOOR_PLANE layer(s) +// We need to force this plane to render as if we were not using sidemap +// this allows larger then bound floors to layer as we'd expect +// ANYTHING on the floor plane needs TOPDOWN_LAYER, and nothing that isn't on the floor plane can have it //FLOOR_PLANE layers -#define TURF_PLATING_DECAL_LAYER 2.001 -#define TURF_DECAL_LAYER 2.009 //Makes turf decals appear in DM how they will look inworld. -#define CULT_OVERLAY_LAYER 2.01 -#define MID_TURF_LAYER 2.02 -#define HIGH_TURF_LAYER 2.03 -#define LATTICE_LAYER 2.04 -#define DISPOSAL_PIPE_LAYER 2.042 -#define WIRE_LAYER 2.044 -#define GLASS_FLOOR_LAYER 2.046 -#define TRAM_RAIL_LAYER 2.047 -#define ABOVE_OPEN_TURF_LAYER 2.049 +// NOTICE: we break from the pattern of increasing in steps of like 0.01 here +// Because TOPDOWN_LAYER is 10000 and that's enough to floating point our modifications away +#define LOW_FLOOR_LAYER (1 + TOPDOWN_LAYER) +#define TURF_PLATING_DECAL_LAYER (2 + TOPDOWN_LAYER) +#define TURF_DECAL_LAYER (3 + TOPDOWN_LAYER) //Makes turf decals appear in DM how they will look inworld. +#define CULT_OVERLAY_LAYER (4 + TOPDOWN_LAYER) +#define MID_TURF_LAYER (5 + TOPDOWN_LAYER) +#define HIGH_TURF_LAYER (6 + TOPDOWN_LAYER) +#define LATTICE_LAYER (7 + TOPDOWN_LAYER) +#define DISPOSAL_PIPE_LAYER (8 + TOPDOWN_LAYER) +#define WIRE_LAYER (9 + TOPDOWN_LAYER) +#define GLASS_FLOOR_LAYER (10 + TOPDOWN_LAYER) +#define TRAM_RAIL_LAYER (11 + TOPDOWN_LAYER) +///catwalk overlay of /turf/open/floor/plating/catwalk_floor +#define CATWALK_LAYER (12 + TOPDOWN_LAYER) +#define ABOVE_OPEN_TURF_LAYER (13 + TOPDOWN_LAYER) //WALL_PLANE layers -#define CLOSED_TURF_LAYER 2.05 +#define BELOW_CLOSED_TURF_LAYER 2.053 +#define CLOSED_TURF_LAYER 2.058 // GAME_PLANE layers #define BULLET_HOLE_LAYER 2.06 @@ -153,8 +167,6 @@ #define PLUMBING_PIPE_VISIBILE_LAYER 2.495//layer = initial(layer) + ducting_layer / 3333 in atmospherics/handle_layer() to determine order of duct overlap #define BOT_PATH_LAYER 2.497 #define LOW_OBJ_LAYER 2.5 -///catwalk overlay of /turf/open/floor/plating/catwalk_floor -#define CATWALK_LAYER 2.51 #define LOW_SIGIL_LAYER 2.52 #define SIGIL_LAYER 2.53 #define HIGH_PIPE_LAYER 2.54 diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index d113a5a10c4eb..a33b7f1ca32a2 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -10,6 +10,8 @@ #define MOVE_INTENT_WALK "walk" #define MOVE_INTENT_RUN "run" +/// Amount of oxyloss that KOs a human +#define OXYLOSS_PASSOUT_THRESHOLD 50 //Blood levels #define BLOOD_VOLUME_MAX_LETHAL 2150 #define BLOOD_VOLUME_EXCESS 2100 @@ -905,7 +907,7 @@ GLOBAL_LIST_INIT(layers_to_offset, list( /// The vomit you've all come to know and love, but with a little extra "spice" (blood) #define VOMIT_CATEGORY_BLOOD (VOMIT_CATEGORY_DEFAULT | MOB_VOMIT_BLOOD) /// Another vomit variant that causes you to get knocked down instead of just only getting a stun. Standard otherwise. -#define VOMIT_CATEGORY_KNOCKDOWN (VOMIT_CATEGORY_DEFAULT | MOB_VOMIT_KNOCKDOWN) +#define VOMIT_CATEGORY_KNOCKDOWN (MOB_VOMIT_MESSAGE | MOB_VOMIT_HARM | MOB_VOMIT_KNOCKDOWN) /// Possible value of [/atom/movable/buckle_lying]. If set to a different (positive-or-zero) value than this, the buckling thing will force a lying angle on the buckled. #define NO_BUCKLE_LYING -1 diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index a4f56a756a161..17fd97d05752e 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -33,6 +33,8 @@ #define PATCH (1<<3) /// Used for direct injection of reagents. #define INJECT (1<<4) +/// Exclusive to just plumbing. if set we use the round robin technique else we use proportional +#define LINEAR (1<<5) /// When returned by on_mob_life(), on_mob_dead(), overdose_start() or overdose_processed(), will cause the mob to updatehealth() afterwards #define UPDATE_MOB_HEALTH 1 @@ -74,6 +76,10 @@ #define CHEMICAL_MAXIMUM_TEMPERATURE 99999 ///The default purity of all non reacted reagents #define REAGENT_STANDARD_PURITY 0.75 +/// Starting purity of consumable reagents +#define CONSUMABLE_STANDARD_PURITY 0.5 // 50% pure by default. Below - synthetic food. Above - natural food. +/// Starting purity of reagents made in biogenerator +#define BIOGEN_REAGENT_PURITY 0.3 /// the default temperature at which chemicals are added to reagent holders at #define DEFAULT_REAGENT_TEMPERATURE 300 diff --git a/code/__DEFINES/research/anomalies.dm b/code/__DEFINES/research/anomalies.dm index dcae65eb75291..d0abbf5147fa8 100644 --- a/code/__DEFINES/research/anomalies.dm +++ b/code/__DEFINES/research/anomalies.dm @@ -1,6 +1,6 @@ // Max amounts of cores you can make #define MAX_CORES_BLUESPACE 3 -#define MAX_CORES_GRAVITATIONAL 8 +#define MAX_CORES_GRAVITATIONAL 6 #define MAX_CORES_FLUX 8 #define MAX_CORES_VORTEX 1 #define MAX_CORES_PYRO 8 diff --git a/code/__DEFINES/research/techweb_nodes.dm b/code/__DEFINES/research/techweb_nodes.dm index 6199918bc0183..3c730e02169fa 100644 --- a/code/__DEFINES/research/techweb_nodes.dm +++ b/code/__DEFINES/research/techweb_nodes.dm @@ -97,7 +97,6 @@ #define TECHWEB_NODE_PASSIVE_IMPLANTS "passive_implants" #define TECHWEB_NODE_PLASMA_CONTROL "plasma_control" #define TECHWEB_NODE_PLASMA_MINING "plasma_mining" -#define TECHWEB_NODE_PLUMBING "plumbing" #define TECHWEB_NODE_POSITRONIC_SPHERE "positronic_sphere" #define TECHWEB_NODE_PROGRAMMED_ROBOT "programmed_robot" #define TECHWEB_NODE_PROGRAMMED_SERVER "programmed_server" diff --git a/code/__DEFINES/time.dm b/code/__DEFINES/time.dm index 6a2a5152903ba..76e8ffdb0e222 100644 --- a/code/__DEFINES/time.dm +++ b/code/__DEFINES/time.dm @@ -40,6 +40,7 @@ #define MOTH_WEEK "Moth Week" #define IAN_HOLIDAY "Ian's Birthday" #define HOTDOG_DAY "National Hot Dog Day" +#define ICE_CREAM_DAY "National Ice Cream Day" /* Days of the week to make it easier to reference them. diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index 9580b56fa8322..cc2a206f4a598 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -351,6 +351,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_GUNFLIP "gunflip" /// Increases chance of getting special traumas, makes them harder to cure #define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost" +/// Doubles the duration and cooldown of a flip +#define TRAIT_SLOW_FLIP "slow_flip" #define TRAIT_SPACEWALK "spacewalk" /// Sanity trait to keep track of when we're in hyperspace and add the appropriate element if we werent #define TRAIT_HYPERSPACED "hyperspaced" @@ -978,6 +980,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define STATION_TRAIT_BIGGER_PODS "station_trait_bigger_pods" #define STATION_TRAIT_BIRTHDAY "station_trait_birthday" #define STATION_TRAIT_BOTS_GLITCHED "station_trait_bot_glitch" +#define STATION_TRAIT_MACHINES_GLITCHED "station_trait_machine_glitch" #define STATION_TRAIT_BRIGHT_DAY "station_trait_bright_day" #define STATION_TRAIT_CARP_INFESTATION "station_trait_carp_infestation" #define STATION_TRAIT_CYBERNETIC_REVOLUTION "station_trait_cybernetic_revolution" @@ -1188,4 +1191,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai ///Trait given to the birthday boy #define TRAIT_BIRTHDAY_BOY "birthday_boy" + +///Trait given to a turf that should not be allowed to be terraformed, such as turfs holding ore vents. +#define TRAIT_NO_TERRAFORM "no_terraform" + + // END TRAIT DEFINES diff --git a/code/__DEFINES/uplink.dm b/code/__DEFINES/uplink.dm index bb92f0672c3a7..67df6fc0e6295 100644 --- a/code/__DEFINES/uplink.dm +++ b/code/__DEFINES/uplink.dm @@ -15,6 +15,17 @@ /// Can be randomly given to spies for their bounties #define UPLINK_SPY (1 << 4) +#define UPLINK_LONE_OP (1 << 5) + +/// A blanket define for an item being purchasable by all types of nukie +#define UPLINK_ALL_SYNDIE_OPS (UPLINK_NUKE_OPS | UPLINK_LONE_OP | UPLINK_CLOWN_OPS) + +/// A blanket define for an item being purchasable by all operatives that spawn at the nukie firebase +#define UPLINK_FIREBASE_OPS (UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + +/// A define that excludes clown ops from the regular nukeop gear lineup +#define UPLINK_SERIOUS_OPS (UPLINK_NUKE_OPS | UPLINK_LONE_OP) + /// Progression gets turned into a user-friendly form. This is just an abstract equation that makes progression not too large. #define DISPLAY_PROGRESSION(time) round(time/60, 0.01) diff --git a/code/__DEFINES/~skyrat_defines/antagonists.dm b/code/__DEFINES/~skyrat_defines/antagonists.dm index 226549b4b5e4e..05c05d4d8325e 100644 --- a/code/__DEFINES/~skyrat_defines/antagonists.dm +++ b/code/__DEFINES/~skyrat_defines/antagonists.dm @@ -17,7 +17,7 @@ #define GOLDENEYE_REQUIRED_KEYS_MAXIMUM 3 /// Population requirement for bomb objectives (ninja c4, locate weakpoint, etc.) objectives to appear -#define BOMB_POP_REQUIREMENT 80 +#define BOMB_POP_REQUIREMENT 30 //BUBBER EDIT: Original 80 // Borer evolution defines // The three primary paths that eventually diverge diff --git a/code/__DEFINES/~skyrat_defines/signals.dm b/code/__DEFINES/~skyrat_defines/signals.dm index bb3e678bbf9b4..800ccfd86010c 100644 --- a/code/__DEFINES/~skyrat_defines/signals.dm +++ b/code/__DEFINES/~skyrat_defines/signals.dm @@ -47,6 +47,8 @@ #define COMSIG_TURF_MOB_FALL "turf_mob_fall" ///from base of /obj/effect/abstract/liquid_turf/Initialize() (/obj/effect/abstract/liquid_turf/liquids) #define COMSIG_TURF_LIQUIDS_CREATION "turf_liquids_creation" +/// From base of /turf/proc/liquids_change(new_state) +#define COMSIG_TURF_LIQUIDS_CHANGE "turf_liquids_change" /// listens to wet_stacks, if wetting a mob above 10 stacks it will signal the akula race trait to apply its buffs and nerfs #define COMSIG_MOB_TRIGGER_WET_SKIN "mob_trigger_wet_skin" diff --git a/code/__DEFINES/~~bubber_defines/footsteps.dm b/code/__DEFINES/~~bubber_defines/footsteps.dm index cee773a905466..1573436fd826c 100644 --- a/code/__DEFINES/~~bubber_defines/footsteps.dm +++ b/code/__DEFINES/~~bubber_defines/footsteps.dm @@ -1,2 +1,2 @@ //footstep mob defines -#define FOOTSTEP_MOB_SNAKE 9 +#define FOOTSTEP_MOB_SNAKE "footstep_snake" diff --git a/code/__DEFINES/~~bubber_defines/signals.dm b/code/__DEFINES/~~bubber_defines/signals.dm index 10e6cf5743871..023ececaf4353 100644 --- a/code/__DEFINES/~~bubber_defines/signals.dm +++ b/code/__DEFINES/~~bubber_defines/signals.dm @@ -1,2 +1,4 @@ // Signal sent when the morgue tray throws its alarm #define COMSIG_MORGUE_ALARM "morgue_alarm" +// Can be sent whenever an object's name is changed so components can be properly updated as well +#define COMSIG_NAME_CHANGED "name_changed" diff --git a/code/__DEFINES/~~bubber_defines/traits.dm b/code/__DEFINES/~~bubber_defines/traits.dm index dac7ce8374e01..b291679dfad9f 100644 --- a/code/__DEFINES/~~bubber_defines/traits.dm +++ b/code/__DEFINES/~~bubber_defines/traits.dm @@ -10,3 +10,6 @@ #define TRAIT_R_SQUADRUPED "squadruped_borg" // For light weight borgs #define TRAIT_R_LIGHT_WEIGHT "lightweight_borg" + +//For the hemophage quirk that allows hemophages to eat/drink normal food/drink. +#define TRAIT_MASQUERADE_FOOD "masquerade_food" diff --git a/code/__DEFINES/~~~splurt_defines/traits/declarations.dm b/code/__DEFINES/~~~splurt_defines/traits/declarations.dm new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/code/__HELPERS/_planes.dm b/code/__HELPERS/_planes.dm index 769c4283ea626..779319114076f 100644 --- a/code/__HELPERS/_planes.dm +++ b/code/__HELPERS/_planes.dm @@ -86,3 +86,19 @@ // This is solvable with lowspec preferences, which would not be hard to implement // Player popups will now render their effects, like overlay lights. this is fixable, but I've not gotten to it // I think overlay lights can render on the wrong z layer. s fucked + +/// Whitelist of planes allowed to use TOPDOWN_LAYER +GLOBAL_LIST_INIT(topdown_planes, list( + "[FLOOR_PLANE]" = TRUE, + )) + +/// Checks if a passed in MA or atom is allowed to have its current plane/layer matchup +/proc/check_topdown_validity(mutable_appearance/thing_to_check) + if(istype(thing_to_check, /atom/movable/screen/plane_master)) + return + var/topdown_plane = GLOB.topdown_planes["[PLANE_TO_TRUE(thing_to_check.plane)]"] + if(topdown_plane) + if(thing_to_check.layer - TOPDOWN_LAYER < 0 || thing_to_check.layer >= BACKGROUND_LAYER) + stack_trace("[thing_to_check] ([thing_to_check.type]) was expected to have a TOPDOWN_LAYER layer due to its plane, but it DID NOT! layer: ([thing_to_check.layer]) plane: ([thing_to_check.plane])") + else if(thing_to_check.layer - TOPDOWN_LAYER >= 0 && thing_to_check.layer < BACKGROUND_LAYER) + stack_trace("[thing_to_check] ([thing_to_check.type] is NOT ALLOWED to have a TOPDOWN_LAYER layer due to its plane, but it did! layer: ([thing_to_check.layer]) plane: ([thing_to_check.plane])") diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index f81464013e01c..1d247c12e6ee7 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -5,6 +5,8 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(list( /area/station/engineering/supermatter, /area/station/engineering/atmospherics_engine, /area/station/ai_monitored/turret_protected/ai, + /area/ruin/comms_agent //fixes icemoon comms station being affected + ))) // Gets an atmos isolated contained space diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index c53d9df2d2c05..88ca3dbe11c8c 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -493,7 +493,7 @@ xxx xxx xxx var/junction_dir = reverse_ndir(smoothing_junction) var/turned_adjacency = REVERSE_DIR(junction_dir) var/turf/neighbor_turf = get_step(src, turned_adjacency & (NORTH|SOUTH)) - var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, offset_spokesman = src, plane = FLOOR_PLANE) + var/mutable_appearance/underlay_appearance = mutable_appearance(layer = LOW_FLOOR_LAYER, offset_spokesman = src, plane = FLOOR_PLANE) if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) neighbor_turf = get_step(src, turned_adjacency & (EAST|WEST)) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index fd11d8f065131..4a4cf2011d081 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -420,6 +420,10 @@ world } \ current_layer = base_layer + appearance.layer + current_layer / 1000; \ } \ + /* If we are using topdown rendering, chop that part off so things layer together as expected */ \ + if((current_layer >= TOPDOWN_LAYER && current_layer < EFFECTS_LAYER) || current_layer > TOPDOWN_LAYER + EFFECTS_LAYER) { \ + current_layer -= TOPDOWN_LAYER; \ + } \ for (var/index_to_compare_to in 1 to layers.len) { \ var/compare_to = layers[index_to_compare_to]; \ if (current_layer < layers[compare_to]) { \ @@ -431,9 +435,10 @@ world } var/static/icon/flat_template = icon('icons/blanks/32x32.dmi', "nothing") + var/icon/flat = icon(flat_template) if(!appearance || appearance.alpha <= 0) - return icon(flat_template) + return flat if(start) if(!defdir) @@ -474,10 +479,15 @@ world if(!base_icon_dir) base_icon_dir = curdir + // Expand our canvas to fit if we're too big + if(render_icon) + var/icon/active_icon = icon(curicon) + if(active_icon.Width() != 32 || active_icon.Height() != 32) + flat.Scale(active_icon.Width(), active_icon.Height()) + var/curblend = appearance.blend_mode || defblend if(appearance.overlays.len || appearance.underlays.len) - var/icon/flat = icon(flat_template) // Layers will be a sorted list of icons/overlays, based on the order in which they are displayed var/list/layers = list() var/image/copy diff --git a/code/__HELPERS/turfs.dm b/code/__HELPERS/turfs.dm index 88509b88ce802..01ad88e68f4c3 100644 --- a/code/__HELPERS/turfs.dm +++ b/code/__HELPERS/turfs.dm @@ -213,6 +213,8 @@ Turf and target are separate in case you want to teleport some distance from a t var/turf/atom_turf = get_turf(checked_atom) //use checked_atom's turfs, as it's coords are the same as checked_atom's AND checked_atom's coords are lost if it is inside another atom if(!atom_turf) return null + if(checked_atom.flags_1 & IGNORE_TURF_PIXEL_OFFSET_1) + return atom_turf var/list/offsets = get_visual_offset(checked_atom) return pixel_offset_turf(atom_turf, offsets) diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index aa689dc65201a..51cea02bc3adf 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -81,6 +81,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "STATION_TRAIT_BIGGER_PODS" = STATION_TRAIT_BIGGER_PODS, "STATION_TRAIT_BIRTHDAY" = STATION_TRAIT_BIRTHDAY, "STATION_TRAIT_BOTS_GLITCHED" = STATION_TRAIT_BOTS_GLITCHED, + "STATION_TRAIT_MACHINES_GLITCHED" = STATION_TRAIT_MACHINES_GLITCHED, "STATION_TRAIT_BRIGHT_DAY" = STATION_TRAIT_BRIGHT_DAY, "STATION_TRAIT_CARP_INFESTATION" = STATION_TRAIT_CARP_INFESTATION, "STATION_TRAIT_CYBERNETIC_REVOLUTION" = STATION_TRAIT_CYBERNETIC_REVOLUTION, @@ -156,7 +157,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_BOMBIMMUNE" = TRAIT_BOMBIMMUNE, "TRAIT_BONSAI" = TRAIT_BONSAI, "TRAIT_BOOZE_SLIDER" = TRAIT_BOOZE_SLIDER, - "TRAIT_BOXING_READY" = TRAIT_BOXING_READY, "TRAIT_BORN_MONKEY" = TRAIT_BORN_MONKEY, "TRAIT_BOXING_READY" = TRAIT_BOXING_READY, "TRAIT_BRAINWASHING" = TRAIT_BRAINWASHING, @@ -307,6 +307,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_MAGICALLY_PHASED" = TRAIT_MAGICALLY_PHASED, "TRAIT_MARTIAL_ARTS_IMMUNE" = TRAIT_MARTIAL_ARTS_IMMUNE, "TRAIT_MANSUS_TOUCHED" = TRAIT_MANSUS_TOUCHED, + "TRAIT_MASQUERADE_FOOD" = TRAIT_MASQUERADE_FOOD, // BUBBER EDIT "TRAIT_MEDIBOTCOMINGTHROUGH" = TRAIT_MEDIBOTCOMINGTHROUGH, "TRAIT_MEDICAL_HUD" = TRAIT_MEDICAL_HUD, "TRAIT_MESON_VISION" = TRAIT_MESON_VISION, @@ -449,6 +450,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE, "TRAIT_SKITTISH" = TRAIT_SKITTISH, "TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE, + "TRAIT_SLOW_FLIP" = TRAIT_SLOW_FLIP, "TRAIT_SMOKER" = TRAIT_SMOKER, "TRAIT_SNEAK" = TRAIT_SNEAK, "TRAIT_SNOB" = TRAIT_SNOB, @@ -645,15 +647,16 @@ GLOBAL_LIST_INIT(traits_by_type, list( /turf = list( "TRAIT_CHASM_STOPPED" = TRAIT_CHASM_STOPPED, "TRAIT_CONTAINMENT_FIELD" = TRAIT_CONTAINMENT_FIELD, + "TRAIT_ELEVATED_TURF" = TRAIT_ELEVATED_TURF, "TRAIT_FIREDOOR_STOP" = TRAIT_FIREDOOR_STOP, + "TRAIT_FISHING_SPOT" = TRAIT_FISHING_SPOT, "TRAIT_HYPERSPACE_STOPPED" = TRAIT_HYPERSPACE_STOPPED, "TRAIT_IMMERSE_STOPPED" = TRAIT_IMMERSE_STOPPED, "TRAIT_LAVA_STOPPED" = TRAIT_LAVA_STOPPED, + "TRAIT_NO_TERRAFORM" = TRAIT_NO_TERRAFORM, "TRAIT_SPINNING_WEB_TURF" = TRAIT_SPINNING_WEB_TURF, "TRAIT_TURF_IGNORE_SLIPPERY" = TRAIT_TURF_IGNORE_SLIPPERY, "TRAIT_TURF_IGNORE_SLOWDOWN" = TRAIT_TURF_IGNORE_SLOWDOWN, - "TRAIT_ELEVATED_TURF" = TRAIT_ELEVATED_TURF, - "TRAIT_FISHING_SPOT" = TRAIT_FISHING_SPOT, ), // SKYRAT EDIT ADDITION START - SKYRAT TRAITS /obj/item/toy/plush/skyrat = list( diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm index 407ac300234c2..3526a2b223193 100644 --- a/code/_globalvars/traits/admin_tooling.dm +++ b/code/_globalvars/traits/admin_tooling.dm @@ -120,6 +120,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_LITERATE" = TRAIT_LITERATE, "TRAIT_LIVERLESS_METABOLISM" = TRAIT_LIVERLESS_METABOLISM, "TRAIT_MAGICALLY_GIFTED" = TRAIT_MAGICALLY_GIFTED, + "TRAIT_MASQUERADE_FOOD" = TRAIT_MASQUERADE_FOOD, //BUBBER EDIT "TRAIT_MEDICAL_HUD" = TRAIT_MEDICAL_HUD, "TRAIT_MIME_FAN" = TRAIT_MIME_FAN, "TRAIT_MIMING" = TRAIT_MIMING, @@ -202,6 +203,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list( "TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE, "TRAIT_SKITTISH" = TRAIT_SKITTISH, "TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE, + "TRAIT_SLOW_FLIP" = TRAIT_SLOW_FLIP, "TRAIT_SMOKER" = TRAIT_SMOKER, "TRAIT_SNOB" = TRAIT_SNOB, "TRAIT_SOOTHED_THROAT" = TRAIT_SOOTHED_THROAT, diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index a9b6821f8076c..0e45825b6529f 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -31,7 +31,10 @@ MiddleClickOn(A, params) return if(LAZYACCESS(modifiers, ALT_CLICK)) // alt and alt-gr (rightalt) - A.borg_click_alt(src) + if(LAZYACCESS(modifiers, RIGHT_CLICK)) + AltClickSecondaryOn(A) + else + A.borg_click_alt(src) return if(LAZYACCESS(modifiers, CTRL_CLICK)) CtrlClickOn(A) diff --git a/code/_onclick/hud/picture_in_picture.dm b/code/_onclick/hud/picture_in_picture.dm index f3bb3713225c9..b6ac49446fc80 100644 --- a/code/_onclick/hud/picture_in_picture.dm +++ b/code/_onclick/hud/picture_in_picture.dm @@ -1,6 +1,7 @@ /atom/movable/screen/movable/pic_in_pic name = "Picture-in-picture" screen_loc = "CENTER" + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE var/atom/center var/width = 0 diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index d7da4d84546e3..4f08502119d0e 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -47,7 +47,7 @@ SUBSYSTEM_DEF(blackbox) /* // SKYRAT EDIT CHANGE - MULTISERVER - ORIGINAL: var/datum/db_query/query_record_playercount = SSdbcore.NewQuery({" INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port, round_id) - VALUES (:playercount, :admincount, NOW(), INET_ATON(:server_ip), :server_port, :round_id) + VALUES (:playercount, :admincount, NOW(), INET_ATON(:server_ip), :server_port, :round_id) */ var/datum/db_query/query_record_playercount = SSdbcore.NewQuery({" INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_name, server_ip, server_port, round_id) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index c0cd22f529355..0ae9105b2e023 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -395,6 +395,7 @@ SUBSYSTEM_DEF(job) //Setup new player list and get the jobs list JobDebug("Running DO, allow_all = [allow_all], pure = [pure]") run_divide_occupation_pure = pure + SEND_SIGNAL(src, COMSIG_OCCUPATIONS_DIVIDED, pure, allow_all) //Get the players who are ready for(var/i in GLOB.new_player_list) @@ -634,6 +635,7 @@ SUBSYSTEM_DEF(job) var/never = 0 //never var/banned = 0 //banned var/young = 0 //account too young + var/newbie = 0 //exp too low for(var/i in GLOB.new_player_list) var/mob/dead/new_player/player = i if(!(player.ready == PLAYER_READY_TO_PLAY && player.mind && is_unassigned_job(player.mind.assigned_role))) @@ -645,7 +647,7 @@ SUBSYSTEM_DEF(job) young++ continue if(job.required_playtime_remaining(player.client)) - young++ + newbie++ continue switch(player.client.prefs.job_preferences[job.title]) if(JP_HIGH) @@ -662,6 +664,7 @@ SUBSYSTEM_DEF(job) SSblackbox.record_feedback("nested tally", "job_preferences", never, list("[job.title]", "never")) SSblackbox.record_feedback("nested tally", "job_preferences", banned, list("[job.title]", "banned")) SSblackbox.record_feedback("nested tally", "job_preferences", young, list("[job.title]", "young")) + SSblackbox.record_feedback("nested tally", "job_preferences", newbie, list("[job.title]", "newbie")) /datum/controller/subsystem/job/proc/PopcapReached() var/hpc = CONFIG_GET(number/hard_popcap) diff --git a/code/controllers/subsystem/persistence/counter_delamination.dm b/code/controllers/subsystem/persistence/counter_delamination.dm index 81dca300c7e1e..dba683bc929a3 100644 --- a/code/controllers/subsystem/persistence/counter_delamination.dm +++ b/code/controllers/subsystem/persistence/counter_delamination.dm @@ -8,7 +8,7 @@ rounds_since_engine_exploded = text2num(file2text(DELAMINATION_COUNT_FILEPATH)) if(fexists(DELAMINATION_HIGHSCORE_FILEPATH)) delam_highscore = text2num(file2text(DELAMINATION_HIGHSCORE_FILEPATH)) - for(var/obj/machinery/incident_display/sign as anything in GLOB.map_delamination_counters) + for(var/obj/machinery/incident_display/sign as anything in GLOB.map_incident_displays) sign.update_delam_count(rounds_since_engine_exploded, delam_highscore) /datum/controller/subsystem/persistence/proc/save_delamination_counter() diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm index 7a74c344f60f7..7b06e07f9d887 100644 --- a/code/controllers/subsystem/polling.dm +++ b/code/controllers/subsystem/polling.dm @@ -176,8 +176,21 @@ SUBSYSTEM_DEF(polling) UNTIL(new_poll.finished) if(!(amount_to_pick > 0)) return new_poll.signed_up + + //BUBBERSTATION CHANGE START: ANTAG TICKETS INTEGRATION + var/list/candidate_tickets = candidates_to_tickets(new_poll.signed_up) + for(var/pick in 1 to amount_to_pick) + if(!length(candidate_tickets)) + continue + var/mob/chosen_mob = pick_weight(candidate_tickets) + candidate_tickets -= chosen_mob + new_poll.chosen_candidates += chosen_mob + /* for(var/pick in 1 to amount_to_pick) new_poll.chosen_candidates += pick_n_take(new_poll.signed_up) + */ + //BUBBERSTATION CHANGE END: ANTAG TICKETS INTEGRATION + if(announce_chosen) new_poll.announce_chosen(group) if(new_poll.chosen_candidates.len == 1) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 2a2c11c1ac18d..ce4082d2d442a 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -36,7 +36,7 @@ SUBSYSTEM_DEF(research) var/list/techweb_nodes_experimental = list() ///path = list(point type = value) var/list/techweb_point_items = list( - /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000) + /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS) ) var/list/errored_datums = list() ///Associated list of all point types that techwebs will have and their respective 'abbreviated' name. @@ -104,6 +104,13 @@ SUBSYSTEM_DEF(research) techweb_list.last_income = world.time + if(techweb_list.research_queue_nodes.len) + techweb_list.research_node_id(techweb_list.research_queue_nodes[1]) // Attempt to research the first node in queue if possible + + for(var/datum/techweb_node/node as anything in techweb_list.research_queue_nodes) + if(node.is_free(techweb_list)) // Automatically research all free nodes in queue if any + techweb_list.research_node(node) + /datum/controller/subsystem/research/proc/autosort_categories() for(var/i in techweb_nodes) var/datum/techweb_node/I = techweb_nodes[i] diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 938321c5cd90b..de9de30a87bd4 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -543,7 +543,7 @@ SUBSYSTEM_DEF(shuttle) sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) - if(!emergency_no_escape && (emergency.mode == SHUTTLE_STRANDED)) + if(!emergency_no_escape && (emergency.mode == SHUTTLE_STRANDED || emergency.mode == SHUTTLE_DOCKED)) emergency.mode = SHUTTLE_DOCKED emergency.setTimer(emergency_dock_time) priority_announce( diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 14d4b7ed293f5..ca3f5a6788005 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -281,6 +281,15 @@ SUBSYSTEM_DEF(vote) return FALSE return TRUE + +/datum/controller/subsystem/vote/proc/toggle_dead_voting(mob/toggle_initiator) + var/switch_deadvote_config = !CONFIG_GET(flag/no_dead_vote) + CONFIG_SET(flag/no_dead_vote, switch_deadvote_config) + var/text_verb = !switch_deadvote_config ? "enabled" : "disabled" + log_admin("[key_name(toggle_initiator)] [text_verb] Dead Vote.") + message_admins("[key_name_admin(toggle_initiator)] [text_verb] Dead Vote.") + SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Dead Vote", text_verb)) + /datum/controller/subsystem/vote/ui_state() return GLOB.always_state @@ -300,6 +309,7 @@ SUBSYSTEM_DEF(vote) data["user"] = list( "ckey" = user.client?.ckey, + "isGhost" = CONFIG_GET(flag/no_dead_vote) && user.stat == DEAD && !user.client?.holder, "isLowerAdmin" = is_lower_admin, "isUpperAdmin" = is_upper_admin, // What the current user has selected in any ongoing votes. @@ -384,6 +394,15 @@ SUBSYSTEM_DEF(vote) end_vote() return TRUE + if("toggleDeadVote") + if(!check_rights_for(voter.client, R_ADMIN)) + message_admins("[key_name(voter)] tried to toggle vote abillity for ghosts while having improper rights, \ + this is potentially a malicious exploit and worth noting.") + return + + toggle_dead_voting(voter) + return TRUE + if("toggleVote") var/datum/vote/selected = possible_votes[params["voteName"]] if(!istype(selected)) diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm index d9032967e263c..461cfcff3aae4 100644 --- a/code/datums/components/bloodysoles.dm +++ b/code/datums/components/bloodysoles.dm @@ -242,6 +242,7 @@ // If our feet are bloody enough, add an entered dir pool_FP.entered_dirs |= wielder.dir pool_FP.update_appearance() + return share_blood(pool) diff --git a/code/datums/components/crafting/atmospheric.dm b/code/datums/components/crafting/atmospheric.dm index b2993012e82b0..6674ee1059a9f 100644 --- a/code/datums/components/crafting/atmospheric.dm +++ b/code/datums/components/crafting/atmospheric.dm @@ -359,3 +359,26 @@ /obj/item/stack/sheet/iron = 30, ) category = CAT_STRUCTURE + +/datum/crafting_recipe/airlock_pump + name = "External Airlock Pump" + tool_behaviors = list(TOOL_WRENCH, TOOL_WELDER) + result = /obj/item/pipe/directional/airlock_pump + reqs = list( + /obj/item/pipe = 1, + /obj/item/stack/sheet/iron = 5, + /obj/item/stack/cable_coil = 5, + /obj/item/analyzer = 1, + ) + time = 2 SECONDS + category = CAT_ATMOSPHERIC + +/datum/crafting_recipe/airlock_pump/check_requirements(mob/user, list/collected_requirements) + return atmos_pipe_check(user, collected_requirements) + +/datum/crafting_recipe/airlock_pump/on_craft_completion(mob/user, atom/result) + var/obj/item/pipe/crafted_pipe = result + crafted_pipe.pipe_type = /obj/machinery/atmospherics/components/unary/airlock_pump + crafted_pipe.pipe_color = COLOR_VERY_LIGHT_GRAY + crafted_pipe.setDir(user.dir) + crafted_pipe.update() diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 21b5548dcaaa8..0220035712646 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -499,12 +499,26 @@ var/list/atoms = mode ? GLOB.cooking_recipes_atoms : GLOB.crafting_recipes_atoms // Prepare atom data + + //load sprite sheets and select the correct one based on the mode + var/static/list/sprite_sheets + if(isnull(sprite_sheets)) + sprite_sheets = ui_assets() + var/datum/asset/spritesheet/sheet = sprite_sheets[mode ? 2 : 1] + + data["icon_data"] = list() for(var/atom/atom as anything in atoms) + var/atom_id = atoms.Find(atom) + data["atom_data"] += list(list( "name" = initial(atom.name), - "is_reagent" = ispath(atom, /datum/reagent/) + "is_reagent" = ispath(atom, /datum/reagent/), )) + var/icon_size = sheet.icon_size_id("a[atom_id]") + if(!endswith(icon_size, "32x32")) + data["icon_data"]["[atom_id]"] = "[icon_size] a[atom_id]" + // Prepare materials data for(var/atom/atom as anything in material_occurences) if(material_occurences[atom] == 1) @@ -578,16 +592,7 @@ data["ref"] = "[REF(recipe)]" var/atom/atom = recipe.result - //load sprite sheets and select the correct one based on the mode - var/static/list/sprite_sheets - if(isnull(sprite_sheets)) - sprite_sheets = ui_assets() - var/datum/asset/spritesheet/sheet = sprite_sheets[mode ? 2 : 1] - - //infer icon size of this atom - var/atom_id = atoms.Find(atom) - var/icon_size = sheet.icon_size_id("a[atom_id]") - data["icon"] = "[icon_size] a[atom_id]" + data["id"] = atoms.Find(atom) var/recipe_data = recipe.crafting_ui_data() for(var/new_data in recipe_data) diff --git a/code/datums/components/material/remote_materials.dm b/code/datums/components/material/remote_materials.dm index d2804f97df120..d630ce8e77f9b 100644 --- a/code/datums/components/material/remote_materials.dm +++ b/code/datums/components/material/remote_materials.dm @@ -147,7 +147,7 @@ handles linking back and forth. /datum/component/remote_materials/proc/OnMultitool(datum/source, mob/user, obj/item/multitool/M) SIGNAL_HANDLER - . = ITEM_INTERACT_BLOCKING + . = NONE if (!QDELETED(M.buffer) && istype(M.buffer, /obj/machinery/ore_silo)) if (silo == M.buffer) to_chat(user, span_warning("[parent] is already connected to [silo]!")) diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm index e2f7b2880c4bd..490f88d39b25e 100644 --- a/code/datums/components/plumbing/_plumbing.dm +++ b/code/datums/components/plumbing/_plumbing.dm @@ -94,7 +94,7 @@ process_request(dir = dir) ///check who can give us what we want, and how many each of them will give us -/datum/component/plumbing/proc/process_request(amount = MACHINE_REAGENT_TRANSFER, reagent, dir) +/datum/component/plumbing/proc/process_request(amount = MACHINE_REAGENT_TRANSFER, reagent, dir, round_robin = TRUE) //find the duct to take from var/datum/ductnet/net if(!ducts.Find(num2text(dir))) @@ -115,7 +115,7 @@ var/target_volume = reagents.total_volume + amount for(var/datum/component/plumbing/give as anything in valid_suppliers) currentRequest = (target_volume - reagents.total_volume) / suppliersLeft - give.transfer_to(src, currentRequest, reagent, net) + give.transfer_to(src, currentRequest, reagent, net, round_robin) suppliersLeft-- return TRUE @@ -134,11 +134,11 @@ return FALSE ///this is where the reagent is actually transferred and is thus the finish point of our process() -/datum/component/plumbing/proc/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net) +/datum/component/plumbing/proc/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net, round_robin = TRUE) if(!reagents || !target || !target.reagents) return FALSE - reagents.trans_to(target.recipient_reagents_holder, amount, target_id = reagent) + reagents.trans_to(target.recipient_reagents_holder, amount, target_id = reagent, methods = round_robin ? LINEAR : NONE) ///We create our luxurious piping overlays/underlays, to indicate where we do what. only called once if use_overlays = TRUE in Initialize() /datum/component/plumbing/proc/create_overlays(atom/movable/parent_movable, list/overlays) @@ -376,46 +376,3 @@ // Defer to later frame because pixel_* is actually updated after all callbacks addtimer(CALLBACK(parent_obj, TYPE_PROC_REF(/atom/, update_appearance)), 0.1 SECONDS) - -///has one pipe input that only takes, example is manual output pipe -/datum/component/plumbing/simple_demand - demand_connects = SOUTH - -///has one pipe output that only supplies. example is liquid pump and manual input pipe -/datum/component/plumbing/simple_supply - supply_connects = SOUTH - -///input and output, like a holding tank -/datum/component/plumbing/tank - demand_connects = WEST - supply_connects = EAST - -/datum/component/plumbing/manifold - demand_connects = NORTH - supply_connects = SOUTH - -/datum/component/plumbing/manifold/change_ducting_layer(obj/caller, obj/changer, new_layer) - return - -#define READY 2 -///Baby component for the buffer plumbing machine -/datum/component/plumbing/buffer - demand_connects = WEST - supply_connects = EAST - -/datum/component/plumbing/buffer/Initialize(start=TRUE, _turn_connects=TRUE, _ducting_layer, datum/reagents/custom_receiver) - if(!istype(parent, /obj/machinery/plumbing/buffer)) - return COMPONENT_INCOMPATIBLE - - return ..() - -/datum/component/plumbing/buffer/can_give(amount, reagent, datum/ductnet/net) - var/obj/machinery/plumbing/buffer/buffer = parent - return (buffer.mode == READY) ? ..() : FALSE - -#undef READY - -///Lazily demand from any direction. Overlays won't look good, and the aquarium sprite occupies about the entire 32x32 area anyway. -/datum/component/plumbing/aquarium - demand_connects = SOUTH|NORTH|EAST|WEST - use_overlays = FALSE diff --git a/code/datums/components/plumbing/buffer.dm b/code/datums/components/plumbing/buffer.dm new file mode 100644 index 0000000000000..608d8df9fbc4b --- /dev/null +++ b/code/datums/components/plumbing/buffer.dm @@ -0,0 +1,17 @@ +#define READY 2 + +/datum/component/plumbing/buffer + demand_connects = WEST + supply_connects = EAST + +/datum/component/plumbing/buffer/Initialize(start = TRUE, _turn_connects = TRUE, _ducting_layer, datum/reagents/custom_receiver) + if(!istype(parent, /obj/machinery/plumbing/buffer)) + return COMPONENT_INCOMPATIBLE + + return ..() + +/datum/component/plumbing/buffer/can_give(amount, reagent, datum/ductnet/net) + var/obj/machinery/plumbing/buffer/buffer = parent + return (buffer.mode == READY) ? ..() : FALSE + +#undef READY diff --git a/code/datums/components/plumbing/filter.dm b/code/datums/components/plumbing/filter.dm index 30e36c057886e..76f3a7e13274e 100644 --- a/code/datums/components/plumbing/filter.dm +++ b/code/datums/components/plumbing/filter.dm @@ -22,7 +22,7 @@ if(!can_give_in_direction(direction, reagent)) return FALSE -/datum/component/plumbing/filter/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net) +/datum/component/plumbing/filter/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net, round_robin = TRUE) if(!reagents || !target || !target.reagents) return FALSE var/direction @@ -31,7 +31,7 @@ direction = get_original_direction(text2num(A)) break if(reagent) - reagents.trans_to(target.parent, amount, target_id = reagent) + reagents.trans_to(target.parent, amount, target_id = reagent, methods = round_robin ? LINEAR : NONE) else for(var/A in reagents.reagent_list) var/datum/reagent/R = A @@ -40,10 +40,11 @@ var/new_amount if(R.volume < amount) new_amount = amount - R.volume - reagents.trans_to(target.parent, amount, target_id = R.type) + reagents.trans_to(target.parent, amount, target_id = R.type, methods = round_robin ? LINEAR : NONE) amount = new_amount if(amount <= 0) break + ///We check if the direction and reagent are valid to give. Needed for filters since different outputs have different behaviours /datum/component/plumbing/filter/proc/can_give_in_direction(dir, reagent) var/obj/machinery/plumbing/filter/F = parent diff --git a/code/datums/components/plumbing/simple_components.dm b/code/datums/components/plumbing/simple_components.dm new file mode 100644 index 0000000000000..d1f8a4c3ca637 --- /dev/null +++ b/code/datums/components/plumbing/simple_components.dm @@ -0,0 +1,26 @@ + +///has one pipe input that only takes, example is manual output pipe +/datum/component/plumbing/simple_demand + demand_connects = SOUTH + +///has one pipe output that only supplies. example is liquid pump and manual input pipe +/datum/component/plumbing/simple_supply + supply_connects = SOUTH + +///input and output, like a holding tank +/datum/component/plumbing/tank + demand_connects = WEST + supply_connects = EAST + +///Lazily demand from any direction. Overlays won't look good, and the aquarium sprite occupies about the entire 32x32 area anyway. +/datum/component/plumbing/aquarium + demand_connects = SOUTH|NORTH|EAST|WEST + use_overlays = FALSE + +///Connects different layer of ducts +/datum/component/plumbing/manifold + demand_connects = NORTH + supply_connects = SOUTH + +/datum/component/plumbing/manifold/change_ducting_layer(obj/caller, obj/changer, new_layer) + return diff --git a/code/datums/components/plumbing/splitter.dm b/code/datums/components/plumbing/splitter.dm index 5ade1dfebc3ba..f94c78c490438 100644 --- a/code/datums/components/plumbing/splitter.dm +++ b/code/datums/components/plumbing/splitter.dm @@ -29,7 +29,7 @@ return FALSE -/datum/component/plumbing/splitter/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net) +/datum/component/plumbing/splitter/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net, round_robin = TRUE) var/direction for(var/A in ducts) if(ducts[A] == net) diff --git a/code/datums/components/speechmod.dm b/code/datums/components/speechmod.dm new file mode 100644 index 0000000000000..71991c80d837c --- /dev/null +++ b/code/datums/components/speechmod.dm @@ -0,0 +1,125 @@ +/// Used to apply certain speech patterns +/// Can be used on organs, wearables, mutations and mobs +/datum/component/speechmod + /// Assoc list for strings/regexes and their replacements. Should be lowercase, as case will be automatically changed + var/list/replacements = list() + /// String added to the end of the message + var/end_string = "" + /// Chance for the end string to be applied + var/end_string_chance = 100 + /// Current target for modification + var/mob/targeted + /// Slot tags in which this item works when equipped + var/slots + /// If set to true, turns all text to uppercase + var/uppercase = FALSE + +/datum/component/speechmod/Initialize(replacements = list(), end_string = "", end_string_chance = 100, slots, uppercase = FALSE) + if (!ismob(parent) && !isitem(parent) && !istype(parent, /datum/mutation/human)) + return COMPONENT_INCOMPATIBLE + + src.replacements = replacements + src.end_string = end_string + src.end_string_chance = end_string_chance + src.slots = slots + src.uppercase = uppercase + + if (istype(parent, /datum/mutation/human)) + RegisterSignal(parent, COMSIG_MUTATION_GAINED, PROC_REF(on_mutation_gained)) + RegisterSignal(parent, COMSIG_MUTATION_LOST, PROC_REF(on_mutation_lost)) + return + + var/atom/owner = parent + + if (ismob(parent)) + targeted = parent + RegisterSignal(targeted, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + return + + if (ismob(owner.loc)) + targeted = owner.loc + RegisterSignal(targeted, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_unequipped)) + RegisterSignal(parent, COMSIG_ORGAN_IMPLANTED, PROC_REF(on_implanted)) + RegisterSignal(parent, COMSIG_ORGAN_REMOVED, PROC_REF(on_removed)) + +/datum/component/speechmod/proc/handle_speech(datum/source, list/speech_args) + SIGNAL_HANDLER + + var/message = speech_args[SPEECH_MESSAGE] + if(message[1] == "*") + return + + for (var/to_replace in replacements) + var/replacement = replacements[to_replace] + // Values can be lists to be picked randomly from + if (islist(replacement)) + replacement = pick(replacement) + + message = replacetextEx(message, to_replace, replacement) + message = trim(message) + if (prob(end_string_chance)) + message += islist(end_string) ? pick(end_string) : end_string + speech_args[SPEECH_MESSAGE] = trim(message) + + if (uppercase) + return COMPONENT_UPPERCASE_SPEECH + +/datum/component/speechmod/proc/on_equipped(datum/source, mob/living/user, slot) + SIGNAL_HANDLER + + if (!isnull(slots) && !(slot & slots)) + if (!isnull(targeted)) + UnregisterSignal(targeted, COMSIG_MOB_SAY) + targeted = null + return + + if (targeted == user) + return + + targeted = user + RegisterSignal(targeted, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + +/datum/component/speechmod/proc/on_unequipped(datum/source, mob/living/user) + SIGNAL_HANDLER + + if (isnull(targeted)) + return + UnregisterSignal(targeted, COMSIG_MOB_SAY) + targeted = null + +/datum/component/speechmod/proc/on_implanted(datum/source, mob/living/carbon/receiver) + SIGNAL_HANDLER + + if (targeted == receiver) + return + + targeted = receiver + RegisterSignal(targeted, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + +/datum/component/speechmod/proc/on_removed(datum/source, mob/living/carbon/former_owner) + SIGNAL_HANDLER + + if (isnull(targeted)) + return + UnregisterSignal(targeted, COMSIG_MOB_SAY) + targeted = null + +/datum/component/speechmod/proc/on_mutation_gained(datum/source, mob/living/carbon/human/owner) + SIGNAL_HANDLER + + if (targeted == owner) + return + + targeted = owner + RegisterSignal(targeted, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + +/datum/component/speechmod/proc/on_mutation_lost(datum/source, mob/living/carbon/human/owner) + SIGNAL_HANDLER + + if (isnull(targeted)) + return + UnregisterSignal(targeted, COMSIG_MOB_SAY) + targeted = null diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index e17a6f85bde15..58da15b03e9cd 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -405,6 +405,10 @@ if(el_tail && (el_tail.wag_flags & WAG_WAGGING)) // lizard tail wagging is robust and can swat away assailants! defense_mod += 1 + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = tackle_target.get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + defense_mod += potential_spine.strength_bonus + // OF-FENSE var/mob/living/carbon/sacker = parent var/sacker_drunkenness = sacker.get_drunk_amount() @@ -442,6 +446,10 @@ attack_mod += 2 // UwU pounces on you // BUBBER EDIT END + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = sacker.get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + attack_mod += potential_spine.strength_bonus + if(ishuman(sacker)) var/mob/living/carbon/human/human_sacker = sacker @@ -505,6 +513,10 @@ if(HAS_TRAIT(user, TRAIT_HEAD_INJURY_BLOCKED)) oopsie_mod -= 6 + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE) // Can't snap that spine if it's made of metal. + if(istype(potential_spine)) + oopsie_mod -= potential_spine.strength_bonus + if(HAS_TRAIT(user, TRAIT_CLUMSY)) oopsie_mod += 6 //honk! diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 3c405619456a8..39720ea9443ed 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -517,18 +517,21 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(create_mutation_blocks) //I hate this generate_dna_blocks() if(randomize_features) - /* SKYRAT EDIT REMOVAL - We don't really want this. We instead let get_mutant_bodyparts() handle the bodypart randomization on our end, to prevent getting any crazy cross-species features. + /* SKYRAT EDIT REMOVAL START - We don't really want this. We instead let get_mutant_bodyparts() handle the bodypart randomization on our end, to prevent getting any crazy cross-species features. var/static/list/all_species_protoypes if(isnull(all_species_protoypes)) all_species_protoypes = list() for(var/species_path in subtypesof(/datum/species)) all_species_protoypes += new species_path() - for(var/species_type in GLOB.species_prototypes) - features |= GLOB.species_prototypes[species_type].randomize_features() - SKYRAT EDIT REMOVAL END */ + var/list/new_features = GLOB.species_prototypes[species_type].randomize_features() + for(var/feature in new_features) + features[feature] = new_features[feature] + SKYRAT REMOVAL END */ + features = species.randomize_features() | features // SKYRAT EDIT CHANGE - Where applicable, replace features with the features generated by species/randomize_features() - Original: features["mcolor"] = "#[random_color()]" body_markings = species.get_random_body_markings(features) // SKYRAT EDIT ADDITION + mutant_bodyparts = species.get_mutant_bodyparts(features, existing_mutant_bodyparts = randomize_features ? list() : mutant_bodyparts) // SKYRAT EDIT ADDITION update_dna_identity() diff --git a/code/datums/elements/climbable.dm b/code/datums/elements/climbable.dm index a2c67742a357e..113cc8aaa90ef 100644 --- a/code/datums/elements/climbable.dm +++ b/code/datums/elements/climbable.dm @@ -35,6 +35,8 @@ examine_texts += span_notice("[source] looks climbable.") /datum/element/climbable/proc/can_climb(atom/source, mob/user) + if (!user.CanReach(source)) + return FALSE var/dir_step = get_dir(user, source.loc) //To jump over a railing you have to be standing next to it, not far behind it. if(source.flags_1 & ON_BORDER_1 && user.loc != source.loc && (dir_step & source.dir) == source.dir) diff --git a/code/datums/elements/embed.dm b/code/datums/elements/embed.dm index 6e83d91c5e76d..4a8bda37c3a75 100644 --- a/code/datums/elements/embed.dm +++ b/code/datums/elements/embed.dm @@ -106,6 +106,7 @@ return // we don't care var/payload_type = source.shrapnel_type var/obj/item/payload = new payload_type(get_turf(hit)) + payload.set_embed(source.get_embed()) if(istype(payload, /obj/item/shrapnel/bullet)) payload.name = source.name SEND_SIGNAL(source, COMSIG_PROJECTILE_ON_SPAWN_EMBEDDED, payload) diff --git a/code/datums/elements/footstep.dm b/code/datums/elements/footstep.dm index 5a2e4d032fce7..52c961354d85f 100644 --- a/code/datums/elements/footstep.dm +++ b/code/datums/elements/footstep.dm @@ -52,10 +52,10 @@ footstep_sounds = 'sound/effects/tank_treads.ogg' RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep_machine)) return - // BOOB EDIT START + // BUBBER EDIT START if(FOOTSTEP_MOB_SNAKE) footstep_sounds = 'sound/effects/footstep/crawl1.ogg' - // BOOB EDIT END + // BUBBER EDIT END RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep)) steps_for_living[target] = 0 diff --git a/code/datums/elements/turf_transparency.dm b/code/datums/elements/turf_transparency.dm index b050dd0866f0e..c9fb667cff922 100644 --- a/code/datums/elements/turf_transparency.dm +++ b/code/datums/elements/turf_transparency.dm @@ -219,10 +219,10 @@ GLOBAL_LIST_EMPTY(pillars_by_z) // it will make them look significantly nicer, and should let you tie into their logic more easily // Just please don't break behavior yeah? thanks, I love you <3 if(isclosedturf(our_turf)) //Show girders below closed turfs - var/mutable_appearance/girder_underlay = mutable_appearance('icons/obj/structures.dmi', "girder", layer = TURF_LAYER-0.01) + var/mutable_appearance/girder_underlay = mutable_appearance('icons/obj/structures.dmi', "girder", layer = BELOW_CLOSED_TURF_LAYER) girder_underlay.appearance_flags = RESET_ALPHA | RESET_COLOR our_turf.underlays += girder_underlay - var/mutable_appearance/plating_underlay = mutable_appearance('icons/turf/floors.dmi', "plating", layer = TURF_LAYER-0.02) + var/mutable_appearance/plating_underlay = mutable_appearance('icons/turf/floors.dmi', "plating", layer = LOW_FLOOR_LAYER, offset_spokesman = our_turf, plane = FLOOR_PLANE) plating_underlay.appearance_flags = RESET_ALPHA | RESET_COLOR our_turf.underlays += plating_underlay return TRUE @@ -240,10 +240,10 @@ GLOBAL_LIST_EMPTY(pillars_by_z) our_turf.underlays -= get_baseturf_underlay(our_turf) if(isclosedturf(our_turf)) //Show girders below closed turfs - var/mutable_appearance/girder_underlay = mutable_appearance('icons/obj/structures.dmi', "girder", layer = TURF_LAYER-0.01) + var/mutable_appearance/girder_underlay = mutable_appearance('icons/obj/structures.dmi', "girder", layer = BELOW_CLOSED_TURF_LAYER) girder_underlay.appearance_flags = RESET_ALPHA | RESET_COLOR our_turf.underlays -= girder_underlay - var/mutable_appearance/plating_underlay = mutable_appearance('icons/turf/floors.dmi', "plating", layer = TURF_LAYER-0.02) + var/mutable_appearance/plating_underlay = mutable_appearance('icons/turf/floors.dmi', "plating", layer = LOW_FLOOR_LAYER, offset_spokesman = our_turf, plane = FLOOR_PLANE) plating_underlay.appearance_flags = RESET_ALPHA | RESET_COLOR our_turf.underlays -= plating_underlay @@ -271,7 +271,7 @@ GLOBAL_LIST_EMPTY(pillars_by_z) if(!ispath(path)) warning("Z-level [our_turf.z] has invalid baseturf '[SSmapping.level_trait(our_turf.z, ZTRAIT_BASETURF)]'") path = /turf/open/space - var/mutable_appearance/underlay_appearance = mutable_appearance(initial(path.icon), initial(path.icon_state), layer = TURF_LAYER-0.02, offset_spokesman = our_turf, plane = PLANE_SPACE) + var/mutable_appearance/underlay_appearance = mutable_appearance(initial(path.icon), initial(path.icon_state), layer = SPACE_LAYER + 0.1, offset_spokesman = our_turf, plane = PLANE_SPACE) underlay_appearance.appearance_flags = RESET_ALPHA | RESET_COLOR return underlay_appearance diff --git a/code/datums/elements/undertile.dm b/code/datums/elements/undertile.dm index ecc621a57e42f..ed901b196c1aa 100644 --- a/code/datums/elements/undertile.dm +++ b/code/datums/elements/undertile.dm @@ -44,6 +44,7 @@ if(underfloor_accessibility < UNDERFLOOR_INTERACTABLE) SET_PLANE_IMPLICIT(source, FLOOR_PLANE) // We do this so that turfs that allow you to see what's underneath them don't have to be on the game plane (which causes ambient occlusion weirdness) + source.layer = ABOVE_OPEN_TURF_LAYER ADD_TRAIT(source, TRAIT_UNDERFLOOR, REF(src)) if(tile_overlay) @@ -61,6 +62,7 @@ else SET_PLANE_IMPLICIT(source, initial(source.plane)) + source.layer = initial(source.layer) REMOVE_TRAIT(source, TRAIT_UNDERFLOOR, REF(src)) if(invisibility_trait) diff --git a/code/datums/embed_data.dm b/code/datums/embed_data.dm index ac010d170a8eb..a82d305c8e6eb 100644 --- a/code/datums/embed_data.dm +++ b/code/datums/embed_data.dm @@ -38,8 +38,8 @@ GLOBAL_LIST_INIT(embed_by_type, generate_embed_type_cache()) /// This percentage of all pain will be dealt as stam damage rather than brute (0-1) var/pain_stam_pct = 0 -/datum/embed_data/proc/generate_with_values(embed_chance, fall_chance, pain_chance, pain_mult, impact_pain_mult, remove_pain_mult, rip_time, ignore_throwspeed_threshold, jostle_chance, jostle_pain_mult, pain_stam_pct) - var/datum/embed_data/data = new() +/datum/embed_data/proc/generate_with_values(embed_chance, fall_chance, pain_chance, pain_mult, impact_pain_mult, remove_pain_mult, rip_time, ignore_throwspeed_threshold, jostle_chance, jostle_pain_mult, pain_stam_pct, force_new = FALSE) + var/datum/embed_data/data = isnull(GLOB.embed_by_type[type]) && !force_new ? src : new() data.embed_chance = !isnull(embed_chance) ? embed_chance : src.embed_chance data.fall_chance = !isnull(fall_chance) ? fall_chance : src.fall_chance @@ -52,3 +52,4 @@ GLOBAL_LIST_INIT(embed_by_type, generate_embed_type_cache()) data.jostle_chance = !isnull(jostle_chance) ? jostle_chance : src.jostle_chance data.jostle_pain_mult = !isnull(jostle_pain_mult) ? jostle_pain_mult : src.jostle_pain_mult data.pain_stam_pct = !isnull(pain_stam_pct) ? pain_stam_pct : src.pain_stam_pct + return data diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm index a3866971aae5f..2137aea08f3b4 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm @@ -265,15 +265,15 @@ /datum/greyscale_config/vape/open_low name = "Open Vape Low" - json_config = 'code/datums/greyscale/json_configs/vape_open_low.json' + json_config = 'code/datums/greyscale/json_configs/vapeopen_low.json' /datum/greyscale_config/vape/open_med name = "Open Vape Medium" - json_config = 'code/datums/greyscale/json_configs/vape_open_med.json' + json_config = 'code/datums/greyscale/json_configs/vapeopen_med.json' /datum/greyscale_config/vape/open_high name = "Open Vape High" - json_config = 'code/datums/greyscale/json_configs/vape_open_high.json' + json_config = 'code/datums/greyscale/json_configs/vapeopen_high.json' // // TAPE diff --git a/code/datums/greyscale/json_configs/vape_open_high.json b/code/datums/greyscale/json_configs/vapeopen_high.json similarity index 94% rename from code/datums/greyscale/json_configs/vape_open_high.json rename to code/datums/greyscale/json_configs/vapeopen_high.json index 65a0400d00334..1ef82459ca8c6 100644 --- a/code/datums/greyscale/json_configs/vape_open_high.json +++ b/code/datums/greyscale/json_configs/vapeopen_high.json @@ -1,5 +1,5 @@ { - "vape_open_high": [ + "vapeopen_high": [ { "type": "icon_state", "icon_state": "vapeOutlet", diff --git a/code/datums/greyscale/json_configs/vape_open_low.json b/code/datums/greyscale/json_configs/vapeopen_low.json similarity index 94% rename from code/datums/greyscale/json_configs/vape_open_low.json rename to code/datums/greyscale/json_configs/vapeopen_low.json index 3ad5971bc3783..eaef871bf3d1f 100644 --- a/code/datums/greyscale/json_configs/vape_open_low.json +++ b/code/datums/greyscale/json_configs/vapeopen_low.json @@ -1,5 +1,5 @@ { - "vape_open_low": [ + "vapeopen_low": [ { "type": "icon_state", "icon_state": "vapeOutlet", diff --git a/code/datums/greyscale/json_configs/vape_open_med.json b/code/datums/greyscale/json_configs/vapeopen_med.json similarity index 94% rename from code/datums/greyscale/json_configs/vape_open_med.json rename to code/datums/greyscale/json_configs/vapeopen_med.json index f26302edd77b3..508015825cef6 100644 --- a/code/datums/greyscale/json_configs/vape_open_med.json +++ b/code/datums/greyscale/json_configs/vapeopen_med.json @@ -1,5 +1,5 @@ { - "vape_open_med": [ + "vapeopen_med": [ { "type": "icon_state", "icon_state": "vapeOutlet", diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 4d4c44138e0c2..190c4a38a299c 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -77,7 +77,7 @@ return TRUE /datum/id_trim/job/assistant - assignment = "Assistant" + assignment = JOB_ASSISTANT trim_state = "trim_assistant" intern_alt_name = "Intern" sechud_icon_state = SECHUD_ASSISTANT @@ -104,7 +104,7 @@ ACCESS_MAINT_TUNNELS) /datum/id_trim/job/atmospheric_technician - assignment = "Atmospheric Technician" + assignment = JOB_ATMOSPHERIC_TECHNICIAN trim_state = "trim_atmospherictechnician" department_color = COLOR_ENGINEERING_ORANGE subdepartment_color = COLOR_ENGINEERING_ORANGE @@ -133,7 +133,7 @@ job = /datum/job/atmospheric_technician /datum/id_trim/job/bartender - assignment = "Bartender" + assignment = JOB_BARTENDER trim_state = "trim_bartender" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -157,7 +157,7 @@ job = /datum/job/bartender /datum/id_trim/job/bitrunner - assignment = "Bitrunner" + assignment = JOB_BITRUNNER trim_state = "trim_bitrunner" department_color = COLOR_CARGO_BROWN subdepartment_color = COLOR_CARGO_BROWN @@ -181,7 +181,7 @@ job = /datum/job/bitrunner /datum/id_trim/job/botanist - assignment = "Botanist" + assignment = JOB_BOTANIST trim_state = "trim_botanist" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -204,7 +204,7 @@ job = /datum/job/botanist /datum/id_trim/job/bridge_assistant - assignment = "Bridge Assistant" + assignment = JOB_BRIDGE_ASSISTANT trim_state = "trim_assistant" department_color = COLOR_COMMAND_BLUE subdepartment_color = COLOR_COMMAND_BLUE @@ -226,7 +226,7 @@ job = /datum/job/bridge_assistant /datum/id_trim/job/captain - assignment = "Captain" + assignment = JOB_CAPTAIN intern_alt_name = "Captain-in-Training" trim_state = "trim_captain" department_color = COLOR_COMMAND_BLUE @@ -249,7 +249,7 @@ return ..() /datum/id_trim/job/cargo_technician - assignment = "Cargo Technician" + assignment = JOB_CARGO_TECHNICIAN trim_state = "trim_cargotechnician" department_color = COLOR_CARGO_BROWN subdepartment_color = COLOR_CARGO_BROWN @@ -274,7 +274,7 @@ job = /datum/job/cargo_technician /datum/id_trim/job/chaplain - assignment = "Chaplain" + assignment = JOB_CHAPLAIN trim_state = "trim_chaplain" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -296,7 +296,7 @@ job = /datum/job/chaplain /datum/id_trim/job/chemist - assignment = "Chemist" + assignment = JOB_CHEMIST trim_state = "trim_chemist" department_color = COLOR_MEDICAL_BLUE subdepartment_color = COLOR_MEDICAL_BLUE @@ -321,7 +321,7 @@ job = /datum/job/chemist /datum/id_trim/job/chief_engineer - assignment = "Chief Engineer" + assignment = JOB_CHIEF_ENGINEER intern_alt_name = "Chief Engineer-in-Training" trim_state = "trim_stationengineer" department_color = COLOR_COMMAND_BLUE @@ -362,7 +362,7 @@ job = /datum/job/chief_engineer /datum/id_trim/job/chief_medical_officer - assignment = "Chief Medical Officer" + assignment = JOB_CHIEF_MEDICAL_OFFICER intern_alt_name = "Chief Medical Officer-in-Training" trim_state = "trim_medicaldoctor" department_color = COLOR_COMMAND_BLUE @@ -401,7 +401,7 @@ job = /datum/job/chief_medical_officer /datum/id_trim/job/clown - assignment = "Clown" + assignment = JOB_CLOWN trim_state = "trim_clown" department_color = COLOR_MAGENTA subdepartment_color = COLOR_MAGENTA @@ -420,7 +420,7 @@ job = /datum/job/clown /datum/id_trim/job/cook - assignment = "Cook" + assignment = JOB_COOK trim_state = "trim_cook" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -443,11 +443,11 @@ job = /datum/job/cook /datum/id_trim/job/cook/chef - assignment = "Chef" + assignment = JOB_CHEF sechud_icon_state = SECHUD_CHEF /datum/id_trim/job/coroner - assignment = "Coroner" + assignment = JOB_CORONER trim_state = "trim_coroner" department_color = COLOR_MEDICAL_BLUE subdepartment_color = COLOR_SERVICE_LIME @@ -474,7 +474,7 @@ job = /datum/job/coroner /datum/id_trim/job/curator - assignment = "Curator" + assignment = JOB_CURATOR trim_state = "trim_curator" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -495,7 +495,7 @@ job = /datum/job/curator /datum/id_trim/job/detective - assignment = "Detective" + assignment = JOB_DETECTIVE trim_state = "trim_detective" department_color = COLOR_SECURITY_RED subdepartment_color = COLOR_SECURITY_RED @@ -533,7 +533,7 @@ access |= list(ACCESS_MAINT_TUNNELS) /datum/id_trim/job/geneticist - assignment = "Geneticist" + assignment = JOB_GENETICIST trim_state = "trim_geneticist" department_color = COLOR_SCIENCE_PINK subdepartment_color = COLOR_SCIENCE_PINK @@ -561,7 +561,7 @@ job = /datum/job/geneticist /datum/id_trim/job/head_of_personnel - assignment = "Head of Personnel" + assignment = JOB_HEAD_OF_PERSONNEL intern_alt_name = "Head of Personnel-in-Training" trim_state = "trim_headofpersonnel" department_color = COLOR_COMMAND_BLUE @@ -614,7 +614,7 @@ job = /datum/job/head_of_personnel /datum/id_trim/job/head_of_security - assignment = "Head of Security" + assignment = JOB_HEAD_OF_SECURITY intern_alt_name = "Head of Security-in-Training" trim_state = "trim_securityofficer" department_color = COLOR_COMMAND_BLUE @@ -673,7 +673,7 @@ access |= list(ACCESS_MAINT_TUNNELS) /datum/id_trim/job/janitor - assignment = "Janitor" + assignment = JOB_JANITOR trim_state = "trim_janitor" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SERVICE_LIME @@ -693,7 +693,7 @@ job = /datum/job/janitor /datum/id_trim/job/lawyer - assignment = "Lawyer" + assignment = JOB_LAWYER trim_state = "trim_lawyer" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_SECURITY_RED @@ -714,7 +714,7 @@ job = /datum/job/lawyer /datum/id_trim/job/medical_doctor - assignment = "Medical Doctor" + assignment = JOB_MEDICAL_DOCTOR trim_state = "trim_medicaldoctor" department_color = COLOR_MEDICAL_BLUE subdepartment_color = COLOR_MEDICAL_BLUE @@ -739,7 +739,7 @@ job = /datum/job/doctor /datum/id_trim/job/mime - assignment = "Mime" + assignment = JOB_MIME trim_state = "trim_mime" department_color = COLOR_SILVER subdepartment_color = COLOR_WHITE @@ -758,7 +758,7 @@ job = /datum/job/mime /datum/id_trim/job/paramedic - assignment = "Paramedic" + assignment = JOB_PARAMEDIC trim_state = "trim_paramedic" department_color = COLOR_MEDICAL_BLUE subdepartment_color = COLOR_MEDICAL_BLUE @@ -790,7 +790,7 @@ job = /datum/job/paramedic /datum/id_trim/job/prisoner - assignment = "Prisoner" + assignment = JOB_PRISONER trim_state = "trim_warden" department_color = COLOR_PRISONER_BLACK subdepartment_color = COLOR_PRISONER_BLACK @@ -833,7 +833,7 @@ template_access = null /datum/id_trim/job/psychologist - assignment = "Psychologist" + assignment = JOB_PSYCHOLOGIST trim_state = "trim_psychologist" department_color = COLOR_SERVICE_LIME subdepartment_color = COLOR_MEDICAL_BLUE @@ -857,7 +857,7 @@ job = /datum/job/psychologist /datum/id_trim/job/quartermaster - assignment = "Quartermaster" + assignment = JOB_QUARTERMASTER intern_alt_name = "Quartermaster-in-Training" trim_state = "trim_cargotechnician" department_color = COLOR_COMMAND_BLUE @@ -895,7 +895,7 @@ job = /datum/job/quartermaster /datum/id_trim/job/research_director - assignment = "Research Director" + assignment = JOB_RESEARCH_DIRECTOR intern_alt_name = "Research Director-in-Training" trim_state = "trim_scientist" department_color = COLOR_COMMAND_BLUE @@ -943,7 +943,7 @@ job = /datum/job/research_director /datum/id_trim/job/roboticist - assignment = "Roboticist" + assignment = JOB_ROBOTICIST trim_state = "trim_roboticist" department_color = COLOR_SCIENCE_PINK subdepartment_color = COLOR_SCIENCE_PINK @@ -973,7 +973,7 @@ job = /datum/job/roboticist /datum/id_trim/job/scientist - assignment = "Scientist" + assignment = JOB_SCIENTIST trim_state = "trim_scientist" department_color = COLOR_SCIENCE_PINK subdepartment_color = COLOR_SCIENCE_PINK @@ -1001,7 +1001,7 @@ /// Sec officers have departmental variants. They each have their own trims with bonus departmental accesses. /datum/id_trim/job/security_officer - assignment = "Security Officer" + assignment = JOB_SECURITY_OFFICER trim_state = "trim_securityofficer" department_color = COLOR_SECURITY_RED subdepartment_color = COLOR_SECURITY_RED @@ -1064,7 +1064,7 @@ access |= elevated_access /datum/id_trim/job/security_officer/supply - assignment = "Security Officer (Cargo)" + assignment = JOB_SECURITY_OFFICER_SUPPLY subdepartment_color = COLOR_CARGO_BROWN department_access = list( ACCESS_BIT_DEN, @@ -1078,7 +1078,7 @@ ) /datum/id_trim/job/security_officer/engineering - assignment = "Security Officer (Engineering)" + assignment = JOB_SECURITY_OFFICER_ENGINEERING subdepartment_color = COLOR_ENGINEERING_ORANGE department_access = list( ACCESS_ATMOSPHERICS, @@ -1092,7 +1092,7 @@ ) /datum/id_trim/job/security_officer/medical - assignment = "Security Officer (Medical)" + assignment = JOB_SECURITY_OFFICER_MEDICAL subdepartment_color = COLOR_MEDICAL_BLUE department_access = list( ACCESS_MEDICAL, @@ -1106,7 +1106,7 @@ ) /datum/id_trim/job/security_officer/science - assignment = "Security Officer (Science)" + assignment = JOB_SECURITY_OFFICER_SCIENCE subdepartment_color = COLOR_SCIENCE_PINK department_access = list( ACCESS_RESEARCH, @@ -1122,7 +1122,7 @@ ) /datum/id_trim/job/shaft_miner - assignment = "Shaft Miner" + assignment = JOB_SHAFT_MINER trim_state = "trim_shaftminer" department_color = COLOR_CARGO_BROWN subdepartment_color = COLOR_SCIENCE_PINK @@ -1159,7 +1159,7 @@ template_access = null /datum/id_trim/job/station_engineer - assignment = "Station Engineer" + assignment = JOB_STATION_ENGINEER trim_state = "trim_stationengineer" department_color = COLOR_ENGINEERING_ORANGE subdepartment_color = COLOR_ENGINEERING_ORANGE @@ -1188,7 +1188,7 @@ job = /datum/job/station_engineer /datum/id_trim/job/veteran_advisor - assignment = "Veteran Security Advisor" + assignment = JOB_VETERAN_ADVISOR trim_state = "trim_veteranadvisor" department_color = COLOR_SECURITY_RED subdepartment_color = COLOR_COMMAND_BLUE @@ -1219,7 +1219,7 @@ /datum/id_trim/job/warden - assignment = "Warden" + assignment = JOB_WARDEN trim_state = "trim_warden" department_color = COLOR_SECURITY_RED subdepartment_color = COLOR_SECURITY_RED diff --git a/code/datums/looping_sounds/breathing.dm b/code/datums/looping_sounds/breathing.dm index f9a81c6856926..82b33ee8311b1 100644 --- a/code/datums/looping_sounds/breathing.dm +++ b/code/datums/looping_sounds/breathing.dm @@ -6,4 +6,3 @@ //spess station- volume = 13 pressure_affected = FALSE - direct = TRUE diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 4e6400163a34b..5c24aaf45b7b2 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -98,6 +98,11 @@ if(honor_check(defender)) var/strength_bonus = HAS_TRAIT(attacker, TRAIT_STRENGTH) ? 2 : 0 //Investing into genetic strength improvements makes you a better boxer + + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = attacker.get_organ_slot(ORGAN_SLOT_SPINE) //Getting a cyberspine also pushes you further than just mere meat + if(istype(potential_spine)) + strength_bonus *= potential_spine.strength_bonus + damage += round(athletics_skill * check_streak(attacker, defender) + strength_bonus) grant_experience = TRUE diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm index c066b96cea419..db5acbca388b6 100644 --- a/code/datums/mutable_appearance.dm +++ b/code/datums/mutable_appearance.dm @@ -45,4 +45,7 @@ else if(!isnull(offset_spokesman) && !isatom(offset_spokesman)) stack_trace("Why did you pass in offset_spokesman as [offset_spokesman]? We need an atom to properly offset planes") + if(PERFORM_ALL_TESTS(focus_only/topdown_filtering)) + check_topdown_validity(appearance) + return appearance diff --git a/code/datums/mutations/_combined.dm b/code/datums/mutations/_combined.dm index baa7c2c1215b5..5b7b5d429015e 100644 --- a/code/datums/mutations/_combined.dm +++ b/code/datums/mutations/_combined.dm @@ -52,3 +52,7 @@ /datum/generecipe/heckacious required = "/datum/mutation/human/wacky; /datum/mutation/human/stoner" result = /datum/mutation/human/heckacious + +/datum/generecipe/ork + required = "/datum/mutation/human/hulk; /datum/mutation/human/clumsy" + result = /datum/mutation/human/hulk/ork diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index d8aaf3baaaa54..dc7b64089bd8a 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -136,6 +136,7 @@ owner = acquirer dna = acquirer.dna dna.mutations += src + SEND_SIGNAL(src, COMSIG_MUTATION_GAINED, acquirer) if(text_gain_indication) to_chat(owner, text_gain_indication) if(visual_indicators.len) @@ -162,6 +163,7 @@ if(!istype(owner) || !(owner.dna.mutations.Remove(src))) return TRUE . = FALSE + SEND_SIGNAL(src, COMSIG_MUTATION_LOST, owner) if(text_lose_indication && owner.stat != DEAD) to_chat(owner, text_lose_indication) if(visual_indicators.len) diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index 5c93fa3b6be2e..1812d83a6b0e8 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -604,9 +604,9 @@ var/obj/item/organ/internal/brain/brain = owner.get_organ_slot(ORGAN_SLOT_BRAIN) if(brain) - brain.Remove(owner, special = TRUE) + brain.Remove(owner, special = TRUE, movement_flags = NO_ID_TRANSFER) brain.zone = BODY_ZONE_CHEST - brain.Insert(owner, special = TRUE) + brain.Insert(owner, special = TRUE, movement_flags = NO_ID_TRANSFER) var/obj/item/bodypart/head/head = owner.get_bodypart(BODY_ZONE_HEAD) if(head) @@ -629,9 +629,9 @@ return TRUE var/obj/item/organ/internal/brain/brain = owner.get_organ_slot(ORGAN_SLOT_BRAIN) if(brain) - brain.Remove(owner, special = TRUE) + brain.Remove(owner, special = TRUE, movement_flags = NO_ID_TRANSFER) brain.zone = initial(brain.zone) - brain.Insert(owner, special = TRUE) + brain.Insert(owner, special = TRUE, movement_flags = NO_ID_TRANSFER) owner.dna.species.regenerate_organs(owner, replace_current = FALSE, excluded_zones = list(BODY_ZONE_CHEST)) //replace_current needs to be FALSE to prevent weird adding and removing mutation healing owner.apply_damage(damage = 50, damagetype = BRUTE, def_zone = BODY_ZONE_HEAD) //and this to DISCOURAGE organ farming, or at least not make it free. diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 5717f649b11d3..5b68826634bd0 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -9,8 +9,10 @@ species_allowed = list(SPECIES_HUMAN) //no skeleton/lizard hulk health_req = 25 instability = POSITIVE_INSTABILITY_MAJOR + conflicts = list(/datum/mutation/human/hulk/ork) var/scream_delay = 50 var/last_scream = 0 + var/bodypart_color = COLOR_DARK_LIME /// List of traits to add/remove when someone gets this mutation. mutation_traits = list( TRAIT_CHUNKYFINGERS, @@ -20,16 +22,21 @@ TRAIT_STUNIMMUNE, ) +/datum/mutation/human/hulk/New(class, timer, datum/mutation/human/copymut) + . = ..() + add_speechmod() + +/datum/mutation/human/hulk/proc/add_speechmod() + AddComponent(/datum/component/speechmod, replacements = list("." = "!"), end_string = "!!", uppercase = TRUE) /datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner) if(..()) return for(var/obj/item/bodypart/part as anything in owner.bodyparts) - part.variable_color = COLOR_DARK_LIME + part.variable_color = bodypart_color owner.update_body_parts() owner.add_mood_event("hulk", /datum/mood_event/hulk) RegisterSignal(owner, COMSIG_LIVING_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand)) - RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) RegisterSignal(owner, COMSIG_MOB_CLICKON, PROC_REF(check_swing)) /datum/mutation/human/hulk/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, modifiers) @@ -91,21 +98,8 @@ owner.update_body_parts() owner.clear_mood_event("hulk") UnregisterSignal(owner, COMSIG_LIVING_EARLY_UNARMED_ATTACK) - UnregisterSignal(owner, COMSIG_MOB_SAY) UnregisterSignal(owner, COMSIG_MOB_CLICKON) -/datum/mutation/human/hulk/proc/handle_speech(datum/source, list/speech_args) - SIGNAL_HANDLER - - var/message = speech_args[SPEECH_MESSAGE] - if(message) - message = "[replacetext(message, ".", "!")]!!" - speech_args[SPEECH_MESSAGE] = message - - // the reason we don't just uppertext(message) in this proc is so that our hulk speech - // can uppercase all other speech moidifiers after they are done (by returning COMPONENT_UPPERCASE_SPEECH) - return COMPONENT_UPPERCASE_SPEECH - /// How many steps it takes to throw the mob #define HULK_TAILTHROW_STEPS 28 @@ -294,4 +288,14 @@ /datum/mutation/human/hulk/superhuman/on_life(seconds_per_tick, times_fired) return +/datum/mutation/human/hulk/ork + name = "Ork" + desc = "A mutation caused by a mixup of hulk genes which severely impacts speech centers in owners' brains." + text_gain_indication = span_notice("You feel significantly dumber!") + bodypart_color = COLOR_ASSISTANT_OLIVE + conflicts = list(/datum/mutation/human/hulk) + +/datum/mutation/human/hulk/ork/add_speechmod() + AddComponent(/datum/component/speechmod, replacements = strings("ork_replacement.json", "ork"), end_string = "!!", uppercase = TRUE) + #undef HULK_TAILTHROW_STEPS diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 98560bb252679..d6b6f714e5964 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -177,30 +177,11 @@ quality = MINOR_NEGATIVE text_gain_indication = span_notice("You feel Swedish, however that works.") text_lose_indication = span_notice("The feeling of Swedishness passes.") + var/static/list/language_mutilation = list("w" = "v", "j" = "y", "bo" = "bjo", "a" = list("å","ä","æ","a"), "o" = list("ö","ø","o")) -/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner) - if(..()) - return - RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - -/datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner) - if(..()) - return - UnregisterSignal(owner, COMSIG_MOB_SAY) - -/datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args) - SIGNAL_HANDLER - - var/message = speech_args[SPEECH_MESSAGE] - if(message) - message = replacetext(message,"w","v") - message = replacetext(message,"j","y") - message = replacetext(message,"a",pick("å","ä","æ","a")) - message = replacetext(message,"bo","bjo") - message = replacetext(message,"o",pick("ö","ø","o")) - if(prob(30)) - message += " Bork[pick("",", bork",", bork, bork")]!" - speech_args[SPEECH_MESSAGE] = trim(message) +/datum/mutation/human/swedish/New(class, timer, datum/mutation/human/copymut) + . = ..() + AddComponent(/datum/component/speechmod, replacements = language_mutilation, end_string = list("",", bork",", bork, bork"), end_string_chance = 30) /datum/mutation/human/chav name = "Chav" @@ -210,35 +191,9 @@ text_gain_indication = span_notice("Ye feel like a reet prat like, innit?") text_lose_indication = span_notice("You no longer feel like being rude and sassy.") -/datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner) - if(..()) - return - RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - -/datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner) - if(..()) - return - UnregisterSignal(owner, COMSIG_MOB_SAY) - -/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args) - SIGNAL_HANDLER - - var/message = speech_args[SPEECH_MESSAGE] - if(message[1] != "*") - message = " [message]" - var/list/chav_words = strings("chav_replacement.json", "chav") - - for(var/key in chav_words) - var/value = chav_words[key] - if(islist(value)) - value = pick(value) - - message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]") - message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]") - message = replacetextEx(message, " [key]", " [value]") - if(prob(30)) - message += ", mate" - speech_args[SPEECH_MESSAGE] = trim(message) +/datum/mutation/human/chav/New(class, timer, datum/mutation/human/copymut) + . = ..() + AddComponent(/datum/component/speechmod, replacements = strings("chav_replacement.json", "chav"), end_string = ", mate", end_string_chance = 30) /datum/mutation/human/elvis name = "Elvis" @@ -248,6 +203,10 @@ text_gain_indication = span_notice("You feel pretty good, honeydoll.") text_lose_indication = span_notice("You feel a little less conversation would be great.") +/datum/mutation/human/chav/New(class, timer, datum/mutation/human/copymut) + . = ..() + AddComponent(/datum/component/speechmod, replacements = strings("elvis_replacement.json", "elvis")) + /datum/mutation/human/elvis/on_life(seconds_per_tick, times_fired) switch(pick(1,2)) if(1) @@ -259,34 +218,6 @@ if(SPT_PROB(7.5, seconds_per_tick)) owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!") -/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner) - if(..()) - return - RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - -/datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner) - if(..()) - return - UnregisterSignal(owner, COMSIG_MOB_SAY) - -/datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args) - SIGNAL_HANDLER - - var/message = speech_args[SPEECH_MESSAGE] - if(message) - message = " [message] " - message = replacetext(message," i'm not "," I ain't ") - message = replacetext(message," girl ",pick(" honey "," baby "," baby doll ")) - message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo ")) - message = replacetext(message," out of "," outta ") - message = replacetext(message," thank you "," thank you, thank you very much ") - message = replacetext(message," thanks "," thank you, thank you very much ") - message = replacetext(message," what are you "," whatcha ") - message = replacetext(message," yes ",pick(" sure", "yea ")) - message = replacetext(message," muh valids "," my kicks ") - speech_args[SPEECH_MESSAGE] = trim(message) - - /datum/mutation/human/stoner name = "Stoner" desc = "A common mutation that severely decreases intelligence." diff --git a/code/datums/proximity_monitor/field.dm b/code/datums/proximity_monitor/field.dm index 03e7c054d0908..e3f0ade5e7dba 100644 --- a/code/datums/proximity_monitor/field.dm +++ b/code/datums/proximity_monitor/field.dm @@ -168,6 +168,7 @@ /obj/item/multitool/field_debug name = "strange multitool" desc = "Seems to project a colored field!" + apc_scanner = FALSE var/operating = FALSE var/range_to_use = 5 var/datum/proximity_monitor/advanced/debug/current = null diff --git a/code/datums/shuttles/arrival.dm b/code/datums/shuttles/arrival.dm index 376de809afa23..645147ee5ba67 100644 --- a/code/datums/shuttles/arrival.dm +++ b/code/datums/shuttles/arrival.dm @@ -26,10 +26,6 @@ suffix = "pubby" name = "arrival shuttle (Pubby)" -/datum/map_template/shuttle/arrival/omega - suffix = "omega" - name = "arrival shuttle (Omega)" - /datum/map_template/shuttle/arrival/northstar suffix = "northstar" name = "arrival shuttle (North Star)" diff --git a/code/datums/shuttles/cargo.dm b/code/datums/shuttles/cargo.dm index a18b7a4ac9af7..8f5d83619f416 100644 --- a/code/datums/shuttles/cargo.dm +++ b/code/datums/shuttles/cargo.dm @@ -11,10 +11,6 @@ suffix = "birdboat" name = "supply shuttle (Birdboat)" -/datum/map_template/shuttle/cargo/donut - suffix = "donut" - name = "supply shuttle (Donut)" - /datum/map_template/shuttle/cargo/pubby suffix = "pubby" name = "supply shuttle (Pubby)" diff --git a/code/datums/shuttles/ferry.dm b/code/datums/shuttles/ferry.dm index e4f540992ff06..a0d3eac82d971 100644 --- a/code/datums/shuttles/ferry.dm +++ b/code/datums/shuttles/ferry.dm @@ -33,8 +33,3 @@ suffix = "kilo" name = "kilo transport ferry" description = "Standard issue CentCom Ferry for Kilo pattern stations. Includes additional equipment and rechargers." - -/datum/map_template/shuttle/ferry/northstar - suffix = "northstar" - name = "north star transport ferry" - description = "In the very depths of the frontier, you'll need a rugged shuttle capable of delivering crew, this is that." diff --git a/code/datums/station_traits/job_traits.dm b/code/datums/station_traits/job_traits.dm index 94fb0e220d4d7..4ac95ced8469b 100644 --- a/code/datums/station_traits/job_traits.dm +++ b/code/datums/station_traits/job_traits.dm @@ -210,8 +210,7 @@ SIGNAL_HANDLER var/datum/job_department/department = SSjob.joinable_departments_by_type[/datum/job_department/silicon] department.remove_job(/datum/job/ai) - var/datum/station_trait/triple_ai/triple_ais = locate() in SSstation.station_traits - if(triple_ais) + if(GLOB.triple_ai_controller) position_amount = 3 /// Gives the AI SAT a fax machine if it doesn't have one. This is copy pasted from Bridge Assistant's coffee maker. diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index 4d3c30feb93fa..f5105bd890db0 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -185,6 +185,22 @@ for(var/mob/living/found_bot as anything in GLOB.bots_list) found_bot.randomize_language_if_on_station() +/datum/station_trait/machine_languages + name = "Machine Language Matrix Malfunction" + trait_type = STATION_TRAIT_NEGATIVE + weight = 2 + cost = STATION_TRAIT_COST_FULL + show_in_report = TRUE + report_message = "Your station's machines have had their language matrix fried due to an event, \ + resulting in some strange and unfamiliar speech patterns." + trait_to_give = STATION_TRAIT_MACHINES_GLITCHED + +/datum/station_trait/machine_languages/New() + . = ..() + // What "caused" our machines to go haywire (fluff) + var/event_source = pick("an ion storm", "a malfunction", "a software update", "a power surge", "a computer virus", "a subdued machine uprising", "a clown's prank") + report_message = "Your station's machinery have had their language matrix fried due to [event_source], resulting in some strange and unfamiliar speech patterns." + /datum/station_trait/revenge_of_pun_pun name = "Revenge of Pun Pun" trait_type = STATION_TRAIT_NEGATIVE diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm index 897ccca2ed943..d068cdb68601b 100644 --- a/code/datums/station_traits/neutral_traits.dm +++ b/code/datums/station_traits/neutral_traits.dm @@ -409,38 +409,6 @@ targets += roundstart_non_secure_closets[1] GLOB.eigenstate_manager.create_new_link(targets) -/datum/station_trait/triple_ai - name = "AI Triumvirate" - trait_type = STATION_TRAIT_NEUTRAL - trait_flags = parent_type::trait_flags | STATION_TRAIT_REQUIRES_AI - show_in_report = TRUE - weight = 0 // SKYRAT EDIT Original = 1 - report_message = "Your station has been instated with three Nanotrasen Artificial Intelligence models." - -/datum/station_trait/triple_ai/New() - . = ..() - RegisterSignal(SSjob, COMSIG_OCCUPATIONS_SETUP, PROC_REF(on_occupations_setup)) - -/datum/station_trait/triple_ai/revert() - UnregisterSignal(SSjob, COMSIG_OCCUPATIONS_SETUP) - return ..() - -/datum/station_trait/triple_ai/proc/on_occupations_setup(datum/controller/subsystem/job/source) - SIGNAL_HANDLER - - //allows for latejoining AIs - for(var/obj/effect/landmark/start/ai/secondary/secondary_ai_spawn in GLOB.start_landmarks_list) - secondary_ai_spawn.latejoin_active = TRUE - - var/datum/station_trait/job/human_ai/ai_trait = locate() in SSstation.station_traits - //human AI quirk will handle adding its own job positions, but for now don't allow more AI slots. - if(ai_trait) - return - for(var/datum/job/ai/ai_datum in SSjob.joinable_occupations) - ai_datum.spawn_positions = 3 - ai_datum.total_positions = 3 - - #define PRO_SKUB "pro-skub" #define ANTI_SKUB "anti-skub" #define SKUB_IDFC "i don't frikkin' care" diff --git a/code/datums/status_effects/debuffs/stamcrit.dm b/code/datums/status_effects/debuffs/stamcrit.dm index 05433244df09c..0edd589ab9cbc 100644 --- a/code/datums/status_effects/debuffs/stamcrit.dm +++ b/code/datums/status_effects/debuffs/stamcrit.dm @@ -15,7 +15,7 @@ // This should be in on apply but we need it to happen AFTER being added to the mob // (Because we need to wait until the status effect is in their status effect list, or we'll add two) - if(owner.getStaminaLoss() < 120) + if(owner.getStaminaLoss() < 162) // SKYRAT EDIT CHANGE // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. owner.adjustStaminaLoss(30, FALSE) @@ -28,6 +28,8 @@ return FALSE if(owner.check_stun_immunity(CANKNOCKDOWN)) return FALSE + if(SEND_SIGNAL(owner, COMSIG_LIVING_ENTER_STAMCRIT) & STAMCRIT_CANCELLED) + return FALSE . = ..() if(!.) diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index 8c98d7d56bd16..94b7f48f08a8e 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -44,6 +44,9 @@ var/animated = TRUE /// Determines whether we play a rustle sound when inserting/removing items. var/rustle_sound = TRUE + /// The sound to play when we open/access the storage + var/open_sound + var/open_sound_vary = TRUE /// The maximum amount of items that can be inserted into this storage. var/max_slots = 7 @@ -920,7 +923,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) animate_parent() if(rustle_sound) - playsound(parent, SFX_RUSTLE, 50, TRUE, -5) + playsound(parent, (open_sound ? open_sound : SFX_RUSTLE), 50, open_sound_vary, -5) return TRUE diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm index ca9cff19c73a8..16ffb326f8a86 100644 --- a/code/datums/weather/weather.dm +++ b/code/datums/weather/weather.dm @@ -56,7 +56,7 @@ /// The list of z-levels that this weather is actively affecting var/impacted_z_levels - /// Since it's above everything else, this is the layer used by default. TURF_LAYER is below mobs and walls if you need to use that. + /// Since it's above everything else, this is the layer used by default. var/overlay_layer = AREA_LAYER /// Plane for the overlay var/overlay_plane = AREA_PLANE diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index 8049f08d8dcf4..584e862eb5d51 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -126,7 +126,7 @@ A.update_appearance() if(WIRE_IDSCAN) // Pulse to disable emergency access and flash the red lights. if(A.hasPower() && A.density) - A.do_animate("deny") + A.run_animation(DOOR_DENY_ANIMATION) if(A.emergency) A.emergency = FALSE A.update_appearance() diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index f713819c81786..47f29a21e9dd5 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -498,7 +498,7 @@ // check if we have a valid treatable tool if(potential_treater.tool_behaviour in treatable_tools) return TRUE - if(TOOL_CAUTERY in treatable_tools && potential_treater.get_temperature() && user == victim) // allow improvised cauterization on yourself without an aggro grab + if((TOOL_CAUTERY in treatable_tools) && potential_treater.get_temperature() && (user == victim)) // allow improvised cauterization on yourself without an aggro grab return TRUE // failing that, see if we're aggro grabbing them and if we have an item that works for aggro grabs only if(user.pulling == victim && user.grab_state >= GRAB_AGGRESSIVE && check_grab_treatments(potential_treater, user)) diff --git a/code/datums/wounds/cranial_fissure.dm b/code/datums/wounds/cranial_fissure.dm index 0b7c00dee7e32..df973d3bdec90 100644 --- a/code/datums/wounds/cranial_fissure.dm +++ b/code/datums/wounds/cranial_fissure.dm @@ -81,7 +81,7 @@ ) /datum/wound/cranial_fissure/try_handling(mob/living/user) - if (user.usable_hands <= 0) + if (user.usable_hands <= 0 || user.combat_mode) return FALSE if(!isnull(user.hud_used?.zone_select) && (user.zone_selected != BODY_ZONE_HEAD && user.zone_selected != BODY_ZONE_PRECISE_EYES)) diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm index 2ecda8cc8fea7..3ea06ed4e00cb 100644 --- a/code/game/atom/_atom.dm +++ b/code/game/atom/_atom.dm @@ -5,7 +5,7 @@ * as much as possible to the components/elements system */ /atom - layer = TURF_LAYER + layer = ABOVE_NORMAL_TURF_LAYER plane = GAME_PLANE appearance_flags = TILE_BOUND|LONG_GLIDE diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 2e159f264ba0d..66384921496c7 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -177,7 +177,7 @@ flags_1 |= PREVENT_CONTENTS_EXPLOSION_1 } - if(HAS_TRAIT(SSstation, STATION_TRAIT_BOTS_GLITCHED)) + if(HAS_TRAIT(SSstation, STATION_TRAIT_MACHINES_GLITCHED) && mapload) randomize_language_if_on_station() SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_MACHINE, src) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 117577e66eb83..08cd5bdc61a11 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/devices/tool.dmi' icon_state = "ai-slipper0" base_icon_state = "ai-slipper" - layer = PROJECTILE_HIT_THRESHHOLD_LAYER + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE max_integrity = 200 armor_type = /datum/armor/machinery_ai_slipper diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index edb945f483e9c..1700abb0af1ab 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -32,6 +32,9 @@ GLOBAL_LIST_EMPTY(announcement_systems) radio = new /obj/item/radio/headset/silicon/ai(src) update_appearance() +/obj/machinery/announcement_system/randomize_language_if_on_station() + return + /obj/machinery/announcement_system/update_icon_state() icon_state = "[base_icon_state]_[is_operational ? "On" : "Off"][panel_open ? "_Open" : null]" return ..() diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index 72c339aa519e3..bb5c5a04e229b 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -93,7 +93,7 @@ return for(var/obj/item/circuitboard/computer/board in src.contents) if(!contents || board.GetComponent(/datum/component/gps)) - return + CRASH("[src] Called imprint_gps without setting gps_tag") board.AddComponent(/datum/component/gps, "[tracker]") balloon_alert_to_viewers("board tracker enabled", vision_distance = 1) diff --git a/code/game/machinery/computer/arcade/_arcade.dm b/code/game/machinery/computer/arcade/_arcade.dm index 69994634fc3b1..0837a6cc50908 100644 --- a/code/game/machinery/computer/arcade/_arcade.dm +++ b/code/game/machinery/computer/arcade/_arcade.dm @@ -70,7 +70,7 @@ if(prize_override) empprize = pick_weight(prize_override) else - empprize = pick_weight(GLOB.arcade_prize_pool) + empprize = pick_weight_recursive(GLOB.arcade_prize_pool) //BUBBERSTATION CHANGE: USES PICK WEIGHT RECURSIVE new empprize(loc) explosion(src, devastation_range = -1, light_impact_range = 1 + num_of_prizes, flame_range = 1 + num_of_prizes) @@ -94,7 +94,7 @@ if(prize_override) prizeselect = pick_weight(prize_override) else - prizeselect = pick_weight(GLOB.arcade_prize_pool) + prizeselect = pick_weight_recursive(GLOB.arcade_prize_pool) //BUBBERSTATION CHANGE: USES PICK WEIGHT RECURSIVE var/atom/movable/the_prize = new prizeselect(get_turf(src)) playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3) visible_message(span_notice("[src] dispenses [the_prize]!"), span_notice("You hear a chime and a clunk.")) diff --git a/code/game/machinery/computer/atmos_computers/inlets.dm b/code/game/machinery/computer/atmos_computers/inlets.dm index 32de77cc632de..474ccae2c14e1 100644 --- a/code/game/machinery/computer/atmos_computers/inlets.dm +++ b/code/game/machinery/computer/atmos_computers/inlets.dm @@ -4,6 +4,14 @@ /// The air sensor type this injector is linked to var/chamber_id +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/layer2 + piping_layer = 2 + icon_state = "inje_map-2" + +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/layer4 + piping_layer = 4 + icon_state = "inje_map-4" + /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/Initialize(mapload) id_tag = CHAMBER_INPUT_FROM_ID(chamber_id) return ..() diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 6117966207cdd..8001c4bea835a 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -394,27 +394,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) post_status(picture) else if(picture == "currentalert") // You cannot set Code Blue display during Code Red and similiar - switch(SSsecurity_level.get_current_level_as_number()) - if(SEC_LEVEL_DELTA) - post_status("alert", "deltaalert") - if(SEC_LEVEL_RED) - post_status("alert", "redalert") - if(SEC_LEVEL_BLUE) - post_status("alert", "bluealert") - if(SEC_LEVEL_GREEN) - post_status("alert", "greenalert") - // SKYRAT EDIT ADD START - Alert Levels - if(SEC_LEVEL_VIOLET) - post_status("alert", "violetalert") - if(SEC_LEVEL_ORANGE) - post_status("alert", "orangealert") - if(SEC_LEVEL_AMBER) - post_status("alert", "amberalert") - if(SEC_LEVEL_EPSILON) - post_status("alert", "epsilonalert") - if(SEC_LEVEL_GAMMA) - post_status("alert", "gammaalert") - // SKYRAT EDIT ADD END - Alert Levels + post_status("alert", SSsecurity_level?.current_security_level?.status_display_icon_state || "greenalert") else post_status("alert", picture) diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 383a980a64da0..742166b285659 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -28,7 +28,7 @@ current = null return M.install(current.laws, user) - imprint_gps(gps_tag = "Weak Upload Signal") + imprint_gps("Weak Upload Signal") else return ..() diff --git a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm index e75513941314c..60d1b10e23186 100644 --- a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm +++ b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm @@ -42,26 +42,28 @@ toxic_foodtypes = NONE // these fucks eat vomit, i am sure they can handle drinking bleach or whatever too modifies_speech = TRUE languages_native = list(/datum/language/buzzwords) + var/static/list/speech_replacements = list( + new /regex("z+", "g") = "zzz", + new /regex("Z+", "g") = "ZZZ", + "s" = "z", + "S" = "Z", + ) + // SKYRAT EDIT ADDITION START - Russian version + var/static/list/russian_speech_replacements = list( + new /regex("z+", "g") = "zzz", + new /regex("Z+", "g") = "ZZZ", + new /regex("з+", "g") = "ззз", + new /regex("З+", "g") = "ЗЗЗ", + "s" = "z", + "S" = "Z", + "с" = "з", + "С" = "З", + ) + // SKYRAT EDIT ADDITION END -/obj/item/organ/internal/tongue/fly/modify_speech(datum/source, list/speech_args) - var/static/regex/fly_buzz = new("z+", "g") - var/static/regex/fly_buZZ = new("Z+", "g") - var/message = speech_args[SPEECH_MESSAGE] - if(message[1] != "*") - message = fly_buzz.Replace(message, "zzz") - message = fly_buZZ.Replace(message, "ZZZ") - message = replacetext(message, "s", "z") - message = replacetext(message, "S", "Z") -//SKYRAT EDIT START: Adding russian version to autohiss - if(CONFIG_GET(flag/russian_text_formation)) - var/static/regex/fly_buzz_ru = new("з+", "g") - var/static/regex/fly_buZZ_ru = new("З+", "g") - message = fly_buzz_ru.Replace(message, "ззз") - message = fly_buZZ_ru.Replace(message, "ЗЗЗ") - message = replacetext(message, "с", "з") - message = replacetext(message, "С", "З") -//SKYRAT EDIT END: Adding russian version to autohiss - speech_args[SPEECH_MESSAGE] = message +/obj/item/organ/internal/tongue/fly/New(class, timer, datum/mutation/human/copymut) + . = ..() + AddComponent(/datum/component/speechmod, replacements = CONFIG_GET(flag/russian_text_formation) ? russian_speech_replacements : speech_replacements) // SKYRAT EDIT CHANGE - ORIGINAL: AddComponent(/datum/component/speechmod, replacements = speech_replacements) /obj/item/organ/internal/tongue/fly/Initialize(mapload) . = ..() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 02df1984e1a69..268a0d1c27dd5 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -151,6 +151,9 @@ /// Used for papers and photos pinned to the airlock var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi'//OVERRIDDEN IN SKYRAT AESTHETICS - SEE MODULE + /// Airlock pump that overrides airlock controlls when set up for cycling + var/obj/machinery/atmospherics/components/unary/airlock_pump/cycle_pump + var/cyclelinkeddir = 0 var/obj/machinery/door/airlock/cyclelinkedairlock var/shuttledocked = 0 @@ -605,13 +608,13 @@ . += floorlight */ -/obj/machinery/door/airlock/do_animate(animation) +/obj/machinery/door/airlock/run_animation(animation) switch(animation) - if("opening") + if(DOOR_OPENING_ANIMATION) update_icon(ALL, AIRLOCK_OPENING) - if("closing") + if(DOOR_OPENING_ANIMATION) update_icon(ALL, AIRLOCK_CLOSING) - if("deny") + if(DOOR_DENY_ANIMATION) if(!machine_stat) update_icon(ALL, AIRLOCK_DENY) playsound(src,doorDeni,50,FALSE,3) @@ -621,6 +624,28 @@ if(airlock_state == AIRLOCK_DENY) update_icon(ALL, AIRLOCK_CLOSED) +/obj/machinery/door/airlock/animation_length(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) + return 0.6 SECONDS + if(DOOR_CLOSING_ANIMATION) + return 0.6 SECONDS + +/obj/machinery/door/airlock/animation_segment_delay(animation) + switch(animation) + if(AIRLOCK_OPENING_TRANSPARENT) + return 0.1 SECONDS + if(AIRLOCK_OPENING_PASSABLE) + return 0.5 SECONDS + if(AIRLOCK_OPENING_FINISHED) + return 0.6 SECONDS + if(AIRLOCK_CLOSING_UNPASSABLE) + return 0.2 SECONDS + if(AIRLOCK_CLOSING_OPAQUE) + return 0.5 SECONDS + if(AIRLOCK_CLOSING_FINISHED) + return 0.6 SECONDS + /obj/machinery/door/airlock/examine(mob/user) . = ..() if(closeOtherId) @@ -1215,6 +1240,10 @@ INVOKE_ASYNC(src, density ? PROC_REF(open) : PROC_REF(close), BYPASS_DOOR_CHECKS) /obj/machinery/door/airlock/open(forced = DEFAULT_DOOR_CHECKS) + if(cycle_pump && !operating && !welded && !seal && locked && density) + cycle_pump.airlock_act(src) + return FALSE // The rest will be handled by the pump + if( operating || welded || locked || seal ) return FALSE @@ -1249,18 +1278,21 @@ SEND_SIGNAL(src, COMSIG_AIRLOCK_OPEN, forced) operating = TRUE update_icon(ALL, AIRLOCK_OPENING, TRUE) - sleep(0.1 SECONDS) + var/transparent_delay = animation_segment_delay(AIRLOCK_OPENING_TRANSPARENT) + sleep(transparent_delay) set_opacity(0) if(multi_tile) filler.set_opacity(FALSE) update_freelook_sight() - sleep(0.4 SECONDS) + var/passable_delay = animation_segment_delay(AIRLOCK_OPENING_PASSABLE) - transparent_delay + sleep(passable_delay) set_density(FALSE) if(multi_tile) filler.set_density(FALSE) flags_1 &= ~PREVENT_CLICK_UNDER_1 air_update_turf(TRUE, FALSE) - sleep(0.1 SECONDS) + var/open_delay = animation_segment_delay(AIRLOCK_OPENING_FINISHED) - transparent_delay - passable_delay + sleep(open_delay) layer = OPEN_DOOR_LAYER update_icon(ALL, AIRLOCK_OPEN, TRUE) operating = FALSE @@ -1330,14 +1362,16 @@ filler.density = TRUE flags_1 |= PREVENT_CLICK_UNDER_1 air_update_turf(TRUE, TRUE) - sleep(0.1 SECONDS) + var/unpassable_delay = animation_segment_delay(AIRLOCK_CLOSING_UNPASSABLE) + sleep(unpassable_delay) if(!air_tight) set_density(TRUE) if(multi_tile) filler.density = TRUE flags_1 |= PREVENT_CLICK_UNDER_1 air_update_turf(TRUE, TRUE) - sleep(0.4 SECONDS) + var/opaque_delay = animation_segment_delay(AIRLOCK_CLOSING_OPAQUE) - unpassable_delay + sleep(opaque_delay) if(dangerous_close) crush() if(visible && !glass) @@ -1345,7 +1379,8 @@ if(multi_tile) filler.set_opacity(TRUE) update_freelook_sight() - sleep(0.1 SECONDS) + var/close_delay = animation_segment_delay(AIRLOCK_CLOSING_FINISHED) - unpassable_delay - opaque_delay + sleep(close_delay) update_icon(ALL, AIRLOCK_CLOSED, 1) operating = FALSE delayed_close_requested = FALSE @@ -1811,6 +1846,17 @@ /obj/structure/fluff/airlock_filler/singularity_pull(S, current_size) return +/obj/machinery/door/airlock/proc/set_cycle_pump(obj/machinery/atmospherics/components/unary/airlock_pump/pump) + RegisterSignal(pump, COMSIG_QDELETING, PROC_REF(unset_cycle_pump)) + cycle_pump = pump + +/obj/machinery/door/airlock/proc/unset_cycle_pump() + SIGNAL_HANDLER + if(locked) + unbolt() + say("Link broken, unbolting.") + cycle_pump = null + // Station Airlocks Regular /obj/machinery/door/airlock/command diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 8c5e1d9e811ab..4a4a397c08fc6 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -3,7 +3,7 @@ name = "door" desc = "It opens and closes." icon = 'icons/obj/doors/doorint.dmi' - icon_state = "door1" + icon_state = "door_closed" base_icon_state = "door" opacity = TRUE density = TRUE @@ -24,6 +24,8 @@ idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.1 active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.2 + /// The animation we're currently playing, if any + var/animation var/visible = TRUE var/operating = FALSE var/glass = FALSE @@ -252,7 +254,7 @@ if(requiresID() && check_access(I)) open() else - do_animate("deny") + run_animation(DOOR_DENY_ANIMATION) return /obj/machinery/door/Move() @@ -282,7 +284,7 @@ else if(requiresID() && allowed(user)) open() else - do_animate("deny") + run_animation(DOOR_DENY_ANIMATION) /obj/machinery/door/attack_hand(mob/user, list/modifiers) . = ..() @@ -310,7 +312,7 @@ close() return TRUE if(density) - do_animate("deny") + run_animation(DOOR_DENY_ANIMATION) /obj/machinery/door/allowed(mob/M) if(emergency) @@ -410,24 +412,68 @@ INVOKE_ASYNC(src, PROC_REF(open)) /obj/machinery/door/update_icon_state() - icon_state = "[base_icon_state][density]" - return ..() - -/obj/machinery/door/proc/do_animate(animation) + . = ..() switch(animation) - if("opening") + if(DOOR_OPENING_ANIMATION) if(panel_open) - flick("o_doorc0", src) + icon_state = "o_door_opening" else - flick("doorc0", src) - if("closing") + icon_state = "door_opening" + if(DOOR_CLOSING_ANIMATION) if(panel_open) - flick("o_doorc1", src) + icon_state = "o_door_closing" else - flick("doorc1", src) - if("deny") + icon_state = "door_closing" + if(DOOR_DENY_ANIMATION) if(!machine_stat) - flick("door_deny", src) + icon_state = "door_deny" + else + icon_state = "[base_icon_state]_[density ? "closed" : "open"]" + +/obj/machinery/door/update_overlays() + . = ..() + if(panel_open) + . += mutable_appearance(icon, "panel_open") + +/// Returns the delay to use for the passed in animation +/// We'll do our cleanup once the delay runs out +/obj/machinery/door/proc/animation_length(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) + return 0.6 SECONDS + if(DOOR_CLOSING_ANIMATION) + return 0.6 SECONDS + if(DOOR_DENY_ANIMATION) + return 0.3 SECONDS + +/// Returns the time required to hit particular points in an animation +/// Used to manage delays for opening/closing and such +/obj/machinery/door/proc/animation_segment_delay(animation) + switch(animation) + if(DOOR_OPENING_PASSABLE) + return 0.5 SECONDS + if(DOOR_OPENING_FINISHED) + return 0.6 SECONDS + if(DOOR_CLOSING_UNPASSABLE) + return 0.2 SECONDS + if(DOOR_CLOSING_FINISHED) + return 0.6 SECONDS + +/// Override this to do misc tasks on animation start +/obj/machinery/door/proc/animation_effects(animation) + return + +/// Used to start a new animation +/// Accepts the animation to start as an arg +/obj/machinery/door/proc/run_animation(animation) + set_animation(animation) + addtimer(CALLBACK(src, PROC_REF(set_animation), null), animation_length(animation), TIMER_UNIQUE|TIMER_OVERRIDE) + animation_effects(animation) + +// React to our animation changing +/obj/machinery/door/proc/set_animation(animation) + src.animation = animation + update_appearance() /// Public proc that simply handles opening the door. Returns TRUE if the door was opened, FALSE otherwise. /// Use argument "forced" in conjunction with try_to_force_door_open if you want/need additional checks depending on how sorely you need the door opened. @@ -438,12 +484,14 @@ return FALSE operating = TRUE use_energy(active_power_usage) - do_animate("opening") + run_animation(DOOR_OPENING_ANIMATION) set_opacity(0) - SLEEP_NOT_DEL(0.5 SECONDS) + var/passable_delay = animation_segment_delay(DOOR_OPENING_PASSABLE) + SLEEP_NOT_DEL(passable_delay) set_density(FALSE) flags_1 &= ~PREVENT_CLICK_UNDER_1 - SLEEP_NOT_DEL(0.5 SECONDS) + var/open_delay = animation_segment_delay(DOOR_OPENING_FINISHED) - passable_delay + SLEEP_NOT_DEL(open_delay) layer = initial(layer) update_appearance() set_opacity(0) @@ -475,12 +523,14 @@ operating = TRUE - do_animate("closing") + run_animation(DOOR_CLOSING_ANIMATION) layer = closingLayer - SLEEP_NOT_DEL(0.5 SECONDS) + var/unpassable_delay = animation_segment_delay(DOOR_CLOSING_UNPASSABLE) + SLEEP_NOT_DEL(unpassable_delay) set_density(TRUE) flags_1 |= PREVENT_CLICK_UNDER_1 - SLEEP_NOT_DEL(0.5 SECONDS) + var/close_delay = animation_segment_delay(DOOR_CLOSING_FINISHED) - unpassable_delay + SLEEP_NOT_DEL(close_delay) update_appearance() if(visible && !glass) set_opacity(1) @@ -561,6 +611,26 @@ /obj/machinery/door/get_dumping_location() return null +/obj/machinery/door/morgue/animation_length(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) + return 1.5 SECONDS + if(DOOR_CLOSING_ANIMATION) + return 1.5 SECONDS + if(DOOR_DENY_ANIMATION) + return 0.1 SECONDS + +/obj/machinery/door/morgue/animation_segment_delay(animation) + switch(animation) + if(DOOR_OPENING_PASSABLE) + return 1.4 SECONDS + if(DOOR_OPENING_FINISHED) + return 1.5 SECONDS + if(DOOR_CLOSING_UNPASSABLE) + return 0.2 SECONDS + if(DOOR_CLOSING_FINISHED) + return 1.5 SECONDS + /obj/machinery/door/proc/lock() return diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index b893f7543aec8..302c88fe6e510 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -547,7 +547,7 @@ if(density) being_held_open = TRUE - user.balloon_alert_to_viewers("holding [src] open", "holding [src] open") + user.balloon_alert_to_viewers("holding firelock open", "holding firelock open") COOLDOWN_START(src, activation_cooldown, REACTIVATION_DELAY) open() if(QDELETED(user)) @@ -586,7 +586,7 @@ UnregisterSignal(user, COMSIG_LIVING_SET_BODY_POSITION) UnregisterSignal(user, COMSIG_QDELETING) if(user) - user.balloon_alert_to_viewers("released [src]", "released [src]") + user.balloon_alert_to_viewers("released firelock", "released firelock") /obj/machinery/door/firedoor/attack_ai(mob/user) add_fingerprint(user) @@ -606,22 +606,43 @@ /obj/machinery/door/firedoor/attack_alien(mob/user, list/modifiers) add_fingerprint(user) if(welded) - to_chat(user, span_warning("[src] refuses to budge!")) + balloon_alert(user, "refuses to budge!") return open() if(active) addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) -/obj/machinery/door/firedoor/do_animate(animation) - switch(animation) - if("opening") - flick("[base_icon_state]_opening", src) - if("closing") - flick("[base_icon_state]_closing", src) - /obj/machinery/door/firedoor/update_icon_state() . = ..() - icon_state = "[base_icon_state]_[density ? "closed" : "open"]" + switch(animation) + if(DOOR_OPENING_ANIMATION) + icon_state = "[base_icon_state]_opening" + if(DOOR_CLOSING_ANIMATION) + icon_state = "[base_icon_state]_closing" + if(DOOR_DENY_ANIMATION) + icon_state = "[base_icon_state]_deny" + else + icon_state = "[base_icon_state]_[density ? "closed" : "open"]" + +/obj/machinery/door/firedoor/animation_length(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) + return 1.2 SECONDS + if(DOOR_CLOSING_ANIMATION) + return 1.2 SECONDS + if(DOOR_DENY_ANIMATION) + return 0.3 SECONDS + +/obj/machinery/door/firedoor/animation_segment_delay(animation) + switch(animation) + if(DOOR_OPENING_PASSABLE) + return 1.0 SECONDS + if(DOOR_OPENING_FINISHED) + return 1.2 SECONDS + if(DOOR_CLOSING_UNPASSABLE) + return 0.2 SECONDS + if(DOOR_CLOSING_FINISHED) + return 1.2 SECONDS /obj/machinery/door/firedoor/update_overlays() . = ..() diff --git a/code/game/machinery/doors/passworddoor.dm b/code/game/machinery/doors/passworddoor.dm index df8f7fa936afd..bccc243381ba4 100644 --- a/code/game/machinery/doors/passworddoor.dm +++ b/code/game/machinery/doors/passworddoor.dm @@ -62,22 +62,44 @@ if(access_bypass || ask_for_pass(user)) open() else - do_animate("deny") + run_animation(DOOR_DENY_ANIMATION) /obj/machinery/door/password/update_icon_state() . = ..() - icon_state = density ? "closed" : "open" + //Deny animation would be nice to have. + switch(animation) + if(DOOR_OPENING_ANIMATION) + icon_state = "opening" + if(DOOR_CLOSING_ANIMATION) + icon_state = "closing" + else + icon_state = density ? "closed" : "open" + +/obj/machinery/door/password/animation_length(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) + return 1.1 SECONDS + if(DOOR_CLOSING_ANIMATION) + return 1.1 SECONDS + +/obj/machinery/door/password/animation_segment_delay(animation) + switch(animation) + if(DOOR_OPENING_PASSABLE) + return 0.5 SECONDS + if(DOOR_OPENING_FINISHED) + return 1.1 SECONDS + if(DOOR_CLOSING_UNPASSABLE) + return 0.2 SECONDS + if(DOOR_CLOSING_FINISHED) + return 1.1 SECONDS -/obj/machinery/door/password/do_animate(animation) +/obj/machinery/door/password/animation_effects(animation) switch(animation) - if("opening") - flick("opening", src) + if(DOOR_OPENING_ANIMATION) playsound(src, door_open, 50, TRUE) - if("closing") - flick("closing", src) + if(DOOR_CLOSING_ANIMATION) playsound(src, door_close, 50, TRUE) - if("deny") - //Deny animation would be nice to have. + if(DOOR_DENY_ANIMATION) playsound(src, door_deny, 30, TRUE) /obj/machinery/door/password/proc/ask_for_pass(mob/user) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 1d92cd69d0752..a8ee8c4b58bd0 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -40,7 +40,7 @@ if(panel_open) if(deconstruction == BLASTDOOR_FINISHED) . += span_notice("The maintenance panel is opened and the electronics could be pried out.") - . += span_notice("\The [src] could be calibrated to a blast door controller ID with a multitool.") + . += span_notice("\The [src] could be calibrated to a blast door controller ID with a multitool or a blast door controller.") else if(deconstruction == BLASTDOOR_NEEDS_ELECTRONICS) . += span_notice("The electronics are missing and there are some wires sticking out.") else if(deconstruction == BLASTDOOR_NEEDS_WIRES) @@ -56,6 +56,9 @@ if(deconstruction == BLASTDOOR_NEEDS_ELECTRONICS && istype(held_item, /obj/item/electronics/airlock)) context[SCREENTIP_CONTEXT_LMB] = "Add electronics" return CONTEXTUAL_SCREENTIP_SET + if(deconstruction == BLASTDOOR_FINISHED && istype(held_item, /obj/item/assembly/control)) + context[SCREENTIP_CONTEXT_LMB] = "Calibrate ID" + return CONTEXTUAL_SCREENTIP_SET //we do not check for special effects like if they can actually perform the action because they will be told they can't do it when they try, //with feedback on what they have to do in order to do so. switch(held_item.tool_behaviour) @@ -99,6 +102,19 @@ balloon_alert(user, "electronics added") deconstruction = BLASTDOOR_FINISHED return ITEM_INTERACT_SUCCESS + + if(deconstruction == BLASTDOOR_FINISHED && istype(tool, /obj/item/assembly/control)) + if(density) + balloon_alert(user, "open the door first!") + return ITEM_INTERACT_BLOCKING + if(!panel_open) + balloon_alert(user, "open the panel first!") + return ITEM_INTERACT_BLOCKING + var/obj/item/assembly/control/controller_item = tool + id = controller_item.id + balloon_alert(user, "id changed") + return ITEM_INTERACT_SUCCESS + return NONE /obj/machinery/door/poddoor/screwdriver_act(mob/living/user, obj/item/tool) @@ -195,19 +211,43 @@ return FALSE return ..() -/obj/machinery/door/poddoor/do_animate(animation) +/obj/machinery/door/poddoor/update_icon_state() + . = ..() + switch(animation) + if(DOOR_OPENING_ANIMATION) + icon_state = "opening" + if(DOOR_CLOSING_ANIMATION) + icon_state = "closing" + if(DOOR_DENY_ANIMATION) + icon_state = "deny" + else + icon_state = density ? "closed" : "open" + +/obj/machinery/door/poddoor/animation_length(animation) switch(animation) - if("opening") - flick("opening", src) + if(DOOR_OPENING_ANIMATION) + return 1.1 SECONDS + if(DOOR_CLOSING_ANIMATION) + return 1.1 SECONDS + +/obj/machinery/door/poddoor/animation_segment_delay(animation) + switch(animation) + if(DOOR_OPENING_PASSABLE) + return 0.5 SECONDS + if(DOOR_OPENING_FINISHED) + return 1.1 SECONDS + if(DOOR_CLOSING_UNPASSABLE) + return 0.2 SECONDS + if(DOOR_CLOSING_FINISHED) + return 1.1 SECONDS + +/obj/machinery/door/poddoor/animation_effects(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) playsound(src, animation_sound, 50, TRUE) - if("closing") - flick("closing", src) + if(DOOR_CLOSING_ANIMATION) playsound(src, animation_sound, 50, TRUE) -/obj/machinery/door/poddoor/update_icon_state() - . = ..() - icon_state = density ? "closed" : "open" - /obj/machinery/door/poddoor/attack_alien(mob/living/carbon/alien/adult/user, list/modifiers) if(density & !(resistance_flags & INDESTRUCTIBLE)) add_fingerprint(user) diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 0df6024ca827a..56e2f5a9743b2 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -11,6 +11,24 @@ recipe_type = /datum/crafting_recipe/shutters animation_sound = 'sound/machines/shutter.ogg' +/obj/machinery/door/poddoor/shutters/animation_length(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) + return 1.388 SECONDS + if(DOOR_CLOSING_ANIMATION) + return 1.388 SECONDS + +/obj/machinery/door/poddoor/shutters/animation_segment_delay(animation) + switch(animation) + if(DOOR_OPENING_PASSABLE) + return 0.76 SECONDS + if(DOOR_OPENING_FINISHED) + return 1.388 SECONDS + if(DOOR_CLOSING_UNPASSABLE) + return 0.152 SECONDS + if(DOOR_CLOSING_FINISHED) + return 1.388 SECONDS + /obj/machinery/door/poddoor/shutters/preopen icon_state = "open" density = FALSE diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 828177f90a81b..0c897c6809666 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -76,7 +76,15 @@ /obj/machinery/door/window/update_icon_state() . = ..() - icon_state = "[base_state][density ? null : "open"]" + switch(animation) + if(DOOR_OPENING_ANIMATION) + icon_state = "[base_state]opening" + if(DOOR_CLOSING_ANIMATION) + icon_state = "[base_state]closing" + if(DOOR_DENY_ANIMATION) + icon_state = "[base_state]deny" + else + icon_state = "[base_state][density ? null : "open"]" if(hasPower() && unres_sides) set_light(l_range = 2, l_power = 1) @@ -84,6 +92,24 @@ set_light(l_range = 0) +/obj/machinery/door/window/animation_length(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) + return 0.9 SECONDS + if(DOOR_CLOSING_ANIMATION) + return 0.9 SECONDS + +/obj/machinery/door/window/animation_segment_delay(animation) + switch(animation) + if(DOOR_OPENING_PASSABLE) + return 0.7 SECONDS + if(DOOR_OPENING_FINISHED) + return 0.9 SECONDS + if(DOOR_CLOSING_UNPASSABLE) + return 0.2 SECONDS + if(DOOR_CLOSING_FINISHED) + return 0.9 SECONDS + /obj/machinery/door/window/update_overlays() . = ..() @@ -135,7 +161,7 @@ if(allowed(occupant)) open_and_close() return - do_animate("deny") + run_animation(DOOR_DENY_ANIMATION) return if(!SSticker) return @@ -159,7 +185,7 @@ open_and_close() else - do_animate("deny") + run_animation(DOOR_DENY_ANIMATION) return @@ -218,11 +244,13 @@ if(!operating) //in case of emag operating = TRUE - do_animate("opening") + run_animation(DOOR_OPENING_ANIMATION) playsound(src, 'sound/machines/windowdoor.ogg', 100, TRUE) - icon_state ="[base_state]open" - sleep(1 SECONDS) + var/passable_delay = animation_segment_delay(DOOR_OPENING_PASSABLE) + sleep(passable_delay) set_density(FALSE) + var/open_delay = animation_segment_delay(DOOR_OPENING_FINISHED) - passable_delay + sleep(open_delay) air_update_turf(TRUE, FALSE) update_freelook_sight() @@ -261,14 +289,15 @@ return FALSE operating = TRUE - do_animate("closing") + run_animation(DOOR_CLOSING_ANIMATION) playsound(src, 'sound/machines/windowdoor.ogg', 100, TRUE) - icon_state = base_state - + var/unpassable_delay = animation_segment_delay(DOOR_CLOSING_UNPASSABLE) + sleep(unpassable_delay) set_density(TRUE) air_update_turf(TRUE, TRUE) update_freelook_sight() - sleep(1 SECONDS) + var/close_delay = animation_segment_delay(DOOR_CLOSING_FINISHED) - unpassable_delay + sleep(close_delay) operating = FALSE return TRUE @@ -439,15 +468,6 @@ else to_chat(user, span_warning("The door's motors resist your efforts to force it!")) -/obj/machinery/door/window/do_animate(animation) - switch(animation) - if("opening") - flick("[base_state]opening", src) - if("closing") - flick("[base_state]closing", src) - if("deny") - flick("[base_state]deny", src) - /obj/machinery/door/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index c89260f7ceb63..a852ea019c697 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -179,27 +179,7 @@ var/current_level = SSsecurity_level.get_current_level_as_number() . += mutable_appearance(icon, "fire_[current_level]") . += emissive_appearance(icon, "fire_level_e", src, alpha = src.alpha) - switch(current_level) - if(SEC_LEVEL_GREEN) - set_light(l_color = LIGHT_COLOR_BLUEGREEN) - if(SEC_LEVEL_BLUE) - set_light(l_color = LIGHT_COLOR_ELECTRIC_CYAN) - if(SEC_LEVEL_RED) - set_light(l_color = LIGHT_COLOR_FLARE) - if(SEC_LEVEL_DELTA) - set_light(l_color = LIGHT_COLOR_INTENSE_RED) - //SKYRAT EDIT ADDITION BEGIN - ADDITIONAL ALERT LEVELS - if(SEC_LEVEL_VIOLET) - set_light(l_color = COLOR_VIOLET) - if(SEC_LEVEL_ORANGE) - set_light(l_color = LIGHT_COLOR_ORANGE) - if(SEC_LEVEL_AMBER) - set_light(l_color = LIGHT_COLOR_DIM_YELLOW) - if(SEC_LEVEL_EPSILON) - set_light(l_color = COLOR_ASSEMBLY_WHITE) - if(SEC_LEVEL_GAMMA) - set_light(l_color = COLOR_ASSEMBLY_PURPLE) - //SKYRAT EDIT ADDITION END + set_light(l_color = SSsecurity_level?.current_security_level?.fire_alarm_light_color || LIGHT_COLOR_BLUEGREEN) else . += mutable_appearance(icon, "fire_offstation") . += emissive_appearance(icon, "fire_level_e", src, alpha = src.alpha) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 96da9e8b57c3f..a2d67f8be49b0 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -39,9 +39,9 @@ Possible to do for anyone motivated enough: icon = 'icons/obj/machines/floor.dmi' icon_state = "holopad0" base_icon_state = "holopad" - layer = LOW_OBJ_LAYER /// The plane is set such that it shows up without being covered by pipes/wires in a map editor, we change this on initialize. - plane = GAME_PLANE + layer = MAP_SWITCH(ABOVE_OPEN_TURF_LAYER, LOW_OBJ_LAYER) + plane = MAP_SWITCH(FLOOR_PLANE, GAME_PLANE) req_access = list(ACCESS_KEYCARD_AUTH) //Used to allow for forced connecting to other (not secure) holopads. Anyone can make a call, though. max_integrity = 300 armor_type = /datum/armor/machinery_holopad @@ -101,9 +101,6 @@ Possible to do for anyone motivated enough: /obj/machinery/holopad/Initialize(mapload) . = ..() - /// We set the plane on mapload such that we can see the holopad render over atmospherics pipe and cabling in a map editor (without initialization), but so it gets that "inset" look in the floor in-game. - SET_PLANE_IMPLICIT(src, FLOOR_PLANE) - update_appearance() var/static/list/hovering_mob_typechecks = list( /mob/living/silicon = list( diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 9ad6bcac58dc0..3fa7d25767f2f 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/machines/floor.dmi' icon_state = "igniter0" base_icon_state = "igniter" + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE max_integrity = 300 armor_type = /datum/armor/machinery_igniter diff --git a/code/game/machinery/incident_display.dm b/code/game/machinery/incident_display.dm index b8452675c71aa..77194a26dd7ba 100644 --- a/code/game/machinery/incident_display.dm +++ b/code/game/machinery/incident_display.dm @@ -1,4 +1,8 @@ -GLOBAL_LIST_EMPTY(map_delamination_counters) +/** + * List of incident displays on the map + * Required as persistence subsystem loads after the ones present at mapload, and to reset to 0 upon explosion. + */ +GLOBAL_LIST_EMPTY(map_incident_displays) /// Display days since last delam on incident sign #define DISPLAY_DELAM (1<<0) @@ -13,25 +17,28 @@ DEFINE_BITFIELD(sign_features, list( #define TREND_RISING "rising" #define TREND_FALLING "falling" -#define NAME_DUAL "safety incident display" #define NAME_DELAM "delamination incident display" #define NAME_TRAM "tram incident display" -#define DESC_DUAL "A display that provides information on the station's safety record. Features an advert for SAFETY MOTH." #define DESC_DELAM "A signs describe how long it's been since the last delamination incident. Features an advert for SAFETY MOTH." -#define DESC_TRAM "A display that provides the number of tram related safety incidents this shift. Features an advert for SAFETY MOTH." +#define DESC_TRAM "A display that provides the number of tram related safety incidents this shift." -/** - * List of safety statistic signs on the map that have delam counting enabled. - * Required as persistence subsystem loads after the ones present at mapload, and to reset to 0 upon explosion. - */ +#define DISPLAY_PIXEL_1_W 21 +#define DISPLAY_PIXEL_1_Z -2 +#define DISPLAY_PIXEL_2_W 16 +#define DISPLAY_PIXEL_2_Z -2 +#define DISPLAY_BASE_ALPHA 64 +#define DISPLAY_PIXEL_ALPHA 96 + +#define LIGHT_COLOR_NORMAL "#4b4290" +#define LIGHT_COLOR_SHAME "#e24e76" /obj/machinery/incident_display name = NAME_DELAM desc = DESC_DELAM icon = 'icons/obj/machines/incident_display.dmi' - icon_preview = "stat_display_delam" - icon_state = "stat_display_delam" + icon_preview = "display_normal" + icon_state = "display_normal" verb_say = "beeps" verb_ask = "bloops" verb_exclaim = "blares" @@ -41,6 +48,10 @@ DEFINE_BITFIELD(sign_features, list( custom_materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4, /datum/material/alloy/titaniumglass = SHEET_MATERIAL_AMOUNT * 4) /// What statistics we want the sign to display var/sign_features = DISPLAY_DELAM + /// Delam digits color + var/delam_display_color = COLOR_DISPLAY_YELLOW + /// Tram hits digits color + var/tram_display_color = COLOR_DISPLAY_BLUE /// Tram hits before hazard warning var/hit_threshold = 0 /// Tram hits @@ -49,49 +60,88 @@ DEFINE_BITFIELD(sign_features, list( var/last_delam = 0 /// Delam record high-score var/delam_record = 0 - -/obj/machinery/incident_display/dual - name = NAME_DUAL - desc = DESC_DUAL - icon_preview = "stat_display_dual" - icon_state = "stat_display_dual" - sign_features = DISPLAY_DELAM | DISPLAY_TRAM + /// If the display is currently running live updated content + var/live_display = FALSE + /// The default advert to show on this display + var/configured_advert + /// Duration of the advert set on this display + var/configured_advert_duration + /// How often to show an advert + var/advert_frequency = 30 SECONDS + /// Timer for sign currently showing an advert + COOLDOWN_DECLARE(active_advert) + /// Cooldown until next advert + COOLDOWN_DECLARE(advert_cooldown) + +/obj/machinery/incident_display/bridge /obj/machinery/incident_display/delam name = NAME_DELAM desc = DESC_DELAM - icon_preview = "stat_display_delam" - icon_state = "stat_display_delam" sign_features = DISPLAY_DELAM + configured_advert = "advert_meson" + configured_advert_duration = 7 SECONDS /obj/machinery/incident_display/tram name = NAME_TRAM desc = DESC_TRAM - icon_preview = "stat_display_tram" - icon_state = "stat_display_tram" sign_features = DISPLAY_TRAM -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display, 32) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/bridge, 32) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/delam, 32) -MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/dual, 32) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32) /obj/machinery/incident_display/Initialize(mapload) ..() + register_context() return INITIALIZE_HINT_LATELOAD /obj/machinery/incident_display/post_machine_initialize() . = ..() - GLOB.map_delamination_counters += src + GLOB.map_incident_displays += src update_delam_count(SSpersistence.rounds_since_engine_exploded, SSpersistence.delam_highscore) RegisterSignal(SStransport, COMSIG_TRAM_COLLISION, PROC_REF(update_tram_count)) update_appearance() /obj/machinery/incident_display/Destroy() - GLOB.map_delamination_counters -= src + GLOB.map_incident_displays -= src return ..() +/obj/machinery/incident_display/process() + if(!isnull(configured_advert) && COOLDOWN_FINISHED(src, advert_cooldown))// time to show an advert + show_advert(advert = configured_advert, duration = configured_advert_duration) + COOLDOWN_START(src, advert_cooldown, rand(advert_frequency - 5 SECONDS, advert_frequency + 5 SECONDS)) + return + + if(!live_display) // displaying static content, no processing required + return + + if(machine_stat & (NOPOWER|BROKEN|MAINT)) + return + + if(COOLDOWN_FINISHED(src, active_advert)) // advert finished, revert to static content + COOLDOWN_RESET(src, active_advert) + live_display = FALSE + update_appearance() + +/obj/machinery/incident_display/add_context(atom/source, list/context, obj/item/held_item, mob/user) + if(!isliving(user)) + return + + var/mob/living/living_user = user + + if(held_item?.tool_behaviour == TOOL_WELDER && !living_user.combat_mode && atom_integrity < max_integrity) + context[SCREENTIP_CONTEXT_LMB] = "repair display" + + if(held_item?.tool_behaviour == TOOL_MULTITOOL && !living_user.combat_mode) + if(sign_features == DISPLAY_TRAM) + context[SCREENTIP_CONTEXT_LMB] = "change to delam mode" + else + context[SCREENTIP_CONTEXT_LMB] = "change to tram mode" + + return CONTEXTUAL_SCREENTIP_SET + /obj/machinery/incident_display/welder_act(mob/living/user, obj/item/tool) if(user.combat_mode) return FALSE @@ -101,7 +151,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32) return TRUE balloon_alert(user, "repairing display...") - if(!tool.use_tool(src, user, 4 SECONDS, amount = 0, volume=50)) + if(!tool.use_tool(src, user, 4 SECONDS, amount = 0, volume = 50)) return TRUE balloon_alert(user, "repaired") @@ -117,35 +167,22 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32) if(sign_features == DISPLAY_TRAM) tool.play_tool_sound(src) - balloon_alert(user, "set to dual") - name = NAME_DUAL - desc = DESC_DUAL - icon_state = "stat_display_dual" - sign_features = DISPLAY_DELAM | DISPLAY_TRAM + balloon_alert(user, "set to delam") + name = NAME_DELAM + desc = DESC_DELAM + sign_features = DISPLAY_DELAM update_delam_count(SSpersistence.rounds_since_engine_exploded, SSpersistence.delam_highscore) - update_tram_count(src, SSpersistence.tram_hits_this_round) update_appearance() return TRUE - else if(sign_features == DISPLAY_DELAM) + else tool.play_tool_sound(src) balloon_alert(user, "set to tram") name = NAME_TRAM desc = DESC_TRAM - icon_state = "stat_display_tram" sign_features = DISPLAY_TRAM update_tram_count(src, SSpersistence.tram_hits_this_round) update_appearance() return TRUE - else if(sign_features == (DISPLAY_DELAM + DISPLAY_TRAM)) - tool.play_tool_sound(src) - balloon_alert(user, "set to delam") - name = NAME_DELAM - desc = DESC_DELAM - icon_state = "stat_display_delam" - sign_features = DISPLAY_DELAM - update_delam_count(SSpersistence.rounds_since_engine_exploded, SSpersistence.delam_highscore) - update_appearance() - return TRUE // EMP causes the display to display random numbers or outright break. /obj/machinery/incident_display/emp_act(severity) @@ -154,14 +191,17 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32) set_machine_stat(machine_stat | BROKEN) update_appearance() return - name = NAME_DUAL - desc = DESC_DUAL - icon_state = "stat_display_dual" - sign_features = DISPLAY_DELAM | DISPLAY_TRAM + hit_threshold = rand(1,99) hit_count = rand(1,99) - last_delam = rand(1,99) - delam_record = rand(1,99) + + if(prob(33)) + last_delam = 0 + delam_record = 0 + else + last_delam = rand(1,99) + delam_record = rand(1,99) + update_appearance() /obj/machinery/incident_display/on_deconstruction(disassembled) @@ -169,159 +209,165 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32) new /obj/item/shard(drop_location()) new /obj/item/shard(drop_location()) +/** + * Update the delamination count on the display + * + * Use the provided args to update the incident display when in delam mode. + * Arguments: + * * new_count - number of shifts without a delam + * * record - current high score for the delam count + */ /obj/machinery/incident_display/proc/update_delam_count(new_count, record) delam_record = record last_delam = min(new_count, 199) update_appearance() +/** + * Update the tram hit count on the display + * + * Sign receives a signal from SStransport that the tram has hit someone, and updates the count. + * Arguments: + * * source - hopefully is the transport subsystem + * * tram_collisions - current number of tram hits + */ /obj/machinery/incident_display/proc/update_tram_count(source, tram_collisions) SIGNAL_HANDLER hit_count = min(tram_collisions, 199) update_appearance() -/obj/machinery/incident_display/update_appearance(updates=ALL) +/** + * Run an animated advert on the display + * + * Arguments: + * * advert - icon state to flick to + * * duration - length of the advert animation + */ +/obj/machinery/incident_display/proc/show_advert(advert, duration = 7 SECONDS) + COOLDOWN_START(src, active_advert, duration) + live_display = TRUE + update_appearance() + flick(advert, src) + +/obj/machinery/incident_display/update_appearance(updates = ALL) . = ..() if(machine_stat & NOPOWER) - icon_state = "stat_display_blank" + icon_state = "display_normal" set_light(l_on = FALSE) return - - if(machine_stat & BROKEN) - icon_state = "stat_display_broken" - else if(sign_features == (DISPLAY_DELAM + DISPLAY_TRAM)) - icon_state = "stat_display_dual" - else if(sign_features == DISPLAY_DELAM) - icon_state = "stat_display_delam" - else if(sign_features == DISPLAY_TRAM) - icon_state = "stat_display_tram" - - set_light(l_range = 1.7, l_power = 1.5, l_color = LIGHT_COLOR_FAINT_CYAN, l_on = TRUE) + else if(machine_stat & BROKEN) + icon_state = "display_broken" + set_light(l_range = 1.7, l_power = 1.5, l_color = LIGHT_COLOR_NORMAL, l_on = TRUE) + else if((sign_features & DISPLAY_DELAM) && last_delam <= 0) // you done fucked up + icon_state = "display_shame" + set_light(l_range = 1.7, l_power = 1.5, l_color = LIGHT_COLOR_SHAME, l_on = TRUE) + else + icon_state = "display_normal" + set_light(l_range = 1.7, l_power = 1.5, l_color = LIGHT_COLOR_NORMAL, l_on = TRUE) /obj/machinery/incident_display/update_overlays() . = ..() if(machine_stat & (NOPOWER|BROKEN)) return - var/mutable_appearance/moff_base_emissive = emissive_appearance(icon, "moff_base_emissive", src, alpha = src.alpha) - . += moff_base_emissive + . += emissive_appearance(icon, "display_emissive", src, alpha = DISPLAY_BASE_ALPHA) + + if(COOLDOWN_STARTED(src, active_advert)) // we don't show the static content during adverts + return if(sign_features & DISPLAY_DELAM) - var/mutable_appearance/delam_base_emissive = emissive_appearance(icon, "delam_base_emissive", src, alpha = src.alpha) - var/delam_display_color - . += delam_base_emissive - if(last_delam <= 0) - delam_display_color = COLOR_DISPLAY_RED - else - delam_display_color = COLOR_DISPLAY_YELLOW + . += mutable_appearance(icon, "overlay_delam") + . += emissive_appearance(icon, "overlay_delam", src, alpha = DISPLAY_PIXEL_ALPHA) var/delam_pos1 = clamp(last_delam, 0, 199) % 10 var/mutable_appearance/delam_pos1_overlay = mutable_appearance(icon, "num_[delam_pos1]") - var/mutable_appearance/delam_pos1_emissive = emissive_appearance(icon, "num_[delam_pos1]_e", src, alpha = src.alpha) + var/mutable_appearance/delam_pos1_emissive = emissive_appearance(icon, "num_[delam_pos1]", src, alpha = DISPLAY_PIXEL_ALPHA) delam_pos1_overlay.color = delam_display_color - delam_pos1_overlay.pixel_w = 9 - delam_pos1_emissive.pixel_w = 9 - delam_pos1_overlay.pixel_z = 4 - delam_pos1_emissive.pixel_z = 4 + delam_pos1_overlay.pixel_w = DISPLAY_PIXEL_1_W + delam_pos1_emissive.pixel_w = DISPLAY_PIXEL_1_W + delam_pos1_overlay.pixel_z = DISPLAY_PIXEL_1_Z + delam_pos1_emissive.pixel_z = DISPLAY_PIXEL_1_Z . += delam_pos1_overlay . += delam_pos1_emissive var/delam_pos2 = (clamp(last_delam, 0, 199) / 10) % 10 var/mutable_appearance/delam_pos2_overlay = mutable_appearance(icon, "num_[delam_pos2]") - var/mutable_appearance/delam_pos2_emissive = emissive_appearance(icon, "num_[delam_pos2]_e", src, alpha = src.alpha) + var/mutable_appearance/delam_pos2_emissive = emissive_appearance(icon, "num_[delam_pos2]", src, alpha = DISPLAY_PIXEL_ALPHA) delam_pos2_overlay.color = delam_display_color - delam_pos2_overlay.pixel_w = 4 - delam_pos2_emissive.pixel_w = 4 - delam_pos2_overlay.pixel_z = 4 - delam_pos2_emissive.pixel_z = 4 + delam_pos2_overlay.pixel_w = DISPLAY_PIXEL_2_W + delam_pos2_emissive.pixel_w = DISPLAY_PIXEL_2_W + delam_pos2_overlay.pixel_z = DISPLAY_PIXEL_2_Z + delam_pos2_emissive.pixel_z = DISPLAY_PIXEL_2_Z . += delam_pos2_overlay . += delam_pos2_emissive if(last_delam >= 100) - var/mutable_appearance/there_i_fixed_it_overlay = mutable_appearance(icon, "num_100_red") - var/mutable_appearance/there_i_fixed_it_emissive = emissive_appearance(icon, "num_100_red", src, alpha = src.alpha) - . += there_i_fixed_it_overlay - . += there_i_fixed_it_emissive + . += mutable_appearance(icon, "num_100_red") + . += emissive_appearance(icon, "num_100_red", src, alpha = DISPLAY_BASE_ALPHA) if(last_delam == delam_record) var/mutable_appearance/delam_trend_overlay = mutable_appearance(icon, TREND_RISING) - var/mutable_appearance/delam_trend_emissive = emissive_appearance(icon, "[TREND_RISING]_e", src, alpha = src.alpha) + var/mutable_appearance/delam_trend_emissive = emissive_appearance(icon, "[TREND_RISING]", src, alpha = DISPLAY_PIXEL_ALPHA) delam_trend_overlay.color = COLOR_DISPLAY_GREEN - delam_trend_overlay.pixel_w = 1 - delam_trend_emissive.pixel_w = 1 - delam_trend_overlay.pixel_z = 6 - delam_trend_emissive.pixel_z = 6 . += delam_trend_overlay . += delam_trend_emissive else var/mutable_appearance/delam_trend_overlay = mutable_appearance(icon, TREND_FALLING) - var/mutable_appearance/delam_trend_emissive = emissive_appearance(icon, "[TREND_FALLING]_e", src, alpha = src.alpha) + var/mutable_appearance/delam_trend_emissive = emissive_appearance(icon, "[TREND_FALLING]", src, alpha = DISPLAY_PIXEL_ALPHA) delam_trend_overlay.color = COLOR_DISPLAY_RED - delam_trend_overlay.pixel_w = 1 - delam_trend_emissive.pixel_w = 1 - delam_trend_overlay.pixel_z = 6 - delam_trend_emissive.pixel_z = 6 . += delam_trend_overlay . += delam_trend_emissive if(sign_features & DISPLAY_TRAM) - var/mutable_appearance/tram_base_emissive = emissive_appearance(icon, "tram_base_emissive", src, alpha = src.alpha) - var/tram_display_color = COLOR_DISPLAY_BLUE + . += mutable_appearance(icon, "overlay_tram") + . += emissive_appearance(icon, "overlay_tram", src, alpha = DISPLAY_PIXEL_ALPHA) var/tram_pos1 = hit_count % 10 var/mutable_appearance/tram_pos1_overlay = mutable_appearance(icon, "num_[tram_pos1]") - var/mutable_appearance/tram_pos1_emissive = emissive_appearance(icon, "num_[tram_pos1]_e", src, alpha = src.alpha) - . += tram_base_emissive + var/mutable_appearance/tram_pos1_emissive = emissive_appearance(icon, "num_[tram_pos1]", src, alpha = DISPLAY_PIXEL_ALPHA) tram_pos1_overlay.color = tram_display_color - tram_pos1_overlay.pixel_w = 9 - tram_pos1_emissive.pixel_w = 9 - tram_pos1_overlay.pixel_z = -6 - tram_pos1_emissive.pixel_z = -6 + tram_pos1_overlay.pixel_w = DISPLAY_PIXEL_1_W + tram_pos1_emissive.pixel_w = DISPLAY_PIXEL_1_W + tram_pos1_overlay.pixel_z = DISPLAY_PIXEL_1_Z + tram_pos1_emissive.pixel_z = DISPLAY_PIXEL_1_Z . += tram_pos1_overlay . += tram_pos1_emissive var/tram_pos2 = (hit_count / 10) % 10 var/mutable_appearance/tram_pos2_overlay = mutable_appearance(icon, "num_[tram_pos2]") - var/mutable_appearance/tram_pos2_emissive = emissive_appearance(icon, "num_[tram_pos2]_e", src, alpha = src.alpha) + var/mutable_appearance/tram_pos2_emissive = emissive_appearance(icon, "num_[tram_pos2]", src, alpha = DISPLAY_PIXEL_ALPHA) tram_pos2_overlay.color = tram_display_color - tram_pos2_overlay.pixel_w = 4 - tram_pos2_emissive.pixel_w = 4 - tram_pos2_overlay.pixel_z = -6 - tram_pos2_emissive.pixel_z = -6 + tram_pos2_overlay.pixel_w = DISPLAY_PIXEL_2_W + tram_pos2_emissive.pixel_w = DISPLAY_PIXEL_2_W + tram_pos2_overlay.pixel_z = DISPLAY_PIXEL_2_Z + tram_pos2_emissive.pixel_z = DISPLAY_PIXEL_2_Z . += tram_pos2_overlay . += tram_pos2_emissive if(hit_count >= 100) - var/mutable_appearance/there_i_fixed_it_overlay = mutable_appearance(icon, "num_100_blue") - var/mutable_appearance/there_i_fixed_it_emissive = emissive_appearance(icon, "num_100_blue", src, alpha = src.alpha) - . += there_i_fixed_it_overlay - . += there_i_fixed_it_emissive + . += mutable_appearance(icon, "num_100_blue") + . += emissive_appearance(icon, "num_100_blue", src, alpha = DISPLAY_BASE_ALPHA) if(hit_count > SSpersistence.tram_hits_last_round) var/mutable_appearance/tram_trend_overlay = mutable_appearance(icon, TREND_RISING) - var/mutable_appearance/tram_trend_emissive = emissive_appearance(icon, "[TREND_RISING]_e", src, alpha = src.alpha) + var/mutable_appearance/tram_trend_emissive = emissive_appearance(icon, "[TREND_RISING]", src, alpha = DISPLAY_PIXEL_ALPHA) tram_trend_overlay.color = COLOR_DISPLAY_RED - tram_trend_overlay.pixel_w = 1 - tram_trend_emissive.pixel_w = 1 - tram_trend_overlay.pixel_z = -4 - tram_trend_emissive.pixel_z = -4 . += tram_trend_overlay . += tram_trend_emissive else var/mutable_appearance/tram_trend_overlay = mutable_appearance(icon, TREND_FALLING) - var/mutable_appearance/tram_trend_emissive = emissive_appearance(icon, "[TREND_FALLING]_e", src, alpha = src.alpha) + var/mutable_appearance/tram_trend_emissive = emissive_appearance(icon, "[TREND_FALLING]", src, alpha = DISPLAY_PIXEL_ALPHA) tram_trend_overlay.color = COLOR_DISPLAY_GREEN - tram_trend_overlay.pixel_w = 1 - tram_trend_emissive.pixel_w = 1 - tram_trend_overlay.pixel_z = -4 - tram_trend_emissive.pixel_z = -4 . += tram_trend_overlay . += tram_trend_emissive /obj/machinery/incident_display/examine(mob/user) . = ..() + if(atom_integrity < max_integrity) + . += span_notice("It can be repaired with a [EXAMINE_HINT("welder")].") if(sign_features & DISPLAY_DELAM) + . += span_notice("It can be changed to display tram hits with a [EXAMINE_HINT("multitool")].") if(last_delam >= 0) . += span_info("It has been [last_delam] shift\s since the last delamination event at this Nanotrasen facility.") switch(last_delam) @@ -339,6 +385,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32) . += span_info("The supermatter crystal has delaminated, in case you didn't notice.") if(sign_features & DISPLAY_TRAM) + . += span_notice("It can be changed to display delam-free shifts with a [EXAMINE_HINT("multitool")].") . += span_info("The station has had [hit_count] tram incident\s this shift.") switch(hit_count) if(0) @@ -357,13 +404,21 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/incident_display/tram, 32) #undef DISPLAY_DELAM #undef DISPLAY_TRAM -#undef NAME_DUAL #undef NAME_DELAM #undef NAME_TRAM -#undef DESC_DUAL #undef DESC_DELAM #undef DESC_TRAM #undef TREND_RISING #undef TREND_FALLING + +#undef DISPLAY_PIXEL_1_W +#undef DISPLAY_PIXEL_1_Z +#undef DISPLAY_PIXEL_2_W +#undef DISPLAY_PIXEL_2_Z +#undef DISPLAY_BASE_ALPHA +#undef DISPLAY_PIXEL_ALPHA + +#undef LIGHT_COLOR_NORMAL +#undef LIGHT_COLOR_SHAME diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 391cf38b74b7d..8733ca548632e 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -98,7 +98,7 @@ /// Updates diagnostic huds /obj/machinery/launchpad/proc/update_hud() var/image/holder = hud_list[DIAG_LAUNCHPAD_HUD] - var/mutable_appearance/target = mutable_appearance('icons/effects/effects.dmi', "launchpad_target", ABOVE_OPEN_TURF_LAYER, src, GAME_PLANE) + var/mutable_appearance/target = mutable_appearance('icons/effects/effects.dmi', "launchpad_target", ABOVE_NORMAL_TURF_LAYER, src, GAME_PLANE) holder.appearance = target update_indicator() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 929383b178c62..80289a201be98 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -53,6 +53,9 @@ Buildable meters /obj/item/pipe/directional/he_exchanger icon_state_preview = "heunary" pipe_type = /obj/machinery/atmospherics/components/unary/heat_exchanger +/obj/item/pipe/directional/airlock_pump + icon_state_preview = "airlock_pump" + pipe_type = /obj/machinery/atmospherics/components/unary/airlock_pump /obj/item/pipe/binary RPD_type = PIPE_STRAIGHT /obj/item/pipe/binary/layer_adapter diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 5e853847e1693..8915a5d509938 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -2,7 +2,7 @@ #define HEATER_MODE_HEAT "heat" #define HEATER_MODE_COOL "cool" #define HEATER_MODE_AUTO "auto" -#define BASE_HEATING_ENERGY (STANDARD_CELL_RATE * 0.1) +#define BASE_HEATING_ENERGY (STANDARD_CELL_RATE * 4) /obj/machinery/space_heater anchored = FALSE @@ -32,7 +32,7 @@ ///How much heat/cold we can deliver var/heating_energy = BASE_HEATING_ENERGY ///How efficiently we can deliver that heat/cold (higher indicates less cell consumption) - var/efficiency = 20 + var/efficiency = 200 ///The amount of degrees above and below the target temperature for us to change mode to heater or cooler var/temperature_tolerance = 1 ///What's the middle point of our settable temperature (30 °C) @@ -178,8 +178,8 @@ heating_energy = laser * BASE_HEATING_ENERGY - settable_temperature_range = cap * 30 - efficiency = (cap + 1) * 10 + settable_temperature_range = cap * initial(settable_temperature_range) + efficiency = (cap + 1) * initial(efficiency) * 0.5 target_temperature = clamp(target_temperature, max(settable_temperature_median - settable_temperature_range, TCMB), diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index 83d0f6e3209a0..5aa7b91c501f4 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -33,6 +33,8 @@ use_energy(idle_power_usage) + return TRUE //BUBBERSTATION CHANGE: MESSAGE OF THE DAY. + /obj/machinery/telecomms/hub/update_power() var/old_on = on if (toggled && (machine_stat & (BROKEN|NOPOWER|EMPED))) diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm index d07ced626dbc5..d1267c59c747c 100644 --- a/code/game/objects/effects/blessing.dm +++ b/code/game/objects/effects/blessing.dm @@ -12,7 +12,7 @@ for(var/obj/effect/blessing/B in loc) if(B != src) return INITIALIZE_HINT_QDEL - var/image/I = image(icon = 'icons/effects/effects.dmi', icon_state = "blessed", layer = ABOVE_OPEN_TURF_LAYER, loc = src) + var/image/I = image(icon = 'icons/effects/effects.dmi', icon_state = "blessed", layer = ABOVE_NORMAL_TURF_LAYER, loc = src) I.alpha = 64 I.appearance_flags = RESET_ALPHA add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessed_aware, "blessing", I) diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 21eff5028b57e..b6837df6f9546 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -1,5 +1,6 @@ /obj/effect/decal/cleanable gender = PLURAL + plane = GAME_PLANE layer = FLOOR_CLEAN_LAYER var/list/random_icon_states = null ///I'm sorry but cleanable/blood code is ass, and so is blood_DNA diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index 941034ec511be..646713a21d74a 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -1,5 +1,6 @@ /obj/effect/decal name = "decal" + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE anchored = TRUE resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/game/objects/effects/spawners/random/clothing.dm b/code/game/objects/effects/spawners/random/clothing.dm index e3193b05836d8..119697c53171b 100644 --- a/code/game/objects/effects/spawners/random/clothing.dm +++ b/code/game/objects/effects/spawners/random/clothing.dm @@ -211,7 +211,7 @@ /obj/item/clothing/head/costume/lobsterhat, /obj/item/clothing/head/costume/cardborg, /obj/item/clothing/head/costume/football_helmet, - /obj/item/clothing/head/costume/tv_head/fov_less, + /obj/item/clothing/head/costume/tv_head, /obj/item/clothing/head/costume/tmc, /obj/item/clothing/head/costume/deckers, /obj/item/clothing/head/costume/yuri, diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm index 74ca4213b0dc5..2ad6fe093a70f 100644 --- a/code/game/objects/effects/spawners/random/entertainment.dm +++ b/code/game/objects/effects/spawners/random/entertainment.dm @@ -237,7 +237,7 @@ loot = list() /obj/effect/spawner/random/entertainment/toy/Initialize(mapload) - loot += GLOB.arcade_prize_pool + loot += GLOB.arcade_prize_pool_toy // BUBBERSTATION CHANGE: USES TOY POOL return ..() /obj/effect/spawner/random/entertainment/plushie diff --git a/code/game/objects/effects/spawners/random/maintenance.dm b/code/game/objects/effects/spawners/random/maintenance.dm index e4ce1ad36a581..c84f9a550d6b9 100644 --- a/code/game/objects/effects/spawners/random/maintenance.dm +++ b/code/game/objects/effects/spawners/random/maintenance.dm @@ -2,14 +2,17 @@ name = "maintenance loot spawner" desc = "Come on Lady Luck, spawn me a pair of sunglasses." icon_state = "loot" + remove_if_cant_spawn = FALSE //don't remove stuff from the global maint list, which other can use. // see code/_globalvars/lists/maintenance_loot.dm for loot table /// A subtype of maintenance loot spawner that does not spawn any decals, for when you want to place them on chasm turfs and such /// decals such as ashes will cause NeverShouldHaveComeHere() to fail on such turfs, which creates annoying rng based CI failures /obj/effect/spawner/random/maintenance/no_decals -/obj/effect/spawner/random/maintenance/no_decals/can_spawn(atom/loot) - return !ispath(loot, /obj/effect/decal) +/obj/effect/spawner/random/maintenance/no_decals/can_spawn(loot) + if(ispath(loot, /obj/effect/decal)) + return FALSE + return ..() /obj/effect/spawner/random/maintenance/examine(mob/user) . = ..() @@ -29,6 +32,14 @@ //BUBBERSTATION CHANGE END return ..() +/obj/effect/spawner/random/maintenance/skew_loot_weights(list/loot_list, exponent) + ///We only need to skew the weights once, since it's a global list used by all maint spawners. + var/static/already_done = FALSE + if(loot_list == GLOB.maintenance_loot && already_done) + return + already_done = TRUE + return ..() + /obj/effect/spawner/random/maintenance/proc/hide() SetInvisibility(INVISIBILITY_OBSERVER) alpha = 100 diff --git a/code/game/objects/effects/spawners/random/random.dm b/code/game/objects/effects/spawners/random/random.dm index ed77f671191b6..fae8ff14cda07 100644 --- a/code/game/objects/effects/spawners/random/random.dm +++ b/code/game/objects/effects/spawners/random/random.dm @@ -29,6 +29,8 @@ var/spawn_scatter_radius = 0 /// Whether the items should have a random pixel_x/y offset (maxium offset distance is ±16 pixels for x/y) var/spawn_random_offset = FALSE + /// Whether items that cannot be spawned will be removed from the loot list. Keep it TRUE unless you've a good reason. + var/remove_if_cant_spawn = TRUE /obj/effect/spawner/random/Initialize(mapload) . = ..() @@ -53,7 +55,7 @@ loot += subtypesof(loot_subtype_path) if(CONFIG_GET(number/random_loot_weight_modifier) != 1) - skew_loot_weights(CONFIG_GET(number/random_loot_weight_modifier)) + skew_loot_weights(loot, CONFIG_GET(number/random_loot_weight_modifier)) if(loot?.len) var/loot_spawned = 0 @@ -61,7 +63,8 @@ while((spawn_loot_count-loot_spawned) && loot.len) var/lootspawn = pick_weight_recursive(loot) if(!can_spawn(lootspawn)) - loot.Remove(lootspawn) + if(remove_if_cant_spawn) + loot.Remove(lootspawn) continue if(!spawn_loot_double) loot.Remove(lootspawn) diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm index a53d4df9b925a..caeede1ec2096 100644 --- a/code/game/objects/effects/temporary_visuals/cult.dm +++ b/code/game/objects/effects/temporary_visuals/cult.dm @@ -49,6 +49,7 @@ /obj/effect/temp_visual/cult/turf/floor icon_state = "floorglow" duration = 5 + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE /obj/effect/temp_visual/cult/portal diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index e4b752670e0b7..acff38cdb802d 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -1830,7 +1830,7 @@ /// Fetches embedding data /obj/item/proc/get_embed() RETURN_TYPE(/datum/embed_data) - return embed_type ? (embed_data ||= get_embed_by_type(embed_type)) : null + return embed_type ? (embed_data ||= get_embed_by_type(embed_type)) : embed_data /obj/item/proc/set_embed(datum/embed_data/embed) if(embed_data == embed) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 7d1274d0604e8..524ebad18c3f5 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -326,6 +326,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return lit = TRUE + playsound(src.loc, 'sound/items/cig_light.ogg', 100, 1) make_cig_smoke() if(!(flags_1 & INITIALIZED_1)) update_appearance(UPDATE_ICON) @@ -380,6 +381,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSobj, src) reagents.flags |= NO_REACT lit = FALSE + playsound(src.loc, 'sound/items/cig_snuff.ogg', 100, 1) update_appearance(UPDATE_ICON) if(ismob(loc)) to_chat(loc, span_notice("Your [name] goes out.")) @@ -932,12 +934,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM span_notice("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow."), span_notice("You quietly shut off [src] without even looking at what you're doing. Wow.") ) - playsound(src, 'modular_skyrat/master_files/sound/items/zippo_close.ogg', 50, TRUE) // SKYRAT EDIT ADDITION + playsound(src.loc , 'sound/items/zippo_off.ogg', 100, 1) else user.visible_message( span_notice("[user] quietly shuts off [src]."), span_notice("You quietly shut off [src].") ) + playsound(src.loc , 'sound/items/lighter_off.ogg', 100, 1) return set_lit(TRUE) @@ -946,8 +949,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM span_notice("Without even breaking stride, [user] flips open and lights [src] in one smooth movement."), span_notice("Without even breaking stride, you flip open and light [src] in one smooth movement.") ) - playsound(src, 'modular_skyrat/master_files/sound/items/zippo_open.ogg', 50, TRUE) // SKYRAT EDIT ADDITION + playsound(src.loc , 'sound/items/zippo_on.ogg', 100, 1) return + else + playsound(src.loc, 'sound/items/lighter_on.ogg', 100, 1) var/hand_protected = FALSE var/mob/living/carbon/human/human_user = user @@ -1176,13 +1181,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM to_chat(user, span_notice("You open the cap on [src].")) reagents.flags |= OPENCONTAINER if(obj_flags & EMAGGED) - icon_state = "vape_open_high" + icon_state = "vapeopen_high" set_greyscale(new_config = /datum/greyscale_config/vape/open_high) else if(super) - icon_state = "vape_open_med" + icon_state = "vapeopen_med" set_greyscale(new_config = /datum/greyscale_config/vape/open_med) else - icon_state = "vape_open_low" + icon_state = "vapeopen_low" set_greyscale(new_config = /datum/greyscale_config/vape/open_low) else screw = FALSE @@ -1197,12 +1202,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!super) super = TRUE to_chat(user, span_notice("You increase the voltage of [src].")) - icon_state = "vape_open_med" + icon_state = "vapeopen_med" set_greyscale(new_config = /datum/greyscale_config/vape/open_med) else super = FALSE to_chat(user, span_notice("You decrease the voltage of [src].")) - icon_state = "vape_open_low" + icon_state = "vapeopen_low" set_greyscale(new_config = /datum/greyscale_config/vape/open_low) if(screw && (obj_flags & EMAGGED)) @@ -1221,7 +1226,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM obj_flags |= EMAGGED super = FALSE balloon_alert(user, "voltage maximized") - icon_state = "vape_open_high" + icon_state = "vapeopen_high" set_greyscale(new_config = /datum/greyscale_config/vape/open_high) var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect sp.set_up(5, 1, src) diff --git a/code/game/objects/items/climbingrope.dm b/code/game/objects/items/climbingrope.dm index 693f850be2a98..e68e508771248 100644 --- a/code/game/objects/items/climbingrope.dm +++ b/code/game/objects/items/climbingrope.dm @@ -50,7 +50,19 @@ playsound(user_turf, 'sound/effects/picaxe1.ogg', 50) var/list/effects = list(new /obj/effect/temp_visual/climbing_hook(target, away_dir), new /obj/effect/temp_visual/climbing_hook(user_turf, away_dir)) - if(do_after(user, climb_time, target)) + // Our climbers athletics ability + var/fitness_level = user.mind?.get_skill_level(/datum/skill/athletics) + + // Misc bonuses to the climb speed. + var/misc_multiplier = 1 + + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + misc_multiplier *= potential_spine.athletics_boost_multiplier + + var/final_climb_time = (climb_time - fitness_level) * misc_multiplier + + if(do_after(user, final_climb_time, target)) user.forceMove(target) uses-- diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 43a32fb65f7e9..f6917ee3c48e5 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -932,6 +932,7 @@ light_range = 4 light_power = 2 alpha = 0 + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE anchored = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index ebd7729b4c56e..aacfe28e68148 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -12,7 +12,7 @@ /obj/item/multitool //SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE name = "multitool" - desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." + desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. You can activate it in-hand to locate the nearest APC." icon = 'icons/obj/devices/tool.dmi' icon_state = "multitool" inhand_icon_state = "multitool" @@ -32,11 +32,31 @@ usesound = 'sound/weapons/empty.ogg' var/datum/buffer // simple machine buffer for device linkage var/mode = 0 + var/apc_scanner = TRUE + COOLDOWN_DECLARE(next_apc_scan) /obj/item/multitool/examine(mob/user) . = ..() . += span_notice("Its buffer [buffer ? "contains [buffer]." : "is empty."]") +/obj/item/multitool/attack_self(mob/user, list/modifiers) + . = ..() + + if(. || !apc_scanner) + return + + if(!COOLDOWN_FINISHED(src, next_apc_scan)) + return + + COOLDOWN_START(src, next_apc_scan, 1 SECONDS) + + var/area/local_area = get_area(src) + var/power_controller = local_area.apc + if(power_controller) + user.balloon_alert(user, "[get_dist(src, power_controller)]m [dir2text(get_dir(src, power_controller))]") + else + user.balloon_alert(user, "couldn't find apc!") + /obj/item/multitool/suicide_act(mob/living/carbon/user) user.visible_message(span_suicide("[user] puts the [src] to [user.p_their()] chest. It looks like [user.p_theyre()] trying to pulse [user.p_their()] heart off!")) return OXYLOSS//theres a reason it wasn't recommended by doctors diff --git a/code/game/objects/items/emags.dm b/code/game/objects/items/emags.dm index cf89c0bb12cd0..5590f72eaf3ba 100644 --- a/code/game/objects/items/emags.dm +++ b/code/game/objects/items/emags.dm @@ -144,7 +144,8 @@ if(!can_emag(interacting_with, user)) return ITEM_INTERACT_BLOCKING log_combat(user, interacting_with, "attempted to emag") - interacting_with.emag_act(user, src) + if(interacting_with.emag_act(user, src)) + SSblackbox.record_feedback("tally", "atom_emagged", 1, interacting_with.type) return ITEM_INTERACT_SUCCESS /obj/item/card/emag/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index 7816fb0e83a70..a5fe073e56f3f 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -16,12 +16,12 @@ /datum/component/blood_walk,\ blood_type = blood_decal_type,\ blood_spawn_chance = 45,\ - max_blood = custom_materials[custom_materials[1]],\ + max_blood = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\ ) AddComponent( /datum/component/bloody_spreader,\ - blood_left = custom_materials[custom_materials[1]],\ + blood_left = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\ blood_dna = list("meaty DNA" = "MT-"),\ diseases = null,\ ) diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index e1449007b71d4..1024e44c625f3 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -387,7 +387,8 @@ /obj/item/food/icecream/make_edible() . = ..() - AddComponent(/datum/component/ice_cream_holder, filled_name = "ice cream", change_desc = TRUE, prefill_flavours = prefill_flavours) + var/max_scoops = check_holidays(ICE_CREAM_DAY) ? DEFAULT_MAX_ICE_CREAM_SCOOPS * 4 : DEFAULT_MAX_ICE_CREAM_SCOOPS + AddComponent(/datum/component/ice_cream_holder, max_scoops, filled_name = "ice cream", change_desc = TRUE, prefill_flavours = prefill_flavours) /obj/item/food/icecream/chocolate name = "chocolate cone" diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm index 1fabf13d31ac1..7e7076e842c64 100644 --- a/code/game/objects/items/puzzle_pieces.dm +++ b/code/game/objects/items/puzzle_pieces.dm @@ -86,6 +86,18 @@ puzzle_id = null //honestly these cant be closed anyway and im not fucking around with door code anymore INVOKE_ASYNC(src, PROC_REF(try_puzzle_open), null) +/obj/machinery/door/puzzle/animation_length(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) + return 1.0 SECONDS + +/obj/machinery/door/puzzle/animation_segment_delay(animation) + switch(animation) + if(DOOR_OPENING_PASSABLE) + return 0.8 SECONDS + if(DOOR_OPENING_FINISHED) + return 1.0 SECONDS + /obj/machinery/door/puzzle/Bumped(atom/movable/AM) return !density && ..() @@ -558,6 +570,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/puzzle/password/pin, 32) desc = "A board filled with colored dots. What could this mean?" icon = 'icons/obj/fluff/puzzle_small.dmi' icon_state = "puzzle_dots" + layer = ABOVE_NORMAL_TURF_LAYER plane = GAME_PLANE //visible over walls resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | UNACIDABLE | LAVA_PROOF flags_1 = UNPAINTABLE_1 diff --git a/code/game/objects/items/robot/items/food.dm b/code/game/objects/items/robot/items/food.dm index 865e5c792e56b..b7b018362c73c 100644 --- a/code/game/objects/items/robot/items/food.dm +++ b/code/game/objects/items/robot/items/food.dm @@ -152,6 +152,10 @@ return NONE /obj/item/borg/lollipop/attack_self(mob/living/user) + switch_mode(user) + return ..() + +/obj/item/borg/lollipop/proc/switch_mode(mob/living/user) switch(mode) if(DISPENSE_LOLLIPOP_MODE) mode = THROW_LOLLIPOP_MODE @@ -165,7 +169,17 @@ if(DISPENSE_ICECREAM_MODE) mode = DISPENSE_LOLLIPOP_MODE to_chat(user, span_notice("Module is now dispensing lollipops.")) - ..() + +/obj/item/borg/lollipop/ice_cream + name = "ice cream fabricator" + desc = "Reward humans with vanilla ice cream. Can't go wrong with it." + candy = 4 + candymax = 4 + charge_delay = 15 SECONDS + mode = DISPENSE_ICECREAM_MODE + +/obj/item/borg/lollipop/ice_cream/switch_mode(mob/living/user) + return /obj/item/ammo_casing/gumball name = "Gumball" diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index a73f4e3d43919..4a540bb5ba5d2 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -1266,7 +1266,6 @@ /obj/item/stack/tile/catwalk_tile/iron, /obj/item/stack/tile/catwalk_tile/iron_white, /obj/item/stack/tile/catwalk_tile/iron_dark, - /obj/item/stack/tile/catwalk_tile/flat_white, /obj/item/stack/tile/catwalk_tile/titanium, /obj/item/stack/tile/catwalk_tile/iron_smooth //this is the original greenish one ) @@ -1292,12 +1291,6 @@ icon_state = "darkiron_catwalk" turf_type = /turf/open/floor/catwalk_floor/iron_dark -/obj/item/stack/tile/catwalk_tile/flat_white - name = "flat white catwalk floor" - singular_name = "flat white catwalk floor tile" - icon_state = "flatwhite_catwalk" - turf_type = /turf/open/floor/catwalk_floor/flat_white - /obj/item/stack/tile/catwalk_tile/titanium name = "titanium catwalk floor" singular_name = "titanium catwalk floor tile" diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index e2658f3451909..7763025d7672e 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -277,11 +277,11 @@ /datum/component/blood_walk,\ blood_type = /obj/effect/decal/cleanable/blood,\ blood_spawn_chance = 15,\ - max_blood = 300,\ + max_blood = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\ ) AddComponent( /datum/component/bloody_spreader,\ - blood_left = INFINITY,\ + blood_left = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\ blood_dna = list("MEAT DNA" = "MT+"),\ diseases = null,\ ) diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index 944289598d17b..c3c97c790fdf3 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -454,6 +454,8 @@ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_SMALL + pickup_sound = 'sound/items/handling/pill_bottle_pickup.ogg' + drop_sound = 'sound/items/handling/pill_bottle_place.ogg' /obj/item/storage/pill_bottle/Initialize(mapload) . = ..() @@ -462,6 +464,8 @@ /obj/item/reagent_containers/pill, /obj/item/food/bait/natural, )) + atom_storage.open_sound = 'sound/items/handling/pill_bottle_open.ogg' + atom_storage.open_sound_vary = FALSE /obj/item/storage/pill_bottle/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] is trying to get the cap off [src]! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 01c1304493df2..cd5a9a1841ead 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -8,9 +8,15 @@ w_class = WEIGHT_CLASS_BULKY distribute_pressure = ONE_ATMOSPHERE * O2STANDARD actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization) + /// What gas our jetpack is filled with on initialize var/gas_type = /datum/gas/oxygen + /// If the jetpack is currently active var/on = FALSE + /// If the jetpack will stop when you stop moving var/stabilize = FALSE + /// If our jetpack is disabled, from getting EMPd + var/disabled = FALSE + /// Callback for the jetpack component var/thrust_callback /obj/item/tank/jetpack/Initialize(mapload) @@ -93,6 +99,8 @@ icon_state = "[initial(icon_state)][on ? "-on" : ""]" /obj/item/tank/jetpack/proc/turn_on(mob/user) + if(disabled) + return FALSE if(SEND_SIGNAL(src, COMSIG_JETPACK_ACTIVATED, user) & JETPACK_ACTIVATION_FAILED) return FALSE on = TRUE @@ -134,6 +142,23 @@ suffocater.visible_message(span_suicide("[user] is suffocating [user.p_them()]self with [src]! It looks like [user.p_they()] didn't read what that jetpack says!")) return OXYLOSS +/obj/item/tank/jetpack/emp_act(severity) + . = ..() + if(. & EMP_PROTECT_CONTENTS) + return + if(ismob(loc) && (item_flags & IN_INVENTORY)) + var/mob/wearer = loc + turn_off(wearer) + else + turn_off() + update_item_action_buttons() + disabled = TRUE + addtimer(CALLBACK(src, PROC_REF(remove_emp)), 4 SECONDS) + +///Removes the disabled flag after getting EMPd +/obj/item/tank/jetpack/proc/remove_emp() + disabled = FALSE + /obj/item/tank/jetpack/improvised name = "improvised jetpack" desc = "A jetpack made from two air tanks, a fire extinguisher and some atmospherics equipment. It doesn't look like it can hold much." diff --git a/code/game/objects/structures/fake_stairs.dm b/code/game/objects/structures/fake_stairs.dm index a5e03ed6b5986..1152a8c02dcca 100644 --- a/code/game/objects/structures/fake_stairs.dm +++ b/code/game/objects/structures/fake_stairs.dm @@ -6,6 +6,7 @@ anchored = TRUE move_resist = INFINITY + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE //one with the floor MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fake_stairs, 0) diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 82569c8f9e794..7acfa65f62577 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -87,7 +87,7 @@ icon = 'icons/obj/mining_zones/survival_pod.dmi' icon_state = "fan_tiny" plane = FLOOR_PLANE - layer = LOW_OBJ_LAYER + layer = ABOVE_OPEN_TURF_LAYER /** * A variety of statue in disrepair; parts are broken off and a gemstone is missing diff --git a/code/game/objects/structures/gym/punching_bag.dm b/code/game/objects/structures/gym/punching_bag.dm index 03a64725ab5e3..59ccf6f23c2c3 100644 --- a/code/game/objects/structures/gym/punching_bag.dm +++ b/code/game/objects/structures/gym/punching_bag.dm @@ -58,6 +58,10 @@ if (is_heavy_gravity) stamina_exhaustion *= 1.5 + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + stamina_exhaustion *= potential_spine.athletics_boost_multiplier + if(HAS_TRAIT(user, TRAIT_STRENGTH)) //The strong get reductions to stamina damage taken while exercising stamina_exhaustion *= 0.5 diff --git a/code/game/objects/structures/gym/weight_machine.dm b/code/game/objects/structures/gym/weight_machine.dm index 3c531f0488929..352ef65ff0050 100644 --- a/code/game/objects/structures/gym/weight_machine.dm +++ b/code/game/objects/structures/gym/weight_machine.dm @@ -171,10 +171,14 @@ var/workout_reps = total_workout_reps[user.mind.get_skill_level(/datum/skill/athletics)] * gravity_modifier // total stamina drain of 1 workout calculated based on the workout length var/stamina_exhaustion = FLOOR(user.maxHealth / workout_reps / WORKOUT_LENGTH, 0.1) - + + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + stamina_exhaustion *= potential_spine.athletics_boost_multiplier + if(HAS_TRAIT(user, TRAIT_STRENGTH)) //The strong get reductions to stamina damage taken while exercising stamina_exhaustion *= 0.5 - + user.adjustStaminaLoss(stamina_exhaustion * seconds_per_tick) return TRUE diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index ef6ea9d433e8f..314539aa2b412 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -105,7 +105,20 @@ /obj/structure/ladder/proc/start_travelling(mob/user, going_up) show_initial_fluff_message(user, going_up) - if(do_after(user, travel_time, target = src, interaction_key = DOAFTER_SOURCE_CLIMBING_LADDER)) + + // Our climbers athletics ability + var/fitness_level = user.mind?.get_skill_level(/datum/skill/athletics) + + // Misc bonuses to the climb speed. + var/misc_multiplier = 1 + + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + misc_multiplier *= potential_spine.athletics_boost_multiplier + + var/final_travel_time = (travel_time - fitness_level) * misc_multiplier + + if(do_after(user, final_travel_time, target = src, interaction_key = DOAFTER_SOURCE_CLIMBING_LADDER)) travel(user, going_up) /// The message shown when the player starts climbing the ladder diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index cf6fe65abe274..0d7d23191742c 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -23,6 +23,7 @@ if(length(give_turf_traits)) give_turf_traits = string_list(give_turf_traits) AddElement(/datum/element/give_turf_traits, give_turf_traits) + AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK) /datum/armor/structure_lattice melee = 50 @@ -98,10 +99,6 @@ obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP give_turf_traits = list(TRAIT_TURF_IGNORE_SLOWDOWN, TRAIT_LAVA_STOPPED, TRAIT_CHASM_STOPPED, TRAIT_IMMERSE_STOPPED, TRAIT_HYPERSPACE_STOPPED) -/obj/structure/lattice/catwalk/Initialize(mapload) - . = ..() - AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK) - /obj/structure/lattice/catwalk/deconstruction_hints(mob/user) return span_notice("The supporting rods look like they could be cut.") diff --git a/code/game/objects/structures/lavaland/gulag_vent.dm b/code/game/objects/structures/lavaland/gulag_vent.dm index b564908cdc6c1..c269c5213e71a 100644 --- a/code/game/objects/structures/lavaland/gulag_vent.dm +++ b/code/game/objects/structures/lavaland/gulag_vent.dm @@ -30,7 +30,14 @@ var/mob/living/living_user = user occupied = TRUE living_user.balloon_alert_to_viewers("hauling...") - var/succeeded = do_after(living_user, 8 SECONDS, src) + + var/boulder_lift_speed = 8 SECONDS + + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = living_user.get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + boulder_lift_speed *= potential_spine.athletics_boost_multiplier + + var/succeeded = do_after(living_user, boulder_lift_speed, src) occupied = FALSE if (!succeeded) return diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index 2ede6833aa992..bf69b23238c61 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -134,6 +134,8 @@ GLOBAL_LIST_INIT(tendrils, list()) playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, TRUE) visible_message(span_boldannounce("The tendril falls inward, the ground around it widening into a yawning chasm!")) for(var/turf/T in RANGE_TURFS(2,src)) + if(HAS_TRAIT(T, TRAIT_NO_TERRAFORM)) + continue if(!T.density) T.TerraformTurf(/turf/open/chasm/lavaland, /turf/open/chasm/lavaland, flags = CHANGETURF_INHERIT_AIR) qdel(src) diff --git a/code/game/objects/structures/lavaland/ore_vent.dm b/code/game/objects/structures/lavaland/ore_vent.dm index 27e05b6dc540d..cb9d203e3f2c7 100644 --- a/code/game/objects/structures/lavaland/ore_vent.dm +++ b/code/game/objects/structures/lavaland/ore_vent.dm @@ -85,6 +85,7 @@ RegisterSignal(src, COMSIG_SPAWNER_SPAWNED_DEFAULT, PROC_REF(anti_cheese)) RegisterSignal(src, COMSIG_SPAWNER_SPAWNED, PROC_REF(log_mob_spawned)) + AddElement(/datum/element/give_turf_traits, string_list(list(TRAIT_NO_TERRAFORM))) return ..() /obj/structure/ore_vent/Destroy() diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index c975463e2400b..2c181b12ab307 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -426,6 +426,10 @@ GLOBAL_LIST_EMPTY(crematoriums) /obj/structure/bodycontainer/crematorium/Initialize(mapload) . = ..() + if(mapload && check_holidays(ICE_CREAM_DAY) && !istype(src, /obj/structure/bodycontainer/crematorium/creamatorium)) + var/obj/structure/bodycontainer/crematorium/creamatorium/creamy = new(loc) + creamy.id = id + return INITIALIZE_HINT_QDEL GLOB.crematoriums += src /obj/structure/bodycontainer/crematorium/Destroy() diff --git a/code/game/objects/structures/signs/signs_departments.dm b/code/game/objects/structures/signs/signs_departments.dm index e663ef2411e62..532cbcfc426ad 100644 --- a/code/game/objects/structures/signs/signs_departments.dm +++ b/code/game/objects/structures/signs/signs_departments.dm @@ -215,6 +215,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/lawyer, 32) MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/cargo, 32) +/obj/structure/sign/departments/exodrone + name = "\improper Exodrone sign" + sign_change_name = "Department - Cargo: exodrone" + desc = "A sign labelling an area where exodrones are used." + icon_state = "exodrone" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/exodrone, 32) + ///////SECURITY /obj/structure/sign/departments/security diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 43ebb5ae53eef..3e7b5febed630 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -275,6 +275,11 @@ else if(HAS_TRAIT(user, TRAIT_QUICK_CARRY)) tableplace_delay = 2.75 SECONDS skills_space = " quickly" + + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + tableplace_delay *= potential_spine.athletics_boost_multiplier + carried_mob.visible_message(span_notice("[user] begins to[skills_space] place [carried_mob] onto [src]..."), span_userdanger("[user] begins to[skills_space] place [carried_mob] onto [src]...")) if(do_after(user, tableplace_delay, target = carried_mob)) diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index c9a00a0febab5..0ff9e3c76d435 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -99,7 +99,7 @@ if(is_station_level(z)) GLOB.station_turfs += src if(smoothing_flags & SMOOTH_DIAGONAL_CORNERS && fixed_underlay) //Set underlays for the diagonal walls. - var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, offset_spokesman = src, plane = FLOOR_PLANE) + var/mutable_appearance/underlay_appearance = mutable_appearance(layer = LOW_FLOOR_LAYER, offset_spokesman = src, plane = FLOOR_PLANE) if(fixed_underlay["space"]) generate_space_underlay(underlay_appearance, src) else diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index 20f9c67aabf5b..777adb9bb2cb1 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -1,4 +1,5 @@ /turf/open + layer = LOW_FLOOR_LAYER plane = FLOOR_PLANE ///negative for faster, positive for slower var/slowdown = 0 diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm index 8db5753a7196b..cf28cdc3a4631 100644 --- a/code/game/turfs/open/asteroid.dm +++ b/code/game/turfs/open/asteroid.dm @@ -311,3 +311,18 @@ GLOBAL_LIST_EMPTY(dug_up_basalt) floor_variance = 0 base_icon_state = "moon_dug" icon_state = "moon_dug" + + //used in outpost45 + +/turf/open/misc/asteroid/plasma //floor piece + gender = PLURAL + name = "asteroid gravel" + desc = "It's coarse and rough and gets everywhere." + baseturfs = /turf/open/misc/asteroid + icon = 'icons/turf/floors.dmi' + damaged_dmi = 'icons/turf/floors.dmi' + icon_state = "asteroid" + base_icon_state = "asteroid" + initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9" + planetary_atmos = TRUE + diff --git a/code/game/turfs/open/floor/catwalk_plating.dm b/code/game/turfs/open/floor/catwalk_plating.dm index 57bd0b74107ee..6e2979b8512f9 100644 --- a/code/game/turfs/open/floor/catwalk_plating.dm +++ b/code/game/turfs/open/floor/catwalk_plating.dm @@ -19,14 +19,10 @@ rust_resistance = RUST_RESISTANCE_BASIC var/covered = TRUE var/catwalk_type = "maint" - var/static/list/catwalk_underlays = list() /turf/open/floor/catwalk_floor/Initialize(mapload) . = ..() - if(!catwalk_underlays[catwalk_type]) - var/mutable_appearance/plating_underlay = mutable_appearance(icon, "[catwalk_type]_below", TURF_LAYER) - catwalk_underlays[catwalk_type] = plating_underlay - underlays += catwalk_underlays[catwalk_type] + underlays += mutable_appearance(icon, "[catwalk_type]_below", LOW_FLOOR_LAYER, src, FLOOR_PLANE) update_appearance() /turf/open/floor/catwalk_floor/examine(mob/user) @@ -43,7 +39,7 @@ covered = !covered if(!covered) underfloor_accessibility = UNDERFLOOR_INTERACTABLE - layer = TURF_LAYER + layer = LOW_FLOOR_LAYER icon_state = "[catwalk_type]_below" else underfloor_accessibility = UNDERFLOOR_VISIBLE @@ -80,12 +76,6 @@ floor_tile = /obj/item/stack/tile/catwalk_tile/iron_dark catwalk_type = "darkiron" -/turf/open/floor/catwalk_floor/flat_white - name = "white large plated catwalk floor" - icon_state = "flatwhite_above" - floor_tile = /obj/item/stack/tile/catwalk_tile/flat_white - catwalk_type = "flatwhite" - /turf/open/floor/catwalk_floor/titanium name = "titanium plated catwalk floor" icon_state = "titanium_above" @@ -115,9 +105,6 @@ /turf/open/floor/catwalk_floor/iron_dark/telecomms initial_gas_mix = TCOMMS_ATMOS -/turf/open/floor/catwalk_floor/flat_white/airless - initial_gas_mix = AIRLESS_ATMOS - /turf/open/floor/catwalk_floor/titanium/Airless initial_gas_mix = AIRLESS_ATMOS diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index cfece702af4f1..e672b7f7294fa 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -871,6 +871,7 @@ icon = 'icons/turf/space.dmi' icon_state = "space" floor_tile = /obj/item/stack/tile/fakespace + layer = SPACE_LAYER plane = PLANE_SPACE tiled_dirt = FALSE damaged_dmi = 'icons/turf/space.dmi' diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index 677bc776ea5a7..1af42be3071cd 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -10,6 +10,7 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT pathing_pass_method = TURF_PATHING_PASS_PROC plane = TRANSPARENT_FLOOR_PLANE + layer = SPACE_LAYER rust_resistance = RUST_RESISTANCE_ABSOLUTE var/can_cover_up = TRUE var/can_build_on = TRUE @@ -199,6 +200,10 @@ /turf/open/openspace/icemoon/keep_below drill_below = FALSE +/turf/open/openspace/xenobio + name = "xenobio bz air" + initial_gas_mix = XENOBIO_BZ + /turf/open/openspace/icemoon/ruins protect_ruin = FALSE drill_below = FALSE diff --git a/code/game/turfs/open/planet.dm b/code/game/turfs/open/planet.dm index 893942fc49c52..e0fe7e842b941 100644 --- a/code/game/turfs/open/planet.dm +++ b/code/game/turfs/open/planet.dm @@ -78,6 +78,9 @@ /turf/open/misc/grass/jungle/lavaland initial_gas_mix = LAVALAND_DEFAULT_ATMOS +/turf/open/misc/grass/jungle/station + baseturfs = /turf/open/misc/dirt/station + /turf/closed/mineral/random/jungle baseturfs = /turf/open/misc/dirt/dark/jungle diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index a54aafde916d3..dc758105d65eb 100644 --- a/code/modules/admin/antag_panel.dm +++ b/code/modules/admin/antag_panel.dm @@ -98,6 +98,9 @@ GLOBAL_VAR(antag_prototypes) var/out = "[name][(current && (current.real_name != name))?" (as [current.real_name])":""]
" out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]
" + //BUBBERSTATION CHANGE START: ANTAG TICKET INTEGRATION + out += "Antag Tickets: [current.client.get_antag_tickets()] (Current multiplier: x[current.client.antag_ticket_multiplier()])
" + //BUBBERSTATION CHANGE END: ANTAG TICKET INTEGRAATION out += "Assigned role: [assigned_role.title]. Edit
" out += "Faction and special role: [special_role]
" out += "Show Teams

" diff --git a/code/modules/admin/outfit_manager.dm b/code/modules/admin/outfit_manager.dm index f3ef7d2685c22..c5f14db8ae3e8 100644 --- a/code/modules/admin/outfit_manager.dm +++ b/code/modules/admin/outfit_manager.dm @@ -7,9 +7,6 @@ ADMIN_VERB(outfit_manager, R_DEBUG|R_ADMIN, "Outfit Manager", "View and edit out /datum/outfit_manager/ui_state(mob/user) return GLOB.admin_state -/datum/outfit_manager/ui_close(mob/user) - qdel(src) - /datum/outfit_manager/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) diff --git a/code/modules/admin/verbs/ai_triumvirate.dm b/code/modules/admin/verbs/ai_triumvirate.dm new file mode 100644 index 0000000000000..d63994a25c319 --- /dev/null +++ b/code/modules/admin/verbs/ai_triumvirate.dm @@ -0,0 +1,49 @@ + +///global reference to the current theme, if there is one. +GLOBAL_DATUM(triple_ai_controller, /datum/triple_ai_controller) + +/** + * The triple ai controller handles the admin triple AI mode, if enabled. + * It is first created when "Toggle AI Triumvirate" triggers it, and it can be referenced from GLOB.triple_ai_controller + * After it handles roundstart business, it cleans itself up. + */ +/datum/triple_ai_controller + +/datum/triple_ai_controller/New() + . = ..() + RegisterSignal(SSjob, COMSIG_OCCUPATIONS_DIVIDED, PROC_REF(on_occupations_divided)) + +/datum/triple_ai_controller/proc/on_occupations_divided(datum/source, pure, allow_all) + SIGNAL_HANDLER + + for(var/datum/job/ai/ai_datum in SSjob.joinable_occupations) + ai_datum.spawn_positions = 3 + if(!pure) + for(var/obj/effect/landmark/start/ai/secondary/secondary_ai_spawn in GLOB.start_landmarks_list) + secondary_ai_spawn.latejoin_active = TRUE + qdel(src) + +/datum/triple_ai_controller/Destroy(force) + UnregisterSignal(SSjob, COMSIG_OCCUPATIONS_DIVIDED) + GLOB.triple_ai_controller = null + . = ..() + +/client/proc/triple_ai() + set category = "Admin.Events" + set name = "Toggle AI Triumvirate" + + if(SSticker.current_state > GAME_STATE_PREGAME) + to_chat(usr, "This option is currently only usable during pregame. This may change at a later date.", confidential = TRUE) + return + + var/datum/job/job = SSjob.GetJobType(/datum/job/ai) + if(!job) + to_chat(usr, "Unable to locate the AI job", confidential = TRUE) + CRASH("triple_ai() called, no /datum/job/ai to be found.") + + if(!GLOB.triple_ai_controller) + GLOB.triple_ai_controller = new() + else + QDEL_NULL(GLOB.triple_ai_controller) + to_chat(usr, "There will[GLOB.triple_ai_controller ? "" : "not"] be an AI Triumvirate at round start.") + message_admins(span_adminnotice("[key_name_admin(usr)] has toggled [GLOB.triple_ai_controller ? "on" : "off"] triple AIs at round start.")) diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index c124a5fba2266..107d74d9c3975 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -257,6 +257,11 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w return holder.anon_names() SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Anonymous Names")) + if("tripleAI") + if(!is_funmin) + return + holder.triple_ai() + SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Triple AI")) if("onlyone") if(!is_funmin) return diff --git a/code/modules/admin/verbs/server.dm b/code/modules/admin/verbs/server.dm index 71000fd310d18..e3a66dcd1b3cf 100644 --- a/code/modules/admin/verbs/server.dm +++ b/code/modules/admin/verbs/server.dm @@ -74,6 +74,9 @@ ADMIN_VERB(toggle_ooc_dead, R_ADMIN, "Toggle Dead OOC", "Toggle the OOC channel message_admins("[key_name_admin(user)] toggled Dead OOC.") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Dead OOC", "[GLOB.dooc_allowed ? "Enabled" : "Disabled"]")) +ADMIN_VERB(toggle_vote_dead, R_ADMIN, "Toggle Dead Vote", "Toggle the vote for dead players on or off.", ADMIN_CATEGORY_SERVER) + SSvote.toggle_dead_voting(user) + ADMIN_VERB(start_now, R_SERVER, "Start Now", "Start the round RIGHT NOW.", ADMIN_CATEGORY_SERVER) var/static/list/waiting_states = list(GAME_STATE_PREGAME, GAME_STATE_STARTUP) if(!(SSticker.current_state in waiting_states)) diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 440feb91b7622..56ee817f0f5c1 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -187,7 +187,7 @@ desc = "A single-use beacon designed to quickly launch reinforcement clown operatives into the field." special_role_name = ROLE_CLOWN_OPERATIVE outfit = /datum/outfit/syndicate/clownop/no_crystals - antag_datum = /datum/antagonist/nukeop/clownop + antag_datum = /datum/antagonist/nukeop/reinforcement/clownop pod_style = STYLE_HONK use_subtypes = FALSE diff --git a/code/modules/antagonists/abductor/abductee/abductee.dm b/code/modules/antagonists/abductor/abductee/abductee.dm index f1e657a558ea1..fa529a6504415 100644 --- a/code/modules/antagonists/abductor/abductee/abductee.dm +++ b/code/modules/antagonists/abductor/abductee/abductee.dm @@ -6,6 +6,7 @@ */ /datum/antagonist/abductee name = "\improper Abductee" + stinger_sound = 'sound/ambience/antag/abductee.ogg' roundend_category = "abductees" antagpanel_category = ANTAG_GROUP_ABDUCTORS antag_hud_name = "abductee" @@ -18,6 +19,7 @@ to_chat(owner, span_warning("Your mind snaps!")) to_chat(owner, "[span_warning("You can't remember how you got here...")]") owner.announce_objectives() + play_stinger() /datum/antagonist/abductee/proc/give_objective() var/objtype = (prob(75) ? /datum/objective/abductee/random : pick(subtypesof(/datum/objective/abductee/) - /datum/objective/abductee/random)) diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index ea6706f96e999..36dccbb297ed1 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) name = new_name real_name = new_name last_attack = world.time - var/datum/blobstrain/BS = pick(GLOB.valid_blobstrains) + var/datum/blobstrain/BS = /datum/blobstrain/reagent/reactive_spines //BUBBERSTATION CHANGE, YOUR STRAIN WILL ALWAYS BE THE SAME. set_strain(BS) color = blobstrain.complementary_color if(blob_core) diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm index 2f3b51741f9b6..eb9d98ac92f5b 100644 --- a/code/modules/antagonists/blob/powers.dm +++ b/code/modules/antagonists/blob/powers.dm @@ -389,6 +389,11 @@ if (!isnull(initial(strain.analyzerdesceffect))) info_text += "
[span_notice("[initial(strain.analyzerdesceffect)]")]" + //BUBBERSATION CHANGE START: INSTANT ALERT WARNING + if(initial(strain.instant_alert_on_change)) + info_text += "
[span_danger("WARNING: Changing your strain to this will instantly alert everyone to your presence!")]" + //BUBBERSTATION CHANGE END: INSTANT ALERT WARNING + var/datum/radial_menu_choice/choice = new choice.image = strain_icon choice.info = info_text @@ -399,17 +404,26 @@ if (isnull(strain_result)) return + /* BUBBERSTATION CHANGE START: REFACTORS THIS. if (!free_strain_rerolls && !can_buy(BLOB_POWER_REROLL_COST)) return + BUBBERSTATION CHANGE END: REFACTORS THIS. */ + //Below code has basically been bubberstation refactored. Too many changes to make even semi-modular. for (var/_other_strain in GLOB.valid_blobstrains) var/datum/blobstrain/other_strain = _other_strain if (initial(other_strain.name) == strain_result) - set_strain(other_strain) - if (free_strain_rerolls) + if(!has_announced && initial(other_strain.instant_alert_on_change) && tgui_alert(src, "Selecting this strain will alert the crew that you exist. Are you sure you wish to continue?","*Notices your Strain*", list("Yes","No")) != "Yes") + return + + if(free_strain_rerolls) free_strain_rerolls -= 1 + else if(!can_buy(BLOB_POWER_REROLL_COST)) + return + set_strain(other_strain) +// BUBBER REFACTOR END last_reroll_time = world.time strain_choices = null diff --git a/code/modules/antagonists/brainwashing/brainwashing.dm b/code/modules/antagonists/brainwashing/brainwashing.dm index 524bfb04362db..57707688f4daf 100644 --- a/code/modules/antagonists/brainwashing/brainwashing.dm +++ b/code/modules/antagonists/brainwashing/brainwashing.dm @@ -30,6 +30,7 @@ /datum/antagonist/brainwashed name = "\improper Brainwashed Victim" job_rank = ROLE_BRAINWASHED + stinger_sound = 'sound/ambience/antag/brainwashed.ogg' roundend_category = "brainwashed victims" show_in_antagpanel = TRUE antag_hud_name = "brainwashed" diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index d84aa5131bf79..f608ae6ccaf51 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -94,7 +94,7 @@ flashed.balloon_alert(source, "[flashed.p_theyre()] loyal to someone else!") return - if (HAS_TRAIT(flashed, TRAIT_MINDSHIELD) || flashed.mind.assigned_role?.departments_bitflags & DEPARTMENT_BITFLAG_SECURITY) + if (HAS_TRAIT(flashed, TRAIT_MINDSHIELD)) flashed.balloon_alert(source, "[flashed.p_they()] resist!") return diff --git a/code/modules/antagonists/clown_ops/clownop.dm b/code/modules/antagonists/clown_ops/clownop.dm index 85cf2c0f631e7..07c1cc84ad756 100644 --- a/code/modules/antagonists/clown_ops/clownop.dm +++ b/code/modules/antagonists/clown_ops/clownop.dm @@ -65,6 +65,11 @@ if(liver) ADD_TRAIT(liver, TRAIT_COMEDY_METABOLISM, CLOWNOP_TRAIT) +// Clown op reinforcements +/datum/antagonist/nukeop/reinforcement/clownop + name = "Clown Operative Reinforcement" + nukeop_outfit = /datum/outfit/syndicate/clownop/no_crystals + /datum/outfit/clown_operative name = "Clown Operative (Preview only)" diff --git a/code/modules/antagonists/clown_ops/outfits.dm b/code/modules/antagonists/clown_ops/outfits.dm index 7dc84b56d856f..fb025e40dbd20 100644 --- a/code/modules/antagonists/clown_ops/outfits.dm +++ b/code/modules/antagonists/clown_ops/outfits.dm @@ -24,6 +24,7 @@ id_trim = /datum/id_trim/chameleon/operative/clown /datum/outfit/syndicate/clownop/no_crystals + name = "Clown Operative - Reinforcement" tc = 0 /datum/outfit/syndicate/clownop/leader diff --git a/code/modules/antagonists/hypnotized/hypnotized.dm b/code/modules/antagonists/hypnotized/hypnotized.dm index 4f1f49aa3be7c..fc1e5d7d5ad24 100644 --- a/code/modules/antagonists/hypnotized/hypnotized.dm +++ b/code/modules/antagonists/hypnotized/hypnotized.dm @@ -1,6 +1,7 @@ /// Antag datum associated with the hypnosis brain trauma, used for displaying objectives and antag hud /datum/antagonist/hypnotized name = "\improper Hypnotized Victim" + stinger_sound = 'sound/ambience/antag/hypnotized.ogg' job_rank = ROLE_HYPNOTIZED roundend_category = "hypnotized victims" antag_hud_name = "brainwashed" @@ -10,7 +11,6 @@ show_name_in_check_antagonists = TRUE count_against_dynamic_roll_chance = FALSE - silent = TRUE //not actually silent, because greet will be called by the trauma anyway. /// Brain trauma associated with this antag datum var/datum/brain_trauma/hypnosis/trauma diff --git a/code/modules/antagonists/nukeop/datums/operative_lone.dm b/code/modules/antagonists/nukeop/datums/operative_lone.dm index d0bc718a781b0..3993c2d49a7f6 100644 --- a/code/modules/antagonists/nukeop/datums/operative_lone.dm +++ b/code/modules/antagonists/nukeop/datums/operative_lone.dm @@ -2,7 +2,7 @@ name = "Lone Operative" always_new_team = TRUE send_to_spawnpoint = FALSE //Handled by event - nukeop_outfit = /datum/outfit/syndicate/full + nukeop_outfit = /datum/outfit/syndicate/full/loneop preview_outfit = /datum/outfit/nuclear_operative preview_outfit_behind = null nuke_icon_state = null diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm index a7611c2444821..0160fbd89149c 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm @@ -99,6 +99,13 @@ GLOBAL_LIST_EMPTY(jam_on_wardec) for(var/obj/machinery/computer/camera_advanced/shuttle_docker/dock as anything in GLOB.jam_on_wardec) dock.jammed = TRUE + var/datum/techweb/station_techweb = locate(/datum/techweb/science) in SSresearch.techwebs + if(station_techweb) + var/obj/machinery/announcement_system/announcement_system = pick(GLOB.announcement_systems) + if (!isnull(announcement_system)) + announcement_system.broadcast("Additional research data received from Nanotrasen R&D Division following the emergency protocol.", list(RADIO_CHANNEL_SCIENCE)) + station_techweb.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS * 3)) + qdel(src) /obj/item/nuclear_challenge/proc/distribute_tc() diff --git a/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm b/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm index 852c0d7d32fbd..6c409f063707d 100644 --- a/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm +++ b/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm @@ -44,3 +44,21 @@ Happy hunting! flash_protect = FLASH_PROTECTION_WELDER clothing_traits = list(TRAIT_REAGENT_SCANNER) var/list/hudlist = list(DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_ADVANCED, DATA_HUD_SECURITY_ADVANCED) + +/obj/item/clothing/glasses/overwatch/equipped(mob/user, slot) + . = ..() + if(!(slot & ITEM_SLOT_EYES) || !ishuman(user)) + return + for(var/hud in hudlist) + var/datum/atom_hud/our_hud = GLOB.huds[hud] + our_hud.show_to(user) + user.add_traits(list(TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD, TRAIT_DIAGNOSTIC_HUD), GLASSES_TRAIT) + +/obj/item/clothing/glasses/overwatch/dropped(mob/user) + . = ..() + user.remove_traits(list(TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD, TRAIT_DIAGNOSTIC_HUD), GLASSES_TRAIT) + if(!ishuman(user)) + return + for(var/hud in hudlist) + var/datum/atom_hud/our_hud = GLOB.huds[hud] + our_hud.hide_from(user) diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm index fa214aa70468c..0d122cff0c061 100644 --- a/code/modules/antagonists/nukeop/outfits.dm +++ b/code/modules/antagonists/nukeop/outfits.dm @@ -52,8 +52,7 @@ if(command_radio) radio.command = TRUE radio.use_command = TRUE - - if(ispath(uplink_type, /obj/item/uplink/nuclear) || tc) // /obj/item/uplink/nuclear understands 0 tc + if(ispath(uplink_type, /obj/item/uplink) || tc) // /obj/item/uplink understands 0 tc var/obj/item/uplink = new uplink_type(nukie, nukie.key, tc) nukie.equip_to_slot_or_del(uplink, ITEM_SLOT_BACKPACK, indirect_action = TRUE) @@ -80,6 +79,10 @@ /obj/item/ammo_box/magazine/m12g = 3, ) +/datum/outfit/syndicate/full/loneop + name = "Syndicate Operative - Full Kit (Loneop)" + uplink_type = /obj/item/uplink/loneop + /datum/outfit/syndicate/full/plasmaman name = "Syndicate Operative - Full Kit (Plasmaman)" back = /obj/item/mod/control/pre_equipped/nuclear/plasmaman @@ -91,6 +94,10 @@ backpack_contents += /obj/item/clothing/head/helmet/space/plasmaman/syndie return ..() +/datum/outfit/syndicate/full/plasmaman/loneop + name = "Syndicate Operative - Full Kit (Loneop Plasmaman)" + uplink_type = /obj/item/uplink/loneop + /datum/outfit/syndicate/reinforcement name = "Syndicate Operative - Reinforcement" tc = 0 diff --git a/code/modules/antagonists/pirate/pirate_outfits.dm b/code/modules/antagonists/pirate/pirate_outfits.dm index aef7f1d9d4b92..72318fe4987ca 100644 --- a/code/modules/antagonists/pirate/pirate_outfits.dm +++ b/code/modules/antagonists/pirate/pirate_outfits.dm @@ -62,10 +62,12 @@ id_trim = /datum/id_trim/pirate/silverscale uniform = /obj/item/clothing/under/syndicate/sniper suit = /obj/item/clothing/suit/armor/vest/alt + back = /obj/item/storage/backpack/satchel glasses = /obj/item/clothing/glasses/monocle gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/collectable/tophat shoes = /obj/item/clothing/shoes/laceup + implants = list(/obj/item/implant/explosive) /datum/outfit/pirate/silverscale/captain name = "Silver Scale Captain" diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm index 4fd68c3865e2d..3fcbc914040e8 100644 --- a/code/modules/antagonists/space_ninja/space_ninja.dm +++ b/code/modules/antagonists/space_ninja/space_ninja.dm @@ -118,7 +118,6 @@ operative.dna.update_dna_identity() operative.dna.species.pre_equip_species_outfit(null, operative) operative.regenerate_icons() - SSquirks.AssignQuirks(operative, operative.client, TRUE, TRUE, null, FALSE, operative) equip_space_ninja(owner.current) owner.current.add_quirk(/datum/quirk/freerunning) diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm index f050528bd3bc7..0bb3bcfe8ead7 100644 --- a/code/modules/art/paintings.dm +++ b/code/modules/art/paintings.dm @@ -265,7 +265,7 @@ return var/sniped_amount = painting_metadata.credit_value var/offer_amount = tgui_input_number(user, "How much do you want to offer?", "Patronage Amount", (painting_metadata.credit_value + 1), account.account_balance, painting_metadata.credit_value) - if(!offer_amount || QDELETED(user) || QDELETED(src) || !usr.can_perform_action(src, FORBID_TELEKINESIS_REACH)) + if(!offer_amount || QDELETED(user) || QDELETED(src) || !istype(loc, /obj/structure/sign/painting) || !user.can_perform_action(loc, FORBID_TELEKINESIS_REACH)) return if(sniped_amount != painting_metadata.credit_value) return diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index fa8b833234586..8674e6331e4ac 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -327,7 +327,10 @@ return FALSE //if the target is not in the same piping layer & it does not have the all layer connection flag[which allows it to be connected regardless of layer] then we are out - if(target.piping_layer != given_layer && !(target.pipe_flags & PIPING_ALL_LAYER)) + if(target.pipe_flags & PIPING_DISTRO_AND_WASTE_LAYERS) + if(ISODD(given_layer)) + return FALSE + else if(target.piping_layer != given_layer && !(target.pipe_flags & PIPING_ALL_LAYER)) return FALSE //if the target does not have the same color and it does not have all color connection flag[which allows it to be connected regardless of color] & one of the pipes is not gray[allowing for connection regardless] then we are out @@ -666,7 +669,7 @@ SET_PLANE_EXPLICIT(cap_overlay, initial(plane), our_turf) cap_overlay.color = pipe_color - cap_overlay.layer = layer + cap_overlay.layer = initial(layer) cap_overlay.icon_state = "[bitfield]_[piping_layer]" cap_overlay.forceMove(our_turf) diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index b4e5d88d62c71..ded9110bdfd74 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -62,9 +62,12 @@ color = null SET_PLANE_IMPLICIT(src, showpipe ? GAME_PLANE : FLOOR_PLANE) + // Layer is handled in update_layer() if(!showpipe) return ..() + if(pipe_flags & PIPING_DISTRO_AND_WASTE_LAYERS) + return ..() var/connected = 0 //Direction bitset @@ -327,7 +330,7 @@ connect_nodes() /obj/machinery/atmospherics/components/update_layer() - layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001) + layer = (showpipe ? initial(layer) : ABOVE_OPEN_TURF_LAYER) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001) /** * Handles air relocation to the pipenet/environment diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm index a9fcaf93ec680..ee1e61428d196 100644 --- a/code/modules/atmospherics/machinery/components/tank.dm +++ b/code/modules/atmospherics/machinery/components/tank.dm @@ -363,6 +363,18 @@ /obj/machinery/atmospherics/components/tank/air name = "pressure tank (Air)" +/obj/machinery/atmospherics/components/tank/air/layer1 + piping_layer = 1 + +/obj/machinery/atmospherics/components/tank/air/layer2 + piping_layer = 2 + +/obj/machinery/atmospherics/components/tank/air/layer4 + piping_layer = 4 + +/obj/machinery/atmospherics/components/tank/air/layer5 + piping_layer = 5 + /obj/machinery/atmospherics/components/tank/air/Initialize(mapload) . = ..() fill_to_pressure(/datum/gas/oxygen, safety_margin = (O2STANDARD * 0.5)) diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index 12a3c7971601b..8f90986baaa46 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -250,6 +250,18 @@ icon_state = "mixer_on-0_f" flipped = TRUE +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/layer1 + piping_layer = 1 + +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/layer2 + piping_layer = 2 + +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/layer4 + piping_layer = 4 + +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/layer5 + piping_layer = 5 + /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse node1_concentration = O2STANDARD node2_concentration = N2STANDARD diff --git a/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm new file mode 100644 index 0000000000000..804f868e9c189 --- /dev/null +++ b/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm @@ -0,0 +1,455 @@ +/** + * The pump looks up for the airlocks automatically based on airlock_pump_distance_limit and airlock_group_distance_limit values. + * When placed, the dir value (direction where the pipes are coming from) is considered as a direction towards the station (internal). The opposite direction is external. + * The airlock then tries to find airlocks or walls towards these directions until airlock_pump_distance_limit number of tiles reached. + * When it finds a valid object, then it tries to find airlocks, in directions perpendicular to the found tiles. + * And then adds them to the corresponding group (external/internal) until airlock_group_distance_limit number of tiles reached + * + * Example scheme of a valid configuration: + * A-----W + * A-----A + * W--P--A + * W-----W + * A-----W + * + * Where: + * A - airlocks + * W - walls + * P - pump + */ +/// A vent, scrubber and a sensor in a single device meant specifically for cycling airlocks. Ideal for airlocks of up to 3x3 tiles in size to avoid wind and timing out. +/obj/machinery/atmospherics/components/unary/airlock_pump + name = "external airlock pump" + desc = "A pump for cycling an external airlock controlled by the connected doors." + icon = 'icons/obj/machines/atmospherics/unary_devices.dmi' + icon_state = "airlock_pump" + pipe_state = "airlock_pump" + use_power = ACTIVE_POWER_USE + active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION + can_unwrench = TRUE + welded = FALSE + vent_movement = VENTCRAWL_ALLOWED | VENTCRAWL_CAN_SEE | VENTCRAWL_ENTRANCE_ALLOWED + max_integrity = 100 + paintable = FALSE + pipe_flags = PIPING_ONE_PER_TURF | PIPING_DISTRO_AND_WASTE_LAYERS | PIPING_DEFAULT_LAYER_ONLY | PIPING_ALL_COLORS + layer = GAS_PUMP_LAYER + hide = TRUE + device_type = BINARY // Even though it is unary, it has two nodes on one side - used in node count checks + + ///Indicates that the direction of the pump, if ATMOS_DIRECTION_SIPHONING is siphoning, if ATMOS_DIRECTION_RELEASING is releasing + var/pump_direction = ATMOS_DIRECTION_SIPHONING + ///Target pressure for pressurization cycle + var/internal_pressure_target = ONE_ATMOSPHERE + ///Target pressure for depressurization cycle + var/external_pressure_target = 0 + ///Target pressure for the current cycle + var/cycle_pressure_target + ///Allowed error in pressure checks + var/allowed_pressure_error = ONE_ATMOSPHERE / 100 + ///Minimal distro pressure to start cycling + var/min_distro_pressure = ONE_ATMOSPHERE / 10 + ///Rate of the pump to remove gases from the air + var/volume_rate = 1000 + ///The start time of the current cycle to calculate cycle duration + var/cycle_start_time + ///Max duration of cycle, after which the pump will unlock the airlocks with a warning + var/cycle_timeout = 10 SECONDS + ///List of the turfs adjacent to the pump for faster cycling and avoiding wind + var/list/turf/adjacent_turfs = list() + ///Max distance between the airlock and the pump. Used to set up cycling. + var/airlock_pump_distance_limit = 2 + ///Max distance between the central airlock and the side airlocks in a group + var/airlock_group_distance_limit = 2 + ///Type of airlocks required for automatic cycling setup. To avoid hacking bridge doors. Ignored for mapspawn pump. + var/valid_airlock_typepath = /obj/machinery/door/airlock/external + ///Station-facing airlocks used in cycling + var/list/obj/machinery/door/airlock/internal_airlocks + ///Space-facing airlocks used in cycling + var/list/obj/machinery/door/airlock/external_airlocks + ///Whether both airlocks are specified and cycling is available + var/cycling_set_up = FALSE + ///Whether the pump opens the airlocks up instead of simpy unbolting them on cycle + var/open_airlock_on_cycle = TRUE + ///Airlocks currently animating + var/airlocks_animating = FALSE + ///Whether the airlocks comment the cycling details to the chat + var/is_cycling_audible = TRUE + + COOLDOWN_DECLARE(check_turfs_cooldown) + + +/obj/machinery/atmospherics/components/unary/airlock_pump/update_icon_nopipes() + if(!on || !is_operational || !powered()) + icon_state = "vent_off" + else + icon_state = pump_direction ? "vent_out" : "vent_in" + + +/obj/machinery/atmospherics/components/unary/airlock_pump/update_overlays() + . = ..() + if(!showpipe) + return + + var/mutable_appearance/distro_pipe_appearance = get_pipe_image(icon, "pipe_exposed", dir, COLOR_BLUE, piping_layer = 4) + if(nodes[1]) + distro_pipe_appearance = get_pipe_image(icon, "pipe_intact", dir, COLOR_BLUE, piping_layer = 4) + . += distro_pipe_appearance + + var/mutable_appearance/waste_pipe_appearance = get_pipe_image(icon, "pipe_exposed", dir, COLOR_RED, piping_layer = 2) + if(nodes[2]) + waste_pipe_appearance = get_pipe_image(icon, "pipe_intact", dir, COLOR_RED, piping_layer = 2) + . += waste_pipe_appearance + + var/mutable_appearance/distro_cap_appearance = get_pipe_image(icon, "vent_cap", dir, piping_layer = 4) + . += distro_cap_appearance + + var/mutable_appearance/waste_cap_appearance = get_pipe_image(icon, "vent_cap", dir, piping_layer = 2) + . += waste_cap_appearance + + +/obj/machinery/atmospherics/components/unary/airlock_pump/atmos_init(list/node_connects) + for(var/obj/machinery/atmospherics/target in get_step(src, dir)) + if(connection_check(target, 4) && !nodes[1]) + nodes[1] = target // Distro + if(connection_check(target, 2) && !nodes[2]) + nodes[2] = target // Waste + update_appearance() + + +/obj/machinery/atmospherics/components/unary/airlock_pump/Initialize(mapload) + . = ..() + if(mapload) + can_unwrench = FALSE + + +/obj/machinery/atmospherics/components/unary/airlock_pump/post_machine_initialize() + . = ..() + set_links() + + +/obj/machinery/atmospherics/components/unary/airlock_pump/New() + . = ..() + var/datum/gas_mixture/distro_air = airs[1] + var/datum/gas_mixture/waste_air = airs[2] + distro_air.volume = 1000 + waste_air.volume = 1000 + + +/obj/machinery/atmospherics/components/unary/airlock_pump/on_deconstruction(disassembled) + . = ..() + if(cycling_set_up) + break_all_links() + + +/obj/machinery/atmospherics/components/unary/airlock_pump/can_unwrench(mob/user) + . = ..() + if(!.) + to_chat(user, span_warning("You cannot unwrench [src], it is secured firmly in place!")) + return FALSE + if(. && on) + to_chat(user, span_warning("You cannot unwrench [src], wait for the cycle completion!")) + return FALSE + + +/obj/machinery/atmospherics/components/unary/airlock_pump/process_atmos() + if(!on) + return + + if(!powered()) + stop_cycle("No power. Cycle aborted.", unbolt_only = TRUE) + return //Couldn't complete the cycle due to power outage + + var/turf/location = get_turf(loc) + if(isclosedturf(location)) + return + + if(COOLDOWN_FINISHED(src, check_turfs_cooldown)) + check_turfs() + COOLDOWN_START(src, check_turfs_cooldown, 2 SECONDS) + + if(world.time - cycle_start_time > cycle_timeout) + stop_cycle("Cycling timed out, bolts unlocked.", unbolt_only = TRUE) + return //Couldn't complete the cycle before timeout + + var/datum/gas_mixture/distro_air = airs[1] + var/datum/gas_mixture/tile_air = loc.return_air() + var/tile_air_pressure = tile_air.return_pressure() + + if(pump_direction == ATMOS_DIRECTION_RELEASING) //distro node -> tile + var/pressure_delta = cycle_pressure_target - tile_air_pressure + if(pressure_delta <= allowed_pressure_error && stop_cycle("Pressurization complete.")) + return //Internal target pressure reached + + var/available_moles = distro_air.total_moles() + var/total_tiles = adjacent_turfs.len + 1 + var/split_moles = QUANTIZE(available_moles / total_tiles) + + fill_tile(loc, split_moles, pressure_delta) + for(var/turf/tile as anything in adjacent_turfs) + fill_tile(tile, split_moles, pressure_delta) + else //tile -> waste node + var/pressure_delta = tile_air_pressure - cycle_pressure_target + if(pressure_delta <= allowed_pressure_error && stop_cycle("Decompression complete.")) + return //External target pressure reached + + siphon_tile(loc) + for(var/turf/tile as anything in adjacent_turfs) + siphon_tile(tile) + + +/// Fill a tile with air from the distro node +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/fill_tile(turf/tile, moles, pressure_delta) + var/datum/pipeline/distro_pipe = parents[1] + var/datum/gas_mixture/distro_air = airs[1] + var/datum/gas_mixture/tile_air = tile.return_air() + var/transfer_moles = (volume_rate / tile_air.volume) * (pressure_delta * tile_air.volume) / (distro_air.temperature * R_IDEAL_GAS_EQUATION) + moles = min(moles, transfer_moles) + + var/datum/gas_mixture/removed_air = distro_air.remove(moles) + + if(!removed_air) + return //No air in distro + + tile.assume_air(removed_air) + distro_pipe.update = TRUE + + +/// Siphon air from the tile to the waste node within the volume rate limit +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/siphon_tile(turf/tile) + var/datum/pipeline/waste_pipe = parents[2] + var/datum/gas_mixture/waste_air = airs[2] + var/datum/gas_mixture/tile_air = tile.return_air() + + var/transfer_moles = tile_air.total_moles() * (volume_rate / tile_air.volume) + var/datum/gas_mixture/removed_air = tile.remove_air(transfer_moles) + + if(!removed_air) + return //No air on the tile + + waste_air.merge(removed_air) + waste_pipe.update = TRUE + + +/// Proc for triggering cycle by clicking on a bolted airlock that has a pump assigned +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/airlock_act(obj/machinery/door/airlock/airlock) + if(on) + airlock.run_animation(DOOR_DENY_ANIMATION) // Already cycling + return + if(!cycling_set_up) + airlock.say("Airlock pair not found.") + return + if(airlock in external_airlocks) + start_cycle(ATMOS_DIRECTION_SIPHONING, airlock) + else if(airlock in internal_airlocks) + start_cycle(ATMOS_DIRECTION_RELEASING, airlock) + + +///Start decompression or pressurization cycle depending on the passed direction +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/start_cycle(cycle_direction, obj/machinery/door/airlock/source_airlock = null) + if(on || !cycling_set_up || airlocks_animating || !powered()) + return FALSE + + pump_direction = cycle_direction + + for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks)) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_close)) + + airlocks_animating = TRUE + stoplag(1 SECONDS) // Wait for closing animation + airlocks_animating = FALSE + + on = TRUE + cycle_start_time = world.time + + var/turf/local_turf = get_turf(src) + var/tile_air_pressure = max(0, local_turf.return_air().return_pressure()) + + if(pump_direction == ATMOS_DIRECTION_RELEASING) + cycle_pressure_target = internal_pressure_target + var/pressure_delta = cycle_pressure_target - tile_air_pressure + if(pressure_delta <= allowed_pressure_error) + stop_cycle("Pressure nominal, cycle skipped.") + return TRUE + + var/datum/gas_mixture/distro_air = airs[1] + if(distro_air.return_pressure() < min_distro_pressure) + stop_cycle("Low pipe pressure, cycle skipped. Proceed with caution.", unbolt_only = TRUE) + return TRUE + + if(!source_airlock) + source_airlock = internal_airlocks[1] + if(is_cycling_audible) + source_airlock.say("Pressurizing airlock.") + else + cycle_pressure_target = external_pressure_target + var/pressure_delta = tile_air_pressure - cycle_pressure_target + if(pressure_delta <= allowed_pressure_error) + stop_cycle("Pressure nominal, cycle skipped.") + return TRUE + + for(var/obj/machinery/door/airlock/airlock as anything in external_airlocks) + if(airlock.shuttledocked) + stop_cycle("Shuttle docked, cycle skipped.") + return TRUE + + if(!source_airlock) + source_airlock = external_airlocks[1] + if(is_cycling_audible) + source_airlock.say("Decompressing airlock.") + + update_appearance() + return TRUE + + +///Complete/Abort cycle with the passed message +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/stop_cycle(message = null, unbolt_only = FALSE) + if(!on) + return FALSE + on = FALSE + + var/list/obj/machinery/door/airlock/unlocked_airlocks = pump_direction == ATMOS_DIRECTION_RELEASING ? internal_airlocks : external_airlocks + for(var/obj/machinery/door/airlock/airlock as anything in unlocked_airlocks) + airlock.unbolt() + if(open_airlock_on_cycle && !unbolt_only) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_open)) //Can unbolt, but without audio + + airlocks_animating = TRUE + stoplag(1 SECONDS) // Wait for opening animation + airlocks_animating = FALSE + + if(message && is_cycling_audible) + unlocked_airlocks[1].say(message) + + update_appearance() + return TRUE + + +///Update adjacent_turfs with atmospherically adjacent tiles +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/check_turfs() + adjacent_turfs.Cut() + var/turf/local_turf = get_turf(src) + adjacent_turfs = local_turf.get_atmos_adjacent_turfs(alldir = TRUE) + + +///Find airlocks and link up with them +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/set_links() + var/perpendicular_dirs = NSCOMPONENT(dir) ? WEST|EAST : NORTH|SOUTH + var/turf/internal_airlocks_origin = find_density(get_turf(src), dir) + var/turf/external_airlocks_origin = find_density(get_turf(src), REVERSE_DIR(dir)) + internal_airlocks = get_adjacent_airlocks(internal_airlocks_origin, perpendicular_dirs) + external_airlocks = get_adjacent_airlocks(external_airlocks_origin, perpendicular_dirs) + + if(!internal_airlocks.len || !internal_airlocks.len) + if(!can_unwrench) //maploaded pump + CRASH("[type] couldn't find airlocks to cycle with!") + internal_airlocks = list() + external_airlocks = list() + say("Cycling setup failed. No opposite airlocks found.") + return + + for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks)) + airlock.set_cycle_pump(src) + RegisterSignal(airlock, COMSIG_QDELETING, PROC_REF(unlink_airlock)) + if (airlock in external_airlocks) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_close)) + else if(open_airlock_on_cycle) + INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_open)) + + cycle_timeout *= round((internal_airlocks.len + external_airlocks.len) / 2) + cycling_set_up = TRUE + if(can_unwrench) + say("Cycling setup complete.") + + +///Get the turf of the first found airlock or an airtight structure (walls) within the allowed range +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/find_density(turf/origin, direction, max_distance = airlock_pump_distance_limit) + var/turf/next_turf = origin + var/limit = max(1, max_distance) + while(limit) + limit-- + next_turf = get_step(next_turf, direction) + var/obj/machinery/door/airlock/found_airlock = locate() in next_turf + if(is_valid_airlock(found_airlock)) + return found_airlock.loc + if(!next_turf.can_atmos_pass) + return next_turf + + +///Find airlocks adjacent to the central one, lined up along the provided directions +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/get_adjacent_airlocks(origin_turf, directions) + var/list/airlocks = list() + + var/obj/machinery/door/airlock/origin_airlock = locate() in origin_turf + if(is_valid_airlock(origin_airlock)) + airlocks.Add(origin_airlock) + + for(var/direction in GLOB.cardinals) + if(!(direction & directions)) + continue + var/turf/next_turf = origin_turf + var/limit = max(0, airlock_group_distance_limit) + while(limit) + limit-- + next_turf = get_step(next_turf, direction) + var/obj/machinery/door/airlock/found_airlock = locate() in next_turf + if (is_valid_airlock(found_airlock)) + airlocks.Add(found_airlock) + else + limit = 0 + + return airlocks + + +///Whether the passed airlock can be linked with +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/is_valid_airlock(obj/machinery/door/airlock/airlock) + if(!airlock) + return FALSE + if(airlock.cycle_pump) + return FALSE // Already linked + if(can_unwrench && !istype(airlock, valid_airlock_typepath)) + return FALSE // Invalid airlock type and the pump is not mapspawn + return TRUE + + +///Find airlocks and link up with them +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/unlink_airlock(airlock) + UnregisterSignal(airlock, COMSIG_QDELETING) + + if(airlock in internal_airlocks) + internal_airlocks.Remove(airlock) + if(airlock in external_airlocks) + external_airlocks.Remove(airlock) + + if(!internal_airlocks.len || !external_airlocks.len) + break_all_links() + + +///Break the cycling setup +/obj/machinery/atmospherics/components/unary/airlock_pump/proc/break_all_links() + for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks)) + UnregisterSignal(airlock, COMSIG_QDELETING) + + external_airlocks = list() + internal_airlocks = list() + cycle_timeout = initial(cycle_timeout) + cycling_set_up = FALSE + + +/obj/machinery/atmospherics/components/unary/airlock_pump/relaymove(mob/living/user, direction) + if(initialize_directions & direction) + return ..() + if((NORTH|EAST) & direction) + user.ventcrawl_layer = clamp(user.ventcrawl_layer + 2, PIPING_LAYER_DEFAULT - 1, PIPING_LAYER_DEFAULT + 1) + if((SOUTH|WEST) & direction) + user.ventcrawl_layer = clamp(user.ventcrawl_layer - 2, PIPING_LAYER_DEFAULT - 1, PIPING_LAYER_DEFAULT + 1) + to_chat(user, "You align yourself with the [user.ventcrawl_layer == 2 ? 1 : 2]\th output.") + +/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only + open_airlock_on_cycle = FALSE + +/obj/machinery/atmospherics/components/unary/airlock_pump/silent + is_cycling_audible = FALSE + +/obj/machinery/atmospherics/components/unary/airlock_pump/lavaland + external_pressure_target = LAVALAND_EQUIPMENT_EFFECT_PRESSURE + diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 55237aba340df..59ce701924c91 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -80,7 +80,7 @@ use_power = IDLE_POWER_USE idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.75 active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 1.5 - flags_1 = PREVENT_CLICK_UNDER_1 + flags_1 = PREVENT_CLICK_UNDER_1 | IGNORE_TURF_PIXEL_OFFSET_1 interaction_flags_mouse_drop = NEED_DEXTERITY ///If TRUE will eject the mob once healing is complete diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 2fe1a8e430fa1..619bf100a170f 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -333,6 +333,18 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer1 + piping_layer = 1 + +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer2 + piping_layer = 2 + +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer4 + piping_layer = 4 + +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/layer5 + piping_layer = 5 + /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on on = TRUE icon_state = "thermo_base_1" @@ -352,6 +364,18 @@ /obj/machinery/atmospherics/components/unary/thermomachine/heater +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer1 + piping_layer = 1 + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer2 + piping_layer = 2 + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer4 + piping_layer = 4 + +/obj/machinery/atmospherics/components/unary/thermomachine/heater/layer5 + piping_layer = 5 + /obj/machinery/atmospherics/components/unary/thermomachine/heater/on on = TRUE icon_state = "thermo_base_1" diff --git a/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm b/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm index 472cb3ed2034a..4c1cd63016c92 100644 --- a/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm +++ b/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm @@ -5,6 +5,7 @@ name = "bridge pipe" desc = "A one meter section of regular pipe used to connect pipenets over pipes." + layer = HIGH_PIPE_LAYER dir = SOUTH initialize_directions = NORTH | SOUTH pipe_flags = PIPING_CARDINAL_AUTONORMALIZE | PIPING_BRIDGE @@ -28,4 +29,5 @@ PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer) . += center - layer = HIGH_PIPE_LAYER //to stay above all sorts of pipes +/obj/machinery/atmospherics/pipe/bridge_pipe/update_layer() + layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER + 1 : initial(layer)) diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm index 730e193671dbe..fde47b1baf0ee 100644 --- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm +++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm @@ -41,7 +41,7 @@ nodes = list() /obj/machinery/atmospherics/pipe/layer_manifold/update_layer() - layer = initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else. + layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER : initial(layer)) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else. /obj/machinery/atmospherics/pipe/layer_manifold/update_overlays() . = ..() @@ -65,10 +65,15 @@ for(var/i in PIPING_LAYER_MIN to PIPING_LAYER_MAX) . += get_attached_image(get_dir(src, machine_check), i, COLOR_VERY_LIGHT_GRAY) return + if(istype(machine_check, /obj/machinery/atmospherics/components/unary/airlock_pump)) + . += get_attached_image(get_dir(src, machine_check), 4, COLOR_BLUE) + //. += get_attached_image(get_dir(src, machine_check), 2, COLOR_RED) // Only the distro node is added currently to the pipenet, it doesn't merge the pipenet with the waste node + return . += get_attached_image(get_dir(src, machine_check), machine_check.piping_layer, machine_check.pipe_color) /obj/machinery/atmospherics/pipe/layer_manifold/proc/get_attached_image(p_dir, p_layer, p_color) - var/mutable_appearance/muta = mutable_appearance('icons/obj/pipes_n_cables/layer_manifold_underlays.dmi', "intact_[p_dir]_[p_layer]", layer = layer - 0.01, appearance_flags = RESET_COLOR) + var/working_layer = FLOAT_LAYER - HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? 1 : 0.01 + var/mutable_appearance/muta = mutable_appearance('icons/obj/pipes_n_cables/layer_manifold_underlays.dmi', "intact_[p_dir]_[p_layer]", layer = working_layer, appearance_flags = RESET_COLOR) muta.color = p_color return muta diff --git a/code/modules/atmospherics/machinery/pipes/mapping.dm b/code/modules/atmospherics/machinery/pipes/mapping.dm index 3ba647ace8ab4..3615147e4d1bf 100644 --- a/code/modules/atmospherics/machinery/pipes/mapping.dm +++ b/code/modules/atmospherics/machinery/pipes/mapping.dm @@ -1,6 +1,22 @@ //Colored pipes, use these for mapping +#define HELPER_PIPING_LAYER(Fulltype) \ + ##Fulltype/layer1 { \ + piping_layer = 1; \ + } \ + ##Fulltype/layer2 { \ + piping_layer = 2; \ + } \ + ##Fulltype/layer4 { \ + piping_layer = 4; \ + } \ + ##Fulltype/layer5 { \ + piping_layer = 5; \ + } + #define HELPER_PARTIAL(Fulltype, Iconbase, Color) \ + HELPER_PIPING_LAYER(Fulltype/visible) \ + HELPER_PIPING_LAYER(Fulltype/hidden) \ ##Fulltype { \ pipe_color = Color; \ color = Color; \ @@ -10,38 +26,30 @@ layer = GAS_PIPE_VISIBLE_LAYER; \ } \ ##Fulltype/visible/layer2 { \ - piping_layer = 2; \ icon_state = Iconbase + "-2"; \ } \ ##Fulltype/visible/layer4 { \ - piping_layer = 4; \ icon_state = Iconbase + "-4"; \ } \ ##Fulltype/visible/layer1 { \ - piping_layer = 1; \ icon_state = Iconbase + "-1"; \ } \ ##Fulltype/visible/layer5 { \ - piping_layer = 5; \ icon_state = Iconbase + "-5"; \ } \ ##Fulltype/hidden { \ hide = TRUE; \ } \ ##Fulltype/hidden/layer2 { \ - piping_layer = 2; \ icon_state = Iconbase + "-2"; \ } \ ##Fulltype/hidden/layer4 { \ - piping_layer = 4; \ icon_state = Iconbase + "-4"; \ } \ ##Fulltype/hidden/layer1 { \ - piping_layer = 1; \ icon_state = Iconbase + "-1"; \ } \ ##Fulltype/hidden/layer5 { \ - piping_layer = 5; \ icon_state = Iconbase + "-5"; \ } @@ -89,3 +97,4 @@ HELPER_NAMED(supply, "air supply pipe", COLOR_BLUE) #undef HELPER #undef HELPER_PARTIAL_NAMED #undef HELPER_PARTIAL +#undef HELPER_PIPING_LAYER diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index 40258db903ff0..230edc9a897f0 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -139,4 +139,4 @@ current_node.update_icon() /obj/machinery/atmospherics/pipe/update_layer() - layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.0001) + layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER : initial(layer)) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.0001) diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm index 22d9f532efcbd..6f6a25b47c8cd 100644 --- a/code/modules/awaymissions/away_props.dm +++ b/code/modules/awaymissions/away_props.dm @@ -56,6 +56,7 @@ name = "pit grate" icon = 'icons/obj/smooth_structures/lattice.dmi' icon_state = "lattice-255" + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE anchored = TRUE obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP @@ -95,6 +96,7 @@ talpha = 255 obj_flags |= BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP SET_PLANE_IMPLICIT(src, ABOVE_LIGHTING_PLANE) //What matters it's one above openspace, so our animation is not dependant on what's there. Up to revision with 513 + layer = ABOVE_NORMAL_TURF_LAYER animate(src,alpha = talpha,time = 10) addtimer(CALLBACK(src, PROC_REF(reset_plane)), 1 SECONDS) if(hidden) @@ -106,6 +108,7 @@ /obj/structure/pitgrate/proc/reset_plane() SET_PLANE_IMPLICIT(src, FLOOR_PLANE) + layer = ABOVE_OPEN_TURF_LAYER /obj/structure/pitgrate/Destroy() if(hidden) diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm index 4274893e99892..342150797e475 100644 --- a/code/modules/bitrunning/components/avatar_connection.dm +++ b/code/modules/bitrunning/components/avatar_connection.dm @@ -60,8 +60,9 @@ var/datum/action/avatar_domain_info/action = new(help_datum) action.Grant(avatar) - var/client/our_client = avatar.client - var/alias = our_client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases) + //var/client/our_client = avatar.client // BUBBER EDIT + var/alias = null // BUBBER EDIT - removes random aliases - original: var/alias = our_client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases) + if(alias && avatar.real_name != alias) avatar.fully_replace_character_name(avatar.real_name, alias) diff --git a/code/modules/bitrunning/server/obj_generation.dm b/code/modules/bitrunning/server/obj_generation.dm index 4f54f739e4e8e..d34305f3dc6d1 100644 --- a/code/modules/bitrunning/server/obj_generation.dm +++ b/code/modules/bitrunning/server/obj_generation.dm @@ -38,7 +38,7 @@ /// Generates a new avatar for the bitrunner. -/obj/machinery/quantum_server/proc/generate_avatar(turf/destination, datum/outfit/netsuit, datum/preferences/prefs, load_loadout = FALSE) // BUBBER EDIT - Prefs argument +/obj/machinery/quantum_server/proc/generate_avatar(turf/destination, datum/outfit/netsuit, datum/preferences/prefs, load_loadout = FALSE) // BUBBER EDIT - Prefs and loadout argument var/mob/living/carbon/human/avatar = new(destination) // BUBBER EDIT BEGIN - PREFS! @@ -82,6 +82,9 @@ new /obj/item/flashlight, ) + if(load_loadout) + avatar.equip_outfit_and_loadout(new /datum/outfit(), prefs) // BUBBER EDIT - LOADOUTS + var/obj/item/card/id/outfit_id = avatar.wear_id if(outfit_id) outfit_id.registered_account = new() diff --git a/code/modules/cards/singlecard.dm b/code/modules/cards/singlecard.dm index 300523254ed7d..5f2c6e37f387a 100644 --- a/code/modules/cards/singlecard.dm +++ b/code/modules/cards/singlecard.dm @@ -170,10 +170,10 @@ user.balloon_alert_to_viewers("deals a card") var/obj/item/toy/cards/cardhand/new_cardhand = new (drop_location()) - new_cardhand.insert(src) - new_cardhand.insert(card) new_cardhand.pixel_x = pixel_x new_cardhand.pixel_y = pixel_y + new_cardhand.insert(src) + new_cardhand.insert(card) if(!isturf(loc)) // make a cardhand in our active hand user.temporarilyRemoveItemFromInventory(src, TRUE) diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index de84a263597da..8581b8744b674 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -181,7 +181,7 @@ var/the_toy for(var/i in 1 to num_contained) if(prob(50)) - the_toy = pick_weight(GLOB.arcade_prize_pool) + the_toy = pick_weight_recursive(GLOB.arcade_prize_pool) //BUBBERSTATION CHANGE: USES PICK_WEIGHT_RECURSIVE else the_toy = pick(subtypesof(/obj/item/toy/plush)) new the_toy(C) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index cbd6ec3b360f9..f6d477afbb923 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -353,7 +353,7 @@ how_cool_are_your_threads += "" . += how_cool_are_your_threads.Join() - if(get_armor().has_any_armor() || (flags_cover & (HEADCOVERSMOUTH|PEPPERPROOF))) + if(get_armor().has_any_armor() || (flags_cover & (HEADCOVERSMOUTH|PEPPERPROOF)) || (clothing_flags & STOPSPRESSUREDAMAGE) || (visor_flags & STOPSPRESSUREDAMAGE)) . += span_notice("OOC: Click here to see its protection classes.") // SKYRAT EDIT ORIGINAL: ("It has a tag listing its protection classes.") /obj/item/clothing/Topic(href, href_list) @@ -393,6 +393,20 @@ readout += "COVERAGE" readout += "It will block [english_list(things_blocked)]." + if(clothing_flags & STOPSPRESSUREDAMAGE || visor_flags & STOPSPRESSUREDAMAGE) + var/list/parts_covered = list() + var/output_string = "It" + if(!(clothing_flags & STOPSPRESSUREDAMAGE)) + output_string = "When sealed, it" + if(body_parts_covered & HEAD) + parts_covered += "head" + if(body_parts_covered & CHEST) + parts_covered += "torso" + if(length(parts_covered)) // Just in case someone makes spaceproof gloves or something + readout += "[output_string] will protect the wearer's [english_list(parts_covered)] from [span_tooltip("The extremely low pressure is the biggest danger posed by the vacuum of space.", "low pressure")]." + + if(min_cold_protection_temperature == SPACE_SUIT_MIN_TEMP_PROTECT) + readout += "It will insulate the wearer from [span_tooltip("While not as dangerous as the lack of pressure, the extremely low temperature of space is also a hazard.", "the cold of space")]." if(!length(readout)) readout += "No armor or durability information available." diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm index ec5ee81741fcc..2768656d5e6f9 100644 --- a/code/modules/clothing/head/costume.dm +++ b/code/modules/clothing/head/costume.dm @@ -156,10 +156,8 @@ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' //Grandfathered in from the wallframe for status displays. righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' clothing_flags = SNUG_FIT - flash_protect = FLASH_PROTECTION_SENSITIVE - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT - var/has_fov = TRUE /datum/armor/costume_bronze melee = 5 @@ -169,15 +167,6 @@ fire = 20 acid = 20 -/obj/item/clothing/head/costume/tv_head/Initialize(mapload) - . = ..() - if(has_fov) - AddComponent(/datum/component/clothing_fov_visor, FOV_90_DEGREES) - -/obj/item/clothing/head/costume/tv_head/fov_less - desc = "A mysterious headgear made from the hollowed out remains of a status display. How very retro-retro-futuristic of you. It's very easy to see out of this one." - has_fov = FALSE - /obj/item/clothing/head/costume/irs name = "internal revenue service cap" desc = "Even in space, you can't avoid the tax collectors." diff --git a/code/modules/clothing/head/frenchberet.dm b/code/modules/clothing/head/frenchberet.dm index 40d8abc5b62ce..de63c6fddfdd1 100644 --- a/code/modules/clothing/head/frenchberet.dm +++ b/code/modules/clothing/head/frenchberet.dm @@ -6,37 +6,17 @@ greyscale_config_worn = /datum/greyscale_config/beret/worn greyscale_colors = "#972A2A" +/obj/item/clothing/head/frenchberet/Initialize(mapload) + . = ..() + AddComponent(/datum/component/speechmod, replacements = strings("french_replacement.json", "french"), end_string = list(" Honh honh honh!"," Honh!"," Zut Alors!"), end_string_chance = 3, slots = ITEM_SLOT_HEAD) /obj/item/clothing/head/frenchberet/equipped(mob/M, slot) . = ..() if (slot & ITEM_SLOT_HEAD) - RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) ADD_TRAIT(M, TRAIT_GARLIC_BREATH, type) else - UnregisterSignal(M, COMSIG_MOB_SAY) REMOVE_TRAIT(M, TRAIT_GARLIC_BREATH, type) /obj/item/clothing/head/frenchberet/dropped(mob/M) . = ..() - UnregisterSignal(M, COMSIG_MOB_SAY) REMOVE_TRAIT(M, TRAIT_GARLIC_BREATH, type) - -/obj/item/clothing/head/frenchberet/proc/handle_speech(datum/source, list/speech_args) - SIGNAL_HANDLER - var/message = speech_args[SPEECH_MESSAGE] - if(message[1] != "*") - message = " [message]" - var/list/french_words = strings("french_replacement.json", "french") - - for(var/key in french_words) - var/value = french_words[key] - if(islist(value)) - value = pick(value) - - message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]") - message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]") - message = replacetextEx(message, " [key]", " [value]") - - if(prob(3)) - message += pick(" Honh honh honh!"," Honh!"," Zut Alors!") - speech_args[SPEECH_MESSAGE] = trim(message) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 5ee1e246c5726..b35b51891bbb4 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -123,7 +123,7 @@ flash_protect = FLASH_PROTECTION_WELDER tint = 2 flags_inv = HIDEEYES | HIDEFACE | HIDESNOUT - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT visor_flags_inv = HIDEEYES | HIDEFACE | HIDESNOUT visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 15929ac5f0673..d9258b8c7ddca 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -53,11 +53,12 @@ /obj/item/clothing/head/bio_hood/plague name = "plague doctor's hat" - desc = "These were once used by plague doctors. Will protect you from exposure to the Pestilence." + desc = "These were once used by plague doctors. This hat will only slightly protect you from exposure to the Pestilence." icon_state = "plaguedoctor" - clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | SNUG_FIT | STACKABLE_HELMET_EXEMPT armor_type = /datum/armor/bio_hood_plague flags_inv = NONE + clothing_flags = SNUG_FIT + flags_cover = NONE /datum/armor/bio_hood_plague bio = 100 diff --git a/code/modules/clothing/head/welding.dm b/code/modules/clothing/head/welding.dm index cb785447174f7..e3f014875dde4 100644 --- a/code/modules/clothing/head/welding.dm +++ b/code/modules/clothing/head/welding.dm @@ -2,7 +2,7 @@ name = "welding helmet" desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." icon_state = "welding" - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF inhand_icon_state = "welding" lefthand_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi' diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index c1d29d65c8641..5255b758b6faf 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -8,7 +8,6 @@ strip_delay = 40 equip_delay_other = 40 visor_vars_to_toggle = NONE - var/modifies_speech = FALSE var/adjusted_flags = null ///Did we install a filtering cloth? var/has_filter = FALSE @@ -25,31 +24,6 @@ var/status = !(clothing_flags & VOICEBOX_DISABLED) to_chat(user, span_notice("You turn the voice box in [src] [status ? "on" : "off"].")) -/obj/item/clothing/mask/equipped(mob/M, slot) - . = ..() - if ((slot & ITEM_SLOT_MASK) && modifies_speech) - RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - else - UnregisterSignal(M, COMSIG_MOB_SAY) - -/obj/item/clothing/mask/dropped(mob/M) - . = ..() - UnregisterSignal(M, COMSIG_MOB_SAY) - -/obj/item/clothing/mask/vv_edit_var(vname, vval) - if(vname == NAMEOF(src, modifies_speech) && ismob(loc)) - var/mob/M = loc - if(M.get_item_by_slot(ITEM_SLOT_MASK) == src) - if(vval) - if(!modifies_speech) - RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) - else if(modifies_speech) - UnregisterSignal(M, COMSIG_MOB_SAY) - return ..() - -/obj/item/clothing/mask/proc/handle_speech() - SIGNAL_HANDLER - /obj/item/clothing/mask/worn_overlays(mutable_appearance/standing, isinhands = FALSE) . = ..() if(isinhands) diff --git a/code/modules/clothing/masks/animal_masks.dm b/code/modules/clothing/masks/animal_masks.dm index 5df5c6738d8e5..05e5888168e12 100644 --- a/code/modules/clothing/masks/animal_masks.dm +++ b/code/modules/clothing/masks/animal_masks.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( /obj/item/clothing/mask/animal w_class = WEIGHT_CLASS_SMALL clothing_flags = VOICEBOX_TOGGLABLE - modifies_speech = TRUE + var/modifies_speech = TRUE flags_cover = MASKCOVERSMOUTH var/animal_type ///what kind of animal the masks represents. used for automatic name and description generation. @@ -32,6 +32,17 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( if(cursed) make_cursed() +/obj/item/clothing/mask/animal/equipped(mob/M, slot) + . = ..() + if ((slot & ITEM_SLOT_MASK) && modifies_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + else + UnregisterSignal(M, COMSIG_MOB_SAY) + +/obj/item/clothing/mask/animal/dropped(mob/M) + . = ..() + UnregisterSignal(M, COMSIG_MOB_SAY) + /obj/item/clothing/mask/animal/vv_edit_var(vname, vval) if(vname == NAMEOF(src, cursed)) if(vval) @@ -39,6 +50,14 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( make_cursed() else if(cursed) clear_curse() + if(vname == NAMEOF(src, modifies_speech) && ismob(loc)) + var/mob/M = loc + if(M.get_item_by_slot(ITEM_SLOT_MASK) == src) + if(vval) + if(!modifies_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + else if(modifies_speech) + UnregisterSignal(M, COMSIG_MOB_SAY) return ..() /obj/item/clothing/mask/animal/examine(mob/user) @@ -90,7 +109,9 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( UnregisterSignal(M, COMSIG_MOB_SAY) M.update_worn_mask() -/obj/item/clothing/mask/animal/handle_speech(datum/source, list/speech_args) +/obj/item/clothing/mask/animal/proc/handle_speech(datum/source, list/speech_args) + SIGNAL_HANDLER + if(clothing_flags & VOICEBOX_DISABLED) return if(!modifies_speech || !LAZYLEN(animal_sounds)) diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 468b1272f8604..2e75cebf5d98f 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -34,31 +34,10 @@ inhand_icon_state = null flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_SMALL - modifies_speech = TRUE -/obj/item/clothing/mask/luchador/handle_speech(datum/source, list/speech_args) - var/message = speech_args[SPEECH_MESSAGE] - if(message[1] != "*") - message = replacetext(message, "captain", "CAPITÁN") - message = replacetext(message, "station", "ESTACIÓN") - message = replacetext(message, "sir", "SEÑOR") - message = replacetext(message, "the ", "el ") - message = replacetext(message, "my ", "mi ") - message = replacetext(message, "is ", "es ") - message = replacetext(message, "it's", "es") - message = replacetext(message, "friend", "amigo") - message = replacetext(message, "buddy", "amigo") - message = replacetext(message, "hello", "hola") - message = replacetext(message, " hot", " caliente") - message = replacetext(message, " very ", " muy ") - message = replacetext(message, "sword", "espada") - message = replacetext(message, "library", "biblioteca") - message = replacetext(message, "traitor", "traidor") - message = replacetext(message, "wizard", "mago") - message = uppertext(message) //Things end up looking better this way (no mixed cases), and it fits the macho wrestler image. - if(prob(25)) - message += " OLE!" - speech_args[SPEECH_MESSAGE] = message +/obj/item/clothing/mask/luchador/Initialize(mapload) + . = ..() + AddComponent(/datum/component/speechmod, replacements = strings("luchador_replacement.json", "luchador"), end_string = " OLE!", end_string_chance = 25, uppercase = TRUE, slots = ITEM_SLOT_MASK) /obj/item/clothing/mask/luchador/tecnicos name = "Tecnicos Mask" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 4aed628f4d356..7de1868656683 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -250,12 +250,12 @@ GLOBAL_LIST_INIT(clown_mask_options, list( //Plague Dr suit can be found in clothing/suits/bio.dm /obj/item/clothing/mask/gas/plaguedoctor name = "plague doctor mask" - desc = "A modernised version of the classic design, this mask will not only filter out toxins but it can also be connected to an air supply." + desc = "A modernised version of the classic design, this mask will not only protect you from exposure to the Pestilence but it can also be connected to an air supply." icon_state = "plaguedoctor" flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT|HIDEHAIR inhand_icon_state = "gas_mask" has_fov = FALSE - flags_cover = MASKCOVERSEYES + clothing_flags = BLOCK_GAS_SMOKE_EFFECT /obj/item/clothing/mask/gas/syndicate name = "syndicate mask" diff --git a/code/modules/clothing/masks/gondola.dm b/code/modules/clothing/masks/gondola.dm index 7a8283293ded2..bfaae3cb3f314 100644 --- a/code/modules/clothing/masks/gondola.dm +++ b/code/modules/clothing/masks/gondola.dm @@ -5,18 +5,7 @@ inhand_icon_state = null flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_SMALL - modifies_speech = TRUE -/obj/item/clothing/mask/gondola/handle_speech(datum/source, list/speech_args) - var/message = speech_args[SPEECH_MESSAGE] - if(message[1] != "*") - message = " [message]" - var/list/spurdo_words = strings("spurdo_replacement.json", "spurdo") - for(var/key in spurdo_words) - var/value = spurdo_words[key] - if(islist(value)) - value = pick(value) - message = replacetextEx(message,regex(uppertext(key),"g"), "[uppertext(value)]") - message = replacetextEx(message,regex(capitalize(key),"g"), "[capitalize(value)]") - message = replacetextEx(message,regex(key,"g"), "[value]") - speech_args[SPEECH_MESSAGE] = trim(message) +/obj/item/clothing/mask/gondola/Initialize(mapload) + . = ..() + AddComponent(/datum/component/speechmod, replacements = strings("spurdo_replacement.json", "spurdo"), slots = ITEM_SLOT_MASK) diff --git a/code/modules/clothing/masks/moustache.dm b/code/modules/clothing/masks/moustache.dm index aaf59be51e4fd..5b71e7a426090 100644 --- a/code/modules/clothing/masks/moustache.dm +++ b/code/modules/clothing/masks/moustache.dm @@ -10,23 +10,7 @@ /obj/item/clothing/mask/fakemoustache/italian name = "italian moustache" desc = "Made from authentic Italian moustache hairs. Gives the wearer an irresistable urge to gesticulate wildly." - modifies_speech = TRUE -/obj/item/clothing/mask/fakemoustache/italian/handle_speech(datum/source, list/speech_args) - var/message = speech_args[SPEECH_MESSAGE] - if(message[1] != "*") - message = " [message]" - var/list/italian_words = strings("italian_replacement.json", "italian") - - for(var/key in italian_words) - var/value = italian_words[key] - if(islist(value)) - value = pick(value) - - message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]") - message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]") - message = replacetextEx(message, " [key]", " [value]") - - if(prob(3)) - message += pick(" Ravioli, ravioli, give me the formuoli!"," Mamma-mia!"," Mamma-mia! That's a spicy meat-ball!", " La la la la la funiculi funicula!") - speech_args[SPEECH_MESSAGE] = trim(message) +/obj/item/clothing/mask/fakemoustache/italian/Initialize(mapload) + . = ..() + AddComponent(/datum/component/speechmod, replacements = strings("italian_replacement.json", "italian"), end_string = list(" Ravioli, ravioli, give me the formuoli!"," Mamma-mia!"," Mamma-mia! That's a spicy meat-ball!", " La la la la la funiculi funicula!"), end_string_chance = 3, slots = ITEM_SLOT_MASK) diff --git a/code/modules/clothing/spacesuits/pirate.dm b/code/modules/clothing/spacesuits/pirate.dm index 946c0c2b66fdd..ca041d68d036f 100644 --- a/code/modules/clothing/spacesuits/pirate.dm +++ b/code/modules/clothing/spacesuits/pirate.dm @@ -30,3 +30,15 @@ armor_type = /datum/armor/space_pirate strip_delay = 40 equip_delay_other = 20 + +/obj/item/clothing/head/helmet/space/pirate/tophat + name = "designer pirate helmet" + desc = "A modified EVA helmet with a five-thousand credit Lizzy Vuitton hat affixed to the top, proving that working in deep space is no excuse for being poor." + icon_state = "spacetophat" + +/obj/item/clothing/suit/space/pirate/silverscale + name = "designer pirate suit" + desc = "A specially-made Cybersun branded space suit; the fine plastisilk exterior is woven from the coccons of black-market Lümlan mothroaches \ + and the trim is lined with the ivory of the critically endagered Zanzibarian dwarf elephant. Baby seal leather boots sold seperately." + inhand_icon_state = "syndicate-black" + icon_state = "syndicate-black-white" diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index 67702582ff857..9cca1cfc3af08 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -28,6 +28,7 @@ GLOBAL_LIST_INIT(syndicate_space_suits_to_helmets,list( /obj/item/clothing/suit/space/syndicate/black/blue = /obj/item/clothing/head/helmet/space/syndicate/black/blue, /obj/item/clothing/suit/space/syndicate/black/orange = /obj/item/clothing/head/helmet/space/syndicate/black/orange, /obj/item/clothing/suit/space/syndicate/black/red = /obj/item/clothing/head/helmet/space/syndicate/black/red, + /obj/item/clothing/suit/space/syndicate/black/white = /obj/item/clothing/head/helmet/space/syndicate/black, /obj/item/clothing/suit/space/syndicate/black/med = /obj/item/clothing/head/helmet/space/syndicate/black/med, /obj/item/clothing/suit/space/syndicate/black/engie = /obj/item/clothing/head/helmet/space/syndicate/black/engie, )) @@ -132,6 +133,13 @@ GLOBAL_LIST_INIT(syndicate_space_suits_to_helmets,list( inhand_icon_state = "syndicate-black-blue" helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black/blue +//Black and white syndicate space suit without the medical iconography +/obj/item/clothing/suit/space/syndicate/black/white + name = "black and white space suit" + icon_state = "syndicate-black-white" + inhand_icon_state = "syndicate-black" + helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black + //Black medical syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black/med diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index 01c1e9d645160..b86f7845cf3d7 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -49,6 +49,7 @@ /obj/item/clothing/suit/hooded/wintercoat/click_alt(mob/user) zipped = !zipped + playsound(src, 'sound/items/zip_up.ogg', 30, TRUE, -3) worn_icon_state = "[initial(icon_state)][zipped ? "_t" : ""]" balloon_alert(user, "[zipped ? "" : "un"]zipped") diff --git a/code/modules/deathmatch/deathmatch_controller.dm b/code/modules/deathmatch/deathmatch_controller.dm index 45b5f087c5bb5..0b098871624dc 100644 --- a/code/modules/deathmatch/deathmatch_controller.dm +++ b/code/modules/deathmatch/deathmatch_controller.dm @@ -76,6 +76,9 @@ return switch (action) if ("host") + if(!(GLOB.ghost_role_flags & GHOSTROLE_MINIGAME)) + tgui_alert(usr, "Deathmatch has been temporarily disabled by admins.") + return if (lobbies[usr.ckey]) return if(!SSticker.HasRoundStarted()) @@ -84,6 +87,9 @@ ui.close() create_new_lobby(usr) if ("join") + if(!(GLOB.ghost_role_flags & GHOSTROLE_MINIGAME)) + tgui_alert(usr, "Deathmatch has been temporarily disabled by admins.") + return if (!lobbies[params["id"]]) return var/datum/deathmatch_lobby/playing_lobby = find_lobby_by_user(usr.ckey) diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm index f081c81b98582..5dbbd1d9795fd 100644 --- a/code/modules/events/space_vines/vine_mutations.dm +++ b/code/modules/events/space_vines/vine_mutations.dm @@ -335,6 +335,7 @@ //This specific mutation only covers floors instead of structures, items, mobs and cant tangle mobs /datum/spacevine_mutation/timid/on_birth(obj/structure/spacevine/holder) SET_PLANE_IMPLICIT(holder, FLOOR_PLANE) + holder.layer = ABOVE_OPEN_TURF_LAYER holder.light_state = PASS_LIGHT holder.can_tangle = FALSE return ..() diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm index 95f4986d1b4ed..244145221ea3b 100644 --- a/code/modules/experisci/experiment/experiments.dm +++ b/code/modules/experisci/experiment/experiments.dm @@ -334,6 +334,7 @@ name = "Exosuit Materials: Stress Failure Test" description = "Your exosuit fabricators allow for rapid production on a small scale, but the structural integrity of created parts is inferior to more traditional means." exp_tag = "Scan" + total_requirement = 2 possible_types = list(/obj/vehicle/sealed/mecha) ///Damage percent that each mech needs to be at for a scan to work. var/damage_percent diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm index 67804cba9fcd1..b03233e76a724 100644 --- a/code/modules/fishing/fish/fish_traits.dm +++ b/code/modules/fishing/fish/fish_traits.dm @@ -269,7 +269,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list( /datum/fish_trait/toxic/apply_to_fish(obj/item/fish/fish) RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_toxin)) RegisterSignal(fish, COMSIG_FISH_EATEN_BY_OTHER_FISH, PROC_REF(on_eaten)) - LAZYSET(fish.grind_results, /datum/reagent/toxin/tetrodotoxin, 0.5) + LAZYSET(fish.grind_results, /datum/reagent/toxin/tetrodotoxin, 2.5) /datum/fish_trait/toxic/proc/add_toxin(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results) var/amount = source.grind_results[ /datum/reagent/toxin/tetrodotoxin] / length(results) diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm index 3c94ff8277d94..059a532072204 100644 --- a/code/modules/fishing/sources/_fish_source.dm +++ b/code/modules/fishing/sources/_fish_source.dm @@ -310,7 +310,7 @@ GLOBAL_LIST(fishing_property_cache) highest_fish_weight = fish_weight for(var/fish in collected_fish_weights) - var/difference = collected_fish_weights[fish] - highest_fish_weight + var/difference = highest_fish_weight - collected_fish_weights[fish] if(!difference) continue final_table[fish] += round(difference**leveling_exponent, 1) diff --git a/code/modules/food_and_drinks/machinery/icecream_vat.dm b/code/modules/food_and_drinks/machinery/icecream_vat.dm index eba5ff63f3f8c..355601693b9d2 100644 --- a/code/modules/food_and_drinks/machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/machinery/icecream_vat.dm @@ -75,13 +75,15 @@ RegisterSignal(src, COMSIG_ATOM_REAGENT_EXAMINE, PROC_REF(allow_reagent_scan)) - create_reagents(300, NO_REACT|TRANSPARENT) + var/ice_cream_day = check_holidays(ICE_CREAM_DAY) //ice cream vats are more "robust" on this holiday + + create_reagents(ice_cream_day ? 400 : 300, NO_REACT|TRANSPARENT) reagents.chem_temp = T0C //So ice doesn't melt register_context() if(preinstall_reagents) for(var/reagent in icecream_vat_reagents) - reagents.add_reagent(reagent, icecream_vat_reagents[reagent], reagtemp = T0C) + reagents.add_reagent(reagent, icecream_vat_reagents[reagent] * (ice_cream_day ? 2.5 : 1), reagtemp = T0C) /obj/machinery/icecream_vat/Exited(atom/movable/gone, direction) . = ..() @@ -95,6 +97,8 @@ context[SCREENTIP_CONTEXT_RMB] = "Transfer beaker reagents" else if(istype(held_item, /obj/item/food/icecream)) context[SCREENTIP_CONTEXT_LMB] = "Take scoop of [selected_flavour] ice cream" + else if(istype(held_item, /obj/item/kitchen/spoon) || istype(held_item, /obj/item/kitchen/spoon/soup_ladle)) + context[SCREENTIP_CONTEXT_RMB] = "Spill reagent" return CONTEXTUAL_SCREENTIP_SET switch(vat_mode) @@ -106,10 +110,20 @@ context[SCREENTIP_CONTEXT_RMB] = "Change mode to flavors" return CONTEXTUAL_SCREENTIP_SET -/obj/machinery/icecream_vat/attackby(obj/item/reagent_containers/beaker, mob/user, params) +/obj/machinery/icecream_vat/examine(mob/user) + . = ..() + . += "You can use a [EXAMINE_HINT("spoon")] or [EXAMINE_HINT("soup ladle")] to spill reagents." + +/obj/machinery/icecream_vat/attackby(obj/item/weapon, mob/user, params) . = ..() if(.) return + + if(istype(weapon, /obj/item/kitchen/spoon) || istype(weapon, /obj/item/kitchen/spoon/soup_ladle)) + spill_reagents(user) + return TRUE + + var/obj/item/reagent_containers/beaker = weapon if(!istype(beaker) || !beaker.reagents || (beaker.item_flags & ABSTRACT) || !beaker.is_open_container()) return @@ -204,6 +218,14 @@ if(cone) make_cone(user, choice, cone.ingredients) +///Lets the user select a reagent in the vat to spill out. +/obj/machinery/icecream_vat/proc/spill_reagents(mob/living/user) + var/datum/reagent/reagent_to_remove = tgui_input_list(user, "Select a reagent to purge from the vat.", "Remove reagent", reagents.reagent_list, ui_state = GLOB.conscious_state) + if(isnull(reagent_to_remove) || !user.can_perform_action(src, action_bitflags = ALLOW_RESTING)) + return + balloon_alert(user, "spilled [reagent_to_remove.name]") + reagents.remove_reagent(reagent_to_remove.type, reagent_to_remove.volume) + /obj/machinery/icecream_vat/proc/make_ice_cream_color(datum/ice_cream_flavour/flavor) if(!flavor.color) return diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm index 68095fcd4af1d..03b99f49ef734 100644 --- a/code/modules/food_and_drinks/machinery/processor.dm +++ b/code/modules/food_and_drinks/machinery/processor.dm @@ -238,8 +238,10 @@ processed_slime.forceMove(drop_location()) processed_slime.balloon_alert_to_viewers("crawls free") return + var/core_count = processed_slime.cores - for(var/i in 1 to (core_count+rating_amount-1)) + var/extra_cores = rating_amount - 1 // 0-3 bonus cores above what slime already has with upgraded parts + for(var/i in 1 to (core_count + extra_cores)) var/atom/movable/item = new processed_slime.slime_type.core_type(drop_location()) adjust_item_drop_location(item) SSblackbox.record_feedback("tally", "slime_core_harvested", 1, processed_slime.slime_type.colour) diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm index 9c99a5811a3d3..c9011ad8c8a28 100644 --- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm +++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm @@ -47,6 +47,10 @@ /datum/customer_data/New() . = ..() name_prefixes = world.file2list(prefix_file) + if(check_holidays(ICE_CREAM_DAY)) ///customers are more likely to order ice cream on this holiday + var/list/orderable_restaurant = orderable_objects[VENUE_RESTAURANT] + if(orderable_restaurant?[/datum/custom_order/icecream]) + orderable_restaurant[/datum/custom_order/icecream] *= 3 /// Can this customer be chosen for this venue? /datum/customer_data/proc/can_use(datum/venue/venue) diff --git a/code/modules/hallucination/body.dm b/code/modules/hallucination/body.dm index 2d017f969679d..8cd34cfcd4071 100644 --- a/code/modules/hallucination/body.dm +++ b/code/modules/hallucination/body.dm @@ -10,7 +10,7 @@ /// Whether we apply the floating anim to the body var/body_floats = FALSE /// The layer this body will be drawn on, in case we want to bypass lighting - var/body_layer = TURF_LAYER + var/body_layer = LOW_FLOOR_LAYER /// if TRUE, spawns the body under the hallucinator instead of somewhere in view var/spawn_under_hallucinator = FALSE diff --git a/code/modules/hallucination/bubblegum_attack.dm b/code/modules/hallucination/bubblegum_attack.dm index 5ee39ed8e8649..529d67dcd3551 100644 --- a/code/modules/hallucination/bubblegum_attack.dm +++ b/code/modules/hallucination/bubblegum_attack.dm @@ -36,7 +36,7 @@ if(hallucinator.client) - fake_broken_wall = image('icons/turf/floors.dmi', wall_source, "plating", layer = TURF_LAYER) + fake_broken_wall = image('icons/turf/floors.dmi', wall_source, "plating", layer = LOW_FLOOR_LAYER) SET_PLANE_EXPLICIT(fake_broken_wall, FLOOR_PLANE, wall_source) fake_broken_wall.override = TRUE fake_rune = image('icons/effects/96x96.dmi', target_landing_image_turf, "landing", layer = ABOVE_OPEN_TURF_LAYER) diff --git a/code/modules/hallucination/hazard.dm b/code/modules/hallucination/hazard.dm index 1dfdfd23970e7..34bcee62f6a87 100644 --- a/code/modules/hallucination/hazard.dm +++ b/code/modules/hallucination/hazard.dm @@ -29,7 +29,8 @@ /// These hallucination effects cause side effects when the hallucinator walks into them. /obj/effect/client_image_holder/hallucination/danger - image_layer = TURF_LAYER + image_layer = LOW_FLOOR_LAYER + image_plane = FLOOR_PLANE /obj/effect/client_image_holder/hallucination/danger/Initialize(mapload, list/mobs_which_see_us, datum/hallucination/parent) . = ..() diff --git a/code/modules/holiday/nth_week.dm b/code/modules/holiday/nth_week.dm index ef4815de06646..6786e2ef7ce66 100644 --- a/code/modules/holiday/nth_week.dm +++ b/code/modules/holiday/nth_week.dm @@ -84,3 +84,12 @@ /datum/holiday/nth_week/moth/getStationPrefix() return pick("Mothball","Lepidopteran","Lightbulb","Moth","Giant Atlas","Twin-spotted Sphynx","Madagascan Sunset","Luna","Death's Head","Emperor Gum","Polyphenus","Oleander Hawk","Io","Rosy Maple","Cecropia","Noctuidae","Giant Leopard","Dysphania Militaris","Garden Tiger") + +/datum/holiday/nth_week/ice_cream + name = ICE_CREAM_DAY + begin_week = 3 + begin_month = JULY + begin_weekday = SUNDAY + +/datum/holiday/nth_week/ice_cream/getStationPrefix() + return pick("Ice Cream", "Gelato", "Semifreddo", "Cornuto", "Soft Serve", "Cone", "Ice", "Cream", "I Scream", "Parfait", "Straccciatella", "Sherbet", "Snow", "Affogato", "Mochi", "Tartufo", "Sundae", "Neapolitan") diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index 0eb05fcdc3049..ee62a12b3d0e1 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -127,6 +127,7 @@ desc = "Space-looking floor. Thankfully, the deadly aspects of space are not emulated here." icon = 'icons/turf/space.dmi' icon_state = "space" + layer = SPACE_LAYER plane = PLANE_SPACE /turf/open/floor/holofloor/hyperspace diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 35bf611b506a6..52df09c29cdf8 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -2,8 +2,6 @@ #define MAX_ITEMS_PER_RATING 10 /// How many items are converted per cycle, per rating point of the manipulator used. #define PROCESSED_ITEMS_PER_RATING 5 -/// Starting purity of reagents made in biogenerator -#define BIOGEN_REAGENT_PURITY 0.3 /obj/machinery/biogenerator name = "biogenerator" @@ -571,4 +569,3 @@ #undef MAX_ITEMS_PER_RATING #undef PROCESSED_ITEMS_PER_RATING -#undef BIOGEN_REAGENT_PURITY diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 70c7cc54cedd8..a6cbf990e20ab 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -249,7 +249,7 @@ // So we'll let it leak in, and move the water over. set_recipient_reagents_holder(nutri_reagents) reagents = nutri_reagents - process_request(dir = dir) + process_request(dir = dir, round_robin = FALSE) // Move the leaked water from nutrients to... water var/leaking_water_amount = nutri_reagents.get_reagent_amount(/datum/reagent/water) @@ -267,7 +267,7 @@ process_request( amount = extra_water_to_gather, reagent = /datum/reagent/water, - dir = dir, + dir = dir ) // Now transfer all remaining water in that buffer and clear it out. diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 0b8c28d370f16..fa901e33de1ce 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -588,11 +588,6 @@ player_client.prefs.read_preference(/datum/preference/choiced/species), ) dna.update_dna_identity() - // BUBBER EDIT START - if(get_taur_mode() == STYLE_TAUR_SNAKE) - RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 0.6, -6) - AddElement(/datum/element/footstep, FOOTSTEP_MOB_SNAKE, 15, -6) - // BUBBER EDIT END updateappearance() diff --git a/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm b/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm new file mode 100644 index 0000000000000..a836442eca052 --- /dev/null +++ b/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm @@ -0,0 +1,40 @@ +#define FLIP_STAMINA_COST 19 + +/obj/item/skillchip/matrix_flip + name = "BULLET_DODGER skillchip" + skill_name = "Flip 2 Dodge" + skill_description = "At the cost of stamina, your flips can also be used to dodge incoming projectiles." + skill_icon = FA_ICON_SPINNER + activate_message = span_notice("You feel the urge to flip scenically as if you are the 'Chosen One'.") + deactivate_message = span_notice("The urge to flip goes away.") + +/obj/item/skillchip/matrix_flip/on_activate(mob/living/carbon/user, silent = FALSE) + . = ..() + ADD_TRAIT(user, TRAIT_SLOW_FLIP, SKILLCHIP_TRAIT) + RegisterSignal(user, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip)) + RegisterSignal(user, COMSIG_MOB_PRE_EMOTED, PROC_REF(check_if_we_can_flip)) + +/obj/item/skillchip/matrix_flip/on_deactivate(mob/living/carbon/user, silent=FALSE) + REMOVE_TRAIT(user, TRAIT_SLOW_FLIP, SKILLCHIP_TRAIT) + UnregisterSignal(user, list(COMSIG_MOB_EMOTED("flip"), COMSIG_MOB_PRE_EMOTED)) + return ..() + +///Prevent players from stamcritting from INTENTIONAL flips. 1.4s of bullet immunity isn't worth several secs of stun. +/obj/item/skillchip/matrix_flip/proc/check_if_we_can_flip(mob/living/source, key, params, type_override, intentional, datum/emote/emote) + SIGNAL_HANDLER + if(key != "flip" || !intentional) + return + if((source.maxHealth - (source.getStaminaLoss() + FLIP_STAMINA_COST)) <= source.crit_threshold) + source.balloon_alert(source, "too tired!") + return COMPONENT_CANT_EMOTE + +/obj/item/skillchip/matrix_flip/proc/on_flip(mob/living/source) + SIGNAL_HANDLER + if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)) + return + playsound(source, 'sound/weapons/fwoosh.ogg', 90, FALSE, frequency = 0.7) + ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT) + source.adjustStaminaLoss(FLIP_STAMINA_COST) + addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), FLIP_EMOTE_DURATION * 2) + +#undef FLIP_STAMINA_COST diff --git a/code/modules/library/skill_learning/skillchip.dm b/code/modules/library/skill_learning/skillchip.dm index ae40b84c64be9..cc284b91454aa 100644 --- a/code/modules/library/skill_learning/skillchip.dm +++ b/code/modules/library/skill_learning/skillchip.dm @@ -499,28 +499,3 @@ skill_icon = FA_ICON_DRUMSTICK_BITE activate_message = span_notice("You think of your favourite food and realise that you can rotate its flavour in your mind.") deactivate_message = span_notice("You feel your food-based mind palace crumbling...") - -/obj/item/skillchip/matrix_flip - name = "BULLET_DODGER skillchip" - skill_name = "Flip 2 Dodge" - skill_description = "At the cost of stamina, your flips can also be used to dodge incoming projectiles." - skill_icon = FA_ICON_SPINNER - activate_message = span_notice("You feel the urge to flip scenically as if you are the 'Chosen One'.") - deactivate_message = span_notice("The urge to flip goes away.") - -/obj/item/skillchip/matrix_flip/on_activate(mob/living/carbon/user, silent = FALSE) - . = ..() - RegisterSignal(user, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip)) - -/obj/item/skillchip/matrix_flip/on_deactivate(mob/living/carbon/user, silent=FALSE) - UnregisterSignal(user, COMSIG_MOB_EMOTED("flip")) - return ..() - -/obj/item/skillchip/matrix_flip/proc/on_flip(mob/living/source) - SIGNAL_HANDLER - if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)) - return - playsound(source, 'sound/weapons/fwoosh.ogg', 90, FALSE) - ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT) - source.adjustStaminaLoss(20) - addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), FLIP_EMOTE_DURATION + 0.1 SECONDS) diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index 1a32686aa1929..30c239160e5a6 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -95,6 +95,7 @@ LAZYADD(new_atom_host.light_sources, src) if(ismovable(new_atom_host) && new_atom_host == source_atom) RegisterSignal(new_atom_host, COMSIG_MOVABLE_MOVED, PROC_REF(update_host_lights)) + RegisterSignal(new_atom_host, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT, PROC_REF(force_update)) return TRUE ///remove this light source from old_atom_host's light_sources list, unsetting movement registrations @@ -105,6 +106,7 @@ LAZYREMOVE(old_atom_host.light_sources, src) if(ismovable(old_atom_host) && old_atom_host == source_atom) UnregisterSignal(old_atom_host, COMSIG_MOVABLE_MOVED) + UnregisterSignal(old_atom_host, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT) return TRUE // Yes this doesn't align correctly on anything other than 4 width tabs. diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index 26ebbd1ba4e29..949d9b59b8f30 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -88,6 +88,9 @@ else //If fulltile and opaque, then the whole tile blocks view, no need to continue checking. directional_opacity = ALL_CARDINALS break + else + for(var/atom/movable/content as anything in contents) + SEND_SIGNAL(content, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT) if(. != directional_opacity && (. == ALL_CARDINALS || directional_opacity == ALL_CARDINALS)) reconsider_lights() //The lighting system only cares whether the tile is fully concealed from all directions or not. diff --git a/code/modules/loadout/loadout_items.dm b/code/modules/loadout/loadout_items.dm index 4c7d92324720f..79c8012814ae5 100644 --- a/code/modules/loadout/loadout_items.dm +++ b/code/modules/loadout/loadout_items.dm @@ -83,7 +83,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) if(can_be_greyscale == DONT_GREYSCALE) can_be_greyscale = FALSE - else if(item_path::flags_1 & IS_PLAYER_COLORABLE_1) + else if((item_path::flags_1 & IS_PLAYER_COLORABLE_1) && item_path::greyscale_config && item_path::greyscale_colors) can_be_greyscale = TRUE if(isnull(name)) @@ -297,6 +297,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) renamed = 1 if(renamed) ADD_TRAIT(equipped_item, TRAIT_WAS_RENAMED, "Loadout") + SEND_SIGNAL(equipped_item, COMSIG_NAME_CHANGED) // BUBBER EDIT // SKYRAT EDIT END if(can_be_reskinned && item_details?[INFO_RESKIN]) diff --git a/code/modules/mapfluff/ruins/icemoonruin_code/library.dm b/code/modules/mapfluff/ruins/icemoonruin_code/library.dm index 1de9ce2dc728c..2f3b6381f0484 100644 --- a/code/modules/mapfluff/ruins/icemoonruin_code/library.dm +++ b/code/modules/mapfluff/ruins/icemoonruin_code/library.dm @@ -5,6 +5,18 @@ puzzle_id = "library" open_message = "The door opens with a loud creak." +/obj/machinery/door/puzzle/keycard/library/animation_length(animation) + switch(animation) + if(DOOR_OPENING_ANIMATION) + return 1.2 SECONDS + +/obj/machinery/door/puzzle/keycard/library/animation_segment_delay(animation) + switch(animation) + if(DOOR_OPENING_PASSABLE) + return 1.0 SECONDS + if(DOOR_OPENING_FINISHED) + return 1.2 SECONDS + /obj/item/keycard/library name = "golden key" desc = "A dull, golden key." diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm index 1c0a5392fb9b2..57f20abb1aa19 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm @@ -78,15 +78,15 @@ desc = /obj/machinery/atmospherics/components/unary/vent_scrubber::desc icon = /obj/machinery/atmospherics/components/unary/vent_scrubber::icon layer = /obj/machinery/atmospherics/components/unary/vent_scrubber::layer - plane = FLOOR_PLANE + plane = /obj/machinery/atmospherics/components/unary/vent_scrubber::plane icon_state = "scrub_on" /obj/structure/fluff/fake_vent name = /obj/machinery/atmospherics/components/unary/vent_pump::name desc = /obj/machinery/atmospherics/components/unary/vent_pump::desc icon = /obj/machinery/atmospherics/components/unary/vent_pump::icon - layer = /obj/machinery/atmospherics/components/unary/vent_scrubber::layer - plane = FLOOR_PLANE + layer = /obj/machinery/atmospherics/components/unary/vent_pump::layer + plane = /obj/machinery/atmospherics/components/unary/vent_pump::plane icon_state = "vent_out" /turf/open/mirage diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index e830718e12ed6..587a62ec0e1b7 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -267,6 +267,16 @@ else airlock.autoname = TRUE +/obj/effect/mapping_helpers/airlock/inaccessible + name = "airlock inaccessible helper" + icon_state = "airlock_inaccessible" + +/obj/effect/mapping_helpers/airlock/inaccessible/payload(obj/machinery/door/airlock/airlock) + if(airlock.req_one_access != null) + log_mapping("[src] at [AREACOORD(src)] tried to set req_access, but req__one_access was already set!") + else + airlock.req_access += list(ACCESS_INACCESSIBLE) + //air alarm helpers /obj/effect/mapping_helpers/airalarm desc = "You shouldn't see this. Report it please." diff --git a/code/modules/mining/equipment/grapple_gun.dm b/code/modules/mining/equipment/grapple_gun.dm index 4e61b5d0fb3fd..76da071ec6e2d 100644 --- a/code/modules/mining/equipment/grapple_gun.dm +++ b/code/modules/mining/equipment/grapple_gun.dm @@ -41,8 +41,8 @@ if(target == user || !hooked) return NONE - if(!lavaland_equipment_pressure_check(get_turf(user))) - user.balloon_alert(user, "gun mechanism wont work here!") + if(!lavaland_equipment_pressure_check(get_turf(user)) && !(obj_flags & EMAGGED)) + user.balloon_alert(user, "gun mechanism won't work here!") return ITEM_INTERACT_BLOCKING if(get_dist(user, target) > 9) user.balloon_alert(user, "too far away!") @@ -73,6 +73,14 @@ update_appearance() return ITEM_INTERACT_SUCCESS +/obj/item/grapple_gun/emag_act(mob/user, obj/item/card/emag/emag_card) + . = ..() + if(obj_flags & EMAGGED) + return FALSE + balloon_alert(user, "pressure settings overloaded") + obj_flags |= EMAGGED + return TRUE + /obj/item/grapple_gun/proc/on_grapple_hit(datum/source, atom/movable/firer, atom/target, Angle) SIGNAL_HANDLER diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 385afb0f81f3e..79d7901dd9e44 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -127,13 +127,16 @@ if(istype(AM, /obj/item/stack/sheet) && AM.loc == get_step(src, input_dir)) process_sheet(AM) -/obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/M) - if(istype(M)) - if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console)) - console = M.buffer - console.machine = src - to_chat(user, span_notice("You link [src] to the console in [M]'s buffer.")) - return TRUE +/obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/multi_tool) + if(user.combat_mode || multi_tool.item_flags & ABSTRACT || multi_tool.flags_1 & HOLOGRAM_1) + return ITEM_INTERACT_SKIP_TO_ATTACK + + . = ITEM_INTERACT_BLOCKING + if(istype(multi_tool.buffer, /obj/machinery/mineral/stacking_unit_console)) + console = multi_tool.buffer + console.machine = src + to_chat(user, span_notice("You link [src] to the console in [multi_tool]'s buffer.")) + return ITEM_INTERACT_SUCCESS /obj/machinery/mineral/stacking_machine/proc/rotate(input) if (input) diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 58429ab5404f3..7814bea871be9 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -80,10 +80,14 @@ /datum/emote/flip/run_emote(mob/user, params , type_override, intentional) . = ..() if(.) - user.SpinAnimation(FLIP_EMOTE_DURATION,1) + user.SpinAnimation(HAS_TRAIT(user, TRAIT_SLOW_FLIP) ? FLIP_EMOTE_DURATION * 2 : FLIP_EMOTE_DURATION, 1) /datum/emote/flip/check_cooldown(mob/user, intentional) + var/slow_flipper = HAS_TRAIT(user, TRAIT_SLOW_FLIP) + if(slow_flipper) + cooldown *= 2 . = ..() + cooldown *= 0.5 if(.) return if(!can_run_emote(user, intentional=intentional)) diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm index 22ab453226912..86fe0b5cf5704 100644 --- a/code/modules/mob/living/basic/bots/_bots.dm +++ b/code/modules/mob/living/basic/bots/_bots.dm @@ -142,9 +142,6 @@ GLOBAL_LIST_INIT(command_strings, list( var/datum/atom_hud/datahud = GLOB.huds[data_hud_type] datahud.show_to(src) - if(HAS_TRAIT(SSstation, STATION_TRAIT_BOTS_GLITCHED)) - randomize_language_if_on_station() - if(mapload && is_station_level(z) && (bot_mode_flags & BOT_MODE_CAN_BE_SAPIENT) && (bot_mode_flags & BOT_MODE_ROUNDSTART_POSSESSION)) enable_possession(mapload = mapload) diff --git a/code/modules/mob/living/basic/ruin_defender/flesh.dm b/code/modules/mob/living/basic/ruin_defender/flesh.dm index 6f46e69070038..359705ecff2bd 100644 --- a/code/modules/mob/living/basic/ruin_defender/flesh.dm +++ b/code/modules/mob/living/basic/ruin_defender/flesh.dm @@ -1,3 +1,6 @@ +#define LIVING_FLESH_TOUCH_CHANCE 30 +#define LIVING_FLESH_COMBAT_TOUCH_CHANCE 70 + /datum/ai_controller/basic_controller/living_limb_flesh blackboard = list( BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic, @@ -67,11 +70,9 @@ if(istype(current_bodypart, /obj/item/bodypart/arm)) var/list/candidates = list() for(var/atom/movable/movable in orange(victim, 1)) - if(movable.anchored) - continue if(movable == victim) continue - if(!victim.CanReach(movable)) + if(!victim.CanReach(movable) || victim.invisibility) continue candidates += movable if(!length(candidates)) @@ -79,8 +80,19 @@ var/atom/movable/candidate = pick(candidates) if(isnull(candidate)) return - victim.start_pulling(candidate, supress_message = TRUE) - victim.visible_message(span_warning("[victim][victim.p_s()] [current_bodypart] instinctually starts feeling [candidate]!")) + + victim.visible_message(span_warning("[victim]'s [current_bodypart.name] instinctively starts feeling [candidate]!")) + if (!victim.anchored && !prob(victim.combat_mode ? LIVING_FLESH_COMBAT_TOUCH_CHANCE : LIVING_FLESH_TOUCH_CHANCE)) + victim.start_pulling(candidate, supress_message = TRUE) + return + + var/active_hand = victim.active_hand_index + var/new_index = (current_bodypart.body_zone == BODY_ZONE_L_ARM) ? LEFT_HANDS : RIGHT_HANDS + if (active_hand != new_index) + victim.swap_hand(new_index, TRUE) + victim.resolve_unarmed_attack(candidate) + if (active_hand != victim.active_hand_index) // Different check in case we failed to swap hands previously due to holding a bulky item + victim.swap_hand(active_hand, TRUE) return if(HAS_TRAIT(victim, TRAIT_IMMOBILIZED)) @@ -127,7 +139,11 @@ if(BODY_ZONE_R_LEG) part_type = /obj/item/bodypart/leg/right/flesh - target.visible_message(span_danger("[src] [target_part ? "tears off and attaches itself" : "attaches itself"] to where [target][target.p_s()] limb used to be!")) + if (!isnull(target_part)) + target.visible_message(span_danger("[src] tears off [target]'s [target_part.plaintext_zone] and attaches itself in [target_part.p_their()] place!"), span_userdanger("[src] tears off your [target_part.plaintext_zone] and attaches itself in [target_part.p_their()] place!")) + else + target.visible_message(span_danger("[src] attaches itself to where [target]'s [target.parse_zone_with_bodypart(target_zone)] used to be!"), span_userdanger("[src] attaches itself to where your [target.parse_zone_with_bodypart(target_zone)] used to be!")) + var/obj/item/bodypart/new_bodypart = new part_type() forceMove(new_bodypart) new_bodypart.replace_limb(target, TRUE) @@ -181,3 +197,6 @@ ai_controller.set_ai_status(AI_STATUS_ON) forceMove(limb.drop_location()) qdel(limb) + +#undef LIVING_FLESH_TOUCH_CHANCE +#undef LIVING_FLESH_COMBAT_TOUCH_CHANCE diff --git a/code/modules/mob/living/basic/ruin_defender/living_floor.dm b/code/modules/mob/living/basic/ruin_defender/living_floor.dm index 851a0873657a0..105838f0c55dd 100644 --- a/code/modules/mob/living/basic/ruin_defender/living_floor.dm +++ b/code/modules/mob/living/basic/ruin_defender/living_floor.dm @@ -35,7 +35,7 @@ move_resist = INFINITY density = FALSE combat_mode = TRUE - layer = TURF_LAYER + layer = LOW_FLOOR_LAYER plane = FLOOR_PLANE faction = list(FACTION_HOSTILE) melee_damage_lower = 20 diff --git a/code/modules/mob/living/basic/slime/slime.dm b/code/modules/mob/living/basic/slime/slime.dm index fa40ac28d816d..352a8149ca616 100644 --- a/code/modules/mob/living/basic/slime/slime.dm +++ b/code/modules/mob/living/basic/slime/slime.dm @@ -189,15 +189,17 @@ cut_overlays() if(slime_type.transparent) alpha = SLIME_TRANSPARENCY_ALPHA - var/icon_text = "[slime_type.colour]-[life_stage]" - icon_dead = "[icon_text]-dead" + + icon_dead = !cores ? "[slime_type.colour]-cut" : "[slime_type.colour]-[life_stage]-dead" + if(stat != DEAD) - icon_state = icon_text + icon_state = "[slime_type.colour]-[life_stage]" if(current_mood && current_mood != SLIME_MOOD_NONE && !stat) add_overlay("aslime-[current_mood]") else icon_state = icon_dead - ..() + + return ..() /mob/living/basic/slime/get_status_tab_items() . = ..() @@ -364,6 +366,21 @@ visible_message(span_warning("The mutated core shudders, and collapses into a puddle, unable to maintain its form.")) qdel(src) +///Proc for slime core removal surgery, tries to remove cores from a dead slime. +/mob/living/basic/slime/proc/try_extract_cores(count = 1) + if(stat != DEAD) + return FALSE + if(count <= 0 || cores < count) + return FALSE + + var/core_count = min(count, cores) + for(var/i in 1 to core_count) + new slime_type.core_type(loc) + cores-- + + regenerate_icons() + + return TRUE ///Makes the slime peaceful and content /mob/living/basic/slime/proc/set_pacified_behaviour() diff --git a/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm b/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm index 44775ea7217ce..0318b044a21ce 100644 --- a/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm +++ b/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(meteor_eyeballs) desc = "An eyeball growing out of the ground, gross." icon_state = "eyeball" max_integrity = 15 - layer = LOW_OBJ_LAYER + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE /obj/structure/meateor_fluff/eyeball/Initialize(mapload) diff --git a/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm b/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm index 5ef330cdc64f9..5801d18321594 100644 --- a/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm +++ b/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm @@ -27,9 +27,21 @@ SIGNAL_HANDLER set_blackboard_key(BB_MOTHROACH_NEXT_EAT, world.time + MOTHROACH_EAT_TIMER) +/datum/ai_planning_subtree/find_food/mothroach + finding_behavior = /datum/ai_behavior/find_and_set/in_list/mothroach_food + /datum/ai_planning_subtree/find_food/mothroach/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) if(world.time < controller.blackboard[BB_MOTHROACH_NEXT_EAT]) return return ..() +/datum/ai_behavior/find_and_set/in_list/mothroach_food + +/datum/ai_behavior/find_and_set/in_list/mothroach_food/search_tactic(datum/ai_controller/controller, locate_paths, search_range) + var/list/found = typecache_filter_list(oview(search_range, controller.pawn), locate_paths) + var/mob/living/living_pawn = controller.pawn + found -= living_pawn.loc + if(length(found)) + return pick(found) + #undef MOTHROACH_EAT_TIMER diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index 5ac120fcee3f3..7d5d6bec936a7 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -25,10 +25,6 @@ adjust_nutrition(-nutrition_ratio * HUNGER_FACTOR * seconds_per_tick) blood_volume = min(blood_volume + (BLOOD_REGEN_FACTOR * nutrition_ratio * seconds_per_tick), BLOOD_VOLUME_NORMAL) - // Some effects are halved mid-combat. - var/determined_mod = has_status_effect(/datum/status_effect/determined) ? 0.5 : 0 - - //Bloodloss from wounds var/temp_bleed = 0 for(var/obj/item/bodypart/iter_part as anything in bodyparts) @@ -45,6 +41,10 @@ //Effects of bloodloss if(sigreturn & HANDLE_BLOOD_NO_OXYLOSS) return + + // Some effects are halved mid-combat. + var/determined_mod = has_status_effect(/datum/status_effect/determined) ? 0.5 : 0 + var/word = pick("dizzy","woozy","faint") switch(blood_volume) if(BLOOD_VOLUME_EXCESS to BLOOD_VOLUME_MAX_LETHAL) @@ -105,11 +105,12 @@ // Blood ratio! if you have 280 blood, this equals 0.5 as that's half of the current value, 560. var/effective_blood_ratio = blood_volume / BLOOD_VOLUME_NORMAL + var/target_oxyloss = max((1 - effective_blood_ratio) * 100, 0) // If your ratio is less than one (you're missing any blood) and your oxyloss is under missing blood %, start getting oxy damage. // This damage accrues faster the less blood you have. - // If KO or in hardcrit, the damage accrues even then to prevent being perma-KO. - if(((effective_blood_ratio < 1) && (getOxyLoss() < ((1 - effective_blood_ratio) * 100))) || (stat in list(UNCONSCIOUS, HARD_CRIT))) + // If the damage surpasses the KO threshold for oxyloss, then we'll always tick up so you die eventually + if(target_oxyloss > 0 && (getOxyLoss() < target_oxyloss || (target_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD && stat >= UNCONSCIOUS))) // At roughly half blood this equals to 3 oxyloss per tick. At 90% blood it's close to 0.5 var/rounded_oxyloss = round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume), 0.25) * seconds_per_tick adjustOxyLoss(rounded_oxyloss, updating_health = TRUE) diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index b0a747ff51d88..3d380ef6824ca 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -113,10 +113,10 @@ if(!QDELETED(organ_owner) && length(skillchips)) if(!special) to_chat(organ_owner, span_notice("You feel your skillchips enable emergency power saving mode, deactivating as your brain leaves your body...")) - for(var/chip in skillchips) - var/obj/item/skillchip/skillchip = chip - // Run the try_ proc with force = TRUE. - skillchip.try_deactivate_skillchip(silent = special, force = TRUE) + for(var/chip in skillchips) + var/obj/item/skillchip/skillchip = chip + // Run the try_ proc with force = TRUE. + skillchip.try_deactivate_skillchip(silent = special, force = TRUE) . = ..() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a18b0ae3a4c68..0bc1fb5879a2e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -6,7 +6,7 @@ GLOB.carbon_list += src ADD_TRAIT(src, TRAIT_CAN_HOLD_ITEMS, INNATE_TRAIT) // Carbons are assumed to be innately capable of having arms, we check their arms count instead - breathing_loop = new(src) + breathing_loop = new(src, _direct = TRUE) /mob/living/carbon/Destroy() //This must be done first, so the mob ghosts correctly before DNA etc is nulled @@ -201,6 +201,11 @@ span_danger("You [verb_text] [thrown_thing][power_throw_text]")) log_message("has thrown [thrown_thing] [power_throw_text]", LOG_ATTACK) var/extra_throw_range = HAS_TRAIT(src, TRAIT_THROWINGARM) ? 2 : 0 + + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + extra_throw_range += potential_spine.added_throw_range + newtonian_move(get_dir(target, src)) thrown_thing.safe_throw_at(target, thrown_thing.throw_range + extra_throw_range, max(1,thrown_thing.throw_speed + power_throw), src, null, null, null, move_force) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 968a09a46b4dd..84d18efef8332 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -591,10 +591,10 @@ */ /mob/living/carbon/proc/check_passout() var/mob_oxyloss = getOxyLoss() - if(mob_oxyloss >= 50) + if(mob_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD) if(!HAS_TRAIT_FROM(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)) ADD_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT) - else if(mob_oxyloss < 50) + else if(mob_oxyloss < OXYLOSS_PASSOUT_THRESHOLD) REMOVE_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT) /mob/living/carbon/get_organic_health() diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index fd9807c32f1b0..3f5d4910bc9e9 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -182,7 +182,7 @@ qdel(hand) to_chat(user, span_warning("You're incapable of using your hand in your current state.")) - +/* Bubber removal begin - moved to modular_zubbers\code\modules\emotes\emotes.dm - /datum/emote/living/snap /datum/emote/living/carbon/snap key = "snap" key_third_person = "snaps" @@ -195,6 +195,7 @@ if(ishuman(user)) return pick('sound/misc/fingersnap1.ogg', 'sound/misc/fingersnap2.ogg') return null +Bubber removal end */ /datum/emote/living/carbon/shoesteal key = "shoesteal" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3a2d406afc1b3..6df51fe8db470 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -961,7 +961,7 @@ var/carrydelay = 5 SECONDS //if you have latex you are faster at grabbing var/skills_space - var/fitness_level = mind.get_skill_level(/datum/skill/athletics) - 1 + var/fitness_level = mind?.get_skill_level(/datum/skill/athletics) - 1 if(HAS_TRAIT(src, TRAIT_QUICKER_CARRY)) carrydelay -= 2 SECONDS else if(HAS_TRAIT(src, TRAIT_QUICK_CARRY)) @@ -970,6 +970,10 @@ // can remove up to 2 seconds at legendary carrydelay -= fitness_level * (1/3) SECONDS + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + carrydelay *= potential_spine.athletics_boost_multiplier + if(carrydelay <= 3 SECONDS) skills_space = " very quickly" else if(carrydelay <= 4 SECONDS) diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 87179972677f0..0a1d8b1446279 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -63,6 +63,7 @@ /datum/outfit/syndicate/reinforcement/mi13 = /datum/outfit/syndicate/reinforcement/plasmaman, /datum/outfit/syndicate/reinforcement/waffle = /datum/outfit/syndicate/reinforcement/plasmaman, /datum/outfit/syndicate/support = /datum/outfit/syndicate/support/plasmaman, + /datum/outfit/syndicate/full/loneop = /datum/outfit/syndicate/full/plasmaman/loneop, ) /// If the bones themselves are burning clothes won't help you much diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index 672d877430a0c..b1ca17337115e 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -5,19 +5,6 @@ /mob/living/carbon/IsParalyzed(include_stamcrit = TRUE) return ..() || (include_stamcrit && HAS_TRAIT_FROM(src, TRAIT_INCAPACITATED, STAMINA)) -/mob/living/carbon/proc/enter_stamcrit() - if(HAS_TRAIT_FROM(src, TRAIT_INCAPACITATED, STAMINA)) //Already in stamcrit - return - if(check_stun_immunity(CANKNOCKDOWN)) - return - if (SEND_SIGNAL(src, COMSIG_CARBON_ENTER_STAMCRIT) & STAMCRIT_CANCELLED) - return - - to_chat(src, span_notice("You're too exhausted to keep going...")) - add_traits(list(TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_FLOORED), STAMINA) - if(getStaminaLoss() < 162) // Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems. //SKYRAT EDIT CHANGE - adjustStaminaLoss(30, FALSE) - /mob/living/carbon/adjust_disgust(amount, max = DISGUST_LEVEL_MAXEDOUT) disgust = clamp(disgust + amount, 0, max) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 3c6f77d481698..49edc67315c68 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -62,6 +62,12 @@ . = SEND_SIGNAL(src, COMSIG_LIVING_Z_IMPACT, levels, impacted_turf) if(. & ZIMPACT_CANCEL_DAMAGE) return . + // multiplier for the damage taken from falling + var/damage_softening_multiplier = 1 + + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + damage_softening_multiplier *= potential_spine.athletics_boost_multiplier //SKYRAT EDIT ADDITION START - Landing in liquids if(impacted_turf.liquids && impacted_turf.liquids.liquid_state >= LIQUID_STATE_WAIST) @@ -113,7 +119,7 @@ new /obj/effect/temp_visual/mook_dust(impacted_turf) if(body_position == STANDING_UP) - var/damage_for_each_leg = round(incoming_damage / 2) + var/damage_for_each_leg = round((incoming_damage / 2) * damage_softening_multiplier) apply_damage(damage_for_each_leg, BRUTE, BODY_ZONE_L_LEG, wound_bonus = -2.5 * levels) apply_damage(damage_for_each_leg, BRUTE, BODY_ZONE_R_LEG, wound_bonus = -2.5 * levels) else @@ -721,6 +727,10 @@ /mob/living/proc/get_up(instant = FALSE) set waitfor = FALSE + var/get_up_time = 1 SECONDS + var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE) + if(istype(potential_spine)) + get_up_time *= potential_spine.athletics_boost_multiplier // if(!instant && !do_after(src, 1 SECONDS, src, timed_action_flags = (IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM), extra_checks = CALLBACK(src, TYPE_PROC_REF(/mob/living, rest_checks_callback)), interaction_key = DOAFTER_SOURCE_GETTING_UP, hidden = TRUE)) // SKYRAT EDIT REMOVAL // SKYRAT EDIT ADDITION START var/get_up_speed = GET_UP_FAST diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index c4b5ec89976ac..0c2858219b7ca 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -65,6 +65,9 @@ emag_modules += new_module emag_modules -= path + if(check_holidays(ICE_CREAM_DAY) && !(locate(/obj/item/borg/lollipop) in basic_modules)) + basic_modules += new /obj/item/borg/lollipop/ice_cream(src) + /obj/item/robot_model/Destroy() basic_modules.Cut() emag_modules.Cut() diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 48d83da80a9c1..49b44122ac0e7 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -196,9 +196,6 @@ path_hud.add_atom_to_hud(src) path_hud.show_to(src) - if(HAS_TRAIT(SSstation, STATION_TRAIT_BOTS_GLITCHED)) - randomize_language_if_on_station() - if(mapload && is_station_level(z) && bot_mode_flags & BOT_MODE_CAN_BE_SAPIENT && bot_mode_flags & BOT_MODE_ROUNDSTART_POSSESSION) enable_possession(mapload = mapload) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index a9c109b81a3c6..3ce473aa814ca 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -125,7 +125,7 @@ dir_shots.Trigger(target = target) // BUBBER EDIT START - ACTUALLY LOOSE THE TARGET var/mob/living/living_target = target - if(!istype(living_target) && living_target.stat == DEAD && living_target.has_status_effect(/datum/status_effect/gutted)) + if(istype(living_target) && living_target.stat == DEAD && living_target.has_status_effect(/datum/status_effect/gutted)) LoseTarget() return // BUBBER EDIT END diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 16ccf461e2545..6fae65787f411 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -884,12 +884,13 @@ return data -/mob/proc/swap_hand(held_index) +/mob/proc/swap_hand(held_index, silent = FALSE) SHOULD_NOT_OVERRIDE(TRUE) // Override perform_hand_swap instead var/obj/item/held_item = get_active_held_item() if(SEND_SIGNAL(src, COMSIG_MOB_SWAPPING_HANDS, held_item) & COMPONENT_BLOCK_SWAP) - to_chat(src, span_warning("Your other hand is too busy holding [held_item].")) + if (!silent) + to_chat(src, span_warning("Your other hand is too busy holding [held_item].")) return FALSE var/result = perform_hand_swap(held_index) diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 3cd8042582fe0..8dde85455040a 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -333,6 +333,26 @@ return ITEM_INTERACT_BLOCKING insert_pai(user, tool) return ITEM_INTERACT_SUCCESS + if(istype(tool, /obj/item/mod/paint)) + var/obj/item/mod/paint/paint_kit = tool + if(active || activating) + balloon_alert(user, "suit is active!") + return ITEM_INTERACT_BLOCKING + if(LAZYACCESS(modifiers, RIGHT_CLICK)) // Right click + if(paint_kit.editing_mod == src) + return ITEM_INTERACT_BLOCKING + paint_kit.editing_mod = src + paint_kit.proxy_view = new() + paint_kit.proxy_view.generate_view("color_matrix_proxy_[REF(user.client)]") + + paint_kit.proxy_view.appearance = paint_kit.editing_mod.appearance + paint_kit.proxy_view.color = null + paint_kit.proxy_view.display_to(user) + paint_kit.ui_interact(user) + return ITEM_INTERACT_SUCCESS + else // Left click + paint_kit.paint_skin(src, user) + return ITEM_INTERACT_SUCCESS if(istype(tool, /obj/item/mod/module)) if(!open) balloon_alert(user, "open the cover first!") @@ -456,6 +476,7 @@ SEND_SIGNAL(src, COMSIG_MOD_WEARER_SET, wearer) RegisterSignal(wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) RegisterSignal(wearer, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) + RegisterSignal(wearer, COMSIG_MOB_CLICKON, PROC_REF(click_on)) update_charge_alert() for(var/obj/item/mod/module/module as anything in modules) module.on_equip() @@ -463,7 +484,7 @@ /obj/item/mod/control/proc/unset_wearer() for(var/obj/item/mod/module/module as anything in modules) module.on_unequip() - UnregisterSignal(wearer, list(COMSIG_ATOM_EXITED, COMSIG_SPECIES_GAIN)) + UnregisterSignal(wearer, list(COMSIG_ATOM_EXITED, COMSIG_SPECIES_GAIN, COMSIG_MOB_CLICKON)) SEND_SIGNAL(src, COMSIG_MOD_WEARER_UNSET, wearer) wearer.update_spacesuit_hud_icon("0") wearer = null @@ -497,7 +518,14 @@ forceMove(drop_location()) return -/obj/item/mod/control/proc/quick_module(mob/user) +/obj/item/mod/control/proc/click_on(mob/source, atom/A, list/modifiers) + SIGNAL_HANDLER + + if (LAZYACCESS(modifiers, CTRL_CLICK) && LAZYACCESS(modifiers, source.client?.prefs.read_preference(/datum/preference/choiced/mod_select) || MIDDLE_CLICK)) + INVOKE_ASYNC(src, PROC_REF(quick_module), source, get_turf(A)) + return COMSIG_MOB_CANCEL_CLICKON + +/obj/item/mod/control/proc/quick_module(mob/user, anchor_override = null) if(!length(modules)) return var/list/display_names = list() @@ -519,7 +547,9 @@ var/radial_anchor = src if(istype(user.loc, /obj/effect/dummy/phased_mob)) radial_anchor = get_turf(user.loc) //they're phased out via some module, anchor the radial on the turf so it may still display - var/pick = show_radial_menu(user, radial_anchor, items, custom_check = FALSE, require_near = TRUE, tooltips = TRUE) + if (!isnull(anchor_override)) + radial_anchor = anchor_override + var/pick = show_radial_menu(user, radial_anchor, items, custom_check = FALSE, require_near = isnull(anchor_override), tooltips = TRUE) if(!pick) return var/module_reference = display_names[pick] diff --git a/code/modules/mod/mod_link.dm b/code/modules/mod/mod_link.dm index bcbf90ed44249..e5c7195bd8cb0 100644 --- a/code/modules/mod/mod_link.dm +++ b/code/modules/mod/mod_link.dm @@ -16,7 +16,7 @@ /proc/get_link_visual_generic(datum/mod_link/mod_link, atom/movable/visuals, proc_path) var/mob/living/user = mod_link.get_user_callback.Invoke() playsound(mod_link.holder, 'sound/machines/terminal_processing.ogg', 50, vary = TRUE) - visuals.add_overlay(mutable_appearance('icons/effects/effects.dmi', "static_base", TURF_LAYER)) + visuals.add_overlay(mutable_appearance('icons/effects/effects.dmi', "static_base", ABOVE_NORMAL_TURF_LAYER)) visuals.add_overlay(mutable_appearance('icons/effects/effects.dmi', "modlink", ABOVE_ALL_MOB_LAYER)) visuals.add_filter("crop_square", 1, alpha_mask_filter(icon = icon('icons/effects/effects.dmi', "modlink_filter"))) visuals.maptext_height = 6 diff --git a/code/modules/mod/mod_paint.dm b/code/modules/mod/mod_paint.dm index fca758c3f5e12..b37be06cd2b7d 100644 --- a/code/modules/mod/mod_paint.dm +++ b/code/modules/mod/mod_paint.dm @@ -23,34 +23,6 @@ . += span_notice("Left-click a MODsuit to change skin.") . += span_notice("Right-click a MODsuit to recolor.") -/obj/item/mod/paint/pre_attack(atom/attacked_atom, mob/living/user, params) - if(!istype(attacked_atom, /obj/item/mod/control)) - return ..() - var/obj/item/mod/control/mod = attacked_atom - if(mod.active || mod.activating) - balloon_alert(user, "suit is active!") - return TRUE - paint_skin(mod, user) - -/obj/item/mod/paint/pre_attack_secondary(atom/attacked_atom, mob/living/user, params) - if(!istype(attacked_atom, /obj/item/mod/control)) - return ..() - var/obj/item/mod/control/mod = attacked_atom - if(mod.active || mod.activating) - balloon_alert(user, "suit is active!") - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - if(editing_mod) - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - editing_mod = mod - proxy_view = new() - proxy_view.generate_view("color_matrix_proxy_[REF(user.client)]") - - proxy_view.appearance = editing_mod.appearance - proxy_view.color = null - proxy_view.display_to(user) - ui_interact(user) - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - /obj/item/mod/paint/ui_interact(mob/user, datum/tgui/ui) if(!editing_mod) return diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index e751d1e943b16..c6d0869c6e987 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -5,7 +5,7 @@ /// The MOD core we apply to the suit. var/applied_core = /obj/item/mod/core/standard /// The cell we apply to the core. Only applies to standard core suits. - var/applied_cell = /obj/item/stock_parts/power_store/cell/high + var/applied_cell = /obj/item/stock_parts/power_store/cell/super /// List of modules we spawn with. var/list/applied_modules = list() /// Modules that we pin when the suit is installed for the first time, for convenience, can be applied or theme inbuilt modules. @@ -165,9 +165,9 @@ /obj/item/mod/module/storage, /obj/item/mod/module/magnetic_harness, /obj/item/mod/module/flashlight, + /obj/item/mod/module/jetpack, /obj/item/mod/module/pepper_shoulders, /obj/item/mod/module/criminalcapture, - /obj/item/mod/module/dispenser/mirage, /obj/item/mod/module/quick_cuff, /obj/item/mod/module/headprotector, ) diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm index 64790eacb3bec..f0a92e3a05153 100644 --- a/code/modules/mod/modules/module_pathfinder.dm +++ b/code/modules/mod/modules/module_pathfinder.dm @@ -11,6 +11,7 @@ Nakamura Engineering swears up and down there's airbrakes." icon_state = "pathfinder" complexity = 1 + module_type = MODULE_USABLE use_energy_cost = DEFAULT_CHARGE_DRAIN * 10 incompatible_modules = list(/obj/item/mod/module/pathfinder) required_slots = list(ITEM_SLOT_BACK|ITEM_SLOT_BELT) @@ -56,6 +57,21 @@ else target.visible_message(span_notice("[user] implants [target]."), span_notice("[user] implants you with [implant].")) playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6) + module_type = MODULE_PASSIVE + +/obj/item/mod/module/pathfinder/on_use() + . = ..() + if (!ishuman(mod.wearer) || !implant) + return + if(!implant.implant(mod.wearer, mod.wearer)) + balloon_alert(mod.wearer, "can't implant!") + return + balloon_alert(mod.wearer, "implanted") + playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6) + module_type = MODULE_PASSIVE + var/datum/action/item_action/mod/pinnable/module/existing_action = pinned_to[REF(mod.wearer)] + if(existing_action) + mod.remove_item_action(existing_action) /obj/item/mod/module/pathfinder/proc/attach(mob/living/user) if(!ishuman(user)) diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm index fc21937eef049..40e1889efd968 100644 --- a/code/modules/mod/modules/modules_engineering.dm +++ b/code/modules/mod/modules/modules_engineering.dm @@ -120,7 +120,7 @@ hitsound = 'sound/weapons/batonextend.ogg' hitsound_wall = 'sound/weapons/batonextend.ogg' suppressed = SUPPRESSED_VERY - hit_threshhold = LATTICE_LAYER + hit_threshhold = ABOVE_NORMAL_TURF_LAYER /// Reference to the beam following the projectile. var/line diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm index a0d58d721f3d4..936c261dd2047 100644 --- a/code/modules/mod/modules/modules_medical.dm +++ b/code/modules/mod/modules/modules_medical.dm @@ -119,6 +119,12 @@ volume = 30 inject_flags = INJECT_CHECK_PENETRATE_THICK +/obj/item/reagent_containers/syringe/mod/update_reagent_overlay() + if(reagents?.total_volume) + var/mutable_appearance/filling_overlay = mutable_appearance('icons/obj/medical/reagent_fillings.dmi', "mod[get_rounded_vol()]") + filling_overlay.color = mix_color_from_reagents(reagents.reagent_list) + . += filling_overlay + ///Organizer - Lets you shoot organs, immediately replacing them if the target has the organ manipulation surgery. /obj/item/mod/module/organizer name = "MOD organizer module" diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index 200b0febe1aab..2261f775ec89c 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -5,6 +5,7 @@ /obj/item/modular_computer/pda/heads greyscale_config = /datum/greyscale_config/tablet/head greyscale_colors = "#67A364#a92323" + max_capacity = parent_type::max_capacity * 2 starting_programs = list( /datum/computer_file/program/crew_manifest, /datum/computer_file/program/status, diff --git a/code/modules/modular_computers/file_system/programs/statusdisplay.dm b/code/modules/modular_computers/file_system/programs/statusdisplay.dm index 5dfdaae2c877e..fa844215b93b9 100644 --- a/code/modules/modular_computers/file_system/programs/statusdisplay.dm +++ b/code/modules/modular_computers/file_system/programs/statusdisplay.dm @@ -59,27 +59,7 @@ post_status(picture) else if(picture == "currentalert") // You cannot set Code Blue display during Code Red and similiar - switch(SSsecurity_level.get_current_level_as_number()) - if(SEC_LEVEL_DELTA) - post_status("alert", "deltaalert") - if(SEC_LEVEL_RED) - post_status("alert", "redalert") - if(SEC_LEVEL_BLUE) - post_status("alert", "bluealert") - if(SEC_LEVEL_GREEN) - post_status("alert", "greenalert") - // SKYRAT EDIT ADD START - Alert Levels - if(SEC_LEVEL_VIOLET) - post_status("alert", "violetalert") - if(SEC_LEVEL_ORANGE) - post_status("alert", "orangealert") - if(SEC_LEVEL_AMBER) - post_status("alert", "amberalert") - if(SEC_LEVEL_EPSILON) - post_status("alert", "epsilonalert") - if(SEC_LEVEL_GAMMA) - post_status("alert", "gammaalert") - // SKYRAT EDIT ADD END - Alert Levels + post_status("alert", SSsecurity_level?.current_security_level?.status_display_icon_state || "greenalert") else post_status("alert", picture) diff --git a/code/modules/modular_computers/file_system/programs/techweb.dm b/code/modules/modular_computers/file_system/programs/techweb.dm index 014e6a56727a3..4e181370fe2ad 100644 --- a/code/modules/modular_computers/file_system/programs/techweb.dm +++ b/code/modules/modular_computers/file_system/programs/techweb.dm @@ -50,6 +50,7 @@ return data data += list( "nodes" = list(), + "queue_nodes" = stored_research.research_queue_nodes, "experiments" = list(), "researched_designs" = stored_research.researched_designs, "points" = stored_research.research_points, @@ -64,6 +65,10 @@ // Serialize all nodes to display for(var/tier in stored_research.tiers) var/datum/techweb_node/node = SSresearch.techweb_node_by_id(tier) + var/enqueued_by_user = FALSE + + if((tier in stored_research.research_queue_nodes) && stored_research.research_queue_nodes[tier] == user) + enqueued_by_user = TRUE // Ensure node is supposed to be visible if (stored_research.hidden_nodes[tier]) @@ -71,8 +76,11 @@ data["nodes"] += list(list( "id" = node.id, + "is_free" = node.is_free(stored_research), "can_unlock" = stored_research.can_unlock_node(node), - "tier" = stored_research.tiers[node.id] + "have_experiments_done" = stored_research.have_experiments_for_node(node), + "tier" = stored_research.tiers[node.id], + "enqueued_by_user" = enqueued_by_user )) // Get experiments and serialize them @@ -111,6 +119,12 @@ if ("researchNode") research_node(params["node_id"], usr) return TRUE + if ("enqueueNode") + enqueue_node(params["node_id"], usr) + return TRUE + if ("dequeueNode") + dequeue_node(params["node_id"], usr) + return TRUE /datum/computer_file/program/science/ui_static_data(mob/user) . = list( @@ -188,6 +202,20 @@ id_cache_seq += 1 return id_cache[id] +/datum/computer_file/program/science/proc/enqueue_node(id, mob/user) + if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id]) + computer.say("Node enqueue failed: Either no techweb is found, node is already researched or is not available!") + return FALSE + stored_research.enqueue_node(id, user) + return TRUE + +/datum/computer_file/program/science/proc/dequeue_node(id, mob/user) + if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id]) + computer.say("Node dequeue failed: Either no techweb is found, node is already researched or is not available!") + return FALSE + stored_research.dequeue_node(id, user) + return TRUE + /datum/computer_file/program/science/proc/research_node(id, mob/user) if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id]) computer.say("Node unlock failed: Either no techweb is found, node is already researched or is not available!") diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 41d24ea9c6da4..d37d97c167792 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -76,7 +76,7 @@ if(user) balloon_alert(user, "clicked") - playsound(src, 'sound/machines/click.ogg', 30, TRUE, -3) + playsound(src, 'sound/items/pen_click.ogg', 30, TRUE, -3) icon_state = initial(icon_state) + (active ? "_retracted" : "") update_appearance(UPDATE_ICON) diff --git a/code/modules/photography/camera/camera_image_capturing.dm b/code/modules/photography/camera/camera_image_capturing.dm index d928164ff014d..64eeb192a2286 100644 --- a/code/modules/photography/camera/camera_image_capturing.dm +++ b/code/modules/photography/camera/camera_image_capturing.dm @@ -10,11 +10,18 @@ step_y = AM.step_y . = ..() +#define PHYSICAL_POSITION(atom) ((atom.y * world.icon_size) + (atom.pixel_y)) + /obj/item/camera/proc/camera_get_icon(list/turfs, turf/center, psize_x = 96, psize_y = 96, datum/turf_reservation/clone_area, size_x, size_y, total_x, total_y) var/list/atoms = list() + var/list/lighting = list() var/skip_normal = FALSE var/wipe_atoms = FALSE + var/mutable_appearance/backdrop = mutable_appearance('icons/hud/screen_gen.dmi', "flash") + backdrop.blend_mode = BLEND_OVERLAY + backdrop.color = "#292319" + if(istype(clone_area) && total_x == clone_area.width && total_y == clone_area.height && size_x >= 0 && size_y > 0) var/turf/bottom_left = clone_area.bottom_left_turfs[1] var/cloned_center_x = round(bottom_left.x + ((total_x - 1) / 2)) @@ -29,6 +36,12 @@ atoms += new /obj/effect/appearance_clone(newT, T) if(T.loc.icon_state) atoms += new /obj/effect/appearance_clone(newT, T.loc) + if(T.lighting_object) + var/obj/effect/appearance_clone/lighting_overlay = new(newT) + lighting_overlay.appearance = T.lighting_object.current_underlay + lighting_overlay.underlays += backdrop + lighting_overlay.blend_mode = BLEND_MULTIPLY + lighting += lighting_overlay for(var/i in T.contents) var/atom/A = i if(!A.invisibility || (see_ghosts && isobserver(A))) @@ -41,6 +54,12 @@ for(var/i in turfs) var/turf/T = i atoms += T + if(T.lighting_object) + var/obj/effect/appearance_clone/lighting_overlay = new(T) + lighting_overlay.appearance = T.lighting_object.current_underlay + lighting_overlay.underlays += backdrop + lighting_overlay.blend_mode = BLEND_MULTIPLY + lighting += lighting_overlay for(var/atom/movable/A in T) if(A.invisibility) if(!(see_ghosts && isobserver(A))) @@ -50,6 +69,7 @@ var/icon/res = icon('icons/blanks/96x96.dmi', "nothing") res.Scale(psize_x, psize_y) + atoms += lighting var/list/sorted = list() var/j @@ -57,7 +77,19 @@ var/atom/c = atoms[i] for(j = sorted.len, j > 0, --j) var/atom/c2 = sorted[j] - if((c2.plane <= c.plane) && (c2.layer <= c.layer)) + if(c2.plane > c.plane) + continue + if(c2.plane < c.plane) + break + var/c_position = PHYSICAL_POSITION(c) + var/c2_position = PHYSICAL_POSITION(c2) + // If you are above me, I layer above you + if(c2_position - 32 >= c_position) + break + // If I am above you you will always layer above me + if(c2_position <= c_position - 32) + continue + if(c2.layer < c.layer) break sorted.Insert(j+1, c) CHECK_TICK @@ -80,32 +112,34 @@ for(var/X in sorted) //these are clones var/obj/effect/appearance_clone/clone = X var/icon/img = getFlatIcon(clone, no_anim = TRUE) - if(img) - // Center of the image in X - var/xo = (clone.x - center.x) * world.icon_size + clone.pixel_x + xcomp + clone.step_x - // Center of the image in Y - var/yo = (clone.y - center.y) * world.icon_size + clone.pixel_y + ycomp + clone.step_y - - if(clone.transform) // getFlatIcon doesn't give a snot about transforms. - var/datum/decompose_matrix/decompose = clone.transform.decompose() - // Scale in X, Y - if(decompose.scale_x != 1 || decompose.scale_y != 1) - var/base_w = img.Width() - var/base_h = img.Height() - // scale_x can be negative - img.Scale(base_w * abs(decompose.scale_x), base_h * decompose.scale_y) - if(decompose.scale_x < 0) - img.Flip(EAST) - xo -= base_w * (decompose.scale_x - SIGN(decompose.scale_x)) / 2 * SIGN(decompose.scale_x) - yo -= base_h * (decompose.scale_y - 1) / 2 - // Rotation - if(decompose.rotation != 0) - img.Turn(decompose.rotation) - // Shift - xo += decompose.shift_x - yo += decompose.shift_y - - res.Blend(img, blendMode2iconMode(clone.blend_mode), xo, yo) + if(!img) + CHECK_TICK + continue + // Center of the image in X + var/xo = (clone.x - center.x) * world.icon_size + clone.pixel_x + xcomp + clone.step_x + // Center of the image in Y + var/yo = (clone.y - center.y) * world.icon_size + clone.pixel_y + ycomp + clone.step_y + + if(clone.transform) // getFlatIcon doesn't give a snot about transforms. + var/datum/decompose_matrix/decompose = clone.transform.decompose() + // Scale in X, Y + if(decompose.scale_x != 1 || decompose.scale_y != 1) + var/base_w = img.Width() + var/base_h = img.Height() + // scale_x can be negative + img.Scale(base_w * abs(decompose.scale_x), base_h * decompose.scale_y) + if(decompose.scale_x < 0) + img.Flip(EAST) + xo -= base_w * (decompose.scale_x - SIGN(decompose.scale_x)) / 2 * SIGN(decompose.scale_x) + yo -= base_h * (decompose.scale_y - 1) / 2 + // Rotation + if(decompose.rotation != 0) + img.Turn(decompose.rotation) + // Shift + xo += decompose.shift_x + yo += decompose.shift_y + + res.Blend(img, blendMode2iconMode(clone.blend_mode), xo, yo) CHECK_TICK if(!silent) @@ -116,5 +150,9 @@ if(wipe_atoms) QDEL_LIST(atoms) + else + QDEL_LIST(lighting) return res + +#undef PHYSICAL_POSITION diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm index 1f60a4eefb4cb..c8564b15f1215 100644 --- a/code/modules/plumbing/plumbers/_plumb_machinery.dm +++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm @@ -109,6 +109,17 @@ */ /datum/reagents/plumbing +/** + * Same as the parent trans_to except only a few arguments have impact here & the rest of the arguments are discarded. + * Arguments + * + * * atom/target - the target we are transfering to + * * amount - amount to transfer + * * datum/reagent/target_id - the reagent id we want to transfer. if null everything gets transfered + * * methods - this is key for deciding between round-robin or proportional transfer. It does not mean the same as the + * parent proc. LINEAR for round robin(in this technique reagents are missing/lost/not preserved when there isn't enough space to hold them) + * NONE means everything is transfered regardless of how much space is available in the receiver in proportions + */ /datum/reagents/plumbing/trans_to( atom/target, amount = 1, @@ -118,7 +129,7 @@ no_react = FALSE, //unused for plumbing we always want reactions mob/transferred_by, //unused for plumbing logging is not important inside plumbing machines remove_blacklisted = FALSE, //unused for plumbing, we don't care what reagents are inside us - methods = NONE, //unused for plumbing + methods = LINEAR, //default round robin technique for transferring reagents show_message = TRUE, //unused for plumbing, used for logging only ignore_stomach = FALSE //unused for plumbing, reagents flow only between machines & is not injected to mobs at any point in time ) @@ -139,8 +150,6 @@ else target_holder = target.reagents - var/cached_amount = amount - // Prevents small amount problems, as well as zero and below zero amounts. amount = round(min(amount, total_volume, target_holder.maximum_volume - target_holder.total_volume), CHEMICAL_QUANTISATION_LEVEL) if(amount <= 0) @@ -153,32 +162,43 @@ var/list/reagents_to_remove = list() var/transfer_amount var/transfered_amount - var/to_transfer = amount var/total_transfered_amount = 0 + var/round_robin = methods & LINEAR + var/part + var/to_transfer + if(round_robin) + to_transfer = amount + else + part = amount / total_volume + //first add reagents to target for(var/datum/reagent/reagent as anything in cached_reagents) - if(!to_transfer) + if(round_robin && !to_transfer) break if(!isnull(target_id)) if(reagent.type == target_id) force_stop_reagent_reacting(reagent) - transfer_amount = min(to_transfer, reagent.volume) + transfer_amount = min(amount, reagent.volume) else continue else - transfer_amount = min(to_transfer, reagent.volume) + if(round_robin) + transfer_amount = min(to_transfer, reagent.volume) + else + transfer_amount = reagent.volume * part - if(reagent.intercept_reagents_transfer(target_holder, cached_amount)) + if(reagent.intercept_reagents_transfer(target_holder, amount)) continue - transfered_amount = target_holder.add_reagent(reagent.type, transfer_amount * multiplier, copy_data(reagent), chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT) //we only handle reaction after every reagent has been transferred. + transfered_amount = target_holder.add_reagent(reagent.type, transfer_amount, copy_data(reagent), chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT) //we only handle reaction after every reagent has been transferred. if(!transfered_amount) continue reagents_to_remove += list(list("R" = reagent, "T" = transfer_amount)) total_transfered_amount += transfered_amount - to_transfer -= transfered_amount + if(round_robin) + to_transfer -= transfered_amount if(!isnull(target_id)) break diff --git a/code/modules/plumbing/plumbers/bottler.dm b/code/modules/plumbing/plumbers/bottler.dm index 5f63a3070bd2a..b3421e9ffc362 100644 --- a/code/modules/plumbing/plumbers/bottler.dm +++ b/code/modules/plumbing/plumbers/bottler.dm @@ -2,6 +2,7 @@ name = "chemical bottler" desc = "Puts reagents into containers, like bottles and beakers in the tile facing the green light spot, they will exit on the red light spot if successfully filled." icon_state = "bottler" + reagents = /datum/reagents layer = ABOVE_ALL_MOB_LAYER plane = ABOVE_GAME_PLANE reagent_flags = TRANSPARENT | DRAINABLE diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index 41b641e139358..a29e1860a33a7 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -772,7 +772,7 @@ icon_state = "floor" brightness = 4 light_angle = 360 - layer = LOW_OBJ_LAYER + layer = ABOVE_OPEN_TURF_LAYER plane = FLOOR_PLANE light_type = /obj/item/light/bulb fitting = "bulb" @@ -789,4 +789,6 @@ /obj/machinery/light/floor/transport name = "transport light" break_if_moved = FALSE + // has to render above tram things (trams are stupid) layer = BELOW_OPEN_DOOR_LAYER + plane = GAME_PLANE diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index 7f1ef8fc2e3a8..4514c89b862e2 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -29,6 +29,7 @@ By design, d1 is the smallest direction and d2 is the highest icon = 'icons/obj/pipes_n_cables/pipe_cleaner.dmi' icon_state = "0-1" layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER + plane = FLOOR_PLANE anchored = TRUE obj_flags = CAN_BE_HIT color = CABLE_HEX_COLOR_RED diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index b86098e27a814..63e82df9700c5 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -239,6 +239,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) QDEL_NULL(radio) QDEL_NULL(countdown) if(is_main_engine && GLOB.main_supermatter_engine == src) + SSpersistence.reset_delam_counter() // NOVA EDIT ADDITION BEGIN - DELAM SCRAM GLOB.main_supermatter_engine = null QDEL_NULL(soundloop) return ..() diff --git a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm index eabb07d113792..b1c66da35dca5 100644 --- a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm +++ b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(sm_delam_list, list( if (sm.is_main_engine) SSpersistence.delam_highscore = SSpersistence.rounds_since_engine_exploded SSpersistence.rounds_since_engine_exploded = ROUNDCOUNT_ENGINE_JUST_EXPLODED - for (var/obj/machinery/incident_display/sign as anything in GLOB.map_delamination_counters) + for (var/obj/machinery/incident_display/sign as anything in GLOB.map_incident_displays) sign.update_delam_count(ROUNDCOUNT_ENGINE_JUST_EXPLODED) qdel(sm) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index b9313ae26ba78..a3bdd2b55bd79 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -129,6 +129,8 @@ density = TRUE wants_powernet = FALSE + circuit = /obj/item/circuitboard/machine/grounding_rod + can_buckle = TRUE buckle_lying = 0 buckle_requires_restraints = TRUE diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index 3a7c3fcb59d36..4c5c24a3eec89 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -20,6 +20,10 @@ /obj/item/ammo_casing/strilka310/enchanted projectile_type = /obj/projectile/bullet/strilka310/enchanted +/obj/item/ammo_casing/strilka310/phasic + name = ".310 Strilka phasic bullet casing" + desc = "A phasic .310 Strika bullet casing. " + projectile_type = /obj/projectile/bullet/strilka310/phasic // .223 (M-90gl Carbine) /obj/item/ammo_casing/a223 diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index b604c5f8eac0d..1fb6cbbf94dc5 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -128,6 +128,12 @@ name = "stripper clip (.310 Surplus)" ammo_type = /obj/item/ammo_casing/strilka310/surplus +/obj/item/ammo_box/strilka310/phasic + name = "stripper clip (.310 Phasic)" + desc = "A stripper clip filled with phasic bullets, hastily developed after an incident where a misfire resulted in the destruction of Atrakor Silverscale's priceless Vigoxian Fabergé egg. \ + These fancy bullets pass right though valuables until they end up in a far less expensive human skull." + ammo_type = /obj/item/ammo_casing/strilka310/phasic + /obj/item/ammo_box/n762 name = "ammo box (7.62x38mmR)" icon_state = "10mmbox" diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm index 8c6abaa0e7798..863f29508dac0 100644 --- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm @@ -9,6 +9,9 @@ /obj/item/ammo_box/magazine/internal/boltaction/surplus ammo_type = /obj/item/ammo_casing/strilka310/surplus +/obj/item/ammo_box/magazine/internal/boltaction/phasic + ammo_type = /obj/item/ammo_casing/strilka310/phasic + /obj/item/ammo_box/magazine/internal/boltaction/pipegun name = "pipegun internal magazine" caliber = CALIBER_JUNK diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 21ddb63211e63..8604e21b32503 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -159,6 +159,7 @@ You are now probably one of the few people in the universe to ever hold an \"Obrez Moderna\". \ All you had to do was take an allen wrench to the stock to take it off. But no, you just had to \ go for the saw." + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/phasic /obj/item/gun/ballistic/rifle/boltaction/prime/Initialize(mapload) . = ..() diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index ea36ad633db66..e35f7161686bf 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -139,12 +139,14 @@ icon_state = "scatterlaser" range = 255 damage = 6 + var/size_per_tile = 0.1 + var/max_scale = 4 /obj/projectile/beam/laser/accelerator/Range() ..() damage += 7 transform = 0 - transform *= 1 + (((damage - 6)/7) * 0.2)//20% larger per tile + transform *= min(1 + (decayedRange - range) * size_per_tile, max_scale) ///X-ray gun diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 2f9ed7b44e02b..a7352645d8b93 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -1215,7 +1215,8 @@ /// Fetches embedding data /obj/projectile/proc/get_embed() - return embed_type ? (embed_data ||= get_embed_by_type(embed_type)) : null + RETURN_TYPE(/datum/embed_data) + return embed_type ? (embed_data ||= get_embed_by_type(embed_type)) : embed_data /obj/projectile/proc/set_embed(datum/embed_data/embed) if(embed_data == embed) diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index 7e29b7e5c244d..6f14df2f4c8bd 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -35,6 +35,10 @@ damage = 20 stamina = 80 +/obj/projectile/bullet/strilka310/phasic + name = "phasic .310 bullet" + projectile_phasing = PASSTABLE | PASSGLASS | PASSGRILLE | PASSCLOSEDTURF | PASSMACHINE | PASSSTRUCTURE | PASSDOORS + // Harpoons (Harpoon Gun) /obj/projectile/bullet/harpoon diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm index 182bb715466d3..43d7968b9ae72 100644 --- a/code/modules/projectiles/projectile/special/temperature.dm +++ b/code/modules/projectiles/projectile/special/temperature.dm @@ -24,6 +24,13 @@ // the new body temperature is adjusted by the bullet's effect temperature L.adjust_bodytemperature((1 - blocked) * temperature) + if(isobj(target)) + var/obj/objectification = target + + if(objectification.reagents) + var/datum/reagents/reagents = objectification.reagents + reagents?.expose_temperature(temperature) + /obj/projectile/temp/hot name = "heat beam" icon_state = "lava" @@ -32,7 +39,14 @@ /obj/projectile/temp/cryo name = "cryo beam" range = 9 - temperature = -240 // Single slow shot reduces temp greatly + temperature = -350 // Single slow shot reduces temp greatly + +/obj/projectile/temp/cryo/on_hit(atom/target, blocked = 0, pierce_hit) + . = ..() + + if(isliving(target)) + var/mob/living/living_target = target + living_target.apply_status_effect(/datum/status_effect/freezing_blast) /obj/projectile/temp/cryo/on_range() var/turf/T = get_turf(src) @@ -45,17 +59,27 @@ name = "hot beam" icon_state = "firebeam" // sets on fire, diff sprite! range = 9 - temperature = 240 + temperature = 350 /obj/projectile/temp/pyro/on_hit(atom/target, blocked, pierce_hit) . = ..() if(!.) return - var/mob/living/living_target = target - if(!istype(living_target)) + + if(isobj(target)) + var/obj/objectification = target + + if(objectification.resistance_flags & ON_FIRE) //Don't burn something already on fire + return + + objectification.fire_act(temperature) + return - living_target.adjust_fire_stacks(2) - living_target.ignite_mob() + + if(isliving(target)) + var/mob/living/living_target = target + living_target.adjust_fire_stacks(2) + living_target.ignite_mob() /obj/projectile/temp/pyro/on_range() var/turf/location = get_turf(src) diff --git a/code/modules/reagents/chemistry/holder/holder.dm b/code/modules/reagents/chemistry/holder/holder.dm index 0c300c3896b0e..46d00e765a343 100644 --- a/code/modules/reagents/chemistry/holder/holder.dm +++ b/code/modules/reagents/chemistry/holder/holder.dm @@ -440,8 +440,6 @@ target_holder = target.reagents target_atom = target - var/cached_amount = amount - // Prevents small amount problems, as well as zero and below zero amounts. amount = round(min(amount, total_volume, target_holder.maximum_volume - target_holder.total_volume), CHEMICAL_QUANTISATION_LEVEL) if(amount <= 0) @@ -477,7 +475,7 @@ if(preserve_data) trans_data = copy_data(reagent) - if(reagent.intercept_reagents_transfer(target_holder, cached_amount)) + if(reagent.intercept_reagents_transfer(target_holder, amount)) continue transfered_amount = target_holder.add_reagent(reagent.type, transfer_amount * multiplier, trans_data, chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT) //we only handle reaction after every reagent has been transferred. if(!transfered_amount) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 06d9561744fad..f7aadf04b8cc7 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -331,6 +331,9 @@ var/datum/reagents/holder = beaker.reagents var/to_dispense = max(0, min(amount, holder.maximum_volume - holder.total_volume)) + if(!to_dispense) + say("The container is full!") + return if(!cell.use(to_dispense * power_cost)) say("Not enough energy to complete operation!") return diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 87fb4cbf2797a..194ce35eebd37 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -6,14 +6,13 @@ // Part of the food code. Also is where all the food // condiments, additives, and such go. - /datum/reagent/consumable name = "Consumable" taste_description = "generic food" taste_mult = 4 inverse_chem_val = 0.1 inverse_chem = null - creation_purity = 0.5 // 50% pure by default. Below - synthetic food. Above - natural food. + creation_purity = CONSUMABLE_STANDARD_PURITY /// How much nutrition this reagent supplies var/nutriment_factor = 1 /// affects mood, typically higher for mixed drinks with more complex recipes' diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 579be761c8e2b..2861fe995abf5 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1376,7 +1376,7 @@ . = ..() affected_mob.add_traits(list(TRAIT_SLEEPIMMUNE, TRAIT_BATON_RESISTANCE), type) affected_mob.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown) - RegisterSignal(affected_mob, COMSIG_CARBON_ENTER_STAMCRIT, PROC_REF(on_stamcrit)) + RegisterSignal(affected_mob, COMSIG_LIVING_ENTER_STAMCRIT, PROC_REF(on_stamcrit)) /datum/reagent/medicine/changelingadrenaline/on_mob_end_metabolize(mob/living/affected_mob) . = ..() @@ -1384,7 +1384,7 @@ affected_mob.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown) affected_mob.remove_status_effect(/datum/status_effect/dizziness) affected_mob.remove_status_effect(/datum/status_effect/jitter) - UnregisterSignal(affected_mob, COMSIG_CARBON_ENTER_STAMCRIT) + UnregisterSignal(affected_mob, COMSIG_LIVING_ENTER_STAMCRIT) /datum/reagent/medicine/changelingadrenaline/proc/on_stamcrit(mob/living/affected_mob) SIGNAL_HANDLER diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 6695b0b9db15d..5e553fce962c5 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -1275,14 +1275,14 @@ /datum/reagent/toxin/tetrodotoxin name = "Tetrodotoxin" - description = "A colorless, oderless, tasteless neurotoxin usually carried by livers of animals of the Tetraodontiformes order." + description = "A colorless, odorless, tasteless neurotoxin usually carried by livers of animals of the Tetraodontiformes order." silent_toxin = TRUE reagent_state = SOLID color = COLOR_VERY_LIGHT_GRAY metabolization_rate = 0.1 * REAGENTS_METABOLISM toxpwr = 0 taste_mult = 0 - chemical_flags = REAGENT_NO_RANDOM_RECIPE + chemical_flags = REAGENT_NO_RANDOM_RECIPE|REAGENT_CAN_BE_SYNTHESIZED var/list/traits_not_applied = list( TRAIT_PARALYSIS_L_ARM = BODY_ZONE_L_ARM, TRAIT_PARALYSIS_R_ARM = BODY_ZONE_R_ARM, @@ -1302,7 +1302,7 @@ if(SPT_PROB(5, seconds_per_tick)) var/obj/item/organ/internal/tongue/tongue = affected_mob.get_organ_slot(ORGAN_SLOT_TONGUE) if(tongue) - to_chat(affected_mob, span_warning("your [tongue.name] feels numb...")) + to_chat(affected_mob, span_warning("Your [tongue.name] feels numb...")) affected_mob.set_slurring_if_lower(5 SECONDS * REM * seconds_per_tick) affected_mob.adjust_disgust(3.5 * REM * seconds_per_tick) if(13 to 21) @@ -1331,7 +1331,7 @@ affected_mob.adjust_disgust(3 * REM * seconds_per_tick) affected_mob.set_slurring_if_lower(3 SECONDS * REM * seconds_per_tick) if(SPT_PROB(5, seconds_per_tick)) - to_chat(affected_mob, span_danger("you feel horribly weak.")) + to_chat(affected_mob, span_danger("You feel horribly weak.")) need_mob_update += affected_mob.adjustStaminaLoss(5 * REM * seconds_per_tick, updating_stamina = FALSE) if(SPT_PROB(8, seconds_per_tick)) paralyze_limb(affected_mob) @@ -1352,7 +1352,7 @@ if(current_cycle > 38 && !length(traits_not_applied) && SPT_PROB(5, seconds_per_tick) && !affected_mob.undergoing_cardiac_arrest()) affected_mob.set_heartattack(TRUE) - to_chat(affected_mob, span_danger("you feel a burning pain spread throughout your chest, oh no...")) + to_chat(affected_mob, span_bolddanger("You feel a burning pain spread throughout your chest!")) if(need_mob_update) return UPDATE_MOB_HEALTH @@ -1360,9 +1360,8 @@ /datum/reagent/toxin/tetrodotoxin/proc/paralyze_limb(mob/living/affected_mob) if(!length(traits_not_applied)) return - var/added_trait = pick(traits_not_applied) + var/added_trait = pick_n_take(traits_not_applied) ADD_TRAIT(affected_mob, added_trait, REF(src)) - traits_not_applied -= added_trait /datum/reagent/toxin/tetrodotoxin/on_mob_metabolize(mob/living/affected_mob) . = ..() diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index d561d0db48792..629e0e96937db 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -140,7 +140,7 @@ name = "mannitol pill" desc = "Used to treat brain damage." icon_state = "pill17" - list_reagents = list(/datum/reagent/medicine/mannitol = 14) + list_reagents = list(/datum/reagent/medicine/mannitol = 15) rename_with_volume = TRUE /obj/item/reagent_containers/pill/sansufentanyl diff --git a/code/modules/requests/request_manager.dm b/code/modules/requests/request_manager.dm index 74a40304f7aed..99a9bba1cc84f 100644 --- a/code/modules/requests/request_manager.dm +++ b/code/modules/requests/request_manager.dm @@ -243,12 +243,10 @@ GLOBAL_DATUM_INIT(requests, /datum/request_manager, new) return TRUE /datum/request_manager/ui_data(mob/user) - . = list( - "requests" = list() - ) + var/list/data = list() for (var/ckey in requests) for (var/datum/request/request as anything in requests[ckey]) - var/list/data = list( + data["requests"] += list(list( "id" = request.id, "req_type" = request.req_type, "owner" = request.owner ? "[REF(request.owner)]" : null, @@ -258,8 +256,8 @@ GLOBAL_DATUM_INIT(requests, /datum/request_manager, new) "additional_info" = request.additional_information, "timestamp" = request.timestamp, "timestamp_str" = gameTimestamp(wtime = request.timestamp) - ) - .["requests"] += list(data) + )) + return data #undef REQUEST_PRAYER #undef REQUEST_CENTCOM diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 2f059b5b538b5..53aeb467a2f1a 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -2613,6 +2613,18 @@ RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY ) +/datum/design/module/mirage + name = "Mirage Grenade Dispenser Module" + id = "mod_mirage_grenade" + materials = list( + /datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/bluespace =HALF_SHEET_MATERIAL_AMOUNT, + ) + build_path = /obj/item/mod/module/dispenser/mirage + category = list( + RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SECURITY + ) + //MODsuit bepis modules /datum/design/module/disposal name = "Disposal Connector Module" diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index cbd05593a3c11..27dbbca1d179c 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -566,6 +566,24 @@ ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL +/datum/design/cyberimp_herculean + name = "Herculean Gravitronic Spinal Implant" + desc = "This gravitronic spinal interface allows the user to reduce the impact of gravity on their body, effectively improving athletic performance." + id = "ci-herculean" + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB + construction_time = 4 SECONDS + materials = list( + /datum/material/iron =SMALL_MATERIAL_AMOUNT*5, + /datum/material/titanium=SMALL_MATERIAL_AMOUNT*3, + /datum/material/gold=SMALL_MATERIAL_AMOUNT*3, + /datum/material/diamond =SMALL_MATERIAL_AMOUNT*5, + ) + build_path = /obj/item/organ/internal/cyberimp/chest/spine + category = list( + RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH + ) + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + /datum/design/cyberimp_nutriment name = "Nutriment Pump Implant" desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are starving." diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 1360c25a23c4a..e7c02c199aa44 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -96,7 +96,6 @@ /obj/item/construction/rcd, /obj/item/grenade, /obj/item/aicard, - /obj/item/storage/backpack/holding, /obj/item/slime_extract, /obj/item/transfer_valve)) @@ -254,16 +253,16 @@ visible_message(span_notice("[exp_on] is gripped in just the right way, enhancing its focus.")) malfunction_probability_coeff_modifier++ RefreshParts() //recalculate malfunction_probability_coeff - else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!")) for(var/mob/living/m in oview(1, src)) m.apply_damage(15, BRUTE, pick(BODY_ZONE_HEAD,BODY_ZONE_CHEST,BODY_ZONE_CHEST)) investigate_log("Experimentor dealt minor brute to [m].", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) - else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] malfunctions!")) exp = SCANTYPE_OBLITERATE - else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src] malfunctions, throwing the [exp_on]!")) var/mob/living/target = locate(/mob/living) in oview(7,src) if(target) @@ -275,23 +274,23 @@ //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_IRRADIATE) visible_message(span_danger("[src] reflects radioactive rays at [exp_on]!")) - if(prob(EFFECT_PROB_LOW) && criticalReaction) + if(prob(EFFECT_PROB_VERYLOW) && criticalReaction) visible_message(span_notice("[exp_on] has activated an unknown subroutine!")) cloneMode = TRUE investigate_log("Experimentor has made a clone of [exp_on]", INVESTIGATE_EXPERIMENTOR) ejectItem() - else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src] malfunctions, melting [exp_on] and leaking radiation!")) radiation_pulse(src, max_range = 6, threshold = 0.3) ejectItem(TRUE) - else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] malfunctions, spewing toxic waste!")) for(var/turf/T in oview(1, src)) if(!T.density) if(prob(EFFECT_PROB_VERYHIGH) && !(locate(/obj/effect/decal/cleanable/greenglow) in T)) var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T) reagentdecal.reagents.add_reagent(/datum/reagent/uranium/radium, 7) - else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01)) var/savedName = "[exp_on]" ejectItem(TRUE) var/newPath = text2path(pick_weight(valid_items())) @@ -308,7 +307,7 @@ if(prob(EFFECT_PROB_LOW) && criticalReaction) visible_message(span_notice("[exp_on] achieves the perfect mix!")) new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src)))) - else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src] destroys [exp_on], leaking dangerous gas!")) chosenchem = pick(/datum/reagent/carbon,/datum/reagent/uranium/radium,/datum/reagent/toxin,/datum/reagent/consumable/condensedcapsaicin,/datum/reagent/drug/mushroomhallucinogen,/datum/reagent/drug/space_drugs,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/ethanol/beepsky_smash) var/datum/reagents/tmp_holder = new/datum/reagents(50) @@ -321,7 +320,7 @@ smoke.start() qdel(tmp_holder) ejectItem(TRUE) - else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src]'s chemical chamber has sprung a leak!")) chosenchem = pick(/datum/reagent/mutationtoxin/classic,/datum/reagent/cyborg_mutation_nanomachines,/datum/reagent/toxin/acid) var/datum/reagents/tmp_holder = new/datum/reagents(50) @@ -335,10 +334,10 @@ ejectItem(TRUE) warn_admins(usr, "[chosenchem] smoke") investigate_log("Experimentor has released [chosenchem] smoke!", INVESTIGATE_EXPERIMENTOR) - else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] malfunctions, spewing harmless gas.")) throwSmoke(loc) - else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] melts [exp_on], ionizing the air around it!")) empulse(loc, 4, 6) investigate_log("Experimentor has generated an Electromagnetic Pulse.", INVESTIGATE_EXPERIMENTOR) @@ -356,7 +355,7 @@ C.name = "Cup of Suspicious Liquid" C.desc = "It has a large hazard symbol printed on the side in fading ink." investigate_log("Experimentor has made a cup of [chosenchem] coffee.", INVESTIGATE_EXPERIMENTOR) - else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) var/turf/start = get_turf(src) var/mob/M = locate(/mob/living) in view(src, 3) var/turf/MT = get_turf(M) @@ -366,12 +365,12 @@ var/obj/projectile/magic/fireball/FB = new /obj/projectile/magic/fireball(start) FB.preparePixelProjectile(MT, start) FB.fire() - else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src] malfunctions, melting [exp_on] and releasing a burst of flame!")) explosion(src, devastation_range = -1, flame_range = 2, adminlog = FALSE) investigate_log("Experimentor started a fire.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) - else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] malfunctions, melting [exp_on] and leaking hot air!")) var/datum/gas_mixture/env = loc.return_air() if(env) @@ -380,7 +379,7 @@ air_update_turf(FALSE, FALSE) investigate_log("Experimentor has released hot air.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) - else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] malfunctions, activating its emergency coolant systems!")) throwSmoke(loc) for(var/mob/living/m in oview(1, src)) @@ -400,7 +399,7 @@ C.name = "Cup of Suspicious Liquid" C.desc = "It has a large hazard symbol printed on the side in fading ink." investigate_log("Experimentor has made a cup of [chosenchem] coffee.", INVESTIGATE_EXPERIMENTOR) - else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!")) var/datum/reagents/tmp_holder = new/datum/reagents(50) tmp_holder.my_atom = src @@ -412,7 +411,7 @@ smoke.start() qdel(tmp_holder) ejectItem(TRUE) - else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] malfunctions, shattering [exp_on] and leaking cold air!")) var/datum/gas_mixture/env = loc.return_air() if(env) @@ -421,7 +420,7 @@ air_update_turf(FALSE, FALSE) investigate_log("Experimentor has released cold air.", INVESTIGATE_EXPERIMENTOR) ejectItem(TRUE) - else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!")) var/datum/effect_system/fluid_spread/smoke/smoke = new smoke.set_up(0, holder = src, location = loc) @@ -433,14 +432,14 @@ if(prob(EFFECT_PROB_LOW) && criticalReaction) visible_message(span_warning("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!")) new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src)))) - else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src]'s crusher goes way too many levels too high, crushing right through space-time!")) playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE, -3) investigate_log("Experimentor has triggered the 'throw things' reaction.", INVESTIGATE_EXPERIMENTOR) for(var/atom/movable/AM in oview(7,src)) if(!AM.anchored) AM.throw_at(src,10,1) - else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff)) + else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src]'s crusher goes one level too high, crushing right into space-time!")) playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE, -3) investigate_log("Experimentor has triggered the 'minor throw things' reaction.", INVESTIGATE_EXPERIMENTOR) @@ -467,7 +466,7 @@ ejectItem() //Global reactions - if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff) && loaded_item) + if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01) && loaded_item) var/globalMalf = rand(1,100) if(globalMalf < 15) visible_message(span_warning("[src]'s onboard detection system has malfunctioned!")) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index cc8e842f18e9a..91cf89582d369 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -96,6 +96,20 @@ Nothing else in the console has ID requirements. stored_research = tool.buffer return TRUE +/obj/machinery/computer/rdconsole/proc/enqueue_node(id, mob/user) + if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id]) + say("Node enqueue failed: Either no techweb is found, node is already researched or is not available!") + return FALSE + stored_research.enqueue_node(id, user) + return TRUE + +/obj/machinery/computer/rdconsole/proc/dequeue_node(id, mob/user) + if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id]) + say("Node dequeue failed: Either no techweb is found, node is already researched or is not available!") + return FALSE + stored_research.dequeue_node(id, user) + return TRUE + /obj/machinery/computer/rdconsole/proc/research_node(id, mob/user) if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id]) say("Node unlock failed: Either no techweb is found, node is already researched or is not available!") @@ -171,6 +185,7 @@ Nothing else in the console has ID requirements. return data data += list( "nodes" = list(), + "queue_nodes" = stored_research.research_queue_nodes, "experiments" = list(), "researched_designs" = stored_research.researched_designs, "points" = stored_research.research_points, @@ -194,6 +209,10 @@ Nothing else in the console has ID requirements. // Serialize all nodes to display for(var/v in stored_research.tiers) var/datum/techweb_node/n = SSresearch.techweb_node_by_id(v) + var/enqueued_by_user = FALSE + + if((v in stored_research.research_queue_nodes) && stored_research.research_queue_nodes[v] == user) + enqueued_by_user = TRUE // Ensure node is supposed to be visible if (stored_research.hidden_nodes[v]) @@ -201,8 +220,11 @@ Nothing else in the console has ID requirements. data["nodes"] += list(list( "id" = n.id, + "is_free" = n.is_free(stored_research), "can_unlock" = stored_research.can_unlock_node(n), + "have_experiments_done" = stored_research.have_experiments_for_node(n), "tier" = stored_research.tiers[n.id], + "enqueued_by_user" = enqueued_by_user )) // Get experiments and serialize them @@ -322,6 +344,12 @@ Nothing else in the console has ID requirements. if ("researchNode") research_node(params["node_id"], usr) return TRUE + if ("enqueueNode") + enqueue_node(params["node_id"], usr) + return TRUE + if ("dequeueNode") + dequeue_node(params["node_id"], usr) + return TRUE if ("ejectDisk") eject_disk(params["type"]) return TRUE diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm index 3c920f6b9a6fe..a85c4b82c1725 100644 --- a/code/modules/research/techweb/_techweb.dm +++ b/code/modules/research/techweb/_techweb.dm @@ -70,6 +70,12 @@ * Filled with nulls on init, populated only on publication. */ var/list/published_papers + /** + * Assoc list of nodes queued for automatic research when there are enough points available + * research_queue_nodes[node_id] = user_enqueued + */ + var/list/research_queue_nodes = list() + /datum/techweb/New() SSresearch.techwebs += src @@ -325,6 +331,40 @@ /datum/techweb/proc/printout_points() return techweb_point_display_generic(research_points) +/datum/techweb/proc/enqueue_node(id, mob/user) + var/mob/living/carbon/human/human_user = user + var/is_rd = FALSE + if(human_user.wear_id) + var/list/access = human_user.wear_id.GetAccess() + if(ACCESS_RD in access) + is_rd = TRUE + + if(id in research_queue_nodes) + if(is_rd) + research_queue_nodes.Remove(id) + else + return FALSE + + for(var/node_id in research_queue_nodes) + if(research_queue_nodes[node_id] == user) + research_queue_nodes.Remove(node_id) + + if (is_rd) + research_queue_nodes.Insert(1, id) + research_queue_nodes[id] = user + + return TRUE + +/datum/techweb/proc/dequeue_node(id, mob/user) + if(!(id in research_queue_nodes)) + return FALSE + if(research_queue_nodes[id] != user) + return FALSE + + research_queue_nodes.Remove(id) + + return TRUE + /datum/techweb/proc/research_node_id(id, force, auto_update_points, get_that_dosh_id) return research_node(SSresearch.techweb_node_by_id(id), force, auto_update_points, get_that_dosh_id) @@ -377,6 +417,10 @@ if (MC_RUNNING()) log_research(log_message) + // Dequeue + if(node.id in research_queue_nodes) + research_queue_nodes.Remove(node.id) + return TRUE /datum/techweb/proc/unresearch_node_id(id) diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm index 7714946a4d290..9b26ca860d88d 100644 --- a/code/modules/research/techweb/_techweb_node.dm +++ b/code/modules/research/techweb/_techweb_node.dm @@ -95,6 +95,17 @@ return actual_costs +/datum/techweb_node/proc/is_free(datum/techweb/host) + var/list/costs = get_price(host) + var/total_points = 0 + + for(var/point_type in costs) + total_points += costs[point_type] + + if(total_points == 0) + return TRUE + return FALSE + /datum/techweb_node/proc/price_display(datum/techweb/TN) return techweb_point_display_generic(get_price(TN)) diff --git a/code/modules/research/techweb/nodes/cyborg_nodes.dm b/code/modules/research/techweb/nodes/cyborg_nodes.dm index 447ee2dc7f3b9..5e0ad2f64e0e9 100644 --- a/code/modules/research/techweb/nodes/cyborg_nodes.dm +++ b/code/modules/research/techweb/nodes/cyborg_nodes.dm @@ -90,7 +90,7 @@ /datum/techweb_node/borg_utility id = TECHWEB_NODE_BORG_UTILITY - display_name = "Untility Cyborg Upgrades" + display_name = "Utility Cyborg Upgrades" description = "Let them wipe our floors for us." prereq_ids = list(TECHWEB_NODE_BORG_SERVICES, TECHWEB_NODE_SANITATION) design_ids = list( @@ -152,6 +152,7 @@ "ci-breather", "ci-nutriment", "ci-thrusters", + "ci-herculean", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) diff --git a/code/modules/research/techweb/nodes/engi_nodes.dm b/code/modules/research/techweb/nodes/engi_nodes.dm index 626dd6981d0ce..0fe1b7bd75f33 100644 --- a/code/modules/research/techweb/nodes/engi_nodes.dm +++ b/code/modules/research/techweb/nodes/engi_nodes.dm @@ -104,7 +104,6 @@ "s_filter", "s_transmitter", "s_treatment", - "gigabeacon", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS) diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm index 7d6db08f584e7..f5b122ccd287d 100644 --- a/code/modules/research/techweb/nodes/medbay_nodes.dm +++ b/code/modules/research/techweb/nodes/medbay_nodes.dm @@ -28,6 +28,7 @@ "syringe", "dropper", "pillbottle", + "xlarge_beaker", ) experiments_to_unlock = list( /datum/experiment/autopsy/human, @@ -43,7 +44,6 @@ description = "Synthesizing complex chemicals from electricity and thin air... Don't ask how..." prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP) design_ids = list( - "xlarge_beaker", "med_spray_bottle", "medigel", "medipen_refiller", @@ -53,29 +53,19 @@ "portable_chem_mixer", "chem_heater", "w-recycler", - ) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) - -/datum/techweb_node/plumbing - id = TECHWEB_NODE_PLUMBING - display_name = "Plumbing" - description = "Essential infrastructure for building chemical factories. To scale up the production of happy pills to an industrial level." - prereq_ids = list(TECHWEB_NODE_CHEM_SYNTHESIS) - design_ids = list( + "meta_beaker", "plumbing_rcd", "plumbing_rcd_service", "plunger", "fluid_ducts", - "meta_beaker", - "piercesyringe", ) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) /datum/techweb_node/medbay_equip_adv id = TECHWEB_NODE_MEDBAY_EQUIP_ADV display_name = "Advanced Medbay Equipment" description = "State-of-the-art medical gear for keeping the crew in one piece — mostly." - prereq_ids = list(TECHWEB_NODE_PLUMBING) + prereq_ids = list(TECHWEB_NODE_CHEM_SYNTHESIS) design_ids = list( "smoke_machine", "chem_mass_spec", @@ -85,6 +75,7 @@ "defibrillator_compact", "defibmount", "medicalbed_emergency", + "piercesyringe", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) required_experiments = list(/datum/experiment/scanning/reagent/haloperidol) diff --git a/code/modules/research/techweb/nodes/modsuit_nodes.dm b/code/modules/research/techweb/nodes/modsuit_nodes.dm index 7fc7342ea410e..d4e30e9cd5d8f 100644 --- a/code/modules/research/techweb/nodes/modsuit_nodes.dm +++ b/code/modules/research/techweb/nodes/modsuit_nodes.dm @@ -83,6 +83,7 @@ description = "Security suits for space crime handling." prereq_ids = list(TECHWEB_NODE_MOD_EQUIP) design_ids = list( + "mod_mirage_grenade", "mod_plating_security", "mod_stealth", "mod_mag_harness", diff --git a/code/modules/research/techweb/nodes/research_nodes.dm b/code/modules/research/techweb/nodes/research_nodes.dm index 0a37fb19868a3..b70d9582681ce 100644 --- a/code/modules/research/techweb/nodes/research_nodes.dm +++ b/code/modules/research/techweb/nodes/research_nodes.dm @@ -45,6 +45,7 @@ "blutrash", "light_replacer_blue", "bluespacebodybag", + "gigabeacon", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS) required_experiments = list(/datum/experiment/scanning/points/bluespace_crystal) diff --git a/code/modules/security_levels/security_level_datums.dm b/code/modules/security_levels/security_level_datums.dm index b3402f643c6bf..d5a2e74e8080e 100644 --- a/code/modules/security_levels/security_level_datums.dm +++ b/code/modules/security_levels/security_level_datums.dm @@ -13,6 +13,10 @@ var/announcement_color = "default" /// The numerical level of this security level, see defines for more information. var/number_level = -1 + /// Icon state that will be displayed on displays during this security level + var/status_display_icon_state + /// The color of the fire alarm light set when changed to this security level + var/fire_alarm_light_color /// The sound that we will play when this security level is set var/sound /// The looping sound that will be played while the security level is set @@ -47,6 +51,8 @@ announcement_color = "green" sound = 'sound/misc/notice2.ogg' // Friendly beep number_level = SEC_LEVEL_GREEN + status_display_icon_state = "greenalert" + fire_alarm_light_color = LIGHT_COLOR_BLUEGREEN lowering_to_configuration_key = /datum/config_entry/string/alert_green shuttle_call_time_mod = ALERT_COEFF_GREEN @@ -60,6 +66,8 @@ announcement_color = "blue" sound = 'sound/misc/notice1.ogg' // Angry alarm number_level = SEC_LEVEL_BLUE + status_display_icon_state = "bluealert" + fire_alarm_light_color = LIGHT_COLOR_ELECTRIC_CYAN lowering_to_configuration_key = /datum/config_entry/string/alert_blue_downto elevating_to_configuration_key = /datum/config_entry/string/alert_blue_upto shuttle_call_time_mod = ALERT_COEFF_BLUE @@ -74,6 +82,8 @@ announcement_color = "red" sound = 'sound/misc/notice3.ogg' // More angry alarm number_level = SEC_LEVEL_RED + status_display_icon_state = "redalert" + fire_alarm_light_color = LIGHT_COLOR_FLARE lowering_to_configuration_key = /datum/config_entry/string/alert_red_downto elevating_to_configuration_key = /datum/config_entry/string/alert_red_upto shuttle_call_time_mod = ALERT_COEFF_RED @@ -88,5 +98,7 @@ announcement_color = "purple" sound = 'sound/misc/airraid.ogg' // Air alarm to signify importance number_level = SEC_LEVEL_DELTA + status_display_icon_state = "deltaalert" + fire_alarm_light_color = LIGHT_COLOR_INTENSE_RED elevating_to_configuration_key = /datum/config_entry/string/alert_delta shuttle_call_time_mod = ALERT_COEFF_DELTA diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index e5b4b0eb02439..484fa32ac8777 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -403,7 +403,6 @@ desc = "Communism powerful force." icon = 'icons/effects/96x96.dmi' icon_state = "communist" - layer = ABOVE_OPEN_TURF_LAYER pixel_x = -32 pixel_y = -32 diff --git a/code/modules/surgery/blood_filter.dm b/code/modules/surgery/blood_filter.dm index 14be3c09a6deb..ff0fc34c4a44f 100644 --- a/code/modules/surgery/blood_filter.dm +++ b/code/modules/surgery/blood_filter.dm @@ -68,7 +68,7 @@ if(target.reagents?.total_volume) for(var/datum/reagent/chem as anything in target.reagents.reagent_list) if(!length(bloodfilter.whitelist) || (chem.type in bloodfilter.whitelist)) - target.reagents.remove_reagent(chem.type, min(round(chem.volume * 0.22, 0.2), 10)) + target.reagents.remove_reagent(chem.type, clamp(round(chem.volume * 0.22, 0.2), 0.4, 10)) target.adjustToxLoss(-2, forced = TRUE) //BUBBER EDIT - Filtration fixes toxins display_results( user, diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 3d31d8f91ed88..dbb50db944bb5 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -1437,12 +1437,6 @@ receive_damage(brute_damage, burn_damage) do_sparks(number = 1, cardinal_only = FALSE, source = owner || src) - //BUBBERSTATION EDIT START: LIMB SPECIFIC EFFECTS ONLY APPLIED IF THERE IS DAMAGE, OR IF IT'S A JOINTED LIMB (LIKE LEGS, ARMS, OR HEAD) - if(protection & EMP_PROTECT_SELF) - return FALSE - //BUBBERSTAION EDIT END. - - if(can_be_disabled && (get_damage() / max_damage) >= robotic_emp_paralyze_damage_percent_threshold) ADD_TRAIT(src, TRAIT_PARALYSIS, EMP_TRAIT) addtimer(TRAIT_CALLBACK_REMOVE(src, TRAIT_PARALYSIS, EMP_TRAIT), time_needed) diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index b70313409fe8b..8a407104a5eb0 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -67,18 +67,18 @@ if(wounding_type != WOUND_BURN && isturf(chest_owner.loc) && can_bleed()) chest_owner.add_splatter_floor(chest_owner.loc) playsound(get_turf(chest_owner), 'sound/misc/splort.ogg', 80, TRUE) - for(var/obj/item/organ/organ in contents) + var/list/droppable_organs= list()// BUBBER EDIT BEGIN - One at a time + for(var/obj/item/organ/droppable in contents) + droppable_organs |= droppable + var/obj/item/organ/organ = pick(droppable_organs)// BUBBER EDIT - Random organ Drop + if(organ)// BUBBER EDIT: OG: for(var/obj/item/organ/organ in contents) -- BUBBER EDIT END // SKYRAT EDIT START - Non-spillable organs if(!organ.drop_when_organ_spilling) - continue + return // BUBBER EDIT - OG: continue // SKYRAT EDIT END var/org_zone = check_zone(organ.zone) if(org_zone != BODY_ZONE_CHEST) - continue - //BUBBERSTATION CHANGE: FIXES ORGAN SPILLING. - if(!organ.drop_when_organ_spilling) - continue - //BUBBERSTATION CHANGE END. + return // BUBBER EDIT- OG: continue organ.Remove(chest_owner) organ.forceMove(chest_owner.loc) . += organ diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 6e3b5ca921bc4..fdfbce9c76180 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -210,12 +210,12 @@ ..() /obj/item/bodypart/arm/left/clear_ownership(mob/living/carbon/old_owner) + . = ..() if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_ARM)) UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM)) REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM) else UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM)) - ..() ///Proc to react to the owner gaining the TRAIT_PARALYSIS_L_ARM trait. /obj/item/bodypart/arm/left/proc/on_owner_paralysis_gain(mob/living/carbon/source) @@ -308,12 +308,12 @@ ..() /obj/item/bodypart/arm/right/clear_ownership(mob/living/carbon/old_owner) + . = ..() if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_ARM)) UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM)) REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM) else UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM)) - ..() ///Proc to react to the owner gaining the TRAIT_PARALYSIS_R_ARM trait. /obj/item/bodypart/arm/right/proc/on_owner_paralysis_gain(mob/living/carbon/source) @@ -429,12 +429,12 @@ ..() /obj/item/bodypart/leg/left/clear_ownership(mob/living/carbon/old_owner) + . = ..() if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_LEG)) UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG)) REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG) else UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG)) - ..() ///Proc to react to the owner gaining the TRAIT_PARALYSIS_L_ARM trait. /obj/item/bodypart/leg/left/proc/on_owner_paralysis_gain(mob/living/carbon/source) @@ -518,12 +518,12 @@ ..() /obj/item/bodypart/leg/right/clear_ownership(mob/living/carbon/old_owner) + . = ..() if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_LEG)) UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG)) REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG) else UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG)) - ..() ///Proc to react to the owner gaining the TRAIT_PARALYSIS_R_LEG trait. /obj/item/bodypart/leg/right/proc/on_owner_paralysis_gain(mob/living/carbon/source) diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm index deda90bdd6e9a..4c7382f3daee4 100644 --- a/code/modules/surgery/core_removal.dm +++ b/code/modules/surgery/core_removal.dm @@ -37,23 +37,15 @@ /datum/surgery_step/extract_core/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/mob/living/basic/slime/target_slime = target - if(target_slime.cores > 0) - target_slime.cores-- + var/core_count = target_slime.cores + if(core_count && target_slime.try_extract_cores(count = core_count)) display_results( user, target, - span_notice("You successfully extract a core from [target]. [target_slime.cores] core\s remaining."), - span_notice("[user] successfully extracts a core from [target]!"), - span_notice("[user] successfully extracts a core from [target]!"), + span_notice("You successfully extract [core_count] core\s from [target]."), + span_notice("[user] successfully extracts [core_count] core\s from [target]!"), + span_notice("[user] successfully extracts [core_count] core\s from [target]!"), ) - - new target_slime.slime_type.core_type(target_slime.loc) - - if(target_slime.cores <= 0) - target_slime.icon_state = "[target_slime.slime_type.colour] baby slime dead-nocore" - return ..() - else - return FALSE - else - to_chat(user, span_warning("There aren't any cores left in [target]!")) - return ..() + return TRUE + to_chat(user, span_warning("There aren't any cores left in [target]!")) + return ..() diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm index a2eeb4eac32ca..324b2c538b840 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm @@ -137,6 +137,7 @@ /obj/item/organ/internal/cyberimp/arm/proc/Retract() if(!active_item || (active_item in src)) return FALSE + active_item.resistance_flags = active_item::resistance_flags if(owner) owner.visible_message( span_notice("[owner] retracts [active_item] back into [owner.p_their()] [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm."), diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm index 24aadfeca14f6..046c84200d1eb 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm @@ -260,3 +260,60 @@ deactivate(silent = TRUE) return FALSE + +/obj/item/organ/internal/cyberimp/chest/spine + name = "\improper Herculean gravitronic spinal implant" + desc = "This gravitronic spinal interface is able to improve the athletics of a user, allowing them greater physical ability. \ + Contains a slot which can be upgraded with a gravity anomaly core, improving its performance." + implant_color = "#15704c" + slot = ORGAN_SLOT_SPINE + /// How much faster does the spinal implant improve our lifting speed, workout ability, reducing falling damage and improving climbing and standing speed + var/athletics_boost_multiplier = 0.8 + /// How much additional throwing range does our spinal implant grant us. + var/added_throw_range = 2 + /// How much additional boxing damage and tackling power do we add? + var/strength_bonus = 4 + /// Whether or not a gravity anomaly core has been installed, improving the effectiveness of the spinal implant. + var/core_applied = FALSE + /// The overlay for our implant to indicate that, yes, this person has an implant inserted. + var/mutable_appearance/stone_overlay + +/obj/item/organ/internal/cyberimp/chest/spine/emp_act(severity) + . = ..() + if(!owner || . & EMP_PROTECT_SELF) + return + to_chat(owner, span_warning("You feel sheering pain as your body is crushed like a soda can!")) + owner.apply_damage(20/severity, BRUTE, def_zone = BODY_ZONE_CHEST) + +/obj/item/organ/internal/cyberimp/chest/spine/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + stone_overlay = mutable_appearance(icon = 'icons/effects/effects.dmi', icon_state = "stone") + organ_owner.add_overlay(stone_overlay) + if(core_applied) + organ_owner.AddElement(/datum/element/forced_gravity, 1) + +/obj/item/organ/internal/cyberimp/chest/spine/on_mob_remove(mob/living/carbon/organ_owner, special) + . = ..() + if(stone_overlay) + organ_owner.cut_overlay(stone_overlay) + stone_overlay = null + if(core_applied) + organ_owner.RemoveElement(/datum/element/forced_gravity, 1) + +/obj/item/organ/internal/cyberimp/chest/spine/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + . = ..() + if(core_applied) + user.balloon_alert(user, "core already installed!") + return ITEM_INTERACT_BLOCKING + + if(istype(tool, /obj/item/assembly/signaler/anomaly/grav)) + user.balloon_alert(user, "core installed.") + athletics_boost_multiplier = 0.25 + added_throw_range += 2 + strength_bonus += 4 + core_applied = TRUE + name = "\improper Atlas gravitonic spinal implant" + desc = "This gravitronic spinal interface is able to improve the athletics of a user, allowing them greater physical ability. \ + This one has been improved through the installation of a gravity anomaly core, allowing for personal gravity manipulation." + qdel(tool) + return ITEM_INTERACT_SUCCESS diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm index 89c6f9c96a411..a50912416ef87 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm @@ -119,12 +119,12 @@ /obj/item/organ/internal/cyberimp/brain/anti_stun/on_mob_remove(mob/living/carbon/implant_owner) . = ..() UnregisterSignal(implant_owner, signalCache) - UnregisterSignal(implant_owner, COMSIG_CARBON_ENTER_STAMCRIT) + UnregisterSignal(implant_owner, COMSIG_LIVING_ENTER_STAMCRIT) /obj/item/organ/internal/cyberimp/brain/anti_stun/on_mob_insert(mob/living/carbon/receiver) . = ..() RegisterSignals(receiver, signalCache, PROC_REF(on_signal)) - RegisterSignal(receiver, COMSIG_CARBON_ENTER_STAMCRIT, PROC_REF(on_stamcrit)) + RegisterSignal(receiver, COMSIG_LIVING_ENTER_STAMCRIT, PROC_REF(on_stamcrit)) /obj/item/organ/internal/cyberimp/brain/anti_stun/proc/on_signal(datum/source, amount) SIGNAL_HANDLER @@ -139,23 +139,23 @@ /obj/item/organ/internal/cyberimp/brain/anti_stun/proc/clear_stuns() if(isnull(owner) || (organ_flags & ORGAN_FAILING) || !COOLDOWN_FINISHED(src, implant_cooldown)) return - + owner.SetStun(0) owner.SetKnockdown(0) owner.SetImmobilized(0) owner.SetParalyzed(0) owner.setStaminaLoss(0) addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living, setStaminaLoss), 0), stun_resistance_time) - + var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread sparks.set_up(5, 1, src) sparks.start() owner.add_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_BATON_RESISTANCE, TRAIT_STUNIMMUNE), REF(src)) - addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_IGNOREDAMAGESLOWDOWN, REF(src)), stun_resistance_time) + addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_IGNOREDAMAGESLOWDOWN, REF(src)), stun_resistance_time) addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_BATON_RESISTANCE, REF(src)), stun_resistance_time) addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_STUNIMMUNE, REF(src)), stun_resistance_time) - + COOLDOWN_START(src, implant_cooldown, 60 SECONDS) addtimer(CALLBACK(src, PROC_REF(implant_ready)),60 SECONDS) @@ -171,7 +171,7 @@ addtimer(CALLBACK(src, PROC_REF(reboot)), 90 / severity) /obj/item/organ/internal/cyberimp/brain/anti_stun/proc/reboot() - organ_flags &= ~ORGAN_FAILING + organ_flags &= ~ORGAN_FAILING implant_ready() //[[[[MOUTH]]]] diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm index a47639fe0e673..ee2f19a8a10a7 100644 --- a/code/modules/surgery/organs/internal/tongue/_tongue.dm +++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm @@ -187,38 +187,36 @@ liked_foodtypes = GORE | MEAT | SEAFOOD | NUTS | BUGS disliked_foodtypes = GRAIN | DAIRY | CLOTH | GROSS voice_filter = @{"[0:a] asplit [out0][out2]; [out0] asetrate=%SAMPLE_RATE%*0.9,aresample=%SAMPLE_RATE%,atempo=1/0.9,aformat=channel_layouts=mono,volume=0.2 [p0]; [out2] asetrate=%SAMPLE_RATE%*1.1,aresample=%SAMPLE_RATE%,atempo=1/1.1,aformat=channel_layouts=mono,volume=0.2[p2]; [p0][0][p2] amix=inputs=3"} + var/static/list/speech_replacements = list( + new /regex("s+", "g") = "sss", + new /regex("S+", "g") = "SSS", + new /regex(@"(\w)x", "g") = "$1kss", + //new /regex(@"(\w)X", "g") = "$1KSSS", // SKYRAT EDIT REMOVAL + new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1", + new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1", + ) + // SKYRAT EDIT ADDITION START - Russian version + var/static/list/russian_speech_replacements = list( + new /regex("s+", "g") = "sss", + new /regex("S+", "g") = "SSS", + new /regex(@"(\w)x", "g") = "$1kss", + new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1", + new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1", + new /regex(@"(\w)x", "g") = "$1kss", + new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1", + new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1", + new /regex("с+", "g") = "ссс", + new /regex("С+", "g") = "ССС", + "з" = "с", + "З" = "С", + "ж" = "ш", + "Ж" = "Ш", + ) + // SKYRAT EDIT ADDITION END -/obj/item/organ/internal/tongue/lizard/modify_speech(datum/source, list/speech_args) - var/static/regex/lizard_hiss = new("s+", "g") - var/static/regex/lizard_hiSS = new("S+", "g") - var/static/regex/lizard_kss = new(@"(\w)x", "g") - /* // SKYRAT EDIT: REMOVAL - var/static/regex/lizard_kSS = new(@"(\w)X", "g") - */ - var/static/regex/lizard_ecks = new(@"\bx([\-|r|R]|\b)", "g") - var/static/regex/lizard_eckS = new(@"\bX([\-|r|R]|\b)", "g") - var/message = speech_args[SPEECH_MESSAGE] - if(message[1] != "*") - message = lizard_hiss.Replace(message, "sss") - message = lizard_hiSS.Replace(message, "SSS") - message = lizard_kss.Replace(message, "$1kss") - /* // SKYRAT EDIT: REMOVAL - message = lizard_kSS.Replace(message, "$1KSS") - */ - message = lizard_ecks.Replace(message, "ecks$1") - message = lizard_eckS.Replace(message, "ECKS$1") - //SKYRAT EDIT START: Adding russian version to autohiss - if(CONFIG_GET(flag/russian_text_formation)) - var/static/regex/lizard_hiss_ru = new("с+", "g") - var/static/regex/lizard_hiSS_ru = new("С+", "g") - message = replacetext(message, "з", "с") - message = replacetext(message, "З", "С") - message = replacetext(message, "ж", "ш") - message = replacetext(message, "Ж", "Ш") - message = lizard_hiss_ru.Replace(message, "ссс") - message = lizard_hiSS_ru.Replace(message, "ССС") - //SKYRAT EDIT END: Adding russian version to autohiss - speech_args[SPEECH_MESSAGE] = message +/obj/item/organ/internal/tongue/lizard/New(class, timer, datum/mutation/human/copymut) + . = ..() + AddComponent(/datum/component/speechmod, replacements = CONFIG_GET(flag/russian_text_formation) ? russian_speech_replacements : speech_replacements) // SKYRAT EDIT CHANGE - ORIGINAL: AddComponent(/datum/component/speechmod, replacements = speech_replacements) /obj/item/organ/internal/tongue/lizard/silver name = "silver tongue" diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index 5172900fcc395..4058348b179ed 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -194,7 +194,7 @@ return if(target.stat >= UNCONSCIOUS) var/datum/mood_event/surgery/target_mood_event = target.mob_mood.mood_events[SURGERY_MOOD_CATEGORY] - if(target_mood_event?.surgery_completed) //don't give sleeping mobs trauma. that said, if they fell asleep mid-surgery after already getting the bad mood, lets make sure they wake up to a (hopefully) happy memory. + if(!target_mood_event || target_mood_event.surgery_completed) //don't give sleeping mobs trauma. that said, if they fell asleep mid-surgery after already getting the bad mood, lets make sure they wake up to a (hopefully) happy memory. return switch(surgery_state) if(SURGERY_STATE_STARTED) diff --git a/code/modules/transport/tram/tram_floors.dm b/code/modules/transport/tram/tram_floors.dm index 9f0b6907fe9c1..f267ccf5cdc84 100644 --- a/code/modules/transport/tram/tram_floors.dm +++ b/code/modules/transport/tram/tram_floors.dm @@ -183,7 +183,7 @@ integrity_failure = 0.75 armor_type = /datum/armor/tram_floor layer = TRAM_FLOOR_LAYER - plane = FLOOR_PLANE + plane = GAME_PLANE obj_flags = BLOCK_Z_OUT_DOWN | BLOCK_Z_OUT_UP appearance_flags = PIXEL_SCALE|KEEP_TOGETHER var/secured = TRUE diff --git a/code/modules/transport/tram/tram_signals.dm b/code/modules/transport/tram/tram_signals.dm index db8aa17ddcb3e..faf4a46e11e28 100644 --- a/code/modules/transport/tram/tram_signals.dm +++ b/code/modules/transport/tram/tram_signals.dm @@ -473,6 +473,7 @@ icon_state = "sensor-base" desc = "Uses an infrared beam to detect passing trams. Works when paired with a sensor on the other side of the track." layer = TRAM_RAIL_LAYER + plane = FLOOR_PLANE use_power = NO_POWER_USE circuit = /obj/item/circuitboard/machine/guideway_sensor /// Sensors work in a married pair diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm index 268452743e7b2..104601f2f6ca3 100644 --- a/code/modules/transport/transport_module.dm +++ b/code/modules/transport/transport_module.dm @@ -14,7 +14,7 @@ armor_type = /datum/armor/transport_module max_integrity = 50 layer = TRAM_FLOOR_LAYER - plane = FLOOR_PLANE + plane = GAME_PLANE smoothing_flags = SMOOTH_BITMASK smoothing_groups = SMOOTH_GROUP_INDUSTRIAL_LIFT canSmoothWith = SMOOTH_GROUP_INDUSTRIAL_LIFT diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 48efd14e44ee8..d6917605cf59a 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -96,6 +96,7 @@ #include "armor_verification.dm" #include "atmospherics_sanity.dm" #include "autowiki.dm" +#include "bake_a_cake.dm" #include "barsigns.dm" #include "baseturfs.dm" #include "bespoke_id.dm" @@ -214,6 +215,7 @@ #include "pills.dm" #include "plane_double_transform.dm" #include "plane_dupe_detector.dm" +#include "plane_sanity.dm" #include "plantgrowth_tests.dm" #include "preference_species.dm" #include "preferences.dm" diff --git a/code/modules/unit_tests/bake_a_cake.dm b/code/modules/unit_tests/bake_a_cake.dm new file mode 100644 index 0000000000000..a4013d1c13794 --- /dev/null +++ b/code/modules/unit_tests/bake_a_cake.dm @@ -0,0 +1,77 @@ +/** + * Confirm that it is possible to bake a cake, get the food buff from a hand-made food and confirm that the reagents are consistent throughout the process + */ +/datum/unit_test/bake_a_cake/Run() + var/turf/table_loc = run_loc_floor_bottom_left + var/turf/oven_loc = get_step(run_loc_floor_bottom_left, EAST) + var/turf/human_loc = get_step(run_loc_floor_bottom_left, NORTHEAST) + var/mob/living/carbon/human/human = allocate(/mob/living/carbon/human/consistent, human_loc) + var/obj/machinery/oven/the_oven = allocate(/obj/machinery/oven, oven_loc) + var/obj/structure/table/the_table = allocate(/obj/structure/table, table_loc) + var/obj/item/knife/kitchen/a_knife = allocate(/obj/item/knife/kitchen, table_loc) + var/obj/item/reagent_containers/cup/beaker/beaker = allocate(/obj/item/reagent_containers/cup/beaker, table_loc) + var/obj/item/reagent_containers/condiment/flour/flour_bag = allocate(/obj/item/reagent_containers/condiment/flour, table_loc) + var/obj/item/reagent_containers/condiment/sugar/sugar_bag = allocate(/obj/item/reagent_containers/condiment/sugar, table_loc) + var/obj/item/storage/fancy/egg_box/egg_box = allocate(/obj/item/storage/fancy/egg_box, table_loc) + var/obj/item/food/egg/sample_egg = egg_box.contents[1] + + var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cakebatter] + var/sugar_required = recipe.required_reagents[/datum/reagent/consumable/sugar] + var/flour_required = recipe.required_reagents[/datum/reagent/consumable/flour] + var/eggyolk_required = recipe.required_reagents[/datum/reagent/consumable/eggyolk] + var/eggwhite_required = recipe.required_reagents[/datum/reagent/consumable/eggwhite] + var/total_volume = sugar_required + flour_required + eggyolk_required + eggwhite_required + + var/sugar_purity = sugar_bag.reagents.get_average_purity() + TEST_ASSERT_EQUAL(sugar_purity, 1, "Incorrect sugar purity!") + var/flour_purity = flour_bag.reagents.get_average_purity() + TEST_ASSERT_EQUAL(flour_purity, CONSUMABLE_STANDARD_PURITY, "Incorrect flour purity!") + var/egg_purity = sample_egg.reagents.get_average_purity() + TEST_ASSERT_EQUAL(egg_purity, CONSUMABLE_STANDARD_PURITY, "Incorrect egg reagents purity!") + + human.mind = new /datum/mind(null) // Add brain for the food buff + + // It's a piece of cake to bake a pretty cake + while(beaker.reagents.get_reagent_amount(/datum/reagent/consumable/sugar) < sugar_required && beaker.reagents.total_volume < total_volume) + sugar_bag.melee_attack_chain(human, beaker) + while(beaker.reagents.get_reagent_amount(/datum/reagent/consumable/flour) < flour_required && beaker.reagents.total_volume < total_volume) + flour_bag.melee_attack_chain(human, beaker) + while((beaker.reagents.get_reagent_amount(/datum/reagent/consumable/eggyolk) < eggyolk_required \ + || beaker.reagents.get_reagent_amount(/datum/reagent/consumable/eggwhite) < eggwhite_required) \ + && beaker.reagents.total_volume < total_volume \ + && beaker.reagents.total_volume >= (sugar_required + flour_required)) // Make sure that we won't miss the reaction + var/obj/item/egg = egg_box.contents[1] + egg.melee_attack_chain(human, beaker, RIGHT_CLICK) + var/obj/item/food/cake_batter = locate(/obj/item/food/cakebatter) in table_loc + TEST_ASSERT_NOTNULL(cake_batter, "Failed making cake batter!") + TEST_ASSERT_EQUAL(beaker.reagents.total_volume, 0, "Cake batter did not consume all beaker reagents!") + + var/batter_purity = cake_batter.reagents.get_average_purity() + var/batter_purity_expected = (sugar_required * sugar_purity + flour_required * flour_purity + (eggyolk_required + eggwhite_required) * egg_purity) / total_volume + TEST_ASSERT_EQUAL(batter_purity, batter_purity_expected, "Incorrect average purity of the cake batter reagents!") + + the_oven.add_tray_to_oven(new /obj/item/plate/oven_tray(the_oven)) // Doesn't have one unless maploaded + the_oven.attack_hand(human) + var/obj/item/plate/oven_tray/oven_tray = locate(/obj/item/plate/oven_tray) in the_oven.contents + TEST_ASSERT_NOTNULL(oven_tray, "The oven doesn't have a tray!") + cake_batter.melee_attack_chain(human, oven_tray, list2params(list(ICON_X = 0, ICON_Y = 0))) + the_oven.attack_hand(human) + the_oven.process(90 SECONDS) // Bake it + the_oven.attack_hand(human) + var/obj/item/food/cake/plain/cake = locate(/obj/item/food/cake/plain) in oven_tray.contents + TEST_ASSERT_NOTNULL(cake, "Didn't manage to bake a cake!") + + cake.melee_attack_chain(human, the_table, list2params(list(ICON_X = 0, ICON_Y = 0))) + a_knife.melee_attack_chain(human, cake) + var/obj/item/food/cakeslice/plain/cake_slice = locate(/obj/item/food/cakeslice/plain) in table_loc + TEST_ASSERT_NOTNULL(cake_slice, "Didn't manage to cut the cake!") + + var/cake_slice_purity = cake_slice.reagents.get_average_purity() + TEST_ASSERT_EQUAL(cake_slice_purity, batter_purity_expected, "Incorrect average purity of the cake slice reagents!") + + cake_slice.attack_hand(human) // Pick it up + var/datum/component/edible/edible_comp = cake_slice.GetComponent(/datum/component/edible) + edible_comp.eat_time = 0 + cake_slice.attack(human, human) // Eat it + var/datum/status_effect/food/effect = locate(/datum/status_effect/food) in human.status_effects + TEST_ASSERT_NOTNULL(effect, "Eating the cake had no effect!") diff --git a/code/modules/unit_tests/focus_only_tests.dm b/code/modules/unit_tests/focus_only_tests.dm index 15d04ee885233..31f34d9f2fb94 100644 --- a/code/modules/unit_tests/focus_only_tests.dm +++ b/code/modules/unit_tests/focus_only_tests.dm @@ -47,3 +47,6 @@ /// Checks that maploaded mobs with either the `atmos_requirements` or `body_temp_sensitive` /datum/unit_test/focus_only/atmos_and_temp_requirements + +/// Ensures only whitelisted planes can have TOPDOWN_LAYERing, and vis versa +/datum/unit_test/focus_only/topdown_filtering diff --git a/code/modules/unit_tests/plane_sanity.dm b/code/modules/unit_tests/plane_sanity.dm new file mode 100644 index 0000000000000..890a0531908a4 --- /dev/null +++ b/code/modules/unit_tests/plane_sanity.dm @@ -0,0 +1,10 @@ +/// Ensures we have no invalid plane/layer combos post init +/datum/unit_test/plane_layer_sanity + priority = TEST_LONGER + +/datum/unit_test/plane_layer_sanity/Run() + // This fucker's gonna be slow, I'm sorry + for(var/mutable_appearance/appearance) + check_topdown_validity(appearance) + for(var/atom/thing) + check_topdown_validity(thing) diff --git a/code/modules/unit_tests/turf_icons.dm b/code/modules/unit_tests/turf_icons.dm index e7b7d722ffb4a..f9d8296419edd 100644 --- a/code/modules/unit_tests/turf_icons.dm +++ b/code/modules/unit_tests/turf_icons.dm @@ -30,7 +30,7 @@ //ignored_types += typesof(YOUR_DOWNSTREAM_TYPEPATH(s)_HERE) //MODULARITY SUPPORT. If you have snowflake typepaths that are blacklisted in, for example, create & destroy unit test because they require certain SS's being init, use this to blacklist them. //SKYRAT EDIT START ignored_types += typesof(/turf/open/openspace/ocean) - ignored_types += typesof(/turf/open/floor/plating/ocean) + ignored_types += typesof(/turf/open/misc/ocean) // SKYRAT EDIT END diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm index 6fa148529b4d9..ea6e071de151f 100644 --- a/code/modules/uplink/uplink_devices.dm +++ b/code/modules/uplink/uplink_devices.dm @@ -48,11 +48,11 @@ hidden_uplink.uplink_handler.debug_mode = TRUE /obj/item/uplink/nuclear - uplink_flag = UPLINK_NUKE_OPS + uplink_flag = UPLINK_ALL_SYNDIE_OPS /obj/item/uplink/nuclear/debug name = "debug nuclear uplink" - uplink_flag = UPLINK_NUKE_OPS + uplink_flag = UPLINK_ALL_SYNDIE_OPS /obj/item/uplink/nuclear/debug/Initialize(mapload, owner, tc_amount = 9000, datum/uplink_handler/uplink_handler_override = null) . = ..() @@ -68,6 +68,10 @@ var/datum/component/uplink/hidden_uplink = GetComponent(/datum/component/uplink) hidden_uplink.allow_restricted = FALSE +///A subtype used for lone ops, with some of the stuff they shouldn't/can't access removed from purchase. +/obj/item/uplink/loneop + uplink_flag = UPLINK_LONE_OP + /obj/item/uplink/clownop uplink_flag = UPLINK_CLOWN_OPS diff --git a/code/modules/uplink/uplink_items/ammunition.dm b/code/modules/uplink/uplink_items/ammunition.dm index 5326880d31be6..705204f98a15b 100644 --- a/code/modules/uplink/uplink_items/ammunition.dm +++ b/code/modules/uplink/uplink_items/ammunition.dm @@ -13,14 +13,14 @@ cost = 2 surplus = 0 illegal_tech = FALSE - purchasable_from = ~UPLINK_NUKE_OPS + purchasable_from = ~UPLINK_SERIOUS_OPS /datum/uplink_item/ammo/pistol name = "9mm Handgun Magazine" desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol." item = /obj/item/ammo_box/magazine/m9mm cost = 1 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS illegal_tech = FALSE /datum/uplink_item/ammo/pistolap @@ -29,7 +29,7 @@ These rounds are less effective at injuring the target but penetrate protective gear." item = /obj/item/ammo_box/magazine/m9mm/ap cost = 2 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/ammo/pistolhp name = "9mm Hollow Point Magazine" @@ -37,7 +37,7 @@ These rounds are more damaging but ineffective against armour." item = /obj/item/ammo_box/magazine/m9mm/hp cost = 3 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/ammo/pistolfire name = "9mm Incendiary Magazine" @@ -45,7 +45,7 @@ Loaded with incendiary rounds which inflict little damage, but ignite the target." item = /obj/item/ammo_box/magazine/m9mm/fire cost = 2 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/ammo/revolver name = ".357 Speed Loader" @@ -53,5 +53,5 @@ For when you really need a lot of things dead." item = /obj/item/ammo_box/a357 cost = 4 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY) //nukies get their own version + purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) //nukies get their own version illegal_tech = FALSE diff --git a/code/modules/uplink/uplink_items/bundle.dm b/code/modules/uplink/uplink_items/bundle.dm index b708af62b69c9..f92435f379532 100644 --- a/code/modules/uplink/uplink_items/bundle.dm +++ b/code/modules/uplink/uplink_items/bundle.dm @@ -62,7 +62,7 @@ item = /obj/item/storage/box/syndicate/bundle_a cost = 20 stock_key = UPLINK_SHARED_STOCK_KITS - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY) + purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) /datum/uplink_item/bundles_tc/bundle_b name = "Syndi-kit Special" @@ -73,7 +73,7 @@ item = /obj/item/storage/box/syndicate/bundle_b cost = 20 stock_key = UPLINK_SHARED_STOCK_KITS - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY) + purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) /datum/uplink_item/bundles_tc/surplus name = "Syndicate Surplus Crate" @@ -82,7 +82,7 @@ Contents are sorted to always be worth 30 TC. The Syndicate will only provide one surplus item per agent." item = /obj/structure/closet/crate // will be replaced in purchase() cost = 20 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY) + purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) stock_key = UPLINK_SHARED_STOCK_SURPLUS /// Value of items inside the crate in TC var/crate_tc_value = 30 @@ -171,5 +171,5 @@ The Syndicate will only provide one surplus item per agent." cost = 20 item = /obj/item/syndicrate_key - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY) + purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) stock_key = UPLINK_SHARED_STOCK_SURPLUS diff --git a/code/modules/uplink/uplink_items/dangerous.dm b/code/modules/uplink/uplink_items/dangerous.dm index 970741876bb7a..11cca6c442661 100644 --- a/code/modules/uplink/uplink_items/dangerous.dm +++ b/code/modules/uplink/uplink_items/dangerous.dm @@ -13,7 +13,7 @@ item = /obj/item/gun/ballistic/automatic/pistol/toy/riot cost = 2 surplus = 10 - purchasable_from = ~UPLINK_NUKE_OPS + purchasable_from = ~UPLINK_SERIOUS_OPS /datum/uplink_item/dangerous/pistol name = "Makarov Pistol" @@ -21,7 +21,7 @@ with suppressors." item = /obj/item/gun/ballistic/automatic/pistol cost = 7 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/dangerous/throwingweapons name = "Box of Throwing Weapons" @@ -49,7 +49,7 @@ progression_minimum = 20 MINUTES item = /obj/item/melee/powerfist cost = 6 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/dangerous/rapid name = "Gloves of the North Star" @@ -66,7 +66,7 @@ item = /obj/item/dualsaber cost = 13 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) //nukies get their own version + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS //nukies get their own version /datum/uplink_item/dangerous/doublesword/get_discount_value(discount_type) switch(discount_type) @@ -85,7 +85,7 @@ item = /obj/item/guardian_creator/tech cost = 18 surplus = 0 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS restricted = TRUE refundable = TRUE @@ -95,7 +95,7 @@ item = /obj/item/gun/ballistic/revolver/syndicate cost = 13 surplus = 50 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) //nukies get their own version + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS //nukies get their own version /datum/uplink_item/dangerous/cat name = "Feral cat grenade" diff --git a/code/modules/uplink/uplink_items/device_tools.dm b/code/modules/uplink/uplink_items/device_tools.dm index c1e1b3ae5f5e6..869d3fd133cdf 100644 --- a/code/modules/uplink/uplink_items/device_tools.dm +++ b/code/modules/uplink/uplink_items/device_tools.dm @@ -92,7 +92,7 @@ item = /obj/item/computer_disk/syndicate/camera_app cost = 1 surplus = 90 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/device_tools/military_belt name = "Chest Rig" @@ -125,7 +125,7 @@ item = /obj/item/computer_disk/virus/frame cost = 4 restricted = TRUE - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/device_tools/frame/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) . = ..() @@ -141,7 +141,7 @@ cost = 1 surplus = 0 restricted = TRUE - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/device_tools/failsafe/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) var/datum/component/uplink/uplink = source.GetComponent(/datum/component/uplink) @@ -176,7 +176,7 @@ and wavelength, which controls the delay before the effect kicks in." item = /obj/item/healthanalyzer/rad_laser cost = 3 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/device_tools/suspiciousphone name = "Protocol CRAB-17 Phone" @@ -249,7 +249,7 @@ item = /obj/item/sbeacondrop cost = 10 surplus = 0 // not while there isnt one on any station - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/device_tools/powersink name = "Power Sink" diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm index e8fea4df2d611..ed19a5dead439 100644 --- a/code/modules/uplink/uplink_items/job.dm +++ b/code/modules/uplink/uplink_items/job.dm @@ -4,7 +4,7 @@ /datum/uplink_item/role_restricted category = /datum/uplink_category/role_restricted - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/role_restricted/haunted_magic_eightball name = "Haunted Magic Eightball" diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index 558124ad4a718..94a5e3b3de4fa 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -7,7 +7,7 @@ /datum/uplink_item/weapon_kits category = /datum/uplink_category/weapon_kits surplus = 40 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS // ~~ Ammunition Categories ~~ @@ -18,7 +18,7 @@ /datum/uplink_item/ammo_nuclear category = /datum/uplink_category/ammo_nuclear surplus = 40 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS // Basic: Run of the mill ammunition for various firearms /datum/uplink_item/ammo_nuclear/basic @@ -55,14 +55,14 @@ cost = 22 //freedom 5, doormag 3, c-4 1, stimpack 5, shield modsuit module 8 limited_stock = 1 cant_discount = TRUE - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS //Low-cost firearms: Around 8 TC each. Meant for easy squad weapon purchases /datum/uplink_item/weapon_kits/low_cost cost = 8 surplus = 40 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS // ~~ Bulldog Shotgun ~~ @@ -139,7 +139,7 @@ /datum/uplink_item/weapon_kits/medium_cost cost = 14 surplus = 20 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS // ~~ C-20r Submachine Gun ~~ @@ -172,7 +172,7 @@ Loaded with incendiary rounds which inflict little damage, but ignite the target." item = /obj/item/ammo_box/magazine/smgm45/incen cost = 4 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS // ~~ Energy Sword and Shield & CQC ~~ @@ -186,7 +186,7 @@ name = "CQC Equipment Case (Very Hard)" desc = "Contains a manual that instructs you in the ways of CQC, or Close Quarters Combat. Comes with a stealth implant, a pack of smokes and a snazzy bandana (use it with the hat stabilizers in your MODsuit)." item = /obj/item/storage/toolbox/guncase/cqc - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS + purchasable_from = UPLINK_ALL_SYNDIE_OPS surplus = 0 // ~~ Syndicate Revolver ~~ @@ -247,7 +247,7 @@ /datum/uplink_item/weapon_kits/high_cost cost = 18 surplus = 10 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS // ~~ L6 SAW Machine Gun ~~ @@ -377,14 +377,14 @@ desc = "A horribly outdated automatic weapon. Why would you want to use this? Comes with...rations." item = /obj/item/gun/ballistic/automatic/plastikov cost = 2 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS /datum/uplink_item/ammo_nuclear/surplus_smg name = "Surplus SMG Magazine (Surplus)" desc = "A cylindrical magazine designed for the PP-95 SMG." item = /obj/item/ammo_box/magazine/plastikov9mm cost = 1 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS illegal_tech = FALSE // Explosives and Grenades @@ -393,8 +393,7 @@ /datum/uplink_item/explosives/grenades cost = 15 surplus = 35 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS - + purchasable_from = UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/explosives/grenades/buzzkill name = "Buzzkill Grenade Box" desc = "A box with three grenades that release a swarm of angry bees upon activation. These bees indiscriminately attack friend or foe \ @@ -421,7 +420,7 @@ name = "Grenadier's Belt and Grenade Launcher Kit (Hard)" desc = "A belt containing 26 lethally dangerous and destructive grenades, along with a grenade launcher to fire them. Comes with an extra multitool and screwdriver." item = /obj/item/storage/box/syndie_kit/demoman - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS // ~~ Detonator: In case you lose the old one ~~ @@ -433,7 +432,7 @@ the blast radius before using the detonator." item = /obj/item/syndicatedetonator cost = 1 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS + purchasable_from = UPLINK_ALL_SYNDIE_OPS // Support (Borgs and Reinforcements) @@ -445,7 +444,7 @@ category = /datum/uplink_category/reinforcements surplus = 0 cost = 35 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS restricted = TRUE refundable = TRUE @@ -482,6 +481,7 @@ If you're a meathead who's just here to kill people and don't care about strategising or intel, you'll still have someone to bear witness to your murder-spree!" item = /obj/item/antag_spawner/nuke_ops/overwatch cost = 12 + purchasable_from = UPLINK_FIREBASE_OPS // ~~ Disposable Sentry Gun ~~ // Technically not a spawn but it is a kind of reinforcement...I guess. @@ -501,7 +501,7 @@ desc = "A box containing x-ray eyes, a CNS Rebooter and Reviver implant. Comes with an autosurgeon for each." item = /obj/item/storage/box/cyber_implants cost = 20 //worth 24 TC - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS /datum/uplink_item/bundles_tc/medical name = "Medical bundle" @@ -509,7 +509,7 @@ a Donksoft LMG, a box of riot darts and a magboot MODsuit module to rescue your friends in no-gravity environments." item = /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle cost = 25 // normally 31 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS /datum/uplink_item/bundles_tc/firestarter name = "Spetsnaz Pyro bundle" @@ -518,7 +518,7 @@ Order NOW and comrade Boris will throw in an extra tracksuit." item = /obj/item/storage/backpack/duffelbag/syndie/firestarter cost = 30 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS /datum/uplink_item/bundles_tc/induction_kit name = "Syndicate Induction Kit" @@ -538,7 +538,7 @@ A lighter is also included, though you must supply your own smokes." item = /obj/item/storage/box/syndie_kit/cowboy cost = 18 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS // Mech related gear @@ -549,7 +549,7 @@ /datum/uplink_item/mech category = /datum/uplink_category/mech surplus = 0 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS restricted = TRUE // ~~ Mechs ~~ @@ -575,21 +575,21 @@ desc = "A duffel bag containing ammo for four full reloads of the scattershotm which is equipped on standard Dark Gygax and Mauler exosuits. Also comes with some support equipment for maintaining the mech, including tools and an inducer." item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mech cost = 4 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS /datum/uplink_item/mech/support_bag/mauler name = "Mauler Ammo Bag" desc = "A duffel bag containing ammo for three full reloads of the LMG, scattershot carbine, and SRM-8 missile laucher that are equipped on a standard Mauler exosuit." item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mauler cost = 6 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS // Stealthy Tools /datum/uplink_item/stealthy_tools/syndigaloshes/nuke item = /obj/item/clothing/shoes/chameleon/noslip cost = 4 - purchasable_from = UPLINK_NUKE_OPS + purchasable_from = UPLINK_SERIOUS_OPS /datum/uplink_item/stealthy_weapons/romerol_kit name = "Romerol" @@ -598,7 +598,7 @@ along with slurred speech, aggression, and the ability to infect others with this agent." item = /obj/item/storage/box/syndie_kit/romerol cost = 25 - purchasable_from = UPLINK_CLOWN_OPS|UPLINK_NUKE_OPS + purchasable_from = UPLINK_ALL_SYNDIE_OPS cant_discount = TRUE // Modsuits @@ -608,7 +608,7 @@ desc = "An upgraded, elite version of the Syndicate MODsuit. It features fireproofing, and also \ provides the user with superior armor and mobility compared to the standard Syndicate MODsuit." item = /obj/item/mod/control/pre_equipped/elite - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY + purchasable_from = (UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) /datum/uplink_item/suits/energy_shield name = "MODsuit Energy Shield Module" @@ -616,28 +616,28 @@ before needing to recharge. Used wisely, this module will keep you alive for a lot longer." item = /obj/item/mod/module/energy_shield cost = 8 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY + purchasable_from = (UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) /datum/uplink_item/suits/emp_shield name = "MODsuit Advanced EMP Shield Module" desc = "An advanced EMP shield module for a MODsuit. It protects your entire body from electromagnetic pulses." item = /obj/item/mod/module/emp_shield/advanced cost = 5 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY + purchasable_from = (UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) /datum/uplink_item/suits/injector name = "MODsuit Injector Module" desc = "An injector module for a MODsuit. It is an extendable piercing injector with 30u capacity." item = /obj/item/mod/module/injector cost = 2 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY + purchasable_from = (UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) /datum/uplink_item/suits/holster name = "MODsuit Holster Module" desc = "A holster module for a MODsuit. It can stealthily store any not too heavy gun inside it." item = /obj/item/mod/module/holster cost = 2 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY + purchasable_from = (UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) /datum/uplink_item/device_tools/medgun_mod name = "Medbeam Gun Module" @@ -645,7 +645,7 @@ operatives in the fight, even while under fire. Don't cross the streams!" item = /obj/item/mod/module/medbeam cost = 15 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS + purchasable_from = UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/suits/syndi_intellicard name = "Pre-Loaded Syndicate Intellicard" @@ -653,7 +653,7 @@ However, due to failsafes activated during the extraction process, the AI is unable to interact with electronics from anywhere but direct proximity..." item = /obj/item/aicard/syndie/loaded cost = 12 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS + purchasable_from = UPLINK_ALL_SYNDIE_OPS refundable = TRUE /datum/uplink_item/suits/synd_ai_upgrade @@ -661,7 +661,7 @@ desc = "...unless you buy the Syndicate Upgrade! This data chip allows the captured AI to increase its interaction range by two tiles per application. The Syndicate recommends three or four purchases at most, for a total of seven or infinite meters of range." item = /obj/item/computer_disk/syndie_ai_upgrade cost = 4 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS + purchasable_from = UPLINK_ALL_SYNDIE_OPS cant_discount = TRUE refundable = TRUE @@ -675,6 +675,7 @@ surplus = 0 purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS restricted = TRUE + purchasable_from = UPLINK_FIREBASE_OPS /datum/uplink_item/device_tools/syndie_jaws_of_life name = "Syndicate Jaws of Life" @@ -682,7 +683,7 @@ In its crowbar configuration, it can be used to force open airlocks. Very useful for entering the station or its departments." item = /obj/item/crowbar/power/syndicate cost = 4 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY + purchasable_from = UPLINK_SERIOUS_OPS | UPLINK_SPY /datum/uplink_item/device_tools/medkit name = "Syndicate Combat Medic Kit" @@ -691,7 +692,7 @@ for faster healing on the field. Also comes with basic medical tools and sterlizer." item = /obj/item/storage/medkit/tactical cost = 4 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS + purchasable_from = UPLINK_SERIOUS_OPS /datum/uplink_item/device_tools/medkit/premium name = "Syndicate Combat Medical Suite" @@ -701,7 +702,7 @@ and some helpful MODsuit modules for for field medical use and operative physiopharmaceutical augmentation." item = /obj/item/storage/medkit/tactical/premium cost = 15 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS + purchasable_from = UPLINK_SERIOUS_OPS /datum/uplink_item/device_tools/potion name = "Syndicate Sentience Potion" @@ -709,7 +710,7 @@ desc = "A potion recovered at great risk by undercover Syndicate operatives and then subsequently modified with Syndicate technology. \ Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication and an internal ID card for opening doors." cost = 4 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY + purchasable_from = UPLINK_SERIOUS_OPS | UPLINK_SPY restricted = TRUE // Implants @@ -734,7 +735,7 @@ This will permanently destroy your body, however." item = /obj/item/storage/box/syndie_kit/imp_microbomb cost = 2 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_SPY + purchasable_from = UPLINK_SERIOUS_OPS | UPLINK_SPY /datum/uplink_item/implants/nuclear/macrobomb name = "Macrobomb Implant" @@ -750,7 +751,7 @@ Prevents collapsing from critical condition, but explodes after a while." item = /obj/item/storage/box/syndie_kit/imp_deniability cost = 6 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_SPY + purchasable_from = UPLINK_SERIOUS_OPS | UPLINK_SPY /datum/uplink_item/implants/nuclear/reviver name = "Reviver Implant" @@ -780,7 +781,7 @@ /datum/uplink_item/badass/costumes surplus = 0 - purchasable_from = UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS + purchasable_from = UPLINK_SERIOUS_OPS cost = 4 cant_discount = TRUE @@ -803,7 +804,6 @@ you can blow those corpo suits away with your very own home-made explosive devices. Made in your local firebase's \ very own Ordnance Laboratory! *The Syndicate is not responsible for injuries or deaths sustained while utilizing the lab." item = /obj/item/keycard/syndicate_bomb - purchasable_from = UPLINK_NUKE_OPS /datum/uplink_item/base_keys/bio_key name = "Syndicate Bio-Weapon Laboratory Access Card" @@ -840,4 +840,4 @@ desc = "Hat crate! Contains hats! HATS!!!" item = /obj/structure/closet/crate/large/hats cost = 5 - purchasable_from = UPLINK_CLOWN_OPS | UPLINK_NUKE_OPS + purchasable_from = UPLINK_ALL_SYNDIE_OPS diff --git a/code/modules/uplink/uplink_items/species.dm b/code/modules/uplink/uplink_items/species.dm index 5eb4bbdcb1776..5b76b745f9b52 100644 --- a/code/modules/uplink/uplink_items/species.dm +++ b/code/modules/uplink/uplink_items/species.dm @@ -4,7 +4,7 @@ /datum/uplink_item/species_restricted category = /datum/uplink_category/species - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY) + purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) /datum/uplink_item/species_restricted/moth_lantern name = "Extra-Bright Lantern" diff --git a/code/modules/uplink/uplink_items/stealthy.dm b/code/modules/uplink/uplink_items/stealthy.dm index fb450fb68df93..898b82d1b6ad2 100644 --- a/code/modules/uplink/uplink_items/stealthy.dm +++ b/code/modules/uplink/uplink_items/stealthy.dm @@ -13,7 +13,7 @@ item = /obj/item/gun/syringe/syndicate cost = 4 surplus = 50 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/stealthy_weapons/dehy_carp name = "Dehydrated Space Carp" @@ -67,7 +67,7 @@ item = /obj/item/storage/box/syndie_kit/origami_bundle cost = 4 surplus = 0 - purchasable_from = ~UPLINK_NUKE_OPS //clown ops intentionally left in, because that seems like some s-tier shenanigans. + purchasable_from = ~UPLINK_SERIOUS_OPS //clown ops intentionally left in, because that seems like some s-tier shenanigans. /datum/uplink_item/stealthy_weapons/martialarts @@ -78,7 +78,7 @@ progression_minimum = 30 MINUTES cost = 17 surplus = 0 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/stealthy_weapons/crossbow name = "Miniature Energy Crossbow" @@ -91,7 +91,7 @@ item = /obj/item/gun/energy/recharge/ebow cost = 10 surplus = 50 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/stealthy_weapons/contrabaton name = "Contractor Baton" diff --git a/code/modules/uplink/uplink_items/stealthy_tools.dm b/code/modules/uplink/uplink_items/stealthy_tools.dm index 59b8f6fca77e6..a225d04d6674e 100644 --- a/code/modules/uplink/uplink_items/stealthy_tools.dm +++ b/code/modules/uplink/uplink_items/stealthy_tools.dm @@ -30,7 +30,7 @@ Due to budget cuts, the shoes don't provide protection against slipping and skillchips are sold separately." item = /obj/item/storage/box/syndie_kit/chameleon cost = 2 - purchasable_from = ~UPLINK_NUKE_OPS //clown ops are allowed to buy this kit, since it's basically a costume + purchasable_from = ~UPLINK_NUKE_OPS //clown ops are allowed to buy this kit, since it's basically a costume, loneops can purchase it to blend in. /datum/uplink_item/stealthy_tools/syndigaloshes name = "No-Slip Chameleon Shoes" @@ -38,7 +38,7 @@ They do not work on heavily lubricated surfaces." item = /obj/item/clothing/shoes/chameleon/noslip cost = 2 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS) /datum/uplink_item/stealthy_tools/chameleon_proj name = "Chameleon Projector" @@ -75,7 +75,7 @@ item = /obj/item/reagent_containers/syringe/mulligan cost = 4 surplus = 30 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS) /datum/uplink_item/stealthy_tools/jammer name = "Radio Jammer" @@ -108,7 +108,7 @@ limited_stock = 1 cost = 4 restricted = TRUE - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) //Can still be purchased by loneops to give them an edge. /datum/uplink_item/stealthy_tools/telecomm_blackout/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) force_event(/datum/round_event_control/communications_blackout, "a syndicate virus") @@ -123,7 +123,7 @@ limited_stock = 1 cost = 6 restricted = TRUE - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) //Can still be purchased by loneops to give them an edge. /datum/uplink_item/stealthy_tools/blackout/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source) force_event(/datum/round_event_control/grid_check, "a syndicate virus") diff --git a/code/modules/uplink/uplink_items/suits.dm b/code/modules/uplink/uplink_items/suits.dm index 5d89f80506178..d940d4eb06769 100644 --- a/code/modules/uplink/uplink_items/suits.dm +++ b/code/modules/uplink/uplink_items/suits.dm @@ -17,7 +17,7 @@ as well as causing significant demoralization amongst Nanotrasen crew." item = /obj/item/mod/control/pre_equipped/infiltrator cost = 6 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS /datum/uplink_item/suits/space_suit name = "Syndicate Space Suit" @@ -32,7 +32,7 @@ desc = "The feared MODsuit of a Syndicate agent. Features armoring and a set of inbuilt modules." item = /obj/item/mod/control/pre_equipped/traitor cost = 8 - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS) //you can't buy it in nuke, because the elite modsuit costs the same while being better + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS //you can't buy it in nuke, because the elite modsuit costs the same while being better /datum/uplink_item/suits/thermal name = "MODsuit Thermal Visor Module" @@ -76,6 +76,6 @@ provides the user with superior armor and mobility compared to the standard Syndicate MODsuit." item = /obj/item/mod/control/pre_equipped/traitor_elite // This one costs more than the nuke op counterpart - purchasable_from = ~(UPLINK_NUKE_OPS | UPLINK_CLOWN_OPS | UPLINK_SPY) + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS progression_minimum = 90 MINUTES cost = 16 diff --git a/code/modules/wiremod/core/marker.dm b/code/modules/wiremod/core/marker.dm index 31821c6d8c3a7..65ed029213e30 100644 --- a/code/modules/wiremod/core/marker.dm +++ b/code/modules/wiremod/core/marker.dm @@ -3,6 +3,7 @@ desc = "A circuit multitool. Used to mark entities which can then be uploaded to components by pressing the upload button on a port. \ Acts as a normal multitool otherwise. Use in hand to clear marked entity so that you can mark another entity." icon_state = "multitool_circuit" + apc_scanner = FALSE // would conflict with mark clearing /// The marked atom of this multitool var/atom/marked_atom diff --git a/html/changelogs/AutoChangeLog-pr-1599.yml b/html/changelogs/AutoChangeLog-pr-1599.yml new file mode 100644 index 0000000000000..ba4f1a992d3fe --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1599.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - rscadd: "Adds Antag Tickets, a new currency that determines who gets antagonist roles." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1658.yml b/html/changelogs/AutoChangeLog-pr-1658.yml new file mode 100644 index 0000000000000..55f72e69d627c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1658.yml @@ -0,0 +1,4 @@ +author: "nevimer" +delete-after: True +changes: + - balance: "chest dismember only removes one organ per occurance" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1684.yml b/html/changelogs/AutoChangeLog-pr-1684.yml new file mode 100644 index 0000000000000..fc8df6021b837 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1684.yml @@ -0,0 +1,4 @@ +author: "Arturlang" +delete-after: True +changes: + - balance: "Bloodsuckers can only reach 560 max blood via drinking blood bags or the blood reagent, and bloodsuckers above level 4 will get 30% less blood and be disgusted by it." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1687.yml b/html/changelogs/AutoChangeLog-pr-1687.yml new file mode 100644 index 0000000000000..7eb29f90c4931 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1687.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - rscadd: "Adds Quote of the Round, an entirely cosmetic way of showing off a random ass message said on Common Radio. This does not ping people. By default, it is posted in the same channel as roundstart announcements." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1695.yml b/html/changelogs/AutoChangeLog-pr-1695.yml new file mode 100644 index 0000000000000..b8a4e498b947d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1695.yml @@ -0,0 +1,4 @@ +author: "xXPawnStarrXx" +delete-after: True +changes: + - rscadd: "Added new pods!" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1706.yml b/html/changelogs/AutoChangeLog-pr-1706.yml new file mode 100644 index 0000000000000..0f3ffc5fe503d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1706.yml @@ -0,0 +1,7 @@ +author: "Majkl-J" +delete-after: True +changes: + - balance: "Weight 8 for BS, Ling, Heretic" + - balance: "Weight 10 for malf" + - balance: "Weight 8 for spy and traitor" + - bugfix: "Fixes runtime in get_antag_cap()" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1726.yml b/html/changelogs/AutoChangeLog-pr-1726.yml new file mode 100644 index 0000000000000..692f189b99ac9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1726.yml @@ -0,0 +1,4 @@ +author: "Shroopy" +delete-after: True +changes: + - rscadd: "Added a GPS tracking collar to the LustWish" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1738.yml b/html/changelogs/AutoChangeLog-pr-1738.yml new file mode 100644 index 0000000000000..a5db695761d99 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1738.yml @@ -0,0 +1,4 @@ +author: "Majkl-J" +delete-after: True +changes: + - rscdel: "Removed damage emp protection as the current strength of the emp does not justify it." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1758.yml b/html/changelogs/AutoChangeLog-pr-1758.yml new file mode 100644 index 0000000000000..7b988a0ef333c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1758.yml @@ -0,0 +1,5 @@ +author: "BurgerBB" +delete-after: True +changes: + - balance: "Your blob strain on start will always be Distributed Neurons, instead of a random strain. The cost to reroll for the first time is still free." + - balance: "Changing to Networked Fibers will instantly alert the crew that you exist (With a level 5 blob biohazard announcement), regardless of how many tiles you have." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1768.yml b/html/changelogs/AutoChangeLog-pr-1768.yml new file mode 100644 index 0000000000000..f58d63d23ba55 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1768.yml @@ -0,0 +1,4 @@ +author: "plsleavemealon" +delete-after: True +changes: + - rscadd: "New Quirk: Masquerade, exclusive to hemophages" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28713.yml b/html/changelogs/AutoChangeLog-pr-1776.yml similarity index 52% rename from html/changelogs/AutoChangeLog-pr-28713.yml rename to html/changelogs/AutoChangeLog-pr-1776.yml index aa281e763ca35..94bb25ef50e8f 100644 --- a/html/changelogs/AutoChangeLog-pr-28713.yml +++ b/html/changelogs/AutoChangeLog-pr-1776.yml @@ -1,4 +1,4 @@ author: "theselfish" delete-after: True changes: - - bugfix: "Donator Item loadout was fixed." \ No newline at end of file + - rscadd: "Clown Hair! Woo! Markings too!" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1777.yml b/html/changelogs/AutoChangeLog-pr-1777.yml new file mode 100644 index 0000000000000..7eaec42bf8281 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1777.yml @@ -0,0 +1,5 @@ +author: "shayoki" +delete-after: True +changes: + - rscadd: "Added more telescreens to BoxStation." + - bugfix: "Fixed BoxStation broken Telescreens." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1784.yml b/html/changelogs/AutoChangeLog-pr-1784.yml new file mode 100644 index 0000000000000..b2bf960349b57 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1784.yml @@ -0,0 +1,4 @@ +author: "MonkeStation (sprites) TheSelfish (Port)" +delete-after: True +changes: + - rscadd: "Multiple new Bunny Outfits are in the vendors now!" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1789.yml b/html/changelogs/AutoChangeLog-pr-1789.yml new file mode 100644 index 0000000000000..ce14d8f24bffe --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1789.yml @@ -0,0 +1,4 @@ +author: "BurgerB" +delete-after: True +changes: + - bugfix: "Fixes Arcade Loot not properly spawning" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1790.yml b/html/changelogs/AutoChangeLog-pr-1790.yml new file mode 100644 index 0000000000000..b96c52ecf37b4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1790.yml @@ -0,0 +1,5 @@ +author: "Majkl-J" +delete-after: True +changes: + - bugfix: "Loadouts in bitrunning work again" + - bugfix: "Names in bitrunning work again" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1792.yml b/html/changelogs/AutoChangeLog-pr-1792.yml new file mode 100644 index 0000000000000..31f92e9a782d3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1792.yml @@ -0,0 +1,5 @@ +author: "nikothedude" +delete-after: True +changes: + - bugfix: "Nagas off-station or restored with the SAD should now properly have their footstep sound" + - bugfix: "Losing your naga lower body now tries to restore normal footsteps" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1793.yml b/html/changelogs/AutoChangeLog-pr-1793.yml new file mode 100644 index 0000000000000..5d7a8c8acbce4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1793.yml @@ -0,0 +1,4 @@ +author: "Odairu" +delete-after: True +changes: + - server: "ghost only votable up to 40 pop" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1795.yml b/html/changelogs/AutoChangeLog-pr-1795.yml new file mode 100644 index 0000000000000..5b815d817f1d2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1795.yml @@ -0,0 +1,4 @@ +author: "nikothedude" +delete-after: True +changes: + - rscadd: "Mothroaches can now be milked for moth milk" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1796.yml b/html/changelogs/AutoChangeLog-pr-1796.yml new file mode 100644 index 0000000000000..c18ace250c86e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1796.yml @@ -0,0 +1,4 @@ +author: "nikothedude" +delete-after: True +changes: + - bugfix: "Naga footstep sounds now work properly" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1799.yml b/html/changelogs/AutoChangeLog-pr-1799.yml new file mode 100644 index 0000000000000..a86d8333a9e3f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1799.yml @@ -0,0 +1,4 @@ +author: "Doomtail" +delete-after: True +changes: + - image: "added new beard icons" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1800.yml b/html/changelogs/AutoChangeLog-pr-1800.yml new file mode 100644 index 0000000000000..d75e23ccb696b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1800.yml @@ -0,0 +1,5 @@ +author: "Odairu" +delete-after: True +changes: + - rscadd: "DomAura quirk to dom borg module, and adds it to the tech tree" + - spellcheck: "Untility Cyborg Upgrades -> Utility Cyborg Upgrades" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1802.yml b/html/changelogs/AutoChangeLog-pr-1802.yml new file mode 100644 index 0000000000000..960a1f8fdfeb3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1802.yml @@ -0,0 +1,4 @@ +author: "StrangeWeirdKitten" +delete-after: True +changes: + - bugfix: "Borg Pinpointers and synthshells are now printable once more." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1809.yml b/html/changelogs/AutoChangeLog-pr-1809.yml new file mode 100644 index 0000000000000..6ed04e3411dc2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1809.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - rscadd: "Improves Moonstation Janitorial by adding missing items found on other maps." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1812.yml b/html/changelogs/AutoChangeLog-pr-1812.yml new file mode 100644 index 0000000000000..a87ebdaacbb09 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1812.yml @@ -0,0 +1,4 @@ +author: "theselfish" +delete-after: True +changes: + - rscadd: "New cloak to the loadout. Caw." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1814.yml b/html/changelogs/AutoChangeLog-pr-1814.yml new file mode 100644 index 0000000000000..fcf2faf67c6c3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1814.yml @@ -0,0 +1,4 @@ +author: "xXPawnStarrXx" +delete-after: True +changes: + - qol: "made it once again possible to print parts from autolathes! You just need the disk <3" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1815.yml b/html/changelogs/AutoChangeLog-pr-1815.yml new file mode 100644 index 0000000000000..f8072999ceb64 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1815.yml @@ -0,0 +1,5 @@ +author: "Majkl-J" +delete-after: True +changes: + - balance: "The ninja bomb objective is now available from 30 pop" + - bugfix: "Ninja no longer spawns with quirks, making you not to randomly die and have a fighting chance" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1817.yml b/html/changelogs/AutoChangeLog-pr-1817.yml new file mode 100644 index 0000000000000..adc19f4847b87 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1817.yml @@ -0,0 +1,5 @@ +author: "theselfish" +delete-after: True +changes: + - rscadd: "Some redsec strays have been added to the ComDrobe and SecVend. Stay tuned." + - code_imp: "Moved the SecVend to be with the rest of the vending overrides." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1819.yml b/html/changelogs/AutoChangeLog-pr-1819.yml new file mode 100644 index 0000000000000..f939b741dc288 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1819.yml @@ -0,0 +1,4 @@ +author: "DimWhat for spriting, SigmaPredator for helping me with organizing this, and my (theselfish) poor keyboard." +delete-after: True +changes: + - rscadd: "Nearly every job has a Bunny outfit. I am not joking. Check your vendors." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1822.yml b/html/changelogs/AutoChangeLog-pr-1822.yml new file mode 100644 index 0000000000000..ca1d2db5b82da --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1822.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - qol: "Improved alarm function on medbay's crew monitor console" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1823.yml b/html/changelogs/AutoChangeLog-pr-1823.yml new file mode 100644 index 0000000000000..83080725c3ce2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1823.yml @@ -0,0 +1,4 @@ +author: "StrangeWeirdKitten" +delete-after: True +changes: + - balance: "Emote delay has been set to 1 second" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1824.yml b/html/changelogs/AutoChangeLog-pr-1824.yml new file mode 100644 index 0000000000000..12936a5e1dd9d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1824.yml @@ -0,0 +1,4 @@ +author: "Majkl-J" +delete-after: True +changes: + - bugfix: "Blue 98 UI Style fixes" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28684.yml b/html/changelogs/AutoChangeLog-pr-28684.yml deleted file mode 100644 index bb4742bd710eb..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28684.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Majkl-J" -delete-after: True -changes: - - bugfix: "Brings loadouts back on par with the old system mechanically" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28685.yml b/html/changelogs/AutoChangeLog-pr-28685.yml deleted file mode 100644 index 0eca3c2c136b9..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28685.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - rscadd: "12% chance of a ouija board spawning in the chaplain office. Wawastation always has one." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28686.yml b/html/changelogs/AutoChangeLog-pr-28686.yml deleted file mode 100644 index 16846b52e850b..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28686.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Melbert" -delete-after: True -changes: - - qol: "Vending Machines have a search bar" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28689.yml b/html/changelogs/AutoChangeLog-pr-28689.yml deleted file mode 100644 index e0efeafca0bac..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28689.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "raptors don't easily stress out in lavaland environments" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28690.yml b/html/changelogs/AutoChangeLog-pr-28690.yml deleted file mode 100644 index c281fd4bc3c76..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28690.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "All jetpacks are now modsuit jetpack speed" - - rscdel: "Adv. Ion Jetpack module has been removed" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28691.yml b/html/changelogs/AutoChangeLog-pr-28691.yml deleted file mode 100644 index f7127976f3e0b..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28691.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - qol: "Mood more promptly reacts to the beauty of an area as it changes, and not just when changing areas." - - rscadd: "Coroners (and potentially other mobs with the morbid trait), now like degradated-looking rooms." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28692.yml b/html/changelogs/AutoChangeLog-pr-28692.yml deleted file mode 100644 index 1e08c79f2bd41..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28692.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Fixed the bluescreen while setting a custom font in tgui panel" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28693.yml b/html/changelogs/AutoChangeLog-pr-28693.yml deleted file mode 100644 index 938e5b678846b..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28693.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: "LT3" -delete-after: True -changes: - - balance: "Advanced Medbay Equipment research node lowered to tier 3" - - balance: "Advanced Medbay Equipment now requires haloperidol scan experiment" - - balance: "Haloperidol and cryostylane experiments can be performed roundstart" - - balance: "Cryostasis research node raised to tier 4" - - balance: "Cryostasis now has Fusion instead of Controlled Plasma as a prerequisite" - - balance: "Cryostasis cryostylane scan is now a discount experiment" - - balance: "Crystallizer moved from Controlled Plasma to Fusion" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28695.yml b/html/changelogs/AutoChangeLog-pr-28695.yml deleted file mode 100644 index 996ba9fcd03d4..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28695.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - rscadd: "Night vision goggles now subtly tint your screen." - - rscadd: "You can turn your night vision goggles off. Doing so removes the tint and the eye protection malus." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28696.yml b/html/changelogs/AutoChangeLog-pr-28696.yml deleted file mode 100644 index 82c8c93f0de48..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28696.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - admin: "Added a config that regulares random spawners weights." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28697.yml b/html/changelogs/AutoChangeLog-pr-28697.yml deleted file mode 100644 index 99bc1155132f5..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28697.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Hoverboards properly dysfunction in space without any kind of support underneath them." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28699.yml b/html/changelogs/AutoChangeLog-pr-28699.yml deleted file mode 100644 index 3a1c99cee8006..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28699.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Fixed glass shards generated from falling vending machines or tackling windows not being able to embed into anyone." - - refactor: "Refactored embedding code to use datums instead of bespoke elements and ugly associated lists." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28701.yml b/html/changelogs/AutoChangeLog-pr-28701.yml deleted file mode 100644 index e9fc577c8e5e0..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28701.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "xXPawnStarrXx" -delete-after: True -changes: - - bugfix: "fixed my medical tools not being printable." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28702.yml b/html/changelogs/AutoChangeLog-pr-28702.yml deleted file mode 100644 index 8a3e5a545d2f6..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28702.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - bugfix: "Fixed the orbit icons scrolling sometimes" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28703.yml b/html/changelogs/AutoChangeLog-pr-28703.yml deleted file mode 100644 index 9e21d30165737..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28703.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - rscadd: "Aquariums now influence the beauty score of an area based on their contents." - - rscadd: "Morbid people now get a positive moodlet when admiring an aquarium full of dead fish, and a negative one when fish are alive." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28704.yml b/html/changelogs/AutoChangeLog-pr-28704.yml deleted file mode 100644 index 7700255dd2674..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28704.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LT3" -delete-after: True -changes: - - bugfix: "Fixed medical stacks like mesh and sutures not treating wounds" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28705.yml b/html/changelogs/AutoChangeLog-pr-28705.yml deleted file mode 100644 index 1907d456f8ecd..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28705.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "Demon: bloodcrawl now deal damage when you using it." - - balance: "Demon: demon can eat only carbon human beings." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28706.yml b/html/changelogs/AutoChangeLog-pr-28706.yml deleted file mode 100644 index 39b1ca2da6f64..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28706.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - balance: "Bait quality now influences the probabilities of getting a rarer fish compared to the most common one(s)" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28707.yml b/html/changelogs/AutoChangeLog-pr-28707.yml deleted file mode 100644 index 0c133098bb9cb..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28707.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - image: "You can now flip your security helmet's visor up with alt-click! However, doing so will (obviously) expose your eyes." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28708.yml b/html/changelogs/AutoChangeLog-pr-28708.yml deleted file mode 100644 index 56a0f30d37f56..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28708.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - refactor: "refactored `GetExactComponent` to be 1641 compatible" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28709.yml b/html/changelogs/AutoChangeLog-pr-28709.yml deleted file mode 100644 index ef87b3d8127cf..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28709.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Rhials" -delete-after: True -changes: - - admin: "Narrate verbs will now allow you to pick what text formatting span you want to use before you send them, if any." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28710.yml b/html/changelogs/AutoChangeLog-pr-28710.yml deleted file mode 100644 index 1185eaaf2e578..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28710.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - code_imp: "Added the subtype vendor which lets admins and coders vend subtypes of a path" - - code_imp: "Added the vendor and both varieties of omnitool to runtime station" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28711.yml b/html/changelogs/AutoChangeLog-pr-28711.yml deleted file mode 100644 index 33ec4a5402e23..0000000000000 --- a/html/changelogs/AutoChangeLog-pr-28711.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SkyratBot" -delete-after: True -changes: - - qol: "blood bros get a hud to see eachother" - - code_imp: "teambased antagonists may not see the HUDs of other teams" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28831.yml b/html/changelogs/AutoChangeLog-pr-28831.yml new file mode 100644 index 0000000000000..36a40d855a096 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28831.yml @@ -0,0 +1,5 @@ +author: "theselfish" +delete-after: True +changes: + - rscdel: "Deleted some unused icons." + - bugfix: "Even more OBJ fixes." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28833.yml b/html/changelogs/AutoChangeLog-pr-28833.yml new file mode 100644 index 0000000000000..fc30ef5aa7615 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28833.yml @@ -0,0 +1,4 @@ +author: "nikothedude" +delete-after: True +changes: + - bugfix: "Naga constrict no longer resets pixel x to 0 if you cosntrict someone being pulled" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28834.yml b/html/changelogs/AutoChangeLog-pr-28834.yml new file mode 100644 index 0000000000000..67400347ef58e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28834.yml @@ -0,0 +1,4 @@ +author: "Thedragmeme" +delete-after: True +changes: + - bugfix: "Fixes the Plague hat having what the Plague mask should have" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28835.yml b/html/changelogs/AutoChangeLog-pr-28835.yml new file mode 100644 index 0000000000000..d2a7158814d3c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28835.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Attachment points on toolset implants have been improved, to prevent against recycler related decouplings." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28837.yml b/html/changelogs/AutoChangeLog-pr-28837.yml new file mode 100644 index 0000000000000..24e742b5ace88 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28837.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "You can no longer cause a bluescreen by attempting to recolor non-recolorable loadout items." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28838.yml b/html/changelogs/AutoChangeLog-pr-28838.yml new file mode 100644 index 0000000000000..b20f28982b2a9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28838.yml @@ -0,0 +1,4 @@ +author: "Melbert" +delete-after: True +changes: + - qol: "If you're in oxycrit (>50 oxy damage) or otherwise made unconscious through other means, blood loss will only kill you if you're *actually* missing a lethal amount of blood." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28839.yml b/html/changelogs/AutoChangeLog-pr-28839.yml new file mode 100644 index 0000000000000..b4d8df3761b37 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28839.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Destroying the jungle grass tiles in Tramstation's science wing should no longer open a chasm." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28840.yml b/html/changelogs/AutoChangeLog-pr-28840.yml new file mode 100644 index 0000000000000..03c929fe5cbec --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28840.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - qol: "Pathfinder MODule can now be triggered while wearing the MODsuit to implant yourself without having to pull it out of the suit." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28841.yml b/html/changelogs/AutoChangeLog-pr-28841.yml new file mode 100644 index 0000000000000..294f850c5c94c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28841.yml @@ -0,0 +1,5 @@ +author: "SkyratBot" +delete-after: True +changes: + - spellcheck: "Firelocks no longer output their full name in their balloon alert." + - spellcheck: "Failure message when a xenomorph tries to force open a welded firelock is now a balloon alert." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28842.yml b/html/changelogs/AutoChangeLog-pr-28842.yml new file mode 100644 index 0000000000000..47a36ef34f051 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28842.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - admin: "Ghosts can no longer create deathmatch lobbies or join existing ones when admins disable minigames" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28843.yml b/html/changelogs/AutoChangeLog-pr-28843.yml new file mode 100644 index 0000000000000..0bfb0cadab199 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28843.yml @@ -0,0 +1,4 @@ +author: "Melbert" +delete-after: True +changes: + - qol: "Lattices now make the same footstep sound as catwalks" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28844.yml b/html/changelogs/AutoChangeLog-pr-28844.yml new file mode 100644 index 0000000000000..e3b3e2cd62c36 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28844.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "mothroaches will no longer be crawling out of bags every minute" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28845.yml b/html/changelogs/AutoChangeLog-pr-28845.yml new file mode 100644 index 0000000000000..dec9e89d2c69a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28845.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - admin: "Outfit manager UI no longer harddels after closing and thus is usable more than once" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28846.yml b/html/changelogs/AutoChangeLog-pr-28846.yml new file mode 100644 index 0000000000000..5959ab9a58396 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28846.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - qol: "Research nodes can be queued, one per player. RDs can place their node at the beginning of the queue." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28849.yml b/html/changelogs/AutoChangeLog-pr-28849.yml new file mode 100644 index 0000000000000..080bbab724603 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28849.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Accelerator cannon projectiles no longer grow to absurd sizes after a bit of travel." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28850.yml b/html/changelogs/AutoChangeLog-pr-28850.yml new file mode 100644 index 0000000000000..9e0177cc1e7bc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28850.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - sound: "added pickup, dropping and opening sound for pill bottle" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28851.yml b/html/changelogs/AutoChangeLog-pr-28851.yml new file mode 100644 index 0000000000000..9da4bfc25b5bb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28851.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "borgs have alt right click functionality" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28853.yml b/html/changelogs/AutoChangeLog-pr-28853.yml new file mode 100644 index 0000000000000..15d5c3dada85a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28853.yml @@ -0,0 +1,4 @@ +author: "SkyratBot" +delete-after: True +changes: + - bugfix: "Fixes overwatch glasses not adding HUDs" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-28855.yml b/html/changelogs/AutoChangeLog-pr-28855.yml new file mode 100644 index 0000000000000..c3882e601572b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28855.yml @@ -0,0 +1,4 @@ +author: "MrDas" +delete-after: True +changes: + - bugfix: "Clown operative reinforcements' uplink no longer break the syndicates' economy by creating TC from nothingness." \ No newline at end of file diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index 8b313c04bcb98..f9778535e27b8 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -457,3 +457,292 @@ theselfish: - qol: Telecomms Sysadmin no longer has to crawl around to get a belt. - bugfix: You can now get Telecomms Drip if it burns off. +2024-07-09: + LT3: + - bugfix: Fixed medical stacks like mesh and sutures not treating wounds + - balance: Advanced Medbay Equipment research node lowered to tier 3 + - balance: Advanced Medbay Equipment now requires haloperidol scan experiment + - balance: Haloperidol and cryostylane experiments can be performed roundstart + - balance: Cryostasis research node raised to tier 4 + - balance: Cryostasis now has Fusion instead of Controlled Plasma as a prerequisite + - balance: Cryostasis cryostylane scan is now a discount experiment + - balance: Crystallizer moved from Controlled Plasma to Fusion + Majkl-J: + - bugfix: Brings loadouts back on par with the old system mechanically + Melbert: + - qol: Vending Machines have a search bar + Rhials: + - admin: Narrate verbs will now allow you to pick what text formatting span you + want to use before you send them, if any. + - admin: Quiet-announce random events still announce to admins and can therefore + be rerolled. + SkyratBot: + - rscadd: Aquariums now influence the beauty score of an area based on their contents. + - rscadd: Morbid people now get a positive moodlet when admiring an aquarium full + of dead fish, and a negative one when fish are alive. + - qol: blood bros get a hud to see eachother + - code_imp: teambased antagonists may not see the HUDs of other teams + - qol: the path to the wawastation chemsat is more clear now + - qol: You can now copy blast door controller IDs directly onto shutters/blast doors, + avoiding the need to open a menu for each one. Additionally, this lets you fix + sets of roundstart shutters without needing to change the IDs on all of the + ones in that set. + - bugfix: Fixed the orbit icons scrolling sometimes + - refactor: refactored `GetExactComponent` to be 1641 compatible + - balance: 'Demon: bloodcrawl now deal damage when you using it.' + - balance: 'Demon: demon can eat only carbon human beings.' + - bugfix: Fixed space heater heating power and power consumption + - qol: Mood more promptly reacts to the beauty of an area as it changes, and not + just when changing areas. + - rscadd: Coroners (and potentially other mobs with the morbid trait), now like + degradated-looking rooms. + - rscadd: Night vision goggles now subtly tint your screen. + - rscadd: You can turn your night vision goggles off. Doing so removes the tint + and the eye protection malus. + - image: You can now flip your security helmet's visor up with alt-click! However, + doing so will (obviously) expose your eyes. + - bugfix: Hoverboards properly dysfunction in space without any kind of support + underneath them. + - bugfix: Fixed missing wires leading to the port hallway APC on Birdshot. + - code_imp: Added the subtype vendor which lets admins and coders vend subtypes + of a path + - code_imp: Added the vendor and both varieties of omnitool to runtime station + - admin: Added a config that regulares random spawners weights. + - bugfix: raptors don't easily stress out in lavaland environments + - bugfix: Fixed the bluescreen while setting a custom font in tgui panel + - rscadd: 12% chance of a ouija board spawning in the chaplain office. Wawastation + always has one. + - bugfix: Fixed glass shards generated from falling vending machines or tackling + windows not being able to embed into anyone. + - refactor: Refactored embedding code to use datums instead of bespoke elements + and ugly associated lists. + - balance: Bait quality now influences the probabilities of getting a rarer fish + compared to the most common one(s) + - bugfix: paintings can be sponsored again + - balance: All jetpacks are now modsuit jetpack speed + - rscdel: Adv. Ion Jetpack module has been removed + grungussuss: + - sound: scalpel cutting sound now has a clean sound. + theselfish: + - bugfix: Donator Item loadout was fixed. + xXPawnStarrXx: + - bugfix: fixed my medical tools not being printable. +2024-07-10: + Jolly: + - code_imp: Behind the scenes, atmos machines (freezers/mixers) in maps were tweaked + a bit. If you see them no longer connected to specific pipenets, please make + an issue report, this is not intended behavior!! + LT3: + - qol: Hypospray and flashlight can be put in labcoat pockets + Rhials: + - bugfix: Certain items can no longer be purchased or be offered with a discount + on a loneop uplink. This is stuff like base cards (functionally useless) or + Overwatch Intel Agents (which break the role). + - balance: Loneops may now purchase chameleon noslips, station blackout triggers, + and station comms failure triggers. + SkyratBot: + - bugfix: Missing janitor access restrictions have been added to Birdshot's custodial + closet doors. + - sound: Added audible zipping to winter coats. + - bugfix: Exosuit Stress Failure experiment now works + - bugfix: Blood filters should filter out reagents completely now instead of leaving + a small amount no matter what. + - bugfix: Ore vents that are caught in the cross-fire of a lavaland tendril collapsing + will now spare the ore vent and it's associated turf. + - bugfix: hydroponic trays take in all reagents "proportionally" from plumbing ducts + without leaving any behind + - bugfix: plumbing bottler pumps out all reagents "proportionally" into output beakers + - rscadd: Added the designer EVA suit, a unique pirate hardsuit for Silverscales. + - balance: Increased the equipment available to Silverscales + - image: Sprites for the designer EVA suit + - qol: You can now use a spoon or ladle on an ice cream vat to spill a reagent, + ridding the machine of all reagent of that type. + - balance: Jetpacks are now briefly disabled by EMP. + - balance: Mirage module has been removed from Sec modsuits. + - balance: Security modsuits now spawn with a better cell and the jetpack module + preinstalled. + - bugfix: fixed CNS rebooter/Changeling adrenaline not preventing/fixing stamina + crit + - rscdel: 'Removed the shuttle manipulator entries for the following shuttles: Northstar + ferry, Omegastation arrivals shuttle, and Donutstation cargo ferry. (These shuttles + didn''t actually exist but they still had entries in the manipulator.)' + - bugfix: 'Fixed the following shuttles flying in unexpected directions: Basic CC + Ferry, Meat Ferry, Lighthouse Ferry, ERT bounty shuttle, Kilo cargo shuttle, + Pubby cargo shuttle, and Delta cargo shuttle.' + - bugfix: Fixed the ERT bounty shuttle having incorrect offsets in the shuttle navigation + console. + - qol: the disposal unit has been added to the cargo bay and miner's office. + - bugfix: missed disposal pipe returned at QM's office + - rscadd: Living flesh arms have a chance to actually touch the thing they're targeting + instead of pulling it. Careful with supermatter! + - bugfix: Welding helmet and hardhat will now properly protect against pepperspray + while its down + - bugfix: fixed dubious chem dispenser feedback when the beaker is full + - bugfix: no more xenobio active turfs + - bugfix: Embedding now properly changes its values. + - bugfix: Bloody footprints no longer bloody your shoes even more when walked over. + - qol: Using a multitool inhand tells you where the area APC is + SpaceLove: + - rscadd: Prybar is possible to be bought again! + - rscadd: Colony Fabricator can be bought from company imports now! + grungussuss: + - bugfix: fixed an unrestricted airlock in metastation brig maints + - sound: pen click now has a proper sound + - sound: Zippos, Lighters and cigarettes now have sound + grungussuss, ported from Beestation: + - sound: abductee, hypnotized and brainwashed now have sound when becoming one. +2024-07-11: + LT3, distributivgesetz, unit0016: + - bugfix: Several liquids rendering issues have been tackled. + SkyratBot: + - bugfix: stacking machines can be linked with its console via multitool + - bugfix: Fixed a whoopsie with bait-related calculations for fishing. + - qol: Docked emergency shuttles will always reset their departure timer when a + hostile environment is stopped, regardless of if the timer displays ETD or ERR. + - bugfix: Amputating a paraplegic's leg no longer miraculously allows them to walk. + - bugfix: Fixed lights stopping emitting light in some situations +2024-07-12: + Jolly: + - bugfix: '[Birdshot] The Ordnance freezer chamber is now linked to an APC, much + like the burn chamber.' + - bugfix: '[Birdshot] The Janitors quarters no longer uses `/area/station/commons`, + instead, it uses the janitors regular area.' + - bugfix: '[Birdshot] The entertainment center now has an APC.' + - bugfix: '[Birdshot] A handful of smaller areas have received air alarms.' + Melbert: + - rscadd: 'Bot Language station trait split into two: One that affects bots (retains + the old weight and cost) and one that affects machine (half weight, double the + cost)' + - rscdel: Bot Language station trait and (new) Machine Language station trait no + longer affect newly created machines or bots, just those present at game start + - rscdel: Machine Language station trait cannot affect the Automated Announcer in + telecomms + SkyratBot: + - refactor: move `status_display_bottom_text` and `fire_alarm_light_color` to security + level prototypes + - bugfix: Mapped in grounding rods can be upgraded again (not that upgraded parts + do anything for it) and don't disappear when deconstructed anymore. + - bugfix: Fixed an oversight that caused knockdown vomits to stun instead. + - bugfix: Using a dual wielded deck to add another card to a single card bases the + position of the resulting hand of cards on the position of the card. + - qol: Clothing now tells you if it is pressure-proof and insulated enough for spacewalking + when examining it. + - bugfix: Vapes use correct fill level overlays + - qol: TV helmet no longer has gas mask FOV, nor does it give you flash sensitivity. + - qol: Since those are gone, removed pepper proof from it as well. + - bugfix: You no longer try to pull out someones eyes in combat mode if they have + cranial fissure + - rscadd: You can emag grapple gun to use it on station. + - code_imp: added a crash report and removes an arg + - refactor: Refactored a lot of speech modifiers to use a component instead of copied + over code. + - bugfix: humanoid species featured are randomized correctly once again + - rscadd: Most door animations now better line up with when they are/are not passable. + - bugfix: Fixed being unable to cauterise wounds with improvised cautery tools such + as welders. + - bugfix: fixes the rightmost wawastation cryo cell + - bugfix: gave tram's primary tool storage functional disposals + - bugfix: Steaks and meatpacks no longer have an absurd amount of blood stored inside + of them. + - balance: Buffed the matrix flip skillchip duration. Lowered the stamina cost very, + very slightly. + - qol: You can now longer matrix-flip yourself into exhaustion, unless the emote + is unintentional. + - balance: bluespace navigation gigabeacons are now unlocked with Applied Bluespace + Research +2024-07-13: + LT3: + - image: Incident displays got a makeover + - balance: Using the delam panic button will now reset the incident display counter + to 0 + Melbert: + - qol: Roundstart Mannitol pills are 15u (up from 14u) + SkyratBot: + - balance: If you remove a security officer's mindshield, then you can flash them + to make them your blood brother. + - balance: Experimentor's reduction chance is multiplicative, and chance to copy + an object has been slightly lowered. + - qol: adds an oxygen chamber for wawastation ordnance + - qol: adds some missing critical items needed to do ordnance and xenobiology + - balance: Experimentor will no longer duplicate Bags of Holding + - balance: War declaration gives 600 research points to the station + - balance: Cryokinesis and pyrokinesis more severely adjust temperature. + - balance: Cryokinesis forces a target to slow down on hit for a few seconds. + - balance: Pyrokinesis can ignite objects. + - balance: Temperature projectiles change the temperature of the target's contained + reagents. + - bugfix: french berets will no longer force the user to speak spanish + - balance: Tetrodotoxin can now be synthesized (bees, the odysseus mech, strange + seeds...) + - balance: Upped the amount of tetrodotoxin you can harvest from pufferfishes (or + any fish with the trait). + - spellcheck: Fixed some typos with the toxin. + - image: re-sprited Catwalk Floor Tiles to fit with TG floor tiles + - image: MOD hyposprays no longer use syringe fill sprites + - bugfix: password doors and shutters will now play their sound effects again instead + of just silently opening/closing + - bugfix: Fixed a bluescreen in the heretic research ui + - bugfix: Added a Mechbay power console to the Metastation cargo warehouse so that + the cargo ripley is able to be charged. + - qol: Heads of staff PDAs start with twice as much disk space + - bugfix: H.A.R.S. will no longer disable your skillchips or show you text reserved + for total brain removal. + - bugfix: The modsuit paint kit is no longer broken. + - bugfix: Other mobs no longer hear your breathing + - bugfix: makes outpost45 cause less lag + - balance: Moves XL beaker from Chemical Synthesis to Medbay Equipment + - balance: Removes Plumbing node and moves most items to Chemical synthesis node + - balance: Moves piercing syringe from Plumbing node to Advanced Medbay Equipment + - rscadd: Add the National Ice Cream Day holiday, which falls on the third Sunday + of July. + - bugfix: all icons in the crafting menu (some that you missed) are now fixed permanently +2024-07-14: + SkyratBot: + - rscadd: Changed the layout of birdshot engineering atmos and SM, added a proper + engineering storage area. + - bugfix: Fixes Icemoon syndie listening station APC's from being affected by station-side + events + - refactor: request managers have been refactored to typescript + - bugfix: request manager type filter now works + - image: the smoking pipe's directional looks have been altered to make it less + ugly + - qol: Using ctrl + your quick MOD button now opens module selector on your mouse + position + - bugfix: Grass turfs will render properly now. Reworked how floors render, please + report any bugs! + - bugfix: Cameras now properly capture lighting + - bugfix: The layering seen in photos should better match the actual game + - bugfix: Fixed tables and racks being climbable from half a mile away + - rscadd: Adds the Herculean Gravitronic Spinal Implant; an implant that makes you + better at athletics. You can upgrade it into an Atlas implant using a gravity + anomaly core. + - balance: Gravity anomaly cores have had their max number of cores reduces from + 8 to 6. + - balance: Your athletic ability allows you to climb faster. + - rscadd: Added airlock pump atmos device to create cycling airlocks + - rscadd: Cytology Lab has been added to Icebox + - rscadd: Delta now has soy seeds on the Cytology Lab + - bugfix: Cytology is playable again on Icebox + - bugfix: Fixed dead slime icon not showing when cores are extracted + - qol: Slime core removal surgery extracts all cores on completion + - rscadd: A new ork mutation which can be acquired by mixing hulk and clumsy. + SpaceLoveSs13: + - bugfix: fixed RSD, BSRPD, Affection Module, Spray perfume bottles etc. Report + further issues. + Vishenka0704: + - qol: With voting turned off for the dead, you can now understand why you can't + vote (being dead). + - admin: Voting switch for the dead players + thegrb93: + - bugfix: Fix laugh not being your selected laugh + theselfish: + - rscadd: Multiple new pets in the carrier. + - bugfix: A few masks are more easily clickable now. + - bugfix: Certain stock issues have been fixed. Kilts and Tactical Outfits are back + in the vendors. +2024-07-15: + StrangeWeirdKitten: + - rscdel: Removed the nuke code from spawning on the Interlink. + thegrb93: + - code_imp: Anthro borg can use affection module + - refactor: Refactors borg affection module diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index efbe4989c6428..3a9f0103c6d52 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 47684f4664e89..c415d4dcff1f4 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ diff --git a/icons/hud/64x16_actions.dmi b/icons/hud/64x16_actions.dmi index 3a98a6c16c70a..9264ba540aa20 100644 Binary files a/icons/hud/64x16_actions.dmi and b/icons/hud/64x16_actions.dmi differ diff --git a/icons/mob/clothing/head/spacehelm.dmi b/icons/mob/clothing/head/spacehelm.dmi index 0b9f3d4a36eb4..d9a634a63c771 100644 Binary files a/icons/mob/clothing/head/spacehelm.dmi and b/icons/mob/clothing/head/spacehelm.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index c877c2fcb8826..22c7ae3ac49c0 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/suits/spacesuit.dmi b/icons/mob/clothing/suits/spacesuit.dmi index 0067c4bf36a8c..1f691729a3031 100644 Binary files a/icons/mob/clothing/suits/spacesuit.dmi and b/icons/mob/clothing/suits/spacesuit.dmi differ diff --git a/icons/obj/clothing/head/spacehelm.dmi b/icons/obj/clothing/head/spacehelm.dmi index c2830a9d9335f..980d2a07a50be 100644 Binary files a/icons/obj/clothing/head/spacehelm.dmi and b/icons/obj/clothing/head/spacehelm.dmi differ diff --git a/icons/obj/clothing/suits/spacesuit.dmi b/icons/obj/clothing/suits/spacesuit.dmi index 922ad05c35e7a..7fe01246352d6 100644 Binary files a/icons/obj/clothing/suits/spacesuit.dmi and b/icons/obj/clothing/suits/spacesuit.dmi differ diff --git a/icons/obj/doors/blastdoor.dmi b/icons/obj/doors/blastdoor.dmi index 9457690cda365..9c7bec103cefa 100644 Binary files a/icons/obj/doors/blastdoor.dmi and b/icons/obj/doors/blastdoor.dmi differ diff --git a/icons/obj/doors/doorfireglass.dmi b/icons/obj/doors/doorfireglass.dmi index 250b5ca833a89..83156ae4351e1 100644 Binary files a/icons/obj/doors/doorfireglass.dmi and b/icons/obj/doors/doorfireglass.dmi differ diff --git a/icons/obj/doors/doormorgue.dmi b/icons/obj/doors/doormorgue.dmi index c0ed1147325ce..381e5c3385ef3 100644 Binary files a/icons/obj/doors/doormorgue.dmi and b/icons/obj/doors/doormorgue.dmi differ diff --git a/icons/obj/doors/puzzledoor/danger.dmi b/icons/obj/doors/puzzledoor/danger.dmi index 89d19131cc189..ed78272037e37 100644 Binary files a/icons/obj/doors/puzzledoor/danger.dmi and b/icons/obj/doors/puzzledoor/danger.dmi differ diff --git a/icons/obj/doors/puzzledoor/default.dmi b/icons/obj/doors/puzzledoor/default.dmi index 49a9206139580..685fc448bdee0 100644 Binary files a/icons/obj/doors/puzzledoor/default.dmi and b/icons/obj/doors/puzzledoor/default.dmi differ diff --git a/icons/obj/doors/puzzledoor/wood.dmi b/icons/obj/doors/puzzledoor/wood.dmi index f2b53e857393b..58717aacf1e65 100644 Binary files a/icons/obj/doors/puzzledoor/wood.dmi and b/icons/obj/doors/puzzledoor/wood.dmi differ diff --git a/icons/obj/doors/shutters.dmi b/icons/obj/doors/shutters.dmi index 1cc727cdbf7a4..5fd2b2a8213d5 100644 Binary files a/icons/obj/doors/shutters.dmi and b/icons/obj/doors/shutters.dmi differ diff --git a/icons/obj/doors/shutters_radiation.dmi b/icons/obj/doors/shutters_radiation.dmi index 2e70b24a4aa2a..37b8cf72cbca0 100644 Binary files a/icons/obj/doors/shutters_radiation.dmi and b/icons/obj/doors/shutters_radiation.dmi differ diff --git a/icons/obj/doors/shutters_window.dmi b/icons/obj/doors/shutters_window.dmi index fcf8af5b94fd7..b86fe675366c1 100644 Binary files a/icons/obj/doors/shutters_window.dmi and b/icons/obj/doors/shutters_window.dmi differ diff --git a/icons/obj/doors/windoor.dmi b/icons/obj/doors/windoor.dmi index 86893eb9c453c..117cd78e1348b 100644 Binary files a/icons/obj/doors/windoor.dmi and b/icons/obj/doors/windoor.dmi differ diff --git a/icons/obj/machines/atmospherics/unary_devices.dmi b/icons/obj/machines/atmospherics/unary_devices.dmi index 47acf3c29c9c4..73da54768b1cb 100644 Binary files a/icons/obj/machines/atmospherics/unary_devices.dmi and b/icons/obj/machines/atmospherics/unary_devices.dmi differ diff --git a/icons/obj/machines/incident_display.dmi b/icons/obj/machines/incident_display.dmi index 80d63134f1d02..863a500131525 100644 Binary files a/icons/obj/machines/incident_display.dmi and b/icons/obj/machines/incident_display.dmi differ diff --git a/icons/obj/medical/reagent_fillings.dmi b/icons/obj/medical/reagent_fillings.dmi index 0d535c6cac2b3..0da57e714a528 100644 Binary files a/icons/obj/medical/reagent_fillings.dmi and b/icons/obj/medical/reagent_fillings.dmi differ diff --git a/icons/obj/pipes_n_cables/pipe_item.dmi b/icons/obj/pipes_n_cables/pipe_item.dmi index 54dac81793975..ea2f9f71eb58d 100644 Binary files a/icons/obj/pipes_n_cables/pipe_item.dmi and b/icons/obj/pipes_n_cables/pipe_item.dmi differ diff --git a/icons/obj/signs.dmi b/icons/obj/signs.dmi index a2069ba5d9d3b..050a609470421 100644 Binary files a/icons/obj/signs.dmi and b/icons/obj/signs.dmi differ diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 2c2aae54de3c2..85d4b82a498c0 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/floors/catwalk_plating.dmi b/icons/turf/floors/catwalk_plating.dmi index b49c46564de50..800d0c8dfffcd 100644 Binary files a/icons/turf/floors/catwalk_plating.dmi and b/icons/turf/floors/catwalk_plating.dmi differ diff --git a/modular_skyrat/master_files/code/game/objects/items/RCD.dm b/modular_skyrat/master_files/code/game/objects/items/RCD.dm index 543fcd1ee5299..3450c7a0fd2c7 100644 --- a/modular_skyrat/master_files/code/game/objects/items/RCD.dm +++ b/modular_skyrat/master_files/code/game/objects/items/RCD.dm @@ -20,16 +20,15 @@ return ..() // Drain deconstruction -/obj/item/construction/plumbing/afterattack(atom/target, mob/user, proximity) - if(!proximity) - return - if(istype(target, /obj/structure/drain)) - var/obj/structure/drain/drain_target = target - if(do_after(user, 2 SECONDS, target = target)) - drain_target.deconstruct() //Let's not substract matter - playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE) - else +/obj/item/construction/plumbing/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!istype(interacting_with, /obj/structure/drain)) return ..() + var/obj/structure/drain/drain_target = interacting_with + if(do_after(user, 2 SECONDS, target = interacting_with)) + drain_target.deconstruct() //Let's not substract matter + playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE) + return ITEM_INTERACT_SUCCESS + return ITEM_INTERACT_BLOCKING /obj/item/construction/plumbing/mining name = "mining plumbing constructor" diff --git a/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm b/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm index 785236aeef94d..e70262fc8a786 100644 --- a/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm +++ b/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm @@ -1,6 +1,10 @@ /obj/item/clothing/suit/toggle/labcoat supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON +/obj/item/clothing/suit/toggle/labcoat/Initialize(mapload) + . = ..() + allowed += list(/obj/item/flashlight, /obj/item/hypospray, /obj/item/storage/hypospraykit) + /obj/item/clothing/suit/toggle/labcoat/skyrat name = "SR LABCOAT SUIT DEBUG" desc = "REPORT THIS IF FOUND" diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/cat/fennec.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/cat/fennec.dm new file mode 100644 index 0000000000000..73880c8d92fd9 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/cat/fennec.dm @@ -0,0 +1,62 @@ +/mob/living/basic/pet/cat/fennec + name = "fennec fox" + desc = "Vulpes Zerda. Also known as a Goob or a Dingler." + icon = 'modular_skyrat/master_files/icons/mob/pets.dmi' + icon_state = "fennec" + icon_living = "fennec" + icon_dead = "fennec_dead" + held_lh = 'modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi' + held_rh = 'modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi' + head_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/pets_head.dmi' + speak_emote = list("screms", "squeaks", "rrrfs") + butcher_results = list( + /obj/item/food/meat/slab = 1, + ) + collar_icon_state = null + has_collar_resting_icon_state = FALSE + can_be_held = TRUE + worn_slot_flags = ITEM_SLOT_HEAD + held_state = "fennec" + ai_controller = /datum/ai_controller/basic_controller/cat/fennec + +/mob/living/basic/pet/cat/fennec/update_overlays() + . = ..() + if(stat == DEAD || resting || !held_food) + return + if(istype(held_food, /obj/item/fish)) + held_item_overlay = mutable_appearance(icon, "fennec_fish_overlay") + if(istype(held_food, /obj/item/food/deadmouse)) + held_item_overlay = mutable_appearance(icon, "fennec_mouse_overlay") + . += held_item_overlay + +/datum/ai_planning_subtree/random_speech/fennecs + speech_chance = 5 + speak = list( + "screm!", + "rrrrf!", + "screech!", + "aaaaaa!", + "squeak!", + "yip!", + "squee!", + ) + +/datum/ai_controller/basic_controller/cat/fennec + planning_subtrees = list( + /datum/ai_planning_subtree/reside_in_home, + /datum/ai_planning_subtree/flee_target/from_flee_key/cat_struggle, + /datum/ai_planning_subtree/find_and_hunt_target/hunt_mice, + /datum/ai_planning_subtree/find_and_hunt_target/find_cat_food, + /datum/ai_planning_subtree/simple_find_target, + /datum/ai_planning_subtree/haul_food_to_young, + /datum/ai_planning_subtree/territorial_struggle, + /datum/ai_planning_subtree/make_babies, + /datum/ai_planning_subtree/random_speech/fennecs, + ) + +/mob/living/basic/pet/cat/fennec/add_breeding_component() + AddComponent(\ + /datum/component/breed,\ + can_breed_with = typecacheof(list(/mob/living/basic/pet/cat/fennec)),\ + baby_path = /mob/living/basic/pet/cat/fennec,\ + ) diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm index ba370f99d6b28..c21c91736e2f4 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm @@ -341,4 +341,12 @@ icon_state = "dobber" icon_dead = "dobbydead" icon_living = "dobber" - gender = MALE + +/mob/living/basic/pet/dog/pitbull + name = "\improper pitbull" + desc = "Lover of Blood. Hater of Toddlers" + icon = 'modular_skyrat/master_files/icons/mob/pets.dmi' + icon_state = "pitbull" + icon_dead = "pitbull_dead" + icon_living = "pitbull" + diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm new file mode 100644 index 0000000000000..d2e21410e4867 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm @@ -0,0 +1,125 @@ +/mob/living/basic/pet/cat/clown + name = "clown cat" + desc = "A funny little creature imported to Clown Planet, beloved by millions." + icon = 'modular_skyrat/master_files/icons/mob/pets.dmi' + icon_state = "clowncat" + icon_living = "clowncat" + icon_dead = "clowncat_dead" + speak_emote = list("purrs", "honks", "meows") + pass_flags = PASSTABLE + mob_size = MOB_SIZE_SMALL + mob_biotypes = MOB_ORGANIC|MOB_BEAST + unsuitable_atmos_damage = 0.5 + butcher_results = list( + /obj/item/food/meat/slab = 1, + /obj/item/organ/internal/ears/cat = 1, + /obj/item/organ/external/tail/cat = 1, + /obj/item/clothing/mask/gas/clown_hat = 1, + + ) + response_help_continuous = "pets" + response_help_simple = "pet" + response_disarm_continuous = "asks to not joke about that" + response_disarm_simple = "ask not to joke about that" + response_harm_continuous = "throws tomatos" + response_harm_simple = "throws tomato" + mobility_flags = MOBILITY_FLAGS_REST_CAPABLE_DEFAULT + gold_core_spawnable = FRIENDLY_SPAWN + collar_icon_state = "clowncat" + has_collar_resting_icon_state = FALSE + can_be_held = TRUE + ai_controller = /datum/ai_controller/basic_controller/cat + held_state = "cat2" + attack_verb_continuous = "honks" + attack_verb_simple = "honk" + attack_sound = 'sound/items/bikehorn.ogg' + attack_vis_effect = ATTACK_EFFECT_CLAW + + +/mob/living/basic/pet/cat/mime + name = "mime cat" + desc = "Almost invisible, this little fella eats mice you can't even see!" + icon = 'modular_skyrat/master_files/icons/mob/pets.dmi' + icon_state = "catmime" + icon_living = "catmime" + icon_dead = "catmime_dead" + speak_emote = list("...",) + pass_flags = PASSTABLE + mob_size = MOB_SIZE_SMALL + mob_biotypes = MOB_ORGANIC|MOB_BEAST + unsuitable_atmos_damage = 0.5 + butcher_results = list( + /obj/item/food/meat/slab = 1, + /obj/item/organ/internal/ears/cat = 1, + /obj/item/organ/external/tail/cat = 1, + /obj/item/clothing/mask/gas/mime = 1, + ) + +/mob/living/basic/pet/cat/tiger + name = "tiger cat" + desc = "A tiger made of paper." + icon = 'modular_skyrat/master_files/icons/mob/pets.dmi' + icon_state = "tiger" + icon_living = "tiger" + icon_dead = "tiger_dead" + speak_emote = list("roar","roars", "purrs", "meows",) + pass_flags = PASSTABLE + mob_size = MOB_SIZE_SMALL + mob_biotypes = MOB_ORGANIC|MOB_BEAST + unsuitable_atmos_damage = 0.5 + butcher_results = list( + /obj/item/food/meat/slab = 1, + /obj/item/organ/internal/ears/cat = 1, + /obj/item/organ/external/tail/cat = 1, + /obj/item/clothing/head/pelt/tiger = 1, + ) + + +/mob/living/basic/carp/clarp + name = "clarp" + desc = "A Space Dragon ate a Clown Station, it tasted funny. This was the result." + faction = list(FACTION_NEUTRAL) + icon = 'modular_skyrat/master_files/icons/mob/pets.dmi' + icon_dead = "clarp_dead" + icon_gib = "clarp_gib" + icon_living = "clarp" + icon_state = "clarp" + greyscale_config = NONE + +/mob/living/basic/carp/petcarp + faction = list(FACTION_NEUTRAL) + +/mob/living/basic/pet/fox/redpanda + name = "red panda" + desc = "Wah't a dork." + icon = 'modular_skyrat/master_files/icons/mob/pets.dmi' + icon_state = "red_panda" + icon_living = "red_panda" + icon_dead = "dead_panda" + speak_emote = list("chirps", "huff-quacks") + butcher_results = list(/obj/item/food/meat/slab = 3) + gold_core_spawnable = FRIENDLY_SPAWN + can_be_held = TRUE + held_state = "fox" + melee_damage_lower = 5 + melee_damage_upper = 5 + attack_verb_continuous = "bites" + attack_verb_simple = "bite" + attack_sound = 'sound/weapons/bite.ogg' + attack_vis_effect = ATTACK_EFFECT_BITE + ai_controller = /datum/ai_controller/basic_controller/fox/docile //he's a nice boy + + +/mob/living/basic/pet/dog/corgi/robocorgo + name = "\improper robocorgi" + real_name = "corgi" + desc = "They're a corgi with various mechanical modifications. The first stage in an E-N's life cycle." + icon = 'modular_skyrat/master_files/icons/mob/pets.dmi' + icon_state = "robocorgi" + icon_living = "robocorgi" + icon_dead = "robocorgi_dead" + held_state = "corgi" + butcher_results = list(/obj/item/food/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1) + gold_core_spawnable = FRIENDLY_SPAWN + collar_icon_state = "robocorgi" + diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm index aae6f80843967..530a91cc6af1e 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm @@ -941,3 +941,12 @@ projectiletype = /obj/projectile/beam/laser projectilesound = 'sound/weapons/laser3.ogg' + +/mob/living/basic/gorilla/pitbull + name = "\improper pitbull" + desc = "Lover of Blood. Hater of Toddlers. Doesn't look too happy to see you." + icon = 'modular_skyrat/master_files/icons/mob/pets.dmi' + icon_state = "pitbull" + icon_dead = "pitbull_dead" + icon_living = "pitbull" + diff --git a/modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi b/modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi index 7fa259c07e89e..70ceb87f00c82 100644 Binary files a/modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi and b/modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi differ diff --git a/modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi b/modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi index 140bd772f44f9..5a208f9183754 100644 Binary files a/modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi and b/modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi differ diff --git a/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi b/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi index 8375633d3543d..367afce725bf3 100644 Binary files a/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/head/pets_head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head/pets_head.dmi new file mode 100644 index 0000000000000..7f9371683fd88 Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/head/pets_head.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi b/modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi index a144c1439dda4..67197ce1d3b00 100644 Binary files a/modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi and b/modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi b/modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi index 1686efd5abd46..d0b99f06e7a76 100644 Binary files a/modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi and b/modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/pets.dmi b/modular_skyrat/master_files/icons/mob/pets.dmi index 8fba90c03a19d..2eb554d4d80f2 100644 Binary files a/modular_skyrat/master_files/icons/mob/pets.dmi and b/modular_skyrat/master_files/icons/mob/pets.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/facialhair.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/facialhair.dmi index a0c10cd7e66c8..710d68a0125ce 100644 Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/facialhair.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/facialhair.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/masks.dmi b/modular_skyrat/master_files/icons/obj/clothing/masks.dmi index 57e85ce1f745c..80a0ea1ce5587 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/masks.dmi and b/modular_skyrat/master_files/icons/obj/clothing/masks.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi index 2c42362565b9e..942684640f837 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi and b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi differ diff --git a/modular_skyrat/master_files/sound/items/zippo_open.ogg b/modular_skyrat/master_files/sound/items/zippo_open.ogg deleted file mode 100644 index 1c1681d999a37..0000000000000 Binary files a/modular_skyrat/master_files/sound/items/zippo_open.ogg and /dev/null differ diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bowtie_collar.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bowtie_collar.json new file mode 100644 index 0000000000000..d777ec66b9b06 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bowtie_collar.json @@ -0,0 +1,30 @@ +{ + "bowtie_collar_tied": [ + { + "type": "icon_state", + "icon_state": "bowtie_collar_base_tied", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bowtie_collar_bowtie_tied", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "bowtie_collar_untied": [ + { + "type": "icon_state", + "icon_state": "bowtie_collar_base_untied", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bowtie_collar_bowtie_untied", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bowtie_collar_worn.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bowtie_collar_worn.json new file mode 100644 index 0000000000000..d777ec66b9b06 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bowtie_collar_worn.json @@ -0,0 +1,30 @@ +{ + "bowtie_collar_tied": [ + { + "type": "icon_state", + "icon_state": "bowtie_collar_base_tied", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bowtie_collar_bowtie_tied", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ], + "bowtie_collar_untied": [ + { + "type": "icon_state", + "icon_state": "bowtie_collar_base_untied", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bowtie_collar_bowtie_untied", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bunnysuit.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bunnysuit.json new file mode 100644 index 0000000000000..90e175b7775c2 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bunnysuit.json @@ -0,0 +1,28 @@ +{ + "playbunny": [ + { + "type": "icon_state", + "icon_state": "playbunny_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_buttons", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_cuffs", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_stockings", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bunnysuit_worn.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bunnysuit_worn.json new file mode 100644 index 0000000000000..d93b2040562d5 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bunnysuit_worn.json @@ -0,0 +1,59 @@ +{ + "playbunny": [ + { + "type": "icon_state", + "icon_state": "playbunny_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_buttons", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_cuffs", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_stockings", + "blend_mode": "overlay", + "color_ids": [ 4 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_tail", + "blend_mode": "overlay" + } + ], + "playbunny_d": [ + { + "type": "icon_state", + "icon_state": "playbunny_base_d", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_buttons", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_cuffs", + "blend_mode": "overlay", + "color_ids": [ 3 ] + }, + { + "type": "icon_state", + "icon_state": "playbunny_stockings", + "blend_mode": "overlay", + "color_ids": [ 4 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears.json new file mode 100644 index 0000000000000..ba2755740171e --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears.json @@ -0,0 +1,10 @@ +{ + "playbunny_ears": [ + { + "type": "icon_state", + "icon_state": "playbunny_ears", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears_worn.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears_worn.json new file mode 100644 index 0000000000000..ba2755740171e --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears_worn.json @@ -0,0 +1,10 @@ +{ + "playbunny_ears": [ + { + "type": "icon_state", + "icon_state": "playbunny_ears", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat.json new file mode 100644 index 0000000000000..0ccf8d62b3d66 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat.json @@ -0,0 +1,10 @@ +{ + "tailcoat": [ + { + "type": "icon_state", + "icon_state": "tailcoat", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_bar.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_bar.json new file mode 100644 index 0000000000000..41418598725f4 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_bar.json @@ -0,0 +1,16 @@ +{ + "tailcoat_bar": [ + { + "type": "icon_state", + "icon_state": "tailcoat_bar_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "tailcoat_bar_tail", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_bar_worn.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_bar_worn.json new file mode 100644 index 0000000000000..41418598725f4 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_bar_worn.json @@ -0,0 +1,16 @@ +{ + "tailcoat_bar": [ + { + "type": "icon_state", + "icon_state": "tailcoat_bar_base", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "tailcoat_bar_tail", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_worn.json b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_worn.json new file mode 100644 index 0000000000000..0ccf8d62b3d66 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_worn.json @@ -0,0 +1,10 @@ +{ + "tailcoat": [ + { + "type": "icon_state", + "icon_state": "tailcoat", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/gps.json b/modular_skyrat/modules/GAGS/json_configs/collar/gps.json new file mode 100644 index 0000000000000..e112f2bc0b2f4 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/collar/gps.json @@ -0,0 +1,22 @@ +{ + "gps": [ + + { + "type": "icon_state", + "icon_state": "collar_band_gray", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "collar_tracker_gray", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "collar_screen", + "blend_mode": "overlay" + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json b/modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json new file mode 100644 index 0000000000000..4486fb697fc4b --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json @@ -0,0 +1,16 @@ +{ + "gps": [ + { + "type": "icon_state", + "icon_state": "collar_inhand_tracker_l_gray", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "collar_inhand_band_l_gray", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json b/modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json new file mode 100644 index 0000000000000..14b4568ba2d73 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json @@ -0,0 +1,16 @@ +{ + "gps": [ + { + "type": "icon_state", + "icon_state": "collar_inhand_tracker_r_gray", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "collar_inhand_band_r_gray", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json b/modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json new file mode 100644 index 0000000000000..4216f213c0919 --- /dev/null +++ b/modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json @@ -0,0 +1,16 @@ +{ + "gps": [ + { + "type": "icon_state", + "icon_state": "collar_mob_tracker_gray", + "blend_mode": "overlay", + "color_ids": [ 2 ] + }, + { + "type": "icon_state", + "icon_state": "collar_mob_band_gray", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/modular_skyrat/modules/advanced_shuttles/code/turfs.dm b/modular_skyrat/modules/advanced_shuttles/code/turfs.dm index 1c5e9c53c30ff..0f05c141bbe06 100644 --- a/modular_skyrat/modules/advanced_shuttles/code/turfs.dm +++ b/modular_skyrat/modules/advanced_shuttles/code/turfs.dm @@ -33,8 +33,8 @@ initial(underturf_path.icon), initial(underturf_path.icon_state), offset_spokesman = src, - layer = TURF_LAYER - 0.02, - plane = initial(underturf_path.plane)) + layer = LOW_FLOOR_LAYER - 0.02, + plane = FLOOR_PLANE) underlay_appearance.appearance_flags = RESET_ALPHA | RESET_COLOR underlays += underlay_appearance diff --git a/modular_skyrat/modules/advanced_shuttles/icons/computer.dmi b/modular_skyrat/modules/advanced_shuttles/icons/computer.dmi index 189ac9d9501c1..c955aef9cbfc5 100644 Binary files a/modular_skyrat/modules/advanced_shuttles/icons/computer.dmi and b/modular_skyrat/modules/advanced_shuttles/icons/computer.dmi differ diff --git a/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm b/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm index 8684c6b8908ca..cf903ed6e9c95 100644 --- a/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm +++ b/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm @@ -6,11 +6,9 @@ var/door_open_sound = 'modular_skyrat/modules/aesthetics/blast_door/sound/shutters_open.ogg' var/door_close_sound = 'modular_skyrat/modules/aesthetics/blast_door/sound/shutters_close.ogg' -/obj/machinery/door/poddoor/shutters/do_animate(animation) +/obj/machinery/door/poddoor/shutters/run_animation(animation) switch(animation) - if("opening") - flick("opening", src) + if(DOOR_OPENING_ANIMATION) playsound(src, door_open_sound, 30, TRUE) - if("closing") - flick("closing", src) + if(DOOR_OPENING_ANIMATION) playsound(src, door_close_sound, 30, TRUE) diff --git a/modular_skyrat/modules/aesthetics/floors/code/floors.dm b/modular_skyrat/modules/aesthetics/floors/code/floors.dm index e2a797a297050..3096e8c93188f 100644 --- a/modular_skyrat/modules/aesthetics/floors/code/floors.dm +++ b/modular_skyrat/modules/aesthetics/floors/code/floors.dm @@ -1,6 +1,9 @@ /turf/open/floor icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi' +/turf/open/floor/catwalk_floor + icon = 'modular_skyrat/modules/aesthetics/floors/icons/catwalk_plating.dmi' + //Removes redundant textured stuff from this radial, as all of ours are textured by default /obj/item/stack/tile/iron tile_reskin_types = list( diff --git a/modular_skyrat/modules/aesthetics/floors/icons/catwalk_plating.dmi b/modular_skyrat/modules/aesthetics/floors/icons/catwalk_plating.dmi new file mode 100644 index 0000000000000..bbd021d16d423 Binary files /dev/null and b/modular_skyrat/modules/aesthetics/floors/icons/catwalk_plating.dmi differ diff --git a/modular_skyrat/modules/airlock_override/code/airlock_override.dm b/modular_skyrat/modules/airlock_override/code/airlock_override.dm index c6fea81df843c..0d05ae1808202 100644 --- a/modular_skyrat/modules/airlock_override/code/airlock_override.dm +++ b/modular_skyrat/modules/airlock_override/code/airlock_override.dm @@ -132,7 +132,7 @@ switch(wire) if(WIRE_IDSCAN) if(airlock.hasPower() && airlock.density) - airlock.do_animate("deny") + airlock.run_animation(DOOR_DENY_ANIMATION) if(airlock.emergency) airlock.emergency = FALSE airlock.update_appearance() diff --git a/modular_skyrat/modules/alerts/code/security_level_datums.dm b/modular_skyrat/modules/alerts/code/security_level_datums.dm index afa355df55aa7..ffafca44e1418 100644 --- a/modular_skyrat/modules/alerts/code/security_level_datums.dm +++ b/modular_skyrat/modules/alerts/code/security_level_datums.dm @@ -29,6 +29,8 @@ name = "violet" announcement_color = "purple" number_level = SEC_LEVEL_VIOLET + status_display_icon_state = "violetalert" + fire_alarm_light_color = COLOR_VIOLET lowering_to_configuration_key = /datum/config_entry/string/alert_violet_downto elevating_to_configuration_key = /datum/config_entry/string/alert_violet_upto sound = 'modular_skyrat/modules/alerts/sound/security_levels/violet.ogg' @@ -43,6 +45,8 @@ name = "orange" announcement_color = "orange" number_level = SEC_LEVEL_ORANGE + status_display_icon_state = "orangealert" + fire_alarm_light_color = LIGHT_COLOR_ORANGE lowering_to_configuration_key = /datum/config_entry/string/alert_orange_downto elevating_to_configuration_key = /datum/config_entry/string/alert_orange_upto sound = 'modular_skyrat/modules/alerts/sound/security_levels/orange.ogg' @@ -58,6 +62,8 @@ name = "amber" announcement_color = "yellow" number_level = SEC_LEVEL_AMBER + status_display_icon_state = "amberalert" + fire_alarm_light_color = LIGHT_COLOR_DIM_YELLOW lowering_to_configuration_key = /datum/config_entry/string/alert_amber_downto elevating_to_configuration_key = /datum/config_entry/string/alert_amber_upto sound = 'modular_skyrat/modules/alerts/sound/security_levels/amber.ogg' @@ -72,6 +78,8 @@ name = "epsilon" announcement_color = "grey" number_level = SEC_LEVEL_EPSILON + status_display_icon_state = "epsilonalert" + fire_alarm_light_color = COLOR_ASSEMBLY_WHITE lowering_to_configuration_key = /datum/config_entry/string/alert_epsilon_downto elevating_to_configuration_key = /datum/config_entry/string/alert_epsilon_upto sound = 'modular_skyrat/modules/alerts/sound/security_levels/epsilon.ogg' @@ -81,12 +89,14 @@ /** * Gamma * - * XK-Class EOW Event + * XK-Class EOR Event */ /datum/security_level/gamma name = "gamma" announcement_color = "pink" number_level = SEC_LEVEL_GAMMA + status_display_icon_state = "gammaalert" + fire_alarm_light_color = COLOR_ASSEMBLY_PURPLE elevating_to_configuration_key = /datum/config_entry/string/alert_gamma shuttle_call_time_mod = 0.25 sound = 'modular_skyrat/modules/alerts/sound/security_levels/gamma_alert.ogg' diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/railroad.dm b/modular_skyrat/modules/ashwalkers/code/buildings/railroad.dm index b0b821d7668f3..50dec900cf1b0 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/railroad.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/railroad.dm @@ -12,15 +12,16 @@ /obj/item/stack/rail_track/fifty amount = 50 -/obj/item/stack/rail_track/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if(!isopenturf(target) || !proximity_flag) - return ..() - var/turf/target_turf = get_turf(target) +/obj/item/stack/rail_track/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!isopenturf(interacting_with)) + return NONE + var/turf/open/target_turf = get_turf(interacting_with) var/obj/structure/railroad/check_rail = locate() in target_turf if(check_rail || !use(1)) - return ..() + return NONE to_chat(user, span_notice("You place [src] on [target_turf].")) - new /obj/structure/railroad(get_turf(target)) + new /obj/structure/railroad(target_turf) + return ITEM_INTERACT_SUCCESS /obj/structure/railroad name = "railroad track" diff --git a/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm b/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm index 670f8f72a3b7a..bcac6a17418a6 100644 --- a/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm +++ b/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm @@ -9,35 +9,41 @@ icon_state = "staffofanimation" inhand_icon_state = "staffofanimation" -/obj/item/ash_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if(!proximity_flag) - return ..() + ///If the world.time is above this, it wont work. Charging requires whacking the necropolis nest + var/staff_time = 0 +/obj/item/ash_staff/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!user.mind.has_antag_datum(/datum/antagonist/ashwalker)) - return ..() - - if(istype(target, /obj/structure/lavaland/ash_walker)) - return - - if(isopenturf(target)) - var/turf/target_turf = target - if(istype(target, /turf/open/misc/asteroid/basalt/lava_land_surface)) - to_chat(user, span_warning("You begin to corrupt the land even further...")) - if(!do_after(user, 4 SECONDS, target = target_turf)) - to_chat(user, span_warning("[src] had their casting cut short!")) - return - - target_turf.ChangeTurf(/turf/open/lava/smooth/lava_land_surface) - to_chat(user, span_notice("[src] sparks, corrupting the area too far!")) - return - - if(!do_after(user, 2 SECONDS, target = target_turf)) + return NONE + if(istype(interacting_with, /obj/structure/lavaland/ash_walker)) + return NONE + if(!isopenturf(interacting_with)) + return NONE + var/turf/target_turf = interacting_with + if(istype(interacting_with, /turf/open/misc/asteroid/basalt/lava_land_surface)) + to_chat(user, span_warning("You begin to corrupt the land even further...")) + if(!do_after(user, 4 SECONDS, target = target_turf)) to_chat(user, span_warning("[src] had their casting cut short!")) - return - - target_turf.ChangeTurf(/turf/open/misc/asteroid/basalt/lava_land_surface) + return ITEM_INTERACT_BLOCKING + target_turf.ChangeTurf(/turf/open/lava/smooth/lava_land_surface) + to_chat(user, span_notice("[src] sparks, corrupting the area too far!")) + return + if(world.time > staff_time) + to_chat(user, span_warning("[src] has had its permission expire from the necropolis!")) + return ITEM_INTERACT_BLOCKING + if(!do_after(user, 2 SECONDS, target = target_turf)) + to_chat(user, span_warning("[src] had their casting cut short!")) + return ITEM_INTERACT_BLOCKING + target_turf.ChangeTurf(/turf/open/misc/asteroid/basalt/lava_land_surface) + return ITEM_INTERACT_SUCCESS + +/obj/structure/lavaland/ash_walker/attackby(obj/item/I, mob/living/user, params) + if(istype(I, /obj/item/ash_staff) && user.mind.has_antag_datum(/datum/antagonist/ashwalker)) + var/obj/item/ash_staff/target_staff = I + target_staff.staff_time = world.time + 5 MINUTES + playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE) + to_chat(user, span_notice("The tendril permits you to have more time to corrupt the world with ashes.")) return - return ..() //generic ash item recipe diff --git a/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm b/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm index d55eb7ae2112d..ea2799589090d 100644 --- a/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm +++ b/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm @@ -88,52 +88,59 @@ var/snack_name = initial(selected_snack.name) to_chat(user, span_notice("[src] is now dispensing [snack_name].")) -/obj/item/borg_snack_dispenser/attack(mob/living/patron, mob/living/silicon/robot/user, params) +/obj/item/borg_snack_dispenser/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + var/mob/living/patron = interacting_with + if(!istype(patron)) + return NONE var/empty_hand = LAZYACCESS(patron.get_empty_held_indexes(), 1) if(!empty_hand) to_chat(user, span_warning("[patron] has no free hands!")) - return + return ITEM_INTERACT_BLOCKING if(!selected_snack) to_chat(user, span_warning("No snack selected.")) - return - if(!istype(user)) - CRASH("[src] being used by non borg [user]") - if(user.cell.charge < borg_charge_cutoff) - to_chat(user, span_danger("Automated Safety Measures restrict the operation of [src] while under [borg_charge_cutoff]!")) - return - if(!user.cell.use(borg_charge_usage)) - to_chat(user, span_danger("Failure printing snack: power failure!")) - return + return ITEM_INTERACT_BLOCKING + var/mob/living/silicon/robot/borg = user + if(!istype(borg)) + CRASH("[src] being used by non borg [borg]") + if(borg.cell.charge < borg_charge_cutoff) + to_chat(borg, span_danger("Automated Safety Measures restrict the operation of [src] while under [borg_charge_cutoff]!")) + return ITEM_INTERACT_BLOCKING + if(!borg.cell.use(borg_charge_usage)) + to_chat(borg, span_danger("Failure printing snack: power failure!")) + return ITEM_INTERACT_BLOCKING var/atom/snack = new selected_snack(src) patron.put_in_hand(snack, empty_hand) - user.do_item_attack_animation(patron, null, snack) + borg.do_item_attack_animation(patron, null, snack) playsound(loc, 'sound/machines/click.ogg', 10, TRUE) - to_chat(patron, span_notice("[user] dispenses [snack] into your empty hand and you reflexively grasp it.")) - to_chat(user, span_notice("You dispense [snack] into the hand of [user].")) + to_chat(patron, span_notice("[borg] dispenses [snack] into your empty hand and you reflexively grasp it.")) + to_chat(borg, span_notice("You dispense [snack] into the hand of [borg].")) + return ITEM_INTERACT_SUCCESS /obj/item/borg_snack_dispenser/click_alt(mob/user) launch_mode = !launch_mode to_chat(user, span_notice("[src] is [(launch_mode ? "now" : "no longer")] launching snacks at a distance.")) return CLICK_ACTION_SUCCESS -/obj/item/borg_snack_dispenser/afterattack(atom/target, mob/living/silicon/robot/user, proximity_flag, click_parameters) - if(Adjacent(target) || !launch_mode) - return ..() +/obj/item/borg_snack_dispenser/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!launch_mode) + return NONE if(!selected_snack) to_chat(user, span_warning("No snack selected.")) - return - if(!istype(user)) - CRASH("[src] being used by non borg [user]") - if(user.cell.charge < borg_charge_cutoff) - to_chat(user, span_danger("Automated Safety Measures restrict the operation of [src] while under [borg_charge_cutoff]!")) - return - if(!user.cell.use(borg_charge_usage)) - to_chat(user, span_danger("Failure printing snack: power failure!")) - return + return ITEM_INTERACT_BLOCKING + var/mob/living/silicon/robot/borg = user + if(!istype(borg)) + CRASH("[src] being used by non borg [borg]") + if(borg.cell.charge < borg_charge_cutoff) + to_chat(borg, span_danger("Automated Safety Measures restrict the operation of [src] while under [borg_charge_cutoff]!")) + return ITEM_INTERACT_BLOCKING + if(!borg.cell.use(borg_charge_usage)) + to_chat(borg, span_danger("Failure printing snack: power failure!")) + return ITEM_INTERACT_BLOCKING var/atom/movable/snack = new selected_snack(get_turf(src)) - snack.throw_at(target, 7, 2, user, TRUE, FALSE) + snack.throw_at(interacting_with, 7, 2, borg, TRUE, FALSE) playsound(loc, 'sound/machines/click.ogg', 10, TRUE) - user.visible_message(span_notice("[src] launches [snack] at [target]!")) + borg.visible_message(span_notice("[src] launches [snack] at [interacting_with]!")) + return ITEM_INTERACT_SUCCESS /obj/item/food/cookie/bacon name = "strip of bacon" diff --git a/modular_skyrat/modules/borgs/code/robot_items.dm b/modular_skyrat/modules/borgs/code/robot_items.dm index 2cce354b3a5f6..3bc966b2814c9 100644 --- a/modular_skyrat/modules/borgs/code/robot_items.dm +++ b/modular_skyrat/modules/borgs/code/robot_items.dm @@ -355,12 +355,12 @@ /// A proc for shooting a projectile at the target, it's just that simple, really. -/obj/item/borg/paperplane_crossbow/proc/shoot(atom/target, mob/living/user, params) +/obj/item/borg/paperplane_crossbow/proc/shoot(atom/target, mob/living/user) if(!COOLDOWN_FINISHED(src, shooting_cooldown)) - return + return ITEM_INTERACT_BLOCKING if(planes <= 0) to_chat(user, span_warning("Not enough paper planes left!")) - return FALSE + return ITEM_INTERACT_BLOCKING planes-- var/obj/item/paperplane/syndicate/hardlight/plane_to_fire = new /obj/item/paperplane/syndicate/hardlight(get_turf(src.loc)) @@ -370,18 +370,19 @@ COOLDOWN_START(src, shooting_cooldown, shooting_delay) user.visible_message(span_warning("[user] shoots a paper plane at [target]!")) check_amount() + return ITEM_INTERACT_SUCCESS -/obj/item/borg/paperplane_crossbow/afterattack(atom/target, mob/living/user, proximity, click_params) - . = ..() +/obj/item/borg/paperplane_crossbow/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) check_amount() - if(iscyborg(user)) - var/mob/living/silicon/robot/robot_user = user - if(!robot_user.cell.use(STANDARD_CELL_CHARGE * 0.1)) - to_chat(user, span_warning("Not enough power.")) - return FALSE - shoot(target, user, click_params) + if(!iscyborg(user)) + return ITEM_INTERACT_BLOCKING + var/mob/living/silicon/robot/robot_user = user + if(!robot_user.cell.use(10)) + to_chat(user, span_warning("Not enough power.")) + return ITEM_INTERACT_BLOCKING + return shoot(interacting_with, user) /// Holders for the package wrap and the wrapping paper synthetizers. diff --git a/modular_skyrat/modules/borgs/code/robot_upgrade.dm b/modular_skyrat/modules/borgs/code/robot_upgrade.dm index 5f5020d8cf9e3..74e971f44f801 100644 --- a/modular_skyrat/modules/borgs/code/robot_upgrade.dm +++ b/modular_skyrat/modules/borgs/code/robot_upgrade.dm @@ -236,12 +236,29 @@ items_to_add = list(/obj/item/quadborg_tongue, /obj/item/quadborg_nose) -/obj/item/borg/upgrade/affectionmodule/action(mob/living/silicon/robot/borg) - if(!((TRAIT_R_SQUADRUPED in borg.model.model_features) || (TRAIT_R_WIDE in borg.model.model_features)))//BUBBER EDIT - added small quadruped borgs - to_chat(usr, span_warning("This unit's chassis does not support this module.")) - return FALSE - . = ..() - +/obj/item/quadborg_tongue/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + var/mob/living/silicon/robot/borg = user + var/mob/living/mob = interacting_with + if(!istype(mob)) + return ITEM_INTERACT_BLOCKING + if(HAS_TRAIT(interacting_with, TRAIT_AFFECTION_AVERSION)) // Checks for Affection Aversion trait + to_chat(user, span_warning("ERROR: [interacting_with] is on the Do Not Lick registry!")) + return ITEM_INTERACT_BLOCKING + if(check_zone(borg.zone_selected) == "head") + borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]'s face!"), span_notice("You affectionally lick \the [mob]'s face!")) + else + borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]!"), span_notice("You affectionally lick \the [mob]!")) + playsound(borg, 'sound/effects/attackblob.ogg', 50, 1) + return ITEM_INTERACT_SUCCESS + +/obj/item/quadborg_nose/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(HAS_TRAIT(interacting_with, TRAIT_AFFECTION_AVERSION)) // Checks for Affection Aversion trait + to_chat(user, span_warning("ERROR: [interacting_with] is on the No Nosing registry!")) + return ITEM_INTERACT_BLOCKING + + do_attack_animation(interacting_with, null, src) + user.visible_message(span_notice("[user] [pick("nuzzles", "pushes", "boops")] \the [interacting_with.name] with their nose!")) + return ITEM_INTERACT_SUCCESS /// The Shrinkening /mob/living/silicon/robot diff --git a/modular_skyrat/modules/bsrpd/code/bsrpd.dm b/modular_skyrat/modules/bsrpd/code/bsrpd.dm index 23daac59efa95..ee88f7719158d 100644 --- a/modular_skyrat/modules/bsrpd/code/bsrpd.dm +++ b/modular_skyrat/modules/bsrpd/code/bsrpd.dm @@ -54,21 +54,21 @@ playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE) return CLICK_ACTION_SUCCESS -/obj/item/pipe_dispenser/bluespace/afterattack(atom/target, mob/user, prox) - if(prox || !remote_piping_toggle) // If we are in proximity to the target or have our safety on, don't use charge and don't call this shitcode. - return ..() +/obj/item/pipe_dispenser/bluespace/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!remote_piping_toggle) // If we are in proximity to the target or have our safety on, don't use charge and don't call this shitcode. + return NONE if(current_capacity < ranged_use_cost) to_chat(user, span_warning("The [src] lacks the charge to do that.")) - return FALSE + return ITEM_INTERACT_BLOCKING if(!in_use) - user.Beam(target, icon_state = "rped_upgrade", time = 1 SECONDS) + user.Beam(interacting_with, icon_state = "rped_upgrade", time = 1 SECONDS) in_use = TRUE // So people can't just spam click and get more uses addtimer(VARSET_CALLBACK(src, in_use, FALSE), 1 SECONDS, TIMER_UNIQUE) - if(pre_attack(target, user)) + if(pre_attack(interacting_with, user)) current_capacity -= ranged_use_cost - return TRUE + return ITEM_INTERACT_SUCCESS - return FALSE + return ITEM_INTERACT_BLOCKING #undef BSRPD_CAPACITY_MAX #undef BSRPD_CAPACITY_USE diff --git a/modular_skyrat/modules/cargo/code/packs.dm b/modular_skyrat/modules/cargo/code/packs.dm index 1d9513a85c9c1..423ffec0c2d61 100644 --- a/modular_skyrat/modules/cargo/code/packs.dm +++ b/modular_skyrat/modules/cargo/code/packs.dm @@ -42,6 +42,54 @@ for(var/i in 1 to 3) new /mob/living/basic/pet/chinchilla(.) + +/datum/supply_pack/critter/fennec + name = "Fennec Crate" + desc = "For when you need someone that can really listen to you. \ + Contains two fennecs. \ + Warning, does not mean the fennecs will actually listen to you." + cost = CARGO_CRATE_VALUE * 7 + contains = list(/mob/living/basic/pet/cat/fennec = 2) + crate_name = "fennec crate" + +/datum/supply_pack/critter/pitbull + name = "Pitbull Crate" + desc = "Contains three pitbulls. WARNING: These are NOT pedigree studs, and thus may be less than friendly." + cost = CARGO_CRATE_VALUE * 7 + contains = list( + /mob/living/basic/gorilla/pitbull, + ) + crate_name = "pitbull crate" + +/datum/supply_pack/critter/pitbull/generate() + . = ..() + for(var/i in 1 to 3) + new /mob/living/basic/gorilla/pitbull(.) + +/datum/supply_pack/critter/pitbull/pimpy + name = "Pedigree Stud Pitbull Crate" + desc = "Contains three pitbulls. Verified at the top of Mount Bullmore to be Pedigree Studs.." + cost = CARGO_CRATE_VALUE * 9 + contains = list( + /mob/living/basic/pet/dog/pitbull, + ) + crate_name = "pedigree stud pitbull crate" + +/datum/supply_pack/critter/pitbull/generate() + . = ..() + for(var/i in 1 to 3) + new /mob/living/basic/pet/dog/pitbull(.) + +/datum/supply_pack/critter/redpanda + name = "Red Panda Crate" + desc = "Your station needs a little more Wah? Some more red tails? Order this. You'll never escape your sadness." + cost = CARGO_CRATE_VALUE * 4 + contains = list( + /mob/living/basic/pet/fox/redpanda, + /mob/living/basic/pet/fox/redpanda, + ) + crate_name = "wah crate" + /* * MEDICAL */ diff --git a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm index 409ddb63eb94c..6107aa9fdfdb6 100644 --- a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm +++ b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm @@ -38,21 +38,17 @@ GLOBAL_LIST_EMPTY(cargo_marks) qdel(destroy_children) return CLICK_ACTION_SUCCESS -/obj/item/cargo_teleporter/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if(!proximity_flag) - return ..() - if(target == src) - return ..() +/obj/item/cargo_teleporter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!COOLDOWN_FINISHED(src, use_cooldown)) to_chat(user, span_warning("[src] is still on cooldown!")) - return + return ITEM_INTERACT_BLOCKING var/choice = tgui_input_list(user, "Select which cargo mark to teleport the items to?", "Cargo Mark Selection", GLOB.cargo_marks) if(!choice) - return ..() - if(get_dist(user, target) > 1) - return + return ITEM_INTERACT_BLOCKING + if(get_dist(user, interacting_with) > 1) + return ITEM_INTERACT_BLOCKING var/turf/moving_turf = get_turf(choice) - var/turf/target_turf = get_turf(target) + var/turf/target_turf = get_turf(interacting_with) for(var/check_content in target_turf.contents) if(isobserver(check_content)) continue @@ -68,6 +64,7 @@ GLOBAL_LIST_EMPTY(cargo_marks) do_teleport(movable_content, moving_turf, asoundout = 'sound/magic/Disable_Tech.ogg') new /obj/effect/decal/cleanable/ash(target_turf) COOLDOWN_START(src, use_cooldown, 8 SECONDS) + return ITEM_INTERACT_SUCCESS /datum/design/cargo_teleporter name = "Cargo Teleporter" diff --git a/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm b/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm index cffb660d9bc74..1a0a53e83b00d 100644 --- a/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm +++ b/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm @@ -46,45 +46,45 @@ . += span_brass("Right Click in-hand to fabricate bronze sheets.") -/obj/item/clockwork/replica_fabricator/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - . = ..() - if(!proximity_flag || !IS_CLOCK(user)) - return +/obj/item/clockwork/replica_fabricator/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!IS_CLOCK(user)) + return NONE - if(istype(target, /obj/item/stack/sheet)) // If it's an item, handle it seperately - attempt_convert_materials(target, user) - return + if(istype(interacting_with, /obj/item/stack/sheet)) // If it's an item, handle it seperately + attempt_convert_materials(interacting_with, user) + return ITEM_INTERACT_SUCCESS - if(!selected_output || !isopenturf(target)) // Now we handle objects - return + if(!selected_output || !isopenturf(interacting_with)) // Now we handle objects + return ITEM_INTERACT_BLOCKING - var/turf/creation_turf = get_turf(target) + var/turf/creation_turf = get_turf(interacting_with) if(locate(selected_output.to_create_path) in creation_turf) to_chat(user, span_clockyellow("There is already one of these on this tile!")) - return + return ITEM_INTERACT_BLOCKING if(power < selected_output.cost) - to_chat(user, span_clockyellow("[src] needs at least [display_energy(selected_output.cost)] of power to create this.")) - return + to_chat(user, span_clockyellow("[src] needs at least [selected_output.cost]W of power to create this.")) + return ITEM_INTERACT_BLOCKING var/obj/effect/temp_visual/ratvar/constructing_effect/effect = new(creation_turf, selected_output.creation_delay) - if(!do_after(user, selected_output.creation_delay, target)) + if(!do_after(user, selected_output.creation_delay, interacting_with)) qdel(effect) - return + return ITEM_INTERACT_BLOCKING if(power < selected_output.cost) // Just in case - return + return ITEM_INTERACT_BLOCKING power -= selected_output.cost var/atom/created if(selected_output.to_create_path) - created = new selected_output.to_create_path(get_turf(target)) + created = new selected_output.to_create_path(get_turf(interacting_with)) selected_output.on_create(created, creation_turf, user) + return ITEM_INTERACT_SUCCESS /obj/item/clockwork/replica_fabricator/attackby(obj/item/attacking_item, mob/user, params) diff --git a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm index 1f40edc610195..cd36dc9584689 100644 --- a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm +++ b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm @@ -171,11 +171,10 @@ AddElement(/datum/element/clockwork_description, "Firing from brass tiles will halve the time that it takes to recharge a bolt.") AddElement(/datum/element/clockwork_pickup) -/obj/item/gun/ballistic/bow/clockwork/afterattack(atom/target, mob/living/user, flag, params, passthrough) +/obj/item/gun/ballistic/bow/clockwork/try_fire_gun(atom/target, mob/living/user, params) if(!drawn || !chambered) to_chat(user, span_notice("[src] must be drawn to fire a shot!")) - return - + return FALSE return ..() /obj/item/gun/ballistic/bow/clockwork/shoot_live_shot(mob/living/user, pointblank, atom/pbtarget, message) diff --git a/modular_skyrat/modules/clock_cult/code/structures/traps/trap.dm b/modular_skyrat/modules/clock_cult/code/structures/traps/trap.dm index aec6c553653be..dc6aa45b3cdc6 100644 --- a/modular_skyrat/modules/clock_cult/code/structures/traps/trap.dm +++ b/modular_skyrat/modules/clock_cult/code/structures/traps/trap.dm @@ -18,12 +18,12 @@ place_trap(get_turf(src), user) -/obj/item/clockwork/trap_placer/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - . = ..() - if(!IS_CLOCK(user) || !isturf(target) || !proximity_flag) - return +/obj/item/clockwork/trap_placer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!IS_CLOCK(user) || !isturf(interacting_with)) + return NONE - place_trap(target, user) + place_trap(interacting_with, user) + return ITEM_INTERACT_SUCCESS /obj/item/clockwork/trap_placer/proc/place_trap(atom/target, mob/user) diff --git a/modular_skyrat/modules/colony_fabricator/code/construction/doors.dm b/modular_skyrat/modules/colony_fabricator/code/construction/doors.dm index 3d123341a577e..b6055221f2f12 100644 --- a/modular_skyrat/modules/colony_fabricator/code/construction/doors.dm +++ b/modular_skyrat/modules/colony_fabricator/code/construction/doors.dm @@ -9,15 +9,11 @@ density = FALSE opacity = FALSE -/obj/machinery/door/poddoor/shutters/colony_fabricator/do_animate(animation) +/obj/machinery/door/poddoor/shutters/colony_fabricator/animation_effects(animation) switch(animation) - if("opening") - flick("opening", src) - icon_state = "open" + if(DOOR_OPENING_ANIMATION) playsound(src, animation_sound, 30, TRUE) - if("closing") - flick("closing", src) - icon_state = "closed" + if(DOOR_CLOSING_ANIMATION) playsound(src, animation_sound, 30, TRUE) /obj/item/flatpacked_machine/shutter_kit diff --git a/modular_skyrat/modules/colony_fabricator/code/construction/turfs.dm b/modular_skyrat/modules/colony_fabricator/code/construction/turfs.dm index 536b3c81b4717..8548ead050237 100644 --- a/modular_skyrat/modules/colony_fabricator/code/construction/turfs.dm +++ b/modular_skyrat/modules/colony_fabricator/code/construction/turfs.dm @@ -43,10 +43,8 @@ GLOBAL_LIST_INIT(plastic_wall_panel_recipes, list( /obj/item/stack/sheet/plastic_wall_panel/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) if(!isopenturf(interacting_with)) - return ITEM_INTERACT_SKIP_TO_ATTACK + return NONE var/turf/open/build_on = interacting_with - if(!user.Adjacent(build_on)) - return ITEM_INTERACT_BLOCKING if(isgroundlessturf(build_on)) user.balloon_alert(user, "can't place it here!") return ITEM_INTERACT_BLOCKING @@ -65,7 +63,7 @@ GLOBAL_LIST_INIT(plastic_wall_panel_recipes, list( user.balloon_alert(user, "not enough material!") return ITEM_INTERACT_BLOCKING build_on.place_on_top(walltype, flags = CHANGETURF_INHERIT_AIR) - return ITEM_INTERACT_BLOCKING + return ITEM_INTERACT_SUCCESS /obj/item/stack/sheet/plastic_wall_panel/get_main_recipes() . = ..() diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/akh_frontier.dm b/modular_skyrat/modules/company_imports/code/armament_datums/akh_frontier.dm index 8687de42ffb6d..e938f3de256e7 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/akh_frontier.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/akh_frontier.dm @@ -13,7 +13,6 @@ /datum/armament_entry/company_import/akh_frontier/basic/prybar item_type = /obj/item/crowbar/large/doorforcer - restricted = TRUE /datum/armament_entry/company_import/akh_frontier/basic/arc_welder item_type = /obj/item/weldingtool/electric/arc_welder @@ -29,7 +28,6 @@ /datum/armament_entry/company_import/akh_frontier/deployables_fab/rapid_construction_fabricator item_type = /obj/item/flatpacked_machine cost = CARGO_CRATE_VALUE * 6 - restricted = TRUE /datum/armament_entry/company_import/akh_frontier/deployables_fab/foodricator item_type = /obj/item/flatpacked_machine/organics_ration_printer diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm index e39da4ad29b8d..3d534e6d4af68 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm @@ -29,15 +29,15 @@ /datum/armament_entry/company_import/deforest/first_aid_kit/first_responder item_type = /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked - cost = PAYCHECK_COMMAND * 6 + cost = PAYCHECK_COMMAND * 10.5 /datum/armament_entry/company_import/deforest/first_aid_kit/orange_satchel item_type = /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked - cost = PAYCHECK_COMMAND * 8 + cost = PAYCHECK_COMMAND * 9.5 /datum/armament_entry/company_import/deforest/first_aid_kit/technician_satchel item_type = /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked - cost = PAYCHECK_COMMAND * 7 + cost = PAYCHECK_COMMAND * 11.75 // Basic first aid supplies like gauze, sutures, mesh, so on diff --git a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm index 00236472960d8..495de7ff9f19c 100644 --- a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm +++ b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm @@ -35,23 +35,20 @@ new_cs.sorting_list = current_sort spawned_sorters += new_cs -/obj/item/conveyor_sorter/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if(target == src) - return ..() - if(!proximity_flag) - return ..() - if(!ismovable(target)) - return ..() - if(istype(target, /obj/effect/decal/conveyor_sorter)) - return - if(is_type_in_list(target, current_sort)) - to_chat(user, span_warning("[target] is already in [src]'s sorting list!")) - return +/obj/item/conveyor_sorter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!ismovable(interacting_with)) + return NONE + if(istype(interacting_with, /obj/effect/decal/conveyor_sorter)) + return NONE + if(is_type_in_list(interacting_with, current_sort)) + to_chat(user, span_warning("[interacting_with] is already in [src]'s sorting list!")) + return ITEM_INTERACT_BLOCKING if(length(current_sort) >= max_items) to_chat(user, span_warning("[src] already has [max_items] things within the sorting list!")) - return - current_sort += target.type - to_chat(user, span_notice("[target] has been added to [src]'s sorting list.")) + return ITEM_INTERACT_BLOCKING + current_sort += interacting_with.type + to_chat(user, span_notice("[interacting_with] has been added to [src]'s sorting list.")) + return ITEM_INTERACT_SUCCESS /obj/item/conveyor_sorter/click_alt(mob/user) visible_message("[src] pings, resetting its sorting list!") diff --git a/modular_skyrat/modules/customization/game/objects/items/conversion_kits.dm b/modular_skyrat/modules/customization/game/objects/items/conversion_kits.dm index ca791924b2a65..78659bc2813e5 100644 --- a/modular_skyrat/modules/customization/game/objects/items/conversion_kits.dm +++ b/modular_skyrat/modules/customization/game/objects/items/conversion_kits.dm @@ -8,21 +8,20 @@ /// The object to turn it into. var/obj/item/to_obj -/obj/item/device/custom_kit/afterattack(obj/target_obj, mob/user, proximity_flag) - if(!proximity_flag) //Gotta be adjacent to your target - return - if(isturf(target_obj)) //This shouldn't be needed, but apparently it throws runtimes otherwise. - return - else if(target_obj.type == from_obj) //Checks whether the item is eligible to be converted - if(!pre_convert_check(target_obj, user)) - return FALSE - var/obj/item/converted_item = new to_obj(get_turf(src)) - user.put_in_hands(converted_item) - user.visible_message(span_notice("[user] modifies [target_obj] into [converted_item]."), span_notice("You modify [target_obj] into [converted_item].")) - qdel(target_obj) - qdel(src) - else - to_chat(user, span_warning("It looks like this kit won't work on [target_obj]...")) +/obj/item/device/custom_kit/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(isturf(interacting_with)) //This shouldn't be needed, but apparently it throws runtimes otherwise. + return NONE + if(interacting_with.type != from_obj) //Checks whether the item is eligible to be converted + to_chat(user, span_warning("It looks like this kit won't work on [interacting_with]...")) + return ITEM_INTERACT_BLOCKING + if(!pre_convert_check(interacting_with, user)) + return ITEM_INTERACT_BLOCKING + var/obj/item/converted_item = new to_obj + user.visible_message(span_notice("[user] modifies [interacting_with] into [converted_item]."), span_notice("You modify [interacting_with] into [converted_item].")) + qdel(interacting_with) + qdel(src) + user.put_in_hands(converted_item) + return ITEM_INTERACT_SUCCESS /// Override this if you have some condition you want fulfilled before allowing the conversion. Return TRUE to allow it to convert, return FALSE to prevent it. /obj/item/device/custom_kit/proc/pre_convert_check(obj/target_obj, mob/user) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm index bf731c941aae7..f31c9b6a33f9a 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm @@ -38,6 +38,10 @@ if(HAS_TRAIT(target_mob, TRAIT_AGEUSIA)) // They don't taste anything, their body shouldn't react strongly to the taste of that stuff. return +// BUBBER EDIT START + if(HAS_TRAIT(target_mob, TRAIT_MASQUERADE_FOOD)) // Their tumor has adapted the ability to consume normal food without violently rejecting it. + return +// BUBBER EDIT END if(container.reagents.has_chemical_flag_skyrat(REAGENT_BLOOD_REGENERATING, container.reagents.total_volume * MINIMUM_BLOOD_REGENING_REAGENT_RATIO)) // At least 75% of the content of the cup needs to be something that's counting as blood-regenerating for the tumor not to freak out. return diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_stomach.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_stomach.dm index 3af433695a9af..8d122fa36787a 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_stomach.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_stomach.dm @@ -34,6 +34,10 @@ if(parent_organ.owner && HAS_TRAIT(parent_organ.owner, TRAIT_AGEUSIA)) // They don't taste anything, their body shouldn't react strongly to the taste of that stuff. return +// BUBBER EDIT START + if(parent_organ.owner && HAS_TRAIT(parent_organ.owner, TRAIT_MASQUERADE_FOOD)) // Their tumor has adapted the ability to consume normal food without violently rejecting it. + return +// BUBBER EDIT END var/mob/living/carbon/body = parent_organ.owner ASSERT(istype(body)) diff --git a/modular_skyrat/modules/deforest_medical_items/code/cargo_packs.dm b/modular_skyrat/modules/deforest_medical_items/code/cargo_packs.dm index f5fc57d349e15..895d1c5f50731 100644 --- a/modular_skyrat/modules/deforest_medical_items/code/cargo_packs.dm +++ b/modular_skyrat/modules/deforest_medical_items/code/cargo_packs.dm @@ -19,91 +19,36 @@ /obj/item/storage/medkit/combat_surgeon/stocked = 3, ) -/datum/supply_pack/medical/kit_medical_surgical - name = "Heavy Duty Medical Kit Crate - Medical/Surgical" - crate_name = "heavy duty medical kit crate" - desc = "Contains a large satchel medical kit, and a first responder surgical kit." +/datum/supply_pack/medical/kit_technician + name = "Heavy Duty Medical Kit Crate - Technician" + crate_name = "technician kit crate" + desc = "Contains a pink medical technician kit." access = ACCESS_MEDICAL - cost = CARGO_CRATE_VALUE * 10 - contains = list( - /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, - /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, - ) - -/datum/supply_pack/medical/kit_surgical_technician - name = "Heavy Duty Medical Kit Crate - Surgical/Technician" - crate_name = "heavy duty medical kit crate" - desc = "Contains a first responder surgical kit, and a medical technician kit." - access = ACCESS_MEDICAL - cost = CARGO_CRATE_VALUE * 10 - contains = list( - /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked, - /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, - ) - -/datum/supply_pack/medical/kit_medical_technician - name = "Heavy Duty Medical Kit Crate - Medical/Technician" - crate_name = "heavy duty medical kit crate" - desc = "Contains a large satchel medical kit, and a medical technician kit." - access = ACCESS_MEDICAL - cost = CARGO_CRATE_VALUE * 10 + cost = CARGO_CRATE_VALUE * 5.5 contains = list( /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked, - /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, ) -/datum/supply_pack/medical/kit_surgical_technician - name = "Heavy Duty Medical Kit Crate - Surgical/Technician" - crate_name = "heavy duty medical kit crate" - desc = "Contains a first responder surgical kit, and a medical technician kit." +/datum/supply_pack/medical/kit_surgical + name = "Heavy Duty Medical Kit Crate - Surgical" + crate_name = "surgical kit crate" + desc = "Contains a grey first responder surgical kit." access = ACCESS_MEDICAL - cost = CARGO_CRATE_VALUE * 10 + cost = CARGO_CRATE_VALUE * 5 contains = list( - /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked, /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, ) -/datum/supply_pack/medical/kit_medical_technician - name = "Heavy Duty Medical Kit Crate - Medical/Technician" - crate_name = "heavy duty medical kit crate" - desc = "Contains a large satchel medical kit, and a medical technician kit." +/datum/supply_pack/medical/kit_medical + name = "Heavy Duty Medical Kit Crate - Medical" + crate_name = "medical kit crate" + desc = "Contains an orange satchel medical kit." access = ACCESS_MEDICAL - cost = CARGO_CRATE_VALUE * 10 + cost = CARGO_CRATE_VALUE * 4.5 contains = list( - /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked, /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, ) -/datum/supply_pack/security/secmed_medical - name = "Security Medic Kit Crate - Medical" - crate_name = "security medic crate" - desc = "Contains a large satchel medical kit." - access = ACCESS_SECURITY - cost = CARGO_CRATE_VALUE * 5 - contains = list( - /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, - ) - -/datum/supply_pack/security/secmed_surgical - name = "Security Medic Kit Crate - Surgical" - crate_name = "security medic crate" - desc = "Contains a first responder surgical kit." - access = ACCESS_SECURITY - cost = CARGO_CRATE_VALUE * 5 - contains = list( - /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, - ) - -/datum/supply_pack/security/secmed_technician - name = "Security Medic Kit Crate - Technician" - crate_name = "security medic crate" - desc = "Contains a medical technician kit." - access = ACCESS_SECURITY - cost = CARGO_CRATE_VALUE * 5 - contains = list( - /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked, - ) - /datum/supply_pack/medical/deforest_vendor_refill name = "DeForest Med-Vend Resupply Crate" crate_name = "\improper DeForest Med-Vend resupply crate" diff --git a/modular_skyrat/modules/delam_emergency_stop/code/scram.dm b/modular_skyrat/modules/delam_emergency_stop/code/scram.dm index 2d5481b27470b..781fc49579c78 100644 --- a/modular_skyrat/modules/delam_emergency_stop/code/scram.dm +++ b/modular_skyrat/modules/delam_emergency_stop/code/scram.dm @@ -189,6 +189,7 @@ // Fire bell close, that nice 'are we gonna die?' rumble out far on = TRUE + SSpersistence.reset_delam_counter() alert_sound_to_playing('sound/misc/earth_rumble_distant3.ogg', override_volume = TRUE) update_appearance() @@ -461,6 +462,13 @@ return ..() +/// Resets the safety incident display internal counter back to -1 (delam event happened) +/datum/controller/subsystem/persistence/proc/reset_delam_counter() + delam_highscore = rounds_since_engine_exploded + rounds_since_engine_exploded = -1 + for(var/obj/machinery/incident_display/sign as anything in GLOB.map_incident_displays) + sign.update_delam_count(rounds_since_engine_exploded) + MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/atmospherics/components/unary/delam_scram, 0) MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/delam_procedure, 32) diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm index 312c22b29176f..442e4ba4b8ac7 100644 --- a/modular_skyrat/modules/emotes/code/emotes.dm +++ b/modular_skyrat/modules/emotes/code/emotes.dm @@ -1,11 +1,11 @@ -#define EMOTE_DELAY (5 SECONDS) //To prevent spam emotes. +#define EMOTE_DELAY (1 SECONDS) //To prevent spam emotes. - BUBBER EDIT 5 to 1 SECOND CHANGE IN COOLDOWN /mob var/nextsoundemote = 1 //Time at which the next emote can be played /datum/emote - // cooldown = EMOTE_DELAY BUBBERSTATION CHANGE: REMOVES ABSURD EMOTE DELAY + cooldown = EMOTE_DELAY var/muzzle_ignore = FALSE //Disables the custom emote blacklist from TG that normally applies to slimes. diff --git a/modular_skyrat/modules/emotes/code/laugh_emotes.dm b/modular_skyrat/modules/emotes/code/laugh_emotes.dm index 0c003d1138fb8..5c202afeaadad 100644 --- a/modular_skyrat/modules/emotes/code/laugh_emotes.dm +++ b/modular_skyrat/modules/emotes/code/laugh_emotes.dm @@ -1,47 +1,25 @@ -/datum/emote/living/scream +/datum/emote/living/laugh + key = "laugh" + key_third_person = "laughs" + message = "laughs." + message_mime = "laughs silently!" + emote_type = EMOTE_AUDIBLE + audio_cooldown = 5 SECONDS vary = TRUE - mob_type_blacklist_typecache = list(/mob/living/carbon/human, /mob/living/basic/slime, /mob/living/brain) //Humans get specialized scream. + mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai) -/datum/emote/living/scream/get_sound(mob/living/user) - if(issilicon(user)) - var/mob/living/silicon/silicon_user = user - var/datum/scream_type/selected_scream = silicon_user.selected_scream - if(isnull(selected_scream)) - return 'modular_skyrat/modules/emotes/sound/voice/scream_silicon.ogg' - if(user.gender == FEMALE && LAZYLEN(selected_scream.female_screamsounds)) - return pick(selected_scream.female_screamsounds) +/datum/emote/living/laugh/get_sound(mob/living/user) + if(iscarbon(user)) + var/mob/living/carbon/human/H = user + if(isnull(H.selected_laugh)) //For things that don't have a selected laugh(npcs) + if(user.gender == MALE) + return pick('sound/voice/human/manlaugh1.ogg', + 'sound/voice/human/manlaugh2.ogg') + else + return pick('modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg', + 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_2.ogg') + if(user.gender == MALE || !LAZYLEN(H.selected_laugh.female_laughsounds)) + return pick(H.selected_laugh.male_laughsounds) else - return pick(selected_scream.male_screamsounds) - if(issilicon(user)) - return 'modular_skyrat/modules/emotes/sound/voice/scream_silicon.ogg' - if(ismonkey(user)) - return 'modular_skyrat/modules/emotes/sound/voice/scream_monkey.ogg' - if(istype(user, /mob/living/basic/gorilla)) - return 'sound/creatures/gorilla.ogg' - if(isalien(user)) - return 'sound/voice/hiss6.ogg' - -/datum/emote/living/scream/can_run_emote(mob/living/user, status_check, intentional) - if(iscyborg(user)) - var/mob/living/silicon/robot/robot_user = user - - if(robot_user.cell?.charge < 200) - to_chat(robot_user , span_warning("Scream module deactivated. Please recharge.")) - return FALSE - robot_user.cell.use(200) - return ..() - -/datum/emote/living/carbon/human/scream - only_forced_audio = FALSE - -/datum/emote/living/carbon/human/scream/get_sound(mob/living/carbon/human/user) - if(!istype(user)) - return - if(isnull(user.selected_scream) || (LAZYLEN(user.selected_scream.male_screamsounds) && LAZYLEN(user.selected_scream.female_screamsounds))) //For things that don't have a selected scream(npcs) - if(prob(1)) - return 'sound/voice/human/wilhelm_scream.ogg' - return user.dna.species.get_scream_sound(user) - if(user.gender == FEMALE && LAZYLEN(user.selected_scream.female_screamsounds)) - return pick(user.selected_scream.female_screamsounds) - else - return pick(user.selected_scream.male_screamsounds) + return pick(H.selected_laugh.female_laughsounds) + return diff --git a/modular_skyrat/modules/faction/code/id.dm b/modular_skyrat/modules/faction/code/id.dm index c7b858989d09d..26fed12142128 100644 --- a/modular_skyrat/modules/faction/code/id.dm +++ b/modular_skyrat/modules/faction/code/id.dm @@ -18,15 +18,16 @@ icon_state = "data_1" var/list/extra_access -/obj/item/card/faction_access/afterattack(atom/movable/AM, mob/user, proximity) - . = ..() - if(istype(AM, /obj/item/card/id) && proximity) - var/obj/item/card/id/I = AM - if(extra_access) - for(var/acs in extra_access) - I.access |= acs - to_chat(user, span_notice("You upgrade [I] with extra access.")) - qdel(src) +/obj/item/card/faction_access/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + var/obj/item/card/id/id = interacting_with + if(!istype(id)) + return NONE + if(extra_access) + for(var/acs in extra_access) + id.access |= acs + to_chat(user, span_notice("You upgrade [id] with extra access.")) + qdel(src) + return ITEM_INTERACT_SUCCESS /obj/item/card/faction_access/guest name = "faction guest access card" diff --git a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm index 0115aebdd0f99..a7f49026ffd69 100644 --- a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm +++ b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm @@ -154,9 +154,9 @@ if(is_nemesis_faction) force -= faction_bonus_force -/obj/item/claymore/dragonslayer/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) +/obj/item/claymore/dragonslayer/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) if(user.IsImmobilized()) // no free dodgerolls - return + return NONE var/turf/where_to = get_turf(interacting_with) user.apply_damage(damage = roll_stamcost, damagetype = STAMINA) user.Immobilize(0.1 SECONDS) // you dont get to adjust your roll @@ -164,7 +164,7 @@ user.apply_status_effect(/datum/status_effect/dodgeroll_iframes) playsound(user, SFX_BODYFALL, 50, TRUE) playsound(user, SFX_RUSTLE, 50, TRUE) - return ..() + return ITEM_INTERACT_SUCCESS /datum/status_effect/dodgeroll_iframes id = "dodgeroll_dodging" diff --git a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm index ca8c9c2f7c2be..a10cf315529e7 100644 --- a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm +++ b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm @@ -76,7 +76,7 @@ /datum/gunpoint/Destroy() UnregisterSignal(aimed_gun, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED)) - UnregisterSignal(target, list(COMSIG_QDELETING, COMSIG_ITEM_INTERACTING_WITH_ATOM, COMSIG_ITEM_ATTACK_SELF, COMSIG_LIVING_UNARMED_ATTACK, COMSIG_ITEM_ATTACK_SELF, COMSIG_MOVABLE_RADIO_TALK_INTO, COMSIG_MOB_FIRED_GUN, COMSIG_MOVABLE_MOVED)) + UnregisterSignal(target, list(COMSIG_QDELETING, COMSIG_ITEM_ATTACK_SELF, COMSIG_LIVING_UNARMED_ATTACK, COMSIG_ITEM_ATTACK_SELF, COMSIG_MOVABLE_RADIO_TALK_INTO, COMSIG_MOB_FIRED_GUN, COMSIG_MOVABLE_MOVED)) UnregisterSignal(source, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIVING_STATUS_STUN, COMSIG_LIVING_STATUS_KNOCKDOWN, COMSIG_LIVING_STATUS_PARALYZE, COMSIG_LIVING_UPDATED_RESTING)) REMOVE_TRAIT(source, TRAIT_NORUNNING, "gunpoint") diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm index 58cb9b8723dba..86bf66e3435ec 100644 --- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm +++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm @@ -97,7 +97,7 @@ icon_state = "bighypo2" gags_bodystate = "hypo2_deluxe" desc = "The deluxe variant of the Hypospray Mk. II, able to take both 100u and 50u vials." - small_only = FALSE + allowed_containers = list(/obj/item/reagent_containers/cup/vial/small, /obj/item/reagent_containers/cup/vial/large) /obj/item/hypospray/mkii/deluxe/cmo name = "hypospray Mk.II deluxe: CMO edition" @@ -139,7 +139,7 @@ return if(vial.reagents.total_volume) var/vial_spritetype = "chem-color" - if(!small_only) + if(istype(vial, /obj/item/reagent_containers/cup/vial/large)) vial_spritetype += "[vial.type_suffix]" else vial_spritetype += "-s" diff --git a/modular_skyrat/modules/liquids/code/cleaning/drains.dm b/modular_skyrat/modules/liquids/code/cleaning/drains.dm index c9b15660056d9..4c98b1931d830 100644 --- a/modular_skyrat/modules/liquids/code/cleaning/drains.dm +++ b/modular_skyrat/modules/liquids/code/cleaning/drains.dm @@ -6,7 +6,6 @@ desc = "Drainage inlet embedded in the floor to prevent flooding." resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF density = FALSE - plane = FLOOR_PLANE layer = GAS_SCRUBBER_LAYER anchored = TRUE var/processing = FALSE diff --git a/modular_skyrat/modules/liquids/code/cleaning/mop.dm b/modular_skyrat/modules/liquids/code/cleaning/mop.dm index 799065054d67b..2634018f31583 100644 --- a/modular_skyrat/modules/liquids/code/cleaning/mop.dm +++ b/modular_skyrat/modules/liquids/code/cleaning/mop.dm @@ -8,7 +8,7 @@ // Disable normal cleaning if there are liquids. if(isturf(atom_to_clean) && turf_to_clean.liquids) - return CLEAN_BLOCKED + return CLEAN_BLOCKED|CLEAN_DONT_BLOCK_INTERACTION return ..() diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_controller.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_controller.dm index b53cbc3bf04b3..14a0173c723ec 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_controller.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_controller.dm @@ -17,15 +17,22 @@ SUBSYSTEM_DEF(liquids) var/list/processing_fire = list() var/fire_counter = 0 //Only process fires on intervals + // format: list[path, list[str, instance]] var/list/singleton_immutables = list() var/run_type = SSLIQUIDS_RUN_TYPE_TURFS -/datum/controller/subsystem/liquids/proc/get_immutable(type) - if(!singleton_immutables[type]) - var/obj/effect/abstract/liquid_turf/immutable/new_one = new type() - singleton_immutables[type] = new_one - return singleton_immutables[type] +/datum/controller/subsystem/liquids/proc/get_immutable(type, turf/reference_turf) + if(isnull(singleton_immutables[type])) + singleton_immutables[type] = list() + + var/offset = GET_TURF_PLANE_OFFSET(reference_turf) + + if(!("[offset]" in singleton_immutables[type])) + var/obj/effect/abstract/liquid_turf/immutable/new_one = new type(null, offset) + singleton_immutables[type]["[offset]"] = new_one + + return singleton_immutables[type]["[offset]"] /datum/controller/subsystem/liquids/stat_entry(msg) diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm index 443fa8bd35d05..94680daf3d3cd 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm @@ -6,6 +6,7 @@ anchored = TRUE plane = FLOOR_PLANE layer = ABOVE_OPEN_TURF_LAYER + appearance_flags = TILE_BOUND color = "#DDF" //For being on fire @@ -222,15 +223,17 @@ /obj/effect/abstract/liquid_turf/proc/make_state_layer(state, has_top) PRIVATE_PROC(TRUE) - . = list(make_liquid_overlay("stage[state]_bottom", ABOVE_MOB_LAYER, ABOVE_GAME_PLANE)) + . = list(make_liquid_overlay("stage[state]_bottom", ABOVE_MOB_LAYER, GAME_PLANE)) if(!has_top) return - . += make_liquid_overlay("stage[state]_top", BELOW_OBJ_LAYER, GAME_PLANE) + . += make_liquid_overlay("stage[state]_top", TABLE_LAYER + 0.05, GAME_PLANE) /obj/effect/abstract/liquid_turf/proc/set_new_liquid_state(new_state) liquid_state = new_state + if(!isnull(my_turf)) + my_turf.liquids_change(new_state) update_icon(UPDATE_OVERLAYS) /obj/effect/abstract/liquid_turf/update_overlays() @@ -651,8 +654,8 @@ smoothing_flags = NONE icon_state = "ocean" base_icon_state = "ocean" - plane = DEFAULT_PLANE //Same as weather, etc. - layer = ABOVE_MOB_LAYER + layer = FLY_LAYER + plane = ABOVE_GAME_PLANE starting_temp = T20C-150 no_effects = TRUE vis_flags = NONE @@ -660,8 +663,9 @@ /obj/effect/abstract/liquid_turf/immutable/ocean/warm starting_temp = T20C+20 -/obj/effect/abstract/liquid_turf/immutable/Initialize(mapload) +/obj/effect/abstract/liquid_turf/immutable/Initialize(mapload, plane_offset) . = ..() + SET_PLANE_W_SCALAR(src, initial(plane), plane_offset) reagent_list = starting_mixture.Copy() total_reagents = 0 for(var/key in reagent_list) @@ -669,5 +673,3 @@ temp = starting_temp calculate_height() set_reagent_color_for_liquid() - - diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm index 1ec199f890cc5..ccabef3654f22 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm @@ -12,16 +12,17 @@ interaction_callback = CALLBACK(parent, on_interaction_callback) /datum/component/liquids_interaction/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(AfterAttack)) //The only signal allowing item -> turf interaction + RegisterSignal(parent, COMSIG_ITEM_INTERACTING_WITH_ATOM, PROC_REF(item_interaction)) //The only signal allowing item -> turf interaction /datum/component/liquids_interaction/UnregisterFromParent() - UnregisterSignal(parent, COMSIG_ITEM_AFTERATTACK) + UnregisterSignal(parent, COMSIG_ITEM_INTERACTING_WITH_ATOM) -/datum/component/liquids_interaction/proc/AfterAttack(obj/item/target, turf/turf_target, mob/user) +/datum/component/liquids_interaction/proc/item_interaction(datum/source, mob/living/user, atom/target, modifiers) SIGNAL_HANDLER - if(!isturf(turf_target) || !turf_target.liquids) + var/turf/turf_target = target + if(!isturf(target) || !turf_target.liquids) return NONE if(interaction_callback.Invoke(turf_target, user, turf_target.liquids)) - return COMPONENT_CANCEL_ATTACK_CHAIN + return ITEM_INTERACT_SUCCESS diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm index dd764e2c56496..c04676a7e377e 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm @@ -40,7 +40,7 @@ /obj/machinery/plumbing/floor_pump/update_appearance(updates) . = ..() layer = tile_placed ? GAS_SCRUBBER_LAYER : BELOW_OBJ_LAYER - plane = tile_placed ? FLOOR_PLANE : GAME_PLANE + SET_PLANE_IMPLICIT(src, tile_placed ? FLOOR_PLANE : GAME_PLANE) /obj/machinery/plumbing/floor_pump/update_icon_state() . = ..() @@ -294,6 +294,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/plumbing/floor_pump/output/on, 0) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/plumbing/floor_pump/output/on/supply, 0) +// Stops at 30 height - perfect for automatically refilling pools and other water fixtures. +/obj/machinery/plumbing/floor_pump/output/on/supply/waist_deep + height_regulator = 30 + +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/plumbing/floor_pump/output/on/supply/waist_deep, 0) + /obj/item/construction/plumbing/engineering name = "engineering plumbing constructor" desc = "A type of plumbing constructor designed to rapidly deploy the machines needed for logistics regarding fluids." @@ -335,9 +341,25 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/plumbing/floor_pump/output/on/supply, // Helpers for maps /obj/machinery/duct/supply + color = COLOR_CYAN duct_color = COLOR_CYAN duct_layer = FOURTH_DUCT_LAYER + pixel_x = 5 + pixel_y = 5 + +/obj/machinery/duct/supply/Initialize(mapload) + pixel_x = 0 + pixel_y = 0 + . = ..() /obj/machinery/duct/waste + color = COLOR_BROWN duct_color = COLOR_BROWN duct_layer = SECOND_DUCT_LAYER + pixel_x = -5 + pixel_y = -5 + +/obj/machinery/duct/waste/Initialize(mapload) + pixel_x = 0 + pixel_y = 0 + . = ..() diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm index b23574e40ceb5..91fd436b21741 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm @@ -22,6 +22,10 @@ lgroup.remove_from_group(src) SSliquids.add_active_turf(src) +/// Called when liquids flow or otherwise update - intercept COMSIG_TURF_LIQUIDS_CHANGE to react. +/turf/proc/liquids_change(new_state) + SEND_SIGNAL(src, COMSIG_TURF_LIQUIDS_CHANGE, new_state) + /obj/effect/abstract/liquid_turf/proc/liquid_simple_delete_flat(flat_amount) if(flat_amount >= total_reagents) qdel(src, TRUE) diff --git a/modular_skyrat/modules/liquids/code/ocean_areas.dm b/modular_skyrat/modules/liquids/code/ocean_areas.dm index 47e5289c71d67..ce9a64463c592 100644 --- a/modular_skyrat/modules/liquids/code/ocean_areas.dm +++ b/modular_skyrat/modules/liquids/code/ocean_areas.dm @@ -1,6 +1,7 @@ /area/ocean name = "Ocean" - icon_state = "space" + icon = 'icons/area/areas_station.dmi' + icon_state = "explored" requires_power = TRUE always_unpowered = TRUE power_light = FALSE @@ -12,6 +13,7 @@ sound_environment = SOUND_AREA_SPACE /area/ocean/generated + icon_state = "unexplored" map_generator = /datum/map_generator/ocean_generator /area/ocean/trench @@ -19,6 +21,7 @@ name = "The Trench" /area/ocean/trench/generated + icon_state = "unexplored" map_generator = /datum/map_generator/cave_generator/trench /area/ruin/ocean diff --git a/modular_skyrat/modules/liquids/code/ocean_biomes.dm b/modular_skyrat/modules/liquids/code/ocean_biomes.dm index 28e1c47d8f8c2..d49698f6caf36 100644 --- a/modular_skyrat/modules/liquids/code/ocean_biomes.dm +++ b/modular_skyrat/modules/liquids/code/ocean_biomes.dm @@ -1,34 +1,34 @@ /datum/biome/ocean_sand - turf_type = /turf/open/floor/plating/ocean + turf_type = /turf/open/misc/ocean flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed) flora_density = 10 /datum/biome/ocean_sand_flora - turf_type = /turf/open/floor/plating/ocean + turf_type = /turf/open/misc/ocean flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed, /obj/structure/flora/ocean/coral) flora_density = 25 fauna_density = 0.03 fauna_types = list(/mob/living/basic/carp) /datum/biome/ocean_redsand - turf_type = /turf/open/floor/plating/ocean/ironsand + turf_type = /turf/open/misc/ironsand/ocean flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed, /obj/structure/flora/ocean/coral) flora_density = 40 fauna_density = 0.06 fauna_types = list(/mob/living/basic/carp) /datum/biome/ocean_rocklight - turf_type = /turf/open/floor/plating/ocean/rock + turf_type = /turf/open/misc/ocean/rock flora_types = list(/obj/effect/spawner/ocean_curio/rock, /obj/structure/flora/rock, /obj/structure/flora/rock/pile) flora_density = 3 /datum/biome/ocean_rockmed - turf_type = /turf/open/floor/plating/ocean/rock/medium + turf_type = /turf/open/misc/ocean/rock/medium flora_types = list(/obj/effect/spawner/ocean_curio/rock, /obj/structure/flora/rock, /obj/structure/flora/rock/pile) flora_density = 5 /datum/biome/ocean_rockheavy - turf_type = /turf/open/floor/plating/ocean/rock/heavy + turf_type = /turf/open/misc/ocean/rock/heavy flora_types = list(/obj/effect/spawner/ocean_curio/rock, /obj/structure/flora/rock, /obj/structure/flora/rock/pile) flora_density = 7 diff --git a/modular_skyrat/modules/liquids/code/ocean_flora.dm b/modular_skyrat/modules/liquids/code/ocean_flora.dm index a3f93496cfd5e..3cd2af2fa0a57 100644 --- a/modular_skyrat/modules/liquids/code/ocean_flora.dm +++ b/modular_skyrat/modules/liquids/code/ocean_flora.dm @@ -81,7 +81,10 @@ #undef SCRAP_METAL_YIELD_HIGH /obj/effect/spawner/liquids_spawner - name = "Liquids Spawner" + name = "Liquids Spawner (Water, Waist-Deep)" + icon = 'modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi' + icon_state = "spawner" + color = "#AAAAAA77" var/reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT*LIQUID_WAIST_LEVEL_HEIGHT) var/temp = T20C @@ -93,11 +96,21 @@ var/turf/T = loc T.add_liquid_list(reagent_list, FALSE, temp) -/obj/effect/spawner/liquids_spawner/acid_puddle - reagent_list = list(/datum/reagent/toxin/acid = ONE_LIQUIDS_HEIGHT) +/obj/effect/spawner/liquids_spawner/puddle + name = "Liquids Spawner (Water, Puddle)" + reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT) -/obj/effect/spawner/liquids_spawner/acid_waist - reagent_list = list(/datum/reagent/toxin/acid = ONE_LIQUIDS_HEIGHT*LIQUID_WAIST_LEVEL_HEIGHT) +/obj/effect/spawner/liquids_spawner/ankles + name = "Liquids Spawner (Water, Ankle-Deep)" + reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT*LIQUID_ANKLES_LEVEL_HEIGHT) + +/obj/effect/spawner/liquids_spawner/shoulders + name = "Liquids Spawner (Water, Shoulder-Deep)" + reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT*LIQUID_SHOULDERS_LEVEL_HEIGHT) + +/obj/effect/spawner/liquids_spawner/fulltile + name = "Liquids Spawner (Water, Fulltile)" + reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT*LIQUID_FULLTILE_LEVEL_HEIGHT) /obj/effect/spawner/ocean_curio name = "Ocean Curio Spawner" diff --git a/modular_skyrat/modules/liquids/code/ocean_mapgen.dm b/modular_skyrat/modules/liquids/code/ocean_mapgen.dm index aaaef881cced7..4f72a4a1b5ac0 100644 --- a/modular_skyrat/modules/liquids/code/ocean_mapgen.dm +++ b/modular_skyrat/modules/liquids/code/ocean_mapgen.dm @@ -42,7 +42,7 @@ for(var/t in turfs) //Go through all the turfs and generate them var/turf/gen_turf = t - if(istype(gen_turf, /turf/open/space/mirage) || istype(gen_turf, /turf/open/openspace/ocean)) + if(istype(gen_turf, /turf/open/openspace/ocean)) continue var/drift_x = (gen_turf.x + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom @@ -85,15 +85,25 @@ /datum/map_generator/cave_generator/trench name = "Trench Generator" - open_turf_types = list(/turf/open/floor/plating/ocean/rock/heavy = 1) - closed_turf_types = list(/turf/closed/mineral/random/ocean = 1) + weighted_open_turf_types = list(/turf/open/misc/ocean/rock/heavy = 1) + weighted_closed_turf_types = list(/turf/closed/mineral/random/ocean = 1) - feature_spawn_list = null - - mob_spawn_list = list(/mob/living/basic/carp = 1) + weighted_mob_spawn_list = list(/mob/living/basic/carp = 1) mob_spawn_chance = 1 + ///Note that this spawn list is also in the lavaland generator + weighted_feature_spawn_list = list( + /obj/structure/geyser/hollowwater = 10, \ + /obj/structure/geyser/plasma_oxide = 10, \ + /obj/structure/geyser/protozine = 10, \ + /obj/structure/geyser/random = 2, \ + /obj/structure/geyser/wittel = 10, \ + ) + flora_spawn_chance = 4 - flora_spawn_list = list(/obj/structure/flora/rock = 1, /obj/structure/flora/rock/pile = 1) + weighted_flora_spawn_list = list( + /obj/structure/flora/rock = 1, \ + /obj/structure/flora/rock/pile = 1, \ + ) #undef BIOME_RANDOM_SQUARE_DRIFT diff --git a/modular_skyrat/modules/liquids/code/ocean_turfs.dm b/modular_skyrat/modules/liquids/code/ocean_turfs.dm index 356cda189a14e..e0b94156f5079 100644 --- a/modular_skyrat/modules/liquids/code/ocean_turfs.dm +++ b/modular_skyrat/modules/liquids/code/ocean_turfs.dm @@ -2,7 +2,7 @@ name = "ocean" planetary_atmos = TRUE baseturfs = /turf/open/openspace/ocean - var/replacement_turf = /turf/open/floor/plating/ocean + var/replacement_turf = /turf/open/misc/ocean /turf/open/openspace/ocean/Initialize(mapload) . = ..() @@ -10,16 +10,20 @@ for(var/obj/structure/flora/plant in contents) qdel(plant) var/turf/T = GET_TURF_BELOW(src) - if(T) - if(T.turf_flags & NO_RUINS) - ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR) - return - if(!ismineralturf(T)) - return - var/turf/closed/mineral/M = T - M.mineralAmt = 0 - M.gets_drilled() - baseturfs = /turf/open/openspace/ocean //This is to ensure that IF random turf generation produces a openturf, there won't be other turfs assigned other than openspace. + //I wonder if I should error here + if(!T) + return + if(T.turf_flags & NO_RUINS) + var/turf/newturf = ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR) + if(!isopenspaceturf(newturf)) // only openspace turfs should be returning INITIALIZE_HINT_LATELOAD + return INITIALIZE_HINT_NORMAL + return + if(!ismineralturf(T)) + return + var/turf/closed/mineral/M = T + M.mineralAmt = 0 + M.gets_drilled() + baseturfs = /turf/open/openspace/ocean //This is to ensure that IF random turf generation produces a openturf, there won't be other turfs assigned other than openspace. /turf/open/openspace/ocean/Initialize(mapload) . = ..() @@ -31,26 +35,36 @@ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean) new_immmutable.add_turf(src) -/turf/open/floor/plating/ocean/ironsand - baseturfs = /turf/open/floor/plating/ocean/ironsand - icon_state = "ironsand1" - base_icon_state = "ironsand" - rand_variants = 15 - rand_chance = 100 +/turf/open/misc/ironsand/ocean + planetary_atmos = TRUE + baseturfs = /turf/open/misc/ocean + +/turf/open/misc/ironsand/ocean/Initialize(mapload) + . = ..() + if(liquids) + if(liquids.immutable) + liquids.remove_turf(src) + else + qdel(liquids, TRUE) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src) + new_immmutable.add_turf(src) -/turf/open/floor/plating/ocean/rock + +/turf/open/misc/ocean/rock name = "rock" - baseturfs = /turf/open/floor/plating/ocean/rock + desc = "Polished over centuries of undersea weather conditions and a distinct lack of light." + baseturfs = /turf/open/misc/ocean/rock icon = 'modular_skyrat/modules/liquids/icons/turf/seafloor.dmi' icon_state = "seafloor" base_icon_state = "seafloor" rand_variants = 0 -/turf/open/floor/plating/ocean/rock/warm +/turf/open/misc/ocean/rock/warm liquid_type = /obj/effect/abstract/liquid_turf/immutable/ocean/warm -/turf/open/floor/plating/ocean/rock/warm/fissure +/turf/open/misc/ocean/rock/warm/fissure name = "fissure" + desc = "A comfortable, warm tempature eminates from these - followed immediately after by toxic chemicals in liquid or gaseous forms; but warmth all the same!" icon = 'modular_skyrat/modules/liquids/icons/turf/fissure.dmi' icon_state = "fissure-0" base_icon_state = "fissure" @@ -60,20 +74,21 @@ light_range = 3 light_color = LIGHT_COLOR_LAVA -/turf/open/floor/plating/ocean/rock/medium +/turf/open/misc/ocean/rock/medium icon_state = "seafloor_med" base_icon_state = "seafloor_med" - baseturfs = /turf/open/floor/plating/ocean/rock/medium + baseturfs = /turf/open/misc/ocean/rock/medium -/turf/open/floor/plating/ocean/rock/heavy +/turf/open/misc/ocean/rock/heavy icon_state = "seafloor_heavy" base_icon_state = "seafloor_heavy" - baseturfs = /turf/open/floor/plating/ocean/rock/heavy + baseturfs = /turf/open/misc/ocean/rock/heavy -/turf/open/floor/plating/ocean +/turf/open/misc/ocean gender = PLURAL name = "ocean sand" - baseturfs = /turf/open/floor/plating/ocean + desc = "If you can't escape sandstorms underwater, is anywhere safe?" + baseturfs = /turf/open/misc/ocean icon = 'icons/turf/floors.dmi' icon_state = "asteroid" base_icon_state = "asteroid" @@ -86,24 +101,24 @@ var/rand_chance = 30 var/liquid_type = /obj/effect/abstract/liquid_turf/immutable/ocean -/turf/open/floor/plating/ocean/Initialize(mapload) +/turf/open/misc/ocean/Initialize(mapload) . = ..() if(liquids) if(liquids.immutable) liquids.remove_turf(src) else qdel(liquids, TRUE) - var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(liquid_type) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(liquid_type, src) new_immmutable.add_turf(src) if(rand_variants && prob(rand_chance)) var/random = rand(1,rand_variants) - icon_state = "[base_icon_state][random]" - base_icon_state = "[base_icon_state][random]" + icon_state = "[icon_state][random]" + base_icon_state = "[icon_state][random]" /turf/open/floor/plating/ocean_plating planetary_atmos = TRUE - baseturfs = /turf/open/floor/plating/ocean_plating + baseturfs = /turf/open/misc/ocean /turf/open/floor/plating/ocean_plating/Initialize(mapload) . = ..() @@ -112,12 +127,12 @@ liquids.remove_turf(src) else qdel(liquids, TRUE) - var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src) new_immmutable.add_turf(src) /turf/open/floor/iron/ocean planetary_atmos = TRUE - baseturfs = /turf/open/floor/iron/ocean + baseturfs = /turf/open/floor/plating/ocean_plating /turf/open/floor/iron/ocean/Initialize(mapload) . = ..() @@ -126,36 +141,109 @@ liquids.remove_turf(src) else qdel(liquids, TRUE) - var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src) + new_immmutable.add_turf(src) + +/turf/open/floor/iron/solarpanel/ocean + planetary_atmos = TRUE + baseturfs = /turf/open/floor/plating/ocean_plating + +/turf/open/floor/iron/solarpanel/ocean/Initialize(mapload) + . = ..() + if(liquids) + if(liquids.immutable) + liquids.remove_turf(src) + else + qdel(liquids, TRUE) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src) + new_immmutable.add_turf(src) + +/turf/open/floor/engine/hull/reinforced/ocean + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + temperature = T20C + planetary_atmos = TRUE + baseturfs = /turf/open/misc/ocean + +/turf/open/floor/engine/hull/reinforced/ocean/Initialize(mapload) + . = ..() + if(liquids) + if(liquids.immutable) + liquids.remove_turf(src) + else + qdel(liquids, TRUE) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src) + new_immmutable.add_turf(src) + +/turf/open/floor/glass/reinforced/ocean + planetary_atmos = TRUE + baseturfs = /turf/open/floor/plating/ocean_plating + +/turf/open/floor/glass/reinforced/ocean/Initialize(mapload) + . = ..() + if(liquids) + if(liquids.immutable) + liquids.remove_turf(src) + else + qdel(liquids, TRUE) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src) + new_immmutable.add_turf(src) + +/turf/open/floor/glass/plasma/ocean + planetary_atmos = TRUE + baseturfs = /turf/open/floor/plating/ocean_plating + +/turf/open/floor/glass/plasma/ocean/Initialize(mapload) + . = ..() + if(liquids) + if(liquids.immutable) + liquids.remove_turf(src) + else + qdel(liquids, TRUE) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src) + new_immmutable.add_turf(src) + +/turf/open/floor/glass/reinforced/plasma/ocean + planetary_atmos = TRUE + baseturfs = /turf/open/floor/plating/ocean_plating + +/turf/open/floor/glass/reinforced/plasma/ocean/Initialize(mapload) + . = ..() + if(liquids) + if(liquids.immutable) + liquids.remove_turf(src) + else + qdel(liquids, TRUE) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src) new_immmutable.add_turf(src) /turf/closed/mineral/random/ocean - baseturfs = /turf/open/floor/plating/ocean/rock/heavy - turf_type = /turf/open/floor/plating/ocean/rock/heavy + baseturfs = /turf/open/misc/ocean/rock/heavy + turf_type = /turf/open/misc/ocean/rock/heavy color = "#58606b" /turf/closed/mineral/random/high_chance/ocean - baseturfs = /turf/open/floor/plating/ocean/rock/heavy - turf_type = /turf/open/floor/plating/ocean/rock/heavy + baseturfs = /turf/open/misc/ocean/rock/heavy + turf_type = /turf/open/misc/ocean/rock/heavy color = "#58606b" /turf/closed/mineral/random/low_chance/ocean - baseturfs = /turf/open/floor/plating/ocean/rock/heavy - turf_type = /turf/open/floor/plating/ocean/rock/heavy + baseturfs = /turf/open/misc/ocean/rock/heavy + turf_type = /turf/open/misc/ocean/rock/heavy color = "#58606b" /turf/closed/mineral/random/stationside/ocean - baseturfs = /turf/open/floor/plating/ocean/rock/heavy - turf_type = /turf/open/floor/plating/ocean/rock/heavy + baseturfs = /turf/open/misc/ocean/rock/heavy + turf_type = /turf/open/misc/ocean/rock/heavy color = "#58606b" /obj/effect/abstract/liquid_turf/immutable/canal starting_mixture = list(/datum/reagent/water = 100) -/turf/open/floor/plating/canal +/turf/open/misc/canal gender = PLURAL name = "canal" - baseturfs = /turf/open/floor/plating/canal + desc = "A section of the earth given way to form a natural aqueduct." + baseturfs = /turf/open/misc/canal icon = 'icons/turf/floors.dmi' icon_state = "asteroid" base_icon_state = "asteroid" @@ -166,20 +254,21 @@ liquid_height = -30 turf_height = -30 -/turf/open/floor/plating/canal/Initialize(mapload) +/turf/open/misc/canal/Initialize(mapload) . = ..() if(liquids) if(liquids.immutable) liquids.remove_turf(src) else qdel(liquids, TRUE) - var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/canal) + var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/canal, src) new_immmutable.add_turf(src) -/turf/open/floor/plating/canal_mutable +/turf/open/misc/canal_mutable gender = PLURAL name = "canal" - baseturfs = /turf/open/floor/plating/canal_mutable + desc = "A section of the earth given way to form a natural aqueduct." + baseturfs = /turf/open/misc/canal_mutable icon = 'icons/turf/floors.dmi' icon_state = "asteroid" base_icon_state = "asteroid" diff --git a/modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi b/modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi index 35ae915a4bff3..6babb35b68ee3 100644 Binary files a/modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi and b/modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi differ diff --git a/modular_skyrat/modules/mapping/code/turf.dm b/modular_skyrat/modules/mapping/code/turf.dm index ab8aa19dfe84d..a9b1f35802ab2 100644 --- a/modular_skyrat/modules/mapping/code/turf.dm +++ b/modular_skyrat/modules/mapping/code/turf.dm @@ -5,7 +5,7 @@ desc = "A patch of fertile soil that you can plant stuff in." icon = 'icons/turf/floors.dmi' // This makes it look like the dirt floor icon_state = "dirt" - layer = 2.0001 + layer = LOW_FLOOR_LAYER plane = FLOOR_PLANE self_sustaining = 1 pixel_z = 0 diff --git a/modular_skyrat/modules/marines/code/gear.dm b/modular_skyrat/modules/marines/code/gear.dm index 7f5b6478a8401..c98610cab1d2f 100644 --- a/modular_skyrat/modules/marines/code/gear.dm +++ b/modular_skyrat/modules/marines/code/gear.dm @@ -93,16 +93,18 @@ QDEL_NULL(underbarrel) return ..() -/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/item_interaction_secondary(mob/living/user, obj/item/tool, list/modifiers) - underbarrel.item_interaction(user, tool, modifiers) - return ITEM_INTERACT_SUCCESS +/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/try_fire_gun(atom/target, mob/living/user, params) + if(LAZYACCESS(params2list(params), RIGHT_CLICK)) + return underbarrel.try_fire_gun(target, user, params) + return ..() -/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/attackby(obj/item/attacking_item, mob/user, params) - if(!istype(attacking_item, /obj/item/ammo_casing)) - ..() - if(istype(attacking_item, underbarrel.magazine.ammo_type)) - underbarrel.attack_self(user) - underbarrel.attackby(attacking_item, user, params) +/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(isammocasing(tool)) + if(istype(tool, underbarrel.magazine.ammo_type)) + underbarrel.attackby(tool, user, list2params(modifiers)) + underbarrel.attack_self(user) + return ITEM_INTERACT_BLOCKING + return ..() /obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher name = "\improper NT M44AGL Pulse Rifle" @@ -121,13 +123,15 @@ QDEL_NULL(underbarrel) return ..() -/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) - underbarrel.interact_with_atom(interacting_with, user, modifiers) - return ITEM_INTERACT_SUCCESS +/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/try_fire_gun(atom/target, mob/living/user, params) + if(LAZYACCESS(params2list(params), RIGHT_CLICK)) + return underbarrel.try_fire_gun(target, user, params) + return ..() -/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/attackby(obj/item/attacking_item, mob/user, params) - if(!istype(attacking_item, /obj/item/ammo_casing)) - ..() - if(istype(attacking_item, underbarrel.magazine.ammo_type)) - underbarrel.attack_self(user) - underbarrel.attackby(attacking_item, user, params) +/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(isammocasing(tool)) + if(istype(tool, underbarrel.magazine.ammo_type)) + underbarrel.attackby(tool, user, list2params(modifiers)) + underbarrel.attack_self(user) + return ITEM_INTERACT_BLOCKING + return ..() diff --git a/modular_skyrat/modules/medical/code/smartdarts.dm b/modular_skyrat/modules/medical/code/smartdarts.dm index cf329b64daaaa..142f00c6b97ae 100644 --- a/modular_skyrat/modules/medical/code/smartdarts.dm +++ b/modular_skyrat/modules/medical/code/smartdarts.dm @@ -10,32 +10,31 @@ //Code that handles the base interactions involving smartdarts /obj/item/reagent_containers/syringe/smartdart/interact_with_atom(atom/target, mob/living/user, list/modifiers) - if(isliving(target)) + if(target.reagents) to_chat(user, span_warning("The [src] is unable to manually inject chemicals.")) - return - + return NONE //A majority of this code is from the original syringes.dm file. -/obj/item/reagent_containers/syringe/smartdart/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) - if(!try_syringe(interacting_with, user)) +/obj/item/reagent_containers/syringe/smartdart/interact_with_atom_secondary(atom/target, mob/living/user, list/modifiers) + if(!try_syringe(target, user)) return ITEM_INTERACT_BLOCKING if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, span_notice("[src] is full.")) return ITEM_INTERACT_BLOCKING - if(isliving(interacting_with)) + if(isliving(target)) to_chat(user, span_warning("The [src] is unable to take blood.")) return ITEM_INTERACT_BLOCKING - if(!interacting_with.reagents.total_volume) - to_chat(user, span_warning("[interacting_with] is empty!")) + if(!target.reagents.total_volume) + to_chat(user, span_warning("[target] is empty!")) return ITEM_INTERACT_BLOCKING - if(!interacting_with.is_drawable(user)) - to_chat(user, span_warning("You cannot directly remove reagents from [interacting_with]!")) + if(!target.is_drawable(user)) + to_chat(user, span_warning("You cannot directly remove reagents from [target]!")) return ITEM_INTERACT_BLOCKING - var/trans = interacting_with.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user) // transfer from, transfer to - who cares? + var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user) // transfer from, transfer to - who cares? to_chat(user, span_notice("You fill [src] with [trans] units of the solution. It now contains [reagents.total_volume] units.")) return ITEM_INTERACT_SUCCESS @@ -57,12 +56,11 @@ /obj/item/gun/syringe/smartdart/give_gun_safeties() return -/obj/item/gun/syringe/smartdart/attackby(obj/item/container, mob/user, params, show_msg = TRUE) - if(istype(container, /obj/item/reagent_containers/syringe/smartdart)) - ..() - else - to_chat(user, span_notice("The [container] is unable to fit inside of the [src]! Try using a SmartDart instead.")) - return FALSE +/obj/item/gun/syringe/smartdart/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(istype(tool, /obj/item/reagent_containers/syringe/smartdart)) + return ..() + to_chat(user, span_notice("The [tool] is unable to fit inside of the [src]! Try using a SmartDart instead.")) + return ITEM_INTERACT_BLOCKING /obj/item/gun/syringe/smartdart/examine(mob/user) . = ..() diff --git a/modular_skyrat/modules/modular_implants/code/misc_devices.dm b/modular_skyrat/modules/modular_implants/code/misc_devices.dm index 2582d06a95912..8f097a34d3320 100644 --- a/modular_skyrat/modules/modular_implants/code/misc_devices.dm +++ b/modular_skyrat/modules/modular_implants/code/misc_devices.dm @@ -144,18 +144,15 @@ return . -/obj/item/nif_hud_adapter/afterattack(obj/item/clothing/glasses/target_glasses, mob/user, proximity_flag, click_parameters) - . = ..() - if(!proximity_flag || !istype(target_glasses)) - return FALSE - - if(!is_type_in_list(target_glasses, glasses_whitelist)) - balloon_alert("incompatible!") - return FALSE +/obj/item/nif_hud_adapter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + var/obj/item/clothing/glasses/target_glasses = interacting_with + if(!istype(target_glasses) || !is_type_in_list(target_glasses, glasses_whitelist)) + balloon_alert(user, "incompatible!") + return NONE if(HAS_TRAIT(target_glasses, TRAIT_NIFSOFT_HUD_GRANTER)) - balloon_alert("already upgraded!") - return FALSE + balloon_alert(user, "already upgraded!") + return ITEM_INTERACT_BLOCKING user.visible_message(span_notice("[user] upgrades [target_glasses] with [src]."), span_notice("You upgrade [target_glasses] to be NIF HUD compatible.")) target_glasses.name = "\improper HUD-upgraded " + target_glasses.name @@ -164,4 +161,5 @@ if(!multiple_uses) qdel(src) + return ITEM_INTERACT_SUCCESS diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm index 0d2de8f71218c..7840d312dfb66 100644 --- a/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm +++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm @@ -80,21 +80,17 @@ /obj/item/attachable_soulcatcher/attack_self(mob/user, modifiers) linked_soulcatcher.ui_interact(user) -/obj/item/attachable_soulcatcher/afterattack(obj/item/target_item, mob/user, proximity_flag, click_parameters) - . = ..() - if(!proximity_flag || !istype(target_item)) - return FALSE +/obj/item/attachable_soulcatcher/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!isitem(interacting_with) || is_type_in_list(interacting_with, blacklisted_items)) + balloon_alert(user, "incompatible!") + return NONE - if(target_item.GetComponent(/datum/component/carrier)) + if(interacting_with.GetComponent(/datum/component/carrier/soulcatcher)) balloon_alert(user, "already attached!") - return FALSE - - if(is_type_in_list(target_item, blacklisted_items)) - balloon_alert(user, "incompatible!") - return FALSE + return ITEM_INTERACT_BLOCKING - var/datum/component/carrier/soulcatcher/attachable/new_soulcatcher = target_item.AddComponent(/datum/component/carrier/soulcatcher/attachable) - playsound(target_item.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE) + var/datum/component/carrier/soulcatcher/new_soulcatcher = interacting_with.AddComponent(/datum/component/carrier/soulcatcher/attachable) + playsound(interacting_with.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE) var/datum/carrier_room/target_room = new_soulcatcher.carrier_rooms[1] var/list/current_mobs = linked_soulcatcher.get_current_mobs() diff --git a/modular_skyrat/modules/modular_items/code/summon_beacon.dm b/modular_skyrat/modules/modular_items/code/summon_beacon.dm index b5dc02007a1f7..d7da8e2641b60 100644 --- a/modular_skyrat/modules/modular_items/code/summon_beacon.dm +++ b/modular_skyrat/modules/modular_items/code/summon_beacon.dm @@ -114,6 +114,7 @@ if(!uses) qdel(src) + return ITEM_INTERACT_SUCCESS // Misc stuff here diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm index ea1e10de65699..432c644225920 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm @@ -16,7 +16,6 @@ greyscale_config_inhand_right = /datum/greyscale_config/ballgag/right_hand greyscale_colors = "#AD66BE" w_class = WEIGHT_CLASS_SMALL - modifies_speech = TRUE flags_cover = MASKCOVERSMOUTH /// Does this gag choke the wearer? @@ -51,14 +50,27 @@ var/size_list_position = 1 /// How big the gag is currently var/gag_size = "small" + var/modifies_speech = TRUE // To update the sprite /obj/item/clothing/mask/ballgag/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) +/obj/item/clothing/mask/ballgag/equipped(mob/equipper, slot) + . = ..() + if ((slot & ITEM_SLOT_MASK) && modifies_speech) + RegisterSignal(equipper, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + else + UnregisterSignal(equipper, COMSIG_MOB_SAY) + +/obj/item/clothing/mask/ballgag/dropped(mob/dropper) + . = ..() + UnregisterSignal(dropper, COMSIG_MOB_SAY) + // Changes speech while worn -/obj/item/clothing/mask/ballgag/handle_speech(datum/source, list/speech_args) +/obj/item/clothing/mask/ballgag/proc/handle_speech(datum/source, list/speech_args) + SIGNAL_HANDLER if(!LAZYLEN(moans)) return speech_args[SPEECH_MESSAGE] = pick((prob(moans_alt_probability) && LAZYLEN(moans_alt)) ? moans_alt : moans) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm index 32e3f8c2040ac..2f809512c5d7c 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm @@ -1,6 +1,7 @@ // Set up the types of items that can be placed in the mask /datum/storage/pockets/small/bdsm_mask max_slots = 1 + click_alt_open = FALSE /datum/storage/pockets/small/bdsm_mask/New() . = ..() @@ -15,6 +16,9 @@ icon_state = "mask_pink_off" base_icon_state = "mask" slot_flags = ITEM_SLOT_MASK + w_class = WEIGHT_CLASS_SMALL + flags_cover = MASKCOVERSMOUTH + starting_filter_type = null var/mask_on = FALSE var/current_mask_color = "pink" var/breath_status = TRUE @@ -35,14 +39,25 @@ var/temp_check = TRUE //Used to check if user unconsious to prevent choking him until he wakes up /// Does the gasmask impede the user's ability to talk? var/speech_disabled - w_class = WEIGHT_CLASS_SMALL - modifies_speech = TRUE - flags_cover = MASKCOVERSMOUTH + var/modifies_speech = TRUE /obj/item/clothing/mask/gas/bdsm_mask/Initialize(mapload) . = ..() create_storage(storage_type = /datum/storage/pockets/small/bdsm_mask) + new /obj/item/reagent_containers/cup/lewd_filter(src) + AddElement(/datum/element/update_icon_updates_onmob) + update_icon_state() + update_icon() + update_mob_action_buttonss() + if(!length(mask_designs)) + populate_mask_designs() + +/// Can the user reach the filter, false if equipped and active +/obj/item/clothing/mask/gas/bdsm_mask/proc/is_locked(mob/living/carbon/user) + var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK) + return istype(user) && src == worn_mask && src.mask_on + /obj/item/clothing/mask/gas/bdsm_mask/proc/update_mob_action_buttonss() var/datum/action/item_action/button @@ -55,7 +70,20 @@ button.button_icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/lewd_icons.dmi' update_icon() -/obj/item/clothing/mask/gas/bdsm_mask/handle_speech(datum/source, list/speech_args) +/obj/item/clothing/mask/gas/bdsm_mask/equipped(mob/equipper, slot) + . = ..() + if ((slot & ITEM_SLOT_MASK) && modifies_speech) + RegisterSignal(equipper, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + else + UnregisterSignal(equipper, COMSIG_MOB_SAY) + +/obj/item/clothing/mask/gas/bdsm_mask/dropped(mob/dropper) + . = ..() + UnregisterSignal(dropper, COMSIG_MOB_SAY) + +/obj/item/clothing/mask/gas/bdsm_mask/proc/handle_speech(datum/source, list/speech_args) + SIGNAL_HANDLER + if(speech_disabled) return @@ -77,6 +105,7 @@ var/choice = show_radial_menu(user, src, mask_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return CLICK_ACTION_BLOCKING + atom_storage.click_alt_open = TRUE current_mask_color = choice update_icon_state() update_icon() @@ -92,69 +121,63 @@ return FALSE return TRUE -// Initializing stuff -/obj/item/clothing/mask/gas/bdsm_mask/Initialize(mapload) - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - update_icon_state() - update_icon() - update_mob_action_buttonss() - if(!length(mask_designs)) - populate_mask_designs() - // To update icon state properly /obj/item/clothing/mask/gas/bdsm_mask/update_icon_state() . = ..() icon_state = "[base_icon_state]_[current_mask_color]_[mask_on? "on" : "off"]" inhand_icon_state = "[base_icon_state]_[current_mask_color]_[mask_on? "on" : "off"]" +/obj/item/clothing/mask/gas/bdsm_mask/proc/try_unequip(mob/user) + if(!do_after(user, 60 SECONDS, target = user)) + to_chat(user, span_warning("You fail to remove the gas mask!")) + return FALSE + to_chat(user, span_notice("You remove the gas mask.")) + return TRUE +/obj/item/clothing/mask/gas/bdsm_mask/attack_hand_secondary(mob/user, list/modifiers) + + // To make in unremovable without helping when mask is on /obj/item/clothing/mask/gas/bdsm_mask/attack_hand(mob/user) - if(iscarbon(user)) - if(mask_on == TRUE) - var/mob/living/carbon/wearer = user - if(wearer.wear_mask == src) - if(!do_after(wearer, 60 SECONDS, target = src)) - to_chat(wearer, span_warning("You fail to remove the gas mask!")) - return - else - to_chat(wearer, span_notice("You remove the gas mask.")) - add_fingerprint(usr) - . = ..() + if(!is_locked(user)) + return ..() + if(try_unequip(user)) + . = ..() + if(.) + to_chat(user, span_notice("You remove the gas mask.")) // To make in unremovable without helping when mask is on (for MouseDrop) +/datum/storage/pockets/small/bdsm_mask/on_mousedrop_onto(datum/source, atom/over_object, mob/user) + var/obj/item/clothing/mask/gas/bdsm_mask/mask = source + if(!istype(mask) || ismecha(user.loc) || user.incapacitated() || !mask.is_locked(user)) + return ..() + return NONE //handled in mask mousedrop, don't allow content dumping + /obj/item/clothing/mask/gas/bdsm_mask/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params) - var/mob/target_mob = user - var/mob/living/carbon/human/target_carbon = user - if(ismecha(target_mob.loc)) // Stops inventory actions in a mech + if(ismecha(user.loc) || user.incapacitated() || !is_locked(user)) return - if(!target_mob.incapacitated()) - if(loc == target_mob) - if(istype(over_object, /atom/movable/screen/inventory/hand)) - var/atom/movable/screen/inventory/hand/hand = over_object - if(iscarbon(user)) - if(mask_on == TRUE) - if(src == target_carbon.wear_mask || . == target_carbon.wear_mask) - if(!do_after(target_carbon, 60 SECONDS, target = src)) - to_chat(target_mob, span_warning("You fail to remove the gas mask!")) - return - else - to_chat(target_mob, span_notice("You remove the gas mask.")) - if(target_mob.putItemFromInventoryInHandIfPossible(src, hand.held_index)) - add_fingerprint(user) - . = ..() - -// Handler for clicking on a slot in a mask by hand with a filter -/datum/storage/pockets/small/bdsm_mask/on_item_interact(datum/source, mob/user, obj/item/thing, params) - . = ..() - var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK) - if(istype(thing, /obj/item/reagent_containers/cup/lewd_filter)) - if(worn_mask) // Null check - if(istype(worn_mask, /obj/item/clothing/mask/gas/bdsm_mask)) // Check that the mask is of the correct type - if(worn_mask.mask_on == TRUE) - // Place for text about the impossibility to attach a filter - to_chat(usr, span_warning("You can't attach a filter while the mask is locked!")) - return + if(!istype(over_object, /atom/movable/screen/inventory/hand)) + return + var/atom/movable/screen/inventory/hand/hand = over_object + if(!istype(hand)) + return + if(!try_unequip(user) || !user.putItemFromInventoryInHandIfPossible(src, hand.held_index)) + return + to_chat(user, span_notice("You remove the gas mask.")) + add_fingerprint(user) + +/datum/storage/pockets/small/bdsm_mask/remove_single(mob/removing, obj/item/thing, atom/remove_to_loc, silent) + var/obj/item/clothing/mask/gas/bdsm_mask/mask = parent + if(!istype(mask) || !mask.is_locked(removing)) + return ..() + to_chat(removing, span_warning("You can't detach the filter while the mask is locked!")) + return FALSE + +/datum/storage/pockets/small/bdsm_mask/attempt_insert(obj/item/to_insert, mob/user, override, force, messages) + var/obj/item/clothing/mask/gas/bdsm_mask/mask = parent + if(!istype(mask) || !mask.is_locked(user)) + return ..() + to_chat(user, span_warning("You can't attach a filter while the mask is locked!")) + return FALSE // Breathing valve control button /datum/action/item_action/toggle_breathcontrol @@ -165,7 +188,7 @@ /datum/action/item_action/toggle_breathcontrol/Trigger(trigger_flags) var/obj/item/clothing/mask/gas/bdsm_mask/mask = target if(istype(mask)) - mask.check() + mask.check(owner) /datum/action/item_action/toggle_gag name = "Toggle gag" @@ -174,7 +197,7 @@ /datum/action/item_action/toggle_gag/Trigger(trigger_flags) var/obj/item/clothing/mask/gas/bdsm_mask/mask = target if(istype(mask)) - mask.check_gag() + mask.check_gag(owner) /datum/action/item_action/mask_inhale name = "Inhale oxygen" @@ -192,13 +215,16 @@ mask.time_to_choke_left = mask.time_to_choke mask.breath_status = TRUE - var/mob/living/carbon/affected_mob = usr + var/mob/living/carbon/affected_mob = owner if(!istype(affected_mob)) return FALSE affected_mob.try_lewd_autoemote("inhale") + if(!length(mask.contents)) + return TRUE var/obj/item/reagent_containers/cup/lewd_filter/filter = mask.contents[1] - filter.reagent_consumption(affected_mob, filter.amount_per_transfer_from_this) + if(istype(filter)) + filter.reagent_consumption(affected_mob, filter.amount_per_transfer_from_this) return TRUE @@ -225,24 +251,22 @@ temp_check = TRUE // To check if player already have this mask on and trying to change mode -/obj/item/clothing/mask/gas/bdsm_mask/proc/check() - var/mob/living/carbon/affected_carbon = usr - if(src == affected_carbon.wear_mask) - to_chat(usr, span_notice("You can't reach the air filter switch!")) - else - toggle(affected_carbon) +/obj/item/clothing/mask/gas/bdsm_mask/proc/check(mob/living/carbon/user) + if(!istype(user) || src == user.wear_mask) + to_chat(user, span_notice("You can't reach the air filter switch!")) + return + toggle(user) // Switch the mask valve to the opposite state -/obj/item/clothing/mask/gas/bdsm_mask/proc/toggle(user) +/obj/item/clothing/mask/gas/bdsm_mask/proc/toggle(mob/living/carbon/user) mask_on = !mask_on to_chat(user, span_notice("You turn the air filter [mask_on ? "on. Use with caution!" : "off. Now it's safe to wear."]")) play_lewd_sound(user, mask_on ? 'sound/weapons/magin.ogg' : 'sound/weapons/magout.ogg', 40, TRUE) update_icon_state() update_mob_action_buttonss() update_icon() - var/mob/living/carbon/human/affected_human = usr if(mask_on) - if(src == affected_human.wear_mask && affected_human.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) + if(src == user.wear_mask && user.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy)) START_PROCESSING(SSobj, src) time_to_choke_left = time_to_choke else @@ -263,18 +287,17 @@ // Mask choke processor /obj/item/clothing/mask/gas/bdsm_mask/process(seconds_per_tick) - var/mob/living/affected_mob = loc - var/mob/living/carbon/affected_carbon = affected_mob + var/mob/living/carbon/affected_carbon = loc if(!istype(affected_carbon)) return FALSE if(time_to_choke_left < time_to_choke/2 && breath_status == TRUE) - if(temp_check == FALSE && affected_mob.stat == CONSCIOUS) // If user passed out while wearing this we should continue when he wakes up + if(temp_check == FALSE && affected_carbon.stat == CONSCIOUS) // If user passed out while wearing this we should continue when he wakes up breath_status = FALSE time_to_choke_left = time_to_choke temp_check = TRUE - if(affected_mob.stat == CONSCIOUS) + if(affected_carbon.stat == CONSCIOUS) affected_carbon.try_lewd_autoemote("exhale") breath_status = FALSE if(rand(0, 3) == 0) @@ -285,10 +308,9 @@ if(time_to_choke_left <= 0) if(tt <= 0) - if(affected_mob.stat == CONSCIOUS) - affected_mob.adjustOxyLoss(rand(4, 8)) // Oxy dmg - if(ispath(affected_carbon)) - affected_carbon.try_lewd_autoemote(pick("gasp", "choke", "moan")) + if(affected_carbon.stat == CONSCIOUS) + affected_carbon.adjustOxyLoss(rand(4, 8)) // Oxy dmg + affected_carbon.try_lewd_autoemote(pick("gasp", "choke", "moan")) tt = time else breath_status = TRUE @@ -318,6 +340,7 @@ volume = 50 possible_transfer_amounts = list(1, 2, 3, 4, 5, 10, 25, 50) list_reagents = list(/datum/reagent/drug/aphrodisiac/crocin = 50) + amount_per_transfer_from_this = 1 interaction_flags_click = NEED_DEXTERITY // Standard initialize code for filter @@ -332,60 +355,13 @@ // Reagent consumption process handler /obj/item/reagent_containers/cup/lewd_filter/proc/reagent_consumption(mob/living/user, amount_per_transfer_from_this) SEND_SIGNAL(src, COMSIG_GLASS_DRANK, user, user) - addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), user, amount_per_transfer_from_this, TRUE, TRUE, FALSE, user, FALSE, INGEST), 0.5 SECONDS) + reagents.trans_to(user, amount_per_transfer_from_this, transferred_by = user, methods = INGEST) -// I just wanted to add 2th color variation. Because. +// I just wanted to add 2nd color variation. Because. /obj/item/reagent_containers/cup/lewd_filter/click_alt(mob/user) // After reskin all clicks go normal, but we can't change the flow rate if mask on and equipped - var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK) - if(worn_mask) - if(iscarbon(user)) - if(istype(worn_mask, /obj/item/clothing/mask/gas/bdsm_mask)) - if(worn_mask.mask_on == TRUE) - if(istype(src, /obj/item/reagent_containers/cup/lewd_filter)) - to_chat(user, span_warning("You can't change the flow rate of the valve while the mask is on!")) - return CLICK_ACTION_BLOCKING - return ..() - -// Filter click handling -/obj/item/reagent_containers/cup/lewd_filter/attack_hand(mob/user) - var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK) - if(worn_mask) - if(iscarbon(user)) - if(istype(worn_mask, /obj/item/clothing/mask/gas/bdsm_mask)) - if(worn_mask.mask_on == TRUE) - if(istype(src, /obj/item/reagent_containers/cup/lewd_filter)) - // Place for text about the impossibility of detaching the filter - to_chat(user, span_warning("You can't detach the filter while the mask is locked!")) - return - - . = ..() - add_fingerprint(usr) - -// Processing a click with a mask filter on the mask. Needed to intercept call at the object class level. Returns automatically to attack_hand(mob/user) method. -/obj/item/clothing/mask/gas/bdsm_mask/attackby(obj/item/used_item, mob/living/user, params) - return ..() || ((obj_flags & CAN_BE_HIT) && used_item.attack_atom(src, user)) - -// Mouse drop handler -/obj/item/reagent_containers/cup/lewd_filter/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params) - var/mob/affected_mob = user - var/mob/living/carbon/human/affected_human = user - var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = affected_human.get_item_by_slot(ITEM_SLOT_MASK) - - if(ismecha(affected_mob.loc)) // Stops inventory actions in a mech - return - - if(!affected_mob.incapacitated()) - if(loc == affected_mob) - if(iscarbon(user)) - if(worn_mask.mask_on == TRUE) - if(istype(over_object, /atom/movable/screen/inventory/hand)) - // Place for text about the impossibility of detaching the filter - to_chat(user, span_warning("You can't detach the filter while the mask is locked!")) - return - else - // Place for text about the impossibility to attach a filter - to_chat(user, span_warning("You can't attach a filter while the mask is locked!")) - return - add_fingerprint(user) - . = ..() + var/obj/item/clothing/mask/gas/bdsm_mask/mask = loc + if(!istype(mask) || !mask.is_locked(user)) + return ..() + to_chat(user, span_warning("You can't change the flow rate of the valve while the mask is on!")) + return CLICK_ACTION_BLOCKING diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm index 4407a304c3f6a..fa03358eb6f11 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm @@ -8,14 +8,13 @@ inhand_icon_state = "nothing" // Jerk off into bottles and onto people. -/obj/item/hand_item/coom/afterattack(obj/target, mob/user, proximity) - . = ..() - do_masturbate(target, user, proximity) +/obj/item/hand_item/coom/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + do_masturbate(interacting_with, user) /// Handles masturbation onto a living mob, or an atom. /// Attempts to fill the atom's reagent container, if it has one, and it isn't full. -/obj/item/hand_item/coom/proc/do_masturbate(obj/target, mob/user, proximity) - if (CONFIG_GET(flag/disable_erp_preferences) || !proximity || user.stat >= DEAD) +/obj/item/hand_item/coom/proc/do_masturbate(atom/target, mob/user) + if (CONFIG_GET(flag/disable_erp_preferences) || user.stat >= DEAD) return var/mob/living/carbon/human/affected_human = user diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm index 11b86eabe3b96..475936eb6ffc3 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm @@ -14,8 +14,8 @@ hitsound = 'sound/weapons/whip.ogg' clothing_flags = INEDIBLE_CLOTHING //When taking that thing in mouth - modifies_speech = TRUE flags_cover = MASKCOVERSMOUTH + var/modifies_speech = TRUE /// If the color of the toy has been changed before var/color_changed = FALSE /// If the form (or size) of the toy has been changed before @@ -50,8 +50,20 @@ if(!isinhands) . += whip_overlay +/obj/item/clothing/mask/leatherwhip/equipped(mob/equipper, slot) + . = ..() + if ((slot & ITEM_SLOT_MASK) && modifies_speech) + RegisterSignal(equipper, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + else + UnregisterSignal(equipper, COMSIG_MOB_SAY) + +/obj/item/clothing/mask/leatherwhip/dropped(mob/dropper) + . = ..() + UnregisterSignal(dropper, COMSIG_MOB_SAY) + // Speech handler for moansing when talking -/obj/item/clothing/mask/leatherwhip/handle_speech(datum/source, list/speech_args) +/obj/item/clothing/mask/leatherwhip/proc/handle_speech(datum/source, list/speech_args) + SIGNAL_HANDLER speech_args[SPEECH_MESSAGE] = pick((prob(moans_alt_probability) && LAZYLEN(moans_alt)) ? moans_alt : moans) play_lewd_sound(loc, pick('modular_skyrat/modules/modular_items/lewd_items/sounds/under_moan_f1.ogg', 'modular_skyrat/modules/modular_items/lewd_items/sounds/under_moan_f2.ogg', diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm index 2a00fd85f26d9..dc95658503137 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm @@ -17,35 +17,34 @@ icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/lewd_items.dmi' w_class = WEIGHT_CLASS_TINY -/obj/item/serviette/afterattack(atom/target, mob/user, proximity) - . = ..() - if(!proximity || !check_allowed_items(target)) - return +/obj/item/serviette/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!check_allowed_items(interacting_with)) + return NONE var/clean_speedies = 1 * cleanspeed if(user.mind) clean_speedies = cleanspeed * min(user.mind.get_skill_modifier(/datum/skill/cleaning, SKILL_SPEED_MODIFIER)+0.1, 1) //less scaling for soapies - if((target in user?.client.screen) && !user.is_holding(target)) - to_chat(user, span_warning("You need to take \the [target.name] off before cleaning it!")) + if((interacting_with in user?.client.screen) && !user.is_holding(interacting_with)) + to_chat(user, span_warning("You need to take \the [interacting_with.name] off before cleaning it!")) - else if(istype(target, /obj/effect/decal/cleanable)) - user.visible_message(span_notice("[user] begins to clean \the [target.name] out with [src]."), span_warning("You begin to clean \the [target.name] out with [src]...")) - if(do_after(user, clean_speedies, target = target)) - to_chat(user, span_notice("You clean \the [target.name] out.")) - var/obj/effect/decal/cleanable/cleanies = target + else if(istype(interacting_with, /obj/effect/decal/cleanable)) + user.visible_message(span_notice("[user] begins to clean \the [interacting_with.name] out with [src]."), span_warning("You begin to clean \the [interacting_with.name] out with [src]...")) + if(do_after(user, clean_speedies, target = interacting_with)) + to_chat(user, span_notice("You clean \the [interacting_with.name] out.")) + var/obj/effect/decal/cleanable/cleanies = interacting_with user.mind?.adjust_experience(/datum/skill/cleaning, max(round(cleanies.beauty/CLEAN_SKILL_BEAUTY_ADJUSTMENT), 0)) //again, intentional that this does NOT round but mops do. - qdel(target) + qdel(interacting_with) qdel(src) var/obj/item/serviette_used/used_cloth = new used_serviette remove_item_from_storage(user) user.put_in_hands(used_cloth) - else if(istype(target, /obj/structure/window)) - user.visible_message(span_notice("[user] begins to clean \the [target.name] with [src]..."), span_notice("You begin to clean \the [target.name] with [src]...")) - if(do_after(user, clean_speedies, target = target)) - to_chat(user, span_notice("You clean \the [target.name].")) - target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) - target.set_opacity(initial(target.opacity)) + else if(istype(interacting_with, /obj/structure/window)) + user.visible_message(span_notice("[user] begins to clean \the [interacting_with.name] with [src]..."), span_notice("You begin to clean \the [interacting_with.name] with [src]...")) + if(do_after(user, clean_speedies, target = interacting_with)) + to_chat(user, span_notice("You clean \the [interacting_with.name].")) + interacting_with.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) + interacting_with.set_opacity(initial(interacting_with.opacity)) user.mind?.adjust_experience(/datum/skill/cleaning, CLEAN_SKILL_GENERIC_WASH_XP) qdel(src) var/obj/item/serviette_used/used_cloth = new used_serviette @@ -53,19 +52,20 @@ user.put_in_hands(used_cloth) else - user.visible_message(span_notice("[user] begins to clean \the [target.name] with [src]..."), span_notice("You begin to clean \the [target.name] with [src]...")) - if(do_after(user, clean_speedies, target = target)) - to_chat(user, span_notice("You clean \the [target.name].")) - if(user && isturf(target)) - for(var/obj/effect/decal/cleanable/cleanable_decal in target) + user.visible_message(span_notice("[user] begins to clean \the [interacting_with.name] with [src]..."), span_notice("You begin to clean \the [interacting_with.name] with [src]...")) + if(do_after(user, clean_speedies, target = interacting_with)) + to_chat(user, span_notice("You clean \the [interacting_with.name].")) + if(user && isturf(interacting_with)) + for(var/obj/effect/decal/cleanable/cleanable_decal in interacting_with) user.mind?.adjust_experience(/datum/skill/cleaning, round(cleanable_decal.beauty / CLEAN_SKILL_BEAUTY_ADJUSTMENT)) - target.wash(CLEAN_SCRUB) - target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) + interacting_with.wash(CLEAN_SCRUB) + interacting_with.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) user.mind?.adjust_experience(/datum/skill/cleaning, CLEAN_SKILL_GENERIC_WASH_XP) qdel(src) var/obj/item/serviette_used/used_cloth = new used_serviette remove_item_from_storage(user) user.put_in_hands(used_cloth) + return ITEM_INTERACT_SUCCESS /* * SERVIETTE PACK diff --git a/modular_skyrat/modules/modular_vending/code/clothesmate.dm b/modular_skyrat/modules/modular_vending/code/clothesmate.dm index 50ce6f46ec0d6..2b2aa4e6f320d 100644 --- a/modular_skyrat/modules/modular_vending/code/clothesmate.dm +++ b/modular_skyrat/modules/modular_vending/code/clothesmate.dm @@ -60,6 +60,8 @@ /obj/item/clothing/under/suit/skyrat/recolorable = 5, /obj/item/clothing/under/suit/skyrat/recolorable/skirt = 5, /obj/item/clothing/under/pants/skyrat/kilt = 5, + /obj/item/clothing/under/costume/skyrat/kilt/royal = 5, + /obj/item/clothing/under/costume/skyrat/tac/irish = 5, /obj/item/clothing/under/suit/fancy = 5, /obj/item/clothing/under/texas = 5, /obj/item/clothing/under/sweater = 5, diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm index a964e6cf36237..f748686c52904 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm @@ -68,17 +68,18 @@ . += span_notice("With Right Click you can set the range that shells will detonate at.") . += span_notice("A small indicator in the sight notes the current detonation range is: [target_range].") -/obj/item/gun/ballistic/automatic/sol_grenade_launcher/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) +/obj/item/gun/ballistic/automatic/sol_grenade_launcher/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) if(!interacting_with || !user) - return + return ITEM_INTERACT_BLOCKING var/distance_ranged = get_dist(user, interacting_with) if(distance_ranged > maximum_target_range) user.balloon_alert(user, "out of range") - return + return ITEM_INTERACT_BLOCKING target_range = distance_ranged user.balloon_alert(user, "range set: [target_range]") + return ITEM_INTERACT_SUCCESS /obj/item/gun/ballistic/automatic/sol_grenade_launcher/no_mag spawnwithmagazine = FALSE diff --git a/modular_skyrat/modules/mold/code/mold_structures.dm b/modular_skyrat/modules/mold/code/mold_structures.dm index 3b5213395ff33..f16bfc948f0b2 100644 --- a/modular_skyrat/modules/mold/code/mold_structures.dm +++ b/modular_skyrat/modules/mold/code/mold_structures.dm @@ -131,7 +131,7 @@ icon = 'modular_skyrat/modules/mold/icons/blob_resin.dmi' icon_state = "blob_floor" density = FALSE - plane = FLOOR_PLANE + plane = GAME_PLANE layer = LOW_SIGIL_LAYER max_integrity = 25 //BUBBERSTATION CHANGE var/blooming = FALSE diff --git a/modular_skyrat/modules/moretraitoritems/code/glue.dm b/modular_skyrat/modules/moretraitoritems/code/glue.dm index 01a1c9983c16a..2b3898cb271db 100644 --- a/modular_skyrat/modules/moretraitoritems/code/glue.dm +++ b/modular_skyrat/modules/moretraitoritems/code/glue.dm @@ -7,24 +7,21 @@ var/uses = 1 -/obj/item/syndie_glue/afterattack(atom/target, mob/user, proximity) - . = ..() - if(!proximity || !target) - return - else - if(!uses) - to_chat(user, span_warning("The bottle of glue is empty!")) - return - if(istype(target, /obj/item)) - var/obj/item/I = target - if(HAS_TRAIT_FROM(I, TRAIT_NODROP, TRAIT_GLUED_ITEM)) - to_chat(user, span_warning("[I] is already sticky!")) - return - uses -= 1 - ADD_TRAIT(I, TRAIT_NODROP, TRAIT_GLUED_ITEM) - I.desc += " It looks sticky." - to_chat(user, span_notice("You smear the [I] with glue, making it incredibly sticky!")) - if(uses == 0) - icon_state = "glue_used" - name = "empty bottle of super glue" - return +/obj/item/syndie_glue/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!uses) + to_chat(user, span_warning("The bottle of glue is empty!")) + return NONE + if(!isitem(interacting_with)) + return NONE + if(HAS_TRAIT_FROM(interacting_with, TRAIT_NODROP, TRAIT_GLUED_ITEM)) + to_chat(user, span_warning("[interacting_with] is already sticky!")) + return ITEM_INTERACT_BLOCKING + + uses -= 1 + ADD_TRAIT(interacting_with, TRAIT_NODROP, TRAIT_GLUED_ITEM) + interacting_with.desc += " It looks sticky." + to_chat(user, span_notice("You smear the [interacting_with] with glue, making it incredibly sticky!")) + if(uses == 0) + icon_state = "glue_used" + name = "empty bottle of super glue" + return ITEM_INTERACT_SUCCESS diff --git a/modular_skyrat/modules/mutants/code/mutant_cure.dm b/modular_skyrat/modules/mutants/code/mutant_cure.dm index 59fdca633254c..81aad77fbffb0 100644 --- a/modular_skyrat/modules/mutants/code/mutant_cure.dm +++ b/modular_skyrat/modules/mutants/code/mutant_cure.dm @@ -29,32 +29,30 @@ return unload_vial(user) -/obj/item/rna_extractor/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if(!proximity_flag) +/obj/item/rna_extractor/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!ishuman(interacting_with)) return - if(!ishuman(target)) - return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/target = interacting_with if(!loaded_vial) to_chat(user, span_danger("[src] is empty!")) return if(loaded_vial.contains_rna) to_chat(user, span_danger("[src] already has RNA data in it, upload it to the combinator!")) return - if(!ismutant(H)) - to_chat(user, span_danger("[H] does not register as infected!")) + if(!ismutant(target)) + to_chat(user, span_danger("[target] does not register as infected!")) return - var/datum/component/mutant_infection/ZI = H.GetComponent(/datum/component/mutant_infection) - if(!ZI) - to_chat(user, span_danger("[H] does not register as infected!")) + var/datum/component/mutant_infection/target_infection = target.GetComponent(/datum/component/mutant_infection) + if(!target_infection) + to_chat(user, span_danger("[target] does not register as infected!")) return - if(ZI.extract_rna()) - loaded_vial.load_rna(H) - to_chat(user, span_notice("[src] successfully scanned [H], and now holds a sample virus RNA data.")) + if(target_infection.extract_rna()) + loaded_vial.load_rna(target) + to_chat(user, span_notice("[src] successfully scanned [target], and now holds a sample virus RNA data.")) playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE, -6) update_appearance() else - to_chat(user, span_warning("[H] has no useable RNA!")) + to_chat(user, span_warning("[target] has no useable RNA!")) /obj/item/rna_extractor/proc/unload_vial(mob/living/user) if(loaded_vial) diff --git a/modular_skyrat/modules/mutants/code/mutant_species.dm b/modular_skyrat/modules/mutants/code/mutant_species.dm index 07bcf0f9cdb33..d560c8bd15684 100644 --- a/modular_skyrat/modules/mutants/code/mutant_species.dm +++ b/modular_skyrat/modules/mutants/code/mutant_species.dm @@ -213,11 +213,8 @@ else icon_state = icon_right -/obj/item/hnz_mutant_hand/afterattack(atom/target, mob/user, proximity_flag) - . = ..() - if(!proximity_flag) - return - else if(isliving(target)) +/obj/item/hnz_mutant_hand/afterattack(atom/target, mob/user, click_parameters) + if(isliving(target)) if(ishuman(target)) try_to_mutant_infect(target, user = user) else diff --git a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm index 51317a8932758..8ec0592005897 100644 --- a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm +++ b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm @@ -317,7 +317,7 @@ UnregisterSignal(mod.wearer, COMSIG_LIVING_HEALTH_UPDATE) /obj/item/mod/module/auto_doc/on_install() - RegisterSignal(mod, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(mod, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_interact)) /obj/item/mod/module/auto_doc/on_uninstall(deleting) UnregisterSignal(mod, COMSIG_ATOM_ATTACKBY) @@ -327,10 +327,10 @@ return TRUE return ..() -/obj/item/mod/module/auto_doc/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user) +/obj/item/mod/module/auto_doc/proc/on_item_interact(datum/source, mob/user, obj/item/thing, params) SIGNAL_HANDLER - if(charge_boost(attacking_item, user)) + if(charge_boost(thing, user)) return COMPONENT_NO_AFTERATTACK return NONE diff --git a/modular_skyrat/modules/pet_owner/pet_owner.dm b/modular_skyrat/modules/pet_owner/pet_owner.dm index c6b80222e6165..6a97b23f409eb 100644 --- a/modular_skyrat/modules/pet_owner/pet_owner.dm +++ b/modular_skyrat/modules/pet_owner/pet_owner.dm @@ -56,16 +56,22 @@ GLOBAL_LIST_INIT(possible_player_pet, list( "Bull terrier" = /mob/living/basic/pet/dog/bullterrier, "Butterfly" = /mob/living/basic/butterfly, "Cat" = /mob/living/basic/pet/cat, + "Cat (Clown)" = /mob/living/basic/pet/cat/clown, + "Cat (Mime)" = /mob/living/basic/pet/cat/mime, + "Carp" = /mob/living/basic/carp/petcarp, + "Carp (Clown)" = /mob/living/basic/carp/clarp, "Chick" = /mob/living/basic/chick/permanent, "Chicken" = /mob/living/basic/chicken, "Chinchilla (dark)" = /mob/living/basic/pet/chinchilla/black, "Chinchilla (white)" = /mob/living/basic/pet/chinchilla/white, "Corgi" = /mob/living/basic/pet/dog/corgi, "Corgi puppy" = /mob/living/basic/pet/dog/corgi/puppy, + "Cyber Corgi" = /mob/living/basic/pet/dog/corgi/robocorgo, "Cockroach" = /mob/living/basic/cockroach, "Crab" = /mob/living/basic/crab, "Deer" = /mob/living/basic/deer, "Dobermann" = /mob/living/basic/pet/dog/dobermann, + "Fennec" = /mob/living/basic/pet/cat/fennec, "Fox" = /mob/living/basic/pet/fox/docile, "Frog" = /mob/living/basic/frog, "Giant ant" = /mob/living/basic/ant, @@ -76,13 +82,16 @@ GLOBAL_LIST_INIT(possible_player_pet, list( "Mouse (gray)" = /mob/living/basic/mouse/gray, "Mouse (brown)" = /mob/living/basic/mouse/brown, "Penguin" = /mob/living/basic/pet/penguin/emperor/neuter, + "Pitbull" = /mob/living/basic/pet/dog/pitbull, "Pig" = /mob/living/basic/pig, "Pug" = /mob/living/basic/pet/dog/pug, "Rabbit" = /mob/living/basic/rabbit, + "Red Panda" = /mob/living/basic/pet/fox/redpanda, "Sloth" = /mob/living/basic/sloth, "Snake" = /mob/living/basic/snake, "Spider" = /mob/living/basic/spider/maintenance, "Tegu" = /mob/living/basic/lizard/tegu, + "Tiger" = /mob/living/basic/pet/cat/tiger, )) //some of these are too big to be put back into the pet carrier once taken out, so I put a warning on the carrier. /datum/preference/choiced/pet_owner/init_possible_values() diff --git a/modular_skyrat/modules/polarized_windows/polarization_controller.dm b/modular_skyrat/modules/polarized_windows/polarization_controller.dm index 214e9257279d5..116f2566c6e7e 100644 --- a/modular_skyrat/modules/polarized_windows/polarization_controller.dm +++ b/modular_skyrat/modules/polarized_windows/polarization_controller.dm @@ -33,7 +33,7 @@ GLOBAL_LIST_EMPTY(polarization_controllers) // But why make it a string here? Otherwise it won't be an associative list and it kind of explodes. Shitty, I know. LAZYADDASSOC(GLOB.polarization_controllers, id, list(src)) - RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_window_attackby)) + RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(window_item_interact)) RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_window_examine)) RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(on_window_multitool_act)) @@ -81,18 +81,18 @@ GLOBAL_LIST_EMPTY(polarization_controllers) * * See: [/obj/item/proc/melee_attack_chain] */ -/datum/component/polarization_controller/proc/on_window_attackby(datum/source, obj/item/attacking_item, mob/user, params) +/datum/component/polarization_controller/proc/window_item_interact(datum/source, obj/item/attacking_item, mob/user, params) SIGNAL_HANDLER if(!istype(attacking_item, /obj/item/assembly/control/polarizer)) - return + return NONE var/obj/item/assembly/control/polarizer/polarizer = attacking_item var/atom/parent_atom = parent if(!polarizer.id) parent_atom.balloon_alert(user, "set id on controller first!") - return COMPONENT_NO_AFTERATTACK + return ITEM_INTERACT_BLOCKING if(id) LAZYREMOVEASSOC(GLOB.polarization_controllers, id, list(src)) @@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(polarization_controllers) LAZYADDASSOC(GLOB.polarization_controllers, id, list(src)) parent_atom.balloon_alert(user, "linked polarizer!") - return COMPONENT_NO_AFTERATTACK + return ITEM_INTERACT_SUCCESS /** diff --git a/modular_skyrat/modules/pollution/code/air_refresher.dm b/modular_skyrat/modules/pollution/code/air_refresher.dm index 2a9466cf8129a..53be9661de90f 100644 --- a/modular_skyrat/modules/pollution/code/air_refresher.dm +++ b/modular_skyrat/modules/pollution/code/air_refresher.dm @@ -18,20 +18,17 @@ else . += "It is empty." -/obj/item/air_refresher/afterattack(atom/attacked, mob/user, proximity) - . = ..() - if(.) - return +/obj/item/air_refresher/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(uses_remaining <= 0) to_chat(user, span_warning("\The [src] is empty!")) - return TRUE + return NONE uses_remaining-- - var/turf/aimed_turf = get_turf(attacked) + var/turf/aimed_turf = get_turf(interacting_with) aimed_turf.pollute_turf(/datum/pollutant/fragrance/air_refresher, 200) user.visible_message(span_notice("[user] sprays the air around with \the [src]."), span_notice("You spray the air around with \the [src].")) user.changeNext_move(CLICK_CD_RANGE*2) playsound(aimed_turf, 'sound/effects/spray2.ogg', 50, TRUE, -6) - return TRUE + return ITEM_INTERACT_SUCCESS /obj/machinery/pollution_scrubber name = "Pollution Scrubber" diff --git a/modular_skyrat/modules/pollution/code/perfumes.dm b/modular_skyrat/modules/pollution/code/perfumes.dm index 80ccf1c253eb1..4fd617b3eb98f 100644 --- a/modular_skyrat/modules/pollution/code/perfumes.dm +++ b/modular_skyrat/modules/pollution/code/perfumes.dm @@ -48,11 +48,10 @@ to_chat(user, span_notice("The cap on [src] is now [cap ? "on" : "off"].")) update_appearance() -/obj/item/perfume/afterattack(atom/attacked, mob/user, proximity) - . = ..() +/obj/item/perfume/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(.) return - if(!ismovable(attacked)) + if(!ismovable(interacting_with)) return if(has_cap && cap) to_chat(user, span_warning("Take the cap off first!")) @@ -63,10 +62,10 @@ uses_remaining-- var/turf/my_turf = get_turf(user) my_turf.pollute_turf(fragrance_type, 20) - user.visible_message(span_notice("[user] sprays [attacked] with \the [src]."), span_notice("You spray [attacked] with \the [src].")) + user.visible_message(span_notice("[user] sprays [interacting_with] with \the [src]."), span_notice("You spray [interacting_with] with \the [src].")) user.changeNext_move(CLICK_CD_RANGE*2) playsound(my_turf, 'sound/effects/spray2.ogg', 50, TRUE, -6) - attacked.AddComponent(/datum/component/temporary_pollution_emission, fragrance_type, 5, 10 MINUTES) + interacting_with.AddComponent(/datum/component/temporary_pollution_emission, fragrance_type, 5, 10 MINUTES) /obj/item/perfume/cologne name = "cologne bottle" diff --git a/modular_skyrat/modules/primitive_production/code/glassblowing.dm b/modular_skyrat/modules/primitive_production/code/glassblowing.dm index 59198aa11124a..49bc2d1c4de72 100644 --- a/modular_skyrat/modules/primitive_production/code/glassblowing.dm +++ b/modular_skyrat/modules/primitive_production/code/glassblowing.dm @@ -143,22 +143,20 @@ if(glass.steps_remaining[STEP_JACKS]) . += "The glass requires [glass.steps_remaining[STEP_JACKS]] more jacking actions!" -/obj/item/glassblowing/blowing_rod/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if(!proximity_flag) - return ..() - if(istype(target, /obj/item/glassblowing/molten_glass)) - var/obj/item/glassblowing/molten_glass/attacking_glass = target - var/obj/item/glassblowing/molten_glass/glass = glass_ref?.resolve() - if(glass) - to_chat(user, span_warning("[src] already has some glass on it!")) - return - if(!user.transferItemToLoc(attacking_glass, src)) - return - glass_ref = WEAKREF(attacking_glass) - to_chat(user, span_notice("[src] picks up [target].")) - icon_state = "blow_pipe_full" - return - return ..() +/obj/item/glassblowing/blowing_rod/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + var/obj/item/glassblowing/molten_glass/attacking_glass = interacting_with + if(!istype(attacking_glass)) + return NONE + + if(glass_ref?.resolve()) + to_chat(user, span_warning("[src] already has some glass on it!")) + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(attacking_glass, src)) + return ITEM_INTERACT_BLOCKING + glass_ref = WEAKREF(attacking_glass) + to_chat(user, span_notice("[src] picks up [attacking_glass].")) + icon_state = "blow_pipe_full" + return ITEM_INTERACT_SUCCESS /obj/item/glassblowing/blowing_rod/attackby(obj/item/attacking_item, mob/living/user, params) var/actioning_speed = user.mind.get_skill_modifier(/datum/skill/production, SKILL_SPEED_MODIFIER) * DEFAULT_TIMED diff --git a/modular_skyrat/modules/reagent_forging/code/forge_items.dm b/modular_skyrat/modules/reagent_forging/code/forge_items.dm index 3a8b8df49ab0b..efa4bfd997db6 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge_items.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge_items.dm @@ -38,7 +38,7 @@ /obj/structure/reagent_crafting_bench ) -/obj/item/forging/hammer/afterattack(atom/target, mob/user, proximity_flag, click_parameters) +/obj/item/forging/hammer/afterattack(atom/target, mob/user, click_parameters) . = ..() if(!is_type_in_list(target, fast_attacks)) return diff --git a/modular_skyrat/modules/resleeving/code/rsd_interface.dm b/modular_skyrat/modules/resleeving/code/rsd_interface.dm index 106bb11ea38bc..34afe37a51ece 100644 --- a/modular_skyrat/modules/resleeving/code/rsd_interface.dm +++ b/modular_skyrat/modules/resleeving/code/rsd_interface.dm @@ -8,20 +8,20 @@ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' /// Attempts to use the item on the target brain. -/obj/item/rsd_interface/afterattack(obj/item/organ/internal/brain/target_brain, mob/user, proximity_flag, click_parameters) - . = ..() - if(!proximity_flag || !istype(target_brain)) - return FALSE +/obj/item/rsd_interface/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!istype(interacting_with, /obj/item/organ/internal/brain)) + return NONE - if(HAS_TRAIT(target_brain, TRAIT_NIFSOFT_HUD_GRANTER)) - balloon_alert("already upgraded!") - return FALSE + if(HAS_TRAIT(interacting_with, TRAIT_RSD_COMPATIBLE)) + user.balloon_alert(user, "already upgraded!") + return ITEM_INTERACT_BLOCKING - user.visible_message(span_notice("[user] upgrades [target_brain] with [src]."), span_notice("You upgrade [target_brain] to be RSD compatible.")) - target_brain.AddElement(/datum/element/rsd_interface) - playsound(target_brain.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE) + user.visible_message(span_notice("[user] upgrades [interacting_with] with [src]."), span_notice("You upgrade [interacting_with] to be RSD compatible.")) + interacting_with.AddElement(/datum/element/rsd_interface) + playsound(interacting_with.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE) qdel(src) + return ITEM_INTERACT_SUCCESS /datum/element/rsd_interface/Attach(datum/target) . = ..() diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm index 37bf649b7fd5d..2514bcf72d959 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm @@ -30,20 +30,19 @@ . = ..() AddElement(/datum/element/kneecapping) -/obj/item/melee/breaching_hammer/afterattack(atom/target, mob/user, proximity) - . = ..() - if(!proximity) - return - if(istype(target, /obj/machinery/door)) - user.changeNext_move(5 SECONDS) - if(!registered) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(remove_track), FALSE) - RegisterSignal(target, COMSIG_BREACHING, PROC_REF(try_breaching), TRUE) - to_chat(user, text = "You prepare to forcefully strike the door") - registered = TRUE - breacher = user - SEND_SIGNAL(target, COMSIG_BREACHING, user) - breaching_target = target +/obj/item/melee/breaching_hammer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!istype(interacting_with, /obj/machinery/door)) + return NONE + user.changeNext_move(5 SECONDS) + if(!registered) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(remove_track), FALSE) + RegisterSignal(interacting_with, COMSIG_BREACHING, PROC_REF(try_breaching), TRUE) + to_chat(user, text = "You prepare to forcefully strike the door") + registered = TRUE + breacher = user + SEND_SIGNAL(interacting_with, COMSIG_BREACHING, user) + breaching_target = interacting_with + return ITEM_INTERACT_SUCCESS /// Removes any form of tracking from the user and the item , make sure to call it on he proper item /obj/item/melee/breaching_hammer/proc/remove_track(mob/living/carbon/human/user) diff --git a/modular_skyrat/modules/space_vines/vine_mutations.dm b/modular_skyrat/modules/space_vines/vine_mutations.dm index 54971404f5cc7..6dfb9c1b7fc41 100644 --- a/modular_skyrat/modules/space_vines/vine_mutations.dm +++ b/modular_skyrat/modules/space_vines/vine_mutations.dm @@ -36,7 +36,7 @@ quality = POSITIVE /datum/spacevine_mutation/domesticated/on_spread(obj/structure/spacevine/vine_object, turf/target) - vine_object.layer = TURF_LAYER + vine_object.layer = LOW_FLOOR_LAYER vine_object.plane = FLOOR_PLANE diff --git a/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm b/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm index 62f4334b09984..d5e610a9050fa 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm @@ -23,16 +23,18 @@ )) // Attempt to charge from an object by using them on the power cord. -/obj/item/synth_powercord/attackby(obj/item/attacking_item, mob/user, params) - if(!can_power_draw(attacking_item, user)) - return ..() - try_power_draw(attacking_item, user) +/obj/item/synth_powercord/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(!can_power_draw(tool, user)) + return NONE + try_power_draw(tool, user) + return ITEM_INTERACT_SUCCESS // Attempt to charge from an object by using the power cord on them. -/obj/item/synth_powercord/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if(!proximity_flag || !can_power_draw(target, user)) - return ..() - try_power_draw(target, user) +/obj/item/synth_powercord/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!can_power_draw(interacting_with, user)) + return NONE + try_power_draw(interacting_with, user) + return ITEM_INTERACT_SUCCESS /// Returns TRUE or FALSE depending on if the target object can be used as a power source. /obj/item/synth_powercord/proc/can_power_draw(obj/target, mob/user) diff --git a/modular_skyrat/modules/taur_mechanics/code/constrict.dm b/modular_skyrat/modules/taur_mechanics/code/constrict.dm index 21ddf3baf19c2..74ce7148b3ffc 100644 --- a/modular_skyrat/modules/taur_mechanics/code/constrict.dm +++ b/modular_skyrat/modules/taur_mechanics/code/constrict.dm @@ -392,11 +392,10 @@ return register_constricted() + restrain_constricted() apply_pixel_shift() constricted.apply_status_effect(/datum/status_effect/constricted) - restrain_constricted() - /// Applies our pixel shift to our constricted. Do not call if we have already applied our pixel shift. /obj/structure/serpentine_tail/proc/apply_pixel_shift() if (!constricted) diff --git a/modular_skyrat/modules/wargame_projectors/code/projectors.dm b/modular_skyrat/modules/wargame_projectors/code/projectors.dm index 0c3c17b413f8f..e81112463bc26 100644 --- a/modular_skyrat/modules/wargame_projectors/code/projectors.dm +++ b/modular_skyrat/modules/wargame_projectors/code/projectors.dm @@ -51,8 +51,8 @@ set_greyscale(holosign_color) populate_radial_choice_lists() -/obj/item/wargame_projector/handle_openspace_click(turf/target, mob/user, proximity_flag, click_parameters) - afterattack(target, user, proximity_flag, click_parameters) +/obj/item/wargame_projector/handle_openspace_click(turf/target, mob/user, click_parameters) + ranged_interact_with_atom(target, user, params2list(click_parameters)) /obj/item/wargame_projector/examine(mob/user) . = ..() @@ -103,9 +103,7 @@ qdel(hologram) /// Can we place a hologram at the target location? -/obj/item/wargame_projector/proc/check_can_place_hologram(atom/target, mob/user, proximity_flag, team) - if(!proximity_flag) - return FALSE +/obj/item/wargame_projector/proc/check_can_place_hologram(atom/target, mob/user, team) if(!check_allowed_items(target, not_inside = TRUE)) return FALSE var/turf/target_turf = get_turf(target) @@ -117,10 +115,9 @@ return TRUE /// Spawn a hologram with pixel offset based on where the user clicked -/obj/item/wargame_projector/proc/create_hologram(atom/target, mob/user, click_parameters) +/obj/item/wargame_projector/proc/create_hologram(atom/target, mob/user, list/modifiers) var/obj/target_holosign = new holosign_type(get_turf(target), src) - var/list/modifiers = params2list(click_parameters) var/click_x var/click_y @@ -135,17 +132,14 @@ playsound(loc, 'sound/machines/click.ogg', 20, TRUE) -/obj/item/wargame_projector/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - . = ..() - if(istype(target, /obj/structure/wargame_hologram)) - qdel(target) - return - if(!check_can_place_hologram(target, user, proximity_flag, 1)) - return - create_hologram(target, user, click_parameters) - -/obj/item/wargame_projector/attack(mob/living/carbon/human/M, mob/user) //Jesse what the fuck is happening with that var, I'm scared to change it from M - return +/obj/item/wargame_projector/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(istype(interacting_with, /obj/structure/wargame_hologram)) + qdel(interacting_with) + return ITEM_INTERACT_SUCCESS + if(!check_can_place_hologram(interacting_with, user, 1)) + return NONE + create_hologram(interacting_with, user, modifiers) + return ITEM_INTERACT_SUCCESS /obj/item/wargame_projector/Destroy() QDEL_LAZYLIST(projections) diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm index ce0053da047ba..7bfa40155cd3c 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm @@ -133,65 +133,48 @@ desc = "An item that has the capabilities to recover items lost due to time." icon_state = "recoverer" -/obj/item/xenoarch/handheld_recoverer/afterattack(atom/target, mob/user, proximity_flag, click_parameters) - if(!proximity_flag) - return - - var/turf/target_turf = get_turf(target) - if(istype(target, /obj/item/xenoarch/broken_item/tech)) +/obj/item/xenoarch/handheld_recoverer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + var/turf/target_turf = get_turf(interacting_with) + . = ITEM_INTERACT_SUCCESS + if(istype(interacting_with, /obj/item/xenoarch/broken_item/tech)) var/spawn_item = pick_weight(GLOB.tech_reward) new spawn_item(target_turf) - user.mind.adjust_experience(/datum/skill/research, 5) - qdel(target) + qdel(interacting_with) return - - if(istype(target, /obj/item/xenoarch/broken_item/weapon)) + if(istype(interacting_with, /obj/item/xenoarch/broken_item/weapon)) var/spawn_item = pick_weight(GLOB.weapon_reward) new spawn_item(target_turf) - user.mind.adjust_experience(/datum/skill/research, 5) - qdel(target) + qdel(interacting_with) return - - if(istype(target, /obj/item/xenoarch/broken_item/illegal)) + if(istype(interacting_with, /obj/item/xenoarch/broken_item/illegal)) var/spawn_item = pick_weight(GLOB.illegal_reward) new spawn_item(target_turf) - user.mind.adjust_experience(/datum/skill/research, 5) - qdel(target) + qdel(interacting_with) return - - if(istype(target, /obj/item/xenoarch/broken_item/alien)) + if(istype(interacting_with, /obj/item/xenoarch/broken_item/alien)) var/spawn_item = pick_weight(GLOB.alien_reward) new spawn_item(target_turf) - user.mind.adjust_experience(/datum/skill/research, 5) - qdel(target) + qdel(interacting_with) return - - if(istype(target, /obj/item/xenoarch/broken_item/plant)) + if(istype(interacting_with, /obj/item/xenoarch/broken_item/plant)) var/spawn_item = pick_weight(GLOB.plant_reward) new spawn_item(target_turf) - user.mind.adjust_experience(/datum/skill/research, 5) - qdel(target) + qdel(interacting_with) return - - if(istype(target, /obj/item/xenoarch/broken_item/clothing)) + if(istype(interacting_with, /obj/item/xenoarch/broken_item/clothing)) var/spawn_item = pick_weight(GLOB.clothing_reward) new spawn_item(target_turf) - user.mind.adjust_experience(/datum/skill/research, 5) - qdel(target) + qdel(interacting_with) return - - if(istype(target, /obj/item/xenoarch/broken_item/animal)) + if(istype(interacting_with, /obj/item/xenoarch/broken_item/animal)) var/spawn_item var/turf/src_turf = get_turf(src) for(var/looptime in 1 to rand(1,4)) spawn_item = pick_weight(GLOB.animal_reward) new spawn_item(src_turf) - - user.mind.adjust_experience(/datum/skill/research, 5) - qdel(target) + qdel(interacting_with) return - - return ..() + return NONE /obj/item/storage/belt/utility/xenoarch name = "xenoarch toolbelt" diff --git a/modular_zubbers/code/game/machinery/crew_monitor.dm b/modular_zubbers/code/game/machinery/crew_monitor.dm index ca30f3fc640da..4d935160c6842 100644 --- a/modular_zubbers/code/game/machinery/crew_monitor.dm +++ b/modular_zubbers/code/game/machinery/crew_monitor.dm @@ -1,11 +1,12 @@ #define SENSORS_UPDATE_PERIOD 15 SECONDS //Why is this not a global define, why do I have to define it again - +#define ALARM_PERIOD 45 SECONDS /obj/machinery/computer/crew luminosity = 1 - light_power = 3 + light_power = 1.4 + light_range = 1.7 var/canalarm = FALSE - + COOLDOWN_DECLARE(alarm_cooldown) /obj/machinery/computer/crew/Initialize(mapload, obj/item/circuitboard/C) . = ..() @@ -21,20 +22,27 @@ if(mob.z != src.z && !HAS_TRAIT(mob, TRAIT_MULTIZ_SUIT_SENSORS)) continue var/obj/item/clothing/under/uniform = mob.w_uniform - if(uniform.sensor_mode >= SENSOR_VITALS && (HAS_TRAIT(mob, TRAIT_CRITICAL_CONDITION) || mob.stat == DEAD)) + if(uniform.sensor_mode == SENSOR_COORDS && (uniform.has_sensor != BROKEN_SENSORS) && (HAS_TRAIT(mob, TRAIT_CRITICAL_CONDITION) || mob.stat == DEAD)) if(mob.get_dnr()) // DNR won't beep anymore continue canalarm = TRUE break // Why wasn't this here? if(canalarm) - playsound(src, 'sound/machines/twobeep.ogg', 50, TRUE) - set_light((initial(light_range) + 3), 3, CIRCUIT_COLOR_SECURITY, TRUE) - spasm_animation(10) + icon_keyboard = "syndie_key" + update_appearance() + set_light(l_range = 1.9, l_power = 5, l_color = CIRCUIT_COLOR_SECURITY, l_on = TRUE) + if(COOLDOWN_FINISHED(src, alarm_cooldown)) + playsound(source = src, soundin = 'sound/machines/twobeep.ogg', vol = 50, vary = TRUE) + spasm_animation(1 SECONDS) + COOLDOWN_START(src, alarm_cooldown, ALARM_PERIOD) else - set_light((initial(light_range)), initial(light_power), initial(light_color), TRUE) + icon_keyboard = "med_key" + update_appearance() + set_light(l_range = initial(light_range), l_power = initial(light_power), l_color = initial(light_color), l_on = TRUE) addtimer(CALLBACK(src, .proc/alarm), SENSORS_UPDATE_PERIOD) // Fix this for 515 return canalarm #undef SENSORS_UPDATE_PERIOD +#undef ALARM_PERIOD diff --git a/modular_zubbers/code/modules/GAGS/greyscale_configs.dm b/modular_zubbers/code/modules/GAGS/greyscale_configs.dm index b533e0de1f6aa..1a123b4466043 100644 --- a/modular_zubbers/code/modules/GAGS/greyscale_configs.dm +++ b/modular_zubbers/code/modules/GAGS/greyscale_configs.dm @@ -11,3 +11,73 @@ name = "Ring Bell Collar (Worn)" json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/ringbell_worn.json' + +/datum/greyscale_config/collar/gps + name = "GPS Collar" + icon_file = 'modular_zubbers/code/modules/GAGS/icons/collar.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps.json' + +/datum/greyscale_config/collar/gps/worn + name = "GPS Collar (Worn)" + json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps_worn.json' + +/datum/greyscale_config/collar/gps/lefthand + name = "GPS Collar (Left hand)" + json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps_lefthand.json' + +/datum/greyscale_config/collar/gps/righthand + name = "GPS Collar (Right hand)" + json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/gps_righthand.json' + +//Bunny stuff, sprites from MonkieStation + +/datum/greyscale_config/bunnysuit + name = "Bunny Suit" + icon_file = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bunnysuit.json' + +/datum/greyscale_config/bunnysuit_worn + name = "Worn Bunny Suit" + icon_file = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bunnysuit_worn.json' + +/datum/greyscale_config/tailcoat + name = "Tailcoat" + icon_file = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat.json' + +/datum/greyscale_config/tailcoat_worn + name = "Worn Tailcoat" + icon_file = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_worn.json' + +/datum/greyscale_config/tailcoat_bar + name = "Bartender's Tailcoat" + icon_file = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_bar.json' + +/datum/greyscale_config/tailcoat_bar_worn + name = "Worn Bartender's Tailcoat" + icon_file = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/tailcoat_bar_worn.json' + +/datum/greyscale_config/bowtie_collar + name = "Bowtie Collar" + icon_file = 'modular_zubbers/icons/mob/clothing/neck/neck.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bowtie_collar.json' + +/datum/greyscale_config/bowtie_collar_worn + name = "Worn Bowtie Collar" + icon_file = 'modular_zubbers/icons/mob/clothing/neck/neck.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/bowtie_collar_worn.json' + +/datum/greyscale_config/playbunnyears + name = "Playbunny Ears" + icon_file = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears.json' + +/datum/greyscale_config/playbunnyears_worn + name = "Worn Playbunny Ears" + icon_file = 'modular_zubbers/icons/mob/clothing/head/bunnyears.dmi' + json_config = 'modular_skyrat/modules/GAGS/json_configs/bunny_stuff/playbunny_ears_worn.json' + diff --git a/modular_zubbers/code/modules/GAGS/icons/collar.dmi b/modular_zubbers/code/modules/GAGS/icons/collar.dmi index d3c65c9f6ef92..0aec642890773 100644 Binary files a/modular_zubbers/code/modules/GAGS/icons/collar.dmi and b/modular_zubbers/code/modules/GAGS/icons/collar.dmi differ diff --git a/modular_zubbers/code/modules/antagonists/blob/blobstrains/_blobstrain.dm b/modular_zubbers/code/modules/antagonists/blob/blobstrains/_blobstrain.dm new file mode 100644 index 0000000000000..199b1bd641efb --- /dev/null +++ b/modular_zubbers/code/modules/antagonists/blob/blobstrains/_blobstrain.dm @@ -0,0 +1,13 @@ +/datum/blobstrain/ + var/instant_alert_on_change = FALSE + +/datum/blobstrain/on_gain() + . = ..() + if(!overmind.has_announced && instant_alert_on_change) + overmind.announcement_size = 0 + +/datum/blobstrain/reagent/networked_fibers + instant_alert_on_change = TRUE + + + diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm index e50e1d3cbcec3..b5ab59e326faf 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm @@ -8,10 +8,15 @@ var/datum/antagonist/bloodsucker/bloodsuckerdatum = IS_BLOODSUCKER(exposed_mob) if(!bloodsuckerdatum) return ..() + if(!(methods & (INJECT|INGEST))) + return ..() - if(istype(bloodsuckerdatum.my_clan, /datum/bloodsucker_clan/ventrue) && bloodsuckerdatum.GetBloodVolume() >= BLOOD_VOLUME_SAFE) + if(bloodsuckerdatum.my_clan && istype(bloodsuckerdatum.my_clan, /datum/bloodsucker_clan/ventrue) && bloodsuckerdatum.GetBloodVolume() >= BLOOD_VOLUME_SAFE) return ..() - if(bloodsuckerdatum.GetBloodVolume() >= BLOOD_VOLUME_MAXIMUM) + if(bloodsuckerdatum.GetRank() >= BLOODSUCKER_HIGH_LEVEL) + exposed_mob.adjust_disgust(5 SECONDS, DISGUST_LEVEL_GROSS) + reac_volume = reac_volume * 0.3 + if(bloodsuckerdatum.GetBloodVolume() >= BLOOD_VOLUME_NORMAL) return ..() bloodsuckerdatum.AdjustBloodVolume(round(reac_volume, 0.1)) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm index 454318b242fce..04f0616e10c7d 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm @@ -211,7 +211,7 @@ // Ranked up enough to get your true Reputation? if(bloodsuckerdatum.GetRank() == BLOODSUCKER_HIGH_LEVEL) - to_chat(bloodsuckerdatum.owner.current, span_warning("Drinking from mindless humans is now much more less effective.")) + to_chat(bloodsuckerdatum.owner.current, span_warning("Drinking from mindless humans and blood bags is now much more less effective.")) bloodsuckerdatum.SelectReputation(am_fledgling = FALSE, forced = TRUE) diff --git a/modular_zubbers/code/modules/antagonists/uplink/uplinkdatums.dm b/modular_zubbers/code/modules/antagonists/uplink/uplinkdatums.dm new file mode 100644 index 0000000000000..83713640bfaec --- /dev/null +++ b/modular_zubbers/code/modules/antagonists/uplink/uplinkdatums.dm @@ -0,0 +1,9 @@ +/datum/uplink_item/bundles_tc/bunny + name = "Syndicate Bunny Kit" + desc = "Straight from the dens of Carota. The Tactical Rabbit Ensemble. \ + Made for Tactical Rabbit Action, it's been adapted for use by the Syndicate, your welcome. \ + This kit contains one armor-lined rabbit costume, white combat gloves and one single carrot shiv. (Carrot shiv may be eaten in transit.)" + item = /obj/item/storage/box/syndibunny + cost = 8 + purchasable_from = UPLINK_NUKE_OPS + diff --git a/modular_zubbers/code/modules/antagonists/uplink/uplinkitems.dm b/modular_zubbers/code/modules/antagonists/uplink/uplinkitems.dm new file mode 100644 index 0000000000000..6df62f74201dc --- /dev/null +++ b/modular_zubbers/code/modules/antagonists/uplink/uplinkitems.dm @@ -0,0 +1,15 @@ +/obj/item/storage/box/syndibunny + name = "Syndicate bunny assassin outfit" + desc = "A box containing a high tech specialized syndicate... bunny suit?" + icon_state = "syndiebox" + +/obj/item/storage/box/syndibunny/PopulateContents() + generate_items_inside(list( + /obj/item/clothing/head/playbunnyears/syndicate = 1, + /obj/item/clothing/under/syndicate/syndibunny = 1, + /obj/item/clothing/suit/jacket/tailcoat/syndicate = 1, + /obj/item/clothing/neck/tie/bunnytie/syndicate = 1, + /obj/item/clothing/shoes/fancy_heels/syndi = 1, + /obj/item/clothing/gloves/combat/white = 1, + ), src) + diff --git a/modular_zubbers/code/modules/autolathe_components_adv/advpartdisks.dm b/modular_zubbers/code/modules/autolathe_components_adv/advpartdisks.dm new file mode 100644 index 0000000000000..bed02a687062b --- /dev/null +++ b/modular_zubbers/code/modules/autolathe_components_adv/advpartdisks.dm @@ -0,0 +1,99 @@ +//Disks that let autolathes print upgraded parts! +/obj/item/disk/design_disk/advanced_parts + name = "advanced components autolathe design disk" + +/obj/item/disk/design_disk/advanced_parts/Initialize(mapload) + . = ..() + blueprints += new /datum/design/adv_capacitor + blueprints += new /datum/design/adv_scanning + blueprints += new /datum/design/nano_servo + blueprints += new /datum/design/high_micro_laser + blueprints += new /datum/design/adv_matter_bin + blueprints += new /datum/design/super_cell + blueprints += new /datum/design/super_battery + blueprints += new /datum/design/water_recycler + blueprints += new /datum/design/card_reader + +/datum/design/adv_capacitor + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/adv_scanning + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/nano_servo + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/high_micro_laser + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/adv_matter_bin + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/super_cell + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/water_recycler + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/card_reader + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE + +/obj/item/disk/design_disk/high_tech_parts + name = "high-tech components autolathe design disk" + +/obj/item/disk/design_disk/high_tech_parts/Initialize(mapload) + . = ..() + blueprints += new /datum/design/super_capacitor + blueprints += new /datum/design/phasic_scanning + blueprints += new /datum/design/pico_servo + blueprints += new /datum/design/ultra_micro_laser + blueprints += new /datum/design/super_matter_bin + blueprints += new /datum/design/hyper_cell + blueprints += new /datum/design/hyper_battery + +/datum/design/super_capacitor + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/phasic_scanning + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/pico_servo + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/ultra_micro_laser + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/super_matter_bin + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/hyper_cell + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE +/datum/design/hyper_battery + build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE + +/datum/design/adv_part_disk + name = "Advanced components design disk" + desc = "A disk for an autolathe containing advanced component designs." + id = "adv_part_disk" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5) + build_path = /obj/item/disk/design_disk/advanced_parts + category = list( + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 + ) + lathe_time_factor = 0.2 + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_MEDICAL + +/datum/design/high_tech_part_disk + name = "High-tech components design disk" + desc = "A disk for an autolathe containing high-tech component designs." + id = "high_tech_part_disk" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/gold = SMALL_MATERIAL_AMOUNT*1.5, /datum/material/silver = SMALL_MATERIAL_AMOUNT*1.5) + build_path = /obj/item/disk/design_disk/high_tech_parts + category = list( + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 + RND_SUBCATEGORY_STOCK_PARTS_3 + ) + lathe_time_factor = 0.2 + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_MEDICAL + +/datum/techweb_node/parts_upg/New() + design_ids += list( + "adv_part_disk", + ) + return ..() + +/datum/techweb_node/parts_adv/New() + design_ids += list( + "high_tech_part_disk", + ) + return ..() + diff --git a/modular_zubbers/code/modules/borgs/code/robot_upgrade.dm b/modular_zubbers/code/modules/borgs/code/robot_upgrade.dm index 3500b1c9c835b..1fc3d55d160f3 100644 --- a/modular_zubbers/code/modules/borgs/code/robot_upgrade.dm +++ b/modular_zubbers/code/modules/borgs/code/robot_upgrade.dm @@ -60,3 +60,11 @@ items_to_add = list(/obj/item/storage/part_replacer/bluespace) items_to_add -= list(/obj/item/storage/part_replacer) +// Borg Dom Aura :) +/obj/item/borg/upgrade/dominatrixmodule/action(mob/living/silicon/robot/borg, mob/living/user) + . = ..() + borg.add_quirk(/datum/quirk/dominant_aura) + +/obj/item/borg/upgrade/dominatrixmodule/deactivate(mob/living/silicon/robot/borg, mob/living/user) + . = ..() + borg.remove_quirk(/datum/quirk/dominant_aura) diff --git a/modular_zubbers/code/modules/cargo/packs/security.dm b/modular_zubbers/code/modules/cargo/packs/security.dm index c44d8c0e821c5..0534817056aed 100644 --- a/modular_zubbers/code/modules/cargo/packs/security.dm +++ b/modular_zubbers/code/modules/cargo/packs/security.dm @@ -111,14 +111,14 @@ /obj/item/ammo_box/c980grenade/riot = 3, ) -/datum/supply_pack/security/secmed_medical - name = "Security Medic Kit Crate - Medical" +/datum/supply_pack/security/secmed_technician + name = "Security Medic Kit Crate - Technician" crate_name = "security medic crate" - desc = "Contains a large satchel medical kit." + desc = "Contains a medical technician kit." access = ACCESS_SECURITY - cost = CARGO_CRATE_VALUE * 3.75 + cost = CARGO_CRATE_VALUE * 5.5 contains = list( - /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, + /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked, ) /datum/supply_pack/security/secmed_surgical @@ -126,17 +126,17 @@ crate_name = "security medic crate" desc = "Contains a first responder surgical kit." access = ACCESS_SECURITY - cost = CARGO_CRATE_VALUE * 3.75 + cost = CARGO_CRATE_VALUE * 5 contains = list( /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked, ) -/datum/supply_pack/security/secmed_technician - name = "Security Medic Kit Crate - Technician" +/datum/supply_pack/security/secmed_medical + name = "Security Medic Kit Crate - Medical" crate_name = "security medic crate" - desc = "Contains a medical technician kit." + desc = "Contains a large satchel medical kit." access = ACCESS_SECURITY - cost = CARGO_CRATE_VALUE * 3.75 + cost = CARGO_CRATE_VALUE * 4.5 contains = list( - /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked, + /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked, ) diff --git a/modular_zubbers/code/modules/clothing/gloves/syndicate.dm b/modular_zubbers/code/modules/clothing/gloves/syndicate.dm index 9131c2da06d17..86b6d4264ee50 100644 --- a/modular_zubbers/code/modules/clothing/gloves/syndicate.dm +++ b/modular_zubbers/code/modules/clothing/gloves/syndicate.dm @@ -4,3 +4,9 @@ name = "tactical maid sleeves" desc = "'Tactical' cleaning gloves." icon_state = "syndimaid_arms" + +/obj/item/clothing/gloves/combat/white + icon_state = "white" + greyscale_colors = "#FFFFFF" + icon = 'icons/obj/clothing/gloves.dmi' + worn_icon = 'icons/mob/clothing/hands.dmi' diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm index ba654bece9d39..b59a052557043 100644 --- a/modular_zubbers/code/modules/clothing/head/helmet.dm +++ b/modular_zubbers/code/modules/clothing/head/helmet.dm @@ -62,3 +62,431 @@ worn_icon = 'modular_zubbers/icons/mob/clothing/head/hats.dmi' icon_state = "clussy_wig" flags_inv = HIDEHAIR + +//ALL BUNNY STUFF BY DimWhat OF MONKEESTATION + +/obj/item/clothing/head/playbunnyears + name = "bunny ears headband" + desc = "A pair of bunny ears attached to a headband. One of the ears is already crooked." + icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/head/bunnyears.dmi' + icon_state = "playbunny_ears" + greyscale_colors = "#39393f" + greyscale_config = /datum/greyscale_config/playbunnyears + greyscale_config_worn = /datum/greyscale_config/playbunnyears_worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/head/playbunnyears/syndicate + name = "blood-red bunny ears headband" + desc = "An unusually suspicious pair of bunny ears attached to a headband. The headband looks reinforced with plasteel... but why?" + icon_state = "syndibunny_ears" + clothing_flags = SNUG_FIT + armor_type = /datum/armor/head_helmet + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/syndicate/fake + armor_type = /datum/armor/none + +/obj/item/clothing/head/playbunnyears/centcom + name = "centcom bunny ears headband" + desc = "A pair of very professional bunny ears attached to a headband. The ears themselves came from an endangered species of green rabbits." + icon_state = "playbunny_ears_centcom" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/british + name = "british bunny ears headband" + desc = "A pair of classy bunny ears attached to a headband. Worn to honor the crown." + icon_state = "playbunny_ears_brit" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/communist + name = "really red bunny ears headband" + desc = "A pair of red and gold bunny ears attached to a headband. Commonly used by any collectivizing bunny waiters." + icon_state = "playbunny_ears_communist" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/usa + name = "usa bunny ears headband" + desc = "A pair of star spangled bunny ears attached to a headband. The headband of a true patriot." + icon_state = "playbunny_ears_usa" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +//CAPTAIN + +/obj/item/clothing/head/hats/caphat/bunnyears_captain + name = "captain's bunny ears" + desc = "A pair of dark blue bunny ears attached to a headband. Worn in lieu of the more traditional bicorn hat." + icon_state = "captain" + inhand_icon_state = "that" + icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/head/bunnyears.dmi' + dog_fashion = null + +//CARGO + +/obj/item/clothing/head/playbunnyears/quartermaster + name = "quartermaster's bunny ears" + desc = "Brown and gray bunny ears attached to a headband. The brown headband denotes relative importance." + icon_state = "qm" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/cargo + name = "cargo bunny ears" + desc = "Brown and gray bunny ears attached to a headband. The gray headband denotes relative unimportance." + icon_state = "cargo_tech" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/miner + name = "shaft miner's bunny ears" + desc = "Muddy gray bunny ears attached to a headband. Has zero resistance against the hostile lavaland atmosphere." + icon_state = "explorer" + armor_type = /datum/armor/hooded_explorer + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/mailman + name = "mailman's bunny ears" + desc = "Blue and red bunny ears attached to a headband. Shows everyone your commitment to speed and efficiency." + icon_state = "mail" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/bitrunner + name = "bunrunner's bunny ears" + desc = "Black and gold with stains of space mountain. The official wear of the Carota E-Sports team." + icon_state = "bitrunner" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +//ENGI + +/obj/item/clothing/head/playbunnyears/engineer + name = "engineering bunny ears" + desc = "Yellow and orange bunny ears attached to a headband. Likely to get caught in heavy machinery." + icon_state = "engi" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/atmos_tech + name = "atmospheric technician's bunny ears" + desc = "Yellow and blue bunny ears attached to a headband. Gives zero protection against both fires and extreme pressures." + icon_state = "atmos" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/ce + name = "chief engineer's bunny ears" + desc = "Green and white bunny ears attached to a headband. Just keep them away from the supermatter." + icon_state = "ce" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +//MEDICAL + +/obj/item/clothing/head/playbunnyears/doctor + name = "medical bunny ears" + desc = "White and blue bunny ears attached to a headband. Certainly cuter than a head mirror." + icon_state = "doctor" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/paramedic + name = "paramedic's bunny ears" + desc = "Blue and white bunny ears attached to a headband. Marks you clearly as a bunny first responder, allowing you a high degree of respect and deference… yeah right." + icon_state = "paramedic" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/chemist + name = "chemist's bunny ears" + desc = "White and orange bunny ears attached to a headband. One of the ears is already crooked." + icon_state = "chem" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/pathologist + name = "pathologist's bunny ears" + desc = "White and green bunny ears attached to a headband. This is not proper PPE gear." + icon_state = "virologist" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/coroner + name = "coroner's bunny ears" + desc = "Black and white bunny ears attached to a headband. Please don't wear this to a funeral." + icon_state = "coroner" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/cmo + name = "chief medical officer's bunny ears" + desc = "White and blue bunny ears attached to a headband. A headband that commands respect from the entire medical team." + icon_state = "cmo" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +//SCIENCE + +/obj/item/clothing/head/playbunnyears/scientist + name = "scientist's bunny ears" + desc = "Purple and white bunny ears attached to a headband. Completes the look for lagomorphic studies." + icon_state = "science" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/roboticist + name = "roboticist's bunny ears" + desc = "Black and red bunny ears attached to a headband. Installed with servos to imitate the movement of real bunny ears." + icon_state = "roboticist" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/geneticist + name = "geneticist's bunny ears" + desc = "Blue and white bunny ears attached to a headband. For when you have no bunnies to splice your genes with." + icon_state = "genetics" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/rd + name = "research director's bunny ears" + desc = "Purple and black bunny ears attached to a headband. Large amounts of funding went into creating a piece of headgear capable of increasing the wearers height, this is what was produced." + icon_state = "rd" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +//SECURITY + +/obj/item/clothing/head/playbunnyears/security + name = "security bunny ears" + desc = "Red and black bunny ears attached to a headband. The band is made out of hardened steel." + icon_state = "sec" + clothing_flags = SNUG_FIT + armor_type = /datum/armor/head_helmet + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + + +/obj/item/clothing/head/playbunnyears/security/assistant + name = "security assistant's bunny ears" + desc = "A pair of red and grey bunny ears attatched to a headband. Snugly fit, to keep it attatched during long distance tackles." + icon_state = "sec_assistant" + +//TODO: Find a way to add Warden stuff that isn't hack-y. + +/obj/item/clothing/head/playbunnyears/warden + name = "warden's bunny ears" + desc = "Red and white bunny ears attached to a headband. Keeps the hair out of the face when checking on cameras." + icon_state = "warden" + clothing_flags = SNUG_FIT + armor_type = /datum/armor/head_helmet + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/brig_phys + name = "brig physician's bunny ears" + desc = "A pair of red and grey bunny ears attatched to a headband. Whoever's wearing these is surely a professional... right?" + icon_state = "brig_phys" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/detective + name = "detective's bunny ears" + desc = "Brown bunny ears attached to a headband. Big ears for listening to calls from hysteric dames." + icon_state = "detective" + armor_type = /datum/armor/fedora_det_hat + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + + +/obj/item/clothing/head/playbunnyears/detective/noir + name = "noir detective's bunny ears" + desc = "Black bunny ears attached to a white headband. Big ears for listening to calls from hysteric dames. In glorious black and white!" + icon_state = "detective_noir" + +/obj/item/clothing/head/playbunnyears/prisoner + name = "prisoner's bunny ears" + desc = "Black and orange bunny ears attached to a headband. This outfit was long ago outlawed under the space geneva convention for being a “cruel and unusual punishment”." + icon_state = "prisoner" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/hos + name = "head of security's bunny ears" + desc = "Red and gold bunny ears attached to a headband. Shows your authority over all bunny officers." + icon_state = "hos" + clothing_flags = SNUG_FIT + armor_type = /datum/armor/hats_hos + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +//SERVICE + +/obj/item/clothing/head/playbunnyears/hop + name = "head of personnel's bunny ears" + desc = "A pair of muted blue bunny ears attached to a headband. The preferred color of bunnycrats everywhere." + icon_state = "hop" + armor_type = /datum/armor/hats_hopcap + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/janitor + name = "janitor's bunny ears" + desc = "A pair of purple bunny ears attached to a headband. Kept meticulously clean." + icon_state = "janitor" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/bartender + name = "bartender's bunny ears" + desc = "A pair of classy black and white bunny ears attached to a headband. They smell faintly of alchohol." + icon_state = "bar" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + custom_price = PAYCHECK_CREW + +/obj/item/clothing/head/playbunnyears/cook + name = "cook's bunny ears" + desc = "A pair of white and red bunny ears attached to a headband. Helps keep hair out of the food." + icon_state = "chef" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/botanist + name = "botanist's bunny ears" + desc = "A pair of green and blue bunny ears attached to a headband. Good for keeping the sweat out of your eyes during long days on the farm." + icon_state = "botany" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/clown + name = "clown's bunny ears" + desc = "A pair of orange and pink bunny ears. They even squeak." + icon_state = "clown" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/mime + name = "mime's bunny ears" + desc = "Red and black bunny ears attached to a headband. Great for street performers sick of the standard beret." + icon_state = "mime" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/chaplain + name = "chaplain's bunny ears" + desc = "A pair of black and white bunny ears attached to a headband. Worn in worship of The Gardener of Carota." + icon_state = "chaplain" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/curator_red + name = "curator's red bunny ears" + desc = "A pair of red and beige bunny ears attached to a headband. Marks you as an expert in all things bunny related." + icon_state = "curator_red" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/curator_green + name = "curator's green bunny ears" + desc = "A pair of green and black bunny ears attached to a headband. Marks you as an expert in all things bunny related." + icon_state = "curator_green" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/curator_teal + name = "curator's teal bunny ears" + desc = "A pair of teal bunny ears attached to a headband. Marks you as an expert in all things bunny related." + icon_state = "curator_teal" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/lawyer_black + name = "lawyer's black bunny ears" + desc = "A pair of black bunny ears attached to a headband. The perfect headband to wear while negotiating a settlement." + icon_state = "lawyer_black" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/lawyer_blue + name = "lawyer's blue bunny ears" + desc = "A pair of blue and white bunny ears attached to a headband. The perfect headband to wear while negotiating a settlement." + icon_state = "lawyer_blue" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/lawyer_red + name = "lawyer's red bunny ears" + desc = "A pair of red and white bunny ears attached to a headband. The perfect headband to wear while negotiating a settlement." + icon_state = "lawyer_red" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/lawyer_good + name = "good lawyer's bunny ears" + desc = "A pair of beige and blue bunny ears attached to a headband. The perfect headband to wear while negotiating a settlement." + icon_state = "lawyer_good" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/psychologist + name = "psychologist's bunny ears" + desc = "A pair of black bunny ears. And how do they make you feel?" + icon_state = "psychologist" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +//BUNNY STUFF END, SPRITES BY DimWhat OF MONKE STATION + diff --git a/modular_zubbers/code/modules/clothing/neck/cloaks.dm b/modular_zubbers/code/modules/clothing/neck/cloaks.dm new file mode 100644 index 0000000000000..e5679234e1978 --- /dev/null +++ b/modular_zubbers/code/modules/clothing/neck/cloaks.dm @@ -0,0 +1,6 @@ +/obj/item/clothing/neck/binary + name = "crow feather cloak" + desc = "It's a sad piece of clothing where one finds many graves." + icon = 'modular_zubbers/icons/obj/clothing/neck/neck.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/neck/neck.dmi' + icon_state = "binarycloak" diff --git a/modular_zubbers/code/modules/clothing/neck/collars.dm b/modular_zubbers/code/modules/clothing/neck/collars.dm index edc4614407d94..bba571915b586 100644 --- a/modular_zubbers/code/modules/clothing/neck/collars.dm +++ b/modular_zubbers/code/modules/clothing/neck/collars.dm @@ -9,3 +9,71 @@ /obj/item/clothing/neck/human_petcollar/locked/ringbell/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('modular_zubbers/sound/misc/collarbell1.ogg'=1,'modular_zubbers/sound/misc/collarbell2.ogg'=1), 50, 100, 8) + +/obj/item/clothing/neck/kink_collar/locked/gps + name = "tracking collar" + desc = "A collar that lets you find your pet anywhere with GPS!" + var/datum/component/gps/gps + icon_state = "gps" + greyscale_config = /datum/greyscale_config/collar/gps + greyscale_config_worn = /datum/greyscale_config/collar/gps/worn + greyscale_config_inhand_left = /datum/greyscale_config/collar/gps/lefthand + greyscale_config_inhand_right = /datum/greyscale_config/collar/gps/righthand + greyscale_colors = "#8B96B7#505665" + flags_1 = IS_PLAYER_COLORABLE_1 + unique_reskin = null + resistance_flags = FIRE_PROOF + +/obj/item/clothing/neck/kink_collar/locked/gps/Initialize(mapload) + . = ..() + atom_storage.click_alt_open = FALSE + gps = AddComponent(/datum/component/gps, name) + register_context() + update_icon(UPDATE_OVERLAYS) + RegisterSignal(src, COMSIG_NAME_CHANGED, PROC_REF(on_update_name)) + +/obj/item/clothing/neck/kink_collar/locked/gps/proc/on_update_name() + SIGNAL_HANDLER + gps.gpstag = name + +/obj/item/clothing/neck/kink_collar/locked/gps/attack_self(mob/user) + . = ..() + gps.gpstag = tagname + +/obj/item/clothing/neck/kink_collar/locked/gps/examine(mob/user) + . = ..() + . += span_notice("Alt-click to [gps.tracking ? "disable":"enable"] tracking.") + +///Calls toggletracking +/obj/item/clothing/neck/kink_collar/locked/gps/click_alt(mob/user) + if(locked) + balloon_alert(user, "it's locked!") + playsound(src, 'sound/items/click.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + else + toggletracking(user) + balloon_alert(user, "tracking [gps.tracking ? "enabled":"disabled"]") + playsound(src, 'sound/machines/click.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + return CLICK_ACTION_SUCCESS + +/obj/item/clothing/neck/kink_collar/locked/gps/proc/toggletracking(mob/user) + gps.tracking = !gps.tracking + update_icon(UPDATE_OVERLAYS) + user.update_worn_neck() + +/obj/item/clothing/neck/kink_collar/locked/gps/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + if(!locked) + context[SCREENTIP_CONTEXT_ALT_LMB] = "[gps.tracking ? "Disable":"Enable"] tracking" + return CONTEXTUAL_SCREENTIP_SET + +/obj/item/clothing/neck/kink_collar/locked/gps/update_overlays() + . = ..() + if(gps.tracking) + . += mutable_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "light") + . += emissive_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "light", src, alpha = src.alpha) + +/obj/item/clothing/neck/kink_collar/locked/gps/worn_overlays(mutable_appearance/standing, isinhands = FALSE) + . = ..() + if(gps.tracking && !isinhands) + . += mutable_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "collar_mob_tracker_light") + . += emissive_appearance('modular_zubbers/code/modules/GAGS/icons/collar.dmi', "collar_mob_tracker_light", src, alpha = src.alpha) diff --git a/modular_zubbers/code/modules/clothing/neck/neck.dm b/modular_zubbers/code/modules/clothing/neck/neck.dm new file mode 100644 index 0000000000000..e0bbb6c74dcc0 --- /dev/null +++ b/modular_zubbers/code/modules/clothing/neck/neck.dm @@ -0,0 +1,552 @@ +//Override thing from Monkey. Lets us tie bowties. + +/obj/item/clothing/neck/tie + var/tie_type = "tie_greyscale" + +/obj/item/clothing/neck/tie/update_icon() + . = ..() + // Normal strip & equip delay, along with 2 second self equip since you need to squeeze your head through the hole. + if(is_tied) + icon_state = "[tie_type]_tied" + strip_delay = 4 SECONDS + equip_delay_other = 4 SECONDS + equip_delay_self = 2 SECONDS + else // Extremely quick strip delay, it's practically a ribbon draped around your neck + icon_state = "[tie_type]_untied" + strip_delay = 1 SECONDS + equip_delay_other = 1 SECONDS + equip_delay_self = 0 + +//ALL BUNNY STUFF BY DimWhat OF MONKEESTATION + +/obj/item/clothing/neck/tie/bunnytie + name = "bowtie collar" + desc = "A fancy tie that includes a collar. Looking snazzy!" + icon = 'modular_zubbers/icons/obj/clothing/neck/neck.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/neck/neck.dmi' + icon_state = "bowtie_collar_tied" + tie_type = "bowtie_collar" + greyscale_colors = "#ffffff#39393f" + greyscale_config = /datum/greyscale_config/bowtie_collar + greyscale_config_worn = /datum/greyscale_config/bowtie_collar_worn + flags_1 = IS_PLAYER_COLORABLE_1 + alternate_worn_layer = UNDER_SUIT_LAYER + +/obj/item/clothing/neck/tie/bunnytie/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/syndicate + name = "blood-red bowtie collar" + desc = "A fancy tie that includes a red collar. Looking sinister..." + icon_state = "bowtie_collar_syndi_tied" + tie_type = "bowtie_collar_syndi" + armor_type = /datum/armor/large_scarf_syndie + tie_timer = 2 SECONDS //Tactical tie + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/neck/tie/bunnytie/syndicate/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/magician + name = "magician's bowtie collar" + desc = "A fancy gold tie that includes a collar. Looking magical!" + icon_state = "bowtie_collar_wiz_tied" + tie_type = "bowtie_collar_wiz" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + custom_price = null + +/obj/item/clothing/neck/tie/bunnytie/magician/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/centcom + name = "centcom bowtie collar" + desc = "A fancy gold tie that includes a collar. Looking in charge!" + icon_state = "bowtie_collar_centcom_tied" + tie_type = "bowtie_collar_centcom" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/neck/tie/bunnytie/centcom/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/communist + name = "really red bowtie collar" + desc = "A simple red tie that includes a collar. Looking egalitarian!" + icon_state = "bowtie_collar_communist_tied" + tie_type = "bowtie_collar_communist" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/neck/tie/bunnytie/communist/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/blue + name = "blue bowtie collar" + desc = "A simple blue tie that includes a collar. Looking imperialist!" + icon_state = "bowtie_collar_blue_tied" + tie_type = "bowtie_collar_blue" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/neck/tie/bunnytie/blue/tied + is_tied = TRUE + +//CAPTAIN + +/obj/item/clothing/neck/tie/bunnytie/captain + name = "captain's bowtie" + desc = "A blue tie that includes a collar. Looking commanding!" + icon_state = "bowtie_collar_captain_tied" + tie_type = "bowtie_collar_captain" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/captain/tied + is_tied = TRUE + +//CARGO + +/obj/item/clothing/neck/tie/bunnytie/cargo + name = "cargo bowtie" + desc = "A brown tie that includes a collar. Looking unionized!" + icon_state = "bowtie_collar_cargo_tied" + tie_type = "bowtie_collar_cargo" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/cargo/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/miner + name = "shaft miner's bowtie" + desc = "A purple tie that includes a collar. Looking hardy!" + icon_state = "bowtie_collar_explorer_tied" + tie_type = "bowtie_collar_explorer" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/miner/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/mailman + name = "mailman's bowtie" + desc = "A red tie that includes a collar. Looking unstoppable!" + icon_state = "bowtie_collar_mail_tied" + tie_type = "bowtie_collar_mail" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/mail/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/bitrunner + name = "bitrunner's bowtie" + desc = "Bitrunners were told that wearing a novelty shirt with a printed bow tie wasn't enough for formal events." + icon_state = "bowtie_collar_bitrunner_tied" + tie_type = "bowtie_collar_bitrunner" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/bitrunner/tied + is_tied = TRUE + +//ENGI + +/obj/item/clothing/neck/tie/bunnytie/engineer + name = "engineering bowtie" + desc = "An orange tie that includes a collar. Looking industrious!" + icon_state = "bowtie_collar_engi_tied" + tie_type = "bowtie_collar_engi" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/engineer/tied + is_tied = TRUE + + +/obj/item/clothing/neck/tie/bunnytie/atmos_tech + name = "atmospheric technician's bowtie" + desc = "A blue tie that includes a collar. Looking inflammable!" + icon_state = "bowtie_collar_atmos_tied" + tie_type = "bowtie_collar_atmos" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/atmos_tech/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/ce + name = "chief engineer's bowtie" + desc = "A green tie that includes a collar. Looking managerial!" + icon_state = "bowtie_collar_ce_tied" + tie_type = "bowtie_collar_ce" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/ce/tied + is_tied = TRUE + +//MEDICAL + +/obj/item/clothing/neck/tie/bunnytie/doctor + name = "medical bowtie" + desc = "A light blue tie that includes a collar. Looking helpful!" + icon_state = "bowtie_collar_doctor_tied" + tie_type = "bowtie_collar_doctor" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/doctor/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/paramedic + name = "paramedic's bowtie" + desc = "A white tie that includes a collar. Looking selfless!" + icon_state = "bowtie_collar_paramedic_tied" + tie_type = "bowtie_collar_paramedic" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/paramedic/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/chemist + name = "chemist's bowtie" + desc = "An orange tie that includes a collar. Looking explosive!" + icon_state = "bowtie_collar_chem_tied" + tie_type = "bowtie_collar_chem" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/chemist/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/pathologist + name = "pathologist's bowtie" + desc = "A green tie that includes a collar. Looking infectious!" + icon_state = "bowtie_collar_virologist_tied" + tie_type = "bowtie_collar_virologist" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/pathologist/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/coroner + name = "coroner's bowtie" + desc = "A black tie that includes a collar. Looking dead...Dead good!" + icon_state = "bowtie_collar_virologist_tied" + tie_type = "bowtie_collar_virologist" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/coroner/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/cmo + name = "chief medical officer's bowtie" + desc = "A blue tie that includes a collar. Looking responsible!" + icon_state = "bowtie_collar_cmo_tied" + tie_type = "bowtie_collar_cmo" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/cmo/tied + is_tied = TRUE + +//SCIENCE + +/obj/item/clothing/neck/tie/bunnytie/scientist + name = "scientist's bowtie" + desc = "A purple tie that includes a collar. Looking intelligent!" + icon_state = "bowtie_collar_science_tied" + tie_type = "bowtie_collar_science" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/scientist/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/roboticist + name = "roboticist's bowtie" + desc = "A red tie that includes a collar. Looking transhumanist!" + icon_state = "bowtie_collar_roboticist_tied" + tie_type = "bowtie_collar_roboticist" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/roboticist/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/geneticist + name = "geneticist's bowtie" + desc = "A blue tie that includes a collar. Looking aberrant!" + icon_state = "bowtie_collar_genetics_tied" + tie_type = "bowtie_collar_genetics" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/geneticist/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/rd + name = "research director's bowtie" + desc = "A purple tie that includes a collar. Looking inventive!" + icon_state = "bowtie_collar_science_tied" + tie_type = "bowtie_collar_science" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/scientist/tied + is_tied = TRUE + +//SECURITY + +/obj/item/clothing/neck/tie/bunnytie/security + name = "security bowtie" + desc = "A red tie that includes a collar. Looking tough!" + icon_state = "bowtie_collar_sec_tied" + tie_type = "bowtie_collar_sec" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/security/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/security_assistant + name = "security assistant's bowtie" + desc = "A grey tie that includes a collar. Looking \"helpful\"." + icon_state = "bowtie_collar_sec_assistant_tied" + tie_type = "bowtie_collar_sec_assistant" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/security_assistant/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/brig_phys + name = "brig physician's bowtie" + desc = "A red tie that includes a collar. Looking underappreciated!" + icon_state = "bowtie_collar_brig_phys_tied" + tie_type = "bowtie_collar_brig_phys" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/brig_phys/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/detective + name = "detective's tie collar" + desc = "A brown tie that includes a collar. Looking inquisitive!" + icon_state = "tie_collar_det_tied" + tie_type = "tie_collar_det" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/detective/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/prisoner + name = "prisoner's bowtie" + desc = "A black tie that includes a collar. Looking criminal!" + icon_state = "bowtie_collar_prisoner_tied" + tie_type = "bowtie_collar_prisoner" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/prisoner/tied + is_tied = TRUE + +//SERVICE + +/obj/item/clothing/neck/tie/bunnytie/hop + name = "head of personnel's bowtie" + desc = "A dull red tie that includes a collar. Looking bogged down." + icon_state = "bowtie_collar_hop_tied" + tie_type = "bowtie_collar_hop" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/hop/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/janitor + name = "janitor's bowtie" + desc = "A purple tie that includes a collar. Looking tidy!" + icon_state = "bowtie_collar_janitor_tied" + tie_type = "bowtie_collar_janitor" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/janitor/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/bartender + name = "bartender's bowtie" + desc = "A black tie that includes a collar. Looking fancy!" + flags_1 = null + custom_price = PAYCHECK_CREW + +/obj/item/clothing/neck/tie/bunnytie/bartender/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/cook + name = "cook's bowtie" + desc = "A red tie that includes a collar. Looking culinary!" + icon_state = "bowtie_collar_chef_tied" + tie_type = "bowtie_collar_chef" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/cook/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/botanist + name = "botanist's bowtie" + desc = "A blue tie that includes a collar. Looking green-thumbed!" + icon_state = "bowtie_collar_botany_tied" + tie_type = "bowtie_collar_botany" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/botanist/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/clown + name = "clown's bowtie" + desc = "An outrageously large blue bowtie. Looking funny!" + icon = 'modular_zubbers/icons/obj/clothing/neck/neck.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/neck/neck.dmi' + icon_state = "bowtie_clown_tied" + tie_type = "bowtie_clown" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + tie_timer = 8 SECONDS //It's a BIG bowtie + +/obj/item/clothing/neck/tie/clown/tied + is_tied = TRUE + +/obj/item/clothing/neck/bunny_pendant + name = "bunny pendant" + desc = "A golden pendant depicting a holy rabbit." + icon_state = "chaplain_pendant" + icon = 'modular_zubbers/icons/obj/clothing/neck/neck.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/neck/neck.dmi' + +/obj/item/clothing/neck/tie/bunnytie/lawyer_black + name = "lawyer's black tie collar" + desc = "A black tie that includes a collar. Looking legal!" + icon_state = "tie_collar_lawyer_black_tied" + tie_type = "tie_collar_lawyer_black" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/lawyer_black/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/lawyer_blue + name = "lawyer's blue tie collar" + desc = "A blue tie that includes a collar. Looking defensive!" + icon_state = "tie_collar_lawyer_blue_tied" + tie_type = "tie_collar_lawyer_blue" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/lawyer_blue/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/lawyer_red + name = "lawyer's red tie collar" + desc = "A red tie that includes a collar. Looking prosecutive!" + icon_state = "tie_collar_lawyer_red_tied" + tie_type = "tie_collar_lawyer_red" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/lawyer_red/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/lawyer_good + name = "good lawyer's tie collar" + desc = "A black tie that includes a collar. Looking technically legal!" + icon_state = "tie_collar_lawyer_good_tied" + tie_type = "tie_collar_lawyer_good" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + flags_1 = null + +/obj/item/clothing/neck/tie/bunnytie/lawyer_good/tied + is_tied = TRUE + +//BUNNY STUFF END, SPRITES BY DimWhat OF MONKE STATION + diff --git a/modular_zubbers/code/modules/clothing/outfits/bunny.dm b/modular_zubbers/code/modules/clothing/outfits/bunny.dm new file mode 100644 index 0000000000000..f93385658268e --- /dev/null +++ b/modular_zubbers/code/modules/clothing/outfits/bunny.dm @@ -0,0 +1,101 @@ +/datum/outfit/bunny_waiter + name = "Bunny Waiter" + uniform = /obj/item/clothing/under/costume/playbunny + back = /obj/item/storage/backpack/satchel + box = /obj/item/storage/box/survival + suit = /obj/item/clothing/suit/jacket/tailcoat + gloves = /obj/item/clothing/gloves/color/white + shoes = /obj/item/clothing/shoes/high_heels + head = /obj/item/clothing/head/playbunnyears + neck = /obj/item/clothing/neck/tie/bunnytie/tied + ears = /obj/item/radio/headset/headset_srv + id = /obj/item/card/id/advanced + id_trim = /datum/id_trim/job/bartender + r_pocket = /obj/item/reagent_containers/cup/rag + l_pocket = /obj/item/toy/cards/deck + l_hand = /obj/item/storage/bag/tray + undershirt = "Nude" + +/datum/outfit/bunny_waiter/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + if(visualsOnly) + return + + var/obj/item/card/id/W = H.wear_id + W.registered_name = H.real_name + W.update_label() + W.update_icon() + return ..() + +/datum/outfit/bunny_waiter/syndicate + name = "Syndicate Bunny Assassin" + uniform = /obj/item/clothing/under/syndicate/syndibunny + suit = /obj/item/clothing/suit/jacket/tailcoat/syndicate + shoes = /obj/item/clothing/shoes/fancy_heels/syndi + neck = /obj/item/clothing/neck/tie/bunnytie/syndicate/tied + ears = /obj/item/radio/headset/syndicate + id = /obj/item/card/id/advanced/chameleon + suit_store = /obj/item/gun/ballistic/automatic/pistol/suppressed + l_pocket = /obj/item/toy/cards/deck/syndicate + +/datum/outfit/bunny_waiter/british_waiter + name = "Bunny Waiter (British)" + uniform = /obj/item/clothing/under/costume/playbunny/british + suit = /obj/item/clothing/suit/jacket/tailcoat/british + shoes = /obj/item/clothing/shoes/fancy_heels/blue + head = /obj/item/clothing/head/playbunnyears/british + neck = /obj/item/clothing/neck/tie/bunnytie/blue + +/datum/outfit/bunny_waiter/communist_waiter + name = "Bunny Waiter (Communist)" + uniform = /obj/item/clothing/under/costume/playbunny/communist + suit = /obj/item/clothing/suit/jacket/tailcoat/communist + shoes = /obj/item/clothing/shoes/fancy_heels/red + head = /obj/item/clothing/head/playbunnyears/communist + neck = /obj/item/clothing/neck/tie/bunnytie/communist + +/datum/outfit/bunny_waiter/usa_waiter + name = "Bunny Waiter (USA)" + uniform = /obj/item/clothing/under/costume/playbunny/usa + suit = /obj/item/clothing/suit/jacket/tailcoat/usa + shoes = /obj/item/clothing/shoes/fancy_heels/red + head = /obj/item/clothing/head/playbunnyears/usa + neck = /obj/item/clothing/neck/tie/bunnytie/blue + +/datum/outfit/wizard/bunny_magician + name = "Bunny Magician" + uniform = /obj/item/clothing/under/costume/playbunny/magician + suit = /obj/item/clothing/suit/wizrobe/magician + back = /obj/item/storage/backpack/satchel/leather + head = /obj/item/clothing/head/playbunnyears + shoes = /obj/item/clothing/shoes/fancy_heels/wizard + neck = /obj/item/clothing/neck/tie/bunnytie/magician/tied + l_hand = /obj/item/gun/magic/wand/nothing + l_pocket = /obj/item/toy/cards/deck/tarot + undershirt = "Nude" + +/datum/outfit/centcom/centcom_bunny + name = "Bunny Waiter (CentCom)" + uniform = /obj/item/clothing/under/costume/playbunny/centcom + back = /obj/item/storage/backpack/satchel/leather + box = /obj/item/storage/box/survival + suit = /obj/item/clothing/suit/jacket/tailcoat/centcom + gloves = /obj/item/clothing/gloves/color/white + shoes = /obj/item/clothing/shoes/fancy_heels/cc + head = /obj/item/clothing/head/playbunnyears/centcom + neck = /obj/item/clothing/neck/tie/bunnytie/centcom/tied + ears = /obj/item/radio/headset/headset_cent + id = /obj/item/card/id/advanced/centcom + r_pocket = /obj/item/reagent_containers/cup/rag + l_pocket = /obj/item/toy/cards/deck + l_hand = /obj/item/storage/bag/tray + undershirt = "Nude" + +/datum/outfit/centcom/centcom_bunny/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + if(visualsOnly) + return + + var/obj/item/card/id/W = H.wear_id + W.registered_name = H.real_name + W.update_label() + W.update_icon() + return ..() diff --git a/modular_zubbers/code/modules/clothing/shoes/boots.dm b/modular_zubbers/code/modules/clothing/shoes/boots.dm index 9d98933113d66..9993a419ad4c5 100644 --- a/modular_zubbers/code/modules/clothing/shoes/boots.dm +++ b/modular_zubbers/code/modules/clothing/shoes/boots.dm @@ -5,3 +5,186 @@ desc = "An old pair of boots used by a now-defunct mining coalition, it seems close to the ones used by Nanotrasen miners, but without the compartments for fitting small items." icon_state = "diver" worn_icon_state = "diver" + +/obj/item/clothing/shoes/fancy_heels/cc + name = "nanotrasen heels" + desc = "Surely these aren't official. Right?" + greyscale_colors = "#316E4A" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/syndi + name = "syndiheels" + desc = "Heel in more way than one." + greyscale_colors = "#18191E" + armor_type = /datum/armor/shoes_combat + lace_time = 12 SECONDS + hitsound = 'sound/weapons/bladeslice.ogg' + strip_delay = 2 SECONDS + force = 10 + throwforce = 15 + sharpness = SHARP_POINTY + attack_verb_continuous = list("attacks", "slices", "slashes", "cuts", "stabs") + attack_verb_simple = list("attack", "slice", "slash", "cut", "stab") + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/wizard + name = "magical heels" + desc = "A pair of heels that seem to magically solve all the problems with walking in heels." + strip_delay = 2 SECONDS + resistance_flags = FIRE_PROOF | ACID_PROOF + greyscale_colors = "#291A69" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/red + name = "red heels" + desc = "A pair of classy red heels." + greyscale_colors = "#921C25" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/blue + name = "blue heels" + greyscale_colors = "#41579a" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/lightgrey + name = "light grey heels" + greyscale_colors = "#d0d7da" + flags_1 = null + +//HEELED STUFF (NOT THE FANCY HEELS) SPRITES BY DimWhat OF MONKE STATION + +/obj/item/clothing/shoes/workboots/mining/heeled + name = "heeled mining boots" + desc = "Steel-toed mining heels for mining in hazardous environments. This was an awful idea." + icon_state = "explorer_heeled" + icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi' + species_exception = null + +/obj/item/clothing/shoes/fancy_heels/navyblue + name = "navy blue heels" + greyscale_colors = "#362f68" + flags_1 = null + +/obj/item/clothing/shoes/workboots/heeled + name = "heeled work boots" + desc = "Nanotrasen-issue Engineering lace-up work heels that seem almost especially designed to cause a workplace accident." + icon_state = "workboots_heeled" + icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi' + species_exception = null + +//MEDICAL + +/obj/item/clothing/shoes/fancy_heels/white + name = "white heels" + greyscale_colors = "#ffffff" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/darkblue + name = "dark blue heels" + greyscale_colors = "#364660" + flags_1 = null + +//SCIENCE + +/obj/item/clothing/shoes/fancy_heels/black + name = "black heels" + greyscale_colors = "#39393f" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/purple + greyscale_colors = "#7e1980" + flags_1 = null + +//SECURITY + +/obj/item/clothing/shoes/fancy_heels/red + name = "red heels" + greyscale_colors = "#a52f29" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/grey + name = "grey heels" + greyscale_colors = "#918f8c" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/brown + name = "brown heels" + greyscale_colors = "#784f44" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/orange + name = "orange heels" + greyscale_colors = "#ff8d1e" + flags_1 = null + +//HEELED STUFF (NOT THE FANCY HEELS) SPRITES BY DimWhat OF MONKE STATION + +/obj/item/clothing/shoes/jackboots/gogo_boots + name = "tactical go-go boots" + desc = "Highly tactical footwear designed to give you a better view of the battlefield." + icon_state = "hos_boots" + icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi' + +//SERVICE + +/obj/item/clothing/shoes/fancy_heels/lightblue + name = "light blue heels" + greyscale_colors = "#3e6588" + flags_1 = null + +//HEELED STUFF (NOT THE FANCY HEELS) SPRITES BY DimWhat OF MONKE STATION + +/obj/item/clothing/shoes/galoshes/heeled + name = "heeled galoshes" + desc = "A pair of yellow rubber heels, designed to prevent slipping on wet surfaces. These are even harder to walk in than normal heels." + icon_state ="galoshes_heeled" + icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi' + custom_premium_price = PAYCHECK_CREW * 3 + +/obj/item/clothing/shoes/fancy_heels/green + name = "green heels" + greyscale_colors = "#50d967" + flags_1 = null + +//HEELED STUFF (NOT THE FANCY HEELS) SPRITES BY DimWhat OF MONKE STATION + +/obj/item/clothing/shoes/clown_shoes/heeled + name = "honk heels" + desc = "A pair of high heeled clown shoes. What kind of maniac would design these?" + icon_state ="honk_heels" + icon = 'modular_zubbers/icons/obj/clothing/feet/feet.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/feet/feet.dmi' + +/obj/item/clothing/shoes/fancy_heels/darkgreen + name = "dark green heels" + greyscale_colors = "#47853a" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/teal + name = "teal heels" + greyscale_colors = "#5cbfaa" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/mutedblack + name = "muted black heels" + greyscale_colors = "#2f3038" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/mutedblue + name = "muted blue heels" + greyscale_colors = "#1165c5" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/beige + name = "beige heels" + greyscale_colors = "#a69e9a" + flags_1 = null + +/obj/item/clothing/shoes/fancy_heels/darkgrey + name = "dark grey heels" + greyscale_colors = "#46464d" + flags_1 = null diff --git a/modular_zubbers/code/modules/clothing/suits/jacket.dm b/modular_zubbers/code/modules/clothing/suits/jacket.dm index 8bd46b11310b5..f06880f41f99f 100644 --- a/modular_zubbers/code/modules/clothing/suits/jacket.dm +++ b/modular_zubbers/code/modules/clothing/suits/jacket.dm @@ -63,3 +63,530 @@ worn_icon = 'modular_zubbers/icons/donator/skyymed_worn.dmi' armor_type = /datum/armor/toggle_labcoat toggle_noun = "zipper" + +//ALL BUNNY STUFF BY DimWhat OF MONKEESTATION + +/obj/item/clothing/suit/jacket/tailcoat //parent type + name = "tailcoat" + desc = "A coat usually worn by bunny themed waiters and the like." + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + icon_state = "tailcoat" + greyscale_colors = "#39393f" + greyscale_config = /datum/greyscale_config/tailcoat + greyscale_config_worn = /datum/greyscale_config/tailcoat_worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/suit/jacket/tailcoat/bartender + name = "bartender's tailcoat" + desc = "A coat usually worn by bunny themed bartenders. It has an interior holster for firearms and some extra padding for minor protection." + icon_state = "tailcoat_bar" + greyscale_colors = "#39393f#ffffff" + greyscale_config = /datum/greyscale_config/tailcoat_bar + greyscale_config_worn = /datum/greyscale_config/tailcoat_bar_worn + armor_type = /datum/armor/suit_armor + + +/obj/item/clothing/suit/jacket/tailcoat/bartender/Initialize(mapload) //so bartenders can use cram their shotgun inside + . = ..() + allowed += list( + /obj/item/ammo_box, + /obj/item/ammo_casing, + /obj/item/gun/ballistic, + /obj/item/gun/energy, + ) + +/obj/item/clothing/suit/jacket/tailcoat/syndicate + name = "suspicious tailcoat" + desc = "A oddly intimidating coat usually worn by bunny themed assassins. It's reinforced with some extremely flexible lightweight alloy. How much did they pay for this?" + icon_state = "tailcoat_syndi" + armor_type = /datum/armor/wintercoat_syndicate + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + + +/obj/item/clothing/suit/jacket/tailcoat/syndicate/Initialize(mapload) + . = ..() + allowed += list( + /obj/item/ammo_box, + /obj/item/ammo_casing, + /obj/item/gun/ballistic, + /obj/item/gun/energy, + /obj/item/restraints/handcuffs, + /obj/item/knife/combat, + /obj/item/melee/baton, + ) + +/obj/item/clothing/suit/jacket/tailcoat/syndicate/fake + armor_type = /datum/armor/none + +/obj/item/clothing/suit/wizrobe/magician //Not really a robe but it's MAGIC + name = "magician's tailcoat" + desc = "A magnificent, gold-lined tailcoat that seems to radiate power." + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi' + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + icon_state = "tailcoat_wiz" + inhand_icon_state = null + flags_inv = null + +/obj/item/clothing/suit/jacket/tailcoat/centcom + name = "Centcom tailcoat" + desc = "An official coat usually worn by bunny themed executives. The inside is lined with comfortable yet tasteful bunny fluff." + icon_state = "tailcoat_centcom" + armor_type = /datum/armor/armor_centcom_formal_nt_consultant + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + + +/obj/item/clothing/suit/jacket/tailcoat/british + name = "british flag tailcoat" + desc = "A tailcoat emblazoned with the Union Jack. Perfect attire for teatime." + icon_state = "tailcoat_brit" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + + +/obj/item/clothing/suit/jacket/tailcoat/communist + name = "really red tailcoat" + desc = "A red tailcoat emblazoned with a golden star. The official uniform of the Bunny Waiter Union." + icon_state = "tailcoat_communist" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/usa + name = "stars tailcoat" + desc = "A vintage coat worn by the 5th bunny battalion during the Revolutionary War. Smooth-bore musket not included." + icon_state = "tailcoat_stars" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/plasmaman + name = "purple tailcoat" + desc = "A purple coat that looks to be the same purple used in several plasmaman evirosuits." + icon_state = "tailcoat_plasma" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +//CAPTAIN + +/obj/item/clothing/suit/armor/vest/capcarapace/tailcoat_captain + name = "captain's tailcoat" + desc = "A nautical coat usually worn by bunny themed captains. It’s reinforced with genetically modified armored blue rabbit fluff." + icon_state = "captain" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + body_parts_covered = CHEST|GROIN|ARMS + cold_protection = CHEST|GROIN|ARMS + dog_fashion = null + +//CARGO + +/obj/item/clothing/suit/jacket/tailcoat/quartermaster + name = "quartermaster's tailcoat" + desc = "A fancy brown coat worn by bunny themed quartermasters. The gold accents show everyone who's in charge." + icon_state = "qm" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/cargo + name = "cargo tailcoat" + desc = "A simple brown coat worn by bunny themed cargo technicians. Significantly less stripy than the quartermasters." + icon_state = "cargo_tech" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/miner + name = "explorer tailcoat" + desc = "An adapted explorer suit worn by bunny themed shaft miners. It has attachment points for goliath plates but comparatively little armor." + icon_state = "explorer" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + cold_protection = CHEST|GROIN|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + heat_protection = CHEST|GROIN|ARMS + max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT + armor_type = /datum/armor/hooded_explorer + allowed = list( + /obj/item/flashlight, + /obj/item/gun/energy/recharge/kinetic_accelerator, + /obj/item/mining_scanner, + /obj/item/pickaxe, + /obj/item/resonator, + /obj/item/storage/bag/ore, + /obj/item/t_scanner/adv_mining_scanner, + /obj/item/tank/internals, + ) + resistance_flags = FIRE_PROOF + clothing_traits = list(TRAIT_SNOWSTORM_IMMUNE) + +/obj/item/clothing/suit/jacket/tailcoat/miner/Initialize(mapload) + . = ..() + AddComponent(/datum/component/armor_plate) + + +/obj/item/clothing/suit/jacket/tailcoat/bitrunner + name = "bitrunner tailcoat" + desc = "A black and gold coat worn by bunny themed cargo technicians. Open your Space Colas and let's fuckin' game!" + icon_state = "bitrunner" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +//ENGI + +/obj/item/clothing/suit/jacket/tailcoat/engineer + name = "engineering tailcoat" + desc = "A high visibility tailcoat worn by bunny themed engineers. Great for working in low-light conditions." + icon_state = "engi" + greyscale_config = null + greyscale_config_worn = null + + greyscale_colors = null + allowed = list( + /obj/item/fireaxe/metal_h2_axe, + /obj/item/flashlight, + /obj/item/radio, + /obj/item/storage/bag/construction, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + /obj/item/t_scanner, + /obj/item/gun/ballistic/rifle/boltaction/pipegun/prime, + ) + +/obj/item/clothing/suit/jacket/tailcoat/engineer/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if(!isinhands) + . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) + +/obj/item/clothing/suit/utility/fire/atmos_tech_tailcoat + name = "atmospheric technician's tailcoat" + desc = "A heavy duty fire-tailcoat worn by bunny themed atmospheric technicians. Reinforced with asbestos weave that makes this both stylish and lung-cancer inducing." + icon_state = "atmos" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + w_class = WEIGHT_CLASS_NORMAL + body_parts_covered = CHEST|GROIN|ARMS + slowdown = 0 + armor_type = /datum/armor/atmos_tech_tailcoat + flags_inv = null + clothing_flags = null + min_cold_protection_temperature = null + max_heat_protection_temperature = null + strip_delay = 30 + equip_delay_other = 30 + +/datum/armor/atmos_tech_tailcoat + melee = 10 + bullet = 5 + laser = 10 + energy = 10 + bomb = 20 + bio = 50 + fire = 100 + acid = 50 + +/obj/item/clothing/suit/utility/fire/ce_tailcoat + name = "chief engineer's tailcoat" + desc = "A heavy duty green and white coat worn by bunny themed chief engineers. Made of a three layered composite fabric that is both insulating and fireproof, it also has an open face rendering all this useless." + icon_state = "ce" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + w_class = WEIGHT_CLASS_NORMAL + body_parts_covered = CHEST|GROIN|ARMS + slowdown = 0 + armor_type = /datum/armor/ce_tailcoat + flags_inv = null + clothing_flags = null + min_cold_protection_temperature = null + max_heat_protection_temperature = null + strip_delay = 30 + equip_delay_other = 30 + +/datum/armor/ce_tailcoat + melee = 10 + bullet = 5 + laser = 10 + energy = 10 + bomb = 20 + bio = 50 + fire = 100 + acid = 50 + +//MEDICAL + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat + name = "medical tailcoat" + desc = "A sterile white and blue coat worn by bunny themed doctors. Great for keeping the blood off." + icon_state = "doctor" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/paramedic + name = "paramedic's tailcoat" + desc = "A heavy duty coat worn by bunny themed paramedics. Marked with high visibility lines for emergency operations in the dark." + icon_state = "paramedic" + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/chemist + name = "chemist's tailcoat" + desc = "A sterile white and orange coat worn by bunny themed chemists. The open chest isn't the greatest when working with dangerous substances." + icon_state = "chem" + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/pathologist + name = "pathologist's tailcoat" + desc = "A sterile white and green coat worn by bunny themed pathologists. The more stylish and ineffective alternative to a biosuit." + icon_state = "virologist" + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/coroner + name = "pathologist's tailcoat" + desc = "A sterile black and white coat worn by bunny themed coroners. Adorned with a skull on the back." + icon_state = "coroner" + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/cmo + name = "chief medical officer's tailcoat" + desc = "A sterile blue coat worn by bunny themed chief medical officers. The blue helps both the wearer and bloodstains stand out from other, lower ranked, and cleaner doctors." + icon_state = "cmo" + +//SCIENCE + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science + name = "scientist's tailcoat" + desc = "A smart white coat worn by bunny themed scientists. Decent protection against slimes." + icon_state = "science" + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science/robotics + name = "roboticist's tailcoat" + desc = "A smart white coat with red pauldrons worn by bunny themed roboticists. Looks surprisingly good with oil stains on it." + icon_state = "roboticist" + + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science/genetics + name = "geneticist's tailcoat" + desc = "A smart white and blue coat worn by bunny themed geneticists. Nearly looks like a real doctor's lab coat." + icon_state = "genetics" + +/obj/item/clothing/suit/jacket/research_director/tailcoat + name = "research director's tailcoat" + desc = "A smart purple coat worn by bunny themed head researchers. Created from captured abductor technology, what looks like a coat is actually an advanced hologram emitted from the pauldrons. Feels exactly like the real thing, too." + icon_state = "rd" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + body_parts_covered = CHEST|ARMS|GROIN + +//SECURITY + +/obj/item/clothing/suit/armor/security_tailcoat + name = "security tailcoat" + desc = "A reinforced tailcoat worn by bunny themed security officers. Uses the same lightweight armor as the MK 1 vest, though obviously has lighter protection in the chest area." + icon_state = "sec" + inhand_icon_state = "armor" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + body_parts_covered = CHEST|GROIN|ARMS + cold_protection = CHEST|GROIN|ARMS + dog_fashion = null + armor_type = /datum/armor/suit_armor + +/obj/item/clothing/suit/armor/security_tailcoat/assistant + name = "security assistant's tailcoat" + desc = "A reinforced tailcoat worn by bunny themed security assistants. The duller color scheme denotes a lower rank on the chain of bunny command." + icon_state = "sec_assistant" + +/obj/item/clothing/suit/armor/security_tailcoat/warden + name = "warden's tailcoat" + desc = "A reinforced tailcoat worn by bunny themed wardens. Stylishly holds hidden flak plates." + icon_state = "warden" + +/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/sec + name = "brig physician's tailcoat" + desc = "A mostly sterile red and grey coat worn by bunny themed brig physicians. It lacks the padding of the \"standard\" security tailcoat." + icon_state = "brig_phys" + +/obj/item/clothing/suit/jacket/det_suit/tailcoat + name = "detective's tailcoat" + desc = "A reinforced tailcoat worn by bunny themed detectives. Perfect for a hard boiled no-nonsense type of gal." + icon_state = "detective" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + +/obj/item/clothing/suit/jacket/det_suit/tailcoat/noir + name = "noir detective's tailcoat" + desc = "A reinforced tailcoat worn by noir bunny themed detectives. Perfect for a hard boiled no-nonsense type of gal." + icon_state = "detective_noir" + +/obj/item/clothing/suit/armor/hos_tailcoat + name = "head of security's tailcoat" + desc = "A reinforced tailcoat worn by bunny themed security commanders. Enhanced with a special alloy for some extra protection and style." + icon_state = "hos" + inhand_icon_state = "armor" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + body_parts_covered = CHEST|GROIN|ARMS + cold_protection = CHEST|GROIN|ARMS + dog_fashion = null + armor_type = /datum/armor/armor_hos + strip_delay = 80 +//SERVICE + +/obj/item/clothing/suit/armor/hop_tailcoat + name = "head of personnel's tailcoat" + desc = "A strict looking coat usually worn by bunny themed bureaucrats. The pauldrons are sure to make people finally take you seriously." + icon_state = "hop" + inhand_icon_state = "armor" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + body_parts_covered = CHEST|GROIN|ARMS + cold_protection = CHEST|GROIN|ARMS + dog_fashion = null + +/obj/item/clothing/suit/jacket/tailcoat/janitor + name = "janitor's tailcoat" + desc = "A clean looking coat usually worn by bunny themed janitors. The purple sleeves are a late 24th century style." + icon_state = "janitor" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/cook + name = "cook's tailcoat" + desc = "A professional white coat worn by bunny themed chefs. The red accents pair nicely with the monkey blood that often stains this." + icon_state = "chef" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + allowed = list( + /obj/item/kitchen, + /obj/item/knife/kitchen, + /obj/item/storage/bag/tray, + ) + +/obj/item/clothing/suit/jacket/tailcoat/botanist + name = "botanist's tailcoat" + desc = "A green leather coat worn by bunny themed botanists. Great for keeping the sun off your back." + icon_state = "botany" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + allowed = list( + /obj/item/cultivator, + /obj/item/geneshears, + /obj/item/graft, + /obj/item/hatchet, + /obj/item/plant_analyzer, + /obj/item/reagent_containers/cup/beaker, + /obj/item/reagent_containers/cup/bottle, + /obj/item/reagent_containers/spray/pestspray, + /obj/item/reagent_containers/spray/plantbgone, + /obj/item/secateurs, + /obj/item/seeds, + /obj/item/storage/bag/plants, + ) + +/obj/item/clothing/suit/jacket/tailcoat/clown + name = "clown's tailcoat" + desc = "An orange polkadot coat worn by bunny themed clowns. Shows everyone who the real ringmaster is." + icon_state = "clown" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/mime + name = "mime's tailcoat" + desc = "A stripy sleeved black coat worn by bunny themed mimes. The red accents mimic the suspenders seen in more standard mime outfits." + icon_state = "mime" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/chaplain + name = "chaplain's tailcoat" + desc = "A gilded black coat worn by bunny themed chaplains. Traditional vestments of the lagomorphic cults of Cairead." + icon_state = "chaplain" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + allowed = list( + /obj/item/nullrod, + /obj/item/reagent_containers/cup/glass/bottle/holywater, + /obj/item/storage/fancy/candle_box, + /obj/item/flashlight/flare/candle, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman + ) + +/obj/item/clothing/suit/jacket/tailcoat/curator_red + name = "curator's red tailcoat" + desc = "A red linen coat worn by bunny themed librarians. Keeps the dust off your shoulders during long shifts in the archives." + icon_state = "curator_red" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/curator_green + name = "curator's green tailcoat" + desc = "A green linen coat worn by bunny themed librarians. Keeps the dust off your shoulders during long shifts in the archives." + icon_state = "curator_green" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/curator_teal + name = "curator's teal tailcoat" + desc = "A teal linen coat worn by bunny themed librarians. Keeps the dust off your shoulders during long shifts in the archives." + icon_state = "curator_teal" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/lawyer_black + name = "lawyer's black tailcoat" + desc = "The staple of any bunny themed lawyers. EXTREMELY professional." + icon_state = "lawyer_black" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/lawyer_blue + name = "lawyer's blue tailcoat" + desc = "A blue linen coat worn by bunny themed lawyers. May or may not contain souls of the damned in suit pockets." + icon_state = "lawyer_blue" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/lawyer_red + name = "lawyer's red tailcoat" + desc = "A red linen coat worn by bunny themed lawyers. May or may not contain souls of the damned in suit pockets." + icon_state = "lawyer_red" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/lawyer_good + name = "good lawyer's tailcoat" + desc = "A beige linen coat worn by bunny themed lawyers. May or may not contain souls of the damned in suit pockets." + icon_state = "lawyer_good" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/psychologist + name = "psychologist's tailcoat" + desc = "A black linen coat worn by bunny themed psychologists. A casual open coat for making you seem approachable, maybe too casual." + icon_state = "psychologist" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +//BUNNY STUFF END, SPRITES BY DimWhat OF MONKE STATION diff --git a/modular_zubbers/code/modules/clothing/under/misc.dm b/modular_zubbers/code/modules/clothing/under/misc.dm index 76d0a4b80d0ac..03d8d74a8ab4a 100644 --- a/modular_zubbers/code/modules/clothing/under/misc.dm +++ b/modular_zubbers/code/modules/clothing/under/misc.dm @@ -7,3 +7,737 @@ icon = 'modular_zubbers/icons/obj/clothing/suits.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/suits.dmi' body_parts_covered = CHEST|LEGS|GROIN + +//ALL BUNNY STUFF BY DimWhat OF MONKEESTATION + +/obj/item/clothing/under/costume/playbunny + name = "bunny suit" + desc = "The staple of any bunny themed waiters and the like. It has a little cottonball tail too." + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/costume_digi.dmi' + icon_state = "playbunny" + greyscale_colors = "#39393f#39393f#ffffff#87502e" + greyscale_config = /datum/greyscale_config/bunnysuit + greyscale_config_worn = /datum/greyscale_config/bunnysuit_worn + flags_1 = IS_PLAYER_COLORABLE_1 + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/costume/playbunny/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/syndicate/syndibunny //heh + name = "blood-red bunny suit" + desc = "The staple of any bunny themed syndicate assassins. Are those carbon nanotube stockings?" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + worn_icon_digi = 'modular_zubbers/icons/mob/clothing/under/costume_digi.dmi' + icon_state = "syndibunny" + body_parts_covered = CHEST|GROIN|LEGS + +/obj/item/clothing/under/syndicate/syndibunny/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/small) + +/obj/item/clothing/under/syndicate/syndibunny/fake + armor_type = /datum/armor/clothing_under/none + +/obj/item/clothing/under/costume/playbunny/magician + name = "magician's bunny suit" + desc = "The staple of any bunny themed stage magician." + icon_state = "playbunny_wiz" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/under/costume/playbunny/magician/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny/magician) + +/datum/storage/pockets/tiny/magician/New() //this is probably a good idea + . = ..() + var/static/list/exception_cache = typecacheof(list( + /obj/item/gun/magic/wand, + /obj/item/warp_whistle, + )) + exception_hold = exception_cache + +/obj/item/clothing/under/costume/playbunny/centcom + name = "centcom bunnysuit" + desc = "A modified Centcom version of a bunny outfit, using Lunarian technology to condense countless amounts of rabbits into a material that is extremely comfortable and light to wear." + icon_state = "playbunny_centcom" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/under/costume/playbunny/british + name = "british bunny suit" + desc = "The staple of any bunny themed monarchists. It has a little cottonball tail too." + icon_state = "playbunny_brit" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/under/costume/playbunny/communist + name = "really red bunny suit" + desc = "The staple of any bunny themed communists. It has a little cottonball tail too." + icon_state = "playbunny_communist" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/under/costume/playbunny/usa + name = "striped bunny suit" + desc = "A bunny outfit stitched together from several American flags. It has a little cottonball tail too." + icon_state = "playbunny_usa" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +//CAPTAIN + +/obj/item/clothing/under/rank/captain/bunnysuit + desc = "The staple of any bunny themed captains. Great for securing the disk." + name = "captain's bunnysuit" + icon_state = "bunnysuit_captain" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/captain/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +//CARGO + +/obj/item/clothing/under/rank/cargo/quartermaster_bunnysuit + name = "quartermaster's bunny suit" + desc = "The staple of any bunny themed quartermasters. Complete with gold buttons and a nametag." + icon_state = "bunnysuit_qm" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/cargo/quartermaster_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/cargo/cargo_bunnysuit + name = "cargo bunny suit" + desc = "The staple of any bunny themed cargo technicians. Nigh indistinguishable from the quartermasters bunny suit." + icon_state = "bunnysuit_cargo" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/cargo/cargo_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/cargo/miner/bunnysuit + name = "shaft miner's bunny suit" + desc = "The staple of any bunny themed shaft miners. The perfect outfit for fighting demons on an ash choked hell planet." + icon_state = "bunnysuit_miner" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/cargo/miner/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/cargo/mailman_bunnysuit + name = "mailman's bunny suit" + desc = "The staple of any bunny themed mailmen. A sleek mailman outfit for when you need to deliver mail as quickly and with as little wind resistance possible." + icon_state = "bunnysuit_mail" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/cargo/mailman_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/cargo/bitrunner/bunnysuit + name = "bunrunner suit" + desc = "The staple of any bunny themed gamer. Has enough space for one extra soda, if you're worthy." + icon_state = "bunnysuit_bitrunner" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/cargo/bitrunner/bunnysuit/Initialize(mapload) + . = ..() + +//ENGI + +/obj/item/clothing/under/rank/engineering/engineer_bunnysuit + name = "engineering bunny suit" + desc = "The staple of any bunny themed engineers. Keeps loose clothing to a minimum in a fashionable manner." + icon_state = "bunnysuit_engi" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/engineering/engineer_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/engineering/atmos_tech_bunnysuit + name = "atmospheric technician's bunny suit" + desc = "The staple of any bunny themed atmospheric technicians. Perfect for any blue collar worker wanting to keep up with fashion trends." + icon_state = "bunnysuit_atmos" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/engineering/atmos_tech_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/engineering/chief_engineer/bunnysuit + name = "chief engineer's bunny suit" + desc = "The staple of any bunny themed chief engineers. The airy design helps with keeping cool when engine fires get too hot to handle." + icon_state = "bunnysuit_ce" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/engineering/chief_engineer/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +//MEDICAL + +/obj/item/clothing/under/rank/medical/doctor_bunnysuit + desc = "The staple of any bunny themed doctors. The open design is great for both comfort and surgery." + name = "medical bunnysuit" + icon_state = "bunnysuit_doctor" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/medical/doctor_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/medical/paramedic_bunnysuit + desc = "The staple of any bunny themed paramedics. Comes with spare pockets for medical supplies fastened to the leggings." + name = "paramedic's bunnysuit" + icon_state = "bunnysuit_paramedic" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/medical/paramedic_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/medical/chemist/bunnysuit + desc = "The staple of any bunny themed chemists. The stockings are both airy and acid resistant." + name = "chemist's bunnysuit" + icon_state = "bunnysuit_chem" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/medical/chemist/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/medical/pathologist_bunnysuit + desc = "The staple of any bunny themed pathologists. The stockings, while cute, do nothing to combat pathogens." + name = "pathologist's bunnysuit" + icon_state = "bunnysuit_viro" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/medical/pathologist_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/medical/coroner_bunnysuit + desc = "The staple of any bunny themed coroners. A rejected mime costume." + name = "coroner's bunnysuit" + icon_state = "bunnysuit_coroner" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/medical/coroner_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/medical/cmo_bunnysuit + desc = "The staple of any bunny themed chief medical officers. The more vibrant blue accents denote a higher status." + name = "chief medical officer's bunnysuit" + icon_state = "bunnysuit_cmo" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/medical/cmo_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +//SCIENCE + +/obj/item/clothing/under/rank/rnd/scientist/bunnysuit + desc = "The staple of any bunny themed scientists. Smart bunnies, Hef." + name = "scientist's bunnysuit" + icon_state = "bunnysuit_sci" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/rnd/scientist/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/rnd/scientist/roboticist_bunnysuit + desc = "The staple of any bunny themed roboticists. The open design and thin leggings help to keep cool when piloting mechs." + name = "roboticist's bunnysuit" + icon_state = "bunnysuit_roboticist" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/rnd/scientist/roboticist_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/rnd/geneticist/bunnysuit + desc = "The staple of any bunny themed geneticists. Doesn’t go great with an abominable green muscled physique, but then again, what does?" + name = "geneticist's bunnysuit" + icon_state = "bunnysuit_genetics" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/rnd/geneticist/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/rnd/research_director/bunnysuit + desc = "The staple of any bunny themed head researchers. Advanced technology allows this suit to stimulate spontaneous bunny tail growth when worn, though it's nigh-indistinguishable from the standard cottonball and disappears as soon as the suit is removed." + name = "research director's bunnysuit" + icon_state = "bunnysuit_rd" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + can_adjust = TRUE + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/rnd/research_director/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +//SECURITY + +/obj/item/clothing/under/rank/security/security_bunnysuit + desc = "The staple of any bunny themed security officers. The red coloring helps to hide any blood that may stain this." + name = "security bunnysuit" + icon_state = "bunnysuit_sec" + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/security/security_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/security/security_assistant_bunnysuit + desc = "The staple of any bunny themed security assistants. Can't lost respect you don't have!" + name = "security assistant's bunnysuit" + icon_state = "bunnysuit_sec_assistant" + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/security/security_assistant_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/security/warden_bunnysuit + desc = "The staple of any bunny themed wardens. The more formal security bunny suit for a less combat focused job." + name = "warden's bunnysuit" + icon_state = "bunnysuit_warden" + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/security/warden_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/security/brig_phys_bunnysuit + desc = "The staple of any bunny themed brig physicians. The rejected alternative to an already discontinued alternate uniform, now sold at a premium!" + name = "brig physician's bunnysuit" + icon_state = "bunnysuit_brig_phys" + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/security/brig_phys_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/security/detective_bunnysuit + desc = "The staple of any bunny themed detectives. Capable of storing precious candy corns." + name = "detective's bunnysuit" + icon_state = "bunnysuit_det" + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/security/detective_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/security/detective_bunnysuit/noir + desc = "The staple of any noir bunny themed detectives. Capable of storing precious candy corns." + name = "noir detective's bunnysuit" + icon_state = "bunnysuit_det_noir" + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/security/detective_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/security/prisoner_bunnysuit + desc = "The staple of any bunny themed prisoners. Great for hiding shanks and other small contrabands." + name = "prisoner's bunnysuit" + icon_state = "bunnysuit_prisoner" + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/security/prisoner_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/security/head_of_security/bunnysuit + desc = "The staple of any bunny themed security commanders. Includes kevlar weave stockings and a gilded tail." + name = "Head of Security's bunnysuit" + icon_state = "bunnysuit_hos" + icon = 'modular_zubbers/icons/obj/clothing/under/security.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/security.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/security/head_of_security/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +//SERVICE + +/obj/item/clothing/under/rank/civilian/hop_bunnysuit + name = "head of personnel's bunny suit" + desc = "The staple of any bunny themed bureaucrats. It has a spare “pocket” for holding extra pens and paper." + icon_state = "bunnysuit_hop" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/hop_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/janitor/bunnysuit + name = "janitor's bunny suit" + desc = "The staple of any bunny themed janitors. The stockings are made of cotton to allow for easy laundering." + icon_state = "bunnysuit_janitor" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/janitor/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/bartender_bunnysuit + name = "bartender's bunnysuit" + desc = "The staple of any bunny themed bartenders. Looks even more stylish than the standard bunny suit." + icon_state = "bunnysuit_bar" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + custom_price = PAYCHECK_CREW + +/obj/item/clothing/under/rank/civilian/bartender_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/cook_bunnysuit + name = "cook's bunny suit" + desc = "The staple of any bunny themed chefs. Shame there aren't any fishnets." + icon_state = "bunnysuit_chef" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/cook_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/hydroponics/bunnysuit + name = "botanist's bunny suit" + desc = "The staple of any bunny themed botanists. The stockings are made of faux-denim to mimic the look of overalls." + icon_state = "bunnysuit_botany" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/hydroponics/bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/clown/clown_bunnysuit + name = "clown's bunny suit" + desc = "The staple of any bunny themed clowns. Now this is just ridiculous." + icon_state = "bunnysuit_clown" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/clown/clown_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/mime_bunnysuit + name = "mime's bunny suit" + desc = "The staple of any bunny themed mimes. Includes black and white stockings in order to comply with mime federation outfit regulations." + icon_state = "bunnysuit_mime" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/mime_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/chaplain_bunnysuit + name = "chaplain's bunny suit" + desc = "The staple of any bunny themed chaplains. The wool for the stockings came from a sacrificial lamb, making them extra holy." + icon_state = "bunnysuit_chaplain" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/chaplain_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/curator_bunnysuit_red + name = "curator's red bunny suit" + desc = "The staple of any bunny themed librarians. A professional yet comfortable suit perfect for the aspiring bunny academic." + icon_state = "bunnysuit_curator_red" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/curator_bunnysuit_red/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/curator_bunnysuit_green + name = "curator's green bunny suit" + desc = "The staple of any bunny themed librarians. A professional yet comfortable suit perfect for the aspiring bunny academic." + icon_state = "bunnysuit_curator_green" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/curator_bunnysuit_green/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/curator_bunnysuit_teal + name = "curator's teal bunny suit" + desc = "The staple of any bunny themed librarians. A professional yet comfortable suit perfect for the aspiring bunny academic." + icon_state = "bunnysuit_curator_teal" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/curator_bunnysuit_teal/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_black + name = "lawyer's black bunny suit" + desc = "A black linen coat worn by bunny themed lawyers. May or may not contain souls of the damned in suit pockets." + icon_state = "bunnysuit_law_black" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_black/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_blue + name = "lawyer's blue bunny suit" + desc = "The staple of any bunny themed lawyers. EXTREMELY professional." + icon_state = "bunnysuit_law_blue" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_blue/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_red + name = "lawyer's red bunny suit" + desc = "The staple of any bunny themed lawyers. EXTREMELY professional." + icon_state = "bunnysuit_law_red" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_red/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_good + name = "good lawyer's bunny suit" + desc = "The staple of any bunny themed lawyers. EXTREMELY professional." + icon_state = "bunnysuit_law_good" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_good/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +/obj/item/clothing/under/rank/civilian/psychologist_bunnysuit + name = "psychologist's bunny suit" + desc = "The staple of any bunny themed psychologists. Perhaps not the best choice for making your patients feel at home." + icon_state = "bunnysuit_psychologist" + inhand_icon_state = null + icon = 'modular_zubbers/icons/obj/clothing/under/costume.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/costume.dmi' + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/rank/civilian/psychologist_bunnysuit/Initialize(mapload) + . = ..() + + create_storage(storage_type = /datum/storage/pockets/tiny) + +//BUNNY STUFF END, SPRITES BY DimWhat OF MONKE STATION diff --git a/modular_zubbers/code/modules/customization/species/synths/code/designs/exofab_designs.dm b/modular_zubbers/code/modules/customization/species/synths/code/designs/exofab_designs.dm deleted file mode 100644 index bca5f8de26e4f..0000000000000 --- a/modular_zubbers/code/modules/customization/species/synths/code/designs/exofab_designs.dm +++ /dev/null @@ -1,16 +0,0 @@ -/datum/techweb_node/base/New() - . = ..() - design_ids += "blanksynth" - -/datum/design/synthclone - name = "Blank synthetic shell" - id = "blanksynth" - build_type = MECHFAB - construction_time = 60 SECONDS - materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 20, - /datum/material/glass = SHEET_MATERIAL_AMOUNT * 10, - /datum/material/silver = SHEET_MATERIAL_AMOUNT * 0.5, - /datum/material/gold = SHEET_MATERIAL_AMOUNT * 0.25) - category = list(RND_CATEGORY_MECHFAB_SYNTH + RND_SUBCATEGORY_MECHFAB_SYNTH_PARTS) - - build_path = /mob/living/carbon/human/species/synth/empty diff --git a/modular_zubbers/code/modules/emotes/emotes.dm b/modular_zubbers/code/modules/emotes/emotes.dm index 796129e2dd43b..d75ecd7a987d1 100644 --- a/modular_zubbers/code/modules/emotes/emotes.dm +++ b/modular_zubbers/code/modules/emotes/emotes.dm @@ -63,3 +63,12 @@ emote_type = EMOTE_AUDIBLE vary = TRUE sound = 'modular_zubbers/sound/emotes/sound_voice_mar.ogg' // Credit to vorestation + +//Silicons can snap now +/datum/emote/living/snap + key = "snap" + key_third_person = "snaps" + message = "snaps their fingers." + message_param = "snaps their fingers at %t." + emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE + sound = 'sound/misc/fingersnap1.ogg' diff --git a/modular_zubbers/code/modules/emp_overhaul/organ.dm b/modular_zubbers/code/modules/emp_overhaul/organ.dm deleted file mode 100644 index 47e9082589067..0000000000000 --- a/modular_zubbers/code/modules/emp_overhaul/organ.dm +++ /dev/null @@ -1,23 +0,0 @@ -// https://www.desmos.com/calculator/7sdtn22uda - -//Note that this doesn't grany synths EMP immunities. -//Regular /tg/ stun effects are still applied. -//This basically just protects from damagae and crazy skyrat effects. -//It's still balanced this way. :^) ~BurgerBB - -/obj/item/bodypart/emp_act(severity) - - if(src.biological_state & BIO_WIRED) - if(!prob((src.get_damage() - 20)*2*(2/severity))) //Chance to get EMP'd is based on self bodypart damage. - if( (src.biological_state & BIO_JOINTED) || prob(20)) - return EMP_PROTECT_SELF //This will still apply the damage, but not the paralysis. Stun is still applied! - return EMP_PROTECT_ALL - - . = ..() - -/obj/item/organ/emp_act(severity) //Internal organs. - - if(src.bodypart_owner && (src.bodypart_owner.biological_state & BIO_WIRED) && !prob((src.bodypart_owner.get_damage() - 20)*2*(2/severity))) //Chance to get EMP'd is based on attached bodypart damage. - return EMP_PROTECT_ALL - - . = ..() diff --git a/modular_zubbers/code/modules/loadout/categories/neck.dm b/modular_zubbers/code/modules/loadout/categories/neck.dm index 7b9a9727b5dc2..1fa456e2d989c 100644 --- a/modular_zubbers/code/modules/loadout/categories/neck.dm +++ b/modular_zubbers/code/modules/loadout/categories/neck.dm @@ -6,3 +6,11 @@ /datum/loadout_item/neck/ringbell name = "Ringing Bell Collar" item_path = /obj/item/clothing/neck/human_petcollar/locked/ringbell + +/datum/loadout_item/neck/gps + name = "Tracking Collar" + item_path = /obj/item/clothing/neck/kink_collar/locked/gps + +/datum/loadout_item/neck/binary + name = "Crow Feather Cloak" + item_path = /obj/item/clothing/neck/binary diff --git a/modular_zubbers/code/modules/mining/equipment/survival_pod.dm b/modular_zubbers/code/modules/mining/equipment/survival_pod.dm index 152bc649a059b..b448b5ea595b4 100644 --- a/modular_zubbers/code/modules/mining/equipment/survival_pod.dm +++ b/modular_zubbers/code/modules/mining/equipment/survival_pod.dm @@ -18,6 +18,24 @@ item_path = /obj/item/survivalcapsule/sauna cost_per_order = 7000 +/obj/item/storage/backpack/duffelbag/mining_bunny + name = "Bunny Kit" + desc = "A mining outfit kit themed around bunnies, they do live in burrows after all..." + icon_state = "duffel-explorer" + inhand_icon_state = "duffel-explorer" + +/obj/item/storage/backpack/duffelbag/mining_bunny/PopulateContents() + new /obj/item/clothing/head/playbunnyears/miner(src) + new /obj/item/clothing/neck/tie/bunnytie/miner(src) + new /obj/item/clothing/suit/jacket/tailcoat/miner(src) + new /obj/item/clothing/under/rank/cargo/miner/bunnysuit(src) + new /obj/item/clothing/shoes/workboots/mining/heeled(src) + +/datum/orderable_item/mining/bunny + item_path = /obj/item/storage/backpack/duffelbag/mining_bunny + desc = "A mining outfit kit themed around bunnies, they do live in burrows after all..." + cost_per_order = 500 + /obj/item/survivalcapsule/medical name = "medical trauma pod" desc = "A bluespace capsule that deploys a fairly effective medical treatment pod!" @@ -35,3 +53,196 @@ /datum/armament_entry/company_import/deforest/equipment/chempod item_type = /obj/item/survivalcapsule/chemistry cost = PAYCHECK_COMMAND * 20 + +/*****************************Botany Pods - Home is where the green is...********************************/ +/obj/item/survivalcapsule/botany + name = "botany control capsule" + desc = "A bluespace pod, containing botanical equipment." + icon_state = "capsule" + icon = 'icons/obj/mining.dmi' + w_class = WEIGHT_CLASS_TINY + template_id = "shelter_botany" + used = FALSE + +/datum/map_template/shelter/botany + name = "Botany Control" + shelter_id = "shelter_botany" + description = "A contained and interconnectable botany pod." + mappath = "_maps/bubber/pods/shelter_botany.dmm" + +/datum/map_template/shelter/botany/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) + +/obj/item/survivalcapsule/trays + name = "botany trays capsule" + desc = "A bluespace pod, containing botanical equipment." + icon_state = "capsule" + icon = 'icons/obj/mining.dmi' + w_class = WEIGHT_CLASS_TINY + template_id = "shelter_trays" + used = FALSE + +/datum/map_template/shelter/trays + name = "Botany Trays" + shelter_id = "shelter_trays" + description = "A contained and interconnectable botany pod." + mappath = "_maps/bubber/pods/shelter_trays.dmm" + +/datum/map_template/shelter/trays/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) + +/obj/item/survivalcapsule/fan + name = "airlock fan capsule" + desc = "A bluespace pod, containing a deployable fan, to keep the pressure in." + icon_state = "capsule" + icon = 'icons/obj/mining.dmi' + w_class = WEIGHT_CLASS_TINY + template_id = "shelter_fan" + used = FALSE + +/datum/map_template/shelter/fan + name = "Airlock fan deployer" + shelter_id = "shelter_fan" + description = "A contained and interconnectable botany pod." + mappath = "_maps/bubber/pods/shelter_fan.dmm" + +/datum/map_template/shelter/fan/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) + +/obj/item/survivalcapsule/o2 + name = "oxygen harvesting capsule" + desc = "A bluespace pod, containing a small pumping station, to harvest breathable O2." + icon_state = "capsule" + icon = 'icons/obj/mining.dmi' + w_class = WEIGHT_CLASS_TINY + template_id = "shelter_o2" + used = FALSE + +/datum/map_template/shelter/o2 + name = "o2 harvester deployer" + shelter_id = "shelter_o2" + description = "A contained O2 harvesting pod, for planetary use." + mappath = "_maps/bubber/pods/shelter_o2.dmm" + +/datum/map_template/shelter/o2/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) + +/obj/item/survivalcapsule/kitchen + name = "deployable kitchen capsule" + desc = "A bluespace pod, containing a kitchen." + icon_state = "capsule" + icon = 'icons/obj/mining.dmi' + w_class = WEIGHT_CLASS_TINY + template_id = "shelter_kitchen" + used = FALSE + +/datum/map_template/shelter/kitchen + name = "kitchen deployer" + shelter_id = "shelter_kitchen" + description = "A contained kitchen." + mappath = "_maps/bubber/pods/shelter_kitchen.dmm" + +/datum/map_template/shelter/kitchen/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) + +/obj/item/survivalcapsule/cabin + name = "deployable comfort capsule" + desc = "A bluespace pod, containing a wooden cabin." + icon_state = "capsule" + icon = 'icons/obj/mining.dmi' + w_class = WEIGHT_CLASS_TINY + template_id = "shelter_cabin" + used = FALSE + +/datum/map_template/shelter/cabin + name = "comfort cabin deployer" + shelter_id = "shelter_cabin" + description = "A contained comfort cabin." + mappath = "_maps/bubber/pods/shelter_cabin.dmm" + +/datum/map_template/shelter/cabin/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) + +/obj/item/survivalcapsule/threebythree + name = "deployable small emtpy capsule" + desc = "A bluespace pod, containing an empty 3x3 capsule." + icon_state = "capsule" + icon = 'icons/obj/mining.dmi' + w_class = WEIGHT_CLASS_TINY + template_id = "shelter_threebythree" + used = FALSE + +/datum/map_template/shelter/threebythree + name = "small capsule deployer" + shelter_id = "shelter_threebythree" + description = "A contained small capsule." + mappath = "_maps/bubber/pods/shelter_3x3.dmm" + +/datum/map_template/shelter/threebythree/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) + +/obj/item/survivalcapsule/sixbysix + name = "deployable large emtpy capsule" + desc = "A bluespace pod, containing an empty 6x6 capsule." + icon_state = "capsule" + icon = 'icons/obj/mining.dmi' + w_class = WEIGHT_CLASS_TINY + template_id = "shelter_sixbysix" + used = FALSE + +/datum/map_template/shelter/sixbysix + name = "large capsule deployer" + shelter_id = "shelter_sixbysix" + description = "A contained large capsule." + mappath = "_maps/bubber/pods/shelter_6x6.dmm" + +/datum/map_template/shelter/sixbysix/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) + +/datum/armament_entry/company_import/nri_surplus/misc/botanypod + item_type = /obj/item/survivalcapsule/botany + cost = PAYCHECK_COMMAND * 4 + +/datum/armament_entry/company_import/nri_surplus/misc/botanytrayspod + item_type = /obj/item/survivalcapsule/trays + cost = PAYCHECK_COMMAND * 2 + +/datum/armament_entry/company_import/nri_surplus/misc/kitchenpod + item_type = /obj/item/survivalcapsule/kitchen + cost = PAYCHECK_COMMAND * 4 + +/datum/armament_entry/company_import/nri_surplus/misc/o2pod + item_type = /obj/item/survivalcapsule/o2 + cost = PAYCHECK_COMMAND * 4 + +/datum/armament_entry/company_import/nri_surplus/misc/fanpod + item_type = /obj/item/survivalcapsule/fan + cost = PAYCHECK_COMMAND * 1 + +/datum/armament_entry/company_import/nri_surplus/misc/threebythree + item_type = /obj/item/survivalcapsule/threebythree + cost = PAYCHECK_COMMAND * 1 + +/datum/armament_entry/company_import/nri_surplus/misc/sixbysix + item_type = /obj/item/survivalcapsule/sixbysix + cost = PAYCHECK_COMMAND * 2 + +/datum/armament_entry/company_import/nri_surplus/misc/cabin + item_type = /obj/item/survivalcapsule/cabin + cost = PAYCHECK_COMMAND * 2 diff --git a/modular_zubbers/code/modules/mining/shelters.dm b/modular_zubbers/code/modules/mining/shelters.dm index 5a5f077534d58..3cf0e55675be7 100644 --- a/modular_zubbers/code/modules/mining/shelters.dm +++ b/modular_zubbers/code/modules/mining/shelters.dm @@ -5,7 +5,7 @@ built-in cameras, medical records, PDA server spying and a \ fax machine! Order now, and we'll throw in a photocopier, \ absolutely free!" - mappath = "_maps/templates/listeningbasics.dmm" + mappath = "_maps/bubber/pods/listeningbasics.dmm" /datum/map_template/shelter/sauna name = "luxury hot tub and sauna survival pod" @@ -13,7 +13,7 @@ description = "A cozy, heated, easily deployable luxury sauna when the heat, ash, and death of lavaland becomes too much. \ Has a bult in personal locker space and dressing room to stow your equipment. \ Requires a 10x10 space clear of obsticals. Warning: Deployment is rapid and explosive!" - mappath = "_maps/templates/shelter_s.dmm" + mappath = "_maps/bubber/pods/shelter_s.dmm" /datum/map_template/shelter/sauna/New() . = ..() @@ -25,7 +25,7 @@ shelter_id = "shelter_delta" description = "An emergency medical pod, comes with stasis beds and surgical suites. \ Deploy to prevent death." - mappath = "_maps/templates/shelter_4.dmm" + mappath = "_maps/bubber/pods/shelter_4.dmm" /datum/map_template/shelter/delta/New() . = ..() @@ -36,7 +36,7 @@ name = "Shelter Echo" shelter_id = "shelter_echo" description = "A pod for harvesting geysers" - mappath = "_maps/templates/shelter_5.dmm" + mappath = "_maps/bubber/pods/shelter_5.dmm" /datum/map_template/shelter/echo/New() . = ..() diff --git a/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm b/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm index 817c83f312d55..4ca7cbbe51b85 100644 --- a/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm +++ b/modular_zubbers/code/modules/mob/dead/new_player/body_markings.dm @@ -9,7 +9,7 @@ recommended_species = null /datum/body_marking/bubber/facedisc - name = "Face disc" + name = "Face Disc" icon_state = "facedisc" affected_bodyparts = HEAD @@ -19,7 +19,7 @@ affected_bodyparts = HEAD /datum/body_marking/bubber/verticalstripe - name = "Vertical stripe" + name = "Vertical Stripe" icon_state = "verticalstripe" affected_bodyparts = HEAD @@ -33,6 +33,18 @@ icon_state = "fangs" affected_bodyparts = HEAD +/datum/body_marking/bubber/clowncross + name = "Clown Cross" + icon_state = "clowncross" + affected_bodyparts = HEAD + gendered = FALSE + +/datum/body_marking/bubber/clownlips + name = "Clown Lips" + icon_state = "clownlips" + affected_bodyparts = HEAD + gendered = FALSE + /datum/body_marking/bubber/longsock name = "Longsock" icon_state = "longsock" diff --git a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm index 639410bc84610..7aa13521909f1 100644 --- a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -38,6 +38,81 @@ icon_state = "royal_curls" icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' +/datum/sprite_accessory/hair/bubberclown + name = "Clown" + icon_state = "hair_clown" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + +/datum/sprite_accessory/hair/emma + name = "Emma" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_emma" + +/datum/sprite_accessory/hair/immovable + name = "Ozen" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_immovable" + +/datum/sprite_accessory/hair/damsel + name = "Damsel" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_damsel" + +/datum/sprite_accessory/hair/wavylong + name = "Long Wavy" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_wavylong" + +/datum/sprite_accessory/hair/wavyovereye + name = "Wavy over eye" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_wavyovereye" + +/datum/sprite_accessory/hair/straightovereye + name = "Straight over eye" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_straightovereye" + +/datum/sprite_accessory/hair/straightside + name = "Side Straight" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_straightside" + +/datum/sprite_accessory/hair/straightshort + name = "Straight Long" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_straightshort" + +/datum/sprite_accessory/hair/straightlong + name = "Straight Long" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_straightlong" + +/datum/sprite_accessory/hair/straightfloorlength + name = "Straight Long (Very)" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_straightfloorlength" + +/datum/sprite_accessory/hair/deathhawk + name = "Deathhawk" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_deathhawk" + +/datum/sprite_accessory/hair/bedheadhline + name = "Bedhead (+hairline)" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_bedheadhline" + +/datum/sprite_accessory/hair/spicyalt + name = "Spicy (Alt)" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_spicyalt" + +/datum/sprite_accessory/hair/honse + name = "Honse" + icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' + icon_state = "hair_honse" + //Sprite from Monkestation: https://github.com/Monkestation/MonkeStation /datum/sprite_accessory/hair/marge name = "Marge" @@ -117,72 +192,3 @@ icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK) -/datum/sprite_accessory/hair/emma - name = "Emma" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_emma" - -/datum/sprite_accessory/hair/immovable - name = "Ozen" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_immovable" - -/datum/sprite_accessory/hair/damsel - name = "Damsel" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_damsel" - -/datum/sprite_accessory/hair/wavylong - name = "Long Wavy" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_wavylong" - -/datum/sprite_accessory/hair/wavyovereye - name = "Wavy over eye" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_wavyovereye" - -/datum/sprite_accessory/hair/straightovereye - name = "Straight over eye" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_straightovereye" - -/datum/sprite_accessory/hair/straightside - name = "Side Straight" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_straightside" - -/datum/sprite_accessory/hair/straightshort - name = "Straight Long" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_straightshort" - -/datum/sprite_accessory/hair/straightlong - name = "Straight Long" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_straightlong" - -/datum/sprite_accessory/hair/straightfloorlength - name = "Straight Long (Very)" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_straightfloorlength" - -/datum/sprite_accessory/hair/deathhawk - name = "Deathhawk" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_deathhawk" - -/datum/sprite_accessory/hair/bedheadhline - name = "Bedhead (+hairline)" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_bedheadhline" - -/datum/sprite_accessory/hair/spicyalt - name = "Spicy (Alt)" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_spicyalt" - -/datum/sprite_accessory/hair/honse - name = "Honse" - icon = 'modular_zubbers/icons/mob/species/human/humanface.dmi' - icon_state = "hair_honse" diff --git a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm index e206f3427e694..93401802fb3da 100644 --- a/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/modular_zubbers/code/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -2,3 +2,24 @@ icon = 'modular_zubbers/icons/customization/hair.dmi' name = "Flaguardyain" icon_state = "hair_flaguardyain" + +//-->Lizard tongue flick, done by Ekizius +/datum/sprite_accessory/facial_hair/faciallizardlick + name = "Lizard Tongue Flick" + icon = 'modular_zubbers/icons/customization/facial_hair.dmi' + icon_state = "facial_lizardlick_s" + +/datum/sprite_accessory/facial_hair/faciallizardlickslow + name = "Lizard Tongue Flick Slow" + icon = 'modular_zubbers/icons/customization/facial_hair.dmi' + icon_state = "facial_lizardlickslow_s" + +/datum/sprite_accessory/facial_hair/faciallizardlickfast + name = "Lizard Tongue Flick Fast" + icon = 'modular_zubbers/icons/customization/facial_hair.dmi' + icon_state = "facial_lizardlickfast_s" + +/datum/sprite_accessory/facial_hair/noselick + name = "Nose Lick" + icon = 'modular_zubbers/icons/customization/facial_hair.dmi' + icon_state = "noselick" diff --git a/modular_zubbers/code/modules/quirks/code/negative_quirks/well_trained.dm b/modular_zubbers/code/modules/quirks/code/negative_quirks/well_trained.dm index d2c63de119ce7..cacf60cee91b2 100644 --- a/modular_zubbers/code/modules/quirks/code/negative_quirks/well_trained.dm +++ b/modular_zubbers/code/modules/quirks/code/negative_quirks/well_trained.dm @@ -19,12 +19,11 @@ . = ..() UnregisterSignal(quirk_holder, COMSIG_MOB_EXAMINING) -/datum/quirk/well_trained/proc/on_dom_examine(atom/source, mob/living/user, list/examine_list) +/datum/quirk/well_trained/proc/on_dom_examine(atom/source, mob/living/dom, list/examine_list) SIGNAL_HANDLER - if(!ishuman(user)) + if(!istype(dom)) return - var/mob/living/carbon/human/dom = user if(!dom.has_quirk(/datum/quirk/dominant_aura) || (dom == quirk_holder)) return if(dom.stat == DEAD) diff --git a/modular_zubbers/code/modules/quirks/code/positive_quirks/dominant_aura.dm b/modular_zubbers/code/modules/quirks/code/positive_quirks/dominant_aura.dm index aa1e93d3936b6..9424e8efbea83 100644 --- a/modular_zubbers/code/modules/quirks/code/positive_quirks/dominant_aura.dm +++ b/modular_zubbers/code/modules/quirks/code/positive_quirks/dominant_aura.dm @@ -6,7 +6,7 @@ value = 1 gain_text = span_notice("You feel like making someone your pet.") lose_text = span_notice("You feel less assertive than before") - quirk_flags = QUIRK_HUMAN_ONLY | QUIRK_HIDE_FROM_SCAN + quirk_flags = QUIRK_HIDE_FROM_SCAN erp_quirk = TRUE // Disables on ERP config. /datum/quirk/dominant_aura/add(client/client_source) diff --git a/modular_zubbers/code/modules/quirks/code/positive_quirks/masquerade_food.dm b/modular_zubbers/code/modules/quirks/code/positive_quirks/masquerade_food.dm new file mode 100644 index 0000000000000..7d7d379190d2e --- /dev/null +++ b/modular_zubbers/code/modules/quirks/code/positive_quirks/masquerade_food.dm @@ -0,0 +1,10 @@ +/datum/quirk/masquerade_food + name = "Masquerade" + desc = "A hemophage that has adapted to be able to consume normal food and drink. Such an act is merely for pleasure, as they derive no nutritional benefit from such." + icon = FA_ICON_MASKS_THEATER + value = 2 + species_whitelist = list(SPECIES_HEMOPHAGE) + mob_trait = TRAIT_MASQUERADE_FOOD + gain_text = span_notice("You feel that your body has adapted to consumption of normal food and drink without mixing in blood.") + lose_text = span_danger("You feel that your body is no longer able to consume normal food or drink without mixing in blood.") + medical_record_text = "Patient is able to consume food or drink without having to mix in blood, though they derive no nutritional benefit from it." diff --git a/modular_zubbers/code/modules/quote_of_the_round/config.dm b/modular_zubbers/code/modules/quote_of_the_round/config.dm new file mode 100644 index 0000000000000..522f715affdd8 --- /dev/null +++ b/modular_zubbers/code/modules/quote_of_the_round/config.dm @@ -0,0 +1,29 @@ +/datum/config_entry/number/quote_of_the_round_time_random_start + default = 1 HOURS + integer = TRUE + min_val = 0 + +/datum/config_entry/number/quote_of_the_round_time_random_end + default = 2 HOURS + integer = TRUE + min_val = 0 + +/datum/config_entry/number/quote_of_the_round_letter_min + default = 42 + integer = TRUE + min_val = 0 + +/datum/config_entry/number/quote_of_the_round_letter_max + default = 120 + integer = TRUE + min_val = 0 + +/datum/config_entry/number/quote_of_the_round_word_min + default = 6 + integer = TRUE + min_val = 0 + +/datum/config_entry/number/quote_of_the_round_word_max + default = 30 + integer = TRUE + min_val = 0 diff --git a/modular_zubbers/code/modules/quote_of_the_round/debug_verbs.dm b/modular_zubbers/code/modules/quote_of_the_round/debug_verbs.dm new file mode 100644 index 0000000000000..0b09fcb3730b8 --- /dev/null +++ b/modular_zubbers/code/modules/quote_of_the_round/debug_verbs.dm @@ -0,0 +1,11 @@ +ADMIN_VERB(generate_quote_of_the_round, R_DEBUG, "Generate Quote of the Round", "Generates a quote of the round for debug purposes.", ADMIN_CATEGORY_DEBUG) + + if(!SSticker.quote_of_the_round_text) + SSticker.quote_of_the_round_text = "Bitches ain't shit but hoes and tricks." + + if(!SSticker.quote_of_the_round_attribution) + SSticker.quote_of_the_round_attribution = "Albert Einstein" + + var/message_to_send = SSticker.generate_quote_of_the_round() + + user << browse(message_to_send,"window='quoteoftheround'") diff --git a/modular_zubbers/code/modules/quote_of_the_round/telecomms.dm b/modular_zubbers/code/modules/quote_of_the_round/telecomms.dm new file mode 100644 index 0000000000000..95f03ba01e44a --- /dev/null +++ b/modular_zubbers/code/modules/quote_of_the_round/telecomms.dm @@ -0,0 +1,87 @@ +/obj/machinery/telecomms/hub/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) + . = ..() + + if(!.) + return + + //Is this actually enabled? + if(!SSticker.quote_of_the_round_record_start) + return + + //Non-common radio. + if(signal.frequency != FREQ_COMMON) //Common only. + return + + //Invalid or incomplete data. + if(!length(signal.data) || !signal.data["message"] || !signal.data["name"] || !signal.data["job"] || signal.data["name"] == "Unknown") + return + + if(world.time >= SSticker.quote_of_the_round_record_start && !prob(80)) //Atmos optimization + + if(!istype(signal,/datum/signal/subspace/vocal)) + return + + var/datum/signal/subspace/vocal/vsignal = signal + + var/mob/found_user = vsignal.virt && vsignal.virt.source && ismob(vsignal.virt.source) ? vsignal.virt.source : null + + if(!found_user) //Not a mob. We don't check for ckey or stuff like that because maybe poly will say something hilarious. + return + + //Okay time to find a suitable message. + var/found_name = found_user.real_name == vsignal.data["name"] ? found_user.real_name : "[found_user.real_name] (as [vsignal.data["name"]])" + var/found_message = vsignal.data["message"] + var/found_job = vsignal.data["job"] + + //Desanitize the contents, but reject the text for anything that may cause issues, such as code injection. + found_name = reject_bad_text(html_decode(found_name)) + found_message = reject_bad_text(html_decode(found_message)) + found_job = reject_bad_text(html_decode(found_job)) + + //These can be null due to reject_bad_text + if(!found_name || !found_message || !found_job) + return + + //Check if the name and message are suitable (sometimes these can be bypassed). + if(is_ic_filtered(found_name) || is_ic_filtered(found_message) || is_ic_filtered(found_job)) + return + + //Check the number of characters. + var/letter_length = length(found_message) //Number of characters. + var/letter_min = CONFIG_GET(number/quote_of_the_round_letter_min) + var/letter_max = CONFIG_GET(number/quote_of_the_round_letter_max) + if(letter_min && letter_length < letter_min) + return + if(letter_max && letter_length > letter_max) + return + + //Check the number of words. + var/word_length = length(splittext(found_message," ")) //Number of words. + var/word_min = CONFIG_GET(number/quote_of_the_round_word_min) + var/word_max = CONFIG_GET(number/quote_of_the_round_word_max) + if(word_min && word_length < word_min) + return + if(word_max && word_length > word_max) + return + + //Finally, store it and save it. + SSticker.quote_of_the_round_text = found_message + SSticker.quote_of_the_round_attribution = "[found_name], [found_job]" + SSticker.quote_of_the_round_record_start = null //Chosen! + SSticker.quote_of_the_round_ckey = found_user.ckey ? found_user.ckey : "NO CKEY" //It's possible to be null. + message_admins("[found_message] by [ADMIN_LOOKUPFLW(found_user)] has been randomly selected as quote of the round. Click here to change.") + log_world("[key_name(found_user)] has been randomly selected for quote of the round with the quote \"[found_message]\".") + +/obj/machinery/telecomms/hub/Topic(href, href_list) + . = ..() + if(href_list["cancel_quote"] && check_rights(R_ADMIN)) + if(!SSticker.quote_of_the_round_text) + to_chat(usr, span_warning("This quote of the day has already been changed."), confidential = TRUE) + return + log_admin("[key_name_admin(usr)] has rerolled the quote of the round, which was: \"[SSticker.quote_of_the_round_text]\" by CKEY [key_name(SSticker.quote_of_the_round_ckey)].") + SSticker.quote_of_the_round_text = null + SSticker.quote_of_the_round_attribution = null + SSticker.quote_of_the_round_ckey = null + SSticker.quote_of_the_round_record_start = world.time + 5 MINUTES + message_admins("[key_name_admin(usr)] has rerolled the quote of the round. A new one will be chosen in 5 minutes.") + diff --git a/modular_zubbers/code/modules/quote_of_the_round/ticker.dm b/modular_zubbers/code/modules/quote_of_the_round/ticker.dm new file mode 100644 index 0000000000000..8b0710399fdd3 --- /dev/null +++ b/modular_zubbers/code/modules/quote_of_the_round/ticker.dm @@ -0,0 +1,38 @@ +/datum/controller/subsystem/ticker + var/quote_of_the_round_record_start + var/quote_of_the_round_text + var/quote_of_the_round_attribution + var/quote_of_the_round_ckey + +/datum/controller/subsystem/ticker/Initialize() + . = ..() + quote_of_the_round_record_start = rand(CONFIG_GET(number/quote_of_the_round_time_random_start), CONFIG_GET(number/quote_of_the_round_time_random_end)) + message_admins( + span_notice("Notice: The quote of the round will be chosen in [DisplayTimeText(quote_of_the_round_record_start,1)].") + ) + log_runtime("The quote of the round will be chosen in [DisplayTimeText(quote_of_the_round_record_start,1)].") + +/datum/controller/subsystem/ticker/declare_completion(force_ending) + + if(quote_of_the_round_text) + send2chat( + new /datum/tgs_message_content(generate_quote_of_the_round()), + CONFIG_GET(string/channel_announce_new_game) + ) + to_chat(world, span_notice("A quote of the round was found, and should have been sent to discord.")) + log_runtime("A quote of the round was found, and should have been sent to discord.") + + else + if(world.time <= quote_of_the_round_record_start) + to_chat(world, span_notice("A quote of the round could not be found due to the round being too short.")) + log_runtime("A quote of the round could not be found. The round ended too early.") + else + to_chat(world, span_notice("A quote of the round could not be found. Perhaps the crew should be more memorable.")) + log_runtime("A quote of the round could not be found. Perhaps the filters are too strict?") + + . = ..() + +/datum/controller/subsystem/ticker/proc/generate_quote_of_the_round() + return "A shift on [SSmapping.config.map_name] has ended.\n\ + [pick(strings("quote_of_the_round.json", "workers"))] [pick(strings("quote_of_the_round.json", "action"))] [pick(strings("quote_of_the_round.json", "message"))] that occured during said shift:\n\ + > *[quote_of_the_round_text]*\n \\- *[quote_of_the_round_attribution]*" diff --git a/modular_zubbers/code/modules/reagents/drink_reagents.dm b/modular_zubbers/code/modules/reagents/drink_reagents.dm index 0b21c250b4c60..94b556fe55076 100644 --- a/modular_zubbers/code/modules/reagents/drink_reagents.dm +++ b/modular_zubbers/code/modules/reagents/drink_reagents.dm @@ -11,3 +11,9 @@ if(!ismoth(M)) M.adjust_disgust(10 * REM * delta_time,DISGUST_LEVEL_DISGUSTED) return UPDATE_MOB_HEALTH + + +/mob/living/basic/mothroach/Initialize(mapload) + . = ..() + + AddComponent(/datum/component/udder, reagent_produced_override = /datum/reagent/consumable/moth_milk) diff --git a/modular_zubbers/code/modules/research/designs/mechfab_designs.dm b/modular_zubbers/code/modules/research/designs/mechfab_designs.dm index 8e3f535117ae3..7749b30d343c1 100644 --- a/modular_zubbers/code/modules/research/designs/mechfab_designs.dm +++ b/modular_zubbers/code/modules/research/designs/mechfab_designs.dm @@ -1,3 +1,18 @@ +// Empty shell + +/datum/design/synthclone + name = "Blank synthetic shell" + id = "blanksynth" + build_type = MECHFAB + construction_time = 60 SECONDS + materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 20, + /datum/material/glass = SHEET_MATERIAL_AMOUNT * 10, + /datum/material/silver = SHEET_MATERIAL_AMOUNT * 0.5, + /datum/material/gold = SHEET_MATERIAL_AMOUNT * 0.25) + category = list(RND_CATEGORY_MECHFAB_SYNTH + RND_SUBCATEGORY_MECHFAB_SYNTH_PARTS) + + build_path = /mob/living/carbon/human/species/synth/empty + /datum/design/borg_upgrade_advcutter name = "Advanced Plasma Cutter" id = "borg_upgrade_advcutter" @@ -52,6 +67,20 @@ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_RESEARCH ) +/datum/design/borg_dominatrix + name = "borg dominatrix module" + id = "dominatrixmodule" + build_type = MECHFAB + build_path = /obj/item/borg/upgrade/dominatrixmodule + materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT, + /datum/material/glass = SHEET_MATERIAL_AMOUNT, + ) + construction_time = 4 SECONDS + category = list( + RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL + ) + //so we have our own category /datum/design/borg_upgrade_surgical_processor_sci name = "Research Surgical Processor" diff --git a/modular_zubbers/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/code/modules/research/techweb/all_nodes.dm index 044507ea93674..3d05709d27d5c 100644 --- a/modular_zubbers/code/modules/research/techweb/all_nodes.dm +++ b/modular_zubbers/code/modules/research/techweb/all_nodes.dm @@ -61,9 +61,17 @@ /datum/techweb_node/borg_medical/New() design_ids += list( "borg_upgrade_surgicalprocessor_sci", + "borg_upgrade_pinpointer", ) return ..() +/datum/techweb_node/augmentation/New() + . = ..() + design_ids += list( + "blanksynth", + "dominatrixmodule", + ) + // Computer Tech /datum/techweb_node/gaming/New() . = ..() diff --git a/modular_zubbers/code/modules/storyteller/event_defines/major/major_overrides.dm b/modular_zubbers/code/modules/storyteller/event_defines/major/major_overrides.dm index 2caacdbdca138..0812b43047b22 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/major/major_overrides.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/major/major_overrides.dm @@ -49,6 +49,15 @@ track = EVENT_TRACK_MAJOR tags = list(TAG_DESTRUCTIVE) -/datum/round_event_control/spider_infestation - track = EVENT_TRACK_ROLESET +/datum/round_event_control/revenant + min_players = 20 + track = EVENT_TRACK_MAJOR + tags = list(TAG_DESTRUCTIVE, TAG_SPOOKY) + +/datum/round_event_control/abductor + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_SPOOKY) + +/datum/round_event_control/fugitives + track = EVENT_TRACK_MAJOR tags = list(TAG_COMBAT) diff --git a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/bloodsucker.dm b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/bloodsucker.dm index 4c205671b7091..69db78d6c9f18 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/bloodsucker.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/bloodsucker.dm @@ -4,7 +4,7 @@ antag_flag = ROLE_BLOODSUCKER antag_datum = /datum/antagonist/bloodsucker - weight = 2 + weight = 8 min_players = 20 base_antags = 2 @@ -15,4 +15,3 @@ /datum/round_event_control/antagonist/solo/bloodsucker/midround name = "Vampiric Accident" roundstart = FALSE - weight = 6 // Outweight the other ghost roles slightly diff --git a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/changeling.dm b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/changeling.dm index a320c068e49cd..f148915387a5e 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/changeling.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/changeling.dm @@ -4,7 +4,7 @@ antag_flag = ROLE_CHANGELING antag_datum = /datum/antagonist/changeling - weight = 4 + weight = 8 min_players = 20 tags = list(TAG_COMBAT, TAG_CREW_ANTAG) @@ -12,4 +12,3 @@ /datum/round_event_control/antagonist/solo/changeling/midround name = "Genome Awakening (Changelings)" roundstart = FALSE - weight = 6 // Outweight the other ghost roles slightly diff --git a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/heretic.dm b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/heretic.dm index bdb99df31f442..ec4d000653b9d 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/heretic.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/heretic.dm @@ -4,8 +4,8 @@ antag_flag = ROLE_HERETIC antag_datum = /datum/antagonist/heretic - weight = 4 - min_players = 40 + weight = 8 + min_players = 30 base_antags = 2 maximum_antags = 3 @@ -19,4 +19,3 @@ /datum/round_event_control/antagonist/solo/heretic/midround name = "Midround Heretics" roundstart = FALSE - weight = 6 // Outweight the other ghost roles slightly diff --git a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/malf.dm b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/malf.dm index d361d9ad8a597..36fc661869e23 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/malf.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/malf.dm @@ -16,7 +16,7 @@ /datum/round_event_control/antagonist/solo/malf/roundstart roundstart = TRUE typepath = /datum/round_event/antagonist/solo/malf_ai/roundstart - weight = 2 + weight = 10 // God has abandoned us /datum/round_event_control/antagonist/solo/malf/roundstart/get_candidates() diff --git a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/spies.dm b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/spies.dm index 49752994e4cb0..fee6829df7084 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/spies.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/spies.dm @@ -4,11 +4,10 @@ antag_flag = ROLE_SPY antag_datum = /datum/antagonist/spy - weight = 4 + weight = 8 tags = list(TAG_CREW_ANTAG) /datum/round_event_control/antagonist/solo/spy/midround name = "Spies (Midround)" roundstart = FALSE - weight = 7 diff --git a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/traitor.dm b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/traitor.dm index 2075027950df4..960af5e385daa 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/traitor.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/roleset/crew_antagonists/traitor.dm @@ -4,11 +4,10 @@ antag_flag = ROLE_TRAITOR antag_datum = /datum/antagonist/traitor - weight = 6 + weight = 8 tags = list(TAG_CREW_ANTAG) /datum/round_event_control/antagonist/solo/traitor/midround name = "Sleeper Agents (Traitors)" roundstart = FALSE - weight = 7 diff --git a/modular_zubbers/code/modules/storyteller/event_defines/roleset/roleset_ghost_overrides.dm b/modular_zubbers/code/modules/storyteller/event_defines/roleset/roleset_ghost_overrides.dm index cbff2e9f15b84..bd578b08cdcb4 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/roleset/roleset_ghost_overrides.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/roleset/roleset_ghost_overrides.dm @@ -1,32 +1,29 @@ /datum/round_event_control/nightmare track = EVENT_TRACK_ROLESET tags = list(TAG_COMBAT, TAG_SPOOKY) - -/datum/round_event_control/revenant - min_players = 20 - track = EVENT_TRACK_ROLESET - tags = list(TAG_DESTRUCTIVE, TAG_SPOOKY) + weight = 4 /datum/round_event_control/space_dragon track = EVENT_TRACK_ROLESET tags = list(TAG_COMBAT) + weight = 2 /datum/round_event_control/space_ninja track = EVENT_TRACK_ROLESET tags = list(TAG_COMBAT) + weight = 4 /datum/round_event_control/changeling track = EVENT_TRACK_ROLESET tags = list(TAG_COMBAT, TAG_CREW_ANTAG) - -/datum/round_event_control/fugitives - track = EVENT_TRACK_ROLESET - tags = list(TAG_COMBAT) + weight = 4 /datum/round_event_control/alien_infestation track = EVENT_TRACK_ROLESET tags = list(TAG_COMBAT, TAG_SPOOKY) + weight = 2 -/datum/round_event_control/abductor +/datum/round_event_control/spider_infestation track = EVENT_TRACK_ROLESET - tags = list(TAG_COMBAT, TAG_SPOOKY) + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE) + weight = 2 diff --git a/modular_zubbers/code/modules/storyteller/gamemode.dm b/modular_zubbers/code/modules/storyteller/gamemode.dm index e8711f700ccae..1bdffe37322b8 100644 --- a/modular_zubbers/code/modules/storyteller/gamemode.dm +++ b/modular_zubbers/code/modules/storyteller/gamemode.dm @@ -211,8 +211,9 @@ SUBSYSTEM_DEF(gamemode) /// Gets the number of antagonists the antagonist injection events will stop rolling after. /datum/controller/subsystem/gamemode/proc/get_antag_cap() - var/cap = FLOOR((get_correct_popcount() / storyteller?.antag_divisor), 1) + sec_crew ? sec_crew : ANTAG_CAP_FLAT // Population divide by storyeteller's divisor, add one antag per sec. - return cap + if(isnull(storyteller)) + return 0 + return round(get_correct_popcount() / storyteller.antag_divisor) + (sec_crew ? sec_crew : ANTAG_CAP_FLAT) // Population divide by storyeteller's divisor, add one antag per sec. /// Whether events can inject more antagonists into the round /datum/controller/subsystem/gamemode/proc/can_inject_antags() diff --git a/modular_zubbers/code/modules/storyteller/storytellers/storyteller_tellers.dm b/modular_zubbers/code/modules/storyteller/storytellers/storyteller_tellers.dm index 90a14788541a8..ea96bfc86ffc2 100644 --- a/modular_zubbers/code/modules/storyteller/storytellers/storyteller_tellers.dm +++ b/modular_zubbers/code/modules/storyteller/storytellers/storyteller_tellers.dm @@ -64,4 +64,5 @@ name = "The Ghost" desc = "The Ghost is the absence of a Storyteller. It will not spawn a single event of any sort, or run any Antagonists. Best for rounds where the population is so low that not even the Sleeper is low enough." disable_distribution = TRUE + population_max = 40 antag_divisor = 32 diff --git a/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm b/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm new file mode 100644 index 0000000000000..a09fe1e296a75 --- /dev/null +++ b/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm @@ -0,0 +1,12 @@ +/obj/item/organ/external/taur_body/serpentine/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) + . = ..() + + organ_owner.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 0.6, -6) + organ_owner.AddElement(/datum/element/footstep, FOOTSTEP_MOB_SNAKE, 15, -6) + +/obj/item/organ/external/taur_body/serpentine/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) + organ_owner.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_SNAKE, 15, -6) + organ_owner.AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 0.6, -6) + + return ..() + diff --git a/modular_zubbers/code/modules/vending/armadyne.dm b/modular_zubbers/code/modules/vending/armadyne.dm new file mode 100644 index 0000000000000..4f5c8fcb6816a --- /dev/null +++ b/modular_zubbers/code/modules/vending/armadyne.dm @@ -0,0 +1,4 @@ +/obj/machinery/vending/security + zubbers_contraband = list( + /obj/item/clothing/neck/kink_collar/locked/gps = 3, + ) diff --git a/modular_zubbers/code/modules/vending/clothmate.dm b/modular_zubbers/code/modules/vending/clothmate.dm index c26fa2f4647fd..6b9871c3b7301 100644 --- a/modular_zubbers/code/modules/vending/clothmate.dm +++ b/modular_zubbers/code/modules/vending/clothmate.dm @@ -60,6 +60,7 @@ /obj/item/clothing/suit/short_coat = 5, /obj/item/clothing/suit/hooded/sigmarcoat = 5, /obj/item/clothing/suit/jacket/skyy = 5, + /obj/item/clothing/suit/jacket/tailcoat = 5, ), ), @@ -84,7 +85,7 @@ ) ) - zubbers_premium = list( //being here means you're artificially rare, congratulations + zubbers_premium = list( //being here means you're even more artificially rare, congratulations /obj/item/clothing/head/razurathhat = 2, /obj/item/clothing/suit/razurathcoat = 2, /obj/item/clothing/suit/hooded/colorblockhoodie = 2, diff --git a/modular_zubbers/code/modules/vending/comdrobe.dm b/modular_zubbers/code/modules/vending/comdrobe.dm index ee0f81a41a204..469fe783dd63d 100644 --- a/modular_zubbers/code/modules/vending/comdrobe.dm +++ b/modular_zubbers/code/modules/vending/comdrobe.dm @@ -7,16 +7,61 @@ /obj/item/clothing/under/rank/blueshield/netra = 1, /obj/item/clothing/gloves/netra = 1, //These are meant to go with the dress above it. /obj/item/clothing/under/bimpcap = 1, + /obj/item/clothing/head/hats/caphat/bunnyears_captain = 1, + /obj/item/clothing/under/rank/captain/bunnysuit = 1, + /obj/item/clothing/suit/armor/vest/capcarapace/tailcoat_captain = 1, + /obj/item/clothing/neck/tie/bunnytie/captain = 1, ) access_lists["[ACCESS_HOS]"] += list( /obj/item/clothing/head/hats/warden/drill/hos = 1, /obj/item/clothing/under/rank/security/head_of_security/alt/roselia = 1, /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia = 1, + /obj/item/clothing/under/rank/security/head_of_security/redsec = 1, + /obj/item/clothing/under/rank/security/head_of_security/parade/redsec = 1, + /obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec = 1, /obj/item/clothing/head/hats/hos/elofy = 1, /obj/item/clothing/suit/armor/hos/elofy = 1, /obj/item/clothing/gloves/elofy = 1, //Part of a set so... /obj/item/clothing/shoes/jackboots/elofy = 1, + /obj/item/clothing/head/playbunnyears/hos = 1, + /obj/item/clothing/under/rank/security/head_of_security/bunnysuit = 1, + /obj/item/clothing/suit/armor/hos_tailcoat = 1, + ) + + access_lists["[ACCESS_HOP]"] += list( + /obj/item/clothing/head/playbunnyears/hop = 1, + /obj/item/clothing/under/rank/civilian/hop_bunnysuit = 1, + /obj/item/clothing/suit/armor/hop_tailcoat = 1, + /obj/item/clothing/neck/tie/bunnytie/hop = 1, + ) + + access_lists["[ACCESS_CMO]"] += list( + /obj/item/clothing/head/playbunnyears/cmo = 1, + /obj/item/clothing/under/rank/medical/cmo_bunnysuit = 1, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/cmo = 1, + /obj/item/clothing/neck/tie/bunnytie/cmo = 1, + ) + + access_lists["[ACCESS_RD]"] += list( + /obj/item/clothing/head/playbunnyears/rd = 1, + /obj/item/clothing/under/rank/rnd/research_director/bunnysuit = 1, + /obj/item/clothing/suit/jacket/research_director/tailcoat = 1, + /obj/item/clothing/neck/tie/bunnytie/rd = 1, + ) + + access_lists["[ACCESS_CE]"] += list( + /obj/item/clothing/head/playbunnyears/ce = 1, + /obj/item/clothing/under/rank/engineering/chief_engineer/bunnysuit = 1, + /obj/item/clothing/suit/utility/fire/ce_tailcoat = 1, + /obj/item/clothing/neck/tie/bunnytie/ce = 1, + ) + + access_lists["[ACCESS_QM]"] += list( + /obj/item/clothing/head/playbunnyears/quartermaster = 1, + /obj/item/clothing/under/rank/cargo/quartermaster_bunnysuit = 1, + /obj/item/clothing/suit/jacket/tailcoat/quartermaster = 1, + /obj/item/clothing/neck/tie/bunnytie/cargo = 1, ) access_lists["[ACCESS_CENT_GENERAL]"] += list( @@ -28,6 +73,10 @@ /obj/item/clothing/under/rank/nanotrasen_consultant/hubert = 1, /obj/item/clothing/head/razurathhat = 1, /obj/item/clothing/suit/razurathcoat = 1, + /obj/item/clothing/head/playbunnyears/centcom = 1, + /obj/item/clothing/neck/tie/bunnytie/centcom = 1, + /obj/item/clothing/suit/jacket/tailcoat/centcom = 1, + /obj/item/clothing/under/costume/playbunny/centcom = 1, ) access_lists["[ACCESS_COMMAND]"] += list( diff --git a/modular_zubbers/code/modules/vending/lustwish.dm b/modular_zubbers/code/modules/vending/lustwish.dm index 0b14b52e0cc48..4cae04f1aefa2 100644 --- a/modular_zubbers/code/modules/vending/lustwish.dm +++ b/modular_zubbers/code/modules/vending/lustwish.dm @@ -8,14 +8,26 @@ /obj/item/clothing/neck/inferno_collar = 8, /obj/item/clothing/neck/flower_collar = 8, ) + ), + + list( + "name" = "Outfits", + "icon" = FA_ICON_SHIRT, + "products" = list( + /obj/item/clothing/head/playbunnyears = 6, + /obj/item/clothing/neck/tie/bunnytie = 6, + /obj/item/clothing/under/costume/playbunny = 6, + /obj/item/clothing/suit/jacket/tailcoat = 6, + ) ) ) zubbers_premium = list( - /obj/item/holosign_creator/sex = 6, - /obj/item/clothing/under/mikubikini = 3, - /obj/item/clothing/suit/mikujacket = 3, - /obj/item/clothing/head/mikuhair = 3, - /obj/item/clothing/gloves/mikugloves = 3, - /obj/item/clothing/shoes/sneakers/mikuleggings = 3, + /obj/item/clothing/neck/kink_collar/locked/gps = 3, + /obj/item/holosign_creator/sex = 6, + /obj/item/clothing/under/mikubikini = 3, + /obj/item/clothing/suit/mikujacket = 3, + /obj/item/clothing/head/mikuhair = 3, + /obj/item/clothing/gloves/mikugloves = 3, + /obj/item/clothing/shoes/sneakers/mikuleggings = 3, ) diff --git a/modular_zubbers/code/game/machinery/vending/multisec.dm b/modular_zubbers/code/modules/vending/multisec.dm similarity index 86% rename from modular_zubbers/code/game/machinery/vending/multisec.dm rename to modular_zubbers/code/modules/vending/multisec.dm index b338a1fd02c9b..952e4fec317fa 100644 --- a/modular_zubbers/code/game/machinery/vending/multisec.dm +++ b/modular_zubbers/code/modules/vending/multisec.dm @@ -26,6 +26,7 @@ /obj/item/clothing/under/rank/security/peacekeeper/skirt = 10, /obj/item/clothing/under/rank/security/peacekeeper/shortskirt = 10, /obj/item/clothing/under/rank/security/peacekeeper/miniskirt = 10, + /obj/item/clothing/under/rank/security/officer/blueshirt = 10, /obj/item/clothing/under/rank/security/peacekeeper/trousers = 5, /obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts = 5, /obj/item/clothing/under/rank/security/skyrat/utility = 6, @@ -52,10 +53,20 @@ /obj/item/clothing/under/rank/security/peacekeeper/armadyne/tactical = 6, /obj/item/clothing/shoes/jackboots = 6, /obj/item/clothing/shoes/jackboots/peacekeeper/armadyne = 6, + /obj/item/clothing/shoes/jackboots/gogo_boots = 6, + /obj/item/clothing/head/helmet/sec/redsec = 6, /obj/item/clothing/head/beret/sec = 6, /obj/item/clothing/head/beret/sec/peacekeeper/armadyne = 6, /obj/item/clothing/head/soft/sec = 6, /obj/item/clothing/head/beaniesec = 6, + /obj/item/clothing/head/playbunnyears/security = 6, + /obj/item/clothing/under/rank/security/security_bunnysuit = 6, + /obj/item/clothing/suit/armor/security_tailcoat = 6, + /obj/item/clothing/neck/tie/bunnytie/security = 6, + /obj/item/clothing/head/playbunnyears/security/assistant = 6, + /obj/item/clothing/under/rank/security/security_assistant_bunnysuit = 6, + /obj/item/clothing/suit/armor/security_tailcoat/assistant = 6, + /obj/item/clothing/neck/tie/bunnytie/security_assistant = 6, /obj/item/clothing/mask/bandana/red = 6, /obj/item/clothing/gloves/color/black = 6, /obj/item/clothing/gloves/combat/peacekeeper/armadyne = 6, @@ -77,6 +88,10 @@ /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/blue = 3, /obj/item/clothing/suit/hazardvest/security_medic/blue = 3, /obj/item/clothing/head/helmet/sec/peacekeeper/security_medic = 3, + /obj/item/clothing/head/playbunnyears/brig_phys = 3, + /obj/item/clothing/under/rank/security/brig_phys_bunnysuit = 3, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/sec = 3, + /obj/item/clothing/neck/tie/bunnytie/brig_phys = 3, /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec = 3, /obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate = 3, /obj/item/clothing/under/rank/security/peacekeeper/security_medic = 3, @@ -114,6 +129,9 @@ /obj/item/clothing/glasses/hud/ar/projector/security = 3, /obj/item/clothing/mask/gas/sechailer/half_mask = 3, /obj/item/clothing/under/rank/prisoner/classic = 6, //To be given to Prisoners. + /obj/item/clothing/head/playbunnyears/prisoner = 6, + /obj/item/clothing/under/rank/security/prisoner_bunnysuit = 6, + /obj/item/clothing/neck/tie/bunnytie/prisoner = 6, /obj/item/clothing/head/hats/caphat/parade/fedcap/sec = 3, /obj/item/clothing/suit/fedcoat/modern/sec = 3, /obj/item/clothing/mask/gas/soviet = 3, diff --git a/modular_zubbers/code/modules/vending/wardrobe.dm b/modular_zubbers/code/modules/vending/wardrobe.dm index 58bb1b8d3966a..366d5dc9f5201 100644 --- a/modular_zubbers/code/modules/vending/wardrobe.dm +++ b/modular_zubbers/code/modules/vending/wardrobe.dm @@ -31,6 +31,34 @@ /obj/item/clothing/head/costume/strigihat = 3, /obj/item/clothing/head/anubite = 3, /obj/item/clothing/under/costume/dragon_maid = 3, + /obj/item/clothing/head/playbunnyears = 6, + /obj/item/clothing/neck/tie/bunnytie = 6, + /obj/item/clothing/under/costume/playbunny = 6, + /obj/item/clothing/suit/jacket/tailcoat = 6, + /obj/item/clothing/neck/tie/bunnytie/magician = 6, + /obj/item/clothing/under/costume/playbunny/magician = 6, + /obj/item/clothing/suit/wizrobe/magician = 6, + /obj/item/clothing/head/playbunnyears/british = 6, + /obj/item/clothing/neck/tie/bunnytie/blue = 6, + /obj/item/clothing/under/costume/playbunny/british = 6, + /obj/item/clothing/suit/jacket/tailcoat/british = 6, + /obj/item/clothing/head/playbunnyears/communist = 6, + /obj/item/clothing/neck/tie/bunnytie/communist = 6, + /obj/item/clothing/under/costume/playbunny/communist = 6, + /obj/item/clothing/suit/jacket/tailcoat/communist = 6, + /obj/item/clothing/head/playbunnyears/usa = 6, + /obj/item/clothing/under/costume/playbunny/usa = 6, + /obj/item/clothing/suit/jacket/tailcoat/usa = 6, + /obj/item/clothing/suit/jacket/tailcoat/plasmaman = 6, + /obj/item/clothing/head/playbunnyears/clown = 3, + /obj/item/clothing/under/rank/civilian/clown/clown_bunnysuit = 3, + /obj/item/clothing/suit/jacket/tailcoat/clown = 3, + /obj/item/clothing/neck/tie/clown = 3, + /obj/item/clothing/shoes/clown_shoes/heeled = 3, + /obj/item/clothing/neck/bunny_pendant = 3, + /obj/item/clothing/head/playbunnyears/mime = 3, + /obj/item/clothing/under/rank/civilian/mime_bunnysuit = 3, + /obj/item/clothing/suit/jacket/tailcoat/mime = 3, ), ), ) @@ -44,6 +72,10 @@ /obj/item/clothing/under/syndicate/skyrat/enclave = 3, /obj/item/clothing/under/syndicate/skyrat/enclave/officer = 3, /obj/item/clothing/under/rank/security/detective/cowboy/armorless = 3, + /obj/item/clothing/head/playbunnyears/syndicate/fake = 3, + /obj/item/clothing/neck/tie/bunnytie/syndicate = 3, //Armored but it's only Fire and Acid, not a balance concern + /obj/item/clothing/under/syndicate/syndibunny/fake = 3, + /obj/item/clothing/suit/jacket/tailcoat/syndicate/fake = 3, ) /obj/machinery/vending/wardrobe/medi_wardrobe @@ -51,18 +83,97 @@ /obj/item/clothing/glasses/hud/health/surgerygoggles = 3, /obj/item/clothing/gloves/latex/nitrile/longrubbergloves = 3, /obj/item/clothing/suit/leatherapron = 3, + /obj/item/clothing/head/playbunnyears/doctor = 3, + /obj/item/clothing/under/rank/medical/doctor_bunnysuit = 3, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat = 3, + /obj/item/clothing/neck/tie/bunnytie/doctor = 3, + /obj/item/clothing/head/playbunnyears/paramedic = 3, + /obj/item/clothing/under/rank/medical/paramedic_bunnysuit = 3, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/paramedic = 3, + /obj/item/clothing/neck/tie/bunnytie/paramedic = 3, + /obj/item/clothing/head/playbunnyears/psychologist = 3, + /obj/item/clothing/under/rank/civilian/psychologist_bunnysuit = 3, + /obj/item/clothing/suit/jacket/tailcoat/psychologist = 3, + ) + +/obj/machinery/vending/wardrobe/chem_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/chemist = 2, + /obj/item/clothing/under/rank/medical/chemist/bunnysuit = 2, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/chemist = 2, + /obj/item/clothing/neck/tie/bunnytie/chemist = 2, +) + +/obj/machinery/vending/wardrobe/viro_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/pathologist = 2, + /obj/item/clothing/under/rank/medical/pathologist_bunnysuit = 2, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/pathologist = 2, + /obj/item/clothing/neck/tie/bunnytie/pathologist = 2, + ) + +/obj/machinery/vending/wardrobe/coroner_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/coroner = 2, + /obj/item/clothing/under/rank/medical/coroner_bunnysuit = 2, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/coroner = 2, + /obj/item/clothing/neck/tie/bunnytie/coroner = 2, + ) + + +/obj/machinery/vending/wardrobe/science_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/scientist = 3, + /obj/item/clothing/under/rank/rnd/scientist/bunnysuit = 3, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science = 3, + /obj/item/clothing/neck/tie/bunnytie/scientist = 3, ) /obj/machinery/vending/wardrobe/robo_wardrobe zubbers_products = list( /obj/item/clothing/glasses/welding/steampunk_goggles = 2, + /obj/item/clothing/head/playbunnyears/roboticist = 2, + /obj/item/clothing/under/rank/rnd/scientist/roboticist_bunnysuit = 2, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science/robotics = 2, + /obj/item/clothing/neck/tie/bunnytie/roboticist = 2, + ) + +/obj/machinery/vending/wardrobe/gene_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/geneticist = 2, + /obj/item/clothing/under/rank/rnd/geneticist/bunnysuit = 2, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science/genetics = 2, + /obj/item/clothing/neck/tie/bunnytie/geneticist = 2, ) +/obj/machinery/vending/wardrobe/det_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/detective = 2, + /obj/item/clothing/under/rank/security/detective_bunnysuit = 2, + /obj/item/clothing/suit/jacket/det_suit/tailcoat = 2, + /obj/item/clothing/neck/tie/bunnytie/detective = 2, + /obj/item/clothing/head/playbunnyears/detective/noir = 2, + /obj/item/clothing/under/rank/security/detective_bunnysuit/noir = 2, + /obj/item/clothing/suit/jacket/det_suit/tailcoat/noir = 2, + ) + + /obj/machinery/vending/wardrobe/cargo_wardrobe zubbers_products = list( /obj/item/clothing/head/caligram_cap_tan = 3, /obj/item/clothing/under/jumpsuit/caligram_fatigues_tan = 3, /obj/item/clothing/suit/jacket/caligram_parka_tan = 3, + /obj/item/clothing/head/playbunnyears/cargo = 3, + /obj/item/clothing/under/rank/cargo/cargo_bunnysuit = 3, + /obj/item/clothing/suit/jacket/tailcoat/cargo = 3, + /obj/item/clothing/neck/tie/bunnytie/cargo = 3, + /obj/item/clothing/head/playbunnyears/mailman = 1, + /obj/item/clothing/under/rank/cargo/mailman_bunnysuit = 1, + /obj/item/clothing/neck/tie/bunnytie/mailman = 1, + /obj/item/clothing/head/playbunnyears/bitrunner = 3, + /obj/item/clothing/under/rank/cargo/bitrunner/bunnysuit = 3, + /obj/item/clothing/neck/tie/bunnytie/bitrunner = 3, + /obj/item/clothing/suit/jacket/tailcoat/bitrunner = 3, ) /obj/machinery/vending/wardrobe/chap_wardrobe @@ -70,15 +181,111 @@ /obj/item/clothing/suit/jacket/brasspriest = 1, /obj/item/clothing/neck/cross = 5, /obj/item/clothing/head/anubite = 1, + /obj/item/clothing/head/playbunnyears/chaplain = 1, + /obj/item/clothing/under/rank/civilian/chaplain_bunnysuit = 1, + /obj/item/clothing/suit/jacket/tailcoat/chaplain = 1, + /obj/item/clothing/neck/bunny_pendant = 6, ) /obj/machinery/vending/wardrobe/curator_wardrobe zubbers_products = list( /obj/item/clothing/under/occult = 2, /obj/item/storage/belt/fannypack/occult = 2, + /obj/item/clothing/head/playbunnyears/curator_red = 2, + /obj/item/clothing/head/playbunnyears/curator_green = 2, + /obj/item/clothing/head/playbunnyears/curator_teal = 2, + /obj/item/clothing/under/rank/civilian/curator_bunnysuit_red = 2, + /obj/item/clothing/under/rank/civilian/curator_bunnysuit_green = 2, + /obj/item/clothing/under/rank/civilian/curator_bunnysuit_teal = 2, + /obj/item/clothing/suit/jacket/tailcoat/curator_red = 2, + /obj/item/clothing/suit/jacket/tailcoat/curator_green = 2, + /obj/item/clothing/suit/jacket/tailcoat/curator_teal = 2, ) /obj/machinery/vending/wardrobe/jani_wardrobe zubbers_products = list( /obj/item/clothing/under/costume/dragon_maid = 3, + /obj/item/clothing/head/playbunnyears/janitor = 3, + /obj/item/clothing/under/rank/civilian/janitor/bunnysuit = 3, + /obj/item/clothing/suit/jacket/tailcoat/janitor = 3, + /obj/item/clothing/neck/tie/bunnytie/janitor = 3, + /obj/item/clothing/shoes/galoshes/heeled = 3, + ) + +/obj/machinery/vending/wardrobe/bar_wardrobe + zubbers_products = list( + /obj/item/clothing/suit/jacket/tailcoat/bartender = 2, + /obj/item/clothing/neck/tie/bunnytie/bartender = 2, + /obj/item/clothing/head/playbunnyears/bartender = 2, + /obj/item/clothing/under/rank/civilian/bartender_bunnysuit = 2, + ) + +/obj/machinery/vending/wardrobe/chef_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/cook = 2, + /obj/item/clothing/under/rank/civilian/cook_bunnysuit = 2, + /obj/item/clothing/suit/jacket/tailcoat/cook = 2, + /obj/item/clothing/neck/tie/bunnytie/cook = 2, + ) + +/obj/machinery/vending/wardrobe/hydro_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/botanist = 2, + /obj/item/clothing/under/rank/civilian/hydroponics/bunnysuit = 2, + /obj/item/clothing/suit/jacket/tailcoat/botanist = 2, + /obj/item/clothing/neck/tie/bunnytie/botanist = 2, + ) + +/obj/machinery/vending/wardrobe/law_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/lawyer_black = 3, + /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_black = 3, + /obj/item/clothing/suit/jacket/tailcoat/lawyer_black = 3, + /obj/item/clothing/neck/tie/bunnytie/lawyer_black = 3, + /obj/item/clothing/head/playbunnyears/lawyer_red = 3, + /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_red = 3, + /obj/item/clothing/suit/jacket/tailcoat/lawyer_red = 3, + /obj/item/clothing/neck/tie/bunnytie/lawyer_red = 3, + /obj/item/clothing/head/playbunnyears/lawyer_blue = 3, + /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_blue = 3, + /obj/item/clothing/suit/jacket/tailcoat/lawyer_blue = 3, + /obj/item/clothing/neck/tie/bunnytie/lawyer_blue = 3, + /obj/item/clothing/head/playbunnyears/lawyer_good = 3, + /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_good = 3, + /obj/item/clothing/suit/jacket/tailcoat/lawyer_good = 3, + /obj/item/clothing/neck/tie/bunnytie/lawyer_good = 3, + ) + + +/obj/machinery/vending/wardrobe/syndie_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/syndicate = 3, + /obj/item/clothing/neck/tie/bunnytie/syndicate = 3, + /obj/item/clothing/under/syndicate/syndibunny = 3, + /obj/item/clothing/suit/jacket/tailcoat/syndicate = 3, + ) + +/obj/machinery/vending/magivend + zubbers_products = list( + /obj/item/clothing/neck/tie/bunnytie/magician = 3, + /obj/item/clothing/under/costume/playbunny/magician = 3, + /obj/item/clothing/suit/wizrobe/magician = 3, + ) + +/obj/machinery/vending/wardrobe/engi_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/engineer = 3, + /obj/item/clothing/under/rank/engineering/engineer_bunnysuit = 3, + /obj/item/clothing/suit/jacket/tailcoat/engineer = 3, + /obj/item/clothing/neck/tie/bunnytie/engineer = 3, + /obj/item/clothing/shoes/workboots/heeled = 3, + ) + +/obj/machinery/vending/wardrobe/atmos_wardrobe + zubbers_products = list( + /obj/item/clothing/head/playbunnyears/atmos_tech = 3, + /obj/item/clothing/under/rank/engineering/atmos_tech_bunnysuit = 3, + /obj/item/clothing/suit/utility/fire/atmos_tech_tailcoat = 3, + /obj/item/clothing/neck/tie/bunnytie/atmos_tech = 3, + /obj/item/clothing/shoes/workboots/heeled = 3, ) diff --git a/modular_zubbers/code/modules/zantag_tickets/_defines.dm b/modular_zubbers/code/modules/zantag_tickets/_defines.dm new file mode 100644 index 0000000000000..28f6fa97208a9 --- /dev/null +++ b/modular_zubbers/code/modules/zantag_tickets/_defines.dm @@ -0,0 +1 @@ +#define LOG_CATEGORY_ANTAG_TICKETS "antag-tickets" diff --git a/modular_zubbers/code/modules/zantag_tickets/antag_ticket_multipliers.dm b/modular_zubbers/code/modules/zantag_tickets/antag_ticket_multipliers.dm new file mode 100644 index 0000000000000..c40444cc6e051 --- /dev/null +++ b/modular_zubbers/code/modules/zantag_tickets/antag_ticket_multipliers.dm @@ -0,0 +1,128 @@ +/datum/antagonist + //Loss multiplier for this antagonist type. + //Null means not actually an antagonist, and should give points. + //0 means don't give any points, but don't take any away. + var/antag_ticket_multiplier + + +/datum/antagonist/proc/get_antag_ticket_multiplier() + return antag_ticket_multiplier + +// /tg/ antag types +/datum/antagonist/abductor + antag_ticket_multiplier = 1 + +/datum/antagonist/battlecruiser + antag_ticket_multiplier = 1 + +/datum/antagonist/blob + antag_ticket_multiplier = 1 + +/datum/antagonist/blob_minion + antag_ticket_multiplier = 1 + +/datum/antagonist/brother + antag_ticket_multiplier = 1 + +/datum/antagonist/changeling + antag_ticket_multiplier = 1 + +/datum/antagonist/fallen_changeling + antag_ticket_multiplier = 0.5 + +/datum/antagonist/cult + antag_ticket_multiplier = 1 + +/datum/antagonist/cult/get_antag_ticket_multiplier() + if(!give_equipment) //This means that converts don't lose tickets. + return 0 + . = ..() + +/datum/antagonist/heretic + antag_ticket_multiplier = 1 + +/datum/antagonist/malf_ai + antag_ticket_multiplier = 1 + +/datum/antagonist/morph + antag_ticket_multiplier = 1 + +/datum/antagonist/nightmare + antag_ticket_multiplier = 1 + +/datum/antagonist/nukeop //Also includes nuke op + antag_ticket_multiplier = 1 + +/datum/antagonist/pirate + antag_ticket_multiplier = 1 + +/datum/antagonist/revenant + antag_ticket_multiplier = 1 + +/datum/antagonist/rev/head //This is head revs. Regular revs don't get anything. + antag_ticket_multiplier = 1 + +/datum/antagonist/enemy_of_the_state + antag_ticket_multiplier = 0.5 + +/datum/antagonist/space_dragon + antag_ticket_multiplier = 1 + +/datum/antagonist/space_carp + antag_ticket_multiplier = 1 + +/datum/antagonist/space_dragon + antag_ticket_multiplier = 1 + +/datum/antagonist/ninja + antag_ticket_multiplier = 1 + +/datum/antagonist/spider + antag_ticket_multiplier = 1 + +/datum/antagonist/spy + antag_ticket_multiplier = 1 + +/datum/antagonist/syndicate_monkey + antag_ticket_multiplier = 1 + +/datum/antagonist/traitor + antag_ticket_multiplier = 1 + +/datum/antagonist/venus_human_trap + antag_ticket_multiplier = 1 + +/datum/antagonist/wishgranter + antag_ticket_multiplier = 1 + +/datum/antagonist/wizard + antag_ticket_multiplier = 1 + +/datum/antagonist/xeno + antag_ticket_multiplier = 1 + +//Skyrat antag types +/datum/antagonist/assault_operative + antag_ticket_multiplier = 1 + +/datum/antagonist/clock_cultist //There is actually no easy way to check if this was a convert. Thanks Skyrat. Good thing this is disabled anyways :^) + antag_ticket_multiplier = 1 + +/datum/antagonist/cortical_borer + antag_ticket_multiplier = 1 + +/datum/antagonist/cop + antag_ticket_multiplier = 1 + +/datum/antagonist/ert/request_911/treason_destroyer + antag_ticket_multiplier = 1 + +/datum/antagonist/ert/nri + antag_ticket_multiplier = 1 + +//Bubberstation Antags +/datum/antagonist/bloodsucker + antag_ticket_multiplier = 1 + +/datum/antagonist/shaded_bloodsucker //This is a dead bloodsucker for some bloodsucker types + antag_ticket_multiplier = 0 diff --git a/modular_zubbers/code/modules/zantag_tickets/blackbox.dm b/modular_zubbers/code/modules/zantag_tickets/blackbox.dm new file mode 100644 index 0000000000000..2acadbc44c533 --- /dev/null +++ b/modular_zubbers/code/modules/zantag_tickets/blackbox.dm @@ -0,0 +1,37 @@ +/datum/controller/subsystem/blackbox/fire() + + . = ..() + + if(SSticker.HasRoundStarted() && (triggertime < 0 || world.time > triggertime + wait/2)) + var/antag_tickets_to_add = CONFIG_GET(number/antag_tickets_per_update) + if(antag_tickets_to_add > 0) + update_antag_tickets(antag_tickets_to_add) + +/datum/controller/subsystem/blackbox/proc/update_antag_tickets(amount) + + var/max_antag_ticket_gain_per_round = CONFIG_GET(number/antag_ticket_max_earned_per_round) + var/max_antag_ticket_loss_per_round = CONFIG_GET(number/antag_ticket_max_spent_per_round) + + for(var/client/found_client as anything in GLOB.clients) + var/ticket_multiplier = found_client.antag_ticket_multiplier() + if(!ticket_multiplier) + continue + var/tickets_to_add = ticket_multiplier*amount + if(!tickets_to_add) + continue + var/datum/preferences/prefs = GLOB.preferences_datums[found_client.ckey] + if(tickets_to_add > 0) + if(max_antag_ticket_gain_per_round > 0) + tickets_to_add = min(tickets_to_add,max_antag_ticket_gain_per_round - prefs.antag_tickets_earned) + if(tickets_to_add <= 0) + continue + prefs.antag_tickets_earned += tickets_to_add + else + if(max_antag_ticket_loss_per_round > 0) + tickets_to_add = max(tickets_to_add,-(max_antag_ticket_loss_per_round - prefs.antag_tickets_spent)) + if(tickets_to_add > 0) + continue + prefs.antag_tickets_spent -= tickets_to_add + found_client.add_antag_tickets(tickets_to_add) + + return TRUE diff --git a/modular_zubbers/code/modules/zantag_tickets/candidate_setup.dm b/modular_zubbers/code/modules/zantag_tickets/candidate_setup.dm new file mode 100644 index 0000000000000..65c9268e015af --- /dev/null +++ b/modular_zubbers/code/modules/zantag_tickets/candidate_setup.dm @@ -0,0 +1,21 @@ +/datum/round_event/antagonist/candidate_setup(datum/round_event_control/antagonist/cast_control) + + var/list/candidates_tickets = candidates_to_tickets(cast_control.get_candidates()) + + //Logging purposes. + var/total_tickets = 0 + for(var/candidate in candidates_tickets) + var/candidate_weight = candidates_tickets[candidate] + total_tickets += candidate_weight + var/average_tickets = round(total_tickets / length(candidates_tickets),1) + + for(var/i in 1 to antag_count) + if(!length(candidates_tickets)) //All out of options. + break + var/mob/candidate = pick_weight(candidates_tickets) + candidates_tickets -= candidate + setup_minds += candidate.mind + candidate_roles_setup(candidate) + var/our_weight = candidates_tickets[candidate] + var/percent_chance = round( (our_weight/total_tickets)*100, 1) + log_antag_tickets("[key_name(candidate)] was made an antagonist with a [percent_chance]% chance to roll (self tickets: [our_weight], total tickets: [total_tickets], average tickets: [average_tickets]).") diff --git a/modular_zubbers/code/modules/zantag_tickets/commands.dm b/modular_zubbers/code/modules/zantag_tickets/commands.dm new file mode 100644 index 0000000000000..ad2dd02fedd54 --- /dev/null +++ b/modular_zubbers/code/modules/zantag_tickets/commands.dm @@ -0,0 +1,32 @@ +/client/verb/check_antag_tickets() + set name = "Check Antag Tickets" + set category = "OOC" + + var/antag_ticket_rate = CONFIG_GET(number/antag_tickets_per_update) + + if(!antag_ticket_rate) + to_chat(span_notice("Antag tickets are currently disabled.")) + return + + var/antag_ticket_count = get_antag_tickets() + var/antag_ticket_gain = antag_ticket_multiplier()*antag_ticket_rate + + to_chat(src,span_notice("You currently have [antag_ticket_count] antag tickets, and are [antag_ticket_gain >= 0 ? "gaining" : "losing"] [abs(antag_ticket_gain)] antag tickets every [DisplayTimeText(SSblackbox.wait,1)].")) + +/client/verb/antag_tickets_info() + set name = "What are antag tickets?" + set category = "OOC" + + var/antag_ticket_rate = CONFIG_GET(number/antag_tickets_per_update) + + if(!antag_ticket_rate) + to_chat(span_notice("Antag tickets are currently disabled, so you don't have to worry about them.")) + return + + var/information = "\ + Antag tickets are a way to balance playtime between being an antagonist and being a non-antagonist. \ + Having more antag tickets makes you more likely to be chosen as an antagonist, while having less makes you less likely to be chosen as one. \ + Antag tickets are gained when you're playing as a crew role while not being an antagonist, while antag tickets are spent when you're playing as an antagonist. \ + Note that as an antagonist, you do not lose antag tickets when you're handcuffed, restrained, dead, crit, incapacitated, or in prison." + + to_chat(src,span_notice(information)) diff --git a/modular_zubbers/code/modules/zantag_tickets/config.dm b/modular_zubbers/code/modules/zantag_tickets/config.dm new file mode 100644 index 0000000000000..25717682c6937 --- /dev/null +++ b/modular_zubbers/code/modules/zantag_tickets/config.dm @@ -0,0 +1,52 @@ +//The amount of antag tickets a crewmember gets every 10 minutes. +/datum/config_entry/number/antag_tickets_per_update + default = 10 + integer = TRUE + min_val = 0 + +//The maximum possible amount of antag tickets someone can have. +/datum/config_entry/number/antag_ticket_maximum + default = 60*3 //3 hours + integer = TRUE + min_val = 0 + +//The minimum possible amount of antag tickets someone can have. This should be a negative number. +//Use antag_ticket_base_weight instead if you want to give people with no tickets a better chance. +/datum/config_entry/number/antag_ticket_minimum + default = 0 + integer = TRUE + max_val = 0 + +//The amount of antagonist tickets a new player gets if they join for the first time (or somehow don't have an antag tickets value). +/datum/config_entry/number/antag_ticket_default + default = 60 + integer = TRUE + +//The base value for weight-based antag ticket rolling. +//For calculations, your final number would be this value + your current antag ticket count. This can be negative, but the final amount will always be at least the value of antag_ticket_roll_minimum . +/datum/config_entry/number/antag_ticket_base_weight + default = 0 + integer = TRUE + +//The minimum possible amount of antag tickets someone can for final calculations. +//Generally, you should set this to 0 to make it so that if you don't have antag tickets, you can't roll antag. +//Note that setting this to 0 means that if no one has enough antag tickets to become something, that antag can't roll. +/datum/config_entry/number/antag_ticket_final_minimum + default = 1 + integer = TRUE + min_val = 0 + + +//The maximum amount of antag tickets you're allowed to gain per round. +/datum/config_entry/number/antag_ticket_max_earned_per_round + default = 0 + integer = TRUE + min_val = 0 + +//The maximum amount of antag tickets you're allowed to lose per round. +/datum/config_entry/number/antag_ticket_max_spent_per_round + default = 120 + integer = TRUE + min_val = 0 + +/datum/config_entry/flag/log_antag_tickets diff --git a/modular_zubbers/code/modules/zantag_tickets/helpers.dm b/modular_zubbers/code/modules/zantag_tickets/helpers.dm new file mode 100644 index 0000000000000..53f106a845a47 --- /dev/null +++ b/modular_zubbers/code/modules/zantag_tickets/helpers.dm @@ -0,0 +1,89 @@ +/client/proc/get_antag_tickets() + return prefs.antag_tickets ? prefs.antag_tickets : 0 + +/client/proc/add_antag_tickets(amount_to_add=0) + + if(!amount_to_add || !prefs) + return + + prefs.antag_tickets = clamp(prefs.antag_tickets + amount_to_add, CONFIG_GET(number/antag_ticket_minimum), CONFIG_GET(number/antag_ticket_maximum)) + + return TRUE + +/client/proc/antag_ticket_multiplier() + + var/datum/mind/our_mind = src.mob?.mind + + if(!our_mind) + return 0 + + if(!isliving(src.mob)) + return 0 + + var/mob/living/actual_mob = our_mind.current + + if(!actual_mob) + return 0 + + if(length(our_mind.antag_datums)) + + var/highest_result //If this is null, then we're not actually an antagonist. + for(var/datum/antagonist/antag as anything in our_mind.antag_datums) + var/antag_multiplier = antag.get_antag_ticket_multiplier() + if(!isnum(antag_multiplier)) + continue + if(!isnum(highest_result)) + highest_result = 0 + highest_result = max(highest_result,antag_multiplier) + + if(isnum(highest_result)) + if(actual_mob.stat) //Dead. Crit, etc. + return 0 + if(HAS_TRAIT(actual_mob, TRAIT_RESTRAINED)) + return 0 + if(HAS_TRAIT(actual_mob, TRAIT_INCAPACITATED)) + return 0 + if(actual_mob.is_imprisoned_in_security()) + return 0 + return -highest_result + + if(our_mind.assigned_role && our_mind.assigned_role.faction == FACTION_STATION && !src.is_afk()) //Non-antagonist crew. + return 1 + + return 0 + + +GLOBAL_LIST_INIT(imprisoning_areas,list( + /area/station/security/holding_cell, + /area/station/security/courtroom/holding, + /area/station/security/interrogation, + /area/station/security/execution, + /area/station/security/checkpoint/escape, + /area/station/security/prison +)) + +/mob/proc/is_imprisoned_in_security() + + var/area/mob_area = get_area(src) + + for(var/area/area_path as anything in GLOB.imprisoning_areas) + if(istype(mob_area,area_path)) + return TRUE + + return FALSE + +/proc/candidates_to_tickets(list/possible_candidates) + var/base_weight = CONFIG_GET(number/antag_ticket_base_weight) + var/absolute_minimum = CONFIG_GET(number/antag_ticket_final_minimum) + var/list/candidates_tickets = list() //M = ticket count + for(var/mob/candidate as anything in possible_candidates) + if(!candidate.client) + continue + var/candidate_tickets = max(absolute_minimum,base_weight + candidate.client.get_antag_tickets()) + if(candidate_tickets <= 0) + continue + candidates_tickets[candidate] = candidate_tickets + return candidates_tickets + +/proc/log_antag_tickets(text, list/data) + logger.Log(LOG_CATEGORY_ANTAG_TICKETS, text, data) diff --git a/modular_zubbers/code/modules/zantag_tickets/logging.dm b/modular_zubbers/code/modules/zantag_tickets/logging.dm new file mode 100644 index 0000000000000..0c0e349b4b932 --- /dev/null +++ b/modular_zubbers/code/modules/zantag_tickets/logging.dm @@ -0,0 +1,4 @@ +/datum/log_category/antag_tickets + category = LOG_CATEGORY_ANTAG_TICKETS + config_flag = /datum/config_entry/flag/log_antag_tickets + master_category = /datum/log_category/game diff --git a/modular_zubbers/code/modules/zantag_tickets/preferences.dm b/modular_zubbers/code/modules/zantag_tickets/preferences.dm new file mode 100644 index 0000000000000..097cfc9ffce7e --- /dev/null +++ b/modular_zubbers/code/modules/zantag_tickets/preferences.dm @@ -0,0 +1,39 @@ +/datum/preferences/ + var/antag_tickets = -1 //Safety + var/antag_tickets_old = -1 + + var/antag_tickets_spent = 0 //This round. + var/antag_tickets_earned = 0 //This round. + +/datum/preferences/load_preferences() + if(!savefile) + stack_trace("Attempted to load the preferences of [parent] without a savefile; did you forget to call load_savefile?") + load_savefile() + if(!savefile) + stack_trace("Failed to load the savefile for [parent] after manually calling load_savefile; something is very wrong.") + return FALSE + antag_tickets = savefile.get_entry("antag_tickets") + if(isnull(antag_tickets)) + antag_tickets = CONFIG_GET(number/antag_ticket_default) + antag_tickets = clamp(antag_tickets, CONFIG_GET(number/antag_ticket_minimum), CONFIG_GET(number/antag_ticket_maximum)) + antag_tickets_old = antag_tickets + . = ..() + +/datum/preferences/save_preferences() + if(!savefile) + CRASH("Attempted to save the preferences of [parent] without a savefile. This should have been handled by load_preferences()") + savefile.set_entry("antag_tickets", antag_tickets) + antag_tickets_old = antag_tickets + . = ..() + +/datum/controller/subsystem/ticker/declare_completion(was_forced = END_ROUND_AS_NORMAL) + + set waitfor = FALSE + + for(var/ckey in GLOB.preferences_datums) + var/datum/preferences/prefs = GLOB.preferences_datums[ckey] + if(prefs.antag_tickets == prefs.antag_tickets_old) + continue //Only save if there has been a change. + prefs.save_preferences() + + . = ..() diff --git a/modular_zubbers/icons/customization/facial_hair.dmi b/modular_zubbers/icons/customization/facial_hair.dmi new file mode 100644 index 0000000000000..5d9285798f264 Binary files /dev/null and b/modular_zubbers/icons/customization/facial_hair.dmi differ diff --git a/modular_zubbers/icons/mob/body_markings/markings.dmi b/modular_zubbers/icons/mob/body_markings/markings.dmi index d64ac5a24ece5..eb298ef5d2613 100644 Binary files a/modular_zubbers/icons/mob/body_markings/markings.dmi and b/modular_zubbers/icons/mob/body_markings/markings.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/feet/feet.dmi b/modular_zubbers/icons/mob/clothing/feet/feet.dmi index 01db60f5902c0..51d4ba0779fd1 100644 Binary files a/modular_zubbers/icons/mob/clothing/feet/feet.dmi and b/modular_zubbers/icons/mob/clothing/feet/feet.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/head/bunnyears.dmi b/modular_zubbers/icons/mob/clothing/head/bunnyears.dmi new file mode 100644 index 0000000000000..ade9346a371a4 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/head/bunnyears.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/neck/neck.dmi b/modular_zubbers/icons/mob/clothing/neck/neck.dmi new file mode 100644 index 0000000000000..57b7aa1c900b1 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/neck/neck.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/jacket.dmi b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi index 783d4d8019813..0685e29bafccc 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/jacket.dmi and b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi b/modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi new file mode 100644 index 0000000000000..7c885bf204148 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/costume.dmi b/modular_zubbers/icons/mob/clothing/under/costume.dmi new file mode 100644 index 0000000000000..2c4c0c6f32cb8 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/costume.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/costume_digi.dmi b/modular_zubbers/icons/mob/clothing/under/costume_digi.dmi new file mode 100644 index 0000000000000..124dad7f96fa9 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/under/costume_digi.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/security.dmi b/modular_zubbers/icons/mob/clothing/under/security.dmi index b47c68ee2beea..cbe76f8948cb5 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/security.dmi and b/modular_zubbers/icons/mob/clothing/under/security.dmi differ diff --git a/modular_zubbers/icons/mob/species/human/humanface.dmi b/modular_zubbers/icons/mob/species/human/humanface.dmi index 8d84e240d42b8..71db7abad89bb 100644 Binary files a/modular_zubbers/icons/mob/species/human/humanface.dmi and b/modular_zubbers/icons/mob/species/human/humanface.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/feet/feet.dmi b/modular_zubbers/icons/obj/clothing/feet/feet.dmi index 963f205bce55e..68d575e12cdeb 100644 Binary files a/modular_zubbers/icons/obj/clothing/feet/feet.dmi and b/modular_zubbers/icons/obj/clothing/feet/feet.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/head/hats.dmi b/modular_zubbers/icons/obj/clothing/head/hats.dmi index 1f07b9c208391..74c16039dac11 100644 Binary files a/modular_zubbers/icons/obj/clothing/head/hats.dmi and b/modular_zubbers/icons/obj/clothing/head/hats.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/neck/neck.dmi b/modular_zubbers/icons/obj/clothing/neck/neck.dmi new file mode 100644 index 0000000000000..fdda576b5022f Binary files /dev/null and b/modular_zubbers/icons/obj/clothing/neck/neck.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/suits/jacket.dmi b/modular_zubbers/icons/obj/clothing/suits/jacket.dmi index d1bc38507bc9d..e922df7a3ab1e 100644 Binary files a/modular_zubbers/icons/obj/clothing/suits/jacket.dmi and b/modular_zubbers/icons/obj/clothing/suits/jacket.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/under/costume.dmi b/modular_zubbers/icons/obj/clothing/under/costume.dmi new file mode 100644 index 0000000000000..9334e46feeae8 Binary files /dev/null and b/modular_zubbers/icons/obj/clothing/under/costume.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/under/security.dmi b/modular_zubbers/icons/obj/clothing/under/security.dmi index 7d69e3ee9a638..360a0dc20686e 100644 Binary files a/modular_zubbers/icons/obj/clothing/under/security.dmi and b/modular_zubbers/icons/obj/clothing/under/security.dmi differ diff --git a/modular_zubbers/maps/moonstation/dp_vent_pump.dm b/modular_zubbers/maps/moonstation/dp_vent_pump.dm new file mode 100644 index 0000000000000..dc3fef1244e44 --- /dev/null +++ b/modular_zubbers/maps/moonstation/dp_vent_pump.dm @@ -0,0 +1,2 @@ +/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos/layer2 + piping_layer = 2 diff --git a/modular_zubbers/master_files/icons/hud/screen_blue98.dmi b/modular_zubbers/master_files/icons/hud/screen_blue98.dmi index ca3085e38386b..0bb205d9805f7 100644 Binary files a/modular_zubbers/master_files/icons/hud/screen_blue98.dmi and b/modular_zubbers/master_files/icons/hud/screen_blue98.dmi differ diff --git a/modular_zzplurt/readme.md b/modular_zzplurt/readme.md new file mode 100644 index 0000000000000..60a870a00f1aa --- /dev/null +++ b/modular_zzplurt/readme.md @@ -0,0 +1,179 @@ +# The Modularization Handbook - S.P.L.U.R.T. Style, v1.0 + +## Introduction + +Welcome to the S.P.L.U.R.T. codebase's modularization handbook! Our goal is to make contributing to our codebase as easy and comfy as possible for coders while upkeeping our code standards. We understand that maintaining a codebase that's a fork of another can be challenging, but with the right practices, we can keep our code clean, organized, and easy to manage. This handbook outlines our modularization protocols and coding standards to help you get started. + +If you'd like to know more about coding, contributing and contribution standards, feel free to read this repository's [contribution guides](./.github/guides)! + +## Important Note - Test Your Pull Requests + +You are responsible for testing your content. Please do not mark a pull request as ready for review until you have thoroughly tested it. If you need a separate client for testing, you can use a guest account by logging out of BYOND and connecting to your test server. Test merges are for stress tests, not for finding bugs that could have been caught with local testing. + +## The Nature of Conflicts + +Conflicts can arise when changes are made to the same lines of code in different branches. For example, if the original code is: + +```byond +var/something = 1 +``` + +And we change it to: + +```diff +- var/something = 1 ++ var/something = 2 //SPLURT EDIT +``` + +But upstream changes it to: + +```diff +- var/something = 1 ++ var/something = 4 +``` + +This results in a conflict that needs to be resolved manually. Our solution is modularization. + +## The Modularization Protocol + +Modularization is the practice of organizing code into separate, self-contained modules that can be developed, tested, and maintained independently. In the context of our codebase, this means placing as much as possible of the new code, icons, sounds, and other assets into the `modular_zzplurt` folder. This approach helps keep our core codebase clean and reduces the likelihood of conflicts when merging changes. By following a structure that resembles the main repository within the `modular_zzplurt` folder, we ensure that our modular code is easy to navigate and manage. This also allows us to make changes and add new features without directly modifying the core files, thereby maintaining the integrity and stability of the main codebase. + +Our modularization protocols are founded on three pillars: + +1. **Modularize anything that's reasonable to modularize:** This includes anything that can be modularized without decreasing its quality or the quality of existing code, and won't logically cause more issues by modularizing than not doing it. +2. **Use commenting conventions for non-modular edits:** When editing non-modular code, make sure to adequately use the [commenting conventions](#commenting-conventions) to ensure it is known that it's a non-modular edit. +3. **It's ok to mess up:** These guidelines are intended less as a set of ironclad rules for contributors to strictly follow, but rather coding standards that we all collectively help to attain, for example through maintainers helping any contributors fulfill them in their pull requests. + +### Modular Overrides + +Modular overrides allow us to extend or modify the behavior of existing code without directly editing the core files. This is done by creating new definitions or modifying existing ones in a way that they can be easily integrated into the core codebase. + +There are two main types of modular overrides: Variable Overrides and Proc Overrides. + +#### Variable Overrides + +Variable overrides allow you to modify existing variables in a modular fashion. This is useful when you need to introduce new properties to existing objects without altering the core code. For example: + +```byond +/obj/item/gun + var/muzzle_flash = TRUE + + ... + +/obj/item/gun + muzzle_flash = FALSE +``` + +In this example, a new variable muzzle_flash is added to the /obj/item/gun object with a value of `TRUE`. The value of this variable is later changed to `FALSE` through overriding. + +#### Proc Overrides + +Proc overrides allow you to extend or modify the behavior of existing procedures (procs) without directly editing the core files. This is done by defining a new proc that calls the original proc and then adds the new behavior. For example: + +```byond +/obj/item/gun/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1) + . = ..() // Call the original proc and set its value to the default return value + if(muzzle_flash) + spawn_sparks(src) // Add new behavior +``` + +In this example, the shoot_live_shot proc is overridden to add a new behavior (spawning sparks) after calling the original proc. This ensures that the new behavior is added without modifying the core code. + +#### How and Why Modular Overrides Work + +Modular overrides work by leveraging BYOND's file inclusion and proc definition order. When BYOND compiles the code, it processes files and definitions in the order that they're included in [tgstation.dme](./../tgstation.dme). BYOND orders said includes in alphabetical order, with `_` being before all letters, and `~` being after. + +Proc overrides run in the order of last-defined to first-defined. This means that the most recently defined proc will be the one that is executed. By placing our overrides in files that are included later in the compilation process, we ensure that they take precedence over earlier definitions. + +#### Why modular_zzplurt? + +The folder is named `modular_zzplurt` rather than `modular_splurt` to ensure that it comes after all other `modular_` folders in the alphabetical order. This guarantees that our modular overrides are processed last, allowing them to effectively override any previous definitions. + +#### When to Use Modular Overrides + +Modular overrides should be used whenever possible to keep the core codebase clean and maintainable. However, it's important to use them judiciously and ensure that they do not introduce performance issues or make the code harder to understand and maintain. Specifically: + +- **Use modular overrides when they won't cause more issues than not modularizing them:** If a modular override would introduce significant complexity, performance issues, or maintenance challenges, it may be better to make a non-modular edit with proper commenting. +- **Document your overrides:** Clearly documenting any modular overrides in your code helps maintainers and other contributors understand your changes and their purpose. + +By following these guidelines, we can ensure that our codebase remains clean, maintainable, and easy to navigate, while still allowing for the flexibility to add new features and make necessary changes. + +## Folder Structure + +Instead of using different modules for every different bit of the game, we prefer to use a structure that resembles the structure of the repo itself inside our modular folder. This means we have one coding folder for all the code, one icons folder, one sounds folder, etc. + +- **Code:** Any .dm files should go in `modular_zzplurt/code/`. +- **Icons:** Any .dmi files should go in `modular_zzplurt/icons/`. +- **Sounds:** Any sound files should go in `modular_zzplurt/sounds/`. + +## Commenting Conventions + +When making non-modular changes to the core code, please use the following commenting conventions or similar: + +- **Addition:** + +```byond + //SPLURT EDIT ADDITION BEGIN - FEATURE_NAME - (Optional Reason/comment) + var/adminEmergencyNoRecall = FALSE + var/lastMode = SHUTTLE_IDLE + var/lastCallTime = 6000 + //SPLURT EDIT ADDITION END +``` + +- **Removal:** + +```byond + //SPLURT EDIT REMOVAL BEGIN - FEATURE_NAME - (Optional Reason/comment) + /* + for(var/obj/docking_port/stationary/S in stationary) + if(S.id = id) + return S + */ + //SPLURT EDIT REMOVAL END + WARNING("couldn't find dock with id: [id]") +``` + +- **Change:** + +```byond + //SPLURT EDIT CHANGE BEGIN - FEATURE_NAME - (Optional Reason/comment) + //if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE) - SPLURT EDIT - ORIGINAL + if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE, SHUTTLE_DISABLED) + //SPLURT EDIT CHANGE END + return 1 +``` + +## Modular Defines + +Our modular defines are located at `code/__DEFINES/~~~splurt_defines`. If you have a define that's used in more than one file, it must be declared here. If you have a define that's used in one file and won't be used anywhere else, declare it at the top and `#undef MY_DEFINE` at the bottom of the file. + +## Binary Files and Maps + +It's preferable to use modular binary files (sounds, icons, assets, etc.) to add content rather than editing non-modular binary files. This should always be your first option when working with binary files. However, if it is absolutely necessary, you may edit non-modular binary files. Remember, if you want to edit maps or binary files, you must install the hooks located in tools/hooks/install.bat. + +**For sound files** the only accepted format to use in the codebase is `.ogg`. All files should be as compressed as possible to not bloat our rsc files. + +### Maps + +When editing maps, especially those that exist in the upstream codebase, the first option should be to use the automapper. The automapper allows you to make modular edits to maps by applying changes through predefined templates and coordinates, ensuring that the core map files remain untouched. + +There are two main ways to use the automapper: the simple area automapper for small changes and the template automapper for larger changes. + +1. **Simple Area Automapper:** + + - Use this for small changes, such as adding a single item to an area. + - Define the item and its location in the automapper configuration. + - This will place the specified item at the given coordinates in the specified area. + +2. **Template Automapper:** + + - Use this for larger changes, such as modifying entire rooms or sections of the map. + - Create a template file that defines the changes you want to make. + - Add entries to the automapper_config.toml file to specify where and how the template should be applied. + - This will apply the changes defined in the template file at the given coordinates. + +Direct edits to the map files should only be made if the automapper is not sufficient for the intended edits. This ensures that our map changes remain modular and easier to manage. + +## Afterword + +We hope this handbook makes contributing to S.P.L.U.R.T. a pleasant experience. Remember, these guidelines are here to help maintain the quality and organization of our codebase. If you have any questions or need assistance, don't hesitate to reach out to our maintainers or the community. Happy coding! diff --git a/modular_zzplurt/tools/ci/splurt_check_grep.sh b/modular_zzplurt/tools/ci/splurt_check_grep.sh new file mode 100644 index 0000000000000..c44413866512d --- /dev/null +++ b/modular_zzplurt/tools/ci/splurt_check_grep.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +#ANSI Escape Codes for colors to increase contrast of errors +RED="\033[0;31m" +GREEN="\033[0;32m" +BLUE="\033[0;34m" +NC="\033[0m" # No Color + +echo -e "${BLUE}Re-running grep checks, but looking in modular_zzplurt...${NC}" + +# Run the linters again, but modular splurt code. +sed "s|code/\*\*/\*\.dm|modular_zzplurt/\*\*/\*\.dm|g" ; }; /** diff --git a/tgui/packages/tgui/icons.ts b/tgui/packages/tgui/icons.ts new file mode 100644 index 0000000000000..5c9cc81bb73f1 --- /dev/null +++ b/tgui/packages/tgui/icons.ts @@ -0,0 +1,14 @@ +import { resolveAsset } from './assets'; +import { fetchRetry } from './http'; +import { logger } from './logging'; + +export function loadIconRefMap() { + if (Object.keys(Byond.iconRefMap).length > 0) { + return; + } + + fetchRetry(resolveAsset('icon_ref_map.json')) + .then((res) => res.json()) + .then((data) => (Byond.iconRefMap = data)) + .catch((error) => logger.log(error)); +} diff --git a/tgui/packages/tgui/index.tsx b/tgui/packages/tgui/index.tsx index 14600cc2f0073..7e1712fed1517 100644 --- a/tgui/packages/tgui/index.tsx +++ b/tgui/packages/tgui/index.tsx @@ -33,6 +33,7 @@ import { setupHotReloading } from 'tgui-dev-server/link/client.cjs'; import { setGlobalStore } from './backend'; import { setupGlobalEvents } from './events'; import { setupHotKeys } from './hotkeys'; +import { loadIconRefMap } from './icons'; import { captureExternalLinks } from './links'; import { createRenderer } from './renderer'; import { configureStore } from './store'; @@ -44,13 +45,14 @@ const store = configureStore(); const renderApp = createRenderer(() => { setGlobalStore(store); + loadIconRefMap(); const { getRoutedComponent } = require('./routes'); const Component = getRoutedComponent(store); return ; }); -const setupApp = () => { +function setupApp() { // Delay setup if (document.readyState === 'loading') { document.addEventListener('DOMContentLoaded', setupApp); @@ -80,6 +82,6 @@ const setupApp = () => { renderApp(); }); } -}; +} setupApp(); diff --git a/tgui/packages/tgui/interfaces/LootPanel/IconDisplay.tsx b/tgui/packages/tgui/interfaces/LootPanel/IconDisplay.tsx index 9a078f3f755ae..fb792f907f28e 100644 --- a/tgui/packages/tgui/interfaces/LootPanel/IconDisplay.tsx +++ b/tgui/packages/tgui/interfaces/LootPanel/IconDisplay.tsx @@ -1,4 +1,5 @@ -import { DmIcon, Icon, Image } from '../../components'; +import { DmIcon, Icon, Image } from 'tgui-core/components'; + import { SearchItem } from './types'; type Props = { diff --git a/tgui/packages/tgui/interfaces/PersonalCrafting.tsx b/tgui/packages/tgui/interfaces/PersonalCrafting.tsx index 4063a2a210224..16420503071e3 100644 --- a/tgui/packages/tgui/interfaces/PersonalCrafting.tsx +++ b/tgui/packages/tgui/interfaces/PersonalCrafting.tsx @@ -108,12 +108,17 @@ enum TABS { type AtomData = { name: string; is_reagent: BooleanLike; + icon: string; }; type Atoms = { [key: number]: number; }; +type Icons = { + [key: number]: string; +}; + type Material = { atom_id: string; occurences: number; @@ -121,7 +126,7 @@ type Material = { type Recipe = { ref: string; - icon: string; + id: number; name: string; desc: string; category: string; @@ -154,6 +159,7 @@ type Data = { // Static diet: Diet; atom_data: AtomData[]; + icon_data: Icons; recipes: Recipe[]; categories: string[]; material_occurences: Material[]; @@ -161,6 +167,14 @@ type Data = { complexity: number; }; +const findIcon = (atom_id: number, data: Data): string => { + let icon: string = data.icon_data[atom_id]; + if (!icon) { + icon = (data.mode ? 'cooking32x32' : 'crafting32x32') + ' a' + atom_id; + } + return icon; +}; + export const PersonalCrafting = (props) => { const { act, data } = useBackend(); const { @@ -555,10 +569,12 @@ export const PersonalCrafting = (props) => { }; const MaterialContent = (props) => { - const { atom_id, occurences } = props; const { data } = useBackend(); + + const { atom_id, occurences } = props; const name = data.atom_data[atom_id - 1].name; - const mode = data.mode; + const icon = findIcon(atom_id, data); + return ( @@ -567,10 +583,7 @@ const MaterialContent = (props) => { inline ml={-1.5} mr={-0.5} - className={classes([ - mode ? 'cooking32x32' : 'crafting32x32', - 'a' + atom_id, - ])} + className={icon} /> {
- + @@ -756,7 +769,7 @@ const RecipeContentCompact = ({ item, craftable, busy, mode }) => { }; const RecipeContent = ({ item, craftable, busy, mode, diet }) => { - const { act } = useBackend(); + const { act, data } = useBackend(); return (
@@ -767,7 +780,7 @@ const RecipeContent = ({ item, craftable, busy, mode, diet }) => { transform: 'scale(1.5)', }} m={'16px'} - className={item.icon} + className={findIcon(item.id, data)} /> @@ -929,9 +942,8 @@ const RecipeContent = ({ item, craftable, busy, mode, diet }) => { const AtomContent = ({ atom_id, amount }) => { const { data } = useBackend(); - const name = data.atom_data[atom_id - 1]?.name; - const is_reagent = data.atom_data[atom_id - 1]?.is_reagent; - const mode = data.mode; + const atom: AtomData = data.atom_data[atom_id - 1]; + return ( { inline my={-1} mr={0.5} - className={classes([ - mode ? 'cooking32x32' : 'crafting32x32', - 'a' + atom_id, - ])} + className={findIcon(atom_id, data)} /> - {name} - {is_reagent ? `\xa0${amount}u` : amount > 1 && `\xa0${amount}x`} + {atom.name} + {atom.is_reagent ? `\xa0${amount}u` : amount > 1 && `\xa0${amount}x`} ) as any; diff --git a/tgui/packages/tgui/interfaces/RequestManager.jsx b/tgui/packages/tgui/interfaces/RequestManager.tsx similarity index 55% rename from tgui/packages/tgui/interfaces/RequestManager.jsx rename to tgui/packages/tgui/interfaces/RequestManager.tsx index b12d8285e80f1..9a009106788b7 100644 --- a/tgui/packages/tgui/interfaces/RequestManager.jsx +++ b/tgui/packages/tgui/interfaces/RequestManager.tsx @@ -3,37 +3,65 @@ * @copyright 2021 bobbahbrown (https://github.com/bobbahbrown) * @license MIT */ -import { decodeHtmlEntities } from 'common/string'; +import { createSearch, decodeHtmlEntities } from 'common/string'; import { useState } from 'react'; -import { useBackend, useLocalState } from '../backend'; -import { Button, Input, Popper, Section, Table } from '../components'; +import { useBackend } from '../backend'; +import { Button, Input, Popper, Section, Stack, Table } from '../components'; import { Window } from '../layouts'; +type Data = { + requests: Request[]; +}; + +type Request = { + id: string; + req_type: string; + owner: string; + owner_ckey: string; + owner_name: string; + message: string; + additional_info: string; + timestamp: number; + timestamp_str: string; +}; + +const displayTypeMap = { + request_prayer: 'PRAYER', + request_centcom: 'CENTCOM', + request_syndicate: 'SYNDICATE', + request_nuke: 'NUKE CODE', + request_fax: 'FAX', + request_internet_sound: 'INTERNET SOUND', +}; + export const RequestManager = (props) => { - const { act, data } = useBackend(); - const { requests } = data; - const [filteredTypes, _] = useLocalState( - 'filteredTypes', + const { act, data } = useBackend(); + const { requests = [] } = data; + const [filteredTypes, setFilteredTypes] = useState( Object.fromEntries( Object.entries(displayTypeMap).map(([type, _]) => [type, true]), ), ); const [searchText, setSearchText] = useState(''); + const updateFilter = (type) => { + const newFilter = { ...filteredTypes }; + newFilter[type] = !newFilter[type]; + setFilteredTypes(newFilter); + }; + // Handle filtering let displayedRequests = requests.filter( (request) => filteredTypes[request.req_type], ); - if (searchText) { - const filterText = searchText.toLowerCase(); - displayedRequests = displayedRequests.filter( - (request) => - decodeHtmlEntities(request.message) - .toLowerCase() - .includes(filterText) || - request.owner_name.toLowerCase().includes(filterText), - ); + const search = createSearch( + searchText, + (requests: Request) => + requests.owner_name + decodeHtmlEntities(requests.message), + ); + if (searchText.length > 0) { + displayedRequests = displayedRequests.filter((request) => search(request)); } return ( @@ -42,15 +70,22 @@ export const RequestManager = (props) => {
- setSearchText(value)} - placeholder={'Search...'} - mr={1} - /> - - + + + setSearchText(value)} + placeholder={'Search...'} + mr={1} + /> + + + + + } > {displayedRequests.map((request) => ( @@ -79,15 +114,6 @@ export const RequestManager = (props) => { ); }; -const displayTypeMap = { - request_prayer: 'PRAYER', - request_centcom: 'CENTCOM', - request_syndicate: 'SYNDICATE', - request_nuke: 'NUKE CODE', - request_fax: 'FAX', - request_internet_sound: 'INTERNET SOUND', -}; - const RequestType = (props) => { const { requestType } = props; @@ -99,7 +125,7 @@ const RequestType = (props) => { }; const RequestControls = (props) => { - const { act, _ } = useBackend(); + const { act } = useBackend(); const { request } = props; return ( @@ -131,52 +157,47 @@ const RequestControls = (props) => { const FilterPanel = (props) => { const [filterVisible, setFilterVisible] = useState(false); - const [filteredTypes, setFilteredTypes] = useLocalState( - 'filteredTypes', - Object.fromEntries( - Object.entries(displayTypeMap).map(([type, _]) => [type, true]), - ), - ); + const { typesList, updateFilter } = props; return ( - - - {Object.keys(displayTypeMap).map((type) => { - return ( - - - - - - { - filteredTypes[type] = !filteredTypes[type]; - setFilteredTypes(filteredTypes); - }} - my={0.25} - /> - - - ); - })} -
- - } - > -
- -
- +
+ {' '} + + + + {Object.keys(displayTypeMap).map((type) => { + return ( + + + + + + { + updateFilter(type); + }} + my={0.25} + /> + + + ); + })} +
+
+ } + /> + ); }; diff --git a/tgui/packages/tgui/interfaces/Secrets.jsx b/tgui/packages/tgui/interfaces/Secrets.jsx index a0896ec750722..3e3ccd70cc0ff 100644 --- a/tgui/packages/tgui/interfaces/Secrets.jsx +++ b/tgui/packages/tgui/interfaces/Secrets.jsx @@ -354,13 +354,13 @@ const FunTab = (props) => { /> - - Your admin button here, coder! - + content="Triple AI mode" + onClick={() => act('tripleAI')} + /> + )) + : 'Empty'} + + @@ -493,9 +504,17 @@ const TechNode = (props) => { points = [], nodes, point_types_abbreviations = [], + queue_nodes = [], } = data; const { node, nodetails, nocontrols } = props; - const { id, can_unlock, tier } = node; + const { + id, + can_unlock, + have_experiments_done, + tier, + enqueued_by_user, + is_free, + } = node; const { name, description, @@ -555,6 +574,40 @@ const TechNode = (props) => { buttons={ !nocontrols && ( <> + {tier > 0 && + (!!can_unlock && (is_free || queue_nodes.length === 0) ? ( + + ) : enqueued_by_user ? ( + + ) : id in queue_nodes && !enqueued_by_user ? ( + + ) : ( + + ))} {!nodetails && ( )} - {tier > 0 && ( - - )} ) } diff --git a/tgui/packages/tgui/interfaces/VotePanel.tsx b/tgui/packages/tgui/interfaces/VotePanel.tsx index 2ae1fb8e00664..2d135727ba6a0 100644 --- a/tgui/packages/tgui/interfaces/VotePanel.tsx +++ b/tgui/packages/tgui/interfaces/VotePanel.tsx @@ -43,6 +43,7 @@ type ActiveVote = { type UserData = { ckey: string; + isGhost: BooleanLike; isLowerAdmin: BooleanLike; isUpperAdmin: BooleanLike; singleSelection: string | null; @@ -88,12 +89,24 @@ export const VotePanel = (props) => { title="Create Vote" buttons={ !!user.isLowerAdmin && ( -