From 429fa975122dfccb935d66bb796e07a5c03bbc23 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Tue, 4 Jul 2023 15:32:24 -0400 Subject: [PATCH] Fix access helpers, remove meta xenoarch access. (#21413) * Fix access helpers, remove meta xenoarch access. * remove redundant science/genetics helpers --- _maps/map_files/Delta/delta.dmm | 4 ++-- code/modules/mapping/access_helpers.dm | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index e4af1659211..c4a49e1b490 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -807,7 +807,7 @@ "ahw" = ( /obj/machinery/door/airlock/maintenance{ name = "Auxiliary Storage"; - req_one_access_txt = "65;12" + req_one_access_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -28343,7 +28343,7 @@ "bxx" = ( /obj/machinery/door/airlock/maintenance{ name = "Auxiliary Storage"; - req_one_access_txt = "65;12" + req_one_access_txt = "12" }, /obj/structure/cable{ d1 = 1; diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 202df591ef9..13c0573a1f7 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -65,6 +65,9 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/general access = ACCESS_ENGINE +/obj/effect/mapping_helpers/airlock/access/any/engineering/equipment + access = ACCESS_ENGINE_EQUIP + /obj/effect/mapping_helpers/airlock/access/any/engineering/construction access = ACCESS_CONSTRUCTION @@ -130,9 +133,6 @@ /obj/effect/mapping_helpers/airlock/access/any/science/tox_storage access = ACCESS_TOX_STORAGE -/obj/effect/mapping_helpers/airlock/access/any/science/genetics - access = ACCESS_GENETICS - /obj/effect/mapping_helpers/airlock/access/any/science/robotics access = ACCESS_ROBOTICS @@ -152,6 +152,9 @@ /obj/effect/mapping_helpers/airlock/access/any/security/general access = ACCESS_SECURITY +/obj/effect/mapping_helpers/airlock/access/any/security/forensics + access = ACCESS_FORENSICS_LOCKERS + /obj/effect/mapping_helpers/airlock/access/any/security/doors access = ACCESS_SEC_DOORS @@ -195,7 +198,7 @@ /obj/effect/mapping_helpers/airlock/access/any/service/library access = ACCESS_LIBRARY -/obj/effect/mapping_helpers/airlock/access/any/service/library +/obj/effect/mapping_helpers/airlock/access/any/service/theatre access = ACCESS_THEATRE /obj/effect/mapping_helpers/airlock/access/any/service/clown @@ -274,6 +277,9 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general access = ACCESS_ENGINE +/obj/effect/mapping_helpers/airlock/access/all/engineering/equipment + access = ACCESS_ENGINE_EQUIP + /obj/effect/mapping_helpers/airlock/access/all/engineering/construction access = ACCESS_CONSTRUCTION @@ -339,9 +345,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/tox_storage access = ACCESS_TOX_STORAGE -/obj/effect/mapping_helpers/airlock/access/all/science/genetics - access = ACCESS_GENETICS - /obj/effect/mapping_helpers/airlock/access/all/science/robotics access = ACCESS_ROBOTICS @@ -361,6 +364,9 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general access = ACCESS_SECURITY +/obj/effect/mapping_helpers/airlock/access/all/security/forensics + access = ACCESS_FORENSICS_LOCKERS + /obj/effect/mapping_helpers/airlock/access/all/security/doors access = ACCESS_SEC_DOORS @@ -407,7 +413,7 @@ /obj/effect/mapping_helpers/airlock/access/all/service/library access = ACCESS_LIBRARY -/obj/effect/mapping_helpers/airlock/access/all/service/library +/obj/effect/mapping_helpers/airlock/access/all/service/theatre access = ACCESS_THEATRE /obj/effect/mapping_helpers/airlock/access/all/service/clown