From 46fe9e511bbee89d9df19ae50f21905ed172ce00 Mon Sep 17 00:00:00 2001 From: Dmeto <75919495+Dmeto@users.noreply.github.com> Date: Mon, 13 Jan 2025 02:15:02 +0000 Subject: [PATCH] Metastation cargo maintenence (#88668) ## About The Pull Request For MetaStation: Removes a wire that went under a wall between Qm's office and maintence. Removes a redundent disconected scrubber in the Cargo office Moves a camera in science lobby so its not eaten by the Experimental Destructive Scanner when someone scans somthing. Lavaland: Connects scrubber in the mini hydroponics to network. ## Why It's Good For The Game Noticed most of these immeditaly after #87968 was merged just normal fixs to redundent wires and pipes. Not sure if AI get messaged when the camera is eaten by machinery but it probbaly shouldnt be. ## Changelog :cl: map: Metastation Science lobby camera moved away form Experimental Destructive Scanner(It was geting eaten on scan) fix: Lavaland base hydroponics scrubber attached to its network with missing pipes map: Redundent disconnected scrubber in cargo office removed on Metastation map : Cable remove from under wall of Qm office on Metastation /:cl: --- _maps/map_files/MetaStation/MetaStation.dmm | 17 +++++------------ _maps/map_files/Mining/Lavaland.dmm | 2 ++ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 651fa6a4169..b44fc6d36f9 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2035,6 +2035,10 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/camera/directional/south{ + network = list("ss13","rd"); + c_tag = "Science Lobby" + }, /turf/open/floor/iron/white, /area/station/science/lobby) "aLW" = ( @@ -16029,10 +16033,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/machinery/camera/directional/north{ - c_tag = "Science Lobby"; - network = list("ss13","rd") - }, /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, @@ -19463,9 +19463,6 @@ /turf/open/floor/iron, /area/station/engineering/main) "hab" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19720,10 +19717,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) -"heR" = ( -/obj/structure/cable, -/turf/closed/wall, -/area/station/command/heads_quarters/qm) "heS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/mop_bucket/janitorialcart, @@ -89201,7 +89194,7 @@ aaa jXu twr nsT -heR +kQP kQP hqD kQP diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 02b56e53a1e..ff8ead98aab 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -1484,6 +1484,7 @@ /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -7301,6 +7302,7 @@ /obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 },