From f598a2912d6b2dfa9c3ca51ca1b0a9dd5bb6d894 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Tue, 16 Jan 2024 21:15:54 +0000 Subject: [PATCH 01/17] Grants ACCESS_LIBRARY to Artists --- code/modules/jobs/job_types/artist.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/artist.dm b/code/modules/jobs/job_types/artist.dm index 55784466133e..3acdc006e016 100644 --- a/code/modules/jobs/job_types/artist.dm +++ b/code/modules/jobs/job_types/artist.dm @@ -12,7 +12,7 @@ outfit = /datum/outfit/job/artist alt_titles = list("Painter", "Composer", "Artisan") added_access = list() - base_access = list() + base_access = list(ACCESS_LIBRARY) paycheck = PAYCHECK_ASSISTANT paycheck_department = ACCOUNT_CIV From 6cc011f6db8a2987d00bdc28460860d46ed298a4 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Wed, 24 Jan 2024 23:37:35 +0000 Subject: [PATCH 02/17] Update access.dm with service hall access --- code/__DEFINES/access.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index f00b5431db9c..fd42046c46a9 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -92,6 +92,7 @@ #define ACCESS_SECURE_TECH_STORAGE 76 // Creating this to cleanly fix door remote bug will be equivalent to ACCESS_AI_UPLOAD for Cap and RD #define ACCESS_PSYCH 77 // For the psych's back office area with the flashes/chem machines #define ACCESS_RND 78 //rnd console +#define ACCESS_SERVHALL 79 //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. From dea81425ee07d179559eec3b2b5c976e324b246b Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Wed, 24 Jan 2024 23:44:22 +0000 Subject: [PATCH 03/17] Gives Artists ACCESS_SERVHALL --- code/modules/jobs/job_types/artist.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/artist.dm b/code/modules/jobs/job_types/artist.dm index 3acdc006e016..a8c2d806543f 100644 --- a/code/modules/jobs/job_types/artist.dm +++ b/code/modules/jobs/job_types/artist.dm @@ -12,7 +12,7 @@ outfit = /datum/outfit/job/artist alt_titles = list("Painter", "Composer", "Artisan") added_access = list() - base_access = list(ACCESS_LIBRARY) + base_access = list(ACCESS_SERVHALL) paycheck = PAYCHECK_ASSISTANT paycheck_department = ACCOUNT_CIV From c43ed3e38a4ebbf919e23acde630749d7b766880 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:07:00 +0000 Subject: [PATCH 04/17] Gives Botanists ACCESS_SERVHALL --- code/modules/jobs/job_types/botanist.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 3e366db34668..48f113d464af 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -14,7 +14,7 @@ alt_titles = list("Ecologist", "Agriculturist", "Botany Greenhorn", "Hydroponicist", "Gardener") added_access = list(ACCESS_BAR, ACCESS_KITCHEN) - base_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BOTANIST From 5962d40f4bbd52d7e3c17e527b351da755410861 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:10:05 +0000 Subject: [PATCH 05/17] Gives Chaplains ACCESS_SERVHALL --- code/modules/jobs/job_types/chaplain.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 3cd1ee881bd2..27120124b9e2 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -15,7 +15,7 @@ alt_titles = list("Priest", "Preacher", "Cleric", "Exorcist", "Vicar") added_access = list() - base_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE) + base_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV From c562bfd9b090787ddf1da96b04bb4a1edad862b3 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:13:40 +0000 Subject: [PATCH 06/17] Gives Clowns ACCESS_SERVHALL --- code/modules/jobs/job_types/clown.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index 7fc1b36a9f38..021c1901b7c0 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -14,7 +14,7 @@ alt_titles = list("Entertainer", "Comedian", "Jester", "Improv Artist") added_access = list() - base_access = list(ACCESS_THEATRE) + base_access = list(ACCESS_THEATRE, ACCESS_SERVHALL) paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV From 4fef08c6b320809315f623da4900d94f5bce2bcb Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:14:08 +0000 Subject: [PATCH 07/17] Gives Cooks ACCESS_SERVHALL --- code/modules/jobs/job_types/cook.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index b0efc565e7a6..6816268116b3 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -15,7 +15,7 @@ alt_titles = list("Chef", "Hash Slinger", "Sous-chef", "Culinary Artist", "Culinarian") added_access = list(ACCESS_HYDROPONICS, ACCESS_BAR) - base_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM) + base_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV From 53d4999cc7fabc3527aa96aa2c3bd54cda216a9c Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:14:44 +0000 Subject: [PATCH 08/17] Gives Curators ACCESS_SERVHALL --- code/modules/jobs/job_types/curator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index eb7aae9266a3..2ec4485c6732 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -15,7 +15,7 @@ alt_titles = list("Librarian", "Journalist", "Archivist", "Cartographer", "Space Archaeologist") added_access = list() - base_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION) + base_access = list(ACCESS_LIBRARY, ACCESS_CONSTRUCTION, ACCESS_MINING_STATION, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_BLOODSUCKER_HUNTER) From d7e6cb3b23f8721218e0807f23e75fc1a710212b Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:17:02 +0000 Subject: [PATCH 09/17] Gives the Head of Personnel ACCESS_SERVHALL --- code/modules/jobs/job_types/head_of_personnel.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 4d684d9a14ca..532da73f2ac6 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -27,7 +27,7 @@ ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MANUFACTURING) //yogs - added ACCESS_MANUFACTURING as it's the clerk's + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MANUFACTURING, ACCESS_SERVHALL) //yogs - added ACCESS_MANUFACTURING as it's the clerk's paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SRV From 8e4bd6783e24fd9d02ea0274badaf7f5419b06be Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:17:49 +0000 Subject: [PATCH 10/17] Gives Janitors ACCESS_SERVHALL --- code/modules/jobs/job_types/janitor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 55e6708188cd..3cae0c2b58df 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -14,7 +14,7 @@ alt_titles = list("Custodian", "Sanitation Worker", "Cleaner", "Caretaker", "Maid") added_access = list() - base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_RESEARCH, ACCESS_MEDICAL) + base_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV From 78222ba9840245d2cf3cdb0a3cdbb6700a7a9c0b Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:18:10 +0000 Subject: [PATCH 11/17] Gives Mimes ACCESS_SERVHALL --- code/modules/jobs/job_types/mime.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index f15a4bfd3be3..2f7eb38dfb76 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -14,7 +14,7 @@ alt_titles = list("Mute Entertainer", "Silent Jokester", "Pantomimist") added_access = list() - base_access = list(ACCESS_THEATRE) + base_access = list(ACCESS_THEATRE, ACCESS_SERVHALL) paycheck = PAYCHECK_MINIMAL paycheck_department = ACCOUNT_SRV From a7bcf95ffc17825d3e757b3cfb1a2eb2dd47de21 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:20:17 +0000 Subject: [PATCH 12/17] Gives Bartenders ACCESS_SERVHALL --- code/modules/jobs/job_types/bartender.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 66fce46dc27a..96bf7ce62893 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -15,7 +15,7 @@ outfit = /datum/outfit/job/bartender added_access = list(ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_MORGUE) - base_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) + base_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_SRV display_order = JOB_DISPLAY_ORDER_BARTENDER From d5d513223f75513e9642260f07354b34fc4f069e Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:21:19 +0000 Subject: [PATCH 13/17] Gives Lawyers ACCESS_SERVHALL Don't blame me, Lawyers already had access there! --- code/modules/jobs/job_types/lawyer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index 2e4c1aaa7850..62d57ce5d864 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -15,7 +15,7 @@ outfit = /datum/outfit/job/lawyer added_access = list() - base_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS) + base_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_SERVHALL) paycheck = PAYCHECK_EASY paycheck_department = ACCOUNT_CIV mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) From 179151baf9c3bdf26772888157db205bdf2ae09e Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 25 Jan 2024 08:33:21 +0000 Subject: [PATCH 14/17] Gives ACCESS_SERVHALL a description, and adds it to All Access & Station General access --- code/modules/jobs/access.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index ebe1c7120a3d..e8934128e90f 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -151,7 +151,7 @@ ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_RND, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, - ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING, ACCESS_BRIG_PHYS, ACCESS_PSYCH) //YOGS - yogs jobs + ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING, ACCESS_BRIG_PHYS, ACCESS_PSYCH, ACCESS_SERVHALL) //YOGS - yogs jobs /// Gets all centcom accesses /proc/get_all_centcom_access() @@ -185,7 +185,7 @@ if(0) return get_all_accesses() if(1) //station general - return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_MANUFACTURING) + return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_MANUFACTURING, ACCESS_SERVHALL) if(2) //security return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) if(3) //medbay @@ -377,6 +377,8 @@ return "Freeminer Engineer" if(ACCESS_FREEMINER_CAPTAIN) return "Freeminer Captain" + if(ACCESS_SERVHALL) + return "Service Hall" // yogs end /// Get descriptions for centcom accesses From 6f3c872bbca586d0f8a63dc4c9663869548ab941 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:08:43 -0700 Subject: [PATCH 15/17] Updates every Service Hall door to require the new Service Hall access --- _maps/map_files/AsteroidStation/AsteroidStation.dmm | 5 ++--- _maps/map_files/DonutStation/DonutStation.dmm | 2 +- _maps/map_files/GaxStation/GaxStation.dmm | 4 ++-- _maps/map_files/IceMeta/IceMeta.dmm | 8 ++++---- _maps/map_files/YogStation/YogStation.dmm | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 3956409040b4..6e764a1e3577 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -26650,8 +26650,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock{ name = "Service Hall"; - req_access_txt = "35"; - req_one_access_txt = "0" + req_access_txt = "35;79" }, /turf/open/floor/wood, /area/hallway/secondary/service) @@ -68477,7 +68476,7 @@ }, /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38;36" + req_access_txt = "79" }, /obj/structure/cable{ icon_state = "4-8" diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 7bfdda23342b..303f7210878f 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -1534,7 +1534,7 @@ }, /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38;36" + req_access_txt = "79" }, /obj/machinery/door/firedoor/border_only{ dir = 4 diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index 54a6a13ab256..27f29f874710 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -39487,7 +39487,7 @@ "toK" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38;36" + req_access_txt = "79" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -42719,7 +42719,7 @@ "uWk" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38" + req_access_txt = "79" }, /obj/machinery/door/firedoor/border_only{ dir = 8 diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 41bee5866aa2..5bd955804ff8 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -10734,7 +10734,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38" + req_access_txt = "79" }, /turf/open/floor/plasteel, /area/hallway/secondary/service) @@ -29891,7 +29891,7 @@ "iMH" = ( /obj/machinery/door/airlock/medical/glass{ name = "Service Door"; - req_one_access_txt = "35;28" + req_access_txt = "35;79" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -43420,7 +43420,7 @@ "mDl" = ( /obj/machinery/door/airlock{ name = "Kitchen"; - req_access_txt = "28" + req_access_txt = "28;79" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -48046,7 +48046,7 @@ "nRB" = ( /obj/machinery/door/airlock{ name = "Bar Storage"; - req_access_txt = "25" + req_access_txt = "25;79" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 8b217280c836..bff1ce11264d 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -23005,7 +23005,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "25;26;35;28;46;37;38" + req_access_txt = "79" }, /obj/structure/cable{ icon_state = "1-2" @@ -53016,7 +53016,7 @@ "qpF" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28;46;37;38;36" + req_access_txt = "79" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ From 0c97bfa3ad3a7ecfcb02d7a4759633170d83489e Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 14 Mar 2024 18:02:28 -0700 Subject: [PATCH 16/17] test commit --- _maps/map_files/YogStation/YogStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index bff1ce11264d..c472f5b7f65c 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -53016,7 +53016,7 @@ "qpF" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_access_txt = "79" + req_access_txt = "35" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ From 71c3927d9bc8735691f560b60ee7a590b30c47e1 Mon Sep 17 00:00:00 2001 From: Cartlord <78994376+Cartlord@users.noreply.github.com> Date: Thu, 14 Mar 2024 18:09:08 -0700 Subject: [PATCH 17/17] undo the test commit --- _maps/map_files/YogStation/YogStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index c472f5b7f65c..bff1ce11264d 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -53016,7 +53016,7 @@ "qpF" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_access_txt = "35" + req_access_txt = "79" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{