From e0af854b27eec22b41c717c2ee5b83ae5b09d2e1 Mon Sep 17 00:00:00 2001 From: Perohai <53275479+Perohai@users.noreply.github.com> Date: Sat, 23 Nov 2024 19:48:44 +0300 Subject: [PATCH] BoxStation fixes (#794) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## About The Pull Request Пофиксил поды, доступы в техи рнд, ботанику(пламбинг френдли), дал вирусную еду в вирусологию, ## Why It's Good For The Game Чинит коробочку ## Changelog :cl: fix: map Cyberiad /:cl: --- _maps/map_files/Cyberiad/Cyberiad.dmm | 247 ++++++++++++++++---------- 1 file changed, 151 insertions(+), 96 deletions(-) diff --git a/_maps/map_files/Cyberiad/Cyberiad.dmm b/_maps/map_files/Cyberiad/Cyberiad.dmm index e85f8df233c32..f09ec7032b229 100644 --- a/_maps/map_files/Cyberiad/Cyberiad.dmm +++ b/_maps/map_files/Cyberiad/Cyberiad.dmm @@ -1253,6 +1253,7 @@ "aqR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/light/small/directional/west, +/obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard) "arb" = ( @@ -2138,6 +2139,10 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"aDA" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/ghetto/central/aft) "aDC" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -4541,14 +4546,14 @@ "bjV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=Lockers"; - location = "EVA" - }, /obj/structure/cable, /obj/effect/turf_decal/plaque{ icon_state = "L6" }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=Lockers"; + location = "EVA" + }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "bjW" = ( @@ -8012,7 +8017,6 @@ /obj/effect/turf_decal/tile/green/half{ dir = 1 }, -/obj/machinery/duct, /turf/open/floor/iron/edge{ dir = 1 }, @@ -11300,6 +11304,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/science/genetics) +"cVq" = ( +/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/navbeacon{ + codes_txt = "patrol;next_patrol=AftH"; + location = "AIW" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) "cVs" = ( /obj/machinery/conveyor{ dir = 8; @@ -14710,7 +14727,6 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "dNI" = ( @@ -16165,7 +16181,7 @@ "ehl" = ( /obj/docking_port/stationary/random{ name = "lavaland"; - shuttle_id = "pod_lavaland"; + shuttle_id = "pod_3_lavaland"; dir = 4 }, /turf/open/space/openspace, @@ -18127,7 +18143,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/machinery/duct, /turf/open/floor/iron/edge{ dir = 4 }, @@ -19012,7 +19027,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/duct, /turf/open/floor/iron, /area/station/service/hydroponics) "eXj" = ( @@ -22433,14 +22447,9 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine/ghetto) "fSd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=EVA2"; - location = "Dorm" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/ghetto/fore/starboard) "fSn" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/random/trash/bin, @@ -28270,6 +28279,10 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/smooth, /area/station/maintenance/ghetto/central) +"hyg" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/department/security/ghetto/south) "hyi" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 6 @@ -28769,6 +28782,8 @@ /area/station/service/hydroponics/garden) "hEZ" = ( /obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "hFb" = ( @@ -28843,9 +28858,8 @@ /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) "hFX" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/box, /obj/machinery/light/directional/south, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, /area/station/science/ordnance/office) "hGd" = ( @@ -31471,7 +31485,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, -/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "isq" = ( @@ -36289,6 +36302,7 @@ "jHK" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/space_heater, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "jHL" = ( @@ -36490,9 +36504,6 @@ /area/station/maintenance/starboard/aft) "jKd" = ( /obj/machinery/light_switch/directional/west, -/obj/machinery/power/floodlight{ - anchored = 1 - }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "jKe" = ( @@ -39989,7 +40000,6 @@ /obj/machinery/portable_atmospherics/pipe_scrubber, /obj/machinery/light/directional/east, /obj/effect/turf_decal/box, -/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/station/science/ordnance/office) "kEO" = ( @@ -42031,11 +42041,11 @@ /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/structure/cable, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=EVA"; location = "Security" }, -/obj/structure/cable, /turf/open/floor/iron, /area/station/security/brig/entrance) "lfU" = ( @@ -43574,6 +43584,11 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"lAG" = ( +/obj/structure/reagent_dispensers/plumbed, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "lAJ" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -45711,7 +45726,6 @@ /obj/effect/turf_decal/tile/green/half{ dir = 4 }, -/obj/machinery/duct, /turf/open/floor/iron/edge{ dir = 4 }, @@ -49640,6 +49654,7 @@ /obj/effect/turf_decal/tile/purple/half{ dir = 8 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/station/science/ordnance/office) "njn" = ( @@ -50014,6 +50029,10 @@ /obj/structure/fireaxecabinet/empty/directional/north, /turf/open/floor/iron, /area/station/maintenance/ghetto/port/aft) +"nnJ" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/ghetto/aft) "nnO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -51215,6 +51234,10 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"nEj" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/ghetto/port/aft) "nEo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52621,9 +52644,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "nXO" = ( -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/white, -/area/station/science/ordnance/office) +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/ghetto/starboard/aft) "nXP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52985,7 +53008,6 @@ dir = 5 }, /obj/structure/cable, -/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "ocB" = ( @@ -54025,7 +54047,6 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/machinery/door/firedoor, -/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "oqR" = ( @@ -54651,14 +54672,14 @@ /turf/open/floor/iron/cafeteria, /area/station/maintenance/ghetto/starboard/aft) "oyJ" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "Tool Storage" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "Tool Storage" + }, /turf/open/floor/iron, /area/station/commons/storage/primary) "oyP" = ( @@ -54819,13 +54840,9 @@ /turf/open/floor/wood, /area/station/security/courtroom) "oBh" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/watering_can{ - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/watering_can{ - pixel_y = 6 - }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/watering_can, +/obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "oBi" = ( @@ -58688,12 +58705,12 @@ /turf/open/floor/iron, /area/station/security/prison) "pCG" = ( -/obj/machinery/computer/warrant{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, +/obj/machinery/computer/security{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/security/brig) "pCK" = ( @@ -60913,6 +60930,11 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/maintenance/department/medical/central) +"qgO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/space_heater, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) "qgR" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -61128,6 +61150,13 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"qkG" = ( +/obj/docking_port/stationary/random{ + name = "lavaland"; + shuttle_id = "pod_2_lavaland" + }, +/turf/open/space/openspace, +/area/space) "qkK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -69115,7 +69144,6 @@ /area/station/maintenance/department/engine/atmos) "srE" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/machinery/duct, /turf/open/floor/iron/corner{ dir = 1 }, @@ -69254,7 +69282,6 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable, /obj/machinery/door/firedoor, -/obj/machinery/duct, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/open/floor/iron/dark, /area/station/hallway/secondary/service) @@ -69788,14 +69815,18 @@ /turf/open/floor/iron, /area/station/security/range) "sCf" = ( -/obj/effect/turf_decal/tile/green/half{ - dir = 8 +/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/duct, -/turf/open/floor/iron/edge{ - dir = 8 +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=CHE"; + location = "AIE" }, -/area/station/service/hydroponics) +/turf/open/floor/iron, +/area/station/hallway/primary/central) "sCm" = ( /turf/open/floor/engine/air, /area/station/engineering/atmos) @@ -70000,12 +70031,11 @@ /turf/open/floor/plating, /area/station/maintenance/aft) "sEo" = ( -/obj/machinery/computer/security{ - dir = 4 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, +/obj/structure/table, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/iron/dark, /area/station/security/brig) "sEp" = ( @@ -72386,7 +72416,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "toF" = ( @@ -73700,6 +73729,11 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"tGg" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "tGj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -74154,7 +74188,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/duct, /turf/open/floor/iron/edge{ dir = 4 }, @@ -75127,7 +75160,7 @@ /turf/open/floor/iron/dark, /area/station/security/warden) "tZs" = ( -/obj/effect/spawner/random/engineering/atmospherics_portable, +/obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/ghetto/starboard) "tZy" = ( @@ -75162,6 +75195,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/ghetto/port) "uae" = ( @@ -77251,7 +77285,6 @@ "uGI" = ( /obj/effect/landmark/start/botanist, /obj/structure/chair/stool/directional/west, -/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "uGM" = ( @@ -77524,7 +77557,7 @@ "uKq" = ( /obj/docking_port/stationary/random{ name = "lavaland"; - shuttle_id = "pod_lavaland"; + shuttle_id = "pod_4_lavaland"; dir = 4 }, /turf/open/space/basic, @@ -78026,7 +78059,6 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "uRh" = ( @@ -78483,6 +78515,11 @@ "uYf" = ( /turf/open/floor/wood/parquet, /area/station/maintenance/department/security/brig) +"uYh" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/ghetto) "uYj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -80639,7 +80676,6 @@ "vAa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, -/obj/machinery/duct, /turf/open/floor/iron, /area/station/service/hydroponics) "vAe" = ( @@ -87092,11 +87128,11 @@ /turf/open/floor/plating, /area/station/maintenance/department/bridge/ntr) "xme" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=HOP2"; location = "Stbd" }, -/obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "xmg" = ( @@ -88445,6 +88481,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, +/obj/structure/reagent_dispensers/wall/virusfood/directional/north, /turf/open/floor/iron/white, /area/station/medical/virology) "xGb" = ( @@ -88753,6 +88790,11 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"xLl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/space_heater, +/turf/open/floor/iron, +/area/station/maintenance/ghetto/port) "xLm" = ( /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -89087,6 +89129,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) +"xPH" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "xPI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/corner{ @@ -89257,6 +89304,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/junction/flip, /obj/structure/cable, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=AIE"; + location = "AftH" + }, /turf/open/floor/iron, /area/station/hallway/primary/aft) "xRg" = ( @@ -89678,13 +89729,13 @@ /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/plaque{ + icon_state = "L10" + }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Security"; location = "EVA2" }, -/obj/effect/turf_decal/plaque{ - icon_state = "L10" - }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "xXW" = ( @@ -90260,6 +90311,10 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage) +"yfM" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/aft) "ygf" = ( /turf/closed/wall, /area/station/engineering/transit_tube) @@ -105232,7 +105287,7 @@ aoJ rlW oqm oqm -rlW +xLl tWQ doz doz @@ -111943,7 +111998,7 @@ rmU tlF aec aec -aec +nEj rmU rmU rmU @@ -115555,7 +115610,7 @@ npV npV tgS dKo -pnB +uYh pnB xvv tSC @@ -117354,7 +117409,7 @@ eQx eQx eYk dKo -pnB +uYh pnB uoO pnB @@ -122248,7 +122303,7 @@ ceC doz ylz lrV -hph +aDA vWi ceC ceC @@ -125238,8 +125293,8 @@ dOO dOO vbK dOO -leG -leG +hyg +hyg dOO dOO dOO @@ -132986,7 +133041,7 @@ pqc ygR jrb woL -qTP +tZs adQ woL cwi @@ -133971,7 +134026,7 @@ doz doz doz pNZ -vpn +fSd vpn tbQ rYX @@ -134228,7 +134283,7 @@ doz doz doz pNZ -vpn +fSd vpn tbQ pNZ @@ -134333,7 +134388,7 @@ mLF aPQ qFZ rQp -qQf +nnJ fif fif fif @@ -140467,7 +140522,7 @@ xQO xQO iYR onD -fKk +nXO iYR vbK ceC @@ -145367,7 +145422,7 @@ fKk fKk fKk fKk -fKk +nXO xkU scy fKk @@ -166877,7 +166932,7 @@ tYD tYD tYD tYD -vHR +qkG tYD tYD tYD @@ -172276,7 +172331,7 @@ ukd oBu wNd oBy -her +xPH plF oBy job @@ -174391,7 +174446,7 @@ aDE oXc lXI sGN -rRJ +tGg oXc cUm sFG @@ -177490,7 +177545,7 @@ hDv oXc qfY nNX -qfY +qgO oXc kJd xRt @@ -184916,7 +184971,7 @@ jFH jpk xvZ dyi -vjf +cVq dyi pSd gUx @@ -185430,7 +185485,7 @@ jFH jpk qmw qoM -hLh +sCf qoM nrC bhY @@ -189256,7 +189311,7 @@ iGO aoV kNp xru -fSd +kfK kfK bXh kfK @@ -190849,7 +190904,7 @@ hXT hXT hXT dRA -hXT +yfM hXT nGm hXT @@ -196455,7 +196510,7 @@ mvc nrH ctG rKR -sCf +chW keB chW keB @@ -196718,7 +196773,7 @@ eJS mcF mcF tLO -byC +qAE cbP uap kkl @@ -197997,7 +198052,7 @@ ylA nrH oBh hEZ -qAE +lAG qTE fiS qTE @@ -205252,7 +205307,7 @@ mum bTH bTH bTH -rMZ +cil rMZ bTH bTH @@ -208570,7 +208625,7 @@ tbI gFt pGx yfh -sjI +yfh hFX jqC qYb @@ -208826,7 +208881,7 @@ vOA tbI dQx jEu -yfh +sjI mgy eWo jqC @@ -209083,7 +209138,7 @@ sSX tbI gOB uzM -nXO +sjI kEN eWo jqC @@ -209601,7 +209656,7 @@ lEd vLK xRt bTH -rMZ +cil txL sZD jMc