diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index b4fe53a805f..ca7f2665710 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -36199,12 +36199,12 @@ /area/station/security/breakroom) "nhY" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/gulag_item_reclaimer{ - pixel_y = 24 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/gulag_item_reclaimer{ + pixel_y = 24 + }, /turf/open/floor/iron/dark, /area/station/security/processing) "nhZ" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a6cfcdf6db5..73c19f48337 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -597,13 +597,6 @@ /obj/effect/turf_decal/tile/green/anticorner/contrasted, /turf/open/floor/iron, /area/station/security/courtroom) -"amr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "amu" = ( /obj/effect/decal/cleanable/dirt, /obj/item/storage/box/drinkingglasses, @@ -4289,7 +4282,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "bCc" = ( @@ -5327,7 +5319,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "bXX" = ( @@ -5467,6 +5458,11 @@ "cbz" = ( /turf/closed/wall, /area/station/cargo/storage) +"ccC" = ( +/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/exit/departure_lounge) "ccD" = ( /mob/living/carbon/human/species/monkey, /turf/open/floor/grass, @@ -10661,6 +10657,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"eaC" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "eaF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11929,11 +11932,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"evj" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "evt" = ( /obj/machinery/modular_computer/preset/id{ dir = 4 @@ -17469,9 +17467,7 @@ /area/station/commons/fitness/recreation) "gCf" = ( /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "gCn" = ( @@ -18472,6 +18468,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron/white/corner, /area/station/hallway/primary/aft) "gUX" = ( @@ -24181,6 +24178,8 @@ /area/station/hallway/secondary/service) "iNZ" = ( /obj/effect/turf_decal/stripes/corner, +/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/exit/departure_lounge) "iOc" = ( @@ -26951,6 +26950,8 @@ "jJX" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/status_display/evac/directional/south, +/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/exit/departure_lounge) "jJY" = ( @@ -28490,15 +28491,6 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/office) -"klY" = ( -/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/aft) "klZ" = ( /obj/machinery/status_display/evac, /turf/closed/wall, @@ -31240,6 +31232,15 @@ }, /turf/open/floor/iron/white, /area/station/security/prison) +"lmV" = ( +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=10-Aft-To-Central"; + location = "9.4-Escape-4" + }, +/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/exit/departure_lounge) "lnc" = ( /turf/closed/wall, /area/station/commons/dorms) @@ -35784,6 +35785,14 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"mVi" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "mVp" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /obj/effect/mapping_helpers/broken_floor, @@ -36451,7 +36460,6 @@ location = "9.2-Escape-2" }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "nhh" = ( @@ -37628,7 +37636,7 @@ "nAV" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage" + name = "Coroner's Office" }, /obj/effect/mapping_helpers/airlock/access/all/medical/coroner, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43885,6 +43893,11 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/port) +"pPf" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "pPh" = ( /obj/structure/closet/secure_closet/miner, /obj/item/clothing/suit/hooded/wintercoat/miner, @@ -52197,13 +52210,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/security/brig) -"sPi" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "sPj" = ( /obj/machinery/door/airlock/command{ name = "Head of Security's Office" @@ -54221,6 +54227,7 @@ /area/station/science/cytology) "tyu" = ( /obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "tyy" = ( @@ -54336,7 +54343,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/status_display/evac/directional/north, /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, @@ -54620,18 +54626,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) -"tGB" = ( -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=10-Aft-To-Central"; - location = "9.4-Escape-4" - }, -/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/secondary/exit/departure_lounge) "tGL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58486,6 +58480,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "uWS" = ( @@ -64697,6 +64692,7 @@ "xks" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "xkv" = ( @@ -93224,12 +93220,12 @@ tSw oBD iUm iyi -tGB +hQT xMz xMz xMz -wRm -dye +ccC +eaC tyu krc aho @@ -93482,13 +93478,13 @@ agR iUm iUm uWR +lmV nSe nSe nSe nSe nSe nSe -krc dDo hQu gRb @@ -94253,7 +94249,7 @@ fdX iUm oZi bfl -wBW +mVi eje eje hlq @@ -94510,13 +94506,13 @@ tmL iUm lZC bfl +ccC nSe nSe nSe nSe nSe nSe -krc dDo hQu gRb @@ -94762,7 +94758,7 @@ njX njX jcd vNv -klY +oAu gUU lMI dWd @@ -94771,11 +94767,11 @@ xMz vkD xMz xMz -xMz -amr -krc +wRm +dye +nSe nhc -evj +hQu iBp hQu cSv @@ -95028,11 +95024,11 @@ mIi bfl bfl bDp -nSe -nSe -nSe -dDo -sPi +krc +krc +krc +pPf +gAw gRb gRb gRb diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 638f12334db..0c40ccd8409 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -23982,8 +23982,8 @@ "gkD" = ( /obj/effect/decal/cleanable/dirt, /obj/item/toy/plush/lizard_plushie/green{ - name = "Bites-The-Wires"; - desc = "A stuffed toy which resembles a wayward Ashlander. This one fills you with hope for the future." + desc = "A stuffed toy which resembles a wayward Ashlander. This one fills you with hope for the future."; + name = "Bites-The-Wires" }, /obj/effect/turf_decal/trimline/green/line{ dir = 10 @@ -65170,7 +65170,6 @@ "qPA" = ( /obj/effect/turf_decal/trimline/purple/arrow_ccw, /obj/machinery/door/firedoor/heavy, -/obj/effect/turf_decal/trimline/purple/mid_joiner, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/green/arrow_cw{ dir = 1 @@ -87913,8 +87912,8 @@ dir = 8 }, /obj/item/toy/plush/beeplushie{ - name = "Bee Haave"; - desc = "A cute bee toy to calm down hysteric patients." + desc = "A cute bee toy to calm down hysteric patients."; + name = "Bee Haave" }, /turf/open/floor/wood, /area/station/medical/psychology) @@ -90805,8 +90804,8 @@ "xEX" = ( /obj/structure/rack, /obj/item/toy/plush/plasmamanplushie{ - name = "Nitrous II"; - desc = "A stuffed toy that resembles your plasma coworkers. It is cute despite itself." + desc = "A stuffed toy that resembles your plasma coworkers. It is cute despite itself."; + name = "Nitrous II" }, /turf/open/floor/plating, /area/station/maintenance/floor1/port/fore) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 021835d0407..8f7a34aca36 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -44840,11 +44840,11 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) "oXu" = ( +/obj/effect/turf_decal/tile/neutral/tram, /obj/effect/spawner/random{ loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); name = "funny slipper :)" }, -/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/right) "oXz" = ( @@ -61416,11 +61416,11 @@ /turf/open/floor/iron, /area/station/security/checkpoint/supply) "uNe" = ( +/obj/effect/turf_decal/tile/neutral/tram, /obj/effect/spawner/random{ loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); name = "funny slipper :)" }, -/obj/effect/turf_decal/tile/neutral/tram, /turf/open/floor/noslip/tram_plate, /area/station/hallway/primary/tram/left) "uNl" = ( @@ -186232,7 +186232,7 @@ aGq fmy pEx pEx -may +pEx fmy dbV seY