From 489d83cbce2fc934ef82d720ee232bed9f68a4dc Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Fri, 1 Dec 2023 16:10:34 +0100 Subject: [PATCH] Fixes the lavaland outpost causing CI to fail (#23431) * Also an easy fix * Adds the CI addition * I can't Engrish * Fixes Metastation * Oops --- _maps/map_files/MetaStation/MetaStation.dmm | 6 ++---- _maps/map_files/generic/Lavaland.dmm | 6 +++--- tools/maplint/lints/different_access_helpers.yml | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 tools/maplint/lints/different_access_helpers.yml diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index aaf4019e4b7..30469b847ce 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -55190,13 +55190,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "gvN" = ( @@ -74829,13 +74828,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "peF" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/machinery/door/airlock/engineering/glass{ heat_proof = 1; name = "Supermatter Chamber" }, /obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) "pfh" = ( diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 81202a08678..706c03d5c47 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -7527,7 +7527,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/any/supply/mining, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/simulated/floor/plasteel{ icon_state = "darkgreencorners" }, @@ -8026,11 +8026,11 @@ name = "Shuttle Dock" }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/supply/mining, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining_station, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining_station, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredfull" diff --git a/tools/maplint/lints/different_access_helpers.yml b/tools/maplint/lints/different_access_helpers.yml new file mode 100644 index 00000000000..c2ec7adb1b8 --- /dev/null +++ b/tools/maplint/lints/different_access_helpers.yml @@ -0,0 +1,4 @@ +help: "Use only the `/access/all` access helpers. Don't mix them with the `any` access helpers." +/obj/effect/mapping_helpers/airlock/access/all: + banned_neighbors: + - /obj/effect/mapping_helpers/airlock/access/any